From 4d3d329cb99cec2eefe587c6fe386bd9aa695375 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Thu, 21 Mar 2024 11:34:20 -0600
Subject: [PATCH 01/99] Bump up version to 9.0.0

Change-Id: Idb5c4beccdab130858d7b05deb6309da98d2e43c
---
 CHANGES                                                     | 3 +++
 .../templates/custom/partials/class.header.tmpl.partial     | 2 +-
 EntityFramework/src/MySql.Data.EntityFramework.csproj       | 2 +-
 .../MySql.EntityFramework.Basic.Tests.csproj                | 2 +-
 .../MySql.EntityFramework.CodeFirst.Tests.csproj            | 2 +-
 .../MySql.EntityFramework.Migrations.Tests.csproj           | 2 +-
 .../src/MySQL.Data.OpenTelemetry.csproj                     | 2 +-
 MySQL.Data/src/MySql.Data.csproj                            | 2 +-
 MySQL.Data/src/Properties/VersionInfo.cs                    | 6 +++---
 MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj   | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj | 2 +-
 MySql.Web/src/MySql.Web.csproj                              | 2 +-
 MySql.Web/tests/MySql.Web.Tests.csproj                      | 2 +-
 13 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index bc4b31cc0..c0021045c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+9.0.0
+
+
 8.4.0
 - Updated FOSS license text in all source files (WL16197).
 - Fixed bug Shared memory connection doesn't work in multithread environment (Oracle Bug #36208932).
diff --git a/Documentation/templates/custom/partials/class.header.tmpl.partial b/Documentation/templates/custom/partials/class.header.tmpl.partial
index a5e724eed..9df19ebdd 100644
--- a/Documentation/templates/custom/partials/class.header.tmpl.partial
+++ b/Documentation/templates/custom/partials/class.header.tmpl.partial
@@ -25,7 +25,7 @@
 {{/implements.0}}
 <h6><strong>{{__global.namespace}}</strong>: {{{namespace.specName.0.value}}}</h6>
 <h6><strong>{{__global.assembly}}</strong>: {{assemblies.0}}.dll</h6>
-<h6><strong>Version</strong>: 8.4.0</h6>
+<h6><strong>Version</strong>: 9.0.0</h6>
 <h5 id="{{id}}_syntax">{{__global.syntax}}</h5>
 <div class="codewrapper">
   <pre><code class="lang-{{_lang}} hljs">{{syntax.content.0.value}}</code></pre>
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index 9aeeed0a7..21d144a18 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>8.4.0</Version>
+    <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;netstandard2.1;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
index 582784520..40ab28073 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.CodeFirTests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>8.4.0</Version>
+    <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net7.0</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Basic.Tests</AssemblyName>
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
index ab33be29a..8466175cc 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.CodeFirst.Tests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>8.4.0</Version>
+    <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net7.0</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.CodeFirst.Tests</AssemblyName>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
index 4e0e6901e..a45dcd0d6 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.Migrations.Tests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>8.4.0</Version>
+    <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net7.0</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Migrations.Tests</AssemblyName>
diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index abfbca424..70d0f257f 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.OpenTelemetry</Description>
     <Copyright>Copyright © 2023, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>8.4.0</Version>
+    <Version>9.0.0</Version>
     <Authors>Oracle</Authors>  
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>MySql.Data.OpenTelemetry</AssemblyName>
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index 4728aa496..cf2092cfc 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -5,7 +5,7 @@
     <Description>MySql.Data.MySqlClient .Net Core Class Library</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>8.4.0</Version>
+    <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
     <AssemblyName>MySql.Data</AssemblyName>
     <TargetFrameworks>net462;net48;netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0;</TargetFrameworks>
diff --git a/MySQL.Data/src/Properties/VersionInfo.cs b/MySQL.Data/src/Properties/VersionInfo.cs
index a9d5ff8f8..545a5808b 100644
--- a/MySQL.Data/src/Properties/VersionInfo.cs
+++ b/MySQL.Data/src/Properties/VersionInfo.cs
@@ -40,7 +40,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("8.4.0")]
-[assembly: AssemblyInformationalVersion("8.4.0")]
-[assembly: AssemblyFileVersion("8.4.0")]
+[assembly: AssemblyVersion("9.0.0")]
+[assembly: AssemblyInformationalVersion("9.0.0")]
+[assembly: AssemblyFileVersion("9.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index 91faa3dcc..ab9a2c1ee 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -4,7 +4,7 @@
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
-    <Version>8.4.0</Version>
+    <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index d253a03dc..76a1d4a15 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -4,7 +4,7 @@
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
-    <Version>8.4.0</Version>
+    <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
diff --git a/MySql.Web/src/MySql.Web.csproj b/MySql.Web/src/MySql.Web.csproj
index 04741c8ea..9bf197b3e 100644
--- a/MySql.Web/src/MySql.Web.csproj
+++ b/MySql.Web/src/MySql.Web.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Web</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>8.4.0</Version>
+    <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
diff --git a/MySql.Web/tests/MySql.Web.Tests.csproj b/MySql.Web/tests/MySql.Web.Tests.csproj
index 5d43bf263..6c7042484 100644
--- a/MySql.Web/tests/MySql.Web.Tests.csproj
+++ b/MySql.Web/tests/MySql.Web.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Web.Tests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>8.4.0</Version>
+    <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.Web.Tests</AssemblyName>

From a6c99c18ad0597a4d66c955e67250a87ca33d7f2 Mon Sep 17 00:00:00 2001
From: Reggie Burnett <reggie.burnett@oracle.com>
Date: Fri, 15 Mar 2024 13:31:51 -0500
Subject: [PATCH 02/99] WL#16279 [Migrate to NUnit 4.x]

Change-Id: I02c391bb4150b2f2da6e78fd8ec424feaea87221
---
 CHANGES                                              |  2 +-
 EFCore/tests/Directory.build.props                   | 12 ++++++++++++
 .../tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs |  1 +
 .../MySql.EFCore.Basic.Tests/ConcurrencyTests.cs     |  1 +
 .../MySql.EFCore.Basic.Tests/ConnectionTests.cs      |  1 +
 EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs   |  1 +
 .../MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs |  1 +
 EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs |  1 +
 .../tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs |  1 +
 .../MySql.EFCore.Basic.Tests/FunctionalTests.cs      |  1 +
 .../LoadingRelatedDataTests.cs                       |  1 +
 .../tests/MySql.EFCore.Basic.Tests/ModelingTests.cs  |  1 +
 .../MySql.EFCore.Basic.Tests/MultiSchemaTests.cs     |  1 +
 .../MySQLDatabaseFacadeTest.cs                       |  1 +
 .../MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs |  1 +
 .../MySql.EntityFrameworkCore.Basic.Tests.csproj     |  5 ++---
 .../ShadowPropertiesTests.cs                         |  1 +
 .../Utils/EntityTestsFixtureClass.cs                 |  1 +
 .../MySQLAnnotationCodeGeneratorTest.cs              |  1 +
 .../MySQLCodeGeneratorTest.cs                        |  1 +
 .../MySQLDatabaseModelFactoryTest.cs                 |  1 +
 .../MySQLDesignTimeProviderServicesTest.cs           |  1 +
 .../MySql.EntityFrameworkCore.Design.Tests.csproj    |  5 ++---
 .../MySQLHistoryRepositoryTests.cs                   |  1 +
 .../MySQLMigrationsTests.cs                          |  1 +
 ...MySql.EntityFrameworkCore.Migrations.Tests.csproj |  5 ++---
 .../MySqlMigrationsGeneratorTest.cs                  |  1 +
 .../MySqlMigrationsGeneratorTestBase.cs              |  1 +
 MySQL.Data/tests/Directory.build.props               | 12 ++++++++++++
 MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs  |  1 +
 MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs       |  1 +
 MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs       |  1 +
 .../tests/MySql.Data.Tests/BlobTestsCompressed.cs    |  1 +
 MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs    |  1 +
 .../tests/MySql.Data.Tests/CharSetUTF8Tests.cs       |  1 +
 .../MySql.Data.Tests/ClientSideFailoverTests.cs      |  1 +
 MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs        |  1 +
 .../tests/MySql.Data.Tests/CmdTestsCompressed.cs     |  1 +
 .../MySql.Data.Tests/ConnectionStringBuilderTests.cs |  1 +
 MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs |  1 +
 MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs   |  1 +
 MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs   |  1 +
 MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs     |  1 +
 MySQL.Data/tests/MySql.Data.Tests/EventTests.cs      |  1 +
 MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs  |  1 +
 .../Framework/netstandard2_0/CultureTests.cs         |  1 +
 .../Framework/netstandard2_0/DataTypeTests.cs        |  1 +
 .../Framework/netstandard2_0/DateTimeTests.cs        |  1 +
 .../Framework/netstandard2_0/GetSchemaTests.cs       |  1 +
 .../Framework/netstandard2_0/MySQLHelperTests.cs     |  1 +
 .../netstandard2_0/MySqlCommandBuilderTests.cs       |  1 +
 .../netstandard2_0/MySqlDataAdapterTests.cs          |  1 +
 .../Framework/netstandard2_0/MySqlDataReaderTests.cs |  1 +
 .../Framework/netstandard2_0/NETCore20Tests.cs       |  1 +
 .../Framework/netstandard2_0/PerfMonTests.cs         |  1 +
 .../netstandard2_0/ProcedureParameterTests.cs        |  1 +
 .../Framework/netstandard2_0/ReplicationTests.cs     |  1 +
 .../Framework/netstandard2_0/ThreadingTests.cs       |  1 +
 .../Framework/netstandard2_0/TimeoutAndCancel.cs     |  1 +
 .../Framework/netstandard2_0/TypeTests.cs            |  1 +
 .../Framework/netstandard2_0/UsageAdvisorTests.cs    |  1 +
 MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs    |  1 +
 .../tests/MySql.Data.Tests/MySql.Data.Tests.csproj   |  7 +++----
 .../tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs   |  1 +
 .../tests/MySql.Data.Tests/MySqlDataReaderTests.cs   |  1 +
 .../tests/MySql.Data.Tests/OutputParametersBatch.cs  |  1 +
 MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs  |  1 +
 MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs    |  1 +
 .../tests/MySql.Data.Tests/PreparedStatements.cs     |  1 +
 MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs |  1 +
 .../tests/MySql.Data.Tests/SimpleTransactions.cs     |  1 +
 MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs   |  1 +
 MySQL.Data/tests/MySql.Data.Tests/SslTests.cs        |  1 +
 MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs |  1 +
 .../MySql.Data.Tests/StoredProcedureWithAccess.cs    |  1 +
 MySQL.Data/tests/MySql.Data.Tests/StressTests.cs     |  1 +
 MySQL.Data/tests/MySql.Data.Tests/Syntax.cs          |  1 +
 MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs         |  1 +
 MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs    |  1 +
 MySQL.Data/tests/MySql.Data.Tests/TestBase.cs        |  1 +
 MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs       |  1 +
 MySQL.Data/tests/MySql.Data.Tests/Transactions.cs    |  1 +
 MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs     |  1 +
 MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs       |  1 +
 MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs |  1 +
 .../tests/MySqlX.Data.Tests/BasicSelectTests.cs      |  1 +
 .../MySqlX.Data.Tests/CharsetAndCollationTests.cs    |  1 +
 .../MySqlX.Data.Tests/ClientSideFailoverTests.cs     |  1 +
 MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs    |  1 +
 .../tests/MySqlX.Data.Tests/CloseConnectionTests.cs  |  1 +
 .../tests/MySqlX.Data.Tests/CollectionAsyncTests.cs  |  1 +
 .../tests/MySqlX.Data.Tests/CollectionIndexTests.cs  |  1 +
 .../tests/MySqlX.Data.Tests/CollectionTests.cs       |  1 +
 .../tests/MySqlX.Data.Tests/CompressionTests.cs      |  1 +
 .../tests/MySqlX.Data.Tests/CrudInsertTests.cs       |  1 +
 .../tests/MySqlX.Data.Tests/CrudRemoveTests.cs       |  1 +
 .../tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs |  1 +
 .../MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs |  1 +
 .../tests/MySqlX.Data.Tests/CrudUpdateTests.cs       |  1 +
 .../tests/MySqlX.Data.Tests/CustomTypeTests.cs       |  1 +
 MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs     |  1 +
 MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs    |  1 +
 .../tests/MySqlX.Data.Tests/ExprParserTests.cs       |  1 +
 .../tests/MySqlX.Data.Tests/JsonParserTests.cs       |  1 +
 MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs     |  1 +
 .../tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj |  7 +++----
 .../MySqlX.Data.Tests/PreparedStatementsTests.cs     |  1 +
 .../RelationalTests/ColumnMetadataTests.cs           |  1 +
 .../RelationalTests/DataTypeTests.cs                 |  1 +
 .../RelationalTests/DateTimeTests.cs                 |  1 +
 .../RelationalTests/RelationalGCTests.cs             |  1 +
 .../RelationalTests/RowBufferingTests.cs             |  1 +
 .../MySqlX.Data.Tests/RelationalTests/SqlTests.cs    |  1 +
 .../RelationalTests/TableAsyncTests.cs               |  1 +
 .../RelationalTests/TableDeleteTests.cs              |  1 +
 .../RelationalTests/TableInsertTests.cs              |  1 +
 .../RelationalTests/TableSelectTests.cs              |  1 +
 .../RelationalTests/TableUpdateTests.cs              |  1 +
 .../MySqlX.Data.Tests/RelationalTests/ViewTests.cs   |  1 +
 MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs    |  1 +
 MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs   |  1 +
 MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs       |  1 +
 .../tests/MySqlX.Data.Tests/TransactionTests.cs      |  1 +
 .../tests/MySqlX.Data.Tests/UnixSocketsTests.cs      |  1 +
 MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs          |  1 +
 .../XConnectionStringBuilderTests.cs                 |  1 +
 MySql.Web/tests/Directory.build.props                | 12 ++++++++++++
 MySql.Web/tests/MySql.Web.Tests.csproj               |  6 +++---
 MySql.Web/tests/PersonalizationTests.cs              |  1 +
 MySql.Web/tests/ProfileTests.cs                      |  1 +
 MySql.Web/tests/RoleManagement.cs                    |  1 +
 MySql.Web/tests/SchemaManagerTests.cs                |  1 +
 MySql.Web/tests/SchemaTests.cs                       |  1 +
 MySql.Web/tests/SessionTests.cs                      |  1 +
 MySql.Web/tests/SimpleMembership.cs                  |  1 +
 MySql.Web/tests/SiteMapTests.cs                      |  1 +
 MySql.Web/tests/UserManagement.cs                    |  1 +
 MySql.Web/tests/WebTestBase.cs                       |  1 +
 138 files changed, 180 insertions(+), 21 deletions(-)
 create mode 100644 EFCore/tests/Directory.build.props
 create mode 100644 MySQL.Data/tests/Directory.build.props
 create mode 100644 MySql.Web/tests/Directory.build.props

diff --git a/CHANGES b/CHANGES
index c0021045c..d29099ec1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
 9.0.0
-
+- Updated NUnit to 4.x (WL16279)
 
 8.4.0
 - Updated FOSS license text in all source files (WL16197).
diff --git a/EFCore/tests/Directory.build.props b/EFCore/tests/Directory.build.props
new file mode 100644
index 000000000..03b886514
--- /dev/null
+++ b/EFCore/tests/Directory.build.props
@@ -0,0 +1,12 @@
+<Project>
+ <PropertyGroup>
+   <Deterministic>true</Deterministic>
+ </PropertyGroup>
+<ItemGroup>
+  <Using Include="NUnit.Framework.Legacy.ClassicAssert" Alias="Assert" />
+  <Using Include="NUnit.Framework.Legacy.CollectionAssert" Alias="CollectionAssert" />
+  <Using Include="NUnit.Framework.Legacy.StringAssert" Alias="StringAssert" />
+  <Using Include="NUnit.Framework.Legacy.DirectoryAssert" Alias="DirectoryAssert" />
+  <Using Include="NUnit.Framework.Legacy.FileAssert" Alias="FileAssert" />
+</ItemGroup></Project>
+
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs
index 5888e6e48..69bdcc775 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs
@@ -30,6 +30,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using MySql.EntityFrameworkCore.Infrastructure.Internal;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Linq;
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs
index 7591baea0..4a2572b8a 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs
@@ -31,6 +31,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.DbContextClasses;
 using MySql.EntityFrameworkCore.Extensions;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Linq;
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
index 1e88d0e76..08673d39a 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
@@ -40,6 +40,7 @@
 using MySql.EntityFrameworkCore.Internal;
 using MySql.EntityFrameworkCore.Storage.Internal;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Diagnostics;
 
 namespace MySql.EntityFrameworkCore.Basic.Tests
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs
index 8cf95c170..a542c2e30 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs
@@ -30,6 +30,7 @@
 using MySql.Data.MySqlClient;
 using MySql.EntityFrameworkCore.Basic.Tests.DbContextClasses;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs
index c24d54de8..1085dba0f 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs
@@ -30,6 +30,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.DbContextClasses;
 using MySql.EntityFrameworkCore.Extensions;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Linq;
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
index c105145cd..fd84eb897 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
@@ -31,6 +31,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.DbContextClasses;
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Linq;
 using System.Transactions;
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs
index 16851d3fc..c34dd7f03 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs
@@ -33,6 +33,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using MySql.EntityFrameworkCore.Extensions;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Linq;
 using System.Text.RegularExpressions;
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/FunctionalTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/FunctionalTests.cs
index 1c7a6336a..6c0d235c2 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/FunctionalTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/FunctionalTests.cs
@@ -34,6 +34,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using MySql.EntityFrameworkCore.Extensions;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Linq;
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs
index 955c5432b..cec6177a3 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs
@@ -31,6 +31,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.DbContextClasses;
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Linq;
 
 namespace MySql.EntityFrameworkCore.Basic.Tests
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ModelingTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ModelingTests.cs
index 6424d0277..cf1746d64 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ModelingTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ModelingTests.cs
@@ -30,6 +30,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.DbContextClasses;
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MultiSchemaTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/MultiSchemaTests.cs
index 503c32699..c40e6a61f 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MultiSchemaTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MultiSchemaTests.cs
@@ -31,6 +31,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.DbContextClasses;
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLDatabaseFacadeTest.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLDatabaseFacadeTest.cs
index 72cfe80e9..6fb864f2b 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLDatabaseFacadeTest.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLDatabaseFacadeTest.cs
@@ -34,6 +34,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using MySql.EntityFrameworkCore.Extensions;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 
 namespace MySql.EntityFrameworkCore.Basic.Tests
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
index adf585fd0..b4aedf779 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
@@ -31,6 +31,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.DbContextClasses;
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index cbfe194b8..4df134a7a 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -26,9 +26,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ShadowPropertiesTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ShadowPropertiesTests.cs
index acfe975f5..bd957825b 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ShadowPropertiesTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ShadowPropertiesTests.cs
@@ -32,6 +32,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.DbContextClasses;
 using MySql.EntityFrameworkCore.Extensions;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.Linq;
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/EntityTestsFixtureClass.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/EntityTestsFixtureClass.cs
index 670bc5778..4da09804f 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/EntityTestsFixtureClass.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/EntityTestsFixtureClass.cs
@@ -30,6 +30,7 @@
 using MySql.Data.MySqlClient;
 using MySql.EntityFrameworkCore.Basic.Tests.DbContextClasses;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Diagnostics;
 using System.Text;
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLAnnotationCodeGeneratorTest.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLAnnotationCodeGeneratorTest.cs
index b913c72ac..61ff8b711 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLAnnotationCodeGeneratorTest.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLAnnotationCodeGeneratorTest.cs
@@ -36,6 +36,7 @@
 using MySql.EntityFrameworkCore.Metadata.Internal;
 using MySql.EntityFrameworkCore.Storage.Internal;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Linq;
 
 namespace MySql.EntityFrameworkCore.Design.Tests
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLCodeGeneratorTest.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLCodeGeneratorTest.cs
index c0b65a21a..c1549b537 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLCodeGeneratorTest.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLCodeGeneratorTest.cs
@@ -32,6 +32,7 @@
 using MySql.EntityFrameworkCore.Infrastructure;
 using MySql.EntityFrameworkCore.Scaffolding.Internal;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Linq;
 using System.Reflection;
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs
index b416915a6..d264c8c4d 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs
@@ -35,6 +35,7 @@
 using MySql.EntityFrameworkCore.Diagnostics.Internal;
 using MySql.EntityFrameworkCore.Scaffolding.Internal;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDesignTimeProviderServicesTest.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDesignTimeProviderServicesTest.cs
index 3a37ccf82..ca39de4c1 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDesignTimeProviderServicesTest.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDesignTimeProviderServicesTest.cs
@@ -30,6 +30,7 @@
 using MySql.EntityFrameworkCore.Design.Internal;
 using MySql.EntityFrameworkCore.Storage.Internal;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Reflection;
 
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index 86eaa62e7..e95a51ffc 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -25,9 +25,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLHistoryRepositoryTests.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLHistoryRepositoryTests.cs
index 35a1611d5..70085710b 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLHistoryRepositoryTests.cs
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLHistoryRepositoryTests.cs
@@ -34,6 +34,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using MySql.EntityFrameworkCore.Extensions;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.EntityFrameworkCore.Migrations.Tests
 {
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs
index 30e97a470..a91f32c00 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs
@@ -32,6 +32,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.EntityFrameworkCore.Migrations.Tests
 {
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
index fd2e0ef96..e82a9bb8c 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
@@ -14,9 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTest.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTest.cs
index f36545f30..bcb5c3ee2 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTest.cs
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTest.cs
@@ -33,6 +33,7 @@
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using MySql.EntityFrameworkCore.Extensions;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.EntityFrameworkCore.Migrations.Tests
 {
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTestBase.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTestBase.cs
index 8e15deaad..e597dfcee 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTestBase.cs
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTestBase.cs
@@ -33,6 +33,7 @@
 using MySql.EntityFrameworkCore.Metadata.Internal;
 using MySql.EntityFrameworkCore.Migrations.Tests.Utilities;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Linq;
 
diff --git a/MySQL.Data/tests/Directory.build.props b/MySQL.Data/tests/Directory.build.props
new file mode 100644
index 000000000..03b886514
--- /dev/null
+++ b/MySQL.Data/tests/Directory.build.props
@@ -0,0 +1,12 @@
+<Project>
+ <PropertyGroup>
+   <Deterministic>true</Deterministic>
+ </PropertyGroup>
+<ItemGroup>
+  <Using Include="NUnit.Framework.Legacy.ClassicAssert" Alias="Assert" />
+  <Using Include="NUnit.Framework.Legacy.CollectionAssert" Alias="CollectionAssert" />
+  <Using Include="NUnit.Framework.Legacy.StringAssert" Alias="StringAssert" />
+  <Using Include="NUnit.Framework.Legacy.DirectoryAssert" Alias="DirectoryAssert" />
+  <Using Include="NUnit.Framework.Legacy.FileAssert" Alias="FileAssert" />
+</ItemGroup></Project>
+
diff --git a/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs
index 269a21b5f..e52a7279b 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 
 namespace MySql.Data.MySqlClient.Tests
diff --git a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
index 115ed476c..5c7cfdcf6 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
@@ -30,6 +30,7 @@
 using MySql.Data.Common;
 using MySql.Data.MySqlClient.Authentication;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Data;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs b/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs
index a49c7bb41..14f7e05be 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs
@@ -29,6 +29,7 @@
 using System;
 using System.Data;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.Data.MySqlClient.Tests
 {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/BlobTestsCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/BlobTestsCompressed.cs
index 2dc442e06..fcb85a1f4 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/BlobTestsCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/BlobTestsCompressed.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.Data.MySqlClient.Tests
 {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs b/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs
index 2e461ab60..e527c3e01 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs
@@ -28,6 +28,7 @@
 
 using MySql.Data.Common;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs b/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs
index 53878b95c..4760e06d7 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs
@@ -28,6 +28,7 @@
 
 using MySql.Data.Common;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.Text;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
index ca9ec8aad..cfd078190 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
@@ -28,6 +28,7 @@
 
 using MySql.Data.Failover;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
index 8cc409197..c2454add3 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.Diagnostics;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CmdTestsCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/CmdTestsCompressed.cs
index e259383f9..d18aecbcb 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CmdTestsCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CmdTestsCompressed.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.Data.MySqlClient.Tests
 {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
index e6e01b814..3d50fa738 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
@@ -28,6 +28,7 @@
 
 using MySql.Data.Common;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Data;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
index 40d791b4c..2e7f989fa 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
@@ -28,6 +28,7 @@
 
 using MySql.Data.Common;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Data;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
index 8d8ab43a0..4f2c02e76 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
@@ -28,6 +28,7 @@
 
 using MySql.Data.Types;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.Text;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs
index 398f4c58a..8ccb87cf9 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs
@@ -28,6 +28,7 @@
 
 using MySql.Data.Types;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Globalization;
 using System.Text;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs b/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs
index b51b16dd9..59a074e65 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs
@@ -29,6 +29,7 @@
 using MySql.Data.Common;
 using MySql.Data.Common.DnsClient;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/EventTests.cs b/MySQL.Data/tests/MySql.Data.Tests/EventTests.cs
index 836c62f65..78d6e0df9 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/EventTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/EventTests.cs
@@ -28,6 +28,7 @@
 
 using System.Data;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.Data.MySqlClient.Tests
 {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs
index f5d43f9da..51ecf2d76 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.Reflection;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CultureTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CultureTests.cs
index ccb2a1f4b..52f2c24ed 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CultureTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CultureTests.cs
@@ -28,6 +28,7 @@
 
 using System;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Threading;
 using System.Globalization;
 using System.Data;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DataTypeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DataTypeTests.cs
index 4ae5238ef..dedd778f2 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DataTypeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DataTypeTests.cs
@@ -28,6 +28,7 @@
 
 using System;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Data;
 using System.Data.Common;
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DateTimeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DateTimeTests.cs
index ba43bb143..07be3e8a5 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DateTimeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DateTimeTests.cs
@@ -28,6 +28,7 @@
 
 using System;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using MySql.Data.Types;
 using System.Data;
 using System.Globalization;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
index 628c199a5..71214f36b 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
@@ -28,6 +28,7 @@
 
 using MySql.Data.Common;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.Linq;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
index a2bdd79c3..bdeff2071 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
@@ -28,6 +28,7 @@
 
 using System;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Data;
 using System.Threading.Tasks;
 using System.Threading;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlCommandBuilderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlCommandBuilderTests.cs
index 309184a2e..542c70aa8 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlCommandBuilderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlCommandBuilderTests.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
index 2c8651fd9..27effd8f6 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.Data.Common;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataReaderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataReaderTests.cs
index 12e0315d1..542ea6f54 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataReaderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataReaderTests.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Data;
 
 namespace MySql.Data.MySqlClient.Tests
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/NETCore20Tests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/NETCore20Tests.cs
index b37707e76..2d984200c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/NETCore20Tests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/NETCore20Tests.cs
@@ -29,6 +29,7 @@
 using System;
 using System.Data;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.Data.MySqlClient.Tests
 {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PerfMonTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PerfMonTests.cs
index 0e69f2da6..cdb6c0230 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PerfMonTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PerfMonTests.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.Data.MySqlClient.Tests
 {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ProcedureParameterTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ProcedureParameterTests.cs
index 0b4894594..c84deb683 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ProcedureParameterTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ProcedureParameterTests.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ReplicationTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ReplicationTests.cs
index c25ee2aca..7f9f37d80 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ReplicationTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ReplicationTests.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.Data.MySqlClient.Tests
 {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs
index 2c297992b..865d0c484 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs
@@ -28,6 +28,7 @@
 
 using System;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Threading;
 using System.Collections;
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
index 48a894fc5..be448303a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
@@ -28,6 +28,7 @@
 
 using System;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Threading;
 using System.Data;
 using System.Globalization;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs
index b2271bed1..b64e74f6f 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using MySql.Data.Types;
 using System.IO;
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs
index 06cf54f96..5ac06fdc8 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Diagnostics;
 using System;
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs
index 7fe068944..f5b437ce5 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs
@@ -29,6 +29,7 @@
 using System;
 using System.Text;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Diagnostics;
 
 namespace MySql.Data.MySqlClient.Tests
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index ab9a2c1ee..0de26db87 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -60,10 +60,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
-    <PackageReference Include="NunitXml.TestLogger" Version="3.0.107" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NunitXml.TestLogger" Version="3.1.20" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs
index 5e0c8bb56..869f11e03 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.IO;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySqlDataReaderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/MySqlDataReaderTests.cs
index 530c91c6e..9ebad9a27 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySqlDataReaderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySqlDataReaderTests.cs
@@ -28,6 +28,7 @@
 
 using MySql.Data.Common;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.Data.SqlTypes;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/OutputParametersBatch.cs b/MySQL.Data/tests/MySql.Data.Tests/OutputParametersBatch.cs
index 82a1997b9..2f1ddbbee 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/OutputParametersBatch.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/OutputParametersBatch.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs
index 75229f3fc..41448db0a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.Diagnostics;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
index 910f73016..5ad5212e1 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
@@ -28,6 +28,7 @@
 
 using MySql.Data.Common;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Data;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs b/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs
index c7370fbad..9c0e94a3f 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.Linq;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs b/MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs
index 585edd440..b6d5b6f42 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs
@@ -30,6 +30,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.Data.MySqlClient.Tests
 {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs b/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs
index 01254868e..bea676d27 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs
@@ -28,6 +28,7 @@
 
 using System;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Data;
 using System.Reflection;
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs b/MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs
index e81985b5d..c3129f6bd 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.Data.MySqlClient.Tests
 {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
index f91031fa1..5dce64220 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
@@ -29,6 +29,7 @@
 using MySql.Data.Common;
 using MySqlX.XDevAPI;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Data;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs b/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs
index ab47cc78b..1a053144b 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.Data.Common;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/StoredProcedureWithAccess.cs b/MySQL.Data/tests/MySql.Data.Tests/StoredProcedureWithAccess.cs
index ba50c3390..e0d2b4fa2 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/StoredProcedureWithAccess.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/StoredProcedureWithAccess.cs
@@ -30,6 +30,7 @@
 using System.Collections.Generic;
 using System.Text;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Data;
 using System.Globalization;
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs b/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs
index 6e65b4852..66a4334ff 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs
@@ -29,6 +29,7 @@
 using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.Data.MySqlClient.Tests
 {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs b/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs
index 5a59e9bba..23b31e307 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.IO;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs b/MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs
index 253a68a9a..15a090262 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs b/MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs
index 32bebd7b8..68eefe76b 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Data;
 using System.Threading;
 using System.Diagnostics;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs b/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs
index 35e44a965..ecd20ef18 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs
@@ -28,6 +28,7 @@
 
 using MySql.Data.Common;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.Diagnostics;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs b/MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs
index 54cf1dc71..a8a0b83f5 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs
@@ -28,6 +28,7 @@
 
 using System;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySql.Data.MySqlClient.Tests
 {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs b/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
index 7f79e875a..665f677ed 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.Data.Common;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs b/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs
index ce5b4ff3d..ce79a457a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs
@@ -28,6 +28,7 @@
 
 using MySql.Data.Common;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
index ac30710f4..cec0bfdd2 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
@@ -32,6 +32,7 @@
 using MySqlX.XDevAPI.CRUD;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 using System.IO;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
index 6c0f85bb9..6bb3b881b 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
@@ -32,6 +32,7 @@
 using MySqlX.XDevAPI.Common;
 using MySqlX.XDevAPI.CRUD;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 
 namespace MySqlX.Data.Tests
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BasicSelectTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BasicSelectTests.cs
index 4f5c64bf3..0037b7cb0 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BasicSelectTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BasicSelectTests.cs
@@ -31,6 +31,7 @@
 using MySqlX.XDevAPI.Relational;
 using System;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySqlX.Data.Tests
 {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
index a32cf7065..d0d1090cf 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
@@ -31,6 +31,7 @@
 using MySqlX.XDevAPI;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
index f6f525b95..1a8ac5077 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
@@ -31,6 +31,7 @@
 using MySql.Data.MySqlClient;
 using MySqlX.XDevAPI;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
index 522035522..3b981419d 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
@@ -33,6 +33,7 @@
 using MySqlX.XDevAPI.Common;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs
index e1ccd486f..46afde1da 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs
@@ -30,6 +30,7 @@
 using MySql.Data.MySqlClient;
 using MySqlX.XDevAPI;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Diagnostics;
 using System.Threading;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs
index 3a9d9f8c0..6c9c393df 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs
@@ -30,6 +30,7 @@
 using MySqlX.XDevAPI.Common;
 using MySqlX.XDevAPI.CRUD;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
index 4a2a6f264..df880847c 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
@@ -31,6 +31,7 @@
 using MySqlX.XDevAPI.Common;
 using MySqlX.XDevAPI.CRUD;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
index 80d9f73aa..00d73b3d8 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
@@ -32,6 +32,7 @@
 using MySqlX.XDevAPI.Common;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
index edec20eb6..16a94cfd2 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
@@ -31,6 +31,7 @@
 using MySqlX.Common;
 using MySqlX.XDevAPI;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs
index 7532e8be4..aa5bcd253 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs
@@ -35,6 +35,7 @@
 using MySqlX.XDevAPI.CRUD;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
index b2736ef38..d6dc7081e 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
@@ -29,6 +29,7 @@
 using MySqlX.XDevAPI;
 using MySqlX.XDevAPI.Common;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs
index c44326e07..5b181c9bb 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs
@@ -30,6 +30,7 @@
 using MySqlX.XDevAPI.Common;
 using System;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySqlX.Data.Tests.ResultTests
 {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs
index 43eb2665f..968fb8b8b 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs
@@ -29,6 +29,7 @@
 using MySqlX.XDevAPI;
 using MySqlX.XDevAPI.Common;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySqlX.Data.Tests.CrudTests
 {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
index ba5ed2dd5..b5abd79a6 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
@@ -30,6 +30,7 @@
 using MySqlX.XDevAPI;
 using MySqlX.XDevAPI.Common;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CustomTypeTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CustomTypeTests.cs
index 33c98ecc6..ba9a17c37 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CustomTypeTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CustomTypeTests.cs
@@ -29,6 +29,7 @@
 using MySqlX.XDevAPI;
 using MySqlX.XDevAPI.Common;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs
index 36c5e8902..e2acbd9fa 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs
@@ -29,6 +29,7 @@
 using MySqlX.XDevAPI;
 using System;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySqlX.Data.Tests
 {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs
index ae65cc357..301471910 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs
@@ -29,6 +29,7 @@
 using MySql.Data.MySqlClient;
 using MySqlX.XDevAPI;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 
 namespace MySqlX.Data.Tests
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ExprParserTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ExprParserTests.cs
index a251cc660..89426bba8 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ExprParserTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ExprParserTests.cs
@@ -34,6 +34,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySqlX.Data.Tests
 {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/JsonParserTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/JsonParserTests.cs
index e7a1b9482..e12dee9f7 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/JsonParserTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/JsonParserTests.cs
@@ -31,6 +31,7 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySqlX.Data.Tests
 {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs b/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs
index 6caeeeadd..c0097e85b 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs
@@ -32,6 +32,7 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySqlX.Data.Tests
 {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 76a1d4a15..16fa0020c 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -62,10 +62,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
-    <PackageReference Include="NunitXml.TestLogger" Version="3.0.107" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NunitXml.TestLogger" Version="3.1.20" />
     <EmbeddedResource Include="Properties\CreateUsers.sql" />
   </ItemGroup>
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
index 4da250cef..e2af9b591 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
@@ -33,6 +33,7 @@
 using MySqlX.XDevAPI.CRUD;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ColumnMetadataTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ColumnMetadataTests.cs
index 5efb99a58..fa37af35e 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ColumnMetadataTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ColumnMetadataTests.cs
@@ -30,6 +30,7 @@
 using MySql.Data.MySqlClient.X.XDevAPI.Common;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySqlX.Data.Tests.RelationalTests
 {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DataTypeTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DataTypeTests.cs
index 62245811d..4e76036a7 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DataTypeTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DataTypeTests.cs
@@ -30,6 +30,7 @@
 using MySql.Data.MySqlClient.X.XDevAPI.Common;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 
 namespace MySqlX.Data.Tests.RelationalTests
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DateTimeTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DateTimeTests.cs
index 1894b9040..8ae4ee483 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DateTimeTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DateTimeTests.cs
@@ -29,6 +29,7 @@
 using MySql.Data.MySqlClient.X.XDevAPI.Common;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 
 namespace MySqlX.Data.Tests.RelationalTests
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RelationalGCTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RelationalGCTests.cs
index 40dac96ae..34d1aaa12 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RelationalGCTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RelationalGCTests.cs
@@ -29,6 +29,7 @@
 using MySqlX.XDevAPI.Relational;
 using System;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySqlX.Data.Tests.ResultTests
 {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RowBufferingTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RowBufferingTests.cs
index 0f4e02f1e..3809bb29b 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RowBufferingTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RowBufferingTests.cs
@@ -28,6 +28,7 @@
 
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySqlX.Data.Tests.RelationalTests
 {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs
index c6bdb2cbd..4ffb01a71 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs
@@ -32,6 +32,7 @@
 using MySqlX.XDevAPI;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Collections.Generic;
 
 namespace MySqlX.Data.Tests.RelationalTests
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableAsyncTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableAsyncTests.cs
index 29cfb61b3..c071fecbb 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableAsyncTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableAsyncTests.cs
@@ -31,6 +31,7 @@
 using MySqlX.XDevAPI.Common;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableDeleteTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableDeleteTests.cs
index 7f0564253..508eefec0 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableDeleteTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableDeleteTests.cs
@@ -30,6 +30,7 @@
 using MySqlX.XDevAPI.Common;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace MySqlX.Data.Tests.RelationalTests
 {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableInsertTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableInsertTests.cs
index 5d1ad8320..d831154fd 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableInsertTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableInsertTests.cs
@@ -29,6 +29,7 @@
 using MySql.Data.MySqlClient;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Linq;
 
 namespace MySqlX.Data.Tests.RelationalTests
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
index f16f24d4c..693435fc1 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
@@ -32,6 +32,7 @@
 using MySqlX.XDevAPI.Common;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Linq;
 using System.Text;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs
index ab9946777..5ea8882b3 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs
@@ -30,6 +30,7 @@
 using MySqlX.XDevAPI.Common;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using MySqlX.XDevAPI;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ViewTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ViewTests.cs
index 859193436..3d046bc76 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ViewTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ViewTests.cs
@@ -29,6 +29,7 @@
 using MySql.Data.MySqlClient;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Collections.Generic;
 using System.Linq;
 using MySqlX.XDevAPI;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs
index 517bcac3e..95e68b92d 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs
@@ -31,6 +31,7 @@
 using MySqlX.XDevAPI.Common;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
index 9d497395e..5d37e3c23 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
@@ -32,6 +32,7 @@
 using MySqlX.XDevAPI;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Data;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
index f410728eb..771f58f95 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
@@ -30,6 +30,7 @@
 using MySql.Data.MySqlClient;
 using MySqlX.XDevAPI;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs
index bcd4d6266..092aa057e 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs
@@ -32,6 +32,7 @@
 using MySqlX.XDevAPI.CRUD;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Linq;
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs
index 89e41fa4e..680642278 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs
@@ -30,6 +30,7 @@
 using MySql.Data.MySqlClient;
 using MySqlX.XDevAPI;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 
 namespace MySqlX.Data.Tests
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs b/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
index fa1dff39e..a5b9d3de9 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
@@ -30,6 +30,7 @@
 using MySql.Data.MySqlClient;
 using MySqlX.XDevAPI;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 
 namespace MySqlX.Data.Tests
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
index bc535e2f0..2df0497af 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
@@ -30,6 +30,7 @@
 using MySql.Data.MySqlClient;
 using MySqlX.XDevAPI;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Data;
 
diff --git a/MySql.Web/tests/Directory.build.props b/MySql.Web/tests/Directory.build.props
new file mode 100644
index 000000000..03b886514
--- /dev/null
+++ b/MySql.Web/tests/Directory.build.props
@@ -0,0 +1,12 @@
+<Project>
+ <PropertyGroup>
+   <Deterministic>true</Deterministic>
+ </PropertyGroup>
+<ItemGroup>
+  <Using Include="NUnit.Framework.Legacy.ClassicAssert" Alias="Assert" />
+  <Using Include="NUnit.Framework.Legacy.CollectionAssert" Alias="CollectionAssert" />
+  <Using Include="NUnit.Framework.Legacy.StringAssert" Alias="StringAssert" />
+  <Using Include="NUnit.Framework.Legacy.DirectoryAssert" Alias="DirectoryAssert" />
+  <Using Include="NUnit.Framework.Legacy.FileAssert" Alias="FileAssert" />
+</ItemGroup></Project>
+
diff --git a/MySql.Web/tests/MySql.Web.Tests.csproj b/MySql.Web/tests/MySql.Web.Tests.csproj
index 6c7042484..4faa9ab0c 100644
--- a/MySql.Web/tests/MySql.Web.Tests.csproj
+++ b/MySql.Web/tests/MySql.Web.Tests.csproj
@@ -23,6 +23,7 @@
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>..\..\ConnectorNetPublicKey.snk</AssemblyOriginatorKeyFile>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -30,9 +31,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
     <ProjectReference Include="..\..\MySQL.Data\src\MySql.Data.csproj" />
     <ProjectReference Include="..\src\MySql.Web.csproj" />
     <Reference Include="System.Web" />
diff --git a/MySql.Web/tests/PersonalizationTests.cs b/MySql.Web/tests/PersonalizationTests.cs
index 3d306323d..23ef47655 100644
--- a/MySql.Web/tests/PersonalizationTests.cs
+++ b/MySql.Web/tests/PersonalizationTests.cs
@@ -29,6 +29,7 @@
 using MySql.Data.MySqlClient;
 using MySql.Web.Personalization;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Specialized;
 using System.Web.UI.WebControls.WebParts;
diff --git a/MySql.Web/tests/ProfileTests.cs b/MySql.Web/tests/ProfileTests.cs
index fa0d2157d..f1ac081ba 100644
--- a/MySql.Web/tests/ProfileTests.cs
+++ b/MySql.Web/tests/ProfileTests.cs
@@ -28,6 +28,7 @@
 
 using MySql.Web.Profile;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Specialized;
 using System.Configuration;
diff --git a/MySql.Web/tests/RoleManagement.cs b/MySql.Web/tests/RoleManagement.cs
index 3990e7634..764b43da1 100644
--- a/MySql.Web/tests/RoleManagement.cs
+++ b/MySql.Web/tests/RoleManagement.cs
@@ -28,6 +28,7 @@
 
 using MySql.Web.Security;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Specialized;
 using System.Web.Security;
diff --git a/MySql.Web/tests/SchemaManagerTests.cs b/MySql.Web/tests/SchemaManagerTests.cs
index 4aedebf96..a8304eb16 100644
--- a/MySql.Web/tests/SchemaManagerTests.cs
+++ b/MySql.Web/tests/SchemaManagerTests.cs
@@ -30,6 +30,7 @@
 using MySql.Web.Common;
 using MySql.Web.Security;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Specialized;
 using System.Configuration.Provider;
diff --git a/MySql.Web/tests/SchemaTests.cs b/MySql.Web/tests/SchemaTests.cs
index 5ff9c8f65..71f8bf050 100644
--- a/MySql.Web/tests/SchemaTests.cs
+++ b/MySql.Web/tests/SchemaTests.cs
@@ -30,6 +30,7 @@
 using MySql.Web.Common;
 using MySql.Web.Security;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System.Collections.Specialized;
 using System.Configuration.Provider;
 using System.Data;
diff --git a/MySql.Web/tests/SessionTests.cs b/MySql.Web/tests/SessionTests.cs
index efdf692cc..51418899c 100644
--- a/MySql.Web/tests/SessionTests.cs
+++ b/MySql.Web/tests/SessionTests.cs
@@ -29,6 +29,7 @@
 using MySql.Data.MySqlClient;
 using MySql.Web.SessionState;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Specialized;
 using System.Configuration;
diff --git a/MySql.Web/tests/SimpleMembership.cs b/MySql.Web/tests/SimpleMembership.cs
index 12e785d3e..d76ba9cfe 100644
--- a/MySql.Web/tests/SimpleMembership.cs
+++ b/MySql.Web/tests/SimpleMembership.cs
@@ -29,6 +29,7 @@
 using MySql.Data.MySqlClient;
 using MySql.Web.Security;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Specialized;
 using System.Web.Security;
diff --git a/MySql.Web/tests/SiteMapTests.cs b/MySql.Web/tests/SiteMapTests.cs
index c288f9458..1e66800c6 100644
--- a/MySql.Web/tests/SiteMapTests.cs
+++ b/MySql.Web/tests/SiteMapTests.cs
@@ -29,6 +29,7 @@
 using MySql.Data.MySqlClient;
 using MySql.Web.SiteMap;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Specialized;
 using System.IO;
diff --git a/MySql.Web/tests/UserManagement.cs b/MySql.Web/tests/UserManagement.cs
index 5bbffb3f9..0c312bbbf 100644
--- a/MySql.Web/tests/UserManagement.cs
+++ b/MySql.Web/tests/UserManagement.cs
@@ -29,6 +29,7 @@
 using MySql.Data.MySqlClient;
 using MySql.Web.Security;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Specialized;
 using System.Configuration.Provider;
diff --git a/MySql.Web/tests/WebTestBase.cs b/MySql.Web/tests/WebTestBase.cs
index 8e3153569..9b8d09355 100644
--- a/MySql.Web/tests/WebTestBase.cs
+++ b/MySql.Web/tests/WebTestBase.cs
@@ -31,6 +31,7 @@
 using MySql.Web.Common;
 using MySql.Web.Security;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
 using System.Configuration;
 using System.Data;

From dd51a525b6c097cdf81ede81ba176d7177c97d4e Mon Sep 17 00:00:00 2001
From: Reggie Burnett <reggie.burnett@oracle.com>
Date: Thu, 14 Mar 2024 11:44:26 -0500
Subject: [PATCH 03/99] WL#16280 [Remove OldGetStringBehavior workaround]

Change-Id: Id33222f0e00411a98575a7fff0a556fd29bed9b1
---
 CHANGES                                       |  3 +-
 .../src/MySqlConnectionStringBuilder.cs       | 14 --------
 MySQL.Data/src/MySqlDataReader.cs             | 12 +------
 .../tests/MySql.Data.Tests/DataTypeTests.cs   | 32 -------------------
 4 files changed, 3 insertions(+), 58 deletions(-)

diff --git a/CHANGES b/CHANGES
index d29099ec1..9f75566a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 9.0.0
 - Updated NUnit to 4.x (WL16279)
-
+- Removed deprecated OldGetStringBehavior option (WL16280)
+ 
 8.4.0
 - Updated FOSS license text in all source files (WL16197).
 - Fixed bug Shared memory connection doesn't work in multithread environment (Oracle Bug #36208932).
diff --git a/MySQL.Data/src/MySqlConnectionStringBuilder.cs b/MySQL.Data/src/MySqlConnectionStringBuilder.cs
index 200615948..0a5d60e11 100644
--- a/MySQL.Data/src/MySqlConnectionStringBuilder.cs
+++ b/MySQL.Data/src/MySqlConnectionStringBuilder.cs
@@ -241,9 +241,6 @@ static MySqlConnectionStringBuilder()
         (msb, sender, value) => { msb.SetValue("blobasutf8excludepattern", value); }, (msb, sender) => msb.BlobAsUTF8ExcludePattern));
 
       #endregion
-
-      Options.Add(new MySqlConnectionStringOption("oldgetstringbehavior", null, typeof(bool), false, true,
-        (msb, sender, value) => { msb.SetValue("oldgetstringbehavior", value); }, (msb, sender) => msb.OldGetStringBehavior));
     }
 
     /// <summary>
@@ -1012,17 +1009,6 @@ public bool UseDefaultCommandTimeoutForEF
     }
     #endregion
 
-    [DisplayName("Use the old GetString behavior for readers")]
-    [Category("Backwards Compatibility")]
-    [Description("When true, MySqlDataReader.GetString will return a string version of every possible data type")]
-    [DefaultValue(false)]
-    [Obsolete("This property is only used to provide old behavior.  This option and the old behavior will be removed in 9.0")]
-    public bool OldGetStringBehavior
-    {
-      get { return (bool)values["oldgetstringbehavior"]; }
-      set { SetValue("oldgetstringbehavior", value); }
-    }
-
     /// <summary>
     /// Gets or sets a connection option.
     /// </summary>
diff --git a/MySQL.Data/src/MySqlDataReader.cs b/MySQL.Data/src/MySqlDataReader.cs
index b878c56d8..32a441b48 100644
--- a/MySQL.Data/src/MySqlDataReader.cs
+++ b/MySQL.Data/src/MySqlDataReader.cs
@@ -919,17 +919,7 @@ public override String GetString(int i)
     {
       IMySqlValue val = GetFieldValue(i, true);
 
-      if (!_connection.Settings.OldGetStringBehavior)
-        return (string)val.Value;
-        
-        
-      if (val is MySqlBinary)
-      {
-        byte[] v = ((MySqlBinary)val).Value;
-        return ResultSet.Fields[i].Encoding.GetString(v, 0, v.Length);
-      }
-
-      return val.Value.ToString();
+      return (string)val.Value;
     }
 
     /// <summary>
diff --git a/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
index 4f2c02e76..25b9e198c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
@@ -1661,38 +1661,6 @@ public void GetIntForTinyInt(bool treatAsBool, bool isPrepared)
       Assert.AreEqual(treatAsBool ? 1 : -2, reader.GetFieldValue<long>(0));
     }
 
-    [Test]
-    public void OldGetStringBehaviorOff()
-    {
-      ExecuteSQL(@"CREATE TABLE Test (value1 int, value2 DATETIME); INSERT INTO Test VALUES (1, '2023-10-30');");
-
-      using var cmd = new MySqlCommand();
-      cmd.Connection = Connection;
-      cmd.CommandText = "SELECT * FROM Test";
-      using var reader = cmd.ExecuteReader();
-      reader.Read();
-      Assert.Throws<InvalidCastException>(() => reader.GetString(0));
-      Assert.Throws<InvalidCastException>(() => reader.GetString(1));
-   }
-
-    [Test]
-    public void OldGetStringBehaviorOn()
-    {
-      ExecuteSQL(@"CREATE TABLE Test (value1 int, value2 DECIMAL(10,2)); INSERT INTO Test VALUES (1, 20.4);");
-      
-      string connString = Connection.ConnectionString + $";oldgetstringbehavior=true;";
-      using var conn = new MySqlConnection(connString);
-      conn.Open();
-
-      using var cmd = new MySqlCommand();
-      cmd.Connection = conn;
-      cmd.CommandText = "SELECT * FROM Test";
-      using var reader = cmd.ExecuteReader();
-      reader.Read();
-      Assert.AreEqual("1", reader.GetString(0));
-      Assert.AreEqual("20.40", reader.GetString(1));
-   }
-
     [Test]
     public void BadVectorDataThrowsException()
     {

From fd5b1f44b3641fdeef08fab240ac946896552739 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 1 May 2024 18:30:45 -0600
Subject: [PATCH 04/99] WL#16279 [Migrate to NUnit 4.x] - Added NUnit test
 adapter package

Change-Id: I72b0eb5b4982e1f0e4c7c98264865d3e57d1bebe
---
 .../MySql.EntityFrameworkCore.Basic.Tests.csproj                 | 1 +
 .../MySql.EntityFrameworkCore.Design.Tests.csproj                | 1 +
 .../MySql.EntityFrameworkCore.Migrations.Tests.csproj            | 1 +
 MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj        | 1 +
 MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj      | 1 +
 MySql.Web/tests/MySql.Web.Tests.csproj                           | 1 +
 6 files changed, 6 insertions(+)

diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index 4df134a7a..ad5d720ab 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -28,6 +28,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index e95a51ffc..e46a6a2bc 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -27,6 +27,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
index e82a9bb8c..fcf790362 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
@@ -16,6 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index 0de26db87..7fc50c885 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -62,6 +62,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="NunitXml.TestLogger" Version="3.1.20" />
   </ItemGroup>
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 16fa0020c..16e8ca52c 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -64,6 +64,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="NunitXml.TestLogger" Version="3.1.20" />
     <EmbeddedResource Include="Properties\CreateUsers.sql" />
   </ItemGroup>
diff --git a/MySql.Web/tests/MySql.Web.Tests.csproj b/MySql.Web/tests/MySql.Web.Tests.csproj
index 4faa9ab0c..4459f0cf9 100644
--- a/MySql.Web/tests/MySql.Web.Tests.csproj
+++ b/MySql.Web/tests/MySql.Web.Tests.csproj
@@ -33,6 +33,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <ProjectReference Include="..\..\MySQL.Data\src\MySql.Data.csproj" />
     <ProjectReference Include="..\src\MySql.Web.csproj" />
     <Reference Include="System.Web" />

From 864af89eaebd2f460ac6c941a836275dd9529090 Mon Sep 17 00:00:00 2001
From: Reggie Burnett <reggie.burnett@oracle.com>
Date: Wed, 15 May 2024 15:24:43 -0500
Subject: [PATCH 05/99] WL#16387 [Remove MySqlX.Data.Performance.Console.Tests
 project]

Change-Id: I91018c2cc333e8055009cd8d4dcae5077b9e1819
---
 CHANGES                                       |   1 +
 MySQL.Data/MySql.Data.sln                     |   2 -
 .../App.config                                |   6 -
 .../InstrumentationSession.psess              | 122 -------------
 ...SqlX.Data.Performance.Console.Tests.csproj |  88 ----------
 .../Program.cs                                | 165 ------------------
 .../Properties/AssemblyInfo.cs                |  23 ---
 7 files changed, 1 insertion(+), 406 deletions(-)
 delete mode 100644 MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/App.config
 delete mode 100644 MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/InstrumentationSession.psess
 delete mode 100644 MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/MySqlX.Data.Performance.Console.Tests.csproj
 delete mode 100644 MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/Program.cs
 delete mode 100644 MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/Properties/AssemblyInfo.cs

diff --git a/CHANGES b/CHANGES
index 9f75566a0..1f8e5f379 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 9.0.0
 - Updated NUnit to 4.x (WL16279)
 - Removed deprecated OldGetStringBehavior option (WL16280)
+- Remove MySqlX.Data.Performance.Console.Tests project (WL16387)
  
 8.4.0
 - Updated FOSS license text in all source files (WL16197).
diff --git a/MySQL.Data/MySql.Data.sln b/MySQL.Data/MySql.Data.sln
index 5bd527a5a..3d178e566 100644
--- a/MySQL.Data/MySql.Data.sln
+++ b/MySQL.Data/MySql.Data.sln
@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MySqlX.Data.Tests", "tests\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MySql.Data.Tests", "tests\MySql.Data.Tests\MySql.Data.Tests.csproj", "{951A6C18-E97C-4F6A-A52C-B6FC4DECABAE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySqlX.Data.Performance.Console.Tests", "tests\MySqlX.Data.Performance.Console.Tests\MySqlX.Data.Performance.Console.Tests.csproj", "{9D5EDC76-5A1C-46C9-A4F2-CF57F276E537}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/App.config b/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/App.config
deleted file mode 100644
index 4bfa00561..000000000
--- a/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
-    </startup>
-</configuration>
diff --git a/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/InstrumentationSession.psess b/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/InstrumentationSession.psess
deleted file mode 100644
index 2937c6df6..000000000
--- a/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/InstrumentationSession.psess
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VSPerformanceSession Version="1.00">
-  <Options>
-    <Solution>..\..\MySql.Data.sln</Solution>
-    <CollectionMethod>Instrumentation</CollectionMethod>
-    <AllocationMethod>None</AllocationMethod>
-    <Reportname>Reports\InstrumentationReport.vsp</Reportname>
-    <AddReport>true</AddReport>
-    <ResourceBasedAnalysisSelected>true</ResourceBasedAnalysisSelected>
-    <UniqueReport>Timestamp</UniqueReport>
-    <SamplingMethod>Cycles</SamplingMethod>
-    <CycleCount>10000000</CycleCount>
-    <PageFaultCount>10</PageFaultCount>
-    <SysCallCount>10</SysCallCount>
-    <SamplingCounter Name="" ReloadValue="00000000000f4240" DisplayName="" />
-    <RelocateBinaries>false</RelocateBinaries>
-    <AdditionalArgruments>/include:MySqlX.Data.Tests.BaseTest::*;MySqlX.Data.Tests.BasicFindTests::*;MySqlX.Data.Tests.BasicSelectTests::*;MySqlX.Data.Tests.CharsetAndCollationTests::*;MySqlX.Data.Tests.CollectionIndexTests::*;MySqlX.Data.Tests.CollectionTests::*;MySqlX.Data.Tests.CollectionAsyncTests::*;MySqlX.Data.Tests.CrudInsertTests::*;MySqlX.Data.Tests.CrudRemoveTests::*;MySqlX.Data.Tests.CrudUpdateTests::*;MySqlX.Data.Tests.MergePatch::*;MySqlX.Data.Tests.SchemaTests::*;MySqlX.Data.Tests.SessionTests::*;MySqlX.Data.Tests.TransactionTests::*;MySqlX.Data.Tests.ExprParserTests::*;MySqlX.Data.Tests.DbDocTests::*;MySqlX.Data.Tests.JsonParserTests::*;MySqlX.Data.Tests.RelationalTests.ColumnMetadataTests::*;MySqlX.Data.Tests.RelationalTests.DataTypeTests::*;MySqlX.Data.Tests.RelationalTests.RowBufferingTests::*;MySqlX.Data.Tests.RelationalTests.DateTimeTests::*;MySqlX.Data.Tests.RelationalTests.SqlTests::*;MySqlX.Data.Tests.RelationalTests.TableAsyncTests::*;MySqlX.Data.Tests.RelationalTests.TableDeleteTests::*;MySqlX.Data.Tests.RelationalTests.TableInsertTests::*;MySqlX.Data.Tests.RelationalTests.TableSelectTests::*;MySqlX.Data.Tests.RelationalTests.TableUpdateTests::*;MySqlX.Data.Tests.RelationalTests.ViewTests::*;MySqlX.Data.Tests.ResultTests.RelationalGCTests::*;MySqlX.Data.Tests.ResultTests.CrudGCTests::*;MySqlX.Data.Tests.CrudTests.DocBufferingTests::*;MySqlX.Data.Tests.PerformanceTests::*;</AdditionalArgruments>
-    <HardwareCounters EnableHWCounters="false" />
-    <EtwSettings />
-    <PdhSettings>
-      <PdhCountersEnabled>false</PdhCountersEnabled>
-      <PdhCountersRate>500</PdhCountersRate>
-      <PdhCounters>
-        <PdhCounter>\Memory\Pages/sec</PdhCounter>
-        <PdhCounter>\PhysicalDisk(_Total)\Avg. Disk Queue Length</PdhCounter>
-        <PdhCounter>\Processor(_Total)\% Processor Time</PdhCounter>
-      </PdhCounters>
-    </PdhSettings>
-  </Options>
-  <ExcludeSmallFuncs>true</ExcludeSmallFuncs>
-  <InteractionProfilingEnabled>false</InteractionProfilingEnabled>
-  <JScriptProfilingEnabled>false</JScriptProfilingEnabled>
-  <PreinstrumentEvent>
-    <InstrEventExclude>false</InstrEventExclude>
-  </PreinstrumentEvent>
-  <PostinstrumentEvent>
-    <InstrEventExclude>false</InstrEventExclude>
-  </PostinstrumentEvent>
-  <Binaries>
-    <Binary>
-      <Path>bin\Release\MySql.Data.dll</Path>
-      <ArgumentTimestamp>08/17/2018 18:41:24</ArgumentTimestamp>
-      <Instrument>true</Instrument>
-      <Sample>true</Sample>
-      <ExternalWebsite>false</ExternalWebsite>
-      <InteractionProfilingEnabled>false</InteractionProfilingEnabled>
-      <IsLocalJavascript>false</IsLocalJavascript>
-      <IsWindowsStoreApp>false</IsWindowsStoreApp>
-      <IsWWA>false</IsWWA>
-      <LaunchProject>true</LaunchProject>
-      <OverrideProjectSettings>false</OverrideProjectSettings>
-      <LaunchMethod>Executable</LaunchMethod>
-      <NetAppHost>IIS</NetAppHost>
-      <NetBrowser>InternetExplorer</NetBrowser>
-      <ExcludeSmallFuncs>true</ExcludeSmallFuncs>
-      <JScriptProfilingEnabled>false</JScriptProfilingEnabled>
-      <PreinstrumentEvent>
-        <InstrEventExclude>false</InstrEventExclude>
-      </PreinstrumentEvent>
-      <PostinstrumentEvent>
-        <InstrEventExclude>false</InstrEventExclude>
-      </PostinstrumentEvent>
-    </Binary>
-    <Binary>
-      <Path>bin\Release\MySqlX.Data.Performance.Console.Tests.exe</Path>
-      <ArgumentTimestamp>08/17/2018 18:41:24</ArgumentTimestamp>
-      <Instrument>true</Instrument>
-      <Sample>true</Sample>
-      <ExternalWebsite>false</ExternalWebsite>
-      <InteractionProfilingEnabled>false</InteractionProfilingEnabled>
-      <IsLocalJavascript>false</IsLocalJavascript>
-      <IsWindowsStoreApp>false</IsWindowsStoreApp>
-      <IsWWA>false</IsWWA>
-      <LaunchProject>false</LaunchProject>
-      <OverrideProjectSettings>true</OverrideProjectSettings>
-      <LaunchMethod>Executable</LaunchMethod>
-      <ExecutablePath>bin\Release\MySqlX.Data.Performance.Console.Tests.exe</ExecutablePath>
-      <StartupDirectory>
-      </StartupDirectory>
-      <Arguments>2</Arguments>
-      <NetAppHost>IIS</NetAppHost>
-      <NetBrowser>InternetExplorer</NetBrowser>
-      <ExcludeSmallFuncs>true</ExcludeSmallFuncs>
-      <JScriptProfilingEnabled>false</JScriptProfilingEnabled>
-      <PreinstrumentEvent>
-        <InstrEventExclude>false</InstrEventExclude>
-      </PreinstrumentEvent>
-      <PostinstrumentEvent>
-        <InstrEventExclude>false</InstrEventExclude>
-      </PostinstrumentEvent>
-    </Binary>
-    <Binary>
-      <Path>bin\Release\MySqlX.Data.Tests.dll</Path>
-      <ArgumentTimestamp>08/17/2018 18:41:24</ArgumentTimestamp>
-      <Instrument>true</Instrument>
-      <Sample>true</Sample>
-      <ExternalWebsite>false</ExternalWebsite>
-      <InteractionProfilingEnabled>false</InteractionProfilingEnabled>
-      <IsLocalJavascript>false</IsLocalJavascript>
-      <IsWindowsStoreApp>false</IsWindowsStoreApp>
-      <IsWWA>false</IsWWA>
-      <LaunchProject>true</LaunchProject>
-      <OverrideProjectSettings>false</OverrideProjectSettings>
-      <LaunchMethod>Executable</LaunchMethod>
-      <NetAppHost>IIS</NetAppHost>
-      <NetBrowser>InternetExplorer</NetBrowser>
-      <ExcludeSmallFuncs>true</ExcludeSmallFuncs>
-      <JScriptProfilingEnabled>false</JScriptProfilingEnabled>
-      <PreinstrumentEvent>
-        <InstrEventExclude>false</InstrEventExclude>
-      </PreinstrumentEvent>
-      <PostinstrumentEvent>
-        <InstrEventExclude>false</InstrEventExclude>
-      </PostinstrumentEvent>
-    </Binary>
-  </Binaries>
-  <Launches>
-    <Binary>
-      <Path>bin\Release\MySqlX.Data.Performance.Console.Tests.exe</Path>
-    </Binary>
-  </Launches>
-</VSPerformanceSession>
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/MySqlX.Data.Performance.Console.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/MySqlX.Data.Performance.Console.Tests.csproj
deleted file mode 100644
index 07faa6cef..000000000
--- a/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/MySqlX.Data.Performance.Console.Tests.csproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{9D5EDC76-5A1C-46C9-A4F2-CF57F276E537}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>MySqlX.Data.Performance.Console.Tests</RootNamespace>
-    <AssemblyName>MySqlX.Data.Performance.Console.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\src\Properties\VersionInfo.cs">
-      <Link>Properties\VersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MySqlX.Data.Tests\MySqlX.Data.Tests.csproj">
-      <Project>{c411c777-fbe2-4f27-bde1-2b69001320bc}</Project>
-      <Name>MySqlX.Data.Tests</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.8 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/Program.cs b/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/Program.cs
deleted file mode 100644
index 74052df56..000000000
--- a/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/Program.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright © 2018, 2024, Oracle and/or its affiliates.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License, version 2.0, as
-// published by the Free Software Foundation.
-//
-// This program is designed to work with certain software (including
-// but not limited to OpenSSL) that is licensed under separate terms, as
-// designated in a particular file or component or in included license
-// documentation. The authors of MySQL hereby grant you an additional
-// permission to link the program and your derivative works with the
-// separately licensed software that they have either included with
-// the program or referenced in the documentation.
-//
-// Without limiting anything contained in the foregoing, this file,
-// which is part of MySQL Connector/NET, is also subject to the
-// Universal FOSS Exception, version 1.0, a copy of which can be found at
-// http://oss.oracle.com/licenses/universal-foss-exception.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License, version 2.0, for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-using System;
-using System.Reflection;
-
-namespace MySqlX.Data.Performance.Console.Tests
-{
-  public class Program
-  {
-    /// <summary>
-    /// Number of times to execute the operation.
-    /// </summary>
-    private const int EXECUTION_COUNT = 1;
-
-    /// <summary>
-    /// Namespaces.
-    /// </summary>
-    private const string X_DEVAPI_TESTS_MAIN_NAMESPACE = "MySqlX.Data.Tests";
-    private const string X_DEVAPI_RELATIONAL_TESTS_NAMESPACE = "MySqlX.Data.Tests.RelationalTests";
-    private const string X_DEVAPI_CRUD_TESTS_NAMESPACE = "MySqlX.Data.Tests.CrudTests";
-    private const string X_DEVAPI_RESULT_TESTS_NAMESPACE = "MySqlX.Data.Tests.ResultTests";
-
-    static void Main(string[] args)
-    {
-      if (args.Length > 0)
-      {
-        switch (args.Length)
-        {
-          case 1:
-            Program.ExecuteCase(Convert.ToInt32(args[0]));
-            break;
-          case 2:
-          case 3:
-            Program.ExecuteCase(1, args);
-            break;
-          default:
-            break;
-        }
-      }
-      else
-      {
-        System.Console.WriteLine("No arguments were found.");
-        Program.ExecuteCase(2);
-      }
-
-      System.Console.WriteLine("Execution completed.");
-      System.Console.ReadKey();
-    }
-
-    static void ExecuteCase(int caseToExecute, string[] args = null)
-    {
-      switch (caseToExecute)
-      {
-        case 0:
-          System.Console.WriteLine("Run tests from the PerformanceTests class.");
-          ExecuteAllClassTests("PerformanceTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          break;
-        case 1:
-          System.Console.WriteLine("Run tests from a specific class.");
-          ExecuteAllClassTests(
-            args[0], args.Length == 3 ?
-              args[1] : X_DEVAPI_TESTS_MAIN_NAMESPACE,
-            args.Length == 2 ?
-              Convert.ToInt32(args[1]) : args.Length == 3 ?
-                Convert.ToInt32(args[2]) : EXECUTION_COUNT);
-          break;
-        case 2:
-          System.Console.WriteLine("Run all unit tests.");
-          ExecuteAllClassTests("BasicFindTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("BasicSelectTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("CharsetAndCollationTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("CollectionIndexTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("CollectionTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("CollectionAsyncTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("CrudInsertTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("CrudRemoveTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("CrudUpdateTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("MergePatch", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("SchemaTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("SessionTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("TransactionTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("ExprParserTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("DbDocTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("JsonParserTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("ColumnMetadataTests", X_DEVAPI_RELATIONAL_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("DataTypeTests", X_DEVAPI_RELATIONAL_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("RowBufferingTests", X_DEVAPI_RELATIONAL_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("DateTimeTests", X_DEVAPI_RELATIONAL_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("SqlTests", X_DEVAPI_RELATIONAL_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("TableAsyncTests", X_DEVAPI_RELATIONAL_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("TableDeleteTests", X_DEVAPI_RELATIONAL_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("TableInsertTests", X_DEVAPI_RELATIONAL_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("TableSelectTests", X_DEVAPI_RELATIONAL_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("TableUpdateTests", X_DEVAPI_RELATIONAL_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("ViewTests", X_DEVAPI_RELATIONAL_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("RelationalGCTests", X_DEVAPI_RESULT_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("CrudGCTests", X_DEVAPI_RESULT_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("DocBufferingTests", X_DEVAPI_CRUD_TESTS_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("PerformanceTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("UnixSocketsTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          ExecuteAllClassTests("ClientSideFailoverTests", X_DEVAPI_TESTS_MAIN_NAMESPACE, EXECUTION_COUNT);
-          break;
-        default:
-          System.Console.WriteLine("Invalid value. Use 0 to execute PerformanceTests tests," +
-            "1 to execute tests from a specific class or 2 to execute all tests.");
-          break;
-      }
-    }
-
-    static void ExecuteAllClassTests(string className, string nameSpace, int executionCount)
-    {
-      System.Console.WriteLine(string.Format("{0} -------------------------- ", className));
-      var type = Type.GetType(string.Format("{0}.{1},{2}", nameSpace, className, X_DEVAPI_TESTS_MAIN_NAMESPACE));
-      var methodInfos = type.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly);
-      foreach (var methodInfo in methodInfos)
-      {
-        int i = 0;
-        try
-        {
-          for (; i < executionCount; i++)
-          {
-            methodInfo.Invoke(Activator.CreateInstance(type), null);
-          }
-          System.Console.WriteLine(string.Format("\t{0} <-- Success({1})", methodInfo.Name, i));
-        }
-        catch (Exception ex)
-        {
-          System.Console.WriteLine(string.Format("\t{0} <-- Not executed({1}): Exception: {2}, Inner exception: {3}",
-            methodInfo.Name,
-            i,
-            ex.Message,
-            ex.InnerException != null ?
-              ex.InnerException.Message :
-              "N/A"));
-        }
-      }
-    }
-  }
-}
diff --git a/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/Properties/AssemblyInfo.cs b/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 32dd847ad..000000000
--- a/MySQL.Data/tests/MySqlX.Data.Performance.Console.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("MySqlX.Data.Performance.Console.Tests")]
-[assembly: AssemblyDescription("Console application to run Performance Profiling tests for MySQL Connector/NET")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Oracle")]
-[assembly: AssemblyProduct("MySqlX.Data.Performance.Console.Tests")]
-[assembly: AssemblyCopyright("Copyright © 2019, 2024, Oracle and/or its affiliates.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("9d5edc76-5a1c-46c9-a4f2-cf57f276e537")]

From 40eba919858df78f4a3d8ca72958e861449aa5fa Mon Sep 17 00:00:00 2001
From: Reggie Burnett <reggie.burnett@oracle.com>
Date: Tue, 14 May 2024 16:28:28 -0500
Subject: [PATCH 06/99] WL#16291 [Update dependencies]

Change-Id: I4070c42b9984d48c9c09359be005935bcfbccb13
---
 CHANGES                                       |  3 ++-
 EFCore/src/MySql.EntityFrameworkCore.csproj   | 16 +++++++-------
 ...Sql.EntityFrameworkCore.Basic.Tests.csproj |  6 ++---
 ...ql.EntityFrameworkCore.Design.Tests.csproj |  2 +-
 MySQL.Data/src/MySql.Data.csproj              | 22 +++++++++----------
 .../MySql.Data.Tests/MySql.Data.Tests.csproj  |  1 -
 .../MySqlX.Data.Tests.csproj                  |  1 -
 MySql.Web/src/MySql.Web.csproj                |  4 ++--
 8 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1f8e5f379..f9df32857 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,8 @@
 - Updated NUnit to 4.x (WL16279)
 - Removed deprecated OldGetStringBehavior option (WL16280)
 - Remove MySqlX.Data.Performance.Console.Tests project (WL16387)
- 
+- Updated third party dependencies (WL16291)
+
 8.4.0
 - Updated FOSS license text in all source files (WL16197).
 - Fixed bug Shared memory connection doesn't work in multithread environment (Oracle Bug #36208932).
diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
index a42ec8b92..6ce2419a7 100644
--- a/EFCore/src/MySql.EntityFrameworkCore.csproj
+++ b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -29,20 +29,20 @@
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
   </PropertyGroup>
-  
+
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.27" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.27" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.30" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.30" />
   </ItemGroup>
-  
+
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.16" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.19" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.19" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index ad5d720ab..6ff70fb78 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -14,15 +14,15 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="6.0.27" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="6.0.30" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="7.0.16" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="7.0.19" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index e46a6a2bc..4e5ba881d 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index cf2092cfc..2d4dc7a03 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -42,21 +42,21 @@
   <ItemGroup>
     <None Include="..\..\Nuget\Readme\MySQL.Data\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
-	
+
   <ItemGroup>
     <EmbeddedResource Include="Properties\ReservedWords.txt" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.2.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.25.1" />
-    <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.5" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.26.1" />
+    <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.8" />
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageReference Include="ZstdSharp.Port" Version="0.7.1" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
-	<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
+    <PackageReference Include="ZstdSharp.Port" Version="0.8.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
+	<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -79,12 +79,12 @@
 
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netstandard2.1' or '$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0' or '$(TargetFramework)'=='net8.0'">
     <Compile Remove="Framework/net462/*" />
-    <PackageReference Include="System.Security.Permissions" Version="4.7.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
+    <PackageReference Include="System.Security.Permissions" Version="8.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-    <PackageReference Include="System.Text.Json" Version="7.0.1" />
+    <PackageReference Include="System.Text.Json" Version="8.0.3" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <Content Include="..\..\Dependencies\MITLibs\comerr64.dll" PackagePath="runtimes\win-x64\native" CopyToOutputDirectory="Always" />
     <Content Include="..\..\Dependencies\MITLibs\gssapi64.dll" PackagePath="runtimes\win-x64\native" CopyToOutputDirectory="Always" />
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index 7fc50c885..e1789b63c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -63,7 +63,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NunitXml.TestLogger" Version="3.1.20" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 16e8ca52c..2bcd44d75 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -65,7 +65,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NunitXml.TestLogger" Version="3.1.20" />
     <EmbeddedResource Include="Properties\CreateUsers.sql" />
   </ItemGroup>
 
diff --git a/MySql.Web/src/MySql.Web.csproj b/MySql.Web/src/MySql.Web.csproj
index 9bf197b3e..c35ac7721 100644
--- a/MySql.Web/src/MySql.Web.csproj
+++ b/MySql.Web/src/MySql.Web.csproj
@@ -53,8 +53,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\MySQL.Data\src\MySql.Data.csproj" />
-    <PackageReference Include="Microsoft.AspNet.WebPages" Version="3.2.7" />
-    <PackageReference Include="Microsoft.AspNet.WebPages.WebData" Version="3.2.7" />
+    <PackageReference Include="Microsoft.AspNet.WebPages" Version="3.3.0" />
+    <PackageReference Include="Microsoft.AspNet.WebPages.WebData" Version="3.3.0" />
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web" />

From 49807f697c0db24b186be7854a378b3232033652 Mon Sep 17 00:00:00 2001
From: Reggie Burnett <reggie.burnett@oracle.com>
Date: Wed, 15 May 2024 14:16:56 -0500
Subject: [PATCH 07/99] WL#16386 [Remove .NET Core 7 and EF Core 7]

Change-Id: Idc2709d5204532587a39cc6e014203120d174d0f
---
 CHANGES                                       |  2 ++
 EFCore/src/MySql.EntityFrameworkCore.csproj   |  9 ++----
 ...Sql.EntityFrameworkCore.Basic.Tests.csproj |  6 +---
 ...ql.EntityFrameworkCore.Design.Tests.csproj |  2 +-
 ...ntityFrameworkCore.Migrations.Tests.csproj |  2 +-
 .../MySql.EntityFramework.Basic.Tests.csproj  | 29 +++++++++----------
 ...Sql.EntityFramework.CodeFirst.Tests.csproj | 27 ++++++++---------
 ...ql.EntityFramework.Migrations.Tests.csproj |  2 +-
 MySQL.Data/src/MySql.Data.csproj              |  8 +++--
 .../MySql.Data.Tests/MySql.Data.Tests.csproj  |  8 +++--
 .../MySqlX.Data.Tests.csproj                  |  6 +++-
 11 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/CHANGES b/CHANGES
index f9df32857..87155fbae 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@
 - Removed deprecated OldGetStringBehavior option (WL16280)
 - Remove MySqlX.Data.Performance.Console.Tests project (WL16387)
 - Updated third party dependencies (WL16291)
+- Remove .NET 7 and EF Core 7 (WL16386)
+
 
 8.4.0
 - Updated FOSS license text in all source files (WL16197).
diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
index 6ce2419a7..d3230975c 100644
--- a/EFCore/src/MySql.EntityFrameworkCore.csproj
+++ b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -10,7 +10,7 @@
     <PackageLicenseExpression>GPL-2.0-only</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <LangVersion>10.0</LangVersion>
-    <TargetFrameworks>net6.0;net7.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFrameworkCore</AssemblyName>
     <PackageId>MySql.EntityFrameworkCore</PackageId>
     <Nullable>enable</Nullable>
@@ -34,12 +34,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.30" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.30" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.19" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.19" />
-  </ItemGroup>
-
+  
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.5" />
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index 6ff70fb78..c29cff6d4 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.EntityFrameworkCore.Basic.Tests Class Library</Description>
-    <TargetFrameworks>net6.0;net7.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFrameworkCore.Basic.Tests</AssemblyName>
     <PackageId>MySql.EntityFrameworkCore.Basic.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -17,10 +17,6 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="6.0.30" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="7.0.19" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.5" />
   </ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index 4e5ba881d..939de4597 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.EntityFrameworkCore.Design.Tests Class Library</Description>
-    <TargetFrameworks>net6.0;net7.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFrameworkCore.Design.Tests</AssemblyName>
     <PackageId>MySql.EntityFrameworkCore.Design.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
index fcf790362..a0c036a21 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.EntityFrameworkCore.Migrations.Tests Class Library</Description>
-    <TargetFrameworks>net6.0;net7.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFrameworkCore.Migrations.Tests</AssemblyName>
     <PackageId>MySql.EntityFrameworkCore.Migrations.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
index 40ab28073..5ca853e1d 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.1;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Basic.Tests</AssemblyName>
     <PackageId>MySql.EntityFramework.Basic.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
@@ -33,21 +33,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EntityFramework" Version="6.4.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
-  </ItemGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NET452;</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DefineConstants>TRACE;RELEASE;NET452;</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)'=='net462'">
     <Reference Include="System.Data" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -58,8 +43,20 @@
     <Reference Include="System.Runtime" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="EntityFramework" Version="6.4.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NET462;</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;RELEASE;NET462;</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
index 8466175cc..cef87a71c 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.1;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.CodeFirst.Tests</AssemblyName>
     <PackageId>MySql.EntityFramework.CodeFirst.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
@@ -48,6 +48,17 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="System.Data" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.2" />
@@ -62,20 +73,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net462'">
-    <Reference Include="System.Data" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\SQLSyntax.Designer.cs">
       <DesignTime>True</DesignTime>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
index a45dcd0d6..a21af629e 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.1;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Migrations.Tests</AssemblyName>
     <PackageId>MySql.EntityFramework.Migrations.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index 2d4dc7a03..8d18d61c7 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -8,7 +8,7 @@
     <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
     <AssemblyName>MySql.Data</AssemblyName>
-    <TargetFrameworks>net462;net48;netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0;</TargetFrameworks>
     <PackageId>MySql.Data</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageReleaseNotes>Review ReleaseNotes.txt for details.</PackageReleaseNotes>
@@ -35,6 +35,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
+    <TargetFrameworks>net462;net48;$(TargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Include="..\..\Nuget\Images\logo-mysql-170x115.png" Pack="true" PackagePath="\" />
   </ItemGroup>
@@ -77,7 +81,7 @@
     <EmbeddedResource Include="Resources.resx;ResourcesX.resx;Properties\ReservedWords.txt" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netstandard2.1' or '$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0' or '$(TargetFramework)'=='net8.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netstandard2.1' or '$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net8.0'">
     <Compile Remove="Framework/net462/*" />
     <PackageReference Include="System.Security.Permissions" Version="8.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index e1789b63c..b7ed1a817 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -8,7 +8,7 @@
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
-    <TargetFrameworks>net8.0;net7.0;net6.0;net462;net48;</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <PackageId>MySql.Data.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
@@ -28,7 +28,11 @@
     <NoWarn>CS1591,CS1587,CS1701,CS1702,CS1570,CA2100</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0' or '$(TargetFramework)'=='net8.0'">
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
+    <TargetFrameworks>net462;net48;$(TargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net8.0'">
     <Compile Remove="Framework\netstandard2_0\PartialTrustSandbox.cs" />
     <Compile Remove="Framework\netstandard2_0\CmdTestsPipe.cs;Framework\netstandard2_0\CmdTestsPipeCompressed.cs;Framework\netstandard2_0\CmdTestsSharedmemCompressed.cs;Framework\netstandard2_0\CmdTestsSharedMem.cs;" />
     <Compile Remove="Framework\netstandard2_0\PSPipeCompressed.cs;Framework\netstandard2_0\PSPipe.cs;Framework\netstandard2_0\PSSharedMemory.cs;Framework\netstandard2_0\PSSharedMemoryCompressed.cs;" />
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 2bcd44d75..e404eda36 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -8,7 +8,7 @@
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
-    <TargetFrameworks>net8.0;net7.0;net6.0;net462;net48;</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <PackageId>MySqlx.Data.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
@@ -28,6 +28,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
+    <TargetFrameworks>net462;net48;$(TargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Remove="Properties\CreateUsers.sql" />
   </ItemGroup>

From c4ddf988a1faa6a6d8f7e0afdf8054fe96a933ef Mon Sep 17 00:00:00 2001
From: Reggie Burnett <reggie.burnett@oracle.com>
Date: Thu, 16 May 2024 12:49:07 -0500
Subject: [PATCH 08/99] Bug#36116171 [Fixed bug SQL Keyword "RETURNING" not
 handled properly when updating data]

Change-Id: If09ce296bd7ef41aba5dfb97765854f49e289921
---
 CHANGES                                       |  2 +-
 EFCore/src/Update/MySQLUpdateSqlGenerator.cs  | 13 +++
 .../MySql.EFCore.Basic.Tests/UpdateTests.cs   | 87 +++++++++++++++++++
 3 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 EFCore/tests/MySql.EFCore.Basic.Tests/UpdateTests.cs

diff --git a/CHANGES b/CHANGES
index 87155fbae..b6e2349bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,7 @@
 - Remove MySqlX.Data.Performance.Console.Tests project (WL16387)
 - Updated third party dependencies (WL16291)
 - Remove .NET 7 and EF Core 7 (WL16386)
-
+- Fixed bug SQL Keyword "RETURNING" not handled properly when updating data (Oracle Bug #36116171)
 
 8.4.0
 - Updated FOSS license text in all source files (WL16197).
diff --git a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
index 7350729a8..83ed2ea7b 100644
--- a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
+++ b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
@@ -551,6 +551,19 @@ protected virtual void AppendWhereAffectedClause(
       }
     }
 
+    protected override void AppendReturningClause(StringBuilder commandStringBuilder, IReadOnlyList<IColumnModification> operations, string? additionalValues = null)
+    {
+      if (additionalValues is not null)
+      {
+        if (operations.Count > 0)
+        {
+          commandStringBuilder.Append(", ");
+        }
+
+        commandStringBuilder.Append('1');
+      }
+    }
+
     private void AppendRowsAffectedWhereCondition(StringBuilder commandStringBuilder, int expectedRowsAffected)
     {
       Check.NotNull(commandStringBuilder, "commandStringBuilder");
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/UpdateTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/UpdateTests.cs
new file mode 100644
index 000000000..baa1ec466
--- /dev/null
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/UpdateTests.cs
@@ -0,0 +1,87 @@
+// Copyright © 2021, 2024, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+using Microsoft.EntityFrameworkCore;
+using MySql.EntityFrameworkCore.Basic.Tests.Utils;
+using NUnit.Framework;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace MySql.EntityFrameworkCore.Basic.Tests
+{
+
+#region Bug113443
+
+    [Table("Bug113443Table")]
+    public record Bug113443Record
+    {
+        [Key]
+        [Column("id")]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; init; }
+        [Column("name")]
+        public string? Name { get; set;}
+
+        [Column("time_created", TypeName = "TIMESTAMP(6)")]
+        [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public DateTime TimeCreated { get; init; }
+
+        [Column("time_updated", TypeName = "TIMESTAMP(6)")]
+        [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public DateTime TimeUpdated { get; init; }
+    }
+
+    public class Bug113443Context : MyTestContext
+    {
+        public DbSet<Bug113443Record> Bug113443 { get; set; }
+    }
+
+#endregion
+
+  public class UpdateTests
+  {
+    [Test]
+    public void Bug113443() {
+        using var ctx = new Bug113443Context();
+        ctx.Database.EnsureCreated();
+        try
+        {
+            Bug113443Record data = new() { Name = "Sample1"};
+            ctx.Bug113443.Add(data);
+            ctx.SaveChanges();
+            data.Name = "Changed!";
+            ctx.SaveChanges();
+        }
+        finally
+        {
+            ctx.Database.EnsureDeleted();
+        }
+    }
+  }
+}

From b82bdc95dbc6d9efffd6a749ced680b71dd4fad8 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Thu, 18 Apr 2024 19:15:11 -0600
Subject: [PATCH 09/99] Bug#36483069 [IIS Website is crashing after upgrading
 MySQL.Data package to 8.3.0]

Change-Id: I11ae533a54093b249f110a44c94772e088ad53cf
---
 CHANGES                            | 14 +++---
 MySQL.Data/src/MySqlPoolManager.cs | 72 ++++++++++++++++++++----------
 2 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/CHANGES b/CHANGES
index b6e2349bb..064ece117 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,12 @@
 9.0.0
-- Updated NUnit to 4.x (WL16279)
-- Removed deprecated OldGetStringBehavior option (WL16280)
-- Remove MySqlX.Data.Performance.Console.Tests project (WL16387)
-- Updated third party dependencies (WL16291)
-- Remove .NET 7 and EF Core 7 (WL16386)
-- Fixed bug SQL Keyword "RETURNING" not handled properly when updating data (Oracle Bug #36116171)
+- Updated NUnit to 4.x (WL16279).
+- Removed deprecated OldGetStringBehavior option (WL16280).
+ - Remove MySqlX.Data.Performance.Console.Tests project (WL16387).
+- Updated third party dependencies (WL16291).
+- Remove .NET 7 and EF Core 7 (WL16386).
+- Fixed bug SQL Keyword "RETURNING" not handled properly when updating data (Oracle Bug #36116171).
+- Fixed bug IIS Website is crashing after upgrading MySQL.Data package to 8.3.0 (Oracle Bug #36483069).
+
 
 8.4.0
 - Updated FOSS license text in all source files (WL16197).
diff --git a/MySQL.Data/src/MySqlPoolManager.cs b/MySQL.Data/src/MySqlPoolManager.cs
index a052dcdf2..72f89caea 100644
--- a/MySQL.Data/src/MySqlPoolManager.cs
+++ b/MySQL.Data/src/MySqlPoolManager.cs
@@ -139,12 +139,15 @@ public static async Task<MySqlPool> GetPoolAsync(MySqlConnectionStringBuilder se
     {
       string text = GetKey(settings);
 
-      await waitHandle.WaitAsync(CancellationToken.None).ConfigureAwait(false);
-      MySqlPool pool;
-      Pools.TryGetValue(text, out pool);
+      if (execAsync)
+        await waitHandle.WaitAsync(CancellationToken.None).ConfigureAwait(false);
+      else
+        waitHandle.Wait(cancellationToken);
 
       try
       {
+        MySqlPool pool;
+        Pools.TryGetValue(text, out pool);
         if (pool == null)
         {
           pool = await MySqlPool.CreateMySqlPoolAsync(settings, execAsync, cancellationToken).ConfigureAwait(false);
@@ -152,6 +155,8 @@ public static async Task<MySqlPool> GetPoolAsync(MySqlConnectionStringBuilder se
         }
         else
           pool.Settings = settings;
+
+        return pool;
       }
       catch (Exception ex)
       {
@@ -161,8 +166,6 @@ public static async Task<MySqlPool> GetPoolAsync(MySqlConnectionStringBuilder se
       {
         waitHandle.Release();
       }
-
-      return pool;
     }
 
     public static void RemoveConnection(Driver driver)
@@ -180,7 +183,8 @@ public static async Task ReleaseConnectionAsync(Driver driver, bool execAsync)
 
       MySqlPool pool = driver.Pool;
 
-      await pool?.ReleaseConnectionAsync(driver, execAsync);
+      if (pool != null)
+        await pool.ReleaseConnectionAsync(driver, execAsync).ConfigureAwait(false);
     }
 
     public static async Task ClearPoolAsync(MySqlConnectionStringBuilder settings, bool execAsync)
@@ -203,33 +207,53 @@ public static async Task ClearPoolAsync(MySqlConnectionStringBuilder settings, b
 
     private static async Task ClearPoolByTextAsync(string key, bool execAsync)
     {
-      // if pools doesn't have it, then this pool must already have been cleared
-      if (!Pools.ContainsKey(key)) return;
+      if (execAsync)
+        await waitHandle.WaitAsync().ConfigureAwait(false);
+      else
+        waitHandle.Wait();
+
+      try
+      { 
+        // if pools doesn't have it, then this pool must already have been cleared
+        if (!Pools.ContainsKey(key)) return;
 
-      // add the pool to our list of pools being cleared
-      MySqlPool pool = (Pools[key] as MySqlPool);
-      ClearingPools.Add(pool);
+        // add the pool to our list of pools being cleared
+        MySqlPool pool = (Pools[key] as MySqlPool);
+        ClearingPools.Add(pool);
 
-      // now tell the pool to clear itself
-      await pool.ClearAsync(execAsync).ConfigureAwait(false);
+        // now tell the pool to clear itself
+        await pool.ClearAsync(execAsync).ConfigureAwait(false);
 
-      // and then remove the pool from the active pools list
-      Pools.Remove(key);
+        // and then remove the pool from the active pools list
+        Pools.Remove(key);
+      }
+      finally
+      {
+        waitHandle.Release();
+      }
     }
 
     public static async Task ClearAllPoolsAsync(bool execAsync)
     {
-      await waitHandle.WaitAsync().ConfigureAwait(false);
-
-      // Create separate keys list.
-      List<string> keys = new List<string>(Pools.Count);
-      keys.AddRange(Pools.Keys);
+      if (execAsync)
+        await waitHandle.WaitAsync().ConfigureAwait(false);
+      else
+        waitHandle.Wait();
 
-      // Remove all pools by key.
-      foreach (string key in keys)
-        await ClearPoolByTextAsync(key, execAsync).ConfigureAwait(false);
+      try
+      {
+        // Create separate keys list.
+        List<string> keys = new List<string>(Pools.Count);
+        keys.AddRange(Pools.Keys);
 
-      waitHandle.Release();
+        // Remove all pools by key.
+        foreach (string key in keys)
+          await ClearPoolByTextAsync(key, execAsync).ConfigureAwait(false);
+      }
+      finally 
+      { 
+        waitHandle.Release();
+      }
 
       if (DemotedServersTimer != null)
       {

From 96e6d948ab335fe9253192de3cef83053008797d Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Fri, 17 May 2024 11:42:09 -0600
Subject: [PATCH 10/99] Bug#36627858 [Use WiX Toolset 4.0.5]

Change-Id: Ied69354a52e3c2012ff4c7f342cfdc10350d83e1
---
 CHANGES | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 064ece117..2011d0666 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,12 @@
 9.0.0
-- Updated NUnit to 4.x (WL16279).
-- Removed deprecated OldGetStringBehavior option (WL16280).
- - Remove MySqlX.Data.Performance.Console.Tests project (WL16387).
-- Updated third party dependencies (WL16291).
-- Remove .NET 7 and EF Core 7 (WL16386).
-- Fixed bug SQL Keyword "RETURNING" not handled properly when updating data (Oracle Bug #36116171).
+- Updated NUnit to 4.x (WL16279)
+- Removed deprecated OldGetStringBehavior option (WL16280)
+- Remove MySqlX.Data.Performance.Console.Tests project (WL16387)
+- Updated third party dependencies (WL16291)
+- Remove .NET 7 and EF Core 7 (WL16386)
+- Fixed bug SQL Keyword "RETURNING" not handled properly when updating data (Oracle Bug #36116171)
 - Fixed bug IIS Website is crashing after upgrading MySQL.Data package to 8.3.0 (Oracle Bug #36483069).
+- Updated Wix Toolset to 4.0.5 (Oracle Bug #36627858).
 
 
 8.4.0

From ea0e78b74f936eee087a4885d4448ac27178da24 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 22 May 2024 18:24:54 -0600
Subject: [PATCH 11/99] Bug#36483069 [IIS Website is crashing after upgrading
 MySQL.Data package to 8.3.0] - complement

Change-Id: I1d08d5778d184a56efb83d57bb8b36953126090e
---
 MySQL.Data/src/MySqlPoolManager.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/MySQL.Data/src/MySqlPoolManager.cs b/MySQL.Data/src/MySqlPoolManager.cs
index 72f89caea..cc16792d0 100644
--- a/MySQL.Data/src/MySqlPoolManager.cs
+++ b/MySQL.Data/src/MySqlPoolManager.cs
@@ -235,10 +235,7 @@ private static async Task ClearPoolByTextAsync(string key, bool execAsync)
 
     public static async Task ClearAllPoolsAsync(bool execAsync)
     {
-      if (execAsync)
-        await waitHandle.WaitAsync().ConfigureAwait(false);
-      else
-        waitHandle.Wait();
+
 
       try
       {
@@ -250,9 +247,9 @@ public static async Task ClearAllPoolsAsync(bool execAsync)
         foreach (string key in keys)
           await ClearPoolByTextAsync(key, execAsync).ConfigureAwait(false);
       }
-      finally 
-      { 
-        waitHandle.Release();
+      catch
+      {
+        throw;
       }
 
       if (DemotedServersTimer != null)

From 9f38bdfd9912ae169e3d7c87afe15cebed7d9f80 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 29 May 2024 14:46:23 -0600
Subject: [PATCH 12/99] global.json test

Change-Id: I80a4f252149e206c3a8b87615f880b4f224009dd
---
 global.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/global.json b/global.json
index f17298ca8..f6386c452 100644
--- a/global.json
+++ b/global.json
@@ -2,4 +2,7 @@
   "msbuild-sdks": {
     "Microsoft.Build.Traversal": "4.1.0"
   }
+  "sdk": {
+    "version": "8.0.22"
+  }
 }
\ No newline at end of file

From 83af47f797022f23e76060236f236adb9d25487e Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Thu, 23 May 2024 16:17:52 -0600
Subject: [PATCH 13/99] Bug#36529814 [The disabling of mysql_native_password in
 server causes errors in testsuite]

Change-Id: I59408a3bd92bb67e208825b75e8997b8375baad0
---
 CHANGES                                        | 13 +++++++------
 MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs | 15 +++++++++------
 .../tests/MySql.Data.Tests/ExceptionTests.cs   |  2 +-
 MySQL.Data/tests/MySql.Data.Tests/TestBase.cs  | 10 +++++++++-
 MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs |  6 ++++++
 .../Properties/CreateUsers.sql                 |  2 --
 MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs    | 18 ++++++++++++++----
 7 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2011d0666..c4b67410d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,12 +1,13 @@
 9.0.0
-- Updated NUnit to 4.x (WL16279)
-- Removed deprecated OldGetStringBehavior option (WL16280)
-- Remove MySqlX.Data.Performance.Console.Tests project (WL16387)
-- Updated third party dependencies (WL16291)
-- Remove .NET 7 and EF Core 7 (WL16386)
-- Fixed bug SQL Keyword "RETURNING" not handled properly when updating data (Oracle Bug #36116171)
+- Updated NUnit to 4.x (WL16279).
+- Removed deprecated OldGetStringBehavior option (WL16280).
+- Remove MySqlX.Data.Performance.Console.Tests project (WL16387).
+- Updated third party dependencies (WL16291).
+- Remove .NET 7 and EF Core 7 (WL16386).
+- Fixed bug SQL Keyword "RETURNING" not handled properly when updating data (Oracle Bug #36116171).
 - Fixed bug IIS Website is crashing after upgrading MySQL.Data package to 8.3.0 (Oracle Bug #36483069).
 - Updated Wix Toolset to 4.0.5 (Oracle Bug #36627858).
+- Fixed bug disabling of mysql_native_password in server causes errors in testsuite (Oracle Bug #36529814).
 
 
 8.4.0
diff --git a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
index 5c7cfdcf6..afd6beba9 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
@@ -358,6 +358,9 @@ private void TestIntegratedSecurityWithUser(string user, bool pooling)
     [Property("Category", "Security")]
     public void ConnectUsingMySqlNativePasswordPlugin()
     {
+      if (!Check_Plugin_Enabled("mysql_native_password"))
+        Assert.Ignore("mysql_native_password plugin must be enabled on the server to run this test");
+
       string userName = "testNtvPass";
       string password = "mysql";
       string pluginName = "mysql_native_password";
@@ -1832,12 +1835,12 @@ public void AuthPlainAndMySql41()
                   "with secure connections(classic connection).Server started with mysql native password plugin")]
     public void Sha256AndNativeWithCertificates()
     {
-      if (Version <= new Version("8.0.4")) Assert.Ignore("This test is for MySql 8.0.4 or higher");
-
-      using (var rdr = ExecuteReader("SELECT * FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'caching_sha2_password'"))
-      {
-        if (!rdr.HasRows) Assert.Ignore("This test needs plugin caching_sha2_password");
-      }
+      if (Version < new Version("8.0.4"))
+        Assert.Ignore("This test is for MySql 8.0.4 or higher");
+      if (!Check_Plugin_Enabled("mysql_native_password"))
+        Assert.Ignore("mysql_native_password plugin must be enabled on the server to run this test");
+      if (!Check_Plugin_Enabled("caching_sha2_password"))
+        Assert.Ignore("This test needs plugin caching_sha2_password");
 
       // Test connection for VALID user in LDAP server with different SSLMode values, expected result pass
       string assemblyPath = Assembly.GetExecutingAssembly().Location.Replace(String.Format("{0}.dll",
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs
index 51ecf2d76..ecb0e9a82 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs
@@ -139,7 +139,7 @@ public void UngrantedAccessException()
     /// </summary>
     [TestCase("Port", 1455, 1042)]
     [TestCase("Database", "nonExistingDB", 1049)]
-    [TestCase("UserID", "nonExistingUser", 1045)]
+    [TestCase("UserID", "nonExistingUser", 1045)] // Check server bug Bug#36527984 in case of failure
     [TestCase("Server", "nonExistingServer", 1042)]
     [TestCase("MaxConnections", "", 1040)]
     public void AuthenticationExceptionNumber(string propertyName, object propertyValue, int exNumber)
diff --git a/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs b/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs
index ecd20ef18..80de1b551 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs
@@ -209,7 +209,7 @@ public string CreateUser(string postfix, string password)
       {
         string userName = String.Format("{0}{1}", BaseUserName, postfix);
 
-        ExecuteSQL($"CREATE USER '{userName}'@'{host}' IDENTIFIED WITH mysql_native_password BY '{password}'", connection);
+        ExecuteSQL($"CREATE USER '{userName}'@'{host}' IDENTIFIED BY '{password}'", connection);
         ExecuteSQL($"GRANT ALL ON *.* TO '{userName}'@'{host}'", connection);
         ExecuteSQL("FLUSH PRIVILEGES", connection);
         return userName;
@@ -334,6 +334,14 @@ public string GetMySqlServerIp(bool isIpV6 = false)
 
       return isIpV6 ? ipv6 : ipv4;
     }
+
+    public bool Check_Plugin_Enabled(string pluginname)
+    {
+      using (var rdr = ExecuteReader($"SELECT PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = '{pluginname}' AND plugin_status = 'ACTIVE';"))
+      {
+        return rdr.HasRows;
+      }
+    }
     #endregion
   }
 }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
index cec0bfdd2..764700cf3 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
@@ -278,6 +278,12 @@ public string GetMySqlServerIp(bool isIpV6 = false)
       return isIpV6 ? ipv6 : ipv4;
     }
 
+    public bool Check_Plugin_Enabled(string pluginname)
+    {
+      var checkplugin = session.SQL($"SELECT * FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = '{pluginname}' AND PLUGIN_STATUS='ACTIVE';").Execute().FetchOne();
+      return checkplugin != null;
+    }
+
     #endregion
   }
 }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/Properties/CreateUsers.sql b/MySQL.Data/tests/MySqlX.Data.Tests/Properties/CreateUsers.sql
index 4edcb388b..8c0ea0906 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/Properties/CreateUsers.sql
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/Properties/CreateUsers.sql
@@ -1,14 +1,12 @@
 DROP USER IF EXISTS 'test';
 DROP USER IF EXISTS 'testNoPass';
 DROP USER IF EXISTS 'testSha2';
-DROP USER IF EXISTS 'testNative';
 DROP USER IF EXISTS 'testAnyhost';
 CREATE USER 'test'@'%' identified by 'test';
 GRANT ALL PRIVILEGES  ON *.*  TO 'test'@'%';
 CREATE USER 'testNoPass'@'%';
 CREATE USER 'testSha2'@'%' identified with caching_sha2_password by 'mysql';
 GRANT ALL PRIVILEGES  ON *.*  TO 'testSha2'@'%';
-CREATE USER 'testNative'@'%' identified with mysql_native_password by 'test';
 CREATE USER 'testAnyhost'@'%' identified by 'test';
 GRANT ALL PRIVILEGES  ON *.*  TO 'testAnyhost'@'%';
 FLUSH PRIVILEGES;
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs b/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
index a5b9d3de9..4cd927b21 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
@@ -199,10 +199,8 @@ public void DefaultAuthPublicKeyRetrieval()
     public void MySqlNativePlugin()
     {
       if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("Test available only to MySQL Server +8.0.11");
-
-      var counter = session.SQL("SELECT count(*) FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'caching_sha2_password'").Execute().FetchOne();
-      if (Convert.ToInt32(counter[0]) <= 0)
-        Assert.Ignore("The caching_sha2_password plugin isn't available.");
+      if (!Check_Plugin_Enabled("mysql_native_password"))
+        Assert.Ignore("mysql_native_password plugin must be enabled on the server to run this test");
 
       string pluginName = "mysql_native_password";//mysql_native_password  plugin
       MySqlConnectionStringBuilder builder = new MySqlConnectionStringBuilder(ConnectionString);
@@ -263,6 +261,10 @@ public void MySqlNativePlugin()
     [Property("Category", "Security")]
     public void ConnectUsingMySQL41Auth()
     {
+      if (!Check_Plugin_Enabled("mysql_native_password"))
+        Assert.Ignore("mysql_native_password plugin must be enabled on the server to run this test");
+      ExecuteSqlAsRoot("CREATE USER IF NOT EXISTS 'testNative'@'%' identified with mysql_native_password by 'test';");
+
       var connectionStringUri = ConnectionStringUri;
       if (session.InternalSession.GetServerVersion().isAtLeast(8, 0, 4))
       {
@@ -371,6 +373,11 @@ public void Sha256MemoryAuthWithDifferentPlugin(string pluginName)
     {
       if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("Test available only to MySQL Server +8.0.11");
 
+      if (pluginName == "mysql_native_password")
+      {
+        if (!Check_Plugin_Enabled("mysql_native_password"))
+          Assert.Ignore("mysql_native_password plugin must be enabled on the server to run this test");
+      }
       MySqlConnectionStringBuilder builder = new MySqlConnectionStringBuilder(ConnectionString);
       builder.UserID = "testDefaultPlugin";
       builder.Password = "test";
@@ -417,6 +424,9 @@ public void NativeAuthValidAndInvalidConnection()
     {
       if (!Platform.IsWindows()) Assert.Ignore("Check for Linux OS");
       if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("Test available only to MySQL Server +8.0.11");
+      if (!Check_Plugin_Enabled("mysql_native_password"))
+        Assert.Ignore("mysql_native_password plugin must be enabled on the server to run this test");
+      ExecuteSqlAsRoot("CREATE USER IF NOT EXISTS 'testNative'@'%' identified with mysql_native_password by 'test';");
 
       var user = "testNative";
       var pwd = "test";

From d8beb16d39a525639f45eac22b00c4992374ef49 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 26 May 2024 14:44:45 -0600
Subject: [PATCH 14/99] WL#16386 [Remove .NET Core 7 and EF Core 7] - Update

Change-Id: Iaf30c0883631f0bcde438b28b9cb58cb6bd4c390
---
 .../Internal/MySQLAnnotationProvider.cs       | 25 -------------------
 .../Internal/MySQLMigrationsModelDiffer.cs    |  2 +-
 EFCore/src/Properties/AssemblyInfo.cs         |  2 --
 .../MySQLParameterBasedSqlProcessor.cs        |  2 +-
 EFCore/src/Update/IMySQLUpdateSqlGenerator.cs |  2 +-
 .../Update/MySQLModificationCommandBatch.cs   |  4 +--
 EFCore/src/Update/MySQLUpdateSqlGenerator.cs  |  2 +-
 .../ConnectionTests.cs                        |  2 +-
 .../Framework/netstandard2_0/TypeTests.cs     |  2 +-
 .../tests/MySqlX.Data.Tests/SessionTests.cs   |  2 +-
 .../tests/MySqlX.Data.Tests/SslTests.cs       |  2 +-
 11 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs b/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs
index 50d43a214..dc22f8f4d 100644
--- a/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs
+++ b/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs
@@ -155,31 +155,6 @@ public override IEnumerable<IAnnotation> For(IColumn column, bool designTime)
         yield return new Annotation(MySQLAnnotationNames.ValueGenerationStrategy, valueGenerationStrategy);
       }
     }
-#elif NET7_0
-      public override IEnumerable<IAnnotation> For(IColumn column, bool designTime)
-    {
-      if (!designTime)
-        yield break;
-
-      var table = StoreObjectIdentifier.Table(column.Table.Name, column.Table.Schema);
-      var properties = column.PropertyMappings.Select(m => m.Property).ToArray();
-
-      if (column.PropertyMappings.Where(m => m.TableMapping.IsSharedTablePrincipal ?? true
-      && m.TableMapping.EntityType == m.Property.DeclaringEntityType)
-        .Select(m => m.Property)
-        .FirstOrDefault(p => p.GetValueGenerationStrategy(table) == MySQLValueGenerationStrategy.IdentityColumn) is IProperty identityProperty)
-      {
-        var valueGenerationStrategy = identityProperty.GetValueGenerationStrategy(table);
-        yield return new Annotation(MySQLAnnotationNames.ValueGenerationStrategy, valueGenerationStrategy);
-      }
-      else if (properties.FirstOrDefault
-        (p => p.GetValueGenerationStrategy(table) == MySQLValueGenerationStrategy.ComputedColumn) is IProperty computedProperty)
-      {
-        var valueGenerationStrategy = computedProperty.GetValueGenerationStrategy(table);
-        yield return new Annotation(MySQLAnnotationNames.ValueGenerationStrategy, valueGenerationStrategy);
-      }
-    }
-
 #elif NET8_0
 
 public override IEnumerable<IAnnotation> For(IColumn column, bool designTime)
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs b/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
index 12ad45c71..22ffaa57a 100644
--- a/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
+++ b/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
@@ -81,7 +81,7 @@ protected override IEnumerable<MigrationOperation> Add(IColumn target, DiffConte
       return base.Add(target, diffContext, inline);
     }
 
-#elif NET7_0 || NET8_0
+#elif NET8_0
     public MySQLMigrationsModelDiffer(
       [NotNull] IRelationalTypeMappingSource typeMappingSource,
       [NotNull] IMigrationsAnnotationProvider migrationsAnnotations,
diff --git a/EFCore/src/Properties/AssemblyInfo.cs b/EFCore/src/Properties/AssemblyInfo.cs
index e18a3ad26..66005293d 100644
--- a/EFCore/src/Properties/AssemblyInfo.cs
+++ b/EFCore/src/Properties/AssemblyInfo.cs
@@ -43,8 +43,6 @@
 [assembly: AssemblyProduct("MySQL Connector/NET")]
 #if NET6_0
 [assembly: AssemblyCopyright("Copyright © 2021, 2024, Oracle and/or its affiliates.")]
-#elif NET7_0
-[assembly: AssemblyCopyright("Copyright © 2022, 2024, Oracle and/or its affiliates.")]
 #elif NET8_0
 [assembly: AssemblyCopyright("Copyright © 2024, Oracle and/or its affiliates.")]
 #endif
diff --git a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
index c23e34dd2..c73a1f77f 100644
--- a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
+++ b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
@@ -62,7 +62,7 @@ protected override SelectExpression ProcessSqlNullability(
 
       return selectExpression;
     }
-#elif NET7_0 || NET8_0
+#elif NET8_0
     protected override Expression ProcessSqlNullability(
       Expression selectExpression, IReadOnlyDictionary<string, object?> parametersValues, out bool canCache)
     {
diff --git a/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs b/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs
index 4c6c7d3b7..5e94a0019 100644
--- a/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs
+++ b/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs
@@ -42,7 +42,7 @@ ResultSetMapping AppendBulkInsertOperation(
     [NotNull] IReadOnlyList<IReadOnlyModificationCommand> modificationCommands,
     int commandPosition);
   }
-#elif NET7_0 || NET8_0
+#elif NET8_0
   /// <summary>
   ///   <para>
   ///     The service lifetime is <see cref="ServiceLifetime.Singleton" />. This means a single instance
diff --git a/EFCore/src/Update/MySQLModificationCommandBatch.cs b/EFCore/src/Update/MySQLModificationCommandBatch.cs
index 9ea4cf0aa..965390c17 100644
--- a/EFCore/src/Update/MySQLModificationCommandBatch.cs
+++ b/EFCore/src/Update/MySQLModificationCommandBatch.cs
@@ -55,7 +55,7 @@ internal class MySQLModificationCommandBatch : AffectedCountModificationCommandB
     private readonly int _maxBatchSize;
     private readonly List<ModificationCommand> _bulkInsertCommands = new List<ModificationCommand>();
     private int _commandsLeftToLengthCheck = 50;
-#elif NET7_0 || NET8_0
+#elif NET8_0
     private readonly List<IReadOnlyModificationCommand> _pendingBulkInsertCommands = new();
 #endif
 
@@ -200,7 +200,7 @@ protected override void UpdateCachedCommandText(int commandPosition)
       }
     }
 
-#elif NET7_0 || NET8_0
+#elif NET8_0
     /// <summary>
     ///   This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///   the same compatibility standards as public APIs. It may be changed or removed without notice in
diff --git a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
index 83ed2ea7b..b94d96dba 100644
--- a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
+++ b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
@@ -233,7 +233,7 @@ internal enum ResultsGrouping
       OneResultSet,
       OneCommandPerResultSet
     }
-#elif NET7_0 || NET8_0
+#elif NET8_0
     public virtual ResultSetMapping AppendBulkInsertOperation(
       StringBuilder commandStringBuilder,
       IReadOnlyList<IReadOnlyModificationCommand> modificationCommands,
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
index 08673d39a..c54c09f04 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
@@ -85,7 +85,7 @@ public static RelationalConnectionDependencies CreateDependencies(DbContextOptio
               TestServiceFactory.Instance.Create<RelationalTypeMappingSourceDependencies>(),
               new MySQLOptions()))));
     }
-#elif NET7_0 || NET8_0
+#elif NET8_0
     public static RelationalConnectionDependencies CreateDependencies(DbContextOptions? options = null)
     {
       options ??= new DbContextOptionsBuilder()
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs
index b64e74f6f..62ccf2c49 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs
@@ -35,7 +35,7 @@ namespace MySql.Data.MySqlClient.Tests
 {
   public class TypeTests : TestBase
   {
-#if !NET7_0_OR_GREATER
+#if !NET8_0_OR_GREATER
     /// <summary>
     /// Test fix for http://bugs.mysql.com/bug.php?id=40555
     /// Make MySql.Data.Types.MySqlDateTime serializable.
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
index 5d37e3c23..13f0ff70c 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
@@ -255,7 +255,7 @@ public void CheckConnectionUri()
       CheckConnectionData("mysqlx://myuser:password@[(address=[fe80::bd41:e449:45ee:2e1a%17]:3305,priority=100)]", "myuser", "password", "[fe80::bd41:e449:45ee:2e1a]", 3305);
       Assert.Throws<UriFormatException>(() => CheckConnectionData("mysqlx://myuser:password@[(address=fe80::bd41:e449:45ee:2e1a%17,priority=100)]", "myuser", "password", "[fe80::bd41:e449:45ee:2e1a]", 33060));
       CheckConnectionData("mysqlx://myuser@localhost/test", "myuser", "", "localhost", 33060, "database", schemaName);
-#if NET7_0
+#if NET8_0
       CheckConnectionData("mysqlx://myuser@localhost/test?ssl%20mode=disabled&connecttimeout=10", "myuser", "", "localhost", 33060, "database", schemaName, "ssl mode", "None", "connecttimeout", "10");
 #else
       CheckConnectionData("mysqlx://myuser@localhost/test?ssl%20mode=disabled&connecttimeout=10", "myuser", "", "localhost", 33060, "database", schemaName, "ssl mode", "Disabled", "connecttimeout", "10");
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
index 771f58f95..6e399c635 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
@@ -123,7 +123,7 @@ public void SslRequiredByDefault()
     public void SslPreferredIsInvalid()
     {
       string prefered = "Prefered";
-#if NET7_0
+#if NET8_0
       prefered = "Preferred";
 #endif
       var expectedErrorMessage = "Value '{0}' is not of the correct type.";

From c84ab782237fc06c881c3c2cb866cb32bcbefc2a Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 2 Jun 2024 19:11:25 -0600
Subject: [PATCH 15/99] Updated LIUMS.

Change-Id: Ia1970c5a1e4eac466e8dc864db752110e202f6c4
---
 LICENSE | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/LICENSE b/LICENSE
index 9ca7460c7..b6c7a6e7e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Licensing Information User Manual
 
-MySQL Connector/NET 8.4.0 Community
+MySQL Connector/NET 9.0.0 Community
      __________________________________________________________________
 
 Introduction
@@ -8,18 +8,18 @@ Introduction
    This License Information User Manual contains Oracle's product license
    and other licensing information, including licensing information for
    third-party software which may be included in this distribution of
-   MySQL Connector/NET 8.4.0 Community.
+   MySQL Connector/NET 9.0.0 Community.
 
-   Last updated: March 2024
+   Last updated: May 2024
 
 Licensing Information
 
-   This release of MySQL Connector/NET 8.4.0 Community is brought to you
+   This release of MySQL Connector/NET 9.0.0 Community is brought to you
    by the MySQL team at Oracle. This software is released under version 2
    of the GNU General Public License (GPLv2), as set forth below, with the
    following additional permissions:
 
-   This distribution of MySQL Connector/NET 8.4.0 Community is designed to
+   This distribution of MySQL Connector/NET 9.0.0 Community is designed to
    work with certain software (including but not limited to OpenSSL) that
    is licensed under separate terms, as designated in a particular file or
    component or in the license documentation. Without limiting your rights
@@ -1017,4 +1017,4 @@ Written Offer for Source Code
        that included the binary that is the subject of your request, or
 
     b. in the case of code licensed under the GPL v3 for as long as Oracle
-       offers spare parts or customer support for that product model.
+       offers spare parts or customer support for that product model.
\ No newline at end of file

From 370c081c6c1e43f65f5bda419fe23748ad9b2246 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 2 Jun 2024 19:31:57 -0600
Subject: [PATCH 16/99] Updated Documentation

Change-Id: I760c43767e2d4b63da58792ae727b022b0ea4c7a
---
 Documentation/index.md |  4 ++--
 README.md              |  2 ++
 Release Notes.txt      | 10 ++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Documentation/index.md b/Documentation/index.md
index 4965d6ca3..ffb271d5f 100644
--- a/Documentation/index.md
+++ b/Documentation/index.md
@@ -1,6 +1,6 @@
 ## MySQL Connector/NET and X DevAPI
 
-MySQL Connector/NET 8.4 supports X Protocol, which enables you to use X DevAPI with the .NET language of choice to develop applications that communicate with a MySQL server functioning as a document store, relational database, or both.
+MySQL Connector/NET 9.0 supports X Protocol, which enables you to use X DevAPI with the .NET language of choice to develop applications that communicate with a MySQL server functioning as a document store, relational database, or both.
 
 To get started, review the following main classes:
 
@@ -16,7 +16,7 @@ For an introduction to X DevAPI concepts, see the [X DevAPI User Guide](https://
 
 ## MySQL Connector/NET
 
-MySQL Connector/NET 8.4 also supports the development of .NET, .NET Core and .NET Framework applications that require secure, high-performance data connectivity with MySQL through the classic protocol. It supports ADO.NET, Entity Framework and various web providers.
+MySQL Connector/NET 9.0 also supports the development of .NET, .NET Core and .NET Framework applications that require secure, high-performance data connectivity with MySQL through the classic protocol. It supports ADO.NET, Entity Framework and various web providers.
 
 To get started, review the following main classes:
 
diff --git a/README.md b/README.md
index 4f91301bd..0a25e8138 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@ From MySQL Connector/NET 8.3, the driver also adds support for [.NET 8](https://
 
 From MySQL Connector/NET 8.4, the driver adds support for TLS1.3 and removes support for FIDO authentication plugin.
 
+From MySQL Connector/NET 9.0, the driver removes support for .NET 7 and EF Core 7.
+
 For detailed information please visit the official [MySQL Connector/NET documentation.](https://dev.mysql.com/doc/connector-net/en/)
 
 ## Licensing
diff --git a/Release Notes.txt b/Release Notes.txt
index 6f1e6dde2..b6cf83c91 100644
--- a/Release Notes.txt	
+++ b/Release Notes.txt	
@@ -1,8 +1,10 @@
-Connector/NET 8.4 Release Notes
+Connector/NET 9.0 Release Notes
 ------------------------------------
-Welcome to the release notes for Connector/NET 8.3
+Welcome to the release notes for Connector/NET 9.0
 
-What's new in 8.4
+What's new in 9.0
 --------------------
 
-Connector/NET added support for TLS1.3 and removed support for FIDO authentication plugin.
\ No newline at end of file
+Connector/NET now uses NUnit 4.1 in the testsuite.
+Connector/NET updated 3rd party dependencies.
+Connector/NET removes support for .NET 7 and EF Core 7.
\ No newline at end of file

From b96a8e68f8b77e6cd0bd114cef33697150916a1a Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 2 Jun 2024 15:34:30 -0600
Subject: [PATCH 17/99] Permit only SDK GA versions to be used in build
 process.

Change-Id: I2040c7cb92df20d3dfa0ddd186666fa1c20d73e0
---
 EFCore/src/global.json                                       | 5 +++++
 EFCore/tests/MySql.EFCore.Basic.Tests/global.json            | 5 +++++
 EFCore/tests/MySql.EFCore.Design.Tests/global.json           | 5 +++++
 EFCore/tests/MySql.EFCore.Migrations.Tests/global.json       | 5 +++++
 EntityFramework/src/global.json                              | 5 +++++
 .../tests/MySql.EntityFramework.Basic.Tests/global.json      | 5 +++++
 .../tests/MySql.EntityFramework.CodeFirst.Tests/global.json  | 5 +++++
 .../tests/MySql.EntityFramework.Migrations.Tests/global.json | 5 +++++
 MySQL.Data.OpenTelemetry/src/global.json                     | 5 +++++
 MySQL.Data/src/global.json                                   | 5 +++++
 MySQL.Data/tests/MySql.Data.Tests/global.json                | 5 +++++
 MySQL.Data/tests/MySqlX.Data.Tests/global.json               | 5 +++++
 MySql.Web/src/global.json                                    | 5 +++++
 MySql.Web/tests/global.json                                  | 5 +++++
 global.json                                                  | 4 ++--
 15 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 EFCore/src/global.json
 create mode 100644 EFCore/tests/MySql.EFCore.Basic.Tests/global.json
 create mode 100644 EFCore/tests/MySql.EFCore.Design.Tests/global.json
 create mode 100644 EFCore/tests/MySql.EFCore.Migrations.Tests/global.json
 create mode 100644 EntityFramework/src/global.json
 create mode 100644 EntityFramework/tests/MySql.EntityFramework.Basic.Tests/global.json
 create mode 100644 EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/global.json
 create mode 100644 EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/global.json
 create mode 100644 MySQL.Data.OpenTelemetry/src/global.json
 create mode 100644 MySQL.Data/src/global.json
 create mode 100644 MySQL.Data/tests/MySql.Data.Tests/global.json
 create mode 100644 MySQL.Data/tests/MySqlX.Data.Tests/global.json
 create mode 100644 MySql.Web/src/global.json
 create mode 100644 MySql.Web/tests/global.json

diff --git a/EFCore/src/global.json b/EFCore/src/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/EFCore/src/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/global.json b/EFCore/tests/MySql.EFCore.Basic.Tests/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/global.json b/EFCore/tests/MySql.EFCore.Design.Tests/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/global.json b/EFCore/tests/MySql.EFCore.Migrations.Tests/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/EntityFramework/src/global.json b/EntityFramework/src/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/EntityFramework/src/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/global.json b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/global.json b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/global.json b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/MySQL.Data.OpenTelemetry/src/global.json b/MySQL.Data.OpenTelemetry/src/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/MySQL.Data.OpenTelemetry/src/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/MySQL.Data/src/global.json b/MySQL.Data/src/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/MySQL.Data/src/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySql.Data.Tests/global.json b/MySQL.Data/tests/MySql.Data.Tests/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/MySQL.Data/tests/MySql.Data.Tests/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/global.json b/MySQL.Data/tests/MySqlX.Data.Tests/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/MySql.Web/src/global.json b/MySql.Web/src/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/MySql.Web/src/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/MySql.Web/tests/global.json b/MySql.Web/tests/global.json
new file mode 100644
index 000000000..a8ab760dd
--- /dev/null
+++ b/MySql.Web/tests/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
\ No newline at end of file
diff --git a/global.json b/global.json
index f6386c452..4978943db 100644
--- a/global.json
+++ b/global.json
@@ -1,8 +1,8 @@
 {
   "msbuild-sdks": {
     "Microsoft.Build.Traversal": "4.1.0"
-  }
+  },
   "sdk": {
-    "version": "8.0.22"
+    "allowPrerelease": false
   }
 }
\ No newline at end of file

From baf1ce9e4709d87bf25af5380ecd80ac97c63803 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 26 May 2024 14:14:32 -0600
Subject: [PATCH 18/99] WL#16279 [Migrate to NUnit 4.x] - Update

Change-Id: I4323bed71ea1dbc07cd6f5542ae3f9b1ba3aadf6
---
 EFCore/tests/Directory.build.props                   | 12 ------------
 .../tests/MySql.EFCore.Basic.Tests/GlobalUsings.cs   |  5 +++++
 .../tests/MySql.EFCore.Design.Tests/GlobalUsings.cs  |  5 +++++
 .../MySql.EFCore.Migrations.Tests/GlobalUsings.cs    |  5 +++++
 .../src/MySql.Data.EntityFramework.csproj            |  2 +-
 .../GlobalUsings.cs                                  |  5 +++++
 .../MySql.EntityFramework.Basic.Tests.csproj         |  7 ++++---
 .../GlobalUsings.cs                                  |  5 +++++
 .../MySql.EntityFramework.CodeFirst.Tests.csproj     |  7 ++++---
 .../GlobalUsings.cs                                  |  5 +++++
 .../MySql.EntityFramework.Migrations.Tests.csproj    |  7 ++++---
 .../SetUpMigrationsTests.cs                          |  3 ++-
 MySQL.Data/tests/Directory.build.props               | 12 ------------
 MySQL.Data/tests/MySql.Data.Tests/GlobalUsings.cs    |  5 +++++
 MySQL.Data/tests/MySqlX.Data.Tests/GlobalUsings.cs   |  5 +++++
 MySql.Web/tests/Directory.build.props                | 12 ------------
 MySql.Web/tests/GlobalUsings.cs                      |  5 +++++
 17 files changed, 60 insertions(+), 47 deletions(-)
 delete mode 100644 EFCore/tests/Directory.build.props
 create mode 100644 EFCore/tests/MySql.EFCore.Basic.Tests/GlobalUsings.cs
 create mode 100644 EFCore/tests/MySql.EFCore.Design.Tests/GlobalUsings.cs
 create mode 100644 EFCore/tests/MySql.EFCore.Migrations.Tests/GlobalUsings.cs
 create mode 100644 EntityFramework/tests/MySql.EntityFramework.Basic.Tests/GlobalUsings.cs
 create mode 100644 EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/GlobalUsings.cs
 create mode 100644 EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/GlobalUsings.cs
 delete mode 100644 MySQL.Data/tests/Directory.build.props
 create mode 100644 MySQL.Data/tests/MySql.Data.Tests/GlobalUsings.cs
 create mode 100644 MySQL.Data/tests/MySqlX.Data.Tests/GlobalUsings.cs
 delete mode 100644 MySql.Web/tests/Directory.build.props
 create mode 100644 MySql.Web/tests/GlobalUsings.cs

diff --git a/EFCore/tests/Directory.build.props b/EFCore/tests/Directory.build.props
deleted file mode 100644
index 03b886514..000000000
--- a/EFCore/tests/Directory.build.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project>
- <PropertyGroup>
-   <Deterministic>true</Deterministic>
- </PropertyGroup>
-<ItemGroup>
-  <Using Include="NUnit.Framework.Legacy.ClassicAssert" Alias="Assert" />
-  <Using Include="NUnit.Framework.Legacy.CollectionAssert" Alias="CollectionAssert" />
-  <Using Include="NUnit.Framework.Legacy.StringAssert" Alias="StringAssert" />
-  <Using Include="NUnit.Framework.Legacy.DirectoryAssert" Alias="DirectoryAssert" />
-  <Using Include="NUnit.Framework.Legacy.FileAssert" Alias="FileAssert" />
-</ItemGroup></Project>
-
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/GlobalUsings.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/GlobalUsings.cs
new file mode 100644
index 000000000..575c7cfd0
--- /dev/null
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/GlobalUsings.cs
@@ -0,0 +1,5 @@
+global using Assert = NUnit.Framework.Legacy.ClassicAssert;
+global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
+global using StringAssert = NUnit.Framework.Legacy.StringAssert;
+global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
+global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/GlobalUsings.cs b/EFCore/tests/MySql.EFCore.Design.Tests/GlobalUsings.cs
new file mode 100644
index 000000000..575c7cfd0
--- /dev/null
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/GlobalUsings.cs
@@ -0,0 +1,5 @@
+global using Assert = NUnit.Framework.Legacy.ClassicAssert;
+global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
+global using StringAssert = NUnit.Framework.Legacy.StringAssert;
+global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
+global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/GlobalUsings.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/GlobalUsings.cs
new file mode 100644
index 000000000..575c7cfd0
--- /dev/null
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/GlobalUsings.cs
@@ -0,0 +1,5 @@
+global using Assert = NUnit.Framework.Legacy.ClassicAssert;
+global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
+global using StringAssert = NUnit.Framework.Legacy.StringAssert;
+global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
+global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index 21d144a18..eb256a715 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net462;netstandard2.1;</TargetFrameworks>
+    <TargetFrameworks>net462;net48;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <AssemblyName>MySql.Data.EntityFramework</AssemblyName>
     <PackageId>MySql.Data.EntityFramework</PackageId>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/GlobalUsings.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/GlobalUsings.cs
new file mode 100644
index 000000000..575c7cfd0
--- /dev/null
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/GlobalUsings.cs
@@ -0,0 +1,5 @@
+global using Assert = NUnit.Framework.Legacy.ClassicAssert;
+global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
+global using StringAssert = NUnit.Framework.Legacy.StringAssert;
+global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
+global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
index 5ca853e1d..3b3b43b7c 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net462;netstandard2.1;</TargetFrameworks>
+    <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Basic.Tests</AssemblyName>
     <PackageId>MySql.EntityFramework.Basic.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
@@ -25,6 +25,7 @@
     <AssemblyOriginatorKeyFile>..\..\..\ConnectorNetPublicKey.snk</AssemblyOriginatorKeyFile>
     <RootNamespace>MySql.EntityFramework.Basic.Tests</RootNamespace>
     <NoWarn>CA2100</NoWarn>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -45,8 +46,8 @@
     <Reference Include="Microsoft.CSharp" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/GlobalUsings.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/GlobalUsings.cs
new file mode 100644
index 000000000..575c7cfd0
--- /dev/null
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/GlobalUsings.cs
@@ -0,0 +1,5 @@
+global using Assert = NUnit.Framework.Legacy.ClassicAssert;
+global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
+global using StringAssert = NUnit.Framework.Legacy.StringAssert;
+global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
+global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
index cef87a71c..ef07197bf 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net462;netstandard2.1;</TargetFrameworks>
+    <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.CodeFirst.Tests</AssemblyName>
     <PackageId>MySql.EntityFramework.CodeFirst.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
@@ -25,6 +25,7 @@
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>..\..\..\ConnectorNetPublicKey.snk</AssemblyOriginatorKeyFile>
     <NoWarn>CA2100</NoWarn>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -61,8 +62,8 @@
     <Reference Include="Microsoft.CSharp" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/GlobalUsings.cs b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/GlobalUsings.cs
new file mode 100644
index 000000000..575c7cfd0
--- /dev/null
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/GlobalUsings.cs
@@ -0,0 +1,5 @@
+global using Assert = NUnit.Framework.Legacy.ClassicAssert;
+global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
+global using StringAssert = NUnit.Framework.Legacy.StringAssert;
+global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
+global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
index a21af629e..323ac00d4 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.0.0</Version>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net462;netstandard2.1;</TargetFrameworks>
+    <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Migrations.Tests</AssemblyName>
     <PackageId>MySql.EntityFramework.Migrations.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
@@ -24,6 +24,7 @@
     <AssemblyOriginatorKeyFile>..\..\..\ConnectorNetPublicKey.snk</AssemblyOriginatorKeyFile>
     <DelaySign>true</DelaySign>
     <NoWarn>CA2100</NoWarn>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -35,8 +36,8 @@
   <ItemGroup>
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net462'">
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/SetUpMigrationsTests.cs b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/SetUpMigrationsTests.cs
index 62d31c7d6..1b5599a5f 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/SetUpMigrationsTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/SetUpMigrationsTests.cs
@@ -29,6 +29,7 @@
 using MySql.Data.EntityFramework.Properties;
 using MySql.Data.EntityFramework.Tests;
 using NUnit.Framework;
+using NUnit.Framework.Internal;
 using System;
 using System.Configuration;
 using System.Data;
@@ -49,7 +50,7 @@ public class SetUpMigrationsTests : DefaultFixture
     [OneTimeSetUp]
     public new void OneTimeSetup()
     {
-      ConnectionStringBlogContext = RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? MySql.EntityFramework.Migrations.Tests.Properties.Resources.ConnStringMacOS : MySql.EntityFramework.Migrations.Tests.Properties.Resources.ConnString;
+      ConnectionStringBlogContext = System.Environment.OSVersion.Platform == PlatformID.MacOSX ? MySql.EntityFramework.Migrations.Tests.Properties.Resources.ConnStringMacOS : MySql.EntityFramework.Migrations.Tests.Properties.Resources.ConnString;
       
       configuration = new Configuration();
       DataSet dataSet = ConfigurationManager.GetSection("system.data") as System.Data.DataSet;
diff --git a/MySQL.Data/tests/Directory.build.props b/MySQL.Data/tests/Directory.build.props
deleted file mode 100644
index 03b886514..000000000
--- a/MySQL.Data/tests/Directory.build.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project>
- <PropertyGroup>
-   <Deterministic>true</Deterministic>
- </PropertyGroup>
-<ItemGroup>
-  <Using Include="NUnit.Framework.Legacy.ClassicAssert" Alias="Assert" />
-  <Using Include="NUnit.Framework.Legacy.CollectionAssert" Alias="CollectionAssert" />
-  <Using Include="NUnit.Framework.Legacy.StringAssert" Alias="StringAssert" />
-  <Using Include="NUnit.Framework.Legacy.DirectoryAssert" Alias="DirectoryAssert" />
-  <Using Include="NUnit.Framework.Legacy.FileAssert" Alias="FileAssert" />
-</ItemGroup></Project>
-
diff --git a/MySQL.Data/tests/MySql.Data.Tests/GlobalUsings.cs b/MySQL.Data/tests/MySql.Data.Tests/GlobalUsings.cs
new file mode 100644
index 000000000..575c7cfd0
--- /dev/null
+++ b/MySQL.Data/tests/MySql.Data.Tests/GlobalUsings.cs
@@ -0,0 +1,5 @@
+global using Assert = NUnit.Framework.Legacy.ClassicAssert;
+global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
+global using StringAssert = NUnit.Framework.Legacy.StringAssert;
+global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
+global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/GlobalUsings.cs b/MySQL.Data/tests/MySqlX.Data.Tests/GlobalUsings.cs
new file mode 100644
index 000000000..575c7cfd0
--- /dev/null
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/GlobalUsings.cs
@@ -0,0 +1,5 @@
+global using Assert = NUnit.Framework.Legacy.ClassicAssert;
+global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
+global using StringAssert = NUnit.Framework.Legacy.StringAssert;
+global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
+global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/MySql.Web/tests/Directory.build.props b/MySql.Web/tests/Directory.build.props
deleted file mode 100644
index 03b886514..000000000
--- a/MySql.Web/tests/Directory.build.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project>
- <PropertyGroup>
-   <Deterministic>true</Deterministic>
- </PropertyGroup>
-<ItemGroup>
-  <Using Include="NUnit.Framework.Legacy.ClassicAssert" Alias="Assert" />
-  <Using Include="NUnit.Framework.Legacy.CollectionAssert" Alias="CollectionAssert" />
-  <Using Include="NUnit.Framework.Legacy.StringAssert" Alias="StringAssert" />
-  <Using Include="NUnit.Framework.Legacy.DirectoryAssert" Alias="DirectoryAssert" />
-  <Using Include="NUnit.Framework.Legacy.FileAssert" Alias="FileAssert" />
-</ItemGroup></Project>
-
diff --git a/MySql.Web/tests/GlobalUsings.cs b/MySql.Web/tests/GlobalUsings.cs
new file mode 100644
index 000000000..575c7cfd0
--- /dev/null
+++ b/MySql.Web/tests/GlobalUsings.cs
@@ -0,0 +1,5 @@
+global using Assert = NUnit.Framework.Legacy.ClassicAssert;
+global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
+global using StringAssert = NUnit.Framework.Legacy.StringAssert;
+global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
+global using FileAssert = NUnit.Framework.Legacy.FileAssert;

From 7456bd102cc4193d61b12f82312b3db063aacea1 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 5 Jun 2024 12:58:26 -0600
Subject: [PATCH 19/99] Bug#36701652 [EFCore test failing due to
 misconfiguration]

Change-Id: I91b60bf0aea34a8ee368532b5827e337b219c4e1
---
 CHANGES                                       |   1 +
 .../Conventions/MySQLConventionSetBuilder.cs  |   3 +-
 .../Internal/MySQLAnnotationProvider.cs       | 199 +++++++-----------
 3 files changed, 81 insertions(+), 122 deletions(-)

diff --git a/CHANGES b/CHANGES
index c4b67410d..5b11b2590 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@
 - Fixed bug IIS Website is crashing after upgrading MySQL.Data package to 8.3.0 (Oracle Bug #36483069).
 - Updated Wix Toolset to 4.0.5 (Oracle Bug #36627858).
 - Fixed bug disabling of mysql_native_password in server causes errors in testsuite (Oracle Bug #36529814).
+- Fixed bug EFCore test failing due to misconfiguration (Oracle Bug #36701652).
 
 
 8.4.0
diff --git a/EFCore/src/Metadata/Conventions/MySQLConventionSetBuilder.cs b/EFCore/src/Metadata/Conventions/MySQLConventionSetBuilder.cs
index f80db87e8..51691531a 100644
--- a/EFCore/src/Metadata/Conventions/MySQLConventionSetBuilder.cs
+++ b/EFCore/src/Metadata/Conventions/MySQLConventionSetBuilder.cs
@@ -67,10 +67,9 @@ public override ConventionSet CreateConventionSet()
 
       conventionSet.PropertyAddedConventions.Add(new MySqlCharsetAttributeConvention(Dependencies));
       conventionSet.PropertyAddedConventions.Add(new MySqlCollationAttributeConvention(Dependencies));
-      #if !NET8_0
       conventionSet.EntityTypeAddedConventions.Add(new MySqlEntityCharsetAttributeConvention(Dependencies));
       conventionSet.EntityTypeAddedConventions.Add(new MySqlEntityCollationAttributeConvention(Dependencies));
-      #endif
+
       ValueGenerationConvention valueGeneratorConvention = new MySQLValueGenerationConvention(Dependencies, RelationalDependencies);
       ReplaceConvention(conventionSet.EntityTypeBaseTypeChangedConventions, valueGeneratorConvention);
       ReplaceConvention(conventionSet.EntityTypePrimaryKeyChangedConventions, valueGeneratorConvention);
diff --git a/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs b/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs
index dc22f8f4d..74a77b683 100644
--- a/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs
+++ b/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs
@@ -70,29 +70,23 @@ public override IEnumerable<IAnnotation> For(ITable table, bool designTime)
       {
         yield break;
       }
-#if !NET8_0
-      var entityType = table.EntityTypeMappings.First().EntityType;
-
-      if (GetActualEntityTypeCharSet(entityType) is string charSet)
+#if NET8_0
+      var entityType = table.EntityTypeMappings.First().TypeBase;
+      if (GetActualTypeBaseCharSet(entityType) is string charSet)
         yield return new Annotation(MySQLAnnotationNames.Charset, charSet);
 
-      if (GetActualEntityTypeCollation(entityType) is string collation)
+      if (GetActualTypeBaseCollation(entityType) is string collation)
         yield return new Annotation(RelationalAnnotationNames.Collation, collation);
-
-      foreach (var annotation in entityType.GetAnnotations().Where(a => a.Name is MySQLAnnotationNames.StoreOptions))
-        yield return annotation;
 #else
-      var typeBase = table.EntityTypeMappings.First().TypeBase;
-
-      if (GetActualTypeBaseCharSet(typeBase) is string charSet)
+      var entityType = table.EntityTypeMappings.First().EntityType;
+      if (GetActualEntityTypeCharSet(entityType) is string charSet)
         yield return new Annotation(MySQLAnnotationNames.Charset, charSet);
 
-      if (GetActualTypeBaseCollation(typeBase) is string collation)
+      if (GetActualEntityTypeCollation(entityType) is string collation)
         yield return new Annotation(RelationalAnnotationNames.Collation, collation);
-
-      foreach (var annotation in typeBase.GetAnnotations().Where(a => a.Name is MySQLAnnotationNames.StoreOptions))
-        yield return annotation;
 #endif
+      foreach (var annotation in entityType.GetAnnotations().Where(a => a.Name is MySQLAnnotationNames.StoreOptions))
+        yield return annotation;
     }
 
     public override IEnumerable<IAnnotation> For(IUniqueConstraint constraint, bool designTime)
@@ -131,7 +125,6 @@ public override IEnumerable<IAnnotation> For(ITableIndex index, bool designTime)
         yield return new Annotation(MySQLAnnotationNames.SpatialIndex, isSpatial.Value);
     }
 
-#if NET6_0
     public override IEnumerable<IAnnotation> For(IColumn column, bool designTime)
     {
       if (!designTime)
@@ -139,49 +132,25 @@ public override IEnumerable<IAnnotation> For(IColumn column, bool designTime)
 
       var table = StoreObjectIdentifier.Table(column.Table.Name, column.Table.Schema);
       var properties = column.PropertyMappings.Select(m => m.Property).ToArray();
-
-      if (column.PropertyMappings.Where(
-        m => m.TableMapping.IsSharedTablePrincipal && m.TableMapping.EntityType == m.Property.DeclaringEntityType)
-        .Select(m => m.Property)
-        .FirstOrDefault(p => p.GetValueGenerationStrategy(table) == MySQLValueGenerationStrategy.IdentityColumn) is IProperty identityProperty)
-      {
-        var valueGenerationStrategy = identityProperty.GetValueGenerationStrategy(table);
-        yield return new Annotation(MySQLAnnotationNames.ValueGenerationStrategy, valueGenerationStrategy);
-      }
-      else if (properties.FirstOrDefault
-        (p => p.GetValueGenerationStrategy(table) == MySQLValueGenerationStrategy.ComputedColumn) is IProperty computedProperty)
-      {
-        var valueGenerationStrategy = computedProperty.GetValueGenerationStrategy(table);
-        yield return new Annotation(MySQLAnnotationNames.ValueGenerationStrategy, valueGenerationStrategy);
-      }
-    }
-#elif NET8_0
-
-public override IEnumerable<IAnnotation> For(IColumn column, bool designTime)
-    {
-      if (!designTime)
-        yield break;
-
-      var table = StoreObjectIdentifier.Table(column.Table.Name, column.Table.Schema);
-      var properties = column.PropertyMappings.Select(m => m.Property).ToArray();
-
-      if (column.PropertyMappings.Where(m => m.TableMapping.IsSharedTablePrincipal ?? true
-      && m.TableMapping.TypeBase == m.Property.DeclaringEntityType)
-        .Select(m => m.Property)
-        .FirstOrDefault(p => p.GetValueGenerationStrategy(table) == MySQLValueGenerationStrategy.IdentityColumn) is IProperty identityProperty)
+#if NET8_0
+      if (column.PropertyMappings.Where(m => m.TableMapping.IsSharedTablePrincipal ?? true && m.TableMapping.TypeBase == m.Property.DeclaringType)
+      .Select(m => m.Property)
+      .FirstOrDefault(p => p.GetValueGenerationStrategy(table) == MySQLValueGenerationStrategy.IdentityColumn) is IProperty identityProperty)
+#else
+      if (column.PropertyMappings.Where(m => m.TableMapping.IsSharedTablePrincipal && m.TableMapping.EntityType == m.Property.DeclaringEntityType)
+      .Select(m => m.Property)
+      .FirstOrDefault(p => p.GetValueGenerationStrategy(table) == MySQLValueGenerationStrategy.IdentityColumn) is IProperty identityProperty)
+#endif
       {
         var valueGenerationStrategy = identityProperty.GetValueGenerationStrategy(table);
         yield return new Annotation(MySQLAnnotationNames.ValueGenerationStrategy, valueGenerationStrategy);
       }
-      else if (properties.FirstOrDefault
-        (p => p.GetValueGenerationStrategy(table) == MySQLValueGenerationStrategy.ComputedColumn) is IProperty computedProperty)
+      else if (properties.FirstOrDefault(p => p.GetValueGenerationStrategy(table) == MySQLValueGenerationStrategy.ComputedColumn) is IProperty computedProperty)
       {
         var valueGenerationStrategy = computedProperty.GetValueGenerationStrategy(table);
         yield return new Annotation(MySQLAnnotationNames.ValueGenerationStrategy, valueGenerationStrategy);
       }
     }
-#endif
-
 
     protected virtual string GetActualModelCharSet(IModel model)
     {
@@ -193,148 +162,138 @@ protected virtual string GetActualModelCollation(IModel model)
       return model.GetCollation()!;
     }
 
-
-#if !NET8_0
-    protected virtual string? GetActualEntityTypeCharSet(IEntityType entityType)
+#if NET8_0
+    protected virtual string? GetActualTypeBaseCharSet(ITypeBase typeBase)
     {
-      var entityTypeCharSet = entityType.GetCharSet();
+      var typeBaseCharSet = typeBase.GetCharSet();
 
-      if (entityTypeCharSet is not null)
-        return entityTypeCharSet;
+      if (typeBaseCharSet is not null)
+        return typeBaseCharSet;
 
-      if (entityTypeCharSet is null)
+      if (typeBaseCharSet is null)
       {
-        var entityTypeCollation = entityType.GetCollation();
-        var actualModelCharSet = GetActualModelCharSet(entityType.Model);
+        var typeBaseCollation = typeBase.GetCollation();
+        var actualModelCharSet = GetActualModelCharSet(typeBase.Model);
 
-        if (entityTypeCollation is not null)
+        if (typeBaseCollation is not null)
         {
-          return actualModelCharSet is not null && entityTypeCollation.StartsWith(actualModelCharSet, StringComparison.OrdinalIgnoreCase)
+          return actualModelCharSet is not null && typeBaseCollation.StartsWith(actualModelCharSet, StringComparison.OrdinalIgnoreCase)
             ? actualModelCharSet : null;
         }
 
-        var actualModelCollation = GetActualModelCollation(entityType.Model);
+        var actualModelCollation = GetActualModelCollation(typeBase.Model);
 
         if (actualModelCollation is not null)
         {
           return actualModelCharSet is not null && actualModelCollation.StartsWith(actualModelCharSet, StringComparison.OrdinalIgnoreCase)
             ? actualModelCharSet : null;
         }
-
         return actualModelCharSet;
       }
-
       return null;
     }
 
-    protected virtual string? GetActualEntityTypeCollation(IEntityType entityType)
+    protected virtual string? GetActualTypeBaseCollation(ITypeBase typeBase)
     {
-      var entityTypeCollation = entityType.GetCollation();
+      var typeBaseCollation = typeBase.GetCollation();
 
-      if (entityTypeCollation is not null)
-        return entityTypeCollation;
+      if (typeBaseCollation is not null)
+        return typeBaseCollation;
 
-      if (entityTypeCollation is null)
+      if (typeBaseCollation is null)
       {
-        var entityTypeCharSet = entityType.GetCharSet();
-        var actualModelCollation = GetActualModelCollation(entityType.Model);
+        var typeBaseCharSet = typeBase.GetCharSet();
+        var actualModelCollation = GetActualModelCollation(typeBase.Model);
 
-        if (entityTypeCharSet is not null)
+        if (typeBaseCharSet is not null)
         {
-          return actualModelCollation is not null && actualModelCollation.StartsWith(entityTypeCharSet, StringComparison.OrdinalIgnoreCase)
+          return actualModelCollation is not null && actualModelCollation.StartsWith(typeBaseCharSet, StringComparison.OrdinalIgnoreCase)
             ? actualModelCollation : null;
         }
-
         return actualModelCollation;
       }
-
       return null;
     }
-
-    protected virtual string? GetActualPropertyCharSet(IProperty[] properties)
-    {
-      return properties.Select(p => p.GetCharSet()).FirstOrDefault(s => s is not null) ??
-        properties.Select(
-          p => p.FindTypeMapping() is MySQLStringTypeMapping
-          ? GetActualEntityTypeCharSet(p.DeclaringEntityType) is string charSet &&
-          (p.GetCollation() is not string collation ||
-          collation.StartsWith(charSet, StringComparison.OrdinalIgnoreCase))
-          ? charSet
-          : null
-          : null)
-        .FirstOrDefault(s => s is not null);
-    }
 #else
-    protected virtual string? GetActualTypeBaseCharSet(ITypeBase typeBase)
+    protected virtual string? GetActualEntityTypeCharSet(IEntityType entityType)
     {
-      var typeBaseCharSet = typeBase.GetCharSet();
+      var entityTypeCharSet = entityType.GetCharSet();
 
-      if (typeBaseCharSet is not null)
-        return typeBaseCharSet;
+      if (entityTypeCharSet is not null)
+        return entityTypeCharSet;
 
-      if (typeBaseCharSet is null)
+      if (entityTypeCharSet is null)
       {
-        var typeBaseCollation = typeBase.GetCollation();
-        var actualModelCharSet = GetActualModelCharSet(typeBase.Model);
+        var entityTypeCollation = entityType.GetCollation();
+        var actualModelCharSet = GetActualModelCharSet(entityType.Model);
 
-        if (typeBaseCollation is not null)
+        if (entityTypeCollation is not null)
         {
-          return actualModelCharSet is not null && typeBaseCollation.StartsWith(actualModelCharSet, StringComparison.OrdinalIgnoreCase)
+          return actualModelCharSet is not null && entityTypeCollation.StartsWith(actualModelCharSet, StringComparison.OrdinalIgnoreCase)
             ? actualModelCharSet : null;
         }
 
-        var actualModelCollation = GetActualModelCollation(typeBase.Model);
+        var actualModelCollation = GetActualModelCollation(entityType.Model);
 
         if (actualModelCollation is not null)
         {
           return actualModelCharSet is not null && actualModelCollation.StartsWith(actualModelCharSet, StringComparison.OrdinalIgnoreCase)
             ? actualModelCharSet : null;
         }
-
         return actualModelCharSet;
       }
-
       return null;
     }
 
-    protected virtual string? GetActualTypeBaseCollation(ITypeBase typeBase)
+    protected virtual string? GetActualEntityTypeCollation(IEntityType entityType)
     {
-      var typeBaseCollation = typeBase.GetCollation();
+      var entityTypeCollation = entityType.GetCollation();
 
-      if (typeBaseCollation is not null)
-        return typeBaseCollation;
+      if (entityTypeCollation is not null)
+        return entityTypeCollation;
 
-      if (typeBaseCollation is null)
+      if (entityTypeCollation is null)
       {
-        var typeBaseCharSet = typeBase.GetCharSet();
-        var actualModelCollation = GetActualModelCollation(typeBase.Model);
+        var entityTypeCharSet = entityType.GetCharSet();
+        var actualModelCollation = GetActualModelCollation(entityType.Model);
 
-        if (typeBaseCharSet is not null)
+        if (entityTypeCharSet is not null)
         {
-          return actualModelCollation is not null && actualModelCollation.StartsWith(typeBaseCharSet, StringComparison.OrdinalIgnoreCase)
+          return actualModelCollation is not null && actualModelCollation.StartsWith(entityTypeCharSet, StringComparison.OrdinalIgnoreCase)
             ? actualModelCollation : null;
         }
-
         return actualModelCollation;
       }
-
       return null;
     }
+#endif
 
     protected virtual string? GetActualPropertyCharSet(IProperty[] properties)
     {
+#if NET8_0
+      return properties.Select(p => p.GetCharSet()).FirstOrDefault(s => s is not null) ??
+        properties.Select(
+        p => p.FindTypeMapping() is MySQLStringTypeMapping
+        ? GetActualTypeBaseCharSet(p.DeclaringType) is string charSet &&
+        (p.GetCollation() is not string collation ||
+        collation.StartsWith(charSet, StringComparison.OrdinalIgnoreCase))
+        ? charSet
+        : null
+        : null)
+        .FirstOrDefault(s => s is not null);
+    }
+#else
       return properties.Select(p => p.GetCharSet()).FirstOrDefault(s => s is not null) ??
         properties.Select(
-          p => p.FindTypeMapping() is MySQLStringTypeMapping
-          ? GetActualTypeBaseCharSet(p.DeclaringType) is string charSet &&
-          (p.GetCollation() is not string collation ||
-          collation.StartsWith(charSet, StringComparison.OrdinalIgnoreCase))
-          ? charSet
-          : null
-          : null)
+        p => p.FindTypeMapping() is MySQLStringTypeMapping
+        ? GetActualEntityTypeCharSet(p.DeclaringEntityType) is string charSet &&
+        (p.GetCollation() is not string collation ||
+        collation.StartsWith(charSet, StringComparison.OrdinalIgnoreCase))
+        ? charSet
+        : null
+        : null)
         .FirstOrDefault(s => s is not null);
     }
 #endif
-
   }
 }

From b5945b636087f11a871fd52a711296748b77a7b3 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Tue, 11 Jun 2024 14:54:29 -0600
Subject: [PATCH 20/99] Bump up version to 9.1.0

Change-Id: Ic417825f9d8fad6dc04e289baf7abc3367654bb9
---
 CHANGES                                                     | 3 +++
 .../templates/custom/partials/class.header.tmpl.partial     | 2 +-
 EntityFramework/src/MySql.Data.EntityFramework.csproj       | 2 +-
 .../MySql.EntityFramework.Basic.Tests.csproj                | 2 +-
 .../MySql.EntityFramework.CodeFirst.Tests.csproj            | 2 +-
 .../MySql.EntityFramework.Migrations.Tests.csproj           | 2 +-
 .../src/MySQL.Data.OpenTelemetry.csproj                     | 2 +-
 MySQL.Data/src/MySql.Data.csproj                            | 2 +-
 MySQL.Data/src/Properties/VersionInfo.cs                    | 6 +++---
 MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj   | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj | 2 +-
 MySql.Web/src/MySql.Web.csproj                              | 2 +-
 MySql.Web/tests/MySql.Web.Tests.csproj                      | 2 +-
 13 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5b11b2590..c80c87130 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+9.1.0
+
+
 9.0.0
 - Updated NUnit to 4.x (WL16279).
 - Removed deprecated OldGetStringBehavior option (WL16280).
diff --git a/Documentation/templates/custom/partials/class.header.tmpl.partial b/Documentation/templates/custom/partials/class.header.tmpl.partial
index 9df19ebdd..2eff37671 100644
--- a/Documentation/templates/custom/partials/class.header.tmpl.partial
+++ b/Documentation/templates/custom/partials/class.header.tmpl.partial
@@ -25,7 +25,7 @@
 {{/implements.0}}
 <h6><strong>{{__global.namespace}}</strong>: {{{namespace.specName.0.value}}}</h6>
 <h6><strong>{{__global.assembly}}</strong>: {{assemblies.0}}.dll</h6>
-<h6><strong>Version</strong>: 9.0.0</h6>
+<h6><strong>Version</strong>: 9.1.0</h6>
 <h5 id="{{id}}_syntax">{{__global.syntax}}</h5>
 <div class="codewrapper">
   <pre><code class="lang-{{_lang}} hljs">{{syntax.content.0.value}}</code></pre>
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index eb256a715..15f1caca9 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.0.0</Version>
+    <Version>9.1.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
index 3b3b43b7c..a421205e8 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.CodeFirTests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.0.0</Version>
+    <Version>9.1.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Basic.Tests</AssemblyName>
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
index ef07197bf..edc58b2ce 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.CodeFirst.Tests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.0.0</Version>
+    <Version>9.1.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.CodeFirst.Tests</AssemblyName>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
index 323ac00d4..213dd36a9 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.Migrations.Tests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.0.0</Version>
+    <Version>9.1.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Migrations.Tests</AssemblyName>
diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index 70d0f257f..96097c5f2 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.OpenTelemetry</Description>
     <Copyright>Copyright © 2023, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.0.0</Version>
+    <Version>9.1.0</Version>
     <Authors>Oracle</Authors>  
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>MySql.Data.OpenTelemetry</AssemblyName>
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index 8d18d61c7..39432847d 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -5,7 +5,7 @@
     <Description>MySql.Data.MySqlClient .Net Core Class Library</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.0.0</Version>
+    <Version>9.1.0</Version>
     <Authors>Oracle</Authors>
     <AssemblyName>MySql.Data</AssemblyName>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0;</TargetFrameworks>
diff --git a/MySQL.Data/src/Properties/VersionInfo.cs b/MySQL.Data/src/Properties/VersionInfo.cs
index 545a5808b..123b70f96 100644
--- a/MySQL.Data/src/Properties/VersionInfo.cs
+++ b/MySQL.Data/src/Properties/VersionInfo.cs
@@ -40,7 +40,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.0.0")]
-[assembly: AssemblyInformationalVersion("9.0.0")]
-[assembly: AssemblyFileVersion("9.0.0")]
+[assembly: AssemblyVersion("9.1.0")]
+[assembly: AssemblyInformationalVersion("9.1.0")]
+[assembly: AssemblyFileVersion("9.1.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index b7ed1a817..3af700db8 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -4,7 +4,7 @@
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
-    <Version>9.0.0</Version>
+    <Version>9.1.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index e404eda36..27f1dff62 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -4,7 +4,7 @@
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
-    <Version>9.0.0</Version>
+    <Version>9.1.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
diff --git a/MySql.Web/src/MySql.Web.csproj b/MySql.Web/src/MySql.Web.csproj
index c35ac7721..602a6e64c 100644
--- a/MySql.Web/src/MySql.Web.csproj
+++ b/MySql.Web/src/MySql.Web.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Web</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.0.0</Version>
+    <Version>9.1.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
diff --git a/MySql.Web/tests/MySql.Web.Tests.csproj b/MySql.Web/tests/MySql.Web.Tests.csproj
index 4459f0cf9..1733d05a7 100644
--- a/MySql.Web/tests/MySql.Web.Tests.csproj
+++ b/MySql.Web/tests/MySql.Web.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Web.Tests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.0.0</Version>
+    <Version>9.1.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.Web.Tests</AssemblyName>

From 6d2eb6be6bc1e4eefdd54755c15b33c0b216688c Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 30 Jun 2024 19:28:13 -0600
Subject: [PATCH 21/99] WL#16397 [Use constraint model in test assertions]

Change-Id: Ia614f8291a307a074283b5ccf3e89753fb13632c
---
 CHANGES                                       |   1 +
 .../BasicGuidTests.cs                         |   6 +-
 .../ConcurrencyTests.cs                       |   2 +-
 .../ConnectionTests.cs                        |  10 +-
 .../MySql.EFCore.Basic.Tests/DataTests.cs     |  12 +-
 .../DbFunctionsMySQLTest.cs                   |  20 +-
 .../MySql.EFCore.Basic.Tests/EFCoreTests.cs   |  18 +-
 .../FluentAPITests.cs                         |  36 +-
 .../FunctionalTests.cs                        |  18 +-
 .../MySql.EFCore.Basic.Tests/GlobalUsings.cs  |   5 -
 .../LoadingRelatedDataTests.cs                |  62 +-
 .../MySql.EFCore.Basic.Tests/ModelingTests.cs |  14 +-
 .../MultiSchemaTests.cs                       |  10 +-
 .../MySQLDatabaseFacadeTest.cs                |  22 +-
 .../MySQLTypeMapperTests.cs                   |  64 +-
 .../ShadowPropertiesTests.cs                  |  14 +-
 .../Utils/EntityTestsFixtureClass.cs          |   2 +-
 .../MySql.EFCore.Design.Tests/GlobalUsings.cs |   5 -
 .../MySQLAnnotationCodeGeneratorTest.cs       |   4 +-
 .../MySQLCodeGeneratorTest.cs                 |  14 +-
 .../MySQLDatabaseModelFactoryTest.cs          |  52 +-
 .../MySQLDesignTimeProviderServicesTest.cs    |   6 +-
 .../GlobalUsings.cs                           |   5 -
 .../MySQLHistoryRepositoryTests.cs            |   5 +-
 .../MySqlMigrationsGeneratorTest.cs           |  26 +-
 .../CanonicalFunctions.cs                     |  66 +-
 .../DataTypeTests.cs                          |   8 +-
 .../DatesTypesTests.cs                        |   8 +-
 .../DefaultFixture.cs                         |   4 +-
 .../DeleteTests.cs                            |   8 +-
 .../ExpressionTests.cs                        |  14 +-
 .../GlobalUsings.cs                           |   5 -
 .../InsertTests.cs                            |  12 +-
 .../Paging.cs                                 |   2 +-
 .../ProceduresAndFunctions.cs                 |   4 +-
 .../ProviderManifestTests.cs                  |  14 +-
 .../ProviderServicesTests.cs                  |  12 +-
 .../SetOperators.cs                           |   4 +-
 .../SimpleQuery.cs                            |   2 +-
 .../Wizard.cs                                 |  14 +-
 .../CodeFirstFixture.cs                       |   6 +-
 .../CodeFirstTests.cs                         | 217 +++---
 .../GlobalUsings.cs                           |   5 -
 .../GlobalUsings.cs                           |   5 -
 .../MySqlMigrationsTests.cs                   |  44 +-
 .../tests/MySql.Data.Tests/AttributeTests.cs  |  46 +-
 .../tests/MySql.Data.Tests/AuthTests.cs       | 236 +++---
 .../tests/MySql.Data.Tests/BlobTests.cs       |  54 +-
 .../tests/MySql.Data.Tests/CharSetTests.cs    |  86 +--
 .../MySql.Data.Tests/CharSetUTF8Tests.cs      |  76 +-
 .../ClientSideFailoverTests.cs                |  26 +-
 MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs | 152 ++--
 .../ConnectionStringBuilderTests.cs           | 152 ++--
 .../tests/MySql.Data.Tests/ConnectionTests.cs | 196 ++---
 .../tests/MySql.Data.Tests/DataTypeTests.cs   | 466 ++++++------
 .../tests/MySql.Data.Tests/DateTimeTests.cs   | 122 ++--
 .../tests/MySql.Data.Tests/DnsSrvTests.cs     |  12 +-
 .../tests/MySql.Data.Tests/ExceptionTests.cs  |  10 +-
 .../Framework/netstandard2_0/CultureTests.cs  |  26 +-
 .../Framework/netstandard2_0/DataTypeTests.cs |  14 +-
 .../Framework/netstandard2_0/DateTimeTests.cs |  32 +-
 .../netstandard2_0/GetSchemaTests.cs          | 454 ++++++------
 .../netstandard2_0/InstallerTests.cs          |   2 +-
 .../netstandard2_0/MySQLHelperTests.cs        |  76 +-
 .../MySqlCommandBuilderTests.cs               |  73 +-
 .../netstandard2_0/MySqlDataAdapterTests.cs   | 336 ++++-----
 .../netstandard2_0/MySqlDataReaderTests.cs    |   6 +-
 .../netstandard2_0/NETCore20Tests.cs          |  34 +-
 .../netstandard2_0/ProcedureParameterTests.cs | 410 ++++++-----
 .../netstandard2_0/ReplicationTests.cs        |   2 +-
 .../netstandard2_0/ThreadingTests.cs          |   4 +-
 .../netstandard2_0/TimeoutAndCancel.cs        |  30 +-
 .../Framework/netstandard2_0/TypeTests.cs     |  24 +-
 .../netstandard2_0/UsageAdvisorTests.cs       | 102 +--
 .../tests/MySql.Data.Tests/LoggingTests.cs    |  36 +-
 .../MySql.Data.Tests/MySqlBulkLoaderTests.cs  | 134 ++--
 .../MySql.Data.Tests/MySqlDataReaderTests.cs  | 298 ++++----
 .../MySql.Data.Tests/OutputParametersBatch.cs |  87 ++-
 .../tests/MySql.Data.Tests/ParameterTests.cs  | 188 ++---
 .../tests/MySql.Data.Tests/PoolingTests.cs    |  38 +-
 .../MySql.Data.Tests/PreparedStatements.cs    | 187 +++--
 .../tests/MySql.Data.Tests/ScriptExecution.cs |  40 +-
 .../MySql.Data.Tests/SimpleTransactions.cs    |  18 +-
 .../tests/MySql.Data.Tests/SqlServerMode.cs   |   4 +-
 MySQL.Data/tests/MySql.Data.Tests/SslTests.cs | 236 +++---
 .../tests/MySql.Data.Tests/StoredProcedure.cs | 130 ++--
 .../tests/MySql.Data.Tests/StressTests.cs     |  12 +-
 MySQL.Data/tests/MySql.Data.Tests/Syntax.cs   |  76 +-
 MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs  |  16 +-
 .../tests/MySql.Data.Tests/TableCaching.cs    |  26 +-
 .../tests/MySql.Data.Tests/Tokenizer.cs       | 242 +++----
 .../tests/MySql.Data.Tests/Transactions.cs    |  40 +-
 .../tests/MySql.Data.Tests/UnixSockets.cs     |   2 +-
 .../tests/MySqlX.Data.Tests/BaseTest.cs       |   2 +-
 .../tests/MySqlX.Data.Tests/BasicFindTests.cs | 622 ++++++++--------
 .../MySqlX.Data.Tests/BasicSelectTests.cs     |  18 +-
 .../CharsetAndCollationTests.cs               | 504 ++++++-------
 .../ClientSideFailoverTests.cs                | 206 +++---
 .../tests/MySqlX.Data.Tests/ClientTests.cs    | 344 ++++-----
 .../MySqlX.Data.Tests/CloseConnectionTests.cs |  42 +-
 .../MySqlX.Data.Tests/CollectionAsyncTests.cs |  10 +-
 .../MySqlX.Data.Tests/CollectionIndexTests.cs | 412 +++++------
 .../MySqlX.Data.Tests/CollectionTests.cs      | 378 +++++-----
 .../MySqlX.Data.Tests/CompressionTests.cs     | 238 +++---
 .../MySqlX.Data.Tests/CrudInsertTests.cs      | 618 ++++++++--------
 .../MySqlX.Data.Tests/CrudRemoveTests.cs      | 138 ++--
 .../CrudTests/CrudGCTests.cs                  |   6 +-
 .../CrudTests/DocBufferingTests.cs            |   4 +-
 .../MySqlX.Data.Tests/CrudUpdateTests.cs      | 458 ++++++------
 .../MySqlX.Data.Tests/CustomTypeTests.cs      |  30 +-
 .../tests/MySqlX.Data.Tests/DbDocTests.cs     |  14 +-
 .../tests/MySqlX.Data.Tests/DnsSrvTests.cs    |  28 +-
 .../MySqlX.Data.Tests/ExprParserTests.cs      | 277 ++++---
 .../tests/MySqlX.Data.Tests/GlobalUsings.cs   |   5 -
 .../MySqlX.Data.Tests/JsonParserTests.cs      |  48 +-
 .../tests/MySqlX.Data.Tests/MergePatch.cs     | 678 +++++++++---------
 .../PreparedStatementsTests.cs                | 226 +++---
 .../RelationalTests/ColumnMetadataTests.cs    | 140 ++--
 .../RelationalTests/DataTypeTests.cs          | 209 +++---
 .../RelationalTests/DateTimeTests.cs          |  30 +-
 .../RelationalTests/RelationalGCTests.cs      |   8 +-
 .../RelationalTests/RowBufferingTests.cs      |   6 +-
 .../RelationalTests/SqlTests.cs               | 158 ++--
 .../RelationalTests/TableAsyncTests.cs        |  18 +-
 .../RelationalTests/TableDeleteTests.cs       |  14 +-
 .../RelationalTests/TableInsertTests.cs       |  32 +-
 .../RelationalTests/TableSelectTests.cs       | 344 ++++-----
 .../RelationalTests/TableUpdateTests.cs       |  56 +-
 .../RelationalTests/ViewTests.cs              |  46 +-
 .../tests/MySqlX.Data.Tests/SchemaTests.cs    |  46 +-
 .../tests/MySqlX.Data.Tests/SessionTests.cs   | 408 +++++------
 .../tests/MySqlX.Data.Tests/SslTests.cs       | 270 +++----
 .../MySqlX.Data.Tests/TransactionTests.cs     | 196 ++---
 .../MySqlX.Data.Tests/UnixSocketsTests.cs     |  80 +--
 MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs   | 162 ++---
 .../XConnectionStringBuilderTests.cs          |  38 +-
 MySql.Web/tests/GlobalUsings.cs               |   5 -
 MySql.Web/tests/PersonalizationTests.cs       |  14 +-
 MySql.Web/tests/ProfileTests.cs               |  50 +-
 MySql.Web/tests/RoleManagement.cs             |  30 +-
 MySql.Web/tests/SchemaManagerTests.cs         | 112 +--
 MySql.Web/tests/SchemaTests.cs                |  28 +-
 MySql.Web/tests/SessionTests.cs               |  12 +-
 MySql.Web/tests/SimpleMembership.cs           |  60 +-
 MySql.Web/tests/SiteMapTests.cs               |  32 +-
 MySql.Web/tests/UserManagement.cs             | 192 ++---
 146 files changed, 6997 insertions(+), 7061 deletions(-)
 delete mode 100644 EFCore/tests/MySql.EFCore.Basic.Tests/GlobalUsings.cs
 delete mode 100644 EFCore/tests/MySql.EFCore.Design.Tests/GlobalUsings.cs
 delete mode 100644 EFCore/tests/MySql.EFCore.Migrations.Tests/GlobalUsings.cs
 delete mode 100644 EntityFramework/tests/MySql.EntityFramework.Basic.Tests/GlobalUsings.cs
 delete mode 100644 EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/GlobalUsings.cs
 delete mode 100644 EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/GlobalUsings.cs
 delete mode 100644 MySQL.Data/tests/MySqlX.Data.Tests/GlobalUsings.cs
 delete mode 100644 MySql.Web/tests/GlobalUsings.cs

diff --git a/CHANGES b/CHANGES
index c80c87130..6467ea3be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 9.1.0
+- Updated test suite to use constraint-based assertions (WL16397).
 
 
 9.0.0
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs
index 69bdcc775..3b0eb6bf3 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs
@@ -59,17 +59,17 @@ public void TestEmptyGUID()
         context.Database.EnsureCreated();
         var filter = new[] { Guid.Empty };
         var resultFilter = context.Guidtable.Where(t => filter.Contains(t.Uuid)).ToArray();
-        Assert.IsNotNull(resultFilter);
+        Assert.That(resultFilter, Is.Not.Null);
         Random rnd = new Random();
         var guid = Guid.NewGuid();
         var record = new GuidTable { Id = rnd.Next(100), Uuid = guid };
         context.Guidtable.Add(record);
         context.SaveChanges();
         var rows = context.Guidtable.Count();
-        Assert.AreEqual(1, rows);
+        Assert.That(rows, Is.EqualTo(1));
         filter[0] = guid;
         var resultFilter2 = context.Guidtable.Where(t => filter.Contains(t.Uuid)).ToArray();
-        Assert.AreEqual(1, resultFilter2.Count());
+        Assert.That(resultFilter2.Count(), Is.EqualTo(1));
       }
     }
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs
index 4a2572b8a..a0ac73b84 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs
@@ -84,7 +84,7 @@ public void CanHandleConcurrencyConflicts()
                   var originalValue = entry.Property(property.Name).OriginalValue;
                   var databaseValue = databaseEntry.Property(property.Name).CurrentValue;
                   entry.Property(property.Name).OriginalValue = databaseEntry.Property(property.Name).CurrentValue;
-                  Assert.AreEqual("Jane", databaseValue);
+                  Assert.That(databaseValue, Is.EqualTo("Jane"));
                 }
               }
             }
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
index c54c09f04..e919b9341 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
@@ -137,7 +137,7 @@ public void CanCreateConnectionString()
     {
       using (var connection = CreateConnection(CreateOptions()))
       {
-        Assert.IsInstanceOf<MySqlConnection>(connection.DbConnection);
+        Assert.That(connection.DbConnection, Is.InstanceOf<MySqlConnection>());
       }
     }
 
@@ -150,10 +150,10 @@ public void CanCreateMainConnection()
         {
           var csb = new MySqlConnectionStringBuilder(source.ConnectionString);
           var csb1 = new MySqlConnectionStringBuilder(MySQLTestStore.BaseConnectionString);
-          Assert.True(csb.Database == csb1.Database);
-          Assert.True(csb.Port == csb1.Port);
-          Assert.True(csb.Server == csb1.Server);
-          Assert.True(csb.UserID == csb1.UserID);
+          Assert.That(csb.Database, Is.EqualTo(csb1.Database));
+          Assert.That(csb.Port, Is.EqualTo(csb1.Port));
+          Assert.That(csb.Server, Is.EqualTo(csb1.Server));
+          Assert.That(csb.UserID, Is.EqualTo(csb1.UserID));
         }
       }
     }
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs
index a542c2e30..39db69db3 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs
@@ -68,17 +68,17 @@ public async Task AsyncData()
 
         var result = context.SaveChangesAsync();
         result.Wait(30_000);
-        Assert.IsNull(result.Exception);
-        Assert.AreEqual(4, result.Result);
+        Assert.That(result.Exception, Is.Null);
+        Assert.That(result.Result, Is.EqualTo(4));
       }
 
       using (var context = new WorldContext())
       {
         var continent = await context.FindAsync<Continent>("AS");
-        Assert.AreEqual("Asia", continent!.Name);
+        Assert.That(continent!.Name, Is.EqualTo("Asia"));
 
         var continents = await context.Continents.ToListAsync();
-        Assert.AreEqual(4, continents.Count);
+        Assert.That(continents.Count, Is.EqualTo(4));
       }
     }
 
@@ -94,10 +94,10 @@ public void ZeroDatetime()
         context.Database.EnsureDeleted();
         context.Database.EnsureCreated();
 
-        Assert.AreEqual(1, context.Database.ExecuteSqlInterpolated($"INSERT IGNORE INTO MyTest (`Date`) VALUES('0000-00-00')"));
+        Assert.That(context.Database.ExecuteSqlInterpolated($"INSERT IGNORE INTO MyTest (`Date`) VALUES('0000-00-00')"), Is.EqualTo(1));
 
         var item = context.MyTest.First();
-        Assert.AreEqual(DateTime.MinValue, item.Date);
+        Assert.That(item.Date, Is.EqualTo(DateTime.MinValue));
       }
     }
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs
index 1085dba0f..3cab9cf34 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs
@@ -68,7 +68,7 @@ public void DateDiffYear()
         var yearsDiff = DateTime.Now.Year - lastUpdate.Year;
         var count = context.Actor.Count(a => EF.Functions.DateDiffYear(a.LastUpdate, DateTime.Now) > 0);
 
-        Assert.AreEqual(200, count);
+        Assert.That(count, Is.EqualTo(200));
       }
     }
 
@@ -81,7 +81,7 @@ public void DateDiffMonth()
         var count = context.Actor
             .Count(a => EF.Functions.DateDiffMonth(a.LastUpdate, DateTime.Now) >= monthsDiff - 1);
 
-        Assert.AreEqual(200, count);
+        Assert.That(count, Is.EqualTo(200));
       }
     }
 
@@ -94,7 +94,7 @@ public void DateDiffDay()
         var count = context.Actor
             .Count(a => EF.Functions.DateDiffDay(a.LastUpdate, DateTime.Now) == daysDiff);
 
-        Assert.AreEqual(200, count, "TotalDays: " + daysDiff);
+        Assert.That(count, Is.EqualTo(200), "TotalDays: " + daysDiff);
       }
     }
 
@@ -107,7 +107,7 @@ public void DateDiffHour()
         var count = context.Actor
             .Count(a => EF.Functions.DateDiffHour(a.LastUpdate, DateTime.Now) == hoursDiff);
 
-        Assert.AreEqual(200, count, "TotalHours: " + hoursDiff);
+        Assert.That(count, Is.EqualTo(200), "TotalHours: " + hoursDiff);
       }
     }
 
@@ -120,7 +120,7 @@ public void DateDiffMinute()
         var count = context.Actor
             .Count(a => EF.Functions.DateDiffMinute(a.LastUpdate, DateTime.Now) == minutesDiff);
 
-        Assert.AreEqual(200, count, "TotalMinutes: " + minutesDiff);
+        Assert.That(count, Is.EqualTo(200), "TotalMinutes: " + minutesDiff);
       }
     }
 
@@ -133,7 +133,7 @@ public void DateDiffSecond()
         var count = context.Actor
             .Count(a => EF.Functions.DateDiffSecond(a.LastUpdate, DateTime.Now) >= secondsDiff);
 
-        Assert.AreEqual(200, count, "TotalSeconds: " + secondsDiff);
+        Assert.That(count, Is.EqualTo(200), "TotalSeconds: " + secondsDiff);
       }
     }
 
@@ -145,7 +145,7 @@ public void DateDiffMicrosecond()
         var count = context.Actor
             .Count(a => EF.Functions.DateDiffMicrosecond(a.LastUpdate, DateTime.Now) == 0);
 
-        Assert.AreEqual(0, count);
+        Assert.That(count, Is.EqualTo(0));
       }
     }
 
@@ -156,7 +156,7 @@ public void LikeIntLiteral()
       {
         var count = context.Actor.Count(o => EF.Functions.Like(o.ActorId, "%A%"));
 
-        Assert.AreEqual(0, count);
+        Assert.That(count, Is.EqualTo(0));
       }
     }
 
@@ -167,7 +167,7 @@ public void LikeDateTimeLiteral()
       {
         var count = context.Actor.Count(o => EF.Functions.Like(o.LastUpdate, "%A%"));
 
-        Assert.AreEqual(0, count);
+        Assert.That(count, Is.EqualTo(0));
       }
     }
 
@@ -178,7 +178,7 @@ public void LikeIntLiteralWithEscape()
       {
         var count = context.Actor.Count(o => EF.Functions.Like(o.ActorId, "!%", "!"));
 
-        Assert.AreEqual(0, count);
+        Assert.That(count, Is.EqualTo(0));
       }
     }
   }
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
index fd84eb897..d062758c1 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
@@ -51,8 +51,8 @@ public void ExplicitlyCompiledQueries()
       using (SakilaLiteContext context = new SakilaLiteContext())
       {
         var customer = _customerById(context, 9);
-        Assert.AreEqual(9, customer.CustomerId);
-        Assert.AreEqual("MOORE", customer.LastName);
+        Assert.That(customer.CustomerId, Is.EqualTo(9));
+        Assert.That(customer.LastName, Is.EqualTo("MOORE"));
       }
     }
 
@@ -68,14 +68,14 @@ public void GraphNewAndExistingEntities()
         context.Attach(actor = new Actor { ActorId = 21, FirstName = "KIRSTEN", LastName = "PALTROW" });
 
         var changes = context.ChangeTracker.Entries();
-        Assert.AreEqual(2, changes.Count());
+        Assert.That(changes.Count(), Is.EqualTo(2));
         Assert.That(changes.Select(c => c.State), Has.Exactly(1).Matches<EntityState>(state => state.Equals(EntityState.Added)));
         Assert.That(changes.Select(c => c.State), Has.Exactly(1).Matches<EntityState>(state => state.Equals(EntityState.Unchanged)));
 
         context.SaveChanges();
 
         var list = context.Actor.ToList();
-        Assert.AreEqual(1, list.Count);
+        Assert.That(list.Count, Is.EqualTo(1));
       }
     }
 
@@ -93,8 +93,8 @@ public void StringInterpolationInSqlCommands()
         context.Database.ExecuteSqlInterpolated($"INSERT INTO actor(actor_id, first_name, last_name, last_update) VALUES ({id}, {firstName}, {lastName}, {lastUpdate:u})");
         Actor actor = context.Set<Actor>().FromSqlInterpolated($"SELECT * FROM actor WHERE actor_id={id} and last_name={lastName}").First();
 
-        Assert.AreEqual(id, actor.ActorId);
-        Assert.AreEqual(firstName, actor.FirstName);
+        Assert.That(actor.ActorId, Is.EqualTo(id));
+        Assert.That(actor.FirstName, Is.EqualTo(firstName));
       }
     }
 
@@ -156,7 +156,7 @@ public void QueryWithDate()
         && w.LastUpdate >= DateTime.Today.AddDays(-15));
 
         var res = scenario1.Count();
-        Assert.AreEqual(0, res);
+        Assert.That(res, Is.EqualTo(0));
 
         var dt = DateTime.Today.AddDays(-15);
         var scenario2 = context.Actor.Where(
@@ -165,7 +165,7 @@ public void QueryWithDate()
         && w.LastUpdate >= dt);
 
         var res2 = scenario2.Count();
-        Assert.AreEqual(0, res2);
+        Assert.That(res2, Is.EqualTo(0));
 
         var scenario3 = context.Actor.Where(
         w => w.FirstName == "GARY"
@@ -173,7 +173,7 @@ public void QueryWithDate()
         && w.LastUpdate >= DateTime.Today.AddDays(3));
 
         var res3 = scenario3.Count();
-        Assert.AreEqual(0, res3);
+        Assert.That(res3, Is.EqualTo(0));
       }
     }
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs
index c34dd7f03..8a81ddb6f 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs
@@ -76,7 +76,7 @@ public void EnsureRelationalPatterns()
         context.Employees.Add(e);
         context.SaveChanges();
         var employeeComputedColumn = context.Employees.FirstOrDefault();
-        Assert.True(employeeComputedColumn!.DisplayName!.Equals("Stuart Jos"), "Wrong computed column");
+        Assert.That(employeeComputedColumn!.DisplayName!.Equals("Stuart Jos"), "Wrong computed column");
         context.Database.EnsureDeleted();
       }
     }
@@ -101,7 +101,7 @@ public void CanUseModelWithDateTimeOffset()
           context.QuickEntity.Add(e);
           context.SaveChanges();
           var row = context.QuickEntity.FirstOrDefault();
-          Assert.AreEqual(dt, row!.Created);
+          Assert.That(row!.Created, Is.EqualTo(dt));
         }
         finally
         {
@@ -130,7 +130,7 @@ public async Task CanUseModelWithDateTimeOffsetAsync()
           context.QuickEntity.Add(e);
           context.SaveChanges();
           var result = await context.QuickEntity.FirstOrDefaultAsync();
-          Assert.AreEqual(dt, result!.Created);
+          Assert.That(result!.Created, Is.EqualTo(dt));
         }
         catch (Exception)
         {
@@ -164,7 +164,7 @@ public void CanNameAlternateKey()
           var reader = cmd.ExecuteReader();
           while (reader.Read())
           {
-            Assert.True(reader.GetString(1).ToString().Equals("AlternateKey_LicensePlate"), "Wrong index creation");
+            Assert.That(reader.GetString(1).ToString().Equals("AlternateKey_LicensePlate"), "Wrong index creation");
           }
         }
       }
@@ -189,7 +189,7 @@ public void CanUseToTable()
           var reader = cmd.ExecuteReader();
           while (reader.Read())
           {
-            Assert.True(reader.GetString(0).ToString().Equals("somecars"), "Wrong table name");
+            Assert.That(reader.GetString(0).ToString().Equals("somecars"), "Wrong table name");
           }
         }
         context.Database.EnsureDeleted();
@@ -216,7 +216,7 @@ public void CanUseConcurrency()
           var reader = cmd.ExecuteReader();
           while (reader.Read())
           {
-            Assert.True(reader.GetString(0).ToString().Equals("somecars"), "Wrong table name");
+            Assert.That(reader.GetString(0).ToString().Equals("somecars"), "Wrong table name");
           }
         }
         context.Database.EnsureDeleted();
@@ -247,7 +247,7 @@ public void CanUseConcurrencyToken()
         context.Employees.Add(e);
         context.SaveChanges();
         var employeeComputedColumn = context.Employees.SingleOrDefault();
-        Assert.True(employeeComputedColumn!.DisplayName!.Equals("Stuart Jos"), "Wrong computed column");
+        Assert.That(employeeComputedColumn!.DisplayName!.Equals("Stuart Jos"), "Wrong computed column");
         context.Database.EnsureDeleted();
       }
     }
@@ -329,9 +329,9 @@ public void CanUseContainsWithInvalidValue()
         context.Employees.Add(e);
         context.SaveChanges();
         var result = context.Employees.Where(t => t.FirstName!.Contains("XXXXXXXX$%^&*()!")).ToList();
-        Assert.IsEmpty(result);
+        Assert.That(result, Is.Empty);
         result = context.Employees.Where(t => t.FirstName!.Contains("null")).ToList();
-        Assert.IsEmpty(result);
+        Assert.That(result, Is.Empty);
         context.Database.EnsureDeleted();
       }
     }
@@ -378,10 +378,10 @@ public void TableAttributeTest()
           MySqlCommand cmd = new MySqlCommand("SHOW TABLES", conn);
           using (MySqlDataReader reader = cmd.ExecuteReader())
           {
-            Assert.True(reader.Read());
-            StringAssert.AreEqualIgnoringCase("continentlist", reader.GetString(0));
-            Assert.True(reader.Read());
-            StringAssert.AreEqualIgnoringCase("countrylist", reader.GetString(0));
+            Assert.That(reader.Read());
+            Assert.That(reader.GetString(0), Is.EqualTo("continentlist").IgnoreCase);
+            Assert.That(reader.Read());
+            Assert.That(reader.GetString(0), Is.EqualTo("countrylist").IgnoreCase);
           }
 
         }
@@ -407,7 +407,7 @@ public void CharsetTest()
             string createTable = reader.GetString(1);
             createTable = Regex.Replace(createTable, @"\t|\n|\r", string.Empty);
             string txt = "CREATE TABLE `testcharsetda` (  `TestCharsetDAId` varbinary(255) NOT NULL,  PRIMARY KEY (`TestCharsetDAId`)) ENGINE=InnoDB DEFAULT CHARSET=ascii";
-            StringAssert.AreEqualIgnoringCase(txt, createTable);
+            Assert.That(createTable, Is.EqualTo(txt).IgnoreCase);
           }
 
           cmd.CommandText = "SHOW CREATE TABLE `TestCharsetFA`";
@@ -422,12 +422,12 @@ public void CharsetTest()
             if (createTable.Contains("COLLATE latin7_general_ci"))
             {
               txt = "CREATE TABLE `testcharsetfa` (  `TestCharsetFAId` varchar(255) CHARACTER SET latin7 COLLATE latin7_general_ci NOT NULL,  PRIMARY KEY (`TestCharsetFAId`)) ENGINE=InnoDB DEFAULT CHARSET=utf16";
-              StringAssert.AreEqualIgnoringCase(txt, createTable);
+              Assert.That(createTable, Is.EqualTo(txt).IgnoreCase);
             }
             else
             {
               txt = "CREATE TABLE `testcharsetfa` (  `TestCharsetFAId` varchar(255) CHARACTER SET latin7 NOT NULL,  PRIMARY KEY (`TestCharsetFAId`)) ENGINE=InnoDB DEFAULT CHARSET=utf16";
-              StringAssert.AreEqualIgnoringCase(txt, createTable);
+              Assert.That(createTable, Is.EqualTo(txt).IgnoreCase);
             }
           }
 
@@ -438,7 +438,7 @@ public void CharsetTest()
             string createTable = reader.GetString(1);
             createTable = Regex.Replace(createTable, @"\t|\n|\r", string.Empty);
             string txt = "CREATE TABLE `testcollationda` (  `TestCollationDAId` varchar(255) CHARACTER SET greek COLLATE greek_bin NOT NULL,  PRIMARY KEY (`TestCollationDAId`)) ENGINE=InnoDB DEFAULT CHARSET=cp932 COLLATE=cp932_bin";
-            StringAssert.AreEqualIgnoringCase(txt, createTable);
+            Assert.That(createTable, Is.EqualTo(txt).IgnoreCase);
           }
 
           cmd.CommandText = "SHOW CREATE TABLE `TestCollationFA`";
@@ -448,7 +448,7 @@ public void CharsetTest()
             string createTable = reader.GetString(1);
             createTable = Regex.Replace(createTable, @"\t|\n|\r", string.Empty);
             string txt = "CREATE TABLE `testcollationfa` (  `TestCollationFAId` varchar(255) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL,  PRIMARY KEY (`TestCollationFAId`)) ENGINE=InnoDB DEFAULT CHARSET=koi8u COLLATE=koi8u_bin";
-            StringAssert.AreEqualIgnoringCase(txt, createTable);
+            Assert.That(createTable, Is.EqualTo(txt).IgnoreCase);
           }
         }
       }
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/FunctionalTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/FunctionalTests.cs
index 6c0d235c2..ef926a1b6 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/FunctionalTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/FunctionalTests.cs
@@ -62,7 +62,7 @@ public void CanConnectWithConnectionOnConfiguring()
       {
         context.Database.EnsureDeleted();
         context.Database.EnsureCreated();
-        Assert.True(context.Posts.Count() == 0);
+        Assert.That(context.Posts.Count(), Is.EqualTo(0));
         context.Database.EnsureDeleted();
       }
     }
@@ -79,7 +79,7 @@ public void CanThrowExceptionWhenNoConfiguration()
 
       using (var context = serviceProvider.GetRequiredService<NoConfigurationContext>())
       {
-        Assert.AreEqual(CoreStrings.NoProviderConfigured, Assert.Throws<InvalidOperationException>(() => context.Blogs.Any())!.Message);
+        Assert.That(Assert.Throws<InvalidOperationException>(() => context.Blogs.Any())!.Message, Is.EqualTo(CoreStrings.NoProviderConfigured));
       }
     }
 
@@ -104,7 +104,7 @@ public void CreatedDb()
           var reader = cmd.ExecuteReader();
           while (reader.Read())
           {
-            Assert.True(string.Equals(dbname, reader.GetString(0), StringComparison.CurrentCultureIgnoreCase), "Database was not created");
+            Assert.That(string.Equals(dbname, reader.GetString(0), StringComparison.CurrentCultureIgnoreCase), "Database was not created");
           }
         }
         context.Database.EnsureDeleted();
@@ -132,7 +132,7 @@ public void EnsureRelationalPatterns()
           var reader = cmd.ExecuteReader();
           while (reader.Read())
           {
-            Assert.True(string.Equals(dbname, reader.GetString(0), StringComparison.CurrentCultureIgnoreCase), "Database was not created");
+            Assert.That(string.Equals(dbname, reader.GetString(0), StringComparison.CurrentCultureIgnoreCase), "Database was not created");
           }
         }
         context.Database.EnsureDeleted();
@@ -152,8 +152,8 @@ public void CanUseIgnoreEntity()
       using (var context = serviceProvider.GetRequiredService<SimpleContextWithIgnore>())
       {
         context.Database.EnsureCreated();
-        Assert.True(context.Model.GetEntityTypes().Count() == 2, "Wrong model generation");
-        Assert.True(context.Blogs.ToList().Count == 0, "");
+        Assert.That(context.Model.GetEntityTypes().Count(), Is.EqualTo(2), "Wrong model generation");
+        Assert.That(context.Blogs.ToList().Count, Is.EqualTo(0), "");
         context.Database.EnsureDeleted();
       }
     }
@@ -167,7 +167,7 @@ public void CanUseOptionsInDbContextCtor()
                                               new MySqlConnection(MySQLTestStore.CreateConnectionString("db-optionsindbcontext"))))
       {
         context.Database.EnsureCreated();
-        Assert.True(context.Blogs.Count() == 0);
+        Assert.That(context.Blogs.Count(), Is.EqualTo(0));
         context.Database.EnsureDeleted();
       }
 
@@ -205,11 +205,11 @@ public OptionsContext(DbContextOptions options, MySqlConnection connection)
 
       protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
       {
-        Assert.AreSame(_options, optionsBuilder.Options);
+        Assert.That(optionsBuilder.Options, Is.SameAs(_options));
 
         optionsBuilder.UseMySQL(_connection);
 
-        Assert.AreNotSame(_options, optionsBuilder.Options);
+        Assert.That(optionsBuilder.Options, Is.Not.SameAs(_options));
       }
 
       public override void Dispose()
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/GlobalUsings.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/GlobalUsings.cs
deleted file mode 100644
index 575c7cfd0..000000000
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/GlobalUsings.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-global using Assert = NUnit.Framework.Legacy.ClassicAssert;
-global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
-global using StringAssert = NUnit.Framework.Legacy.StringAssert;
-global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
-global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs
index cec6177a3..4378672b3 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs
@@ -63,7 +63,7 @@ public void OneTimeTearDown()
     [Test]
     public void CanUseSkipAndTake()
     {
-      Assert.False(context.Database.EnsureCreated());
+      Assert.That(!context.Database.EnsureCreated());
       var people
               = context.Set<Guest>()
                   .Skip(2)
@@ -76,56 +76,56 @@ var people
     [Test]
     public void CanIncludeAddressData()
     {
-      Assert.False(context.Database.EnsureCreated());
+      Assert.That(!context.Database.EnsureCreated());
       var people
               = context.Set<Guest>()
                   .Include(p => p.Address)
                   .ToList();
 
-      Assert.AreEqual(4, people.Count);
-      Assert.AreEqual(3, people.Count(p => p.Address != null));
+      Assert.That(people.Count, Is.EqualTo(4));
+      Assert.That(people.Count(p => p.Address != null), Is.EqualTo(3));
     }
 
     [Test]
     public void CanIncludeGuestData()
     {
-      Assert.False(context.Database.EnsureCreated());
+      Assert.That(!context.Database.EnsureCreated());
       var ad
               = context.Set<Address>()
                   .Include(p => p.Guest)
                   .ToList();
 
-      Assert.AreEqual(3, ad.Count);
+      Assert.That(ad.Count, Is.EqualTo(3));
       var rows = ad.Select(g => g.Guest).Where(a => a != null).ToList();
-      Assert.AreEqual(3, rows.Count());
+      Assert.That(rows.Count(), Is.EqualTo(3));
     }
 
 
     [Test]
     public void CanIncludeGuestShadowProperty()
     {
-      Assert.False(context.Database.EnsureCreated());
+      Assert.That(!context.Database.EnsureCreated());
       var addressRelative
             = context.Set<AddressRelative>()
                 .Include(a => a.Relative)
                 .ToList();
 
-      Assert.AreEqual(3, addressRelative.Count);
-      Assert.True(addressRelative.All(p => p.Relative != null));
+      Assert.That(addressRelative.Count, Is.EqualTo(3));
+      Assert.That(addressRelative.All(p => p.Relative != null));
     }
 
     [Test]
     public void MixClientServerEvaluation()
     {
-      Assert.False(context.Database.EnsureCreated());
+      Assert.That(!context.Database.EnsureCreated());
       var list
             = context.Set<Address>()
             .OrderByDescending(a => a.City)
             .Select(a => new { Id = a.IdAddress, City = SetCity(a.City!) })
             .ToList();
 
-      Assert.AreEqual(3, list.Count);
-      StringAssert.EndsWith(" city", list.First().City);
+      Assert.That(list.Count, Is.EqualTo(3));
+      Assert.That(list.First().City, Does.EndWith(" city"));
     }
 
     private static string SetCity(string name)
@@ -136,16 +136,16 @@ private static string SetCity(string name)
     [Test]
     public void RawSqlQueries()
     {
-      Assert.False(context.Database.EnsureCreated());
+      Assert.That(!context.Database.EnsureCreated());
       var guests = context.Set<Guest>().FromSqlRaw("SELECT * FROM Guests")
         .ToList();
-      Assert.AreEqual(4, guests.Count);
+      Assert.That(guests.Count, Is.EqualTo(4));
     }
 
     [Test]
     public void UsingTransactions()
     {
-      Assert.False(context.Database.EnsureCreated());
+      Assert.That(!context.Database.EnsureCreated());
       using (var transaction = context.Database.BeginTransaction())
       {
         context.Set<Guest>().Add(new Guest()
@@ -154,15 +154,15 @@ public void UsingTransactions()
         });
         context.SaveChanges();
       }
-      Assert.AreEqual(4, context.Set<Guest>().Count());
+      Assert.That(context.Set<Guest>().Count(), Is.EqualTo(4));
     }
 
     [Test]
     public void DbSetFind()
     {
       var address = context.Set<Address>().Find(1);
-      Assert.NotNull(address);
-      Assert.AreEqual("Michigan", address!.City);
+      Assert.That(address, Is.Not.Null);
+      Assert.That(address!.City, Is.EqualTo("Michigan"));
     }
 
 
@@ -199,10 +199,10 @@ public void JsonDataTest()
           }
           //Adding "COLLATION" to the string validation at table creation (this happens since MySql 8.0.5 Server)
           if (jsonTableDesc.Contains("COLLATE=utf8mb4_0900_ai_ci"))
-            StringAssert.AreEqualIgnoringCase($"CREATE TABLE `jsonentity` (\n  `Id` smallint{smallintWidth} NOT NULL AUTO_INCREMENT," +
-            $"\n  `jsoncol` json DEFAULT NULL,\n  PRIMARY KEY (`Id`)\n) ENGINE=InnoDB DEFAULT CHARSET={charset} COLLATE=utf8mb4_0900_ai_ci", jsonTableDesc);
-          else StringAssert.AreEqualIgnoringCase($"CREATE TABLE `jsonentity` (\n  `Id` smallint{smallintWidth} NOT NULL AUTO_INCREMENT,\n  `jsoncol` json DEFAULT NULL,\n  PRIMARY KEY (`Id`)\n) " +
-            $"ENGINE=InnoDB DEFAULT CHARSET={charset}", jsonTableDesc);
+            Assert.That(jsonTableDesc, Is.EqualTo($"CREATE TABLE `jsonentity` (\n  `Id` smallint{smallintWidth} NOT NULL AUTO_INCREMENT," +
+            $"\n  `jsoncol` json DEFAULT NULL,\n  PRIMARY KEY (`Id`)\n) ENGINE=InnoDB DEFAULT CHARSET={charset} COLLATE=utf8mb4_0900_ai_ci").IgnoreCase);
+          else Assert.That(jsonTableDesc, Is.EqualTo($"CREATE TABLE `jsonentity` (\n  `Id` smallint{smallintWidth} NOT NULL AUTO_INCREMENT,\n  `jsoncol` json DEFAULT NULL,\n  PRIMARY KEY (`Id`)\n) " +
+            $"ENGINE=InnoDB DEFAULT CHARSET={charset}").IgnoreCase);
         }
 
         context.JsonEntity.Add(new JsonData()
@@ -211,7 +211,7 @@ public void JsonDataTest()
         });
         context.SaveChanges();
         JsonData json = context.JsonEntity.First();
-        Assert.AreEqual("{ \"name\": \"Ronald\", \"city\": \"Austin\" }", json.jsoncol);
+        Assert.That(json.jsoncol, Is.EqualTo("{ \"name\": \"Ronald\", \"city\": \"Austin\" }"));
       }
     }
 
@@ -234,7 +234,7 @@ public void JsonInvalidData()
         });
 
         var ex = Assert.Throws<DbUpdateException>(() => context.SaveChanges())?.GetBaseException();
-        Assert.AreEqual(3140, ((MySqlException)ex!).Number);
+        Assert.That(((MySqlException)ex!).Number, Is.EqualTo(3140));
       }
     }
 
@@ -266,8 +266,8 @@ public void ComputedColumns()
         context.Triangle.AddRange(data);
         context.Triangle.Add(data[1]);
         context.SaveChanges();
-        Assert.AreEqual(75, data[0].Area);
-        Assert.AreEqual(50, data[1].Area);
+        Assert.That(data[0].Area, Is.EqualTo(75));
+        Assert.That(data[1].Area, Is.EqualTo(50));
       }
     }
 
@@ -278,12 +278,12 @@ public void ExplicitLoading()
       {
         context.PopulateData();
         var america = context.Continents.Single(c => c.Code == "AM");
-        Assert.Null(america.Countries);
+        Assert.That(america.Countries, Is.Null);
         context.Entry(america)
           .Collection(c => c.Countries!)
           .Load();
-        Assert.AreEqual(5, america.Countries!.Count);
-        Assert.AreEqual("United States", america.Countries.Single(c => c.Code == "US").Name);
+        Assert.That(america.Countries!.Count, Is.EqualTo(5));
+        Assert.That(america.Countries.Single(c => c.Code == "US").Name, Is.EqualTo("United States"));
       }
     }
 
@@ -294,7 +294,7 @@ public void ExplicitLoadingQueryingRelatedEntitites()
       {
         context.PopulateData();
         var asia = context.Continents.Single(c => c.Code == "AS");
-        Assert.Null(asia.Countries);
+        Assert.That(asia.Countries, Is.Null);
         var list = context.Entry(asia)
           .Collection(c => c.Countries!)
           .Query()
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ModelingTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ModelingTests.cs
index cf1746d64..8ba63fd0b 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ModelingTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ModelingTests.cs
@@ -124,10 +124,10 @@ public void LikeFunction()
       using (SakilaLiteContext context = new SakilaLiteContext())
       {
         var query = context.Actor.Where(c => EF.Functions.Like(c.LastName!, "A%")).ToList();
-        Assert.IsNotEmpty(query);
+        Assert.That(query, Is.Not.Empty);
         foreach (Actor actor in query)
         {
-          StringAssert.StartsWith("A", actor.LastName);
+          Assert.That(actor.LastName, Does.StartWith("A"));
         }
       }
     }
@@ -158,8 +158,8 @@ public void OwnedEntityTypes()
           context.SaveChanges();
 
           var customer = context.Customer.Where(p => p.Address!.AddressId == 1).First();
-          Assert.AreEqual(1, customer.CustomerId);
-          Assert.AreEqual("47 MySakila Drive", customer.Address!.Address);
+          Assert.That(customer.CustomerId, Is.EqualTo(1));
+          Assert.That(customer.Address!.Address, Is.EqualTo("47 MySakila Drive"));
         }
         finally
         {
@@ -173,8 +173,8 @@ public void ModelLevelQueryFilter()
     {
       using (SakilaLiteContext context = new SakilaLiteContext())
       {
-        Assert.AreEqual(584, context.Customer.Count());
-        Assert.AreEqual(599, context.Customer.IgnoreQueryFilters().Count());
+        Assert.That(context.Customer.Count(), Is.EqualTo(584));
+        Assert.That(context.Customer.IgnoreQueryFilters().Count(), Is.EqualTo(599));
       }
     }
 
@@ -194,7 +194,7 @@ public void ConvertToType()
           Text = b.FirstName,
         }).ToList();
 
-        Assert.IsNotEmpty(ls);
+        Assert.That(ls, Is.Not.Empty);
       }
     }
   }
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MultiSchemaTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/MultiSchemaTests.cs
index c40e6a61f..0a4959aed 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MultiSchemaTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MultiSchemaTests.cs
@@ -77,11 +77,11 @@ public void MultiSchemaTest()
           {
             while (reader.Read())
             {
-              Assert.Contains(reader.GetString(0), databases);
+              Assert.That(databases.Contains(reader.GetString(0)));
               count++;
             }
           }
-          Assert.AreEqual(3, count);
+          Assert.That(count, Is.EqualTo(3));
         }
       }
     }
@@ -137,9 +137,9 @@ public void LoadingData()
         });
 
         context.SaveChanges();
-        Assert.AreEqual(2, context.Car.Count());
-        Assert.AreEqual(2, context.BodyShop.Count());
-        Assert.AreEqual(2, context.Employee.Count());
+        Assert.That(context.Car.Count(), Is.EqualTo(2));
+        Assert.That(context.BodyShop.Count(), Is.EqualTo(2));
+        Assert.That(context.Employee.Count(), Is.EqualTo(2));
       }
     }
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLDatabaseFacadeTest.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLDatabaseFacadeTest.cs
index 6fb864f2b..1ce799ba6 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLDatabaseFacadeTest.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLDatabaseFacadeTest.cs
@@ -46,7 +46,7 @@ public void IsMySQLWhenUsingOnConfiguring()
     {
       using (var context = new MySQLOnConfiguringContext())
       {
-        Assert.True(context.Database.IsMySql());
+        Assert.That(context.Database.IsMySql());
       }
     }
 
@@ -56,7 +56,7 @@ public void IsMySQLInOnModelCreatingWhenUsingOnConfiguring()
       using (var context = new MySQLOnModelContext())
       {
         var _ = context.Model; // Trigger context initialization
-        Assert.True(context.IsMySQLSet);
+        Assert.That(context.IsMySQLSet == true);
       }
     }
 
@@ -66,7 +66,7 @@ public void IsMySQLInConstructorWhenUsingOnConfiguring()
       using (var context = new MySQLConstructorContext())
       {
         var _ = context.Model; // Trigger context initialization
-        Assert.True(context.IsMySQLSet);
+        Assert.That(context.IsMySQLSet == true);
       }
     }
 
@@ -75,13 +75,12 @@ public void CannotUseIsMySQLInOnConfiguring()
     {
       using (var context = new MySQLUseInOnConfiguringContext())
       {
-        Assert.AreEqual(
-            CoreStrings.RecursiveOnConfiguring,
+        Assert.That(
             Assert.Throws<InvalidOperationException>(
                 () =>
                 {
                   var _ = context.Model; // Trigger context initialization
-                })!.Message);
+                })!.Message, Is.EqualTo(CoreStrings.RecursiveOnConfiguring));
       }
     }
 
@@ -93,7 +92,7 @@ public void IsMySQLWhenUsingConstructor()
               .UseInternalServiceProvider(MySQLFixture.DefaultServiceProvider)
               .UseMySQL("Database=Maltesers").Options))
       {
-        Assert.True(context.Database.IsMySql());
+        Assert.That(context.Database.IsMySql());
       }
     }
 
@@ -106,7 +105,7 @@ public void IsMySQLInOnModelCreatingWhenUsingConstructor()
               .UseMySQL("Database=Maltesers").Options))
       {
         var _ = context.Model; // Trigger context initialization
-        Assert.True(context.IsMySQLSet);
+        Assert.That(context.IsMySQLSet == true);
       }
     }
 
@@ -119,7 +118,7 @@ public void IsMySQLInConstructorWhenUsingConstructor()
               .UseMySQL("Database=Maltesers").Options))
       {
         var _ = context.Model; // Trigger context initialization
-        Assert.True(context.IsMySQLSet);
+        Assert.That(context.IsMySQLSet == true);
       }
     }
 
@@ -131,13 +130,12 @@ public void CannotUseIsMySQLInOnConfiguringWithConstructor()
               .UseInternalServiceProvider(MySQLFixture.DefaultServiceProvider)
               .UseMySQL("Database=Maltesers").Options))
       {
-        Assert.AreEqual(
-            CoreStrings.RecursiveOnConfiguring,
+        Assert.That(
             Assert.Throws<InvalidOperationException>(
                 () =>
                 {
                   var _ = context.Model; // Trigger context initialization
-                })!.Message);
+                })!.Message, Is.EqualTo(CoreStrings.RecursiveOnConfiguring));
       }
     }
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
index b4aedf779..8e7173496 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
@@ -103,33 +103,33 @@ public void InsertAllDataTypes()
       using (var context = new AllDataTypesContext())
       {
         var data = context.AllDataTypes.First();
-        Assert.AreEqual(1, data.AddressNumber1);
-        Assert.AreEqual(2, data.AddressNumber2);
-        Assert.AreEqual(3, data.AddressNumber3);
-        Assert.AreEqual(4, data.AddressNumber4);
-        Assert.AreEqual((long)5, data.AddressNumber5);
-        Assert.AreEqual(6.36f, data.AddressNumber6);
-        Assert.AreEqual(7.49f, data.AddressNumber7);
-        Assert.AreEqual(8.64d, data.AddressNumber8);
-        Assert.AreEqual(9.81m, data.AddressNumber9);
-        Assert.AreEqual(10, data.AddressNumber10);
-        Assert.AreEqual("BuildingName1", data.BuildingName1);
-        Assert.AreEqual("BuildingName2", data.BuildingName2);
-        Assert.AreEqual("BuildingName3", data.BuildingName3);
-        Assert.AreEqual("BuildingName4", data.BuildingName4);
-        Assert.AreEqual("BuildingName5", data.BuildingName5);
-        Assert.AreEqual("BuildingName6".PadRight(120, '\0'), UTF8Encoding.UTF8.GetString(data.BuildingName6!));
-        Assert.AreEqual("BuildingName7", UTF8Encoding.UTF8.GetString(data.BuildingName7!));
-        Assert.AreEqual("BuildingName8", UTF8Encoding.UTF8.GetString(data.BuildingName8!));
-        Assert.AreEqual("BuildingName9", UTF8Encoding.UTF8.GetString(data.BuildingName9!));
-        Assert.AreEqual("BuildingName10", UTF8Encoding.UTF8.GetString(data.BuildingName10!));
-        Assert.AreEqual("small", data.BuildingName11);
-        Assert.AreEqual("small,medium,large", data.BuildingName12);
-        Assert.AreEqual(now.Date, data.BuildingName13);
-        Assert.AreEqual(now, data.BuildingName14);
-        Assert.AreEqual(now.TimeOfDay, data.BuildingName15);
-        Assert.AreEqual(now, data.BuildingName16);
-        Assert.AreEqual(now.Year, data.BuildingName17);
+        Assert.That(data.AddressNumber1, Is.EqualTo(1));
+        Assert.That(data.AddressNumber2, Is.EqualTo(2));
+        Assert.That(data.AddressNumber3, Is.EqualTo(3));
+        Assert.That(data.AddressNumber4, Is.EqualTo(4));
+        Assert.That(data.AddressNumber5, Is.EqualTo((long)5));
+        Assert.That(data.AddressNumber6, Is.EqualTo(6.36f));
+        Assert.That(data.AddressNumber7, Is.EqualTo(7.49f));
+        Assert.That(data.AddressNumber8, Is.EqualTo(8.64d));
+        Assert.That(data.AddressNumber9, Is.EqualTo(9.81m));
+        Assert.That(data.AddressNumber10, Is.EqualTo(10));
+        Assert.That(data.BuildingName1, Is.EqualTo("BuildingName1"));
+        Assert.That(data.BuildingName2, Is.EqualTo("BuildingName2"));
+        Assert.That(data.BuildingName3, Is.EqualTo("BuildingName3"));
+        Assert.That(data.BuildingName4, Is.EqualTo("BuildingName4"));
+        Assert.That(data.BuildingName5, Is.EqualTo("BuildingName5"));
+        Assert.That(UTF8Encoding.UTF8.GetString(data.BuildingName6!), Is.EqualTo("BuildingName6".PadRight(120, '\0')));
+        Assert.That(UTF8Encoding.UTF8.GetString(data.BuildingName7!), Is.EqualTo("BuildingName7"));
+        Assert.That(UTF8Encoding.UTF8.GetString(data.BuildingName8!), Is.EqualTo("BuildingName8"));
+        Assert.That(UTF8Encoding.UTF8.GetString(data.BuildingName9!), Is.EqualTo("BuildingName9"));
+        Assert.That(UTF8Encoding.UTF8.GetString(data.BuildingName10!), Is.EqualTo("BuildingName10"));
+        Assert.That(data.BuildingName11, Is.EqualTo("small"));
+        Assert.That(data.BuildingName12, Is.EqualTo("small,medium,large"));
+        Assert.That(data.BuildingName13, Is.EqualTo(now.Date));
+        Assert.That(data.BuildingName14, Is.EqualTo(now));
+        Assert.That(data.BuildingName15, Is.EqualTo(now.TimeOfDay));
+        Assert.That(data.BuildingName16, Is.EqualTo(now));
+        Assert.That(data.BuildingName17, Is.EqualTo(now.Year));
       }
     }
 
@@ -169,9 +169,9 @@ public void LongBlobMapping()
 
         var data = context.AllBlobTypes.First();
 
-        Assert.AreEqual(data1.Length, data.Example1.Length);
-        Assert.AreEqual(data2.Length, data.Example2.Length);
-        Assert.AreEqual(data3.Length, data.Example3.Length);
+        Assert.That(data.Example1.Length, Is.EqualTo(data1.Length));
+        Assert.That(data.Example2.Length, Is.EqualTo(data2.Length));
+        Assert.That(data.Example3.Length, Is.EqualTo(data3.Length));
       }
     }
 
@@ -203,10 +203,10 @@ public void ValidateStringLength()
           {
             string field = reader.GetString("field");
             string type = validation[field];
-            Assert.AreEqual(type, reader.GetString("type"));
+            Assert.That(reader.GetString("type"), Is.EqualTo(type));
             counter++;
           }
-          Assert.AreEqual(validation.Count, counter);
+          Assert.That(counter, Is.EqualTo(validation.Count));
         }
       }
     }
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ShadowPropertiesTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ShadowPropertiesTests.cs
index bd957825b..cbc676c76 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ShadowPropertiesTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ShadowPropertiesTests.cs
@@ -60,7 +60,7 @@ public ShadowPropertiesTests()
     [Test]
     public void CanUseShadowPropertyWhenUpdatingEntry()
     {
-      Assert.False(context.Database.EnsureCreated());
+      Assert.That(!context.Database.EnsureCreated());
       var ad = new Address { Street = "New street two", City = "Chicago" };
       var g = new Guest { Name = "Guest number two", Address = ad };
       context.Set<Guest>().Add(g);
@@ -68,7 +68,7 @@ public void CanUseShadowPropertyWhenUpdatingEntry()
 
       // update entry
       var entry = context.Set<Guest>().Where(t => t.Name!.Equals("Guest number two")).First();
-      Assert.False(entry == null);
+      Assert.That(entry, Is.Not.Null);
 
       entry!.Name = "Guest number two updated";
       context.SaveChanges();
@@ -81,15 +81,15 @@ public void CanUseShadowPropertyWhenUpdatingEntry()
 
         var cmd = new MySqlCommand("Select UpdatedAt from Guests where IdGuest=" + entry.IdGuest, cnn);
         var updatedAt = cmd.ExecuteScalar();
-        Assert.False(updatedAt == null);
-        Assert.True(((DateTime)updatedAt!).Date.CompareTo(DateTime.Now.Date) == 0);
+        Assert.That(updatedAt, Is.Not.Null);
+        Assert.That(((DateTime)updatedAt!).Date.CompareTo(DateTime.Now.Date) == 0);
       }
     }
 
     [Test]
     public void CanUseShadowPropertyWhenAddingEntry()
     {
-      Assert.False(context.Database.EnsureCreated());
+      Assert.That(!context.Database.EnsureCreated());
       var ad = new Address { Street = "New street", City = "Oregon" };
       var g = new Guest { Name = "Guest number one", Address = ad };
       context.Set<Guest>().Add(g);
@@ -104,8 +104,8 @@ public void CanUseShadowPropertyWhenAddingEntry()
 
         var cmd = new MySqlCommand("Select CreatedAt from Guests Limit 1", cnn);
         var createdAt = cmd.ExecuteScalar();
-        Assert.False(createdAt == null);
-        Assert.True(((DateTime)createdAt!).Date.CompareTo(DateTime.Now.Date) == 0);
+        Assert.That(createdAt, Is.Not.Null);
+        Assert.That(((DateTime)createdAt!).Date.CompareTo(DateTime.Now.Date) == 0);
       }
     }
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/EntityTestsFixtureClass.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/EntityTestsFixtureClass.cs
index 4da09804f..87696ef1b 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/EntityTestsFixtureClass.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/EntityTestsFixtureClass.cs
@@ -93,7 +93,7 @@ protected internal void CheckSql(string sql, string refSql)
       foreach (char c in refSql)
         if (!Char.IsWhiteSpace(c))
           str2.Append(c);
-      Assert.AreEqual(0, String.Compare(str1.ToString(), str2.ToString(), true));
+      Assert.That(String.Compare(str1.ToString(), str2.ToString(), true), Is.EqualTo(0));
     }
 
 
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/GlobalUsings.cs b/EFCore/tests/MySql.EFCore.Design.Tests/GlobalUsings.cs
deleted file mode 100644
index 575c7cfd0..000000000
--- a/EFCore/tests/MySql.EFCore.Design.Tests/GlobalUsings.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-global using Assert = NUnit.Framework.Legacy.ClassicAssert;
-global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
-global using StringAssert = NUnit.Framework.Legacy.StringAssert;
-global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
-global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLAnnotationCodeGeneratorTest.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLAnnotationCodeGeneratorTest.cs
index 61ff8b711..6e5e9d6ce 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLAnnotationCodeGeneratorTest.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLAnnotationCodeGeneratorTest.cs
@@ -65,8 +65,8 @@ public void GenerateFluentApiHasCharset(string mySQLAnnotation)
       var annotation = key?.FindAnnotation(mySQLAnnotation);
       var result = MySQLAnnotationCodeGenerator.GenFluentApi((Microsoft.EntityFrameworkCore.Metadata.IProperty)key!, annotation!);
 
-      Assert.AreEqual(mySQLAnnotation == MySQLAnnotationNames.Charset ? "ForMySQLHasCharset" : "ForMySQLHasCollation", result?.Method);
-      Assert.AreEqual(1, result?.Arguments.Count);
+      Assert.That(result?.Method, Is.EqualTo(mySQLAnnotation == MySQLAnnotationNames.Charset ? "ForMySQLHasCharset" : "ForMySQLHasCollation"));
+      Assert.That(result?.Arguments.Count, Is.EqualTo(1));
     }
   }
 }
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLCodeGeneratorTest.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLCodeGeneratorTest.cs
index c1549b537..b0e83d66f 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLCodeGeneratorTest.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLCodeGeneratorTest.cs
@@ -50,9 +50,9 @@ public virtual void UseProviderMethodIsGeneratedCorrectly()
 
       var result = codeGenerator.GenerateUseProvider("Data Source=Test", providerOptions: null);
 
-      Assert.AreEqual("UseMySQL", result.Method);
+      Assert.That(result.Method, Is.EqualTo("UseMySQL"));
       Assert.That(result.Arguments, Has.Exactly(1).EqualTo("Data Source=Test"));
-      Assert.Null(result.ChainedCall);
+      Assert.That(result.ChainedCall, Is.Null);
     }
 
     [Test]
@@ -66,13 +66,13 @@ public virtual void UseProviderMethodIsGeneratedCorrectlyWithOptions()
 
       var result = codeGenerator.GenerateUseProvider("Data Source=Test", providerOptions);
 
-      Assert.AreEqual("UseMySQL", result.Method);
+      Assert.That(result.Method, Is.EqualTo("UseMySQL"));
       Assert.That(result.Arguments, Has.Exactly(1).EqualTo("Data Source=Test"));
-      Assert.IsInstanceOf<NestedClosureCodeFragment>(result.Arguments[1]);
+      Assert.That(result.Arguments[1], Is.InstanceOf<NestedClosureCodeFragment>());
       NestedClosureCodeFragment nestedClosure = (NestedClosureCodeFragment)result.Arguments[1]!;
-      Assert.AreEqual("x", nestedClosure?.Parameter);
-      Assert.AreSame(providerOptions, nestedClosure?.MethodCalls[0]);
-      Assert.Null(result.ChainedCall);
+      Assert.That(nestedClosure?.Parameter, Is.EqualTo("x"));
+      Assert.That(nestedClosure?.MethodCalls[0], Is.SameAs(providerOptions));
+      Assert.That(result.ChainedCall, Is.Null);
     }
 
     private static readonly MethodInfo UseMySqlServerMethodInfo
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs
index d264c8c4d..a520b0c2c 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs
@@ -102,7 +102,7 @@ PRIMARY KEY (description, id)
 
       Assert.Multiple(() =>
       {
-        Assert.AreEqual("blogman", dbModel.DatabaseName);
+        Assert.That(dbModel.DatabaseName, Is.EqualTo("blogman"));
         Assert.That(dbModel.Tables.Select(c => c.Name), Has.Exactly(1).Matches<string>(table => table.Contains("blogs")));
       });
 
@@ -111,27 +111,27 @@ PRIMARY KEY (description, id)
       Assert.That(columns.Where(n => n.Name == "id").Select(a => a.Name), Has.Exactly(1).Matches<string>(name => name.Contains("id")));
       Assert.That(columns.Where(n => n.Name == "id").Select(a => a.GetDataType()), Has.One.Items.EqualTo("int" + smallintWidth));
       Assert.That(columns.Where(n => n.Name == "id").Select(a => a.GetPrimaryKeyOrdinal(2)), Has.One.Items.EqualTo(2));
-      Assert.False(columns.Where(n => n.Name == "id").Select(a => a.IsNullable).FirstOrDefault());
+      Assert.That(!columns.Where(n => n.Name == "id").Select(a => a.IsNullable).FirstOrDefault());
       Assert.That(columns.Where(n => n.Name == "id").Select(a => a.GetOrdinal(0)), Has.One.Items.EqualTo(0));
-      Assert.IsNull(columns.Where(n => n.Name == "id").Select(a => a.GetDefaultValue()).FirstOrDefault());
+      Assert.That(columns.Where(n => n.Name == "id").Select(a => a.GetDefaultValue()).FirstOrDefault(), Is.Null);
 
       Assert.That(columns.Where(n => n.Name == "description").Select(a => a.Name), Has.Exactly(1).Matches<string>(name => name.Contains("description")));
       Assert.That(columns.Where(n => n.Name == "description").Select(a => a.GetDataType()), Has.One.Items.EqualTo("varchar(100)"));
       Assert.That(columns.Where(n => n.Name == "description").Select(a => a.GetPrimaryKeyOrdinal(1)), Has.One.Items.EqualTo(1));
-      Assert.False(columns.Where(n => n.Name == "description").Select(a => a.IsNullable).FirstOrDefault());
+      Assert.That(!columns.Where(n => n.Name == "description").Select(a => a.IsNullable).FirstOrDefault());
       Assert.That(columns.Where(n => n.Name == "description").Select(a => a.GetOrdinal(1)), Has.One.Items.EqualTo(1));
-      Assert.IsNull(columns.Where(n => n.Name == "description").Select(a => a.GetDefaultValue()).FirstOrDefault());
+      Assert.That(columns.Where(n => n.Name == "description").Select(a => a.GetDefaultValue()).FirstOrDefault(), Is.Null);
       Assert.That(columns.Where(n => n.Name == "description").Select(a => a.GetMaxLength(100)), Has.One.Items.EqualTo(100));
 
       Assert.That(columns.Where(n => n.Name == "rate").Select(a => a.Name), Has.Exactly(1).Matches<string>(name => name.Contains("rate")));
       Assert.That(columns.Where(n => n.Name == "rate").Select(a => a.GetDataType()), Has.One.Items.EqualTo("decimal(5,2)"));
-      Assert.IsNull(columns.Where(n => n.Name == "rate").Select(a => a.GetPrimaryKeyOrdinal(null)).FirstOrDefault());
-      Assert.True(columns.Where(n => n.Name == "rate").Select(a => a.IsNullable).FirstOrDefault());
+      Assert.That(columns.Where(n => n.Name == "rate").Select(a => a.GetPrimaryKeyOrdinal(null)).FirstOrDefault(), Is.Null);
+      Assert.That(columns.Where(n => n.Name == "rate").Select(a => a.IsNullable).FirstOrDefault());
       Assert.That(columns.Where(n => n.Name == "rate").Select(a => a.GetOrdinal(2)), Has.One.Items.EqualTo(2));
-      StringAssert.AreEqualIgnoringCase(columns.Where(n => n.Name == "rate").Select(a => a.GetDefaultValue()).FirstOrDefault(), "'0.00'");
+      Assert.That("'0.00'", Is.EqualTo(columns.Where(n => n.Name == "rate").Select(a => a.GetDefaultValue()).FirstOrDefault()).IgnoreCase);
       Assert.That(columns.Where(n => n.Name == "rate").Select(a => a.GetPrecision(5)), Has.One.Items.EqualTo(5));
       Assert.That(columns.Where(n => n.Name == "rate").Select(a => a.GetScale(2)), Has.One.Items.EqualTo(2));
-      Assert.IsNull(columns.Where(n => n.Name == "rate").Select(a => a.GetMaxLength(null)).FirstOrDefault());
+      Assert.That(columns.Where(n => n.Name == "rate").Select(a => a.GetMaxLength(null)).FirstOrDefault(), Is.Null);
 
       Assert.That(columns.Where(n => n.Name == "created").Select(a => a.Name), Has.Exactly(1).Matches<string>(name => name.Contains("created")));
       Assert.That(columns.Where(n => n.Name == "created").Select(a => a.GetDefaultValue()), Has.One.Items.EqualTo("CURRENT_TIMESTAMP"));
@@ -163,14 +163,14 @@ KEY idx_fk_country_id (country_id),
       var dbModel = _fixture!.CreateModel("sakiladb", sql, new List<string> { "city", "country" }, new List<string>());
 
       var fk = (dbModel.Tables.Single(t => t.ForeignKeys.Count > 0).ForeignKeys);
-      Assert.IsNotNull(fk);
-      Assert.AreEqual("sakiladb", fk[0].Table.Database!.DatabaseName);
-      Assert.AreEqual("city", fk[0].Table.Name);
-      Assert.AreEqual("sakiladb", fk[0].PrincipalTable.Database!.DatabaseName);
-      Assert.AreEqual("country", fk[0].PrincipalTable.Name);
-      Assert.AreEqual("country_id", fk[0].GetColumn().Name);
-      Assert.AreEqual("country_id", fk[0].GetPrincipalColumn().Name);
-      Assert.AreEqual(ReferentialAction.Restrict, fk[0].OnDelete);
+      Assert.That(fk, Is.Not.Null);
+      Assert.That(fk[0].Table.Database!.DatabaseName, Is.EqualTo("sakiladb"));
+      Assert.That(fk[0].Table.Name, Is.EqualTo("city"));
+      Assert.That(fk[0].PrincipalTable.Database!.DatabaseName, Is.EqualTo("sakiladb"));
+      Assert.That(fk[0].PrincipalTable.Name, Is.EqualTo("country"));
+      Assert.That(fk[0].GetColumn().Name, Is.EqualTo("country_id"));
+      Assert.That(fk[0].GetPrincipalColumn().Name, Is.EqualTo("country_id"));
+      Assert.That(fk[0].OnDelete, Is.EqualTo(ReferentialAction.Restrict));
     }
 
     [Test]
@@ -195,23 +195,23 @@ PRIMARY KEY(actor_id),
       Assert.Multiple(() =>
       {
         var c = indexes[0];
-        Assert.AreEqual("sakilaIndex", c.Table!.Database!.DatabaseName);
-        Assert.AreEqual("actor", c.Table.Name);
+        Assert.That(c.Table!.Database!.DatabaseName, Is.EqualTo("sakilaIndex"));
+        Assert.That(c.Table.Name, Is.EqualTo("actor"));
       });
 
       Assert.Multiple(() =>
         {
           var composite = indexes[0];
-          Assert.AreEqual("idx_actor_first_last_name", composite.Name);
-          Assert.False(composite.IsUnique);
-          Assert.AreEqual(new List<string> { "first_name", "last_name" }, composite.GetColumns().Select(c => c.GetColumn().Name).ToList());
+          Assert.That(composite.Name, Is.EqualTo("idx_actor_first_last_name"));
+          Assert.That(!composite.IsUnique);
+          Assert.That(composite.GetColumns().Select(c => c.GetColumn().Name).ToList(), Is.EqualTo(new List<string> { "first_name", "last_name" }));
         });
 
       Assert.Multiple(() =>
         {
           var onecolumn = indexes[1];
-          Assert.AreEqual("last_name", onecolumn.GetColumn().Name);
-          Assert.True(onecolumn.IsUnique);
+          Assert.That(onecolumn.GetColumn().Name, Is.EqualTo("last_name"));
+          Assert.That(onecolumn.IsUnique);
         }
         );
     }
@@ -250,7 +250,7 @@ private void Test(string createSql, IEnumerable<string> tables, IEnumerable<stri
 
         var databaseModel = databaseModelFactory.Create(_fixture.TestStore.ConnectionString,
             new DatabaseModelFactoryOptions(tables, schemas));
-        Assert.NotNull(databaseModel);
+        Assert.That(databaseModel, Is.Not.Null);
         asserter(databaseModel);
       }
       finally
@@ -345,7 +345,7 @@ public void CanFiltersViews()
       var selectionSet = new List<string> { "t1", "x1" };
 
       var dbModel = _fixture!.CreateModel("testview", sql, selectionSet, new List<string>());
-      Assert.True(dbModel.Tables.Count == 2);
+      Assert.That(dbModel.Tables.Count == 2);
     }
   }
 }
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDesignTimeProviderServicesTest.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDesignTimeProviderServicesTest.cs
index ca39de4c1..5331e8b81 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDesignTimeProviderServicesTest.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDesignTimeProviderServicesTest.cs
@@ -51,9 +51,9 @@ public void EnsureAssemblyIdentityMatches()
       var dtAttribute = runtimeAssembly.GetCustomAttribute<DesignTimeProviderServicesAttribute>();
       var dtType = GetDesignTimeServicesType();
 
-      Assert.NotNull(dtType);
-      Assert.NotNull(dtAttribute);
-      Assert.AreEqual(dtType.FullName, dtAttribute?.TypeName);
+      Assert.That(dtType, Is.Not.Null);
+      Assert.That(dtAttribute, Is.Not.Null);
+      Assert.That(dtAttribute?.TypeName, Is.EqualTo(dtType.FullName));
     }
   }
 }
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/GlobalUsings.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/GlobalUsings.cs
deleted file mode 100644
index 575c7cfd0..000000000
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/GlobalUsings.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-global using Assert = NUnit.Framework.Legacy.ClassicAssert;
-global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
-global using StringAssert = NUnit.Framework.Legacy.StringAssert;
-global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
-global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLHistoryRepositoryTests.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLHistoryRepositoryTests.cs
index 70085710b..7ae230162 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLHistoryRepositoryTests.cs
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLHistoryRepositoryTests.cs
@@ -81,9 +81,8 @@ public void CanCreateDatabase()
       var creator = context.GetService<IRelationalDatabaseCreator>();
 
       var cmdBuilder = context.GetService<IRawSqlCommandBuilder>();
-      Assert.False(creator.Exists());
-      Assert.AreEqual("IF EXISTS(SELECT * FROM `__EFMigrationsHistory` WHERE `MigrationId` = 'MigrationId')\nBEGIN",
-          cmdBuilder.Build(repository.GetBeginIfExistsScript("MigrationId")).CommandText.Replace("\r", string.Empty));
+      Assert.That(!creator.Exists());
+      Assert.That(cmdBuilder.Build(repository.GetBeginIfExistsScript("MigrationId")).CommandText.Replace("\r", string.Empty), Is.EqualTo("IF EXISTS(SELECT * FROM `__EFMigrationsHistory` WHERE `MigrationId` = 'MigrationId')\nBEGIN"));
     }
   }
 }
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTest.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTest.cs
index bcb5c3ee2..7be723ae2 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTest.cs
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTest.cs
@@ -72,7 +72,7 @@ public override void CreateTableOperation()
           ");" + EOL;
       string fullResult = result.Replace(" NULL,", ",");
 
-      Assert.True(result == Sql || fullResult == Sql);
+      Assert.That(result == Sql || fullResult == Sql);
     }
 
     [Test]
@@ -81,28 +81,28 @@ public override void AddColumnOperation_with_maxLength()
       base.AddColumnOperation_with_maxLength();
       string result = "ALTER TABLE `Person` ADD `Name` varchar(30);" + EOL;
       string fullResult = "ALTER TABLE `Person` ADD `Name` varchar(30) NULL;" + EOL;
-      Assert.True(result == Sql || fullResult == Sql);
+      Assert.That(result == Sql || fullResult == Sql);
     }
 
     [Test]
     public override void AddColumnOperationWithComputedValueSql()
     {
       base.AddColumnOperationWithComputedValueSql();
-      Assert.AreEqual("ALTER TABLE `People` ADD `DisplayName` varchar(50) AS (CONCAT_WS(' ', LastName , FirstName));" + EOL, Sql);
+      Assert.That(Sql, Is.EqualTo("ALTER TABLE `People` ADD `DisplayName` varchar(50) AS (CONCAT_WS(' ', LastName , FirstName));" + EOL));
     }
 
     [Test]
     public override void AddColumnOperationWithDefaultValueSql()
     {
       base.AddColumnOperationWithDefaultValueSql();
-      Assert.AreEqual("ALTER TABLE `People` ADD `Timestamp` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP;" + EOL, Sql);
+      Assert.That(Sql, Is.EqualTo("ALTER TABLE `People` ADD `Timestamp` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP;" + EOL));
     }
 
     [Test]
     public override void AlterColumnOperation()
     {
       base.AlterColumnOperation();
-      Assert.AreEqual("ALTER TABLE `Person` MODIFY `Age` int NOT NULL DEFAULT 7;" + EOL, Sql);
+      Assert.That(Sql, Is.EqualTo("ALTER TABLE `Person` MODIFY `Age` int NOT NULL DEFAULT 7;" + EOL));
     }
 
 
@@ -110,21 +110,21 @@ public override void AlterColumnOperation()
     public override void AlterColumnOperationWithoutType()
     {
       base.AlterColumnOperationWithoutType();
-      Assert.AreEqual("ALTER TABLE `Person` MODIFY `Age` int NOT NULL;" + EOL, Sql);
+      Assert.That(Sql, Is.EqualTo("ALTER TABLE `Person` MODIFY `Age` int NOT NULL;" + EOL));
     }
 
     [Test]
     public override void RenameTableOperationInSchema()
     {
       base.RenameTableOperationInSchema();
-      Assert.AreEqual("ALTER TABLE t1 RENAME t2;" + EOL, Sql);
+      Assert.That(Sql, Is.EqualTo("ALTER TABLE t1 RENAME t2;" + EOL));
     }
 
     [Test]
     public override void CreateUniqueIndexOperation()
     {
       base.CreateUniqueIndexOperation();
-      Assert.AreEqual("CREATE UNIQUE INDEX `IXPersonName` ON `Person` (`FirstName`, `LastName`);" + EOL, Sql);
+      Assert.That(Sql, Is.EqualTo("CREATE UNIQUE INDEX `IXPersonName` ON `Person` (`FirstName`, `LastName`);" + EOL));
     }
 
     [Test]
@@ -132,7 +132,7 @@ public override void CreateNonUniqueIndexOperation()
     {
       base.CreateNonUniqueIndexOperation();
 
-      Assert.AreEqual("CREATE INDEX `IXPersonName` ON `Person` (`Name`);" + EOL, Sql);
+      Assert.That(Sql, Is.EqualTo("CREATE INDEX `IXPersonName` ON `Person` (`Name`);" + EOL));
     }
 
     [Test]
@@ -140,28 +140,28 @@ public override void CreateNonUniqueIndexOperation()
     public override void RenameIndexOperation()
     {
       base.RenameIndexOperation();
-      Assert.AreEqual("DROP INDEX IXPersonName ON Person; CREATE INDEX IXNombre;" + EOL, Sql);
+      Assert.That(Sql, Is.EqualTo("DROP INDEX IXPersonName ON Person; CREATE INDEX IXNombre;" + EOL));
     }
 
     [Test]
     public override void DropIndexOperation()
     {
       base.DropIndexOperation();
-      Assert.AreEqual("DROP INDEX IXPersonName ON Person;" + EOL, Sql);
+      Assert.That(Sql, Is.EqualTo("DROP INDEX IXPersonName ON Person;" + EOL));
     }
 
     [Test]
     public override void DropPrimaryKeyOperation()
     {
       base.DropPrimaryKeyOperation();
-      Assert.AreEqual(string.Empty, Sql);
+      Assert.That(Sql, Is.EqualTo(string.Empty));
     }
 
     [Test]
     public override void AddPrimaryKeyOperation()
     {
       base.AddPrimaryKeyOperation();
-      Assert.AreEqual(string.Empty, Sql);
+      Assert.That(Sql, Is.EqualTo(string.Empty));
     }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/CanonicalFunctions.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/CanonicalFunctions.cs
index 765b90ce5..cecb039a7 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/CanonicalFunctions.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/CanonicalFunctions.cs
@@ -64,13 +64,13 @@ public void Bitwise()
         var context = ((IObjectContextAdapter)ctx).ObjectContext;
         ObjectQuery<Int32> q = context.CreateQuery<Int32>("BitwiseAnd(255,15)");
         foreach (int i in q)
-          Assert.AreEqual(15, i);
+          Assert.That(i, Is.EqualTo(15));
         q = context.CreateQuery<Int32>("BitwiseOr(240,31)");
         foreach (int i in q)
-          Assert.AreEqual(255, i);
+          Assert.That(i, Is.EqualTo(255));
         q = context.CreateQuery<Int32>("BitwiseXor(255,15)");
         foreach (int i in q)
-          Assert.AreEqual(240, i);
+          Assert.That(i, Is.EqualTo(240));
       }
     }
 
@@ -85,9 +85,9 @@ public void CurrentDateTime()
         ObjectQuery<DateTime> q = context.CreateQuery<DateTime>("CurrentDateTime()");
         foreach (DateTime dt in q)
         {
-          Assert.AreEqual(current.Year, dt.Year);
-          Assert.AreEqual(current.Month, dt.Month);
-          Assert.AreEqual(current.Day, dt.Day);
+          Assert.That(dt.Year, Is.EqualTo(current.Year));
+          Assert.That(dt.Month, Is.EqualTo(current.Month));
+          Assert.That(dt.Day, Is.EqualTo(current.Day));
           // we don't check time as that will be always be different
         }
       }
@@ -104,9 +104,9 @@ public void YearMonthDay()
                         FROM Companies AS c WHERE c.Id=1");
         foreach (DbDataRecord record in q)
         {
-          Assert.AreEqual(1996, record[1]);
-          Assert.AreEqual(11, record[2]);
-          Assert.AreEqual(15, record[3]);
+          Assert.That(record[1], Is.EqualTo(1996));
+          Assert.That(record[2], Is.EqualTo(11));
+          Assert.That(record[3], Is.EqualTo(15));
         }
       }
     }
@@ -122,9 +122,9 @@ public void HourMinuteSecond()
                         FROM Companies AS c WHERE c.Id=1");
         foreach (DbDataRecord record in q)
         {
-          Assert.AreEqual(5, record[1]);
-          Assert.AreEqual(18, record[2]);
-          Assert.AreEqual(23, record[3]);
+          Assert.That(record[1], Is.EqualTo(5));
+          Assert.That(record[2], Is.EqualTo(18));
+          Assert.That(record[3], Is.EqualTo(23));
         }
       }
     }
@@ -137,11 +137,11 @@ public void IndexOf()
         var context = ((IObjectContextAdapter)ctx).ObjectContext;
         ObjectQuery<Int32> q = context.CreateQuery<Int32>(@"IndexOf('needle', 'haystackneedle')");
         foreach (int index in q)
-          Assert.AreEqual(9, index);
+          Assert.That(index, Is.EqualTo(9));
 
         q = context.CreateQuery<Int32>(@"IndexOf('haystack', 'needle')");
         foreach (int index in q)
-          Assert.AreEqual(0, index);
+          Assert.That(index, Is.EqualTo(0));
       }
     }
 
@@ -154,17 +154,17 @@ public void LeftRight()
         string entitySQL = "CONCAT(LEFT('foo',3),RIGHT('bar',3))";
         ObjectQuery<String> query = context.CreateQuery<String>(entitySQL);
         foreach (string s in query)
-          Assert.AreEqual("foobar", s);
+          Assert.That(s, Is.EqualTo("foobar"));
 
         entitySQL = "CONCAT(LEFT('foobar',3),RIGHT('barfoo',3))";
         query = context.CreateQuery<String>(entitySQL);
         foreach (string s in query)
-          Assert.AreEqual("foofoo", s);
+          Assert.That(s, Is.EqualTo("foofoo"));
 
         entitySQL = "CONCAT(LEFT('foobar',8),RIGHT('barfoo',8))";
         query = context.CreateQuery<String>(entitySQL);
         foreach (string s in query)
-          Assert.AreEqual("foobarbarfoo", s);
+          Assert.That(s, Is.EqualTo("foobarbarfoo"));
       }
     }
 
@@ -177,7 +177,7 @@ public void Length()
         string entitySQL = "Length('abc')";
         ObjectQuery<Int32> query = context.CreateQuery<Int32>(entitySQL);
         foreach (int len in query)
-          Assert.AreEqual(3, len);
+          Assert.That(len, Is.EqualTo(3));
       }
     }
 
@@ -189,13 +189,13 @@ public void Trims()
         var context = ((IObjectContextAdapter)ctx).ObjectContext;
         ObjectQuery<string> query = context.CreateQuery<string>("LTrim('   text   ')");
         foreach (string s in query)
-          Assert.AreEqual("text   ", s);
+          Assert.That(s, Is.EqualTo("text   "));
         query = context.CreateQuery<string>("RTrim('   text   ')");
         foreach (string s in query)
-          Assert.AreEqual("   text", s);
+          Assert.That(s, Is.EqualTo("   text"));
         query = context.CreateQuery<string>("Trim('   text   ')");
         foreach (string s in query)
-          Assert.AreEqual("text", s);
+          Assert.That(s, Is.EqualTo("text"));
       }
     }
 
@@ -213,11 +213,11 @@ public void Round()
                     FROM Products AS p WHERE p.Id=1");
         foreach (DbDataRecord r in q)
         {
-          Assert.AreEqual(1, r[0]);
-          Assert.AreEqual(8.865f, (float)r[1]);
-          Assert.AreEqual(9, Convert.ToInt32(r[2]));
-          Assert.AreEqual(8, Convert.ToInt32(r[3]));
-          Assert.AreEqual(9, Convert.ToInt32(r[4]));
+          Assert.That(r[0], Is.EqualTo(1));
+          Assert.That((float)r[1], Is.EqualTo(8.865f));
+          Assert.That(Convert.ToInt32(r[2]), Is.EqualTo(9));
+          Assert.That(Convert.ToInt32(r[3]), Is.EqualTo(8));
+          Assert.That(Convert.ToInt32(r[4]), Is.EqualTo(9));
         }
       }
     }
@@ -231,7 +231,7 @@ public void Substring()
         ObjectQuery<string> query = context.CreateQuery<string>("SUBSTRING('foobarfoo',4,3)");
         query = context.CreateQuery<string>("SUBSTRING('foobarfoo',4,30)");
         foreach (string s in query)
-          Assert.AreEqual("barfoo", s);
+          Assert.That(s, Is.EqualTo("barfoo"));
       }
     }
 
@@ -246,9 +246,9 @@ public void ToUpperToLowerReverse()
                     Reverse(c.Name) FROM Companies AS c WHERE c.Id=1");
         foreach (DbDataRecord r in q)
         {
-          Assert.AreEqual("HASBRO", r[0]);
-          Assert.AreEqual("hasbro", r[1]);
-          Assert.AreEqual("orbsaH", r[2]);
+          Assert.That(r[0], Is.EqualTo("HASBRO"));
+          Assert.That(r[1], Is.EqualTo("hasbro"));
+          Assert.That(r[2], Is.EqualTo("orbsaH"));
         }
       }
     }
@@ -262,7 +262,7 @@ public void Replace()
         ObjectQuery<string> q = context.CreateQuery<string>(
             @"Replace('abcdefghi', 'def', 'zzz')");
         foreach (string s in q)
-          Assert.AreEqual("abczzzghi", s);
+          Assert.That(s, Is.EqualTo("abczzzghi"));
       }
     }
 
@@ -277,8 +277,8 @@ public void CanRoundToNonZeroDigits()
                                         Round(p.Weight, 2) AS [Rounded Weight]
                                         FROM Products AS p WHERE p.Id=1").First();
 
-        Assert.AreEqual((float)8.865, (float)product[1]);
-        Assert.AreEqual((double)8.86, (double)product[2]);
+        Assert.That((float)product[1], Is.EqualTo((float)8.865));
+        Assert.That((double)product[2], Is.EqualTo((double)8.86)  );
       }
     }
 
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DataTypeTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DataTypeTests.cs
index 3d620c5d1..f36994dc8 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DataTypeTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DataTypeTests.cs
@@ -57,7 +57,7 @@ public void TimeType()
         ctx.SaveChanges();
 
         Child d = ctx.Children.Where(x => x.ChildId == "ABC").Single();
-        Assert.AreEqual(birth, d.BirthTime);
+        Assert.That(d.BirthTime, Is.EqualTo(birth));
       }
     }
 
@@ -111,7 +111,7 @@ public void TimestampColumn()
         ctx.SaveChanges();
 
         p = ctx.Products.First();
-        Assert.AreEqual(now, p.CreatedDate);
+        Assert.That(p.CreatedDate, Is.EqualTo(now));
       }
     }
 
@@ -135,7 +135,7 @@ public void GuidType()
         ctx.SaveChanges();
 
         Child d = ctx.Children.Where(x => x.ChildId == "GUID").Single();
-        Assert.AreEqual(g, d.Label);
+        Assert.That(d.Label, Is.EqualTo(g));
 
       }
     }
@@ -156,7 +156,7 @@ public void CanSetDbTypeDecimalFromNewDecimalParameter()
         IsNullable = true
       };
 
-      Assert.AreEqual(DbType.Decimal, newDecimalParameter.DbType);
+      Assert.That(newDecimalParameter.DbType, Is.EqualTo(DbType.Decimal));
     }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DatesTypesTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DatesTypesTests.cs
index 22b246a55..edefa6f75 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DatesTypesTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DatesTypesTests.cs
@@ -89,12 +89,12 @@ public void CanCreateDBScriptWithDateTimePrecision()
         DataTable schema = Connection.GetSchema("COLUMNS", new string[] { null, Connection.Database, "widgets" });
 
         DataRow row = schema.Rows[3];
-        Assert.AreEqual("datetime", (string)row["DATA_TYPE"]);
-        Assert.AreEqual("NO", (string)row["IS_NULLABLE"]);
+        Assert.That((string)row["DATA_TYPE"], Is.EqualTo("datetime"));
+        Assert.That((string)row["IS_NULLABLE"], Is.EqualTo("NO"));
         if (Version < new Version(8, 0))
-          Assert.AreEqual((uint)6, (UInt64)row["DATETIME_PRECISION"]);
+          Assert.That((UInt64)row["DATETIME_PRECISION"], Is.EqualTo((uint)6));
         else
-          Assert.AreEqual((uint)6, (UInt32)row["DATETIME_PRECISION"]);
+          Assert.That((UInt32)row["DATETIME_PRECISION"], Is.EqualTo((uint)6));
       }
     }
   }
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DefaultFixture.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DefaultFixture.cs
index c575b0617..bd36e9c6c 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DefaultFixture.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DefaultFixture.cs
@@ -147,14 +147,14 @@ public static void CheckSql(string actual, string expected)
     {
       var exp = Regex.Replace(expected, @"\s", string.Empty);
       var act = Regex.Replace(actual, @"\s", string.Empty);
-      Assert.AreEqual(act, exp);
+      Assert.That(exp, Is.EqualTo(act));
     }
 
     public static void CheckSqlContains(string actual, string expected)
     {
       var exp = Regex.Replace(expected, @"\s", string.Empty);
       var act = Regex.Replace(actual, @"\s", string.Empty);
-      Assert.True(act.Contains(exp));
+      Assert.That(act.Contains(exp));
     }
 
     public DefaultContext GetDefaultContext()
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DeleteTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DeleteTests.cs
index 305a60805..eac1476b9 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DeleteTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DeleteTests.cs
@@ -53,13 +53,13 @@ public void SimpleDeleteAllRows()
     {
       using (DefaultContext ctx = new DefaultContext(ConnectionString))
       {
-        Assert.True(ctx.Products.Count() > 0);
+        Assert.That(ctx.Products.Count() > 0);
 
         foreach (Product p in ctx.Products)
           ctx.Products.Remove(p);
         ctx.SaveChanges();
 
-        Assert.AreEqual(0, ctx.Products.Count());
+        Assert.That(ctx.Products.Count(), Is.EqualTo(0));
       }
       // set the flag that will cause the setup to happen again
       // since we just blew away a table
@@ -74,12 +74,12 @@ public void SimpleDeleteRowByParameter()
         int total = ctx.Products.Count();
         int cntLeft = ctx.Products.Where(b => b.MinAge >= 18).Count();
         // make sure the test is valid
-        Assert.True(total > cntLeft);
+        Assert.That(total > cntLeft);
 
         foreach (Product p in ctx.Products.Where(b => b.MinAge < 18).ToList())
           ctx.Products.Remove(p);
         ctx.SaveChanges();
-        Assert.AreEqual(cntLeft, ctx.Products.Count());
+        Assert.That(ctx.Products.Count(), Is.EqualTo(cntLeft));
       }
       // set the flag that will cause the setup to happen again
       // since we just blew away a table
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ExpressionTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ExpressionTests.cs
index 9759feef3..9b2acc565 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ExpressionTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ExpressionTests.cs
@@ -54,7 +54,7 @@ public void CheckStartsWithWhenUsingVariable()
       {
         string str = "Garbage";
         var records = ctx.Products.Where(p => p.Name.StartsWith(str)).ToArray();
-        Assert.AreEqual(1, records.Count());
+        Assert.That(records.Count(), Is.EqualTo(1));
       }
     }
 
@@ -67,7 +67,7 @@ public void CheckStartsWithWhenUsingValue()
       using (DefaultContext ctx = new DefaultContext(ConnectionString))
       {
         var records = ctx.Products.Where(p => p.Name.StartsWith("Garbage")).ToArray();
-        Assert.AreEqual(1, records.Count());
+        Assert.That(records.Count(), Is.EqualTo(1));
       }
     }
 
@@ -81,7 +81,7 @@ public void CheckEndsWithWhenUsingVariable()
       {
         string str = "Hoop";
         var records = ctx.Products.Where(p => p.Name.EndsWith(str)).ToArray();
-        Assert.AreEqual(1, records.Count());
+        Assert.That(records.Count(), Is.EqualTo(1));
       }
     }
 
@@ -94,7 +94,7 @@ public void CheckEndsWithWhenUsingValue()
       using (DefaultContext ctx = new DefaultContext(ConnectionString))
       {
         var records = ctx.Products.Where(p => p.Name.EndsWith("Hoop")).ToArray();
-        Assert.AreEqual(1, records.Count());
+        Assert.That(records.Count(), Is.EqualTo(1));
       }
     }
 
@@ -109,7 +109,7 @@ public void CheckContainsWhenUsingVariable()
       {
         string str = "bage";
         var records = ctx.Products.Where(p => p.Name.Contains(str)).ToArray();
-        Assert.AreEqual(1, records.Count());
+        Assert.That(records.Count(), Is.EqualTo(1));
       }
     }
 
@@ -123,7 +123,7 @@ public void CheckContainsWhenUsingHardCodedValue()
       using (DefaultContext ctx = new DefaultContext(ConnectionString))
       {
         var records = ctx.Products.Where(p => p.Name.Contains("bage")).ToArray();
-        Assert.AreEqual(1, records.Count());
+        Assert.That(records.Count(), Is.EqualTo(1));
       }
     }
 
@@ -136,7 +136,7 @@ public void CheckContainsWhenUsingHardCodedValueWithPercentageSymbol()
       using (DefaultContext ctx = new DefaultContext(ConnectionString))
       {
         var records = ctx.Products.Where(p => p.Name.Contains("%")).ToArray();
-        Assert.AreEqual(0, records.Count());
+        Assert.That(records.Count(), Is.EqualTo(0));
       }
     }
 
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/GlobalUsings.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/GlobalUsings.cs
deleted file mode 100644
index 575c7cfd0..000000000
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/GlobalUsings.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-global using Assert = NUnit.Framework.Legacy.ClassicAssert;
-global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
-global using StringAssert = NUnit.Framework.Legacy.StringAssert;
-global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
-global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/InsertTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/InsertTests.cs
index e2d7ec7a7..19c198969 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/InsertTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/InsertTests.cs
@@ -58,11 +58,11 @@ public void InsertSingleRow()
         ctx.Companies.Add(c);
         int result = ctx.SaveChanges();
 
-        Assert.AreEqual(beforeCnt + 1, ctx.Companies.Count());
+        Assert.That(ctx.Companies.Count(), Is.EqualTo(beforeCnt + 1));
 
         Company d = ctx.Companies.Find(c.Id);
         d.Id = c.Id;
-        Assert.AreEqual(c, d);
+        Assert.That(d, Is.EqualTo(c));
       }
     }
 
@@ -93,12 +93,12 @@ public async Task ExecuteNonQueryAndScalarAsyncAwait()
       proc.CommandType = CommandType.StoredProcedure;
       int result = await proc.ExecuteNonQueryAsync();
 
-      Assert.AreNotEqual(-1, result);
+      Assert.That(result, Is.Not.EqualTo(-1));
 
       EFMySqlCommand cmd = new EFMySqlCommand() { CommandText = "SELECT COUNT(*) FROM NonQueryAndScalarAsyncAwaitTest;", Connection = Connection };
       cmd.CommandType = CommandType.Text;
       object cnt = await cmd.ExecuteScalarAsync();
-      Assert.AreEqual(100, Convert.ToInt32(cnt));
+      Assert.That(Convert.ToInt32(cnt), Is.EqualTo(100));
     }
 
     [Test]
@@ -147,14 +147,14 @@ public void SqlModeReplacedByANSI()
         LongDataTest longData = new LongDataTest();
         longData.Data = "This does fit.";
         ctx.LongDataTests.Add(longData);
-        Assert.IsTrue(ctx.SaveChanges() == 1);
+        Assert.That(ctx.SaveChanges() == 1);
 
         // Try to insert a value that is larger than the max lenght of the column
         longData.Data = "This does not fit in the column!!!";
         ctx.LongDataTests.Add(longData);
         var ex = Assert.Throws<DbUpdateException>(() => ctx.SaveChanges());
         Assert.That(ex.InnerException.InnerException is MySqlException);
-        StringAssert.AreEqualIgnoringCase("Data too long for column 'Data' at row 1", ex.InnerException.InnerException.Message);
+        Assert.That(ex.InnerException.InnerException.Message, Is.EqualTo("Data too long for column 'Data' at row 1").IgnoreCase);
       }
     }
   }
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Paging.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Paging.cs
index ad95562d2..2b04847a1 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Paging.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Paging.cs
@@ -97,7 +97,7 @@ public void TakeWithCount()
       using (DefaultContext ctx = new DefaultContext(ConnectionString))
       {
         int cnt = ctx.Products.Take(2).Count();
-        Assert.AreEqual(2, cnt);
+        Assert.That(cnt, Is.EqualTo(2));
       }
     }
   }
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProceduresAndFunctions.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProceduresAndFunctions.cs
index 0d436d480..fd2b0126a 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProceduresAndFunctions.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProceduresAndFunctions.cs
@@ -53,7 +53,7 @@ public void CallStoredProcedure()
       using (DefaultContext ctx = new DefaultContext(ConnectionString))
       {
         long count = ctx.Database.SqlQuery<long>("call CallStoredProcedure").First();
-        Assert.AreEqual(5, count);
+        Assert.That(count, Is.EqualTo(5));
       }
     }
 
@@ -69,7 +69,7 @@ public void UserDefinedFunction()
       using (DefaultContext ctx = new DefaultContext(ConnectionString))
       {
         int val = ctx.Database.SqlQuery<int>(@"SELECT spFunc()").Single();
-        Assert.AreEqual(3, val);
+        Assert.That(val, Is.EqualTo(3));
       }
     }
 
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderManifestTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderManifestTests.cs
index e24e37635..fb7e0f4cc 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderManifestTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderManifestTests.cs
@@ -44,17 +44,17 @@ public void TestingMaxLengthFacet()
         TypeUsage tu = TypeUsage.CreateStringTypeUsage(
           PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.String), false, false);
         TypeUsage result = pm.GetStoreType(tu);
-        Assert.AreEqual("longtext", result.EdmType.Name);
+        Assert.That(result.EdmType.Name, Is.EqualTo("longtext"));
 
         tu = TypeUsage.CreateStringTypeUsage(
           PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.String), false, false, Int32.MaxValue);
         result = pm.GetStoreType(tu);
-        Assert.AreEqual("longtext", result.EdmType.Name);
+        Assert.That(result.EdmType.Name, Is.EqualTo("longtext"));
 
         tu = TypeUsage.CreateStringTypeUsage(
           PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.String), false, false, 70000);
         result = pm.GetStoreType(tu);
-        Assert.AreEqual("mediumtext", result.EdmType.Name);
+        Assert.That(result.EdmType.Name, Is.EqualTo("mediumtext"));
 
       }
     }
@@ -72,7 +72,7 @@ public void CanMapByteTypeToUTinyInt()
         TypeUsage tu = TypeUsage.CreateDefaultTypeUsage(
                 PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.Byte));
         TypeUsage result = pm.GetStoreType(tu);
-        Assert.AreEqual("utinyint", result.EdmType.Name);
+        Assert.That(result.EdmType.Name, Is.EqualTo("utinyint"));
 
       }
     }
@@ -86,17 +86,17 @@ public void TestingMaxLengthWithFixedLenghtTrueFacets()
         TypeUsage tu = TypeUsage.CreateStringTypeUsage(
           PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.String), false, true);
         TypeUsage result = pm.GetStoreType(tu);
-        Assert.AreEqual("char", result.EdmType.Name);
+        Assert.That(result.EdmType.Name, Is.EqualTo("char"));
 
         tu = TypeUsage.CreateStringTypeUsage(
           PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.String), false, true, Int32.MaxValue);
         result = pm.GetStoreType(tu);
-        Assert.AreEqual("char", result.EdmType.Name);
+        Assert.That(result.EdmType.Name, Is.EqualTo("char"));
 
         tu = TypeUsage.CreateStringTypeUsage(
           PrimitiveType.GetEdmPrimitiveType(PrimitiveTypeKind.String), false, true, 70000);
         result = pm.GetStoreType(tu);
-        Assert.AreEqual("char", result.EdmType.Name);
+        Assert.That(result.EdmType.Name, Is.EqualTo("char"));
       }
     }
   }
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderServicesTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderServicesTests.cs
index c6d928197..6a500f835 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderServicesTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderServicesTests.cs
@@ -58,11 +58,11 @@ public void CreateAndDeleteDatabase()
       {
         if (ctx.Database.Exists())
           ctx.Database.Delete();
-        Assert.False(ctx.Database.Exists());
+        Assert.That(!ctx.Database.Exists());
         ctx.Database.Create();
-        Assert.True(ctx.Database.Exists());
+        Assert.That(ctx.Database.Exists());
         ctx.Database.Delete();
-        Assert.False(ctx.Database.Exists());
+        Assert.That(!ctx.Database.Exists());
       }
       NeedSetup = true;
     }
@@ -73,7 +73,7 @@ public void DatabaseExists()
       using (DefaultContext ctx = new DefaultContext(ConnectionString))
       {
         DataTable dt = Connection.GetSchema("DATABASES", new string[] { Connection.Database });
-        Assert.AreEqual(1, dt.Rows.Count);
+        Assert.That(dt.Rows.Count, Is.EqualTo(1));
         ctx.Database.Delete();
       }
       NeedSetup = true;
@@ -97,7 +97,7 @@ public void GetDbProviderManifestTokenDoesNotThrowWhenLocalized()
       {
         MySqlProviderServices providerServices = new MySqlProviderServices();
         var token = providerServices.GetProviderManifestToken(connection);
-        Assert.NotNull(token);
+        Assert.That(token, Is.Not.Null);
       }
     }
 
@@ -109,7 +109,7 @@ public void GetDbProviderManifestTokenDoesNotThrowWhenMissingPersistSecurityInfo
         conn.Open();
         MySqlProviderServices providerServices = new MySqlProviderServices();
         var token = providerServices.GetProviderManifestToken(conn);
-        Assert.NotNull(token);
+        Assert.That(token, Is.Not.Null);
       }
     }
   }
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SetOperators.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SetOperators.cs
index 2c6c37e86..3ebc28dbb 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SetOperators.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SetOperators.cs
@@ -78,7 +78,7 @@ public void FirstSimple()
                 select p;
         Product product = q.First() as Product;
 
-        Assert.AreEqual(id, product.Id);
+        Assert.That(product.Id, Is.EqualTo(id));
       }
     }
 
@@ -94,7 +94,7 @@ public void FirstPredicate()
                 where p.MinAge > 8
                 select p;
         Product product = q.First() as Product;
-        Assert.AreEqual(id, product.Id);
+        Assert.That(product.Id, Is.EqualTo(id));
       }
     }
   }
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SimpleQuery.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SimpleQuery.cs
index 28c1730e3..8ef037ed9 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SimpleQuery.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SimpleQuery.cs
@@ -84,7 +84,7 @@ public void TablesWithSchemaWithoutUsingProperty()
         context.SaveChanges();
 
         var q = (from u in context.User select u).ToArray();
-        Assert.IsTrue(q.Length == 2);
+        Assert.That(q.Length == 2);
       }
     }
   }
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Wizard.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Wizard.cs
index fc4350fde..9ed361481 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Wizard.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Wizard.cs
@@ -45,17 +45,17 @@ public void GetDbProviderManifestTokenReturnsCorrectSchemaVersion()
       string token = services.GetProviderManifestToken(Connection);
 
       if (Version < new Version(5, 1))
-        Assert.AreEqual("5.0", token);
+        Assert.That(token, Is.EqualTo("5.0"));
       else if (Version < new Version(5, 5))
-        Assert.AreEqual("5.1", token);
+        Assert.That(token, Is.EqualTo("5.1"));
       else if (Version < new Version(5, 6))
-        Assert.AreEqual("5.5", token);
+        Assert.That(token, Is.EqualTo("5.5"));
       else if (Version < new Version(5, 7))
-        Assert.AreEqual("5.6", token);
+        Assert.That(token, Is.EqualTo("5.6"));
       else if (Version < new Version(8, 0))
-        Assert.AreEqual("5.7", token);
+        Assert.That(token, Is.EqualTo("5.7"));
       else
-        Assert.AreEqual("8.0", token);
+        Assert.That(token, Is.EqualTo("8.0"));
     }
 
     [Test]
@@ -64,7 +64,7 @@ public void GetStoreSchemaDescriptionDoesNotThrowForServer50OrGreater()
       MySqlProviderManifest manifest = new MySqlProviderManifest(Version.Major + "." + Version.Minor);
       using (XmlReader reader = manifest.GetInformation(DbXmlEnabledProviderManifest.StoreSchemaDefinition))
       {
-        Assert.NotNull(reader);
+        Assert.That(reader, Is.Not.Null);
       }
     }
   }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs
index 4689889e1..49ea6b4e8 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs
@@ -174,19 +174,19 @@ private EntityConnection GetEntityConnection()
       foreach (char c in refSql)
         if (!Char.IsWhiteSpace(c))
           str2.Append(c);
-      Assert.AreEqual(0, String.Compare(str1.ToString(), str2.ToString(), true));
+      Assert.That(String.Compare(str1.ToString(), str2.ToString(), true), Is.EqualTo(0));
     }
 
     private class AssertFailTraceListener : DefaultTraceListener
     {
       public override void Fail(string message)
       {
-        Assert.True(message == String.Empty, "Failure: " + message);
+        Assert.That(message == String.Empty, "Failure: " + message);
       }
 
       public override void Fail(string message, string detailMessage)
       {
-        Assert.True(message == String.Empty, "Failure: " + message);
+        Assert.That(message == String.Empty, "Failure: " + message);
       }
     }
   }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
index fb04f751c..1b247cd6c 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
@@ -65,7 +65,7 @@ public void SimpleCodeFirstSelect()
       {
         j--;
       }
-      Assert.AreEqual(0, j);
+      Assert.That(j, Is.EqualTo(0));
     }
 
     /// <summary>
@@ -87,14 +87,14 @@ public void AlterTableTest()
       {
         j--;
       }
-      Assert.AreEqual(0, j);
+      Assert.That(j, Is.EqualTo(0));
       MovieFormat m = new MovieFormat();
       m.Format = 8.0f;
       db.MovieFormats.Add(m);
       db.SaveChanges();
       MovieFormat m2 = db.MovieFormats.Where(p => p.Format == 8.0f).FirstOrDefault();
-      Assert.NotNull(m2);
-      Assert.AreEqual(8.0f, m2.Format);
+      Assert.That(m2, Is.Not.Null);
+      Assert.That(m2.Format, Is.EqualTo(8.0f));
     }
 
     /// <summary>
@@ -168,7 +168,7 @@ public void CheckByteArray()
         ((IObjectContextAdapter)db).ObjectContext.CreateDatabaseScript();
       Regex rx = new Regex(@"`Data` (?<type>[^\),]*)", RegexOptions.Compiled | RegexOptions.Singleline);
       Match m = rx.Match(dbCreationScript);
-      Assert.AreEqual("longblob", m.Groups["type"].Value);
+      Assert.That(m.Groups["type"].Value, Is.EqualTo("longblob"));
     }
 
     /// <summary>
@@ -187,7 +187,7 @@ public void CallStoredProcedure()
         context.Database.ExecuteSqlCommand(@"create procedure `GetCount`() begin select 5; end;");
         long count = context.Database.SqlQuery<long>("call GetCount").First();
 
-        Assert.AreEqual(5, count);
+        Assert.That(count, Is.EqualTo(5));
       }
     }
 
@@ -220,7 +220,7 @@ public void Bug63920_Test1()
           records = Convert.ToInt32(cmd.ExecuteScalar());
         }
 
-        Assert.AreEqual(context.Vehicles.Count(), records);
+        Assert.That(records, Is.EqualTo(context.Vehicles.Count()));
       }
     }
 
@@ -253,7 +253,7 @@ public void Bug63920_Test2()
           records = Convert.ToInt32(cmd.ExecuteScalar());
         }
 
-        Assert.AreEqual(context.Vehicles.Count(), records);
+        Assert.That(records, Is.EqualTo(context.Vehicles.Count()));
       }
     }
 
@@ -275,8 +275,8 @@ public void TestPrecisionNscale()
 where table_schema = '{Connection.Database}' and table_name = 'movies' and column_name = 'Price'", Connection).ExecuteReader())
       {
         r.Read();
-        Assert.AreEqual(16, r.GetInt32(0));
-        Assert.AreEqual(2, r.GetInt32(1));
+        Assert.That(r.GetInt32(0), Is.EqualTo(16));
+        Assert.That(r.GetInt32(1), Is.EqualTo(2));
       }
     }
 
@@ -310,9 +310,9 @@ public void TestStringTypeToStoreType()
           MySqlDataReader reader = query.ExecuteReader();
           while (reader.Read())
           {
-            Assert.AreEqual("Description", reader[0].ToString());
-            Assert.AreEqual("NO", reader[1].ToString());
-            Assert.AreEqual("mediumtext", reader[2].ToString());
+            Assert.That(reader[0].ToString(), Is.EqualTo("Description"));
+            Assert.That(reader[1].ToString(), Is.EqualTo("NO"));
+            Assert.That(reader[2].ToString(), Is.EqualTo("mediumtext"));
           }
           reader.Close();
 
@@ -320,10 +320,10 @@ public void TestStringTypeToStoreType()
           reader = query.ExecuteReader();
           while (reader.Read())
           {
-            Assert.AreEqual("Name", reader[0].ToString());
-            Assert.AreEqual("NO", reader[1].ToString());
-            Assert.AreEqual("varchar", reader[2].ToString());
-            Assert.AreEqual("255", reader[3].ToString());
+            Assert.That(reader[0].ToString(), Is.EqualTo("Name"));
+            Assert.That(reader[1].ToString(), Is.EqualTo("NO"));
+            Assert.That(reader[2].ToString(), Is.EqualTo("varchar"));
+            Assert.That(reader[3].ToString(), Is.EqualTo("255"));
           }
           reader.Close();
 
@@ -331,10 +331,10 @@ public void TestStringTypeToStoreType()
           reader = query.ExecuteReader();
           while (reader.Read())
           {
-            Assert.AreEqual("LongDescription", reader[0].ToString());
-            Assert.AreEqual("NO", reader[1].ToString());
-            Assert.AreEqual("longtext", reader[2].ToString());
-            Assert.AreEqual("4294967295", reader[3].ToString());
+            Assert.That(reader[0].ToString(), Is.EqualTo("LongDescription"));
+            Assert.That(reader[1].ToString(), Is.EqualTo("NO"));
+            Assert.That(reader[2].ToString(), Is.EqualTo("longtext"));
+            Assert.That(reader[3].ToString(), Is.EqualTo("4294967295"));
           }
         }
       }
@@ -360,7 +360,7 @@ public void AddingEmptyRow()
       using (MovieDBContext ctx2 = new MovieDBContext())
       {
         var q = from esc in ctx2.EntitySingleColumns where esc.Id == 1 select esc;
-        Assert.AreEqual(1, q.Count());
+        Assert.That(q.Count(), Is.EqualTo(1));
       }
     }
 
@@ -413,7 +413,7 @@ public void IdentityTest()
           // Validates Guid
           MySqlCommand cmd = new MySqlCommand("SELECT * FROM Manufacturers", conn);
           MySqlDataReader dr = cmd.ExecuteReader();
-          Assert.False(!dr.HasRows, "No records found");
+          Assert.That(dr.HasRows, "No records found");
 
           while (dr.Read())
           {
@@ -421,12 +421,12 @@ public void IdentityTest()
             switch (name)
             {
               case "Nissan":
-                Assert.AreEqual(dr.GetGuid(0), nissan.ManufacturerId);
-                Assert.AreEqual(dr.GetGuid(2), nissan.GroupIdentifier);
+                Assert.That(nissan.ManufacturerId, Is.EqualTo(dr.GetGuid(0)));
+                Assert.That(nissan.GroupIdentifier, Is.EqualTo(dr.GetGuid(2)));
                 break;
               case "Ford":
-                Assert.AreEqual(dr.GetGuid(0), ford.ManufacturerId);
-                Assert.AreEqual(dr.GetGuid(2), ford.GroupIdentifier);
+                Assert.That(ford.ManufacturerId, Is.EqualTo(dr.GetGuid(0)));
+                Assert.That(ford.GroupIdentifier, Is.EqualTo(dr.GetGuid(2)));
                 break;
               default:
                 //Assert.Fail();
@@ -446,10 +446,10 @@ public void IdentityTest()
               switch (name)
               {
                 case "Distributor1":
-                  Assert.AreEqual(dr.GetInt32(0), dis1.DistributorId);
+                  Assert.That(dis1.DistributorId, Is.EqualTo(dr.GetInt32(0)));
                   break;
                 case "Distributor2":
-                  Assert.AreEqual(dr.GetInt32(0), dis2.DistributorId);
+                  Assert.That(dis2.DistributorId, Is.EqualTo(dr.GetInt32(0)));
                   break;
                 default:
                   //Assert.Fail();
@@ -490,7 +490,7 @@ public void FirstOrDefaultNested()
         {
           j--;
         }
-        Assert.AreEqual(0, j);
+        Assert.That(j, Is.EqualTo(0));
       }
     }
 
@@ -523,7 +523,7 @@ orderby cu.customer_id descending
         {
           //Debug.WriteLine( r.country1 );
         }
-        Assert.AreEqual(599, j);
+        Assert.That(j, Is.EqualTo(599));
       }
     }
 
@@ -550,10 +550,10 @@ public void CanDefineDatesWithPrecisionFor56()
           MySqlDataReader reader = query.ExecuteReader();
           while (reader.Read())
           {
-            Assert.AreEqual("DateTimeWithPrecision", reader[0].ToString());
-            Assert.AreEqual("NO", reader[1].ToString());
-            Assert.AreEqual("datetime", reader[2].ToString());
-            Assert.AreEqual("3", reader[3].ToString());
+            Assert.That(reader[0].ToString(), Is.EqualTo("DateTimeWithPrecision"));
+            Assert.That(reader[1].ToString(), Is.EqualTo("NO"));
+            Assert.That(reader[2].ToString(), Is.EqualTo("datetime"));
+            Assert.That(reader[3].ToString(), Is.EqualTo("3"));
           }
           reader.Close();
 
@@ -562,10 +562,10 @@ public void CanDefineDatesWithPrecisionFor56()
           reader = query.ExecuteReader();
           while (reader.Read())
           {
-            Assert.AreEqual("TimeStampWithPrecision", reader[0].ToString());
-            Assert.AreEqual("NO", reader[1].ToString());
-            Assert.AreEqual("timestamp", reader[2].ToString());
-            Assert.AreEqual("3", reader[3].ToString());
+            Assert.That(reader[0].ToString(), Is.EqualTo("TimeStampWithPrecision"));
+            Assert.That(reader[1].ToString(), Is.EqualTo("NO"));
+            Assert.That(reader[2].ToString(), Is.EqualTo("timestamp"));
+            Assert.That(reader[3].ToString(), Is.EqualTo("3"));
           }
           reader.Close();
         }
@@ -608,10 +608,10 @@ public void CanDefineDateTimeAndTimestampWithIdentity()
         updateProduct.DateTimeWithPrecision = new DateTime(2012, 3, 18, 23, 9, 7, 6);
         db.SaveChanges();
 
-        Assert.NotNull(db.Products.First().Timestamp);
-        Assert.NotNull(db.Products.First().DateCreated);
-        Assert.AreEqual(new DateTime(2012, 3, 18, 23, 9, 7, 6), db.Products.First().DateTimeWithPrecision);
-        Assert.AreEqual(1, db.Products.Count());
+        Assert.That(db.Products.First().Timestamp, Is.Not.Empty);
+        Assert.That(db.Products.First().DateCreated, Is.Not.Empty);
+        Assert.That(db.Products.First().DateTimeWithPrecision, Is.EqualTo(new DateTime(2012, 3, 18, 23, 9, 7, 6)));
+        Assert.That(db.Products.Count(), Is.EqualTo(1));
         db.Database.Delete();
       }
     }
@@ -740,10 +740,10 @@ public void ShipTest()
           }
         }
         // check data integrity
-        Assert.AreEqual(outData.Count, data.Length);
+        Assert.That(data.Length, Is.EqualTo(outData.Count));
         for (int i = 0; i < data.Length; i++)
         {
-          Assert.True(outData.ContainsKey(data[i]));
+          Assert.That(outData.ContainsKey(data[i]));
         }
       }
     }
@@ -852,12 +852,12 @@ public void BadOrderBy()
         int i = 0;
         foreach (Movie m in q)
         {
-          Assert.AreEqual(data[i].ID, m.ID);
-          Assert.AreEqual(data[i].Title, m.Title);
-          Assert.AreEqual(data[i].ReleaseDate, m.ReleaseDate);
+          Assert.That(m.ID, Is.EqualTo(data[i].ID));
+          Assert.That(m.Title, Is.EqualTo(data[i].Title));
+          Assert.That(m.ReleaseDate, Is.EqualTo(data[i].ReleaseDate));
           i++;
         }
-        Assert.AreEqual(2, i);
+        Assert.That(i, Is.EqualTo(2));
       }
     }
 
@@ -887,9 +887,9 @@ orderby m.ID descending
         int i = 0;
         foreach (var row in q1)
         {
-          Assert.AreEqual(MovieDBInitialize.data[i].ID, row.ID);
-          Assert.AreEqual(MovieDBInitialize.data[i].Title, row.Title);
-          Assert.AreEqual(MovieDBInitialize.data[i].ReleaseDate, row.ReleaseDate);
+          Assert.That(row.ID, Is.EqualTo(MovieDBInitialize.data[i].ID));
+          Assert.That(row.Title, Is.EqualTo(MovieDBInitialize.data[i].Title));
+          Assert.That(row.ReleaseDate, Is.EqualTo(MovieDBInitialize.data[i].ReleaseDate));
           i++;
         }
       }
@@ -953,7 +953,7 @@ public void BadContainsOrderByTake2()
         {
           j--;
         }
-        Assert.AreEqual(0, j);
+        Assert.That(j, Is.EqualTo(0));
       }
     }
 
@@ -992,7 +992,7 @@ public void BadContainsOrderByTake3()
         {
           j--;
         }
-        Assert.AreEqual(0, j);
+        Assert.That(j, Is.EqualTo(0));
       }
     }
 
@@ -1071,7 +1071,7 @@ where m.Title.Contains("x") && db.Medias.Where(mm => mm.Format == "Digital").Any
         {
           j--;
         }
-        Assert.AreEqual(0, j);
+        Assert.That(j, Is.EqualTo(0));
       }
     }
 
@@ -1092,7 +1092,7 @@ public void AutoIncrementBug()
       using (var reader = MySqlHelper.ExecuteReader(dbContext.Database.Connection.ConnectionString,
         $"SHOW COLUMNS FROM {nameof(dbContext.AutoIncrementBug)}s WHERE UPPER(EXTRA) LIKE '%AUTO_INCREMENT%'"))
       {
-        Assert.True(reader.HasRows);
+        Assert.That(reader.HasRows);
       }
       dbContext.Database.Delete();
     }
@@ -1143,7 +1143,7 @@ public void MigrationHistoryConfigurationTest()
       {
       }
       var result = MySqlHelper.ExecuteScalar($"server=localhost;User Id=root;database={db.Database.Connection.Database};logging=true; port=" + Port + ";", "SELECT COUNT(_MigrationId) FROM __MySqlMigrations;");
-      Assert.AreEqual(1, int.Parse(result.ToString()));
+      Assert.That(int.Parse(result.ToString()), Is.EqualTo(1));
     }
 
     [Test]
@@ -1159,14 +1159,14 @@ public void DbSetRangeTest()
         db.Movies.AddRange(new Movie[] { m1, m2, m3, m4 });
         db.SaveChanges();
         var q = from m in db.Movies select m;
-        Assert.AreEqual(4, q.Count());
+        Assert.That(q.Count(), Is.EqualTo(4));
         foreach (var row in q)
         {
         }
         db.Movies.RemoveRange(q.ToList());
         db.SaveChanges();
         var q2 = from m in db.Movies select m;
-        Assert.AreEqual(0, q2.Count());
+        Assert.That(q2.Count(), Is.EqualTo(0));
       }
     }
 
@@ -1183,8 +1183,8 @@ public void EnumSupportTest()
                         where s.Subject == SchoolSubject.History
                         select s).FirstOrDefault();
 
-        Assert.AreNotEqual(null, schedule);
-        Assert.AreEqual(SchoolSubject.History, schedule.Subject);
+        Assert.That(schedule, Is.Not.EqualTo(null));
+        Assert.That(schedule.Subject, Is.EqualTo(SchoolSubject.History));
       }
     }
 
@@ -1226,15 +1226,15 @@ public void SpatialSupportTest()
 
         var distance = (point.Distance(place.location) * 100);
 
-        Assert.AreNotEqual(null, place);
-        Assert.AreEqual(8.6944880240295852D, distance.Value);
+        Assert.That(place, Is.Not.Null);
+        Assert.That(distance.Value, Is.EqualTo(8.6944880240295852D));
 
         var points = from p in dbCtx.MyPlaces
                      select new { name = p.name, location = p.location };
         foreach (var item in points)
         {
           var distanceX = DbGeometry.FromText("POINT(40.717957 -73.736501)").Distance(item.location) * 100;
-          Assert.IsNotNull(distanceX);
+          Assert.That(distanceX, Is.Not.Null);
         }
 
         foreach (MyPlace p in dbCtx.MyPlaces)
@@ -1268,9 +1268,9 @@ public void SpatialSupportTest()
 
         var result = (from u in dbCtx.MyPlaces select u.location.CoordinateSystemId).ToList();
         foreach (var item in result)
-          Assert.IsNotNull(item);
+          Assert.That(item, Is.Not.Empty);
         var res = dbCtx.MyPlaces.OrderBy(q => q.name.Take(1).Skip(1).ToList());
-        Assert.IsNotNull(res);
+        Assert.That(res, Is.Not.Null);
 
         var pointA1 = DbGeometry.FromText(string.Format("POINT(40.644047 -73.782291)"));
         var pointB1 = DbGeometry.FromText("POINT(40.717957 -73.736501)");
@@ -1284,7 +1284,7 @@ public void SpatialSupportTest()
         var pointB3 = DbGeometry.FromText("POINT(-1 3)");
         var distance3 = pointA3.Distance(pointB3);
 
-        Assert.True(distance1.Value == 0.086944880240295855 && distance2.Value == 2.2671568097509267 &&
+        Assert.That(distance1.Value == 0.086944880240295855 && distance2.Value == 2.2671568097509267 &&
              distance3.Value == 8.06225774829855);
 
       }
@@ -1310,12 +1310,12 @@ public void BeginTransactionSupportTest()
 
             dbcontext.SaveChanges();
             var result = MySqlHelper.ExecuteScalar("server=localhost;User Id=root;database=test;logging=true;port=" + Port + ";", "select COUNT(*) from moviecbcs;");
-            Assert.AreEqual(0, int.Parse(result.ToString()));
+            Assert.That(int.Parse(result.ToString()), Is.EqualTo(0));
 
             transaction.Commit();
 
             result = MySqlHelper.ExecuteScalar("server=localhost;User Id=root;database=test;logging=true; port=" + Port + ";", "select COUNT(*) from moviecbcs;");
-            Assert.AreEqual(1, int.Parse(result.ToString()));
+            Assert.That(int.Parse(result.ToString()), Is.EqualTo(1));
           }
           catch (Exception)
           {
@@ -1359,12 +1359,12 @@ public void UseTransactionSupportTest()
               dbcontext.SaveChanges();
             }
             var result = MySqlHelper.ExecuteScalar("server=localhost;User Id=root;database=test;logging=true; port=" + Port + ";", "select COUNT(*) from moviecbcs;");
-            Assert.AreEqual(0, int.Parse(result.ToString()));
+            Assert.That(int.Parse(result.ToString()), Is.EqualTo(0));
 
             transaction.Commit();
 
             result = MySqlHelper.ExecuteScalar("server=localhost;User Id=root;database=test;logging=true; port=" + Port + ";", "select COUNT(*) from moviecbcs;");
-            Assert.AreEqual(1, int.Parse(result.ToString()));
+            Assert.That(int.Parse(result.ToString()), Is.EqualTo(1));
           }
           catch (Exception)
           {
@@ -1390,9 +1390,9 @@ public void HasChangesSupportTest()
           ReleaseDate = DateTime.Parse("01/07/2013")
         });
 
-        Assert.True(dbcontext.ChangeTracker.HasChanges());
+        Assert.That(dbcontext.ChangeTracker.HasChanges());
         dbcontext.SaveChanges();
-        Assert.False(dbcontext.ChangeTracker.HasChanges());
+        Assert.That(!dbcontext.ChangeTracker.HasChanges());
       }
     }
 
@@ -1419,7 +1419,7 @@ public void MySqlLoggingToFileSupportTest()
         dbcontext.SaveChanges();
       }
 
-      Assert.AreEqual(true, System.IO.File.Exists(logName));
+      Assert.That(System.IO.File.Exists(logName), Is.EqualTo(true));
     }
 
     [Test]
@@ -1462,7 +1462,7 @@ public void MySqlLoggingToConsoleSupportTest()
       writer.Close();
       file.Close();
 
-      Assert.AreEqual(true, System.IO.File.Exists(logName));
+      Assert.That(System.IO.File.Exists(logName), Is.EqualTo(true));
     }
 
     [Test]
@@ -1483,10 +1483,11 @@ public void EntityAndComplexTypeSupportTest()
         var student = (from s in dbContext.Students
                        select s).FirstOrDefault();
 
-        Assert.AreNotEqual(null, student);
-        Assert.AreNotEqual(null, student.Schedule);
-        Assert.AreNotEqual(true, string.IsNullOrEmpty(student.Address.Street));
-        Assert.AreNotEqual(0, student.Schedule.Count());
+        Assert.That(student, Is.Not.Null);
+        Assert.That(student.Schedule, Is.Not.Null);
+        Assert.That(student.Address.Street, Is.Not.Null);
+        Assert.That(student.Address.Street, Is.Not.Empty);
+        Assert.That(student.Schedule.Count(), Is.Not.EqualTo(0));
       }
     }
 
@@ -1516,7 +1517,7 @@ public void ExecutionStrategyTest()
         connection.Dispose();
       }
       var result = MySqlHelper.ExecuteScalar("server=localhost;User Id=root;database=test;logging=true; port=" + Port + ";", "select COUNT(*) from moviecbcs;");
-      Assert.AreEqual(1, int.Parse(result.ToString()));
+      Assert.That(int.Parse(result.ToString()), Is.EqualTo(1));
     }
 
     [Test]
@@ -1565,7 +1566,7 @@ public void StartsWithTest()
       {
         j--;
       }
-      Assert.AreEqual(0, j);
+      Assert.That(j, Is.EqualTo(0));
     }
 
     [Test]
@@ -1592,7 +1593,7 @@ public void EndsWithTest()
       {
         j--;
       }
-      Assert.AreEqual(0, j);
+      Assert.That(j, Is.EqualTo(0));
     }
 
     [Test]
@@ -1618,7 +1619,7 @@ public void ContainsTest()
       {
         j--;
       }
-      Assert.AreEqual(0, j);
+      Assert.That(j, Is.EqualTo(0));
     }
 
 
@@ -1708,7 +1709,7 @@ public void ReplaceTableNameVisitor()
         Debug.WriteLine(sql);
 #endif
         var result = rentals.ToList();
-        Assert.AreEqual(520, rentals.Count());
+        Assert.That(rentals.Count(), Is.EqualTo(520));
       }
     }
 
@@ -1748,9 +1749,9 @@ public void InvalidQuery()
                     .Include(c => c.Orders.Select(o => o.Items))
                     .Include(c => c.Orders.Select(o => o.Discounts)).ToList();
 
-        Assert.AreEqual(clients.Count(), 3);
-        Assert.AreEqual(clients.Where(t => t.Id == 1).Single().Orders.Count(), 1);
-        Assert.AreEqual(clients.Where(t => t.Id == 1).Single().Orders.Where(j => j.Id == 1).Single().Items.Count(), 3);
+        Assert.That(3, Is.EqualTo(clients.Count()));
+        Assert.That(1, Is.EqualTo(clients.Where(t => t.Id == 1).Single().Orders.Count()));
+        Assert.That(3, Is.EqualTo(clients.Where(t => t.Id == 1).Single().Orders.Where(j => j.Id == 1).Single().Items.Count()));
       }
     }
 
@@ -1795,17 +1796,17 @@ BEFORE UPDATE ON `MovieRelease2`
           mr.Id = 1;
           mr.Name = "Commercial";
           db.MovieReleases2.Add(mr);
-          Assert.AreEqual(mr.RowVersion, 0);
+          Assert.That(0, Is.EqualTo(mr.RowVersion));
           db.SaveChanges(); // ADD
-          Assert.AreEqual(mr.RowVersion, 0);
+          Assert.That(0, Is.EqualTo(mr.RowVersion));
 
           mr.Name = "Director's Cut";
           db.SaveChanges(); // UPDATE #1
-          Assert.AreEqual(mr.RowVersion, 1);
+          Assert.That(1, Is.EqualTo(mr.RowVersion));
 
           mr.Name = "Avengers";
           db.SaveChanges(); // UPDATE #2
-          Assert.AreEqual(mr.RowVersion, 2);
+          Assert.That(2, Is.EqualTo(mr.RowVersion));
         }
         finally
         {
@@ -1847,13 +1848,13 @@ public void TablesWithSchema()
         context.Blog.Add(blog);
 
         context.SaveChanges();
-        Assert.AreEqual(2, context.Blog.Count());
-        Assert.AreEqual(2, context.Blog.First(b => b.Title == "Blog_2").BlogId);
+        Assert.That(context.Blog.Count(), Is.EqualTo(2));
+        Assert.That(context.Blog.First(b => b.Title == "Blog_2").BlogId, Is.EqualTo(2));
 
         context.Blog.Remove(blog);
         context.SaveChanges();
-        Assert.AreEqual(1, context.Blog.Count());
-        Assert.AreEqual("Blog_1", context.Blog.First().Title);
+        Assert.That(context.Blog.Count(), Is.EqualTo(1));
+        Assert.That(context.Blog.First().Title, Is.EqualTo("Blog_1"));
       }
     }
 
@@ -1909,7 +1910,7 @@ public void UnionSyntax()
         var query1 = context.StringUsers;
         var query2 = query1.Take(0).Concat(query1);
         var query3 = query1.Concat(query1.Take(0));
-        Assert.True((query1.Count() == 5) & (query2.Count() == 5) & (query3.Count() == 5));
+        Assert.That((query1.Count() == 5) & (query2.Count() == 5) & (query3.Count() == 5));
       }
     }
 
@@ -1935,7 +1936,7 @@ public void NormalForeignKey()
             while (reader.Read())
             {
               var val = reader.GetValue(0);
-              Assert.True(val.ToString().Contains("FK_"));
+              Assert.That(val.ToString().Contains("FK_"));
             }
           }
         }
@@ -1964,7 +1965,7 @@ public void LongForeignKey()
             while (reader.Read())
             {
               var val = reader.GetValue(0);
-              Assert.True(val.ToString().Contains("FK_"));
+              Assert.That(val.ToString().Contains("FK_"));
             }
           }
         }
@@ -2026,7 +2027,7 @@ public void SaveTinyIntAsPK()
         var query1 = context.TinyPkUseRs;
         var query2 = query1.Take(0).Concat(query1);
         var query3 = query1.Concat(query1.Take(0));
-        Assert.True((query1.Count() == 5) & (query2.Count() == 5) & (query3.Count() == 5));
+        Assert.That((query1.Count() == 5) & (query2.Count() == 5) & (query3.Count() == 5));
       }
     }
 
@@ -2085,7 +2086,7 @@ public void SaveBigIntAsPK()
         var query1 = context.BigIntPkUseRs;
         var query2 = query1.Take(0).Concat(query1);
         var query3 = query1.Concat(query1.Take(0));
-        Assert.True((query1.Count() == 5) & (query2.Count() == 5) & (query3.Count() == 5));
+        Assert.That((query1.Count() == 5) & (query2.Count() == 5) & (query3.Count() == 5));
       }
     }
 
@@ -2126,7 +2127,7 @@ public void BeginTransNested()
           trans.Commit();
         }
         var count = context.SchoolSchedules.Count();
-        Assert.AreEqual(3, count);
+        Assert.That(count, Is.EqualTo(3));
         //Rollback
         using (var trans = context.Database.BeginTransaction())
         {
@@ -2145,7 +2146,7 @@ public void BeginTransNested()
           trans.Commit();
         }
         count = context.SchoolSchedules.Count();
-        Assert.AreEqual(4, count);
+        Assert.That(count, Is.EqualTo(4));
       }
 
     }
@@ -2186,7 +2187,7 @@ public void TransactionAfterFailStressTest()
             context.SaveChanges();
             trans.Commit();
             var count = context.SchoolSchedules.Count();
-            Assert.True(count > 0);
+            Assert.That(count > 0);
           }
         }
       }
@@ -2231,23 +2232,23 @@ public void TestListMatchingLike()
 
         string[] matchText = new string[] { "must", "tan" };
         var list = context.Vehicles.Where(v => matchText.Any(t => v.Name.Contains(t)));
-        Assert.AreEqual(1, list.Count());
+        Assert.That(list.Count(), Is.EqualTo(1));
 
         matchText = new string[] { "mus't", "tan" };
         list = context.Vehicles.Where(v => matchText.Any(t => v.Name.Contains(t)));
-        Assert.AreEqual(1, list.Count());
+        Assert.That(list.Count(), Is.EqualTo(1));
 
         matchText = new string[] { "%" };
         list = context.Vehicles.Where(v => matchText.Any(t => v.Name.Contains(t)));
-        Assert.AreEqual(0, list.Count());
+        Assert.That(list.Count(), Is.EqualTo(0));
 
         matchText = new string[] { "tan" };
         list = context.Vehicles.Where(v => matchText.Any(t => v.Name.Contains(t)));
-        Assert.AreEqual(1, list.Count());
+        Assert.That(list.Count(), Is.EqualTo(1));
 
         matchText = new string[] { "_" };
         list = context.Vehicles.Where(v => matchText.Any(t => v.Name.Contains(t)));
-        Assert.AreEqual(0, list.Count());
+        Assert.That(list.Count(), Is.EqualTo(0));
       }
     }
   }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/GlobalUsings.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/GlobalUsings.cs
deleted file mode 100644
index 575c7cfd0..000000000
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/GlobalUsings.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-global using Assert = NUnit.Framework.Legacy.ClassicAssert;
-global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
-global using StringAssert = NUnit.Framework.Legacy.StringAssert;
-global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
-global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/GlobalUsings.cs b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/GlobalUsings.cs
deleted file mode 100644
index 575c7cfd0..000000000
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/GlobalUsings.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-global using Assert = NUnit.Framework.Legacy.ClassicAssert;
-global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
-global using StringAssert = NUnit.Framework.Legacy.StringAssert;
-global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
-global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySqlMigrationsTests.cs b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySqlMigrationsTests.cs
index bf2974f29..e43268894 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySqlMigrationsTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySqlMigrationsTests.cs
@@ -85,15 +85,15 @@ public void AddColumnOperationMigration()
         using (MySqlConnection conn = new MySqlConnection(context.Database.Connection.ConnectionString))
         {
           if (conn.State == System.Data.ConnectionState.Closed) conn.Open();
-          Assert.AreEqual(true, GenerateAndExecuteMySQLStatements(migrationOperations));
+          Assert.That(GenerateAndExecuteMySQLStatements(migrationOperations), Is.EqualTo(true));
 
           MySqlCommand query = new MySqlCommand("Select Column_name, Is_Nullable, Data_Type from information_schema.Columns where table_schema ='" + conn.Database + "' and table_name = 'Blogs' and column_name ='TotalPosts'", conn);
           MySqlDataReader reader = query.ExecuteReader();
           while (reader.Read())
           {
-            Assert.AreEqual("TotalPosts", reader[0].ToString());
-            Assert.AreEqual("NO", reader[1].ToString());
-            Assert.AreEqual("int", reader[2].ToString());
+            Assert.That(reader[0].ToString(), Is.EqualTo("TotalPosts"));
+            Assert.That(reader[1].ToString(), Is.EqualTo("NO"));
+            Assert.That(reader[2].ToString(), Is.EqualTo("int"));
           }
           reader.Close();
           conn.Close();
@@ -122,7 +122,7 @@ public void CreateTableOperationMigration()
         using (var conn = new MySqlConnection(context.Database.Connection.ConnectionString))
         {
           if (conn.State == System.Data.ConnectionState.Closed) conn.Open();
-          Assert.True(GenerateAndExecuteMySQLStatements(migrationOperations));
+          Assert.That(GenerateAndExecuteMySQLStatements(migrationOperations));
           using (MySqlCommand query = new MySqlCommand($"SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA ='{conn.Database}'" +
             $" AND TABLE_NAME = 'Posts'", conn))
           {
@@ -137,7 +137,7 @@ public void CreateTableOperationMigration()
             query.CommandText = $"SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '{conn.Database}' AND " +
               $"TABLE_NAME = 'Posts' AND COLUMN_NAME = 'Password'";
 
-            StringAssert.AreEqualIgnoringCase("binary(10)", query.ExecuteScalar().ToString());
+            Assert.That(query.ExecuteScalar().ToString(), Is.EqualTo("binary(10)").IgnoreCase);
           }
         }
       }
@@ -195,7 +195,7 @@ public void CreateForeignKeyOperation()
         if (context.Database.Exists()) context.Database.Delete();
         context.Database.Create();
 
-        Assert.AreEqual(true, GenerateAndExecuteMySQLStatements(migrationOperations));
+        Assert.That(GenerateAndExecuteMySQLStatements(migrationOperations), Is.EqualTo(true));
 
         using (var conn = new MySqlConnection(context.Database.Connection.ConnectionString))
         {
@@ -203,11 +203,11 @@ public void CreateForeignKeyOperation()
           // check for foreign key creation
           MySqlCommand query = new MySqlCommand("select Count(*) from information_schema.table_constraints where LOWER(constraint_type) = 'foreign key' and constraint_schema = '" + conn.Database + "' and constraint_name = 'FKBlogs'", conn);
           int rows = Convert.ToInt32(query.ExecuteScalar());
-          Assert.AreEqual(1, rows);
+          Assert.That(rows, Is.EqualTo(1));
           // check for table creation          
           query = new MySqlCommand("select Count(*) from information_schema.Tables WHERE `table_name` = 'Posts' and `table_schema` = '" + conn.Database + "' ", conn);
           rows = Convert.ToInt32(query.ExecuteScalar());
-          Assert.AreEqual(1, rows);
+          Assert.That(rows, Is.EqualTo(1));
           conn.Close();
         }
 
@@ -221,7 +221,7 @@ public void CreateForeignKeyOperation()
           {
             r.Read();
             string sql = r.GetString(1);
-            Assert.True(sql.IndexOf(
+            Assert.That(sql.IndexOf(
               " CONSTRAINT `FKBlogs` FOREIGN KEY (`BlogId`) REFERENCES `blogs` (`BlogId`) ON DELETE CASCADE ON UPDATE CASCADE",
               StringComparison.OrdinalIgnoreCase) != -1);
           }
@@ -259,7 +259,7 @@ public void DropPrimaryKeyOperationWithAnonymousArguments()
         context.Database.Create();
 
 
-        Assert.AreEqual(true, GenerateAndExecuteMySQLStatements(migrationOperations));
+        Assert.That(GenerateAndExecuteMySQLStatements(migrationOperations), Is.EqualTo(true));
 
         using (var conn = new MySqlConnection(context.Database.Connection.ConnectionString))
         {
@@ -268,21 +268,21 @@ public void DropPrimaryKeyOperationWithAnonymousArguments()
           // check for table creation          
           var query = new MySqlCommand("select Count(*) from information_schema.Tables WHERE `table_name` = 'Posts' and `table_schema` = '" + conn.Database + "' ", conn);
           int rows = Convert.ToInt32(query.ExecuteScalar());
-          Assert.AreEqual(1, rows);
+          Assert.That(rows, Is.EqualTo(1));
 
           // check if PK exists          
           query = new MySqlCommand("select Count(*) from information_schema.table_constraints where `constraint_type` = 'primary key' and `constraint_schema` = '" + conn.Database + "' and table_name= 'Posts'", conn);
           rows = Convert.ToInt32(query.ExecuteScalar());
-          Assert.AreEqual(0, rows);
+          Assert.That(rows, Is.EqualTo(0));
 
           //check the definition of the column that was PK
           query = new MySqlCommand("Select Column_name, Is_Nullable, Data_Type from information_schema.Columns where table_schema ='" + conn.Database + "' and table_name = 'Posts' and column_name ='PostId'", conn);
           MySqlDataReader reader = query.ExecuteReader();
           while (reader.Read())
           {
-            Assert.AreEqual("PostId", reader[0].ToString());
-            Assert.AreEqual("NO", reader[1].ToString());
-            Assert.AreEqual("int", reader[2].ToString());
+            Assert.That(reader[0].ToString(), Is.EqualTo("PostId"));
+            Assert.That(reader[1].ToString(), Is.EqualTo("NO"));
+            Assert.That(reader[2].ToString(), Is.EqualTo("int"));
           }
           reader.Close();
           conn.Close();
@@ -315,7 +315,7 @@ public void DropPrimaryKeyOperation()
         context.Database.Create();
 
 
-        Assert.AreEqual(true, GenerateAndExecuteMySQLStatements(migrationOperations));
+        Assert.That(GenerateAndExecuteMySQLStatements(migrationOperations), Is.EqualTo(true));
 
         using (var conn = new MySqlConnection(context.Database.Connection.ConnectionString))
         {
@@ -324,21 +324,21 @@ public void DropPrimaryKeyOperation()
           // check for table creation          
           var query = new MySqlCommand("select Count(*) from information_schema.Tables WHERE `table_name` = 'Posts' and `table_schema` = '" + conn.Database + "' ", conn);
           int rows = Convert.ToInt32(query.ExecuteScalar());
-          Assert.AreEqual(1, rows);
+          Assert.That(rows, Is.EqualTo(1));
 
           // check if PK exists          
           query = new MySqlCommand("select Count(*) from information_schema.table_constraints where `constraint_type` = 'primary key' and `constraint_schema` = '" + conn.Database + "' and table_name= 'Posts'", conn);
           rows = Convert.ToInt32(query.ExecuteScalar());
-          Assert.AreEqual(0, rows);
+          Assert.That(rows, Is.EqualTo(0));
 
           //check the definition of the column that was PK
           query = new MySqlCommand("Select Column_name, Is_Nullable, Data_Type from information_schema.Columns where table_schema ='" + conn.Database + "' and table_name = 'Posts' and column_name ='PostId'", conn);
           MySqlDataReader reader = query.ExecuteReader();
           while (reader.Read())
           {
-            Assert.AreEqual("PostId", reader[0].ToString());
-            Assert.AreEqual("NO", reader[1].ToString());
-            Assert.AreEqual("int", reader[2].ToString());
+            Assert.That(reader[0].ToString(), Is.EqualTo("PostId"));
+            Assert.That(reader[1].ToString(), Is.EqualTo("NO"));
+            Assert.That(reader[2].ToString(), Is.EqualTo("int"));
           }
           reader.Close();
           conn.Close();
diff --git a/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs
index e52a7279b..2dbeba0e0 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs
@@ -57,15 +57,15 @@ public void SetAttributesWithoutParams(bool prepare)
       if (prepare) cmd.Prepare();
 
       var result = cmd.ExecuteScalar();
-      if (Version >= new Version(8, 0, 26) || !prepare) StringAssert.AreEqualIgnoringCase("v1", result.ToString());
-      else Assert.IsEmpty(result.ToString());
+      if (Version >= new Version(8, 0, 26) || !prepare) Assert.That(result.ToString(), Is.EqualTo("v1").IgnoreCase);
+      else Assert.That(result.ToString(), Is.Empty);
 
       cmd.Attributes.SetAttribute("n2", 123);
       cmd.CommandText = "SELECT mysql_query_attribute_string('n2')";
       if (prepare) cmd.Prepare();
       result = cmd.ExecuteScalar();
-      if (Version >= new Version(8, 0, 26) || !prepare) StringAssert.AreEqualIgnoringCase("123", result.ToString());
-      else Assert.IsEmpty(result.ToString());
+      if (Version >= new Version(8, 0, 26) || !prepare) Assert.That(result.ToString(), Is.EqualTo("123").IgnoreCase);
+      else Assert.That(result.ToString(), Is.Empty);
 
       MySqlAttribute attr = new MySqlAttribute();
       attr.AttributeName = "n3";
@@ -74,8 +74,8 @@ public void SetAttributesWithoutParams(bool prepare)
       cmd.CommandText = "SELECT mysql_query_attribute_string('n3')";
       if (prepare) cmd.Prepare();
       result = cmd.ExecuteScalar();
-      if (Version >= new Version(8, 0, 26) || !prepare) StringAssert.AreEqualIgnoringCase("v3", result.ToString());
-      else Assert.IsEmpty(result.ToString());
+      if (Version >= new Version(8, 0, 26) || !prepare) Assert.That(result.ToString(), Is.EqualTo("v3").IgnoreCase);
+      else Assert.That(result.ToString(), Is.Empty);
     }
 
     [TestCase("StringType", "value1")]
@@ -93,7 +93,7 @@ public void ValueTypes(string name, object value)
       cmd.Attributes.SetAttribute(name, value);
       cmd.CommandText = $"SELECT mysql_query_attribute_string('{name}')";
       var result = cmd.ExecuteScalar();
-      StringAssert.AreEqualIgnoringCase(value.ToString(), result.ToString());
+      Assert.That(result.ToString(), Is.EqualTo(value.ToString()).IgnoreCase);
     }
 
     [Test]
@@ -108,7 +108,7 @@ public void TimeSpanValueType()
       cmd.Attributes.SetAttribute("TimeSpan", time);
       cmd.CommandText = "SELECT mysql_query_attribute_string('TimeSpan')";
       var result = cmd.ExecuteScalar();
-      StringAssert.StartsWith(time.ToString(), result.ToString());
+      Assert.That(result.ToString(), Does.StartWith(time.ToString()));
     }
 
     [Test]
@@ -123,7 +123,7 @@ public void DateTimeValueType()
       cmd.Attributes.SetAttribute("DateTime", dateTime);
       cmd.CommandText = "SELECT mysql_query_attribute_string('DateTime')";
       var result = cmd.ExecuteScalar();
-      Assert.AreEqual(dateTime.ToString("yyyy-MM-dd HH:mm:ss.ffffff"), result.ToString());
+      Assert.That(result.ToString(), Is.EqualTo(dateTime.ToString("yyyy-MM-dd HH:mm:ss.ffffff")));
     }
 
     [Test]
@@ -131,13 +131,13 @@ public void ClearAttributes()
     {
       using MySqlCommand cmd = new MySqlCommand();
       cmd.Attributes.SetAttribute("foo", "bar");
-      Assert.AreEqual(1, cmd.Attributes.Count);
+      Assert.That(cmd.Attributes.Count, Is.EqualTo(1));
 
       cmd.Attributes.SetAttribute("bar", "foo");
-      Assert.AreEqual(2, cmd.Attributes.Count);
+      Assert.That(cmd.Attributes.Count, Is.EqualTo(2));
 
       cmd.Attributes.Clear();
-      Assert.AreEqual(0, cmd.Attributes.Count);
+      Assert.That(cmd.Attributes.Count, Is.EqualTo(0));
     }
 
     [Test]
@@ -153,7 +153,7 @@ public void SameNameAttribute()
       cmd.CommandText = "SELECT mysql_query_attribute_string('foo')";
 
       var result = cmd.ExecuteScalar();
-      StringAssert.AreEqualIgnoringCase("bar", result.ToString());
+      Assert.That(result.ToString(), Is.EqualTo("bar").IgnoreCase);
     }
 
     [TestCase(true)]
@@ -177,8 +177,8 @@ public void QueryAttributesNotSupported(bool prepare)
       if (prepare) cmd.Prepare();
 
       var result = cmd.ExecuteScalar();
-      StringAssert.AreEqualIgnoringCase("test", result.ToString());
-      StringAssert.Contains(string.Format(Resources.QueryAttributesNotSupported, Version), listener.Strings[0]);
+      Assert.That(result.ToString(), Is.EqualTo("test").IgnoreCase);
+      Assert.That(listener.Strings[0], Does.Contain(string.Format(Resources.QueryAttributesNotSupported, Version)));
     }
 
     [TestCase(true)]
@@ -199,9 +199,9 @@ public void AttributesAndParameters(bool prepare)
       {
         while (reader.Read())
         {
-          StringAssert.AreEqualIgnoringCase("Hello World", reader.GetString(0));
-          StringAssert.AreEqualIgnoringCase("Goodbye World", reader.GetString(1));
-          if (Version >= new Version(8, 0, 26) || !prepare) StringAssert.AreEqualIgnoringCase("bar", reader.GetString(2));
+          Assert.That(reader.GetString(0), Is.EqualTo("Hello World").IgnoreCase);
+          Assert.That(reader.GetString(1), Is.EqualTo("Goodbye World").IgnoreCase);
+          if (Version >= new Version(8, 0, 26) || !prepare) Assert.That(reader.GetString(2), Is.EqualTo("bar").IgnoreCase);
         }
       }
     }
@@ -236,11 +236,11 @@ public void ParameterOverridesAttributeValue(bool prepare)
       using var reader = cmd.ExecuteReader();
       while (reader.Read())
       {
-        StringAssert.AreEqualIgnoringCase("attribute", reader.GetValue(0).ToString());
-        StringAssert.AreEqualIgnoringCase("attribute2", reader.GetValue(1).ToString());
-        StringAssert.AreEqualIgnoringCase("parameter", reader.GetValue(2).ToString());
-        StringAssert.AreEqualIgnoringCase("parameter2", reader.GetValue(3).ToString());
-        StringAssert.AreEqualIgnoringCase("attribute3", reader.GetValue(4).ToString());
+        Assert.That(reader.GetValue(0).ToString(), Is.EqualTo("attribute").IgnoreCase);
+        Assert.That(reader.GetValue(1).ToString(), Is.EqualTo("attribute2").IgnoreCase);
+        Assert.That(reader.GetValue(2).ToString(), Is.EqualTo("parameter").IgnoreCase);
+        Assert.That(reader.GetValue(3).ToString(), Is.EqualTo("parameter2").IgnoreCase);
+        Assert.That(reader.GetValue(4).ToString(), Is.EqualTo("attribute3").IgnoreCase);
       }
     }
   }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
index afd6beba9..29fe191f8 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
@@ -202,18 +202,18 @@ private void TestIntegratedSecurityWithoutProxy(string user, bool pooling)
             threadId = c.ServerThread;
             MySqlCommand command = new MySqlCommand("SELECT 1", c);
             long ret = (long)command.ExecuteScalar();
-            Assert.AreEqual(1, ret);
+            Assert.That(ret, Is.EqualTo(1));
 
             command.CommandText = "select user()";
             string myUser = (string)command.ExecuteScalar();
             // Check if proxy user is correct
-            StringAssert.StartsWith(UserName + "@", myUser);
+            Assert.That(myUser, Does.StartWith(UserName + "@"));
 
             // check if mysql user is correct
             // (foo_user is mapped to current  OS user)
             command.CommandText = "select current_user()";
             string currentUser = (string)command.ExecuteScalar();
-            StringAssert.StartsWith(UserName, currentUser);
+            Assert.That(currentUser, Does.StartWith(UserName));
           }
         }
 
@@ -329,18 +329,18 @@ private void TestIntegratedSecurityWithUser(string user, bool pooling)
           threadId = c.ServerThread;
           MySqlCommand command = new MySqlCommand("SELECT 1", c);
           long ret = (long)command.ExecuteScalar();
-          Assert.AreEqual(1, ret);
+          Assert.That(ret, Is.EqualTo(1));
 
           command.CommandText = "select user()";
           string myUser = (string)command.ExecuteScalar();
           // Check if proxy user is correct
-          StringAssert.StartsWith(UserName + "@", myUser);
+          Assert.That(myUser, Does.StartWith(UserName + "@"));
 
           // check if mysql user is correct
           // (foo_user is mapped to current  OS user)
           command.CommandText = "select current_user()";
           string currentUser = (string)command.ExecuteScalar();
-          StringAssert.StartsWith("foo_user@", currentUser);
+          Assert.That(currentUser, Does.StartWith("foo_user@"));
         }
       }
 
@@ -377,16 +377,16 @@ public void ConnectUsingMySqlNativePasswordPlugin()
         MySqlCommand command = new MySqlCommand("SHOW SESSION STATUS LIKE 'Ssl_version';", connection);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          StringAssert.StartsWith("TLSv1", reader.GetString(1));
+          Assert.That(reader.Read(), Is.True);
+          Assert.That(reader.GetString(1), Does.StartWith("TLSv1"));
         }
 
         command.CommandText = String.Format("SELECT `User`, `plugin` FROM `mysql`.`user` WHERE `User` = '{0}';", userName);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          Assert.AreEqual(userName, reader.GetString(0));
-          Assert.AreEqual(pluginName, reader.GetString(1));
+          Assert.That(reader.Read(), Is.True);
+          Assert.That(reader.GetString(0), Is.EqualTo(userName));
+          Assert.That(reader.GetString(1), Is.EqualTo(pluginName));
         }
 
         connection.Close();
@@ -427,16 +427,16 @@ public void ConnectUsingSha256PasswordPlugin()
         MySqlCommand command = new MySqlCommand("SHOW SESSION STATUS LIKE 'Ssl_version';", connection);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          StringAssert.StartsWith("TLSv1", reader.GetString(1));
+          Assert.That(reader.Read(), Is.True);
+          Assert.That(reader.GetString(1), Does.StartWith("TLSv1"));
         }
 
         command.CommandText = String.Format("SELECT `User`, `plugin` FROM `mysql`.`user` WHERE `User` = '{0}';", userName);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          Assert.AreEqual(userName, reader.GetString(0));
-          Assert.AreEqual(pluginName, reader.GetString(1));
+          Assert.That(reader.Read(), Is.True);
+          Assert.That(reader.GetString(0), Is.EqualTo(userName));
+          Assert.That(reader.GetString(1), Is.EqualTo(pluginName));
         }
 
         connection.Close();
@@ -464,7 +464,7 @@ public void ConnectUsingSha256PasswordPlugin()
         if (serverCompiledUsingOpenSsl)
         {
           Exception ex = Assert.Throws<MySqlException>(() => connection.Open());
-          Assert.AreEqual("Retrieval of the RSA public key is not enabled for insecure connections.", ex.Message);
+          Assert.That(ex.Message, Is.EqualTo("Retrieval of the RSA public key is not enabled for insecure connections."));
         }
         else Assert.Throws<MySqlException>(() => connection.Open());
       }
@@ -491,16 +491,16 @@ public void ConnectUsingSha256PasswordPlugin()
         MySqlCommand command = new MySqlCommand("SHOW SESSION STATUS LIKE 'Ssl_version';", connection);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          StringAssert.StartsWith("TLSv1", reader.GetString(1));
+          Assert.That(reader.Read(), Is.True);
+          Assert.That(reader.GetString(1), Does.StartWith("TLSv1"));
         }
 
         command.CommandText = String.Format("SELECT `User`, `plugin` FROM `mysql`.`user` WHERE `User` = '{0}';", userName);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          Assert.AreEqual(userName, reader.GetString(0));
-          Assert.AreEqual(pluginName, reader.GetString(1));
+          Assert.That(reader.Read(), Is.True);
+          Assert.That(reader.GetString(0), Is.EqualTo(userName));
+          Assert.That(reader.GetString(1), Is.EqualTo(pluginName));
         }
 
         connection.Close();
@@ -542,9 +542,9 @@ public void AllowPublicKeyRetrievalForSha256PasswordPlugin()
       {
         Exception ex = Assert.Throws<MySqlException>(() => connection.Open()); ;
         if (serverCompiledUsingOpenSsl)
-          Assert.AreEqual("Retrieval of the RSA public key is not enabled for insecure connections.", ex.Message);
+          Assert.That(ex.Message, Is.EqualTo("Retrieval of the RSA public key is not enabled for insecure connections."));
         else
-          StringAssert.StartsWith("Authentication to host", ex.Message);
+          Assert.That(ex.Message, Does.StartWith("Authentication to host"));
       }
 
       if (serverCompiledUsingOpenSsl)
@@ -606,8 +606,8 @@ public void ConnectUsingCachingSha2Plugin()
       using (MySqlConnection connection = new MySqlConnection(builder.ConnectionString))
       {
         connection.Open();
-        Assert.AreEqual(ConnectionState.Open, connection.connectionState);
-        Assert.AreEqual(AuthStage.FULL_AUTH, CachingSha2AuthenticationPlugin._authStage);
+        Assert.That(connection.connectionState, Is.EqualTo(ConnectionState.Open));
+        Assert.That(CachingSha2AuthenticationPlugin._authStage, Is.EqualTo(AuthStage.FULL_AUTH));
         connection.Close();
       }
 
@@ -615,8 +615,8 @@ public void ConnectUsingCachingSha2Plugin()
       using (MySqlConnection connection = new MySqlConnection(builder.ConnectionString))
       {
         connection.Open();
-        Assert.AreEqual(ConnectionState.Open, connection.connectionState);
-        Assert.AreEqual(AuthStage.FAST_AUTH, CachingSha2AuthenticationPlugin._authStage);
+        Assert.That(connection.connectionState, Is.EqualTo(ConnectionState.Open));
+        Assert.That(CachingSha2AuthenticationPlugin._authStage, Is.EqualTo(AuthStage.FAST_AUTH));
         connection.Close();
       }
 
@@ -625,14 +625,14 @@ public void ConnectUsingCachingSha2Plugin()
       using (MySqlConnection connection = new MySqlConnection(builder.ConnectionString))
       {
         connection.Open();
-        Assert.AreEqual(AuthStage.FULL_AUTH, CachingSha2AuthenticationPlugin._authStage);
+        Assert.That(CachingSha2AuthenticationPlugin._authStage, Is.EqualTo(AuthStage.FULL_AUTH));
         connection.Close();
       }
 
       // Authentication failure - TLS connection.
       builder.Password = "incorrectPassword";
       Exception ex = Assert.Throws<MySqlException>(() => new MySqlConnection(builder.ConnectionString).Open());
-      StringAssert.StartsWith("Access denied for user", ex.InnerException.Message);
+      Assert.That(ex.InnerException.Message, Does.StartWith("Access denied for user"));
 
       // Authentication success with empty password – Any connection.
       builder.UserID = "testCachingSha2NoPassword";
@@ -643,8 +643,8 @@ public void ConnectUsingCachingSha2Plugin()
       using (MySqlConnection connection = new MySqlConnection(builder.ConnectionString))
       {
         connection.Open();
-        Assert.AreEqual(ConnectionState.Open, connection.connectionState);
-        Assert.AreEqual(AuthStage.GENERATE_SCRAMBLE, CachingSha2AuthenticationPlugin._authStage);
+        Assert.That(connection.connectionState, Is.EqualTo(ConnectionState.Open));
+        Assert.That(CachingSha2AuthenticationPlugin._authStage, Is.EqualTo(AuthStage.GENERATE_SCRAMBLE));
         connection.Close();
       }
 
@@ -653,8 +653,8 @@ public void ConnectUsingCachingSha2Plugin()
       using (MySqlConnection connection = new MySqlConnection(builder.ConnectionString))
       {
         connection.Open();
-        Assert.AreEqual(ConnectionState.Open, connection.connectionState);
-        Assert.AreEqual(AuthStage.GENERATE_SCRAMBLE, CachingSha2AuthenticationPlugin._authStage);
+        Assert.That(connection.connectionState, Is.EqualTo(ConnectionState.Open));
+        Assert.That(CachingSha2AuthenticationPlugin._authStage, Is.EqualTo(AuthStage.GENERATE_SCRAMBLE));
         connection.Close();
       }
 
@@ -663,12 +663,12 @@ public void ConnectUsingCachingSha2Plugin()
       builder.UserID = "testCachingSha2";
       builder.SslMode = MySqlSslMode.Required;
       ex = Assert.Throws<MySqlException>(() => new MySqlConnection(builder.ConnectionString).Open());
-      StringAssert.StartsWith("Access denied for user", ex.InnerException.Message);
+      Assert.That(ex.InnerException.Message, Does.StartWith("Access denied for user"));
 
       // TLS not enabled.
       builder.SslMode = MySqlSslMode.Disabled;
       ex = Assert.Throws<MySqlException>(() => new MySqlConnection(builder.ConnectionString).Open());
-      StringAssert.StartsWith("Access denied for user", ex.InnerException.Message);
+      Assert.That(ex.InnerException.Message, Does.StartWith("Access denied for user"));
 
       // Authentication using RSA keys. Only available in servers compiled with OpenSSL (E.g. Commercial).
       bool serverCompiledUsingOpenSsl = false;
@@ -695,21 +695,21 @@ public void ConnectUsingCachingSha2Plugin()
         using (MySqlConnection connection = new MySqlConnection(builder.ConnectionString))
         {
           ex = Assert.Throws<MySqlException>(() => connection.Open());
-          Assert.AreEqual("Retrieval of the RSA public key is not enabled for insecure connections.", ex.Message);
+          Assert.That(ex.Message, Is.EqualTo("Retrieval of the RSA public key is not enabled for insecure connections."));
         }
 
         builder.AllowPublicKeyRetrieval = true;
         using (MySqlConnection connection = new MySqlConnection(builder.ConnectionString))
         {
           connection.Open();
-          Assert.AreEqual(AuthStage.FULL_AUTH, CachingSha2AuthenticationPlugin._authStage);
+          Assert.That(CachingSha2AuthenticationPlugin._authStage, Is.EqualTo(AuthStage.FULL_AUTH));
           connection.Close();
         }
 
         using (MySqlConnection connection = new MySqlConnection(builder.ConnectionString))
         {
           connection.Open();
-          Assert.AreEqual(AuthStage.FAST_AUTH, CachingSha2AuthenticationPlugin._authStage);
+          Assert.That(CachingSha2AuthenticationPlugin._authStage, Is.EqualTo(AuthStage.FAST_AUTH));
           connection.Close();
         }
 
@@ -718,13 +718,13 @@ public void ConnectUsingCachingSha2Plugin()
         using (MySqlConnection connection = new MySqlConnection(builder.ConnectionString))
         {
           connection.Open();
-          Assert.AreEqual(AuthStage.FULL_AUTH, CachingSha2AuthenticationPlugin._authStage);
+          Assert.That(CachingSha2AuthenticationPlugin._authStage, Is.EqualTo(AuthStage.FULL_AUTH));
           connection.Close();
         }
 
         builder.Password = "incorrectPassword";
         ex = Assert.Throws<MySqlException>(() => new MySqlConnection(builder.ConnectionString).Open());
-        StringAssert.StartsWith("Access denied for user", ex.InnerException.Message);
+        Assert.That(ex.InnerException.Message, Does.StartWith("Access denied for user"));
       }
     }
 
@@ -763,9 +763,9 @@ public void AllowPublicKeyRetrievalForCachingSha2PasswordPlugin()
       {
         Exception ex = Assert.Throws<MySqlException>(() => connection.Open());
         if (serverCompiledUsingOpenSsl)
-          Assert.AreEqual("Retrieval of the RSA public key is not enabled for insecure connections.", ex.Message);
+          Assert.That(ex.Message, Is.EqualTo("Retrieval of the RSA public key is not enabled for insecure connections."));
         else
-          StringAssert.StartsWith("Authentication to host", ex.Message);
+          Assert.That(ex.Message, Does.StartWith("Authentication to host"));
       }
 
       if (serverCompiledUsingOpenSsl)
@@ -813,7 +813,7 @@ public void CachingSha2AuthFailsAfterFlushPrivileges()
       using (MySqlConnection connection = new MySqlConnection(settings.ConnectionString))
       {
         connection.Open();
-        Assert.True(connection.State == ConnectionState.Open);
+        Assert.That(connection.State == ConnectionState.Open, Is.True);
         connection.Close();
       }
 
@@ -822,7 +822,7 @@ public void CachingSha2AuthFailsAfterFlushPrivileges()
       using (MySqlConnection connection = new MySqlConnection(settings.ConnectionString))
       {
         connection.Open();
-        Assert.True(connection.State == ConnectionState.Open);
+        Assert.That(connection.State == ConnectionState.Open, Is.True);
         connection.Close();
       }
 
@@ -834,9 +834,9 @@ public void CachingSha2AuthFailsAfterFlushPrivileges()
       {
         ex = Assert.Throws<MySqlException>(() => connection.Open());
         if (serverCompiledUsingOpenSsl)
-          Assert.AreEqual("Retrieval of the RSA public key is not enabled for insecure connections.", ex.Message);
+          Assert.That(ex.Message, Is.EqualTo("Retrieval of the RSA public key is not enabled for insecure connections."));
         else
-          StringAssert.StartsWith("Authentication to host", ex.Message);
+          Assert.That(ex.Message, Does.StartWith("Authentication to host"));
       }
 
       settings.AllowPublicKeyRetrieval = true;
@@ -846,14 +846,14 @@ public void CachingSha2AuthFailsAfterFlushPrivileges()
         if (serverCompiledUsingOpenSsl)
         {
           connection.Open();
-          Assert.True(connection.State == ConnectionState.Open);
+          Assert.That(connection.State == ConnectionState.Open);
           connection.Close();
         }
         // Fail since AllowPublicKeyRetrieval is ignored in gpl servers.
         else
         {
           ex = Assert.Throws<MySqlException>(() => connection.Open());
-          StringAssert.StartsWith("Authentication to host", ex.Message);
+          Assert.That(ex.Message, Does.StartWith("Authentication to host"));
         }
       }
     }
@@ -889,7 +889,7 @@ public void CheckAllowPublicKeyRetrievalOptionIsAvailable()
       using (MySqlConnection connection = new MySqlConnection(connectionString))
       {
         connection.Open();
-        Assert.True(connection.Settings.AllowPublicKeyRetrieval);
+        Assert.That(connection.Settings.AllowPublicKeyRetrieval, Is.True);
         connection.Close();
       }
     }
@@ -920,14 +920,14 @@ public void ConnectUsingClearPasswordPlugin()
       using (MySqlConnection connection = new MySqlConnection(settings.ConnectionString))
       {
         connection.Open();
-        Assert.AreEqual(ConnectionState.Open, connection.connectionState);
+        Assert.That(connection.connectionState, Is.EqualTo(ConnectionState.Open));
         var sql = string.Format("select user,plugin from mysql.user where user like '{0}'", settings.UserID);
         MySqlCommand command = new MySqlCommand(sql, connection);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          StringAssert.AreEqualIgnoringCase("test1@MYSQL.LOCAL", reader.GetString(0));
-          StringAssert.AreEqualIgnoringCase("authentication_ldap_simple", reader.GetString(1));
+          Assert.That(reader.Read(), Is.True);
+          Assert.That(reader.GetString(0), Is.EqualTo("test1@MYSQL.LOCAL").IgnoreCase);
+          Assert.That(reader.GetString(1), Is.EqualTo("authentication_ldap_simple").IgnoreCase);
         }
         //test the new user can execute sql statements FR1_1	
         sql = "create table testinserts( id int, name varchar(50),age int)";
@@ -942,13 +942,13 @@ public void ConnectUsingClearPasswordPlugin()
         sql = "select count(*) from testinserts";
         command = new MySqlCommand(sql, connection);
         var counter = command.ExecuteScalar();
-        Assert.AreEqual(4, counter);
+        Assert.That(counter, Is.EqualTo(4));
         //check ssl
         command = new MySqlCommand("SHOW SESSION STATUS LIKE 'Ssl_version';", connection);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          StringAssert.StartsWith("TLSv1", reader.GetString(1));
+          Assert.That(reader.Read(), Is.True);
+          Assert.That(reader.GetString(1), Does.StartWith("TLSv1"));
         }
 
       }
@@ -960,13 +960,13 @@ public void ConnectUsingClearPasswordPlugin()
         using (MySqlConnection conn = new MySqlConnection(unixConnectionString))
         {
           conn.Open();
-          Assert.AreEqual(ConnectionState.Open, conn.State);
+          Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
         }
 
         using (MySqlConnection connection = new MySqlConnection(unixConnectionString + "sslmode=none"))
         {
           connection.Open();
-          Assert.AreEqual(ConnectionState.Open, connection.State);
+          Assert.That(connection.State, Is.EqualTo(ConnectionState.Open));
         }
       }
 
@@ -981,7 +981,7 @@ public void ConnectUsingClearPasswordPlugin()
       using (MySqlConnection connection = new MySqlConnection(settings.ConnectionString))
       {
         Exception ex = Assert.Throws<MySqlException>(() => connection.Open());
-        StringAssert.StartsWith("Access denied for user", ex.InnerException.Message);
+        Assert.That(ex.InnerException.Message, Does.StartWith("Access denied for user"));
       }
 
       // Test connection for INVALID user in LDAP server, expected result FAIL
@@ -995,7 +995,7 @@ public void ConnectUsingClearPasswordPlugin()
       using (MySqlConnection connection = new MySqlConnection(settings.ConnectionString))
       {
         Exception ex = Assert.Throws<MySqlException>(() => connection.Open());
-        StringAssert.StartsWith("Access denied for user", ex.InnerException.Message);
+        Assert.That(ex.InnerException.Message, Does.StartWith("Access denied for user"));
       }
 
       // Test connection for VALID user in LDAP server with SSLMode=none, expected result FAIL
@@ -1010,7 +1010,7 @@ public void ConnectUsingClearPasswordPlugin()
       using (MySqlConnection connection = new MySqlConnection(settings.ConnectionString))
       {
         Exception ex = Assert.Throws<MySqlException>(() => connection.Open());
-        StringAssert.Contains("Clear-password authentication is not supported over insecure channels", ex.Message);
+        Assert.That(ex.Message, Does.Contain("Clear-password authentication is not supported over insecure channels"));
       }
 
       // Test connection for VALID user in LDAP server with different SSLMode values, expected result pass
@@ -1030,7 +1030,7 @@ public void ConnectUsingClearPasswordPlugin()
       using (MySqlConnection connection = new MySqlConnection(settings.ConnectionString))
       {
         connection.Open();
-        Assert.AreEqual(ConnectionState.Open, connection.State);
+        Assert.That(connection.State, Is.EqualTo(ConnectionState.Open));
         connection.Close();
       }
 
@@ -1039,7 +1039,7 @@ public void ConnectUsingClearPasswordPlugin()
       using (MySqlConnection connection = new MySqlConnection(settings.ConnectionString))
       {
         connection.Open();
-        Assert.AreEqual(ConnectionState.Open, connection.State);
+        Assert.That(connection.State, Is.EqualTo(ConnectionState.Open));
         connection.Close();
       }
 
@@ -1050,7 +1050,7 @@ public void ConnectUsingClearPasswordPlugin()
       using (MySqlConnection connection = new MySqlConnection(settings.ConnectionString))
       {
         connection.Open();
-        Assert.AreEqual(ConnectionState.Open, connection.State);
+        Assert.That(connection.State, Is.EqualTo(ConnectionState.Open));
         connection.Close();
       }
 
@@ -1095,11 +1095,11 @@ public void ConnectUsingMySqlSASLPluginSCRAMSHA(string userName, string password
           MySqlCommand command = new MySqlCommand($"SELECT `User`, `plugin` FROM `mysql`.`user` WHERE `User` = '{userName}';", connection);
           using (MySqlDataReader reader = command.ExecuteReader())
           {
-            StringAssert.AreEqualIgnoringCase(mechanism, MySqlSASLPlugin.scramMechanism.MechanismName);
-            Assert.AreEqual(ScramBase.AuthState.VALIDATE, MySqlSASLPlugin.scramMechanism._state);
-            Assert.True(reader.Read());
-            StringAssert.AreEqualIgnoringCase(userName, reader.GetString(0));
-            StringAssert.AreEqualIgnoringCase(plugin, reader.GetString(1));
+            Assert.That(MySqlSASLPlugin.scramMechanism.MechanismName, Is.EqualTo(mechanism).IgnoreCase);
+            Assert.That(MySqlSASLPlugin.scramMechanism._state, Is.EqualTo(ScramBase.AuthState.VALIDATE));
+            Assert.That(reader.Read(), Is.True);
+            Assert.That(reader.GetString(0), Is.EqualTo(userName).IgnoreCase);
+            Assert.That(reader.GetString(1), Is.EqualTo(plugin).IgnoreCase);
           }
         }
         else
@@ -1118,19 +1118,19 @@ public void AssertScramSha1()
 
       ScramSha1Mechanism scramSha1 = new ScramSha1Mechanism("user", "pencil", Host);
       scramSha1._cnonce = fixedNonce;
-      Assert.AreEqual(ScramBase.AuthState.INITIAL, scramSha1._state);
+      Assert.That(scramSha1._state, Is.EqualTo(ScramBase.AuthState.INITIAL));
 
       var challenge = Encoding.UTF8.GetString(scramSha1.Challenge(null));
-      Assert.AreEqual("n,a=user,n=user,r=" + fixedNonce, challenge);
-      Assert.AreEqual(ScramBase.AuthState.FINAL, scramSha1._state);
+      Assert.That(challenge, Is.EqualTo("n,a=user,n=user,r=" + fixedNonce));
+      Assert.That(scramSha1._state, Is.EqualTo(ScramBase.AuthState.FINAL));
 
       response = Encoding.UTF8.GetBytes(challenge1);
       challenge = Encoding.UTF8.GetString(scramSha1.Challenge(response));
-      Assert.AreEqual(expected, challenge);
-      Assert.AreEqual(ScramBase.AuthState.VALIDATE, scramSha1._state);
+      Assert.That(challenge, Is.EqualTo(expected));
+      Assert.That(scramSha1._state, Is.EqualTo(ScramBase.AuthState.VALIDATE));
 
       response = Encoding.UTF8.GetBytes(challenge2);
-      Assert.IsNull(scramSha1.Challenge(response));
+      Assert.That(scramSha1.Challenge(response), Is.Null);
     }
 
     [Test]
@@ -1144,19 +1144,19 @@ public void AssertScramSha256()
 
       ScramSha256Mechanism scramSha256 = new ScramSha256Mechanism("user", "pencil", Host);
       scramSha256._cnonce = fixedNonce;
-      Assert.AreEqual(ScramBase.AuthState.INITIAL, scramSha256._state);
+      Assert.That(scramSha256._state, Is.EqualTo(ScramBase.AuthState.INITIAL));
 
       var challenge = Encoding.UTF8.GetString(scramSha256.Challenge(null));
-      Assert.AreEqual("n,a=user,n=user,r=" + fixedNonce, challenge);
-      Assert.AreEqual(ScramBase.AuthState.FINAL, scramSha256._state);
+      Assert.That(challenge, Is.EqualTo("n,a=user,n=user,r=" + fixedNonce));
+      Assert.That(scramSha256._state, Is.EqualTo(ScramBase.AuthState.FINAL));
 
       response = Encoding.UTF8.GetBytes(challenge1);
       challenge = Encoding.UTF8.GetString(scramSha256.Challenge(response));
-      Assert.AreEqual(expected, challenge);
-      Assert.AreEqual(ScramBase.AuthState.VALIDATE, scramSha256._state);
+      Assert.That(challenge, Is.EqualTo(expected));
+      Assert.That(scramSha256._state, Is.EqualTo(ScramBase.AuthState.VALIDATE));
 
       response = Encoding.UTF8.GetBytes(challenge2);
-      Assert.IsNull(scramSha256.Challenge(response));
+      Assert.That(scramSha256.Challenge(response), Is.Null);
     }
     #endregion
 
@@ -1192,9 +1192,9 @@ public void ConnectUsingMySqlSASLPluginGSSAPI(string userName, string password,
           MySqlCommand command = new MySqlCommand($"SELECT user();", connection);
           using (MySqlDataReader reader = command.ExecuteReader())
           {
-            StringAssert.AreEqualIgnoringCase("GSSAPI", MySqlSASLPlugin.gssapiMechanism.MechanismName);
-            Assert.True(reader.Read());
-            StringAssert.Contains(userName, reader.GetString(0));
+            Assert.That(MySqlSASLPlugin.gssapiMechanism.MechanismName, Is.EqualTo("GSSAPI").IgnoreCase);
+            Assert.That(reader.Read(), Is.True);
+            Assert.That(reader.GetString(0), Does.Contain(userName));
           }
         }
         else
@@ -1207,27 +1207,27 @@ public void ConnectUsingMySqlSASLPluginGSSAPI(string userName, string password,
     public void AssertSaslPrep()
     {
       // Valid String
-      Assert.AreEqual("my,0TEXT", MySqlSASLPlugin.SaslPrep("my,0TEXT"));
-      Assert.AreEqual("my,0 TEXT", MySqlSASLPlugin.SaslPrep("my,0 TEXT"));
+      Assert.That(MySqlSASLPlugin.SaslPrep("my,0TEXT"), Is.EqualTo("my,0TEXT"));
+      Assert.That(MySqlSASLPlugin.SaslPrep("my,0 TEXT"), Is.EqualTo("my,0 TEXT"));
 
       // Queries for matching strings MAY contain unassigned code points.
-      Assert.AreEqual("\u0888my,0TEXT", MySqlSASLPlugin.SaslPrep("\u0888my,0TEXT"));
-      Assert.AreEqual("my,0\u0890TEXT", MySqlSASLPlugin.SaslPrep("my,0\u0890TEXT"));
-      Assert.AreEqual("my,0TEXT\u089F", MySqlSASLPlugin.SaslPrep("my,0TEXT\u089F"));
+      Assert.That(MySqlSASLPlugin.SaslPrep("\u0888my,0TEXT"), Is.EqualTo("\u0888my,0TEXT"));
+      Assert.That(MySqlSASLPlugin.SaslPrep("my,0\u0890TEXT"), Is.EqualTo("my,0\u0890TEXT"));
+      Assert.That(MySqlSASLPlugin.SaslPrep("my,0TEXT\u089F"), Is.EqualTo("my,0TEXT\u089F"));
 
       // Mapping: non-ASCII space characters.
-      Assert.AreEqual("my,0 TEXT", MySqlSASLPlugin.SaslPrep("my,0\u1680TEXT"));
-      Assert.AreEqual("my,0 TEXT", MySqlSASLPlugin.SaslPrep("my,0\u200BTEXT"));
-      Assert.AreEqual(" my,0 TEXT ", MySqlSASLPlugin.SaslPrep("\u00A0my,0\u2000TEXT\u3000"));
+      Assert.That(MySqlSASLPlugin.SaslPrep("my,0\u1680TEXT"), Is.EqualTo("my,0 TEXT"));
+      Assert.That(MySqlSASLPlugin.SaslPrep("my,0\u200BTEXT"), Is.EqualTo("my,0 TEXT"));
+      Assert.That(MySqlSASLPlugin.SaslPrep("\u00A0my,0\u2000TEXT\u3000"), Is.EqualTo(" my,0 TEXT "));
 
       // Mapping: the "commonly mapped to nothing" characters.
-      Assert.AreEqual("my,0TEXT", MySqlSASLPlugin.SaslPrep("my,0\u00ADTEXT"));
-      Assert.AreEqual("my,0TEXT", MySqlSASLPlugin.SaslPrep("my,0\uFE0ATEXT"));
-      Assert.AreEqual("my,0TEXT", MySqlSASLPlugin.SaslPrep("\u00ADmy,0\u1806TE\uFE0FXT\uFEFF"));
+      Assert.That(MySqlSASLPlugin.SaslPrep("my,0\u00ADTEXT"), Is.EqualTo("my,0TEXT"));
+      Assert.That(MySqlSASLPlugin.SaslPrep("my,0\uFE0ATEXT"), Is.EqualTo("my,0TEXT"));
+      Assert.That(MySqlSASLPlugin.SaslPrep("\u00ADmy,0\u1806TE\uFE0FXT\uFEFF"), Is.EqualTo("my,0TEXT"));
 
       // KC Normalization.
-      Assert.AreEqual("my,0 fi TEXT", MySqlSASLPlugin.SaslPrep("my,0 \uFB01 TEXT"));
-      Assert.AreEqual("my,0 fi TEXT", MySqlSASLPlugin.SaslPrep("my,0 \uFB01 TEXT"));
+      Assert.That(MySqlSASLPlugin.SaslPrep("my,0 \uFB01 TEXT"), Is.EqualTo("my,0 fi TEXT"));
+      Assert.That(MySqlSASLPlugin.SaslPrep("my,0 \uFB01 TEXT"), Is.EqualTo("my,0 fi TEXT"));
 
       // Prohibited Output: ASCII control characters.
       Assert.Throws<ArgumentException>(() => MySqlSASLPlugin.SaslPrep("\u007Fmy,0TEXT"));
@@ -1381,11 +1381,11 @@ private void TestKerberosConnection(bool shouldPass, string username, MySqlConne
           MySqlCommand command = new MySqlCommand($"SELECT user();", conn);
           using (MySqlDataReader reader = command.ExecuteReader())
           {
-            Assert.True(reader.Read());
-            StringAssert.Contains(username, reader.GetString(0));
+            Assert.That(reader.Read(), Is.True);
+            Assert.That(reader.GetString(0), Does.Contain(username));
           }
 
-          Assert.True(conn.Settings.KerberosAuthMode == mode);
+          Assert.That(conn.Settings.KerberosAuthMode == mode);
         }
         else
           Assert.Throws<MySqlException>(() => conn.Open());
@@ -1425,9 +1425,9 @@ public void ConnectUsingOciIamAuthentication(string userName, string configFileP
         MySqlCommand command = new MySqlCommand($"SELECT user();", conn);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
+          Assert.That(reader.Read(), Is.True);
           userName = string.IsNullOrEmpty(userName) ? Environment.UserName : userName;
-          StringAssert.Contains(userName, reader.GetString(0));
+          Assert.That(reader.GetString(0), Does.Contain(userName));
         }
       }
     }
@@ -1438,7 +1438,7 @@ public void NonExistingKeyFile()
       OciAuthenticationPlugin plugin = new OciAuthenticationPlugin();
       string keyFileInvalidPath = "C:\\invalid\\Path";
       string exMsg = Assert.Throws<MySqlException>(() => OciAuthenticationPlugin.SignData(new byte[0], keyFileInvalidPath)).Message;
-      StringAssert.AreEqualIgnoringCase(Resources.OciKeyFileDoesNotExists, exMsg);
+      Assert.That(exMsg, Is.EqualTo(Resources.OciKeyFileDoesNotExists).IgnoreCase);
     }
 
     public struct Profiles
@@ -1486,13 +1486,13 @@ public void ValidatesEntries(Profiles profiles)
       if (profiles.missingEntry)
       {
         exMsg = Assert.Throws<MySqlException>(() => plugin.GetOciConfigValues(profiles.profiles, out string keyFile, out string fingerprint, out string securityTokenFilePath)).Message;
-        StringAssert.AreEqualIgnoringCase(Resources.OciEntryNotFound, exMsg);
+        Assert.That(exMsg, Is.EqualTo(Resources.OciEntryNotFound).IgnoreCase);
       }
       else
       {
         plugin.GetOciConfigValues(profiles.profiles, out string keyFile, out string fingerprint, out string securityTokenFilePath);
         exMsg = Assert.Throws<MySqlException>(() => OciAuthenticationPlugin.SignData(new byte[0], keyFile)).Message;
-        StringAssert.AreEqualIgnoringCase(Resources.OciInvalidKeyFile, exMsg);
+        Assert.That(exMsg, Is.EqualTo(Resources.OciInvalidKeyFile).IgnoreCase);
       }
     }
 
@@ -1509,9 +1509,9 @@ public void OtherThanDefaultProfile()
       plugin._ociConfigProfile = "TEST";
       plugin.GetOciConfigValues(profiles, out string keyFilePath, out string fingerprint, out string securityTokenFilePath);
 
-      StringAssert.AreEqualIgnoringCase("keyFilePath", keyFilePath);
-      StringAssert.AreEqualIgnoringCase("66:55:44:33:22:11", fingerprint);
-      StringAssert.AreEqualIgnoringCase("securityTokenFilePath", securityTokenFilePath);
+      Assert.That(keyFilePath, Is.EqualTo("keyFilePath").IgnoreCase);
+      Assert.That(fingerprint, Is.EqualTo("66:55:44:33:22:11").IgnoreCase);
+      Assert.That(securityTokenFilePath, Is.EqualTo("securityTokenFilePath").IgnoreCase);
     }
 
     [DatapointSource]
@@ -1541,7 +1541,7 @@ public void NonExistingConfigFile(string invalidPath)
       using (var conn = new MySqlConnection(connStringBuilder.ConnectionString))
       {
         string exMsg = Assert.Throws<MySqlException>(() => conn.Open()).Message;
-        StringAssert.AreEqualIgnoringCase(Resources.OciConfigFileNotFound, exMsg);
+        Assert.That(exMsg, Is.EqualTo(Resources.OciConfigFileNotFound).IgnoreCase);
       }
     }
 
@@ -1551,7 +1551,7 @@ public void OciSdkNotInstalled()
       OciAuthenticationPlugin plugin = new OciAuthenticationPlugin();
 
       string exMsg = Assert.Throws<MySqlException>(() => plugin.AuthenticateAsync(false, false).GetAwaiter().GetResult()).Message;
-      StringAssert.AreEqualIgnoringCase(Resources.OciSDKNotFound, exMsg);
+      Assert.That(exMsg, Is.EqualTo(Resources.OciSDKNotFound).IgnoreCase);
     }
 
     [Test]
@@ -1574,7 +1574,7 @@ public void NonExistingConfigProfile()
       using (var conn = new MySqlConnection(connStringBuilder.ConnectionString))
       {
         string exMsg = Assert.Throws<MySqlException>(() => conn.Open()).Message;
-        StringAssert.AreEqualIgnoringCase(Resources.OciConfigProfileNotFound, exMsg);
+        Assert.That(exMsg, Is.EqualTo(Resources.OciConfigProfileNotFound).IgnoreCase);
       }
     }
 
@@ -1610,7 +1610,7 @@ public void ConnectUsing1FAuth()
 
       using var conn = new MySqlConnection(connStringBuilder.ConnectionString);
       conn.Open();
-      Assert.AreEqual(ConnectionState.Open, conn.State);
+      Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
     }
 
     [TestCase("user_2f", "password1", "password2", true)]
@@ -1643,7 +1643,7 @@ public void ConnectUsing2FAuth(string user, string pwd, string pwd2, bool should
       else
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.State);
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
       }
     }
 
@@ -1677,7 +1677,7 @@ public void ConnectUsing3FAuth(string user, string pwd, string pwd2, string pwd3
       else
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.State);
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
       }
     }
     #endregion
@@ -1709,7 +1709,7 @@ public void WebAuthnAuthenticationPasswordless()
       using var conn = new MySqlConnection(connStringBuilder.ConnectionString);
       conn.WebAuthnActionRequested += Conn_WebAuthnActionRequested;
       conn.Open();
-      Assert.AreEqual(ConnectionState.Open, conn.State);
+      Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
     }
 
     [Test]
@@ -1735,7 +1735,7 @@ public void WebAuthnAuthentication2F()
       using var conn = new MySqlConnection(connStringBuilder.ConnectionString);
       conn.WebAuthnActionRequested += Conn_WebAuthnActionRequested;
       conn.Open();
-      Assert.AreEqual(ConnectionState.Open, conn.State);
+      Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
     }
 
     [Test]
@@ -1762,7 +1762,7 @@ public void WebAuthnAuthentication3F()
       using var conn = new MySqlConnection(connStringBuilder.ConnectionString);
       conn.WebAuthnActionRequested += Conn_WebAuthnActionRequested;
       conn.Open();
-      Assert.AreEqual(ConnectionState.Open, conn.State);
+      Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
     }
 
     [Test]
diff --git a/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs b/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs
index 14f7e05be..a69bc6902 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs
@@ -49,11 +49,11 @@ public void InsertNullBinary()
       cmd.CommandText = "SELECT * FROM Test";
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.HasRows == true, "Checking HasRows");
+        Assert.That(reader.HasRows, Is.EqualTo(true), "Checking HasRows");
 
         reader.Read();
         var value = reader.GetValue(1) as string;
-        Assert.True(value == null);
+        Assert.That(value, Is.EqualTo(null));
       }
     }
 
@@ -76,23 +76,23 @@ public void InsertBinary()
       cmd.Parameters[1].Value = dataIn2;
       rows += cmd.ExecuteNonQuery();
 
-      Assert.True(rows == 2, "Checking insert rowcount");
+      Assert.That(rows == 2, "Checking insert rowcount");
 
       cmd.CommandText = "SELECT * FROM InsertBinary";
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.HasRows == true, "Checking HasRows");
+        Assert.That(reader.HasRows, Is.EqualTo(true), "Checking HasRows");
 
         reader.Read();
 
         byte[] dataOut = new byte[lenIn];
         long lenOut = reader.GetBytes(1, 0, dataOut, 0, lenIn);
 
-        Assert.True(lenIn == lenOut, "Checking length of binary data (row 1)");
+        Assert.That(lenIn, Is.EqualTo(lenOut), "Checking length of binary data (row 1)");
 
         // now see if the buffer is intact
         for (int x = 0; x < dataIn.Length; x++)
-          Assert.True(dataIn[x] == dataOut[x], "Checking first binary array at " + x);
+          Assert.That(dataIn[x], Is.EqualTo(dataOut[x]), "Checking first binary array at " + x);
 
         // now we test chunking
         int pos = 0;
@@ -106,15 +106,15 @@ public void InsertBinary()
         }
         // now see if the buffer is intact
         for (int x = 0; x < dataIn.Length; x++)
-          Assert.True(dataIn[x] == dataOut[x], "Checking first binary array at " + x);
+          Assert.That(dataIn[x], Is.EqualTo(dataOut[x]), "Checking first binary array at " + x);
 
         reader.Read();
         lenOut = reader.GetBytes(1, 0, dataOut, 0, lenIn);
-        Assert.True(lenIn == lenOut, "Checking length of binary data (row 2)");
+        Assert.That(lenIn == lenOut, "Checking length of binary data (row 2)");
 
         // now see if the buffer is intact
         for (int x = 0; x < dataIn2.Length; x++)
-          Assert.True(dataIn2[x] == dataOut[x], "Checking second binary array at " + x);
+          Assert.That(dataIn2[x], Is.EqualTo(dataOut[x]), "Checking second binary array at " + x);
       }
     }
 
@@ -167,7 +167,7 @@ private void InternalGetChars(bool prepare)
         }
         // now see if the buffer is intact
         for (int x = 0; x < data.Length; x++)
-          Assert.True(data[x] == dataOut[x], "Checking first text array at " + x);
+          Assert.That(data[x], Is.EqualTo(dataOut[x]), "Checking first text array at " + x);
       }
     }
 
@@ -198,7 +198,7 @@ private void InternalInsertText(bool prepare)
       cmd.Parameters.Add(new MySqlParameter("?b1", "This is my blob data"));
       if (prepare) cmd.Prepare();
       int rows = cmd.ExecuteNonQuery();
-      Assert.True(rows == 1, "Checking insert rowcount");
+      Assert.That(rows, Is.EqualTo(1), "Checking insert rowcount");
 
       cmd.CommandText = "INSERT INTO InsertText VALUES(2, ?b1, ?t1)";
       cmd.Parameters.Clear();
@@ -208,22 +208,22 @@ private void InternalInsertText(bool prepare)
       cmd.Parameters.AddWithValue("?b1", str);
 
       rows = cmd.ExecuteNonQuery();
-      Assert.True(rows == 1, "Checking insert rowcount");
+      Assert.That(rows, Is.EqualTo(1), "Checking insert rowcount");
 
       cmd.CommandText = "SELECT * FROM InsertText";
       if (prepare) cmd.Prepare();
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.HasRows, "Checking HasRows");
+        Assert.That(reader.HasRows, "Checking HasRows");
 
-        Assert.True(reader.Read());
+        Assert.That(reader.Read());
 
         string s = reader.GetString(2);
-        Assert.True(s.Length == 1024, "Checking length returned ");
-        Assert.True(s.Substring(0, 9) == "ABCDEFGHI", "Checking first few chars of string");
+        Assert.That(s.Length, Is.EqualTo(1024), "Checking length returned ");
+        Assert.That(s.Substring(0, 9), Is.EqualTo("ABCDEFGHI"), "Checking first few chars of string");
 
-        Assert.True(reader.Read());
-        Assert.AreEqual(DBNull.Value, reader.GetValue(2));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetValue(2), Is.EqualTo(DBNull.Value));
       }
     }
 
@@ -240,8 +240,8 @@ public void GetCharsOnLongTextColumn()
       {
         reader.Read();
         reader.GetChars(1, 0, buf, 0, 2);
-        Assert.AreEqual('T', buf[0]);
-        Assert.AreEqual('e', buf[1]);
+        Assert.That(buf[0], Is.EqualTo('T'));
+        Assert.That(buf[1], Is.EqualTo('e'));
       }
     }
 
@@ -271,13 +271,13 @@ public void MediumIntBlobSize()
       {
         reader.Read();
         uint actualsize = reader.GetUInt32(1);
-        Assert.AreEqual((uint)image.Length, actualsize);
+        Assert.That(actualsize, Is.EqualTo((uint)image.Length));
 
         uint size = reader.GetUInt32(0);
         byte[] outImage = new byte[size];
         long len = reader.GetBytes(reader.GetOrdinal("image"), 0, outImage, 0, (int)size);
-        Assert.AreEqual((uint)image.Length, size);
-        Assert.AreEqual((uint)image.Length, len);
+        Assert.That(size, Is.EqualTo((uint)image.Length));
+        Assert.That(len, Is.EqualTo((uint)image.Length));
       }
     }
     
@@ -297,7 +297,7 @@ public void BlobBiggerThanMaxPacket()
         cmd.Parameters.AddWithValue("?image", image);
 
         Exception ex = Assert.Throws<MySqlException>(() => cmd.ExecuteNonQuery());
-        Assert.AreEqual(ex.Message, "Packets larger than max_allowed_packet are not allowed.");
+        Assert.That(ex.Message, Is.EqualTo("Packets larger than max_allowed_packet are not allowed."));
       }
     }
 
@@ -315,7 +315,7 @@ public void UpdateDataSet()
       MySqlCommandBuilder cb = new MySqlCommandBuilder(da);
 
       string s = (string)dt.Rows[0][2];
-      Assert.AreEqual("Text field", s);
+      Assert.That(s, Is.EqualTo("Text field"));
 
       byte[] inBuf = Utils.CreateBlob(512);
       dt.Rows[0].BeginEdit();
@@ -330,10 +330,10 @@ public void UpdateDataSet()
       cb.Dispose();
 
       byte[] outBuf = (byte[])dt.Rows[0]["blob1"];
-      Assert.True(inBuf.Length == outBuf.Length, "checking length of updated buffer");
+      Assert.That(inBuf.Length, Is.EqualTo(outBuf.Length), "checking length of updated buffer");
 
       for (int y = 0; y < inBuf.Length; y++)
-        Assert.True(inBuf[y] == outBuf[y], "checking array data");
+        Assert.That(inBuf[y] == outBuf[y], Is.True, "checking array data");
     }
   }
 }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs b/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs
index e527c3e01..698c274ca 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs
@@ -64,9 +64,9 @@ public void VarBinary()
       MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", Connection);
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
+        Assert.That(reader.Read());
         object o = reader.GetValue(1);
-        Assert.True(o is string);
+        Assert.That(o is string);
       }
     }
 
@@ -82,7 +82,7 @@ public void Latin1Connection()
 
         MySqlCommand cmd = new MySqlCommand("SELECT id FROM Test WHERE name LIKE 'Test'", conn);
         object id = cmd.ExecuteScalar();
-        Assert.AreEqual(1, id);
+        Assert.That(id, Is.EqualTo(1));
       }
     }
 
@@ -103,7 +103,7 @@ public void FunctionReturnsStringWithCharSet()
         using (MySqlDataReader reader = cmd.ExecuteReader())
         {
           reader.Read();
-          Assert.AreEqual("Trädgårdsvägen1", reader.GetString(0));
+          Assert.That(reader.GetString(0), Is.EqualTo("Trädgårdsvägen1"));
         }
       }
     }
@@ -126,7 +126,7 @@ public void Encoding()
         using (MySqlDataReader reader = cmd.ExecuteReader())
         {
           reader.Read();
-          Assert.AreEqual("äâáàç", reader.GetString(0));
+          Assert.That(reader.GetString(0), Is.EqualTo("äâáàç"));
         }
       }
     }
@@ -145,7 +145,7 @@ public void RespectBinaryFlags()
           "SELECT CONCAT('Trädgårdsvägen', 1)", c);
         DataTable dt = new DataTable();
         da.Fill(dt);
-        Assert.True(dt.Rows[0][0] is byte[]);
+        Assert.That(dt.Rows[0][0] is byte[]);
       }
       connStr = Connection.ConnectionString + ";respect binary flags=false";
       using (MySqlConnection c = new MySqlConnection(connStr))
@@ -156,8 +156,8 @@ public void RespectBinaryFlags()
           "SELECT CONCAT('Trädgårdsvägen', 1)", c);
         DataTable dt = new DataTable();
         da.Fill(dt);
-        Assert.True(dt.Rows[0][0] is string);
-        Assert.AreEqual("Trädgårdsvägen1", dt.Rows[0][0]);
+        Assert.That(dt.Rows[0][0] is string);
+        Assert.That(dt.Rows[0][0], Is.EqualTo("Trädgårdsvägen1"));
       }
     }
 
@@ -183,7 +183,7 @@ public void RussianErrorMessagesShowCorrectly()
       }
       catch (MySqlException e)
       {
-        Assert.AreEqual(expected, e.Message);
+        Assert.That(e.Message, Is.EqualTo(expected));
       }
     }
 
@@ -224,10 +224,10 @@ public void UsingUtf16()
         {
           for (int i = 0; i < reader.FieldCount; i++)
           {
-            Assert.True(j == reader.GetInt32(0));
-            Assert.True(firstNames[j] == reader.GetString(1));
-            Assert.True(lastNames[j] == reader.GetString(2));
-            Assert.True(lastUpdates[j] == reader.GetDateTime(3));
+            Assert.That(j, Is.EqualTo(reader.GetInt32(0)));
+            Assert.That(firstNames[j], Is.EqualTo(reader.GetString(1)));
+            Assert.That(lastNames[j], Is.EqualTo(reader.GetString(2)));
+            Assert.That(lastUpdates[j], Is.EqualTo(reader.GetDateTime(3)));
           }
           j++;
         }
@@ -269,10 +269,10 @@ public void UsingUtf32()
         {
           for (int i = 0; i < reader.FieldCount; i++)
           {
-            Assert.True(j == reader.GetInt32(0));
-            Assert.True(firstNames[j] == reader.GetString(1));
-            Assert.True(lastNames[j] == reader.GetString(2));
-            Assert.True(lastUpdates[j] == reader.GetDateTime(3));
+            Assert.That(j, Is.EqualTo(reader.GetInt32(0)));
+            Assert.That(firstNames[j], Is.EqualTo(reader.GetString(1)));
+            Assert.That(lastNames[j], Is.EqualTo(reader.GetString(2)));
+            Assert.That(lastUpdates[j], Is.EqualTo(reader.GetDateTime(3)));
           }
           j++;
         }
@@ -306,9 +306,9 @@ public void CanInsertChineseCharacterSetGB18030()
         while (reader.Read())
         {
           if (reader.GetUInt32(0) == 1)
-            Assert.AreEqual("㭋玤䂜蚌", reader.GetString(1));
+            Assert.That(reader.GetString(1), Is.EqualTo("㭋玤䂜蚌"));
           if (reader.GetUInt32(0) == 2)
-            Assert.AreEqual("念奴娇·赤壁怀古 ·苏东坡", reader.GetString(1));
+            Assert.That(reader.GetString(1), Is.EqualTo("念奴娇·赤壁怀古 ·苏东坡"));
         }
       }
     }
@@ -343,7 +343,7 @@ public void CanCreateDbUsingChineseCharacterSetGB18030()
           using (MySqlConnection conn = new MySqlConnection(rootSb.ConnectionString))
           {
             conn.Open();
-            Assert.AreEqual(database, conn.Database);
+            Assert.That(conn.Database, Is.EqualTo(database));
           }
         }
         finally
@@ -366,7 +366,7 @@ public void UTF16LETest()
       {
         while (reader.Read())
         {
-          Assert.AreEqual("瑵ㅦ氶⁥整瑳", reader[0].ToString());
+          Assert.That(reader[0].ToString(), Is.EqualTo("瑵ㅦ氶⁥整瑳"));
         }
       }
     }
@@ -382,7 +382,7 @@ public void CP932()
         connection.Open();
         MySqlCommand cmd = new MySqlCommand("SELECT '涯割晦叶角'", connection);
         string s = (string)cmd.ExecuteScalar();
-        Assert.AreEqual("涯割晦叶角", s);
+        Assert.That(s, Is.EqualTo("涯割晦叶角"));
       }
     }
 
@@ -428,7 +428,7 @@ public void ExtendedCharsetOnConnection()
           using (MySqlConnection conn = new MySqlConnection(sb.ToString()))
           {
             conn.Open();
-            Assert.AreEqual(database, conn.Database);
+            Assert.That(conn.Database, Is.EqualTo(database));
           }
         }
         finally
@@ -453,9 +453,9 @@ public void DefaultCharSet()
         reader.Read();
 
         if (Connection.driver.Version.isAtLeast(8, 0, 1))
-          Assert.AreEqual("utf8mb4", reader.GetString("Value"));
+          Assert.That(reader.GetString("Value"), Is.EqualTo("utf8mb4"));
         else
-          Assert.AreEqual("latin1", reader.GetString("Value"));
+          Assert.That(reader.GetString("Value"), Is.EqualTo("latin1"));
       }
     }
 
@@ -470,21 +470,21 @@ public void CharacterVariablesByDefault()
         MySqlCommand cmd = rootConnection.CreateCommand();
         cmd.CommandText = "SELECT @@character_set_server";
         string characterSet = cmd.ExecuteScalar().ToString();
-        Assert.False(string.IsNullOrWhiteSpace(characterSet));
+        Assert.That(string.IsNullOrWhiteSpace(characterSet), Is.False);
 
         cmd.CommandText = "SHOW VARIABLES LIKE 'character_set_c%'";
         using (MySqlDataReader dr = cmd.ExecuteReader())
         {
-          Assert.True(dr.HasRows);
+          Assert.That(dr.HasRows);
           while (dr.Read())
           {
             switch (dr.GetString(0).ToLowerInvariant())
             {
               case "character_set_client":
-                Assert.AreEqual(characterSet, dr.GetString(1));
+                Assert.That(dr.GetString(1), Is.EqualTo(characterSet));
                 break;
               case "character_set_connection":
-                Assert.AreEqual(characterSet, dr.GetString(1));
+                Assert.That(dr.GetString(1), Is.EqualTo(characterSet));
                 break;
               default:
                 throw new InvalidOperationException(string.Format("Variable '{0}' not expected.", dr.GetString(0)));
@@ -493,7 +493,7 @@ public void CharacterVariablesByDefault()
         }
 
         cmd.CommandText = "SELECT @@character_set_results";
-        Assert.AreEqual(DBNull.Value, cmd.ExecuteScalar());
+        Assert.That(cmd.ExecuteScalar(), Is.EqualTo(DBNull.Value));
       }
     }
 
@@ -516,7 +516,7 @@ public void DatabaseCaseSentitive()
         {
           cmd.CommandType = CommandType.StoredProcedure;
           var result = cmd.ExecuteNonQuery();
-          Assert.AreEqual(0, result);
+          Assert.That(result, Is.EqualTo(0));
         }
       }
     }
@@ -538,8 +538,8 @@ public void PoundSymbolInJsonColumn()
       {
         while (reader.Read())
         {
-          StringAssert.AreEqualIgnoringCase("£", reader[0].ToString());
-          StringAssert.AreEqualIgnoringCase("{\"Value\": \"£\"}", reader[1].ToString());
+          Assert.That(reader[0].ToString(), Is.EqualTo("£").IgnoreCase);
+          Assert.That(reader[1].ToString(), Is.EqualTo("{\"Value\": \"£\"}").IgnoreCase);
         }
       }
     }
@@ -561,26 +561,26 @@ public void CharacterVariablesByDefaultServerDefault()
         var cmd = rootConnection.CreateCommand();
         cmd.CommandText = "SELECT @@character_set_server";
         var characterSet = cmd.ExecuteScalar().ToString();
-        Assert.AreEqual(false, string.IsNullOrWhiteSpace(characterSet));
+        Assert.That(string.IsNullOrWhiteSpace(characterSet), Is.EqualTo(false));
 
         cmd.CommandText = "SHOW VARIABLES LIKE 'character_set_c%'";
         using (var dr = cmd.ExecuteReader())
         {
-          Assert.AreEqual(true, dr.HasRows);
+          Assert.That(dr.HasRows, Is.EqualTo(true));
           while (dr.Read())
             switch (dr.GetString(0).ToLowerInvariant())
             {
               case "character_set_client":
-                Assert.AreEqual(characterSet, dr.GetString(1));
+                Assert.That(dr.GetString(1), Is.EqualTo(characterSet));
                 break;
               case "character_set_connection":
-                Assert.AreEqual(characterSet, dr.GetString(1));
+                Assert.That(dr.GetString(1), Is.EqualTo(characterSet));
                 break;
             }
         }
 
         cmd.CommandText = "SELECT @@character_set_results";
-        Assert.AreEqual(DBNull.Value, cmd.ExecuteScalar());
+        Assert.That(cmd.ExecuteScalar(), Is.EqualTo(DBNull.Value));
       }
     }
 
@@ -601,20 +601,20 @@ public void CharacterVariablesByAssignedServerDefault()
         var cmd = rootConnection.CreateCommand();
         cmd.CommandText = "SELECT @@character_set_server";
         var characterSet = cmd.ExecuteScalar().ToString();
-        Assert.AreEqual(false, string.IsNullOrWhiteSpace(characterSet));
+        Assert.That(string.IsNullOrWhiteSpace(characterSet), Is.EqualTo(false));
 
         cmd.CommandText = "SHOW VARIABLES LIKE 'character_set_c%'";
         using (var dr = cmd.ExecuteReader())
         {
-          Assert.AreEqual(true, dr.HasRows);
+          Assert.That(dr.HasRows, Is.EqualTo(true));
           while (dr.Read())
             switch (dr.GetString(0).ToLowerInvariant())
             {
               case "character_set_client":
-                StringAssert.StartsWith(expectedCharSet, dr.GetString(1));
+                Assert.That(dr.GetString(1), Does.StartWith(expectedCharSet));
                 break;
               case "character_set_connection":
-                StringAssert.StartsWith(expectedCharSet, dr.GetString(1));
+                Assert.That(dr.GetString(1), Does.StartWith(expectedCharSet));
                 break;
               default:
                 Assert.Fail($"Variable {dr.GetString(0)} not expected."); break;
@@ -622,7 +622,7 @@ public void CharacterVariablesByAssignedServerDefault()
         }
 
         cmd.CommandText = "SELECT @@character_set_results";
-        Assert.AreEqual(DBNull.Value, cmd.ExecuteScalar());
+        Assert.That(cmd.ExecuteScalar(), Is.EqualTo(DBNull.Value));
       }
     }
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs b/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs
index 4760e06d7..33bb95c5f 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs
@@ -67,7 +67,7 @@ public void UTF8BlogsTruncating()
       {
         reader.Read();
         string s = reader.GetString(0);
-        Assert.AreEqual(szParam, s);
+        Assert.That(s, Is.EqualTo(szParam));
       }
     }
 
@@ -88,8 +88,8 @@ public void GetSchemaOnUTF8()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         DataTable dt = reader.GetSchemaTable();
-        Assert.AreEqual(40, dt.Rows[0]["ColumnSize"]);
-        Assert.AreEqual(20, dt.Rows[1]["ColumnSize"]);
+        Assert.That(dt.Rows[0]["ColumnSize"], Is.EqualTo(40));
+        Assert.That(dt.Rows[1]["ColumnSize"], Is.EqualTo(20));
       }
     }
 
@@ -103,7 +103,7 @@ public void NonLatin1Exception()
 
       MySqlCommand cmd = new MySqlCommand("select `Numéro` from Test", Connection);
       var exception = Assert.Throws<MySqlException>(() => cmd.ExecuteScalar());
-      Assert.AreEqual("Unknown column 'Numéro' in 'field list'", exception.Message);
+      Assert.That(exception.Message, Is.EqualTo("Unknown column 'Numéro' in 'field list'"));
     }
 
     /// <summary>
@@ -121,8 +121,8 @@ public void GetCharLengthInUTF8()
       DataSet ds = new DataSet();
       ad.Fill(ds);
       ad.FillSchema(ds, SchemaType.Mapped);
-      Assert.AreEqual(1, ds.Tables[0].Columns["name"].MaxLength);
-      Assert.AreEqual(20, ds.Tables[0].Columns["longname"].MaxLength);
+      Assert.That(ds.Tables[0].Columns["name"].MaxLength, Is.EqualTo(1));
+      Assert.That(ds.Tables[0].Columns["longname"].MaxLength, Is.EqualTo(20));
     }
 
     [Test]
@@ -156,10 +156,10 @@ public void BlobAsUtf8()
         da.Fill(dt);
         foreach (DataColumn col in dt.Columns)
         {
-          Assert.AreEqual(typeof(string), col.DataType);
+          Assert.That(col.DataType, Is.EqualTo(typeof(string)));
           string s = (string)dt.Rows[0][0];
           byte[] b = utf8.GetBytes(s);
-          Assert.AreEqual(utf8_string, dt.Rows[0][col.Ordinal].ToString());
+          Assert.That(dt.Rows[0][col.Ordinal].ToString(), Is.EqualTo(utf8_string));
         }
       }
 
@@ -174,11 +174,11 @@ public void BlobAsUtf8()
         foreach (DataColumn col in dt.Columns)
         {
           if (col.ColumnName.StartsWith("exclude", StringComparison.OrdinalIgnoreCase))
-            Assert.AreEqual(typeof(byte[]), col.DataType);
+            Assert.That(col.DataType, Is.EqualTo(typeof(byte[])));
           else
           {
-            Assert.AreEqual(typeof(string), col.DataType);
-            Assert.AreEqual(utf8_string, dt.Rows[0][col.Ordinal].ToString());
+            Assert.That(col.DataType, Is.EqualTo(typeof(string)));
+            Assert.That(dt.Rows[0][col.Ordinal].ToString(), Is.EqualTo(utf8_string));
           }
         }
       }
@@ -195,11 +195,11 @@ public void BlobAsUtf8()
         {
           if (col.ColumnName.StartsWith("include", StringComparison.OrdinalIgnoreCase))
           {
-            Assert.AreEqual(typeof(string), col.DataType);
-            Assert.AreEqual(utf8_string, dt.Rows[0][col.Ordinal].ToString());
+            Assert.That(col.DataType, Is.EqualTo(typeof(string)));
+            Assert.That(dt.Rows[0][col.Ordinal].ToString(), Is.EqualTo(utf8_string));
           }
           else
-            Assert.AreEqual(typeof(byte[]), col.DataType);
+            Assert.That(col.DataType, Is.EqualTo(typeof(byte[])));
         }
       }
     }
@@ -220,13 +220,13 @@ public void UTF8AsColumnNames()
         DataTable dt = new DataTable();
         da.Fill(dt);
 
-        Assert.AreEqual("Numéro", dt.Columns[0].ColumnName);
+        Assert.That(dt.Columns[0].ColumnName, Is.EqualTo("Numéro"));
 
         MySqlCommand cmd = new MySqlCommand("SELECT NOW() AS 'Numéro'", c);
         using (MySqlDataReader reader = cmd.ExecuteReader())
         {
           int ord = reader.GetOrdinal("Numéro");
-          Assert.AreEqual(0, ord);
+          Assert.That(ord, Is.EqualTo(0));
         }
       }
     }
@@ -242,7 +242,7 @@ public void Unicode()
       {
         reader.Read();
         string s1 = reader.GetString(0);
-        Assert.AreEqual("困巫忘否役", s1);
+        Assert.That(s1, Is.EqualTo("困巫忘否役"));
       }
     }
 
@@ -279,21 +279,21 @@ public void UTF8()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual("ЁЄЉҖҚ", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("ЁЄЉҖҚ"));
         reader.Read();
-        Assert.AreEqual("兣冘凥凷冋", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("兣冘凥凷冋"));
         reader.Read();
-        Assert.AreEqual("困巫忘否役", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("困巫忘否役"));
         reader.Read();
-        Assert.AreEqual("涯割晦叶角", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("涯割晦叶角"));
         reader.Read();
-        Assert.AreEqual("ברחפע", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("ברחפע"));
         reader.Read();
-        Assert.AreEqual("ψόβΩΞ", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("ψόβΩΞ"));
         reader.Read();
-        Assert.AreEqual("þðüçöÝÞÐÜÇÖ", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("þðüçöÝÞÐÜÇÖ"));
         reader.Read();
-        Assert.AreEqual("ฅๆษ", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("ฅๆษ"));
       }
     }
 
@@ -334,21 +334,21 @@ public void UTF8PreparedAndUsingParameters()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual("ЁЄЉҖҚ", reader.GetString(0));
+        Assert.That(reader.GetString(0), Is.EqualTo("ЁЄЉҖҚ"));
         reader.Read();
-        Assert.AreEqual("兣冘凥凷冋", reader.GetString(0));
+        Assert.That(reader.GetString(0), Is.EqualTo("兣冘凥凷冋"));
         reader.Read();
-        Assert.AreEqual("困巫忘否役", reader.GetString(0));
+        Assert.That(reader.GetString(0), Is.EqualTo("困巫忘否役"));
         reader.Read();
-        Assert.AreEqual("涯割晦叶角", reader.GetString(0));
+        Assert.That(reader.GetString(0), Is.EqualTo("涯割晦叶角"));
         reader.Read();
-        Assert.AreEqual("ברחפע", reader.GetString(0));
+        Assert.That(reader.GetString(0), Is.EqualTo("ברחפע"));
         reader.Read();
-        Assert.AreEqual("ψόβΩΞ", reader.GetString(0));
+        Assert.That(reader.GetString(0), Is.EqualTo("ψόβΩΞ"));
         reader.Read();
-        Assert.AreEqual("þðüçöÝÞÐÜÇÖ", reader.GetString(0));
+        Assert.That(reader.GetString(0), Is.EqualTo("þðüçöÝÞÐÜÇÖ"));
         reader.Read();
-        Assert.AreEqual("ฅๆษ", reader.GetString(0));
+        Assert.That(reader.GetString(0), Is.EqualTo("ฅๆษ"));
       }
     }
 
@@ -362,8 +362,8 @@ public void Chinese()
       using (MySqlDataReader reader = ExecuteReader("SELECT * FROM Test"))
       {
         reader.Read();
-        Assert.AreEqual("困巫忘否役", reader.GetString(1));
-        Assert.AreEqual("涝搞谷侪魍", reader.GetString(2));
+        Assert.That(reader.GetString(1), Is.EqualTo("困巫忘否役"));
+        Assert.That(reader.GetString(2), Is.EqualTo("涝搞谷侪魍"));
       }
     }
 
@@ -379,7 +379,7 @@ public void Russian()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual("щьеи", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("щьеи"));
       }
     }
 
@@ -400,7 +400,7 @@ public void UTF8Parameters()
       cmd.Parameters.Add("?parameter", MySqlDbType.VarString);
       cmd.Parameters[0].Value = "šđč枊ĐČĆŽ";
       object o = cmd.ExecuteScalar();
-      Assert.AreEqual(1, o);
+      Assert.That(o, Is.EqualTo(1));
     }
 
     [Test]
@@ -415,7 +415,7 @@ public void Turkish()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual("ĞËÇÄŞ", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("ĞËÇÄŞ"));
       }
     }
   }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
index cfd078190..829fae591 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
@@ -62,10 +62,10 @@ public void RandomMethod(string server, bool shouldPass = true)
       if (!shouldPass)
       {
         Exception ex = Assert.Throws<MySqlException>(() => TryConnection(Settings.ConnectionString));
-        Assert.AreEqual("Unable to connect to any of the specified MySQL hosts.", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Unable to connect to any of the specified MySQL hosts."));
       }
       else
-        Assert.AreEqual(ConnectionState.Open, TryConnection(Settings.ConnectionString));
+        Assert.That(TryConnection(Settings.ConnectionString), Is.EqualTo(ConnectionState.Open));
     }
 
     private static ConnectionState TryConnection(string connString)
@@ -91,11 +91,11 @@ public void PriorityMethod()
       using (MySqlConnection conn = new MySqlConnection(Settings.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.State);
-        Assert.AreEqual(Host, conn.Settings.Server);
-        Assert.AreEqual("server.example", FailoverManager.FailoverGroup.Hosts[0].Host);
-        Assert.AreEqual("192.0.10.56", FailoverManager.FailoverGroup.Hosts[1].Host);
-        Assert.AreEqual(Host, FailoverManager.FailoverGroup.Hosts[2].Host);
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
+        Assert.That(conn.Settings.Server, Is.EqualTo(Host));
+        Assert.That(FailoverManager.FailoverGroup.Hosts[0].Host, Is.EqualTo("server.example"));
+        Assert.That(FailoverManager.FailoverGroup.Hosts[1].Host, Is.EqualTo("192.0.10.56"));
+        Assert.That(FailoverManager.FailoverGroup.Hosts[2].Host, Is.EqualTo(Host));
       }
 
       // Multiple hosts with IPv6
@@ -106,7 +106,7 @@ public void PriorityMethod()
         using (MySqlConnection conn = new MySqlConnection(Settings.ConnectionString))
         {
           conn.Open();
-          Assert.AreEqual(ConnectionState.Open, conn.State);
+          Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
         }
       }
 
@@ -124,11 +124,11 @@ public void PriorityMethod()
       using (MySqlConnection conn = new MySqlConnection(Settings.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.State);
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
         priority = 100;
         foreach (var host in FailoverManager.FailoverGroup.Hosts)
         {
-          Assert.AreEqual(priority != 0 ? priority-- : 0, host.Priority);
+          Assert.That(host.Priority, Is.EqualTo(priority != 0 ? priority-- : 0));
         }
       }
     }
@@ -149,7 +149,7 @@ public void PriorityMethodConnectionFail(string server, string exceptionMessage,
         else
           ex = Assert.Throws<MySqlException>(() => conn.Open());
 
-        Assert.AreEqual(exceptionMessage, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(exceptionMessage));
       }
     }
 
@@ -166,7 +166,7 @@ public void Pooling(string server)
       {
         connArray[i] = new MySqlConnection(Settings.ConnectionString);
         connArray[i].Open();
-        Assert.AreEqual(ConnectionState.Open, connArray[i].State);
+        Assert.That(connArray[i].State, Is.EqualTo(ConnectionState.Open));
       }
 
       // now make sure all the server ids are different
@@ -175,7 +175,7 @@ public void Pooling(string server)
         for (int j = 0; j < connArray.Length; j++)
         {
           if (i != j)
-            Assert.True(connArray[i].ServerThread != connArray[j].ServerThread);
+            Assert.That(connArray[i].ServerThread != connArray[j].ServerThread);
         }
       }
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
index c2454add3..cc377864e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
@@ -83,7 +83,7 @@ public void InvalidCast()
         cmd.Parameters[1].Direction = ParameterDirection.ReturnValue;
         cmd.Parameters[0].Value = 20;
         cmd.ExecuteNonQuery();
-        Assert.AreEqual(40, cmd.Parameters[1].Value);
+        Assert.That(cmd.Parameters[1].Value, Is.EqualTo(40));
 
         cmd.CommandText = "spMyTwice";
         cmd.CommandType = CommandType.StoredProcedure;
@@ -93,7 +93,7 @@ public void InvalidCast()
         cmd.Parameters[0].Direction = ParameterDirection.Output;
         cmd.Parameters[1].Value = 20;
         cmd.ExecuteNonQuery();
-        Assert.AreEqual(40, cmd.Parameters[0].Value);
+        Assert.That(cmd.Parameters[0].Value, Is.EqualTo(40));
       }
     }
 
@@ -104,25 +104,25 @@ public void InsertTest()
       // do the insert
       MySqlCommand cmd = new MySqlCommand("INSERT INTO Test (id,name) VALUES(10,'Test')", Connection);
       int cnt = cmd.ExecuteNonQuery();
-      Assert.True(cnt == 1, "Insert Count");
+      Assert.That(cnt == 1, "Insert Count");
 
       // make sure we get the right value back out
       cmd.CommandText = "SELECT name FROM Test WHERE id=10";
       string name = (string)cmd.ExecuteScalar();
-      Assert.True(name == "Test", "Insert result");
+      Assert.That(name == "Test", "Insert result");
 
       // now do the insert with parameters
       cmd.CommandText = "INSERT INTO Test (id,name) VALUES(?id, ?name)";
       cmd.Parameters.Add(new MySqlParameter("?id", 11));
       cmd.Parameters.Add(new MySqlParameter("?name", "Test2"));
       cnt = cmd.ExecuteNonQuery();
-      Assert.True(cnt == 1, "Insert with Parameters Count");
+      Assert.That(cnt == 1, "Insert with Parameters Count");
 
       // make sure we get the right value back out
       cmd.Parameters.Clear();
       cmd.CommandText = "SELECT name FROM Test WHERE id=11";
       name = (string)cmd.ExecuteScalar();
-      Assert.True(name == "Test2", "Insert with parameters result");
+      Assert.That(name == "Test2", "Insert with parameters result");
     }
 
     [Test]
@@ -135,29 +135,29 @@ public void UpdateTest()
       // do the update
       MySqlCommand cmd = new MySqlCommand("UPDATE test SET name='Test3' WHERE id=10 OR id=11", Connection);
       int cnt = cmd.ExecuteNonQuery();
-      Assert.AreEqual(2, cnt);
+      Assert.That(cnt, Is.EqualTo(2));
 
       // make sure we get the right value back out
       cmd.CommandText = "SELECT name FROM test WHERE id=10";
       string name = (string)cmd.ExecuteScalar();
-      Assert.AreEqual("Test3", name);
+      Assert.That(name, Is.EqualTo("Test3"));
 
       cmd.CommandText = "SELECT name FROM test WHERE id=11";
       name = (string)cmd.ExecuteScalar();
-      Assert.AreEqual("Test3", name);
+      Assert.That(name, Is.EqualTo("Test3"));
 
       // now do the update with parameters
       cmd.CommandText = "UPDATE test SET name=?name WHERE id=?id";
       cmd.Parameters.Add(new MySqlParameter("?id", 11));
       cmd.Parameters.Add(new MySqlParameter("?name", "Test5"));
       cnt = cmd.ExecuteNonQuery();
-      Assert.True(cnt == 1, "Update with Parameters Count");
+      Assert.That(cnt == 1, "Update with Parameters Count");
 
       // make sure we get the right value back out
       cmd.Parameters.Clear();
       cmd.CommandText = "SELECT name FROM test WHERE id=11";
       name = (string)cmd.ExecuteScalar();
-      Assert.AreEqual("Test5", name);
+      Assert.That(name, Is.EqualTo("Test5"));
 
     }
 
@@ -171,12 +171,12 @@ public void DeleteTest()
       // make sure we get the right value back out
       MySqlCommand cmd = new MySqlCommand("DELETE FROM Test WHERE id=1 or id=2", Connection);
       int delcnt = cmd.ExecuteNonQuery();
-      Assert.AreEqual(2, delcnt);
+      Assert.That(delcnt, Is.EqualTo(2));
 
       // find out how many rows we have now
       cmd.CommandText = "SELECT COUNT(*) FROM Test";
       object after_cnt = cmd.ExecuteScalar();
-      Assert.AreEqual(0, Convert.ToInt32(after_cnt));
+      Assert.That(Convert.ToInt32(after_cnt), Is.EqualTo(0));
     }
 
     [Test]
@@ -309,9 +309,9 @@ public void PreparedInsertUsingReader()
     {
       ExecuteSQL("CREATE TABLE Test (id int NOT NULL, name VARCHAR(100))");
       MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES(1, 'Test')", Connection);
-      Assert.False(cmd.IsPrepared);
+      Assert.That(cmd.IsPrepared, Is.False);
       cmd.Prepare();
-      Assert.True(cmd.IsPrepared);
+      Assert.That(cmd.IsPrepared);
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
       }
@@ -319,9 +319,9 @@ public void PreparedInsertUsingReader()
       cmd.CommandText = "SELECT * FROM Test";
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.False(reader.Read());
-        Assert.False(reader.NextResult());
+        Assert.That(reader.Read());
+        Assert.That(reader.Read(), Is.False);
+        Assert.That(reader.NextResult(), Is.False);
       }
     }
 
@@ -396,31 +396,31 @@ public void DefaultCommandTimeout()
     {
       MySqlConnection c = new MySqlConnection($"server={Host}");
       MySqlCommand cmd = new MySqlCommand("", c);
-      Assert.AreEqual(30, cmd.CommandTimeout);
+      Assert.That(cmd.CommandTimeout, Is.EqualTo(30));
 
       c = new MySqlConnection($"server={Host};default command timeout=47");
       cmd = new MySqlCommand("", c);
-      Assert.AreEqual(47, cmd.CommandTimeout);
+      Assert.That(cmd.CommandTimeout, Is.EqualTo(47));
 
       cmd = new MySqlCommand("");
-      Assert.AreEqual(30, cmd.CommandTimeout);
+      Assert.That(cmd.CommandTimeout, Is.EqualTo(30));
 
       cmd.CommandTimeout = 66;
       cmd.Connection = c;
-      Assert.AreEqual(66, cmd.CommandTimeout);
+      Assert.That(cmd.CommandTimeout, Is.EqualTo(66));
       cmd.CommandTimeout = 0;
-      Assert.AreEqual(0, cmd.CommandTimeout);
+      Assert.That(cmd.CommandTimeout, Is.EqualTo(0));
 
       c = new MySqlConnection($"server={Host};default command timeout=0");
       cmd = new MySqlCommand("", c);
-      Assert.AreEqual(0, cmd.CommandTimeout);
+      Assert.That(cmd.CommandTimeout, Is.EqualTo(0));
 
       // Defaults to Int32.MaxValue/1000 when provided value is larger. 
       c = new MySqlConnection(Connection.ConnectionString);
       cmd = new MySqlCommand("", c);
       c.Open();
       cmd.CommandTimeout = Int32.MaxValue;
-      Assert.AreEqual(Int32.MaxValue / 1000, cmd.CommandTimeout);
+      Assert.That(cmd.CommandTimeout, Is.EqualTo(Int32.MaxValue / 1000));
       c.Close();
     }
 
@@ -454,7 +454,7 @@ public void UseAffectedRows()
       ExecuteSQL("INSERT INTO Test VALUES (3, 'C')");
 
       MySqlCommand cmd = new MySqlCommand("UPDATE Test SET name='C' WHERE id=3", Connection);
-      Assert.AreEqual(1, cmd.ExecuteNonQuery());
+      Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(1));
 
       MySqlConnectionStringBuilder connStr = new MySqlConnectionStringBuilder(Connection.ConnectionString);
       connStr.UseAffectedRows = true;
@@ -462,7 +462,7 @@ public void UseAffectedRows()
       {
         c.Open();
         cmd.Connection = c;
-        Assert.AreEqual(0, cmd.ExecuteNonQuery());
+        Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(0));
       }
     }
 
@@ -496,10 +496,10 @@ public void TableCommandType()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual(1, reader.GetInt32(0));
-        Assert.AreEqual("A", reader.GetString(1));
-        Assert.AreEqual(2, reader.GetInt32(2));
-        Assert.AreEqual("B", reader.GetString(3));
+        Assert.That(reader.GetInt32(0), Is.EqualTo(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("A"));
+        Assert.That(reader.GetInt32(2), Is.EqualTo(2));
+        Assert.That(reader.GetString(3), Is.EqualTo("B"));
       }
     }
 
@@ -530,8 +530,8 @@ public void SyntaxErrorWithCloseConnection()
         c.Open();
         MySqlCommand cmd = new MySqlCommand("SELE 1", c);
         var ex = Assert.Throws<MySqlException>(() => cmd.ExecuteReader(CommandBehavior.CloseConnection));
-        Assert.AreEqual("You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELE 1' at line 1", ex.Message);
-        Assert.True(c.State == ConnectionState.Closed);
+        Assert.That(ex.Message, Is.EqualTo("You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELE 1' at line 1"));
+        Assert.That(c.State == ConnectionState.Closed);
       }
     }
 
@@ -545,7 +545,7 @@ public void EmptyOrJustSemiCommand()
       cmd.CommandText = ";";
       MySqlException ex = Assert.Throws<MySqlException>(() => cmd.ExecuteNonQuery());
       // Error: 1065  Message: Query was empty
-      Assert.AreEqual(1065, ex.Number);
+      Assert.That(ex.Number, Is.EqualTo(1065));
     }
 
     /// <summary>
@@ -558,7 +558,7 @@ public void CommandTextIsNull()
     {
       MySqlCommand cmd = new MySqlCommand(null, Connection);
       Exception ex = Assert.Throws<InvalidOperationException>(() => cmd.ExecuteReader());
-      Assert.True(ex.Message != String.Empty);
+      Assert.That(ex.Message != String.Empty);
     }
 
     /// <summary>
@@ -577,7 +577,7 @@ public void LongLastInsertId()
       {
         cmd.CommandText = "INSERT INTO longids VALUES ();";
         cmd.ExecuteNonQuery();
-        Assert.AreEqual(seed++, cmd.LastInsertedId);
+        Assert.That(cmd.LastInsertedId, Is.EqualTo(seed++));
       }
     }
 
@@ -593,12 +593,12 @@ public async Task ExecuteNonQueryAsync()
       proc.CommandType = CommandType.StoredProcedure;
       int result = await proc.ExecuteNonQueryAsync();
 
-      Assert.AreNotEqual(-1, result);
+      Assert.That(result, Is.Not.EqualTo(-1));
 
       MySqlCommand cmd = new MySqlCommand("SELECT COUNT(*) FROM CMDNonQueryAsyncTest;", Connection);
       cmd.CommandType = CommandType.Text;
       object cnt = cmd.ExecuteScalar();
-      Assert.AreEqual(100, Convert.ToInt32(cnt));
+      Assert.That(Convert.ToInt32(cnt), Is.EqualTo(100));
     }
 
     [Test]
@@ -612,17 +612,17 @@ public async Task ExecuteReaderAsync()
 
       using (MySqlDataReader reader = await proc.ExecuteReaderAsync() as MySqlDataReader)
       {
-        Assert.NotNull(reader);
-        Assert.True(reader.Read(), "can read");
-        Assert.True(reader.NextResult());
-        Assert.True(reader.Read());
-        Assert.AreEqual("done", reader.GetString(0));
+        Assert.That(reader, Is.Not.Null);
+        Assert.That(reader.Read(), "can read");
+        Assert.That(reader.NextResult());
+        Assert.That(reader.Read());
+        Assert.That(reader.GetString(0), Is.EqualTo("done"));
         reader.Close();
 
         proc.CommandType = CommandType.Text;
         proc.CommandText = "SELECT COUNT(*) FROM CMDReaderAsyncTest";
         object cnt = proc.ExecuteScalar();
-        Assert.AreEqual(1, Convert.ToInt32(cnt));
+        Assert.That(Convert.ToInt32(cnt), Is.EqualTo(1));
       }
     }
 
@@ -638,8 +638,8 @@ public async Task ExecuteScalarAsync()
       cmd.Parameters[1].Direction = ParameterDirection.Output;
 
       object result = await cmd.ExecuteScalarAsync();
-      Assert.AreEqual("Test", result);
-      Assert.AreEqual("valuein", cmd.Parameters[1].Value);
+      Assert.That(result, Is.EqualTo("Test"));
+      Assert.That(cmd.Parameters[1].Value, Is.EqualTo("valuein"));
     }
 
 #if NET452
@@ -691,7 +691,7 @@ public void BatchUpdatesAndDeletes()
         da.Update(dt);
       }
 
-      Assert.AreEqual(1, listener.Find("Query Opened: UPDATE"));
+      Assert.That(listener.Find("Query Opened: UPDATE"), Is.EqualTo(1));
     }
 
     [Test]
@@ -708,10 +708,10 @@ public void ExecuteReaderReturnsReaderAfterCancel()
 
       command = new MySqlCommand("SELECT PrimaryKey FROM TableWithStringAsPrimaryKey", Connection);
       reader = command.ExecuteReader(CommandBehavior.KeyInfo);
-      Assert.NotNull(reader);
+      Assert.That(reader, Is.Not.Null);
 
       dataTableSchema = reader.GetSchemaTable();
-      Assert.True("PrimaryKey" == (string)dataTableSchema.Rows[0][dataTableSchema.Columns[0]]);
+      Assert.That("PrimaryKey" == (string)dataTableSchema.Rows[0][dataTableSchema.Columns[0]]);
       reader.Close();
     }
 
@@ -724,10 +724,10 @@ public void CloneCommand()
 
       var cmd2 = (MySqlCommand)cmd.Clone();
 
-      Assert.AreEqual(1, cmd2.Parameters.Count);
-      Assert.AreEqual(1, cmd2.Attributes.Count);
-      StringAssert.AreEqualIgnoringCase("attr_value", cmd2.Attributes[0].Value.ToString());
-      StringAssert.AreEqualIgnoringCase("param_value", cmd2.Parameters[0].Value.ToString());
+      Assert.That(cmd2.Parameters.Count, Is.EqualTo(1));
+      Assert.That(cmd2.Attributes.Count, Is.EqualTo(1));
+      Assert.That(cmd2.Attributes[0].Value.ToString(), Is.EqualTo("attr_value").IgnoreCase);
+      Assert.That(cmd2.Parameters[0].Value.ToString(), Is.EqualTo("param_value").IgnoreCase);
     }
 
     /// <summary>
@@ -747,9 +747,9 @@ public void ExecuteReaderAfterClosingCommand()
           reader = cmd.ExecuteReader();
         }
 
-        Assert.True(reader.Read());
-        Assert.AreEqual("TEST", reader.GetString(0));
-        Assert.False(reader.Read());
+        Assert.That(reader.Read());
+        Assert.That(reader.GetString(0), Is.EqualTo("TEST"));
+        Assert.That(reader.Read(), Is.False);
       }
     }
 
@@ -761,14 +761,14 @@ public void CommandNegativeTimeout()
     {
       MySqlConnection conn = new MySqlConnection($"server={Host};default command timeout=10");
       MySqlCommand cmd = new MySqlCommand("", conn);
-      Assert.AreEqual(10, cmd.CommandTimeout);
+      Assert.That(cmd.CommandTimeout, Is.EqualTo(10));
 
       Assert.Throws<ArgumentException>(() => conn = new MySqlConnection($"server={Host};default command timeout=-1"));
       var ex = Assert.Throws<ArgumentException>(() => cmd.CommandTimeout = -1);
-      StringAssert.AreEqualIgnoringCase("Command timeout must not be negative", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Command timeout must not be negative").IgnoreCase);
 
       cmd.CommandTimeout = 15;
-      Assert.AreEqual(15, cmd.CommandTimeout);
+      Assert.That(cmd.CommandTimeout, Is.EqualTo(15));
     }
 
     #region SQL Injection
@@ -792,7 +792,7 @@ public void SqlInjection1()
       cmd.Parameters[0].Value = "\u2032 OR 1=1;-- --";
       cmd.ExecuteNonQuery();
 
-      Assert.AreEqual(count, (Int64)cnt.ExecuteScalar());
+      Assert.That((Int64)cnt.ExecuteScalar(), Is.EqualTo(count));
     }
 
     #endregion
@@ -838,11 +838,11 @@ PRIMARY KEY (`inventory_id`)
         {
           while (reader.Read())
           {
-            Assert.AreEqual(999999, cmd.CommandTimeout);
-            Assert.IsNotEmpty(reader.GetValue(0).ToString());
-            Assert.IsNotEmpty(reader.GetValue(1).ToString());
-            Assert.IsNotEmpty(reader.GetValue(2).ToString());
-            Assert.IsNotEmpty(reader.GetValue(3).ToString());
+            Assert.That(cmd.CommandTimeout, Is.EqualTo(999999));
+            Assert.That(reader.GetValue(0).ToString(), Is.Not.Empty);
+            Assert.That(reader.GetValue(1).ToString(), Is.Not.Empty);
+            Assert.That(reader.GetValue(2).ToString(), Is.Not.Empty);
+            Assert.That(reader.GetValue(3).ToString(), Is.Not.Empty);
           }
         }
       }
@@ -872,9 +872,9 @@ public void ReservedWordUse()
         {
           while (rdr.Read())
           {
-            Assert.AreEqual("1", rdr[0]);
-            Assert.AreEqual("test", rdr[1]);
-            Assert.AreEqual("status", rdr[2]);
+            Assert.That(rdr[0], Is.EqualTo("1"));
+            Assert.That(rdr[1], Is.EqualTo("test"));
+            Assert.That(rdr[2], Is.EqualTo("status"));
           }
         }
       }
@@ -924,10 +924,10 @@ public void ExecuteCmdWithTabsAndNewLines()
       using (var cmd = Connection.CreateCommand())
       {
         cmd.CommandText = "SELECT\nCOUNT(*)\nFROM\nTest;";
-        Assert.AreEqual(1, cmd.ExecuteScalar());
+        Assert.That(cmd.ExecuteScalar(), Is.EqualTo(1));
 
         cmd.CommandText = "SELECT\tCOUNT(*)\n\t\tFROM\tTest;";
-        Assert.AreEqual(1, cmd.ExecuteScalar());
+        Assert.That(cmd.ExecuteScalar(), Is.EqualTo(1));
       }
     }
 
@@ -945,10 +945,10 @@ public void LastInsertedIdInMultipleStatements()
       + "INSERT INTO TestForeignKey (foreign_id, column2) VALUES(LAST_INSERT_ID(), 'test');";
 
       cmd.ExecuteNonQuery();
-      Assert.AreEqual(1, cmd.LastInsertedId);
+      Assert.That(cmd.LastInsertedId, Is.EqualTo(1));
 
       cmd.ExecuteNonQuery();
-      Assert.AreEqual(2, cmd.LastInsertedId);
+      Assert.That(cmd.LastInsertedId, Is.EqualTo(2));
 
       cmd.CommandText = "SELECT * FROM Test";
       int id = 1;
@@ -956,11 +956,11 @@ public void LastInsertedIdInMultipleStatements()
       using var reader = cmd.ExecuteReader();
       while (reader.Read())
       {
-        Assert.IsTrue(reader.GetInt32(0) == id);
+        Assert.That(reader.GetInt32(0) == id);
         id++;
       }
 
-      Assert.AreEqual(-1, cmd.LastInsertedId);
+      Assert.That(cmd.LastInsertedId, Is.EqualTo(-1));
     }
 
     /// <summary>
@@ -974,8 +974,8 @@ public void LastInserteIdRedux()
       using var cmd = Connection.CreateCommand();
       cmd.CommandText = @"INSERT INTO Test (text) VALUES ('test1'); INSERT INTO Test (text) VALUES ('test2');";
 
-      Assert.AreEqual(2, cmd.ExecuteNonQuery());
-      Assert.AreEqual(2, cmd.LastInsertedId);
+      Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(2));
+      Assert.That(cmd.LastInsertedId, Is.EqualTo(2));
     }
 
   }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
index 3d50fa738..5f04d2c1b 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
@@ -54,48 +54,48 @@ public void Simple()
       sb.ConnectionString = "server=localhost;uid=reggie;pwd=pass;port=1111;" +
           "connection timeout=23; pooling=true; min pool size=33; " +
           "max pool size=66;keepalive=1";
-      Assert.AreEqual("localhost", sb.Server);
-      Assert.AreEqual("reggie", sb.UserID);
-      Assert.AreEqual("pass", sb.Password);
-      Assert.AreEqual(1111, Convert.ToInt32(sb.Port));
-      Assert.AreEqual(23, Convert.ToInt32(sb.ConnectionTimeout));
-      Assert.True(sb.Pooling);
-      Assert.AreEqual(33, Convert.ToInt32(sb.MinimumPoolSize));
-      Assert.AreEqual(66, Convert.ToInt32(sb.MaximumPoolSize));
-      Assert.AreEqual(1, Convert.ToInt32(sb.Keepalive));
+      Assert.That(sb.Server, Is.EqualTo("localhost"));
+      Assert.That(sb.UserID, Is.EqualTo("reggie"));
+      Assert.That(sb.Password, Is.EqualTo("pass"));
+      Assert.That(Convert.ToInt32(sb.Port), Is.EqualTo(1111));
+      Assert.That(Convert.ToInt32(sb.ConnectionTimeout), Is.EqualTo(23));
+      Assert.That(sb.Pooling);
+      Assert.That(Convert.ToInt32(sb.MinimumPoolSize), Is.EqualTo(33));
+      Assert.That(Convert.ToInt32(sb.MaximumPoolSize), Is.EqualTo(66));
+      Assert.That(Convert.ToInt32(sb.Keepalive), Is.EqualTo(1));
       Exception ex = Assert.Throws<ArgumentException>(() => sb.ConnectionString = "server=localhost;badkey=badvalue");
 #if NETFRAMEWORK
-      Assert.AreEqual($"Option not supported.{Environment.NewLine}Parameter name: badkey", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo($"Option not supported.{Environment.NewLine}Parameter name: badkey"));
 #else
-      Assert.AreEqual("Option not supported. (Parameter 'badkey')", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Option not supported. (Parameter 'badkey')"));
 #endif
       sb.Clear();
-      Assert.AreEqual(15, Convert.ToInt32(sb.ConnectionTimeout));
-      Assert.True(sb.Pooling);
-      Assert.True(sb.Pooling);
-      Assert.AreEqual(3306, Convert.ToInt32(sb.Port));
-      Assert.AreEqual(String.Empty, sb.Server);
-      Assert.False(sb.PersistSecurityInfo);
-      Assert.AreEqual(0, Convert.ToInt32(sb.ConnectionLifeTime));
-      Assert.False(sb.ConnectionReset);
-      Assert.AreEqual(0, Convert.ToInt32(sb.MinimumPoolSize));
-      Assert.AreEqual(100, Convert.ToInt32(sb.MaximumPoolSize));
-      Assert.AreEqual(String.Empty, sb.UserID);
-      Assert.AreEqual(String.Empty, sb.Password);
-      Assert.False(sb.UseUsageAdvisor);
-      Assert.AreEqual(String.Empty, sb.CharacterSet);
-      Assert.False(sb.UseCompression);
-      Assert.AreEqual("MYSQL", sb.PipeName);
-      Assert.False(sb.Logging);
-      Assert.True(sb.AllowBatch);
-      Assert.False(sb.ConvertZeroDateTime);
-      Assert.AreEqual("MYSQL", sb.SharedMemoryName);
-      Assert.AreEqual(String.Empty, sb.Database);
-      Assert.AreEqual(MySqlConnectionProtocol.Sockets, sb.ConnectionProtocol);
-      Assert.False(sb.AllowZeroDateTime);
-      Assert.False(sb.UsePerformanceMonitor);
-      Assert.AreEqual(25, Convert.ToInt32(sb.ProcedureCacheSize));
-      Assert.AreEqual(0, Convert.ToInt32(sb.Keepalive));
+      Assert.That(Convert.ToInt32(sb.ConnectionTimeout), Is.EqualTo(15));
+      Assert.That(sb.Pooling);
+      Assert.That(sb.Pooling);
+      Assert.That(Convert.ToInt32(sb.Port), Is.EqualTo(3306));
+      Assert.That(sb.Server, Is.EqualTo(String.Empty));
+      Assert.That(sb.PersistSecurityInfo, Is.False);
+      Assert.That(Convert.ToInt32(sb.ConnectionLifeTime), Is.EqualTo(0));
+      Assert.That(sb.ConnectionReset, Is.False);
+      Assert.That(Convert.ToInt32(sb.MinimumPoolSize), Is.EqualTo(0));
+      Assert.That(Convert.ToInt32(sb.MaximumPoolSize), Is.EqualTo(100));
+      Assert.That(sb.UserID, Is.EqualTo(String.Empty));
+      Assert.That(sb.Password, Is.EqualTo(String.Empty));
+      Assert.That(sb.UseUsageAdvisor, Is.False);
+      Assert.That(sb.CharacterSet, Is.EqualTo(String.Empty));
+      Assert.That(sb.UseCompression, Is.False);
+      Assert.That(sb.PipeName, Is.EqualTo("MYSQL"));
+      Assert.That(sb.Logging, Is.False);
+      Assert.That(sb.AllowBatch);
+      Assert.That(sb.ConvertZeroDateTime, Is.False);
+      Assert.That(sb.SharedMemoryName, Is.EqualTo("MYSQL"));
+      Assert.That(sb.Database, Is.EqualTo(String.Empty));
+      Assert.That(sb.ConnectionProtocol, Is.EqualTo(MySqlConnectionProtocol.Sockets));
+      Assert.That(sb.AllowZeroDateTime, Is.False);
+      Assert.That(sb.UsePerformanceMonitor, Is.False);
+      Assert.That(Convert.ToInt32(sb.ProcedureCacheSize), Is.EqualTo(25));
+      Assert.That(Convert.ToInt32(sb.Keepalive), Is.EqualTo(0));
     }
 
     /// <summary>
@@ -107,7 +107,7 @@ public void SettingValueMultipeTimes()
       MySqlConnectionStringBuilder s = new MySqlConnectionStringBuilder();
       s["database"] = "test";
       s["database"] = "test2";
-      Assert.AreEqual("database=test2", s.ConnectionString);
+      Assert.That(s.ConnectionString, Is.EqualTo("database=test2"));
     }
 
     /// <summary>
@@ -118,8 +118,8 @@ public void NoValueGivenForConnectionStringOption()
     {
       MySqlConnectionStringBuilder s = new MySqlConnectionStringBuilder();
       s.ConnectionString = "compress=;pooling=";
-      Assert.False(s.UseCompression);
-      Assert.True(s.Pooling);
+      Assert.That(s.UseCompression, Is.False);
+      Assert.That(s.Pooling);
     }
 
     /// <summary>
@@ -130,18 +130,18 @@ public void ContainsKey()
     {
       MySqlConnectionStringBuilder s = new MySqlConnectionStringBuilder();
       s["database"] = "test";
-      Assert.True(s.ContainsKey("initial catalog"));
+      Assert.That(s.ContainsKey("initial catalog"));
       s["server"] = "myserver";
-      Assert.True(s.ContainsKey("server"));
-      Assert.True(s.ContainsKey("host"));
-      Assert.False(s.ContainsKey("badkey"));
+      Assert.That(s.ContainsKey("server"));
+      Assert.That(s.ContainsKey("host"));
+      Assert.That(s.ContainsKey("badkey"), Is.False);
     }
 
     [Test]
     public void SettingCheckParameters()
     {
       MySqlConnectionStringBuilder s = new MySqlConnectionStringBuilder("server=localhost;check parameters=false");
-      Assert.False(s.CheckParameters);
+      Assert.That(s.CheckParameters, Is.False);
     }
 
     [TestCase("foo keyword")]
@@ -151,9 +151,9 @@ public void SettingInvalidKeyThrowsArgumentException(string invalidKey)
       MySqlConnectionStringBuilder s = new MySqlConnectionStringBuilder();
       Exception ex = Assert.Throws<ArgumentException>(() => s[invalidKey] = "foo");
 #if NETFRAMEWORK
-      Assert.AreEqual($"Option not supported.{Environment.NewLine}Parameter name: {invalidKey}", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo($"Option not supported.{Environment.NewLine}Parameter name: {invalidKey}"));
 #else
-      Assert.AreEqual($"Option not supported. (Parameter '{invalidKey}')", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo($"Option not supported. (Parameter '{invalidKey}')"));
 #endif
     }
 
@@ -166,7 +166,7 @@ public void SafeTryGetValue()
       object obj;
       MySqlConnectionStringBuilder s = new MySqlConnectionStringBuilder("server=localhost;");
       s.TryGetValue("unknownproperty", out obj);
-      Assert.Null(obj);
+      Assert.That(obj, Is.Null);
     }
 
 #if !NETFRAMEWORK
@@ -231,7 +231,7 @@ public void SettingTableCachingRaisesException()
     {
       var builder = new MySqlConnectionStringBuilder();
       builder.TableCaching = true;
-      Assert.True(builder.TableCaching);
+      Assert.That(builder.TableCaching);
     }
 
     /// <summary>
@@ -246,11 +246,11 @@ public void SettingInvalidAuthenticationMethod(string method)
       var builder = new MySqlConnectionStringBuilder();
       builder.DefaultAuthenticationPlugin = " ";
       var ex = Assert.Throws<MySqlException>(() => builder.DefaultAuthenticationPlugin = method);
-      StringAssert.AreEqualIgnoringCase(string.Format(Resources.AuthenticationMethodNotSupported, method), ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(string.Format(Resources.AuthenticationMethodNotSupported, method)).IgnoreCase);
 
       var connStr = $"server=localhost;userid=root;defaultauthenticationplugin={method}";
       ex = Assert.Throws<MySqlException>(() => new MySqlConnection(connStr));
-      StringAssert.AreEqualIgnoringCase(string.Format(Resources.AuthenticationMethodNotSupported, method), ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(string.Format(Resources.AuthenticationMethodNotSupported, method)).IgnoreCase);
 
       connStr = "server=localhost;userid=root;defaultauthenticationplugin=";
       var conn = new MySqlConnection(connStr);
@@ -266,17 +266,17 @@ public void UsingPwdAliases(string alias)
     {
       string value = "test";
       var conn = new MySqlConnection($"{alias}={value};pwd2={value};pwd3={value}");
-      StringAssert.AreEqualIgnoringCase(value, conn.Settings.Password);
-      StringAssert.AreEqualIgnoringCase(value, conn.Settings.Password2);
-      StringAssert.AreEqualIgnoringCase(value, conn.Settings.Password3);
+      Assert.That(conn.Settings.Password, Is.EqualTo(value).IgnoreCase);
+      Assert.That(conn.Settings.Password2, Is.EqualTo(value).IgnoreCase);
+      Assert.That(conn.Settings.Password3, Is.EqualTo(value).IgnoreCase);
 
       var connBuilder = new MySqlConnectionStringBuilder();
       connBuilder[alias] = value;
       connBuilder["pwd2"] = value;
       connBuilder["pwd3"] = value;
-      StringAssert.AreEqualIgnoringCase(value, connBuilder.Password);
-      StringAssert.AreEqualIgnoringCase(value, connBuilder.Password2);
-      StringAssert.AreEqualIgnoringCase(value, connBuilder.Password3);
+      Assert.That(connBuilder.Password, Is.EqualTo(value).IgnoreCase);
+      Assert.That(connBuilder.Password2, Is.EqualTo(value).IgnoreCase);
+      Assert.That(connBuilder.Password3, Is.EqualTo(value).IgnoreCase);
     }
 
     [Test, Description("Session BaseString/MySQLConnectionString Builder")]
@@ -299,7 +299,7 @@ public void ConnectionStringBuilderClassicTests()
       using (var conn = new MySqlConnection(mysql.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.connectionState);
+        Assert.That(conn.connectionState, Is.EqualTo(ConnectionState.Open));
       }
 
       mysql = new MySqlConnectionStringBuilder(Settings.ConnectionString);
@@ -316,7 +316,7 @@ public void ConnectionStringBuilderClassicTests()
       using (var conn = new MySqlConnection(mysql.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.connectionState);
+        Assert.That(conn.connectionState, Is.EqualTo(ConnectionState.Open));
       }
 
       mysql = new MySqlConnectionStringBuilder(Settings.ConnectionString);
@@ -329,7 +329,7 @@ public void ConnectionStringBuilderClassicTests()
       using (var conn = new MySqlConnection(mysql.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.connectionState);
+        Assert.That(conn.connectionState, Is.EqualTo(ConnectionState.Open));
       }
 
       ////Scenario-2
@@ -382,7 +382,7 @@ public void ConnectionStringBuilderClassicTests()
       using (var conn = new MySqlConnection(mysql.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.connectionState);
+        Assert.That(conn.connectionState, Is.EqualTo(ConnectionState.Open));
       }
 
       mysql.SslCa = _sslCa;
@@ -390,7 +390,7 @@ public void ConnectionStringBuilderClassicTests()
       using (var conn = new MySqlConnection(mysql.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.connectionState);
+        Assert.That(conn.connectionState, Is.EqualTo(ConnectionState.Open));
       }
 
       ////Basic Scenarios
@@ -401,7 +401,7 @@ public void ConnectionStringBuilderClassicTests()
       using (var conn = new MySqlConnection(mysql.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.connectionState);
+        Assert.That(conn.connectionState, Is.EqualTo(ConnectionState.Open));
       }
     }
 
@@ -418,21 +418,21 @@ public void TryGetValue()
         MinimumPoolSize = 10,
       };
 
-      Assert.IsTrue(connStringBuilder.ContainsKey("data source"));
-      Assert.IsTrue(connStringBuilder.TryGetValue("host", out var server));
-      StringAssert.AreEqualIgnoringCase(connStringBuilder.Server, (string)server);
+      Assert.That(connStringBuilder.ContainsKey("data source"));
+      Assert.That(connStringBuilder.TryGetValue("host", out var server));
+      Assert.That((string)server, Is.EqualTo(connStringBuilder.Server).IgnoreCase);
 
-      Assert.IsTrue(connStringBuilder.ContainsKey("MinimumPoolSize"));
-      Assert.IsTrue(connStringBuilder.TryGetValue("Minimum Pool Size", out var minpoolsize));
-      Assert.AreEqual(connStringBuilder.MinimumPoolSize, (uint)minpoolsize);
+      Assert.That(connStringBuilder.ContainsKey("MinimumPoolSize"));
+      Assert.That(connStringBuilder.TryGetValue("Minimum Pool Size", out var minpoolsize));
+      Assert.That((uint)minpoolsize, Is.EqualTo(connStringBuilder.MinimumPoolSize));
 
       // Default value
-      Assert.IsTrue(connStringBuilder.TryGetValue("allowpublickeyretrieval", out var allowpublickeyretrieval));
-      Assert.AreEqual(connStringBuilder.GetOption("allowpublickeyretrieval").DefaultValue, allowpublickeyretrieval);
+      Assert.That(connStringBuilder.TryGetValue("allowpublickeyretrieval", out var allowpublickeyretrieval));
+      Assert.That(allowpublickeyretrieval, Is.EqualTo(connStringBuilder.GetOption("allowpublickeyretrieval").DefaultValue));
 
       // Non existing option
-      Assert.IsFalse(connStringBuilder.TryGetValue("bar", out var nonexistingoption));
-      Assert.IsNull(nonexistingoption);
+      Assert.That(connStringBuilder.TryGetValue("bar", out var nonexistingoption), Is.False);
+      Assert.That(nonexistingoption, Is.Null);
     }
 
     /// <summary>
@@ -448,17 +448,17 @@ public void KerberosAuthModeTest()
       MySqlConnection conn;
 
       conn = new MySqlConnection();
-      Assert.True(conn.Settings.KerberosAuthMode == KerberosAuthMode.AUTO);
+      Assert.That(conn.Settings.KerberosAuthMode == KerberosAuthMode.AUTO);
 
       foreach (KerberosAuthMode mode in Enum.GetValues(typeof(KerberosAuthMode)))
       {
         connString = $"kerberosauthmode={mode}";
         conn = new MySqlConnection(connString);
-        Assert.True(conn.Settings.KerberosAuthMode == mode);
+        Assert.That(conn.Settings.KerberosAuthMode == mode);
 
         connString = $"kerberos auth mode={mode}";
         conn = new MySqlConnection(connString);
-        Assert.True(conn.Settings.KerberosAuthMode == mode);
+        Assert.That(conn.Settings.KerberosAuthMode == mode);
       }
 
       connString = "kerberosauthmode=INVALID";
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
index 2e7f989fa..c2fef3dab 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
@@ -49,38 +49,38 @@ public void TestConnectionStrings()
       MySqlConnection c = new MySqlConnection();
 
       // public properties
-      Assert.True(15 == c.ConnectionTimeout, "ConnectionTimeout");
-      Assert.True(String.Empty == c.Database, "Database");
-      Assert.True(String.Empty == c.DataSource, "DataSource");
-      Assert.True(false == c.UseCompression, "Use Compression");
-      Assert.True(ConnectionState.Closed == c.State, "State");
+      Assert.That(15 == c.ConnectionTimeout, "ConnectionTimeout");
+      Assert.That(String.Empty == c.Database, "Database");
+      Assert.That(String.Empty == c.DataSource, "DataSource");
+      Assert.That(false == c.UseCompression, "Use Compression");
+      Assert.That(ConnectionState.Closed == c.State, "State");
 
       c = new MySqlConnection("connection timeout=25; user id=myuser; " +
           "password=mypass; database=Test;server=myserver; use compression=true; " +
           "pooling=false;min pool size=5; max pool size=101");
 
       // public properties
-      Assert.True(25 == c.ConnectionTimeout, "ConnectionTimeout");
-      Assert.True("Test" == c.Database, "Database");
-      Assert.True("myserver" == c.DataSource, "DataSource");
-      Assert.True(true == c.UseCompression, "Use Compression");
-      Assert.True(ConnectionState.Closed == c.State, "State");
+      Assert.That(25 == c.ConnectionTimeout, "ConnectionTimeout");
+      Assert.That("Test" == c.Database, "Database");
+      Assert.That("myserver" == c.DataSource, "DataSource");
+      Assert.That(true == c.UseCompression, "Use Compression");
+      Assert.That(ConnectionState.Closed == c.State, "State");
 
       c.ConnectionString = "connection timeout=15; user id=newuser; " +
           "password=newpass; port=3308; database=mydb; data source=myserver2; " +
           "use compression=true; pooling=true; min pool size=3; max pool size=76";
 
       // public properties
-      Assert.True(15 == c.ConnectionTimeout, "ConnectionTimeout");
-      Assert.True("mydb" == c.Database, "Database");
-      Assert.True("myserver2" == c.DataSource, "DataSource");
-      Assert.True(true == c.UseCompression, "Use Compression");
-      Assert.True(ConnectionState.Closed == c.State, "State");
+      Assert.That(15 == c.ConnectionTimeout, "ConnectionTimeout");
+      Assert.That("mydb" == c.Database, "Database");
+      Assert.That("myserver2" == c.DataSource, "DataSource");
+      Assert.That(true == c.UseCompression, "Use Compression");
+      Assert.That(ConnectionState.Closed == c.State, "State");
 
       // Bug #30791289 - MYSQLCONNECTION(NULL) NOW THROWS NULLREFERENCEEXCEPTION
       var conn = new MySqlConnection($"server={Host};");
       conn.ConnectionString = null;
-      Assert.AreEqual(string.Empty, conn.ConnectionString);
+      Assert.That(conn.ConnectionString, Is.EqualTo(string.Empty));
     }
 
     [Test]
@@ -91,12 +91,12 @@ public void ChangeDatabase()
       using (c)
       {
         c.Open();
-        Assert.True(c.State == ConnectionState.Open);
-        Assert.AreEqual(connStr.Database, c.Database);
+        Assert.That(c.State == ConnectionState.Open);
+        Assert.That(c.Database, Is.EqualTo(connStr.Database));
 
         string dbName = CreateDatabase("db1");
         c.ChangeDatabase(dbName);
-        Assert.AreEqual(dbName, c.Database);
+        Assert.That(c.Database, Is.EqualTo(dbName));
       }
     }
 
@@ -110,7 +110,7 @@ public void ConnectionPoolExhaustion()
       {
         var ex = Assert.Catch<MySqlException>(() => CreateCommandTimeoutException());
         //Prior to the fix the exception thrown was 'error connecting: Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached.' after the 10th execution.
-        Assert.AreEqual("Fatal error encountered during command execution.", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Fatal error encountered during command execution."));
       }
     }
 
@@ -197,8 +197,8 @@ public void ConnectingAsUTF8()
         MySqlCommand cmd2 = new MySqlCommand("SELECT id, active FROM test", d);
         using (MySqlDataReader reader = cmd2.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          Assert.True(reader.GetBoolean(1));
+          Assert.That(reader.Read());
+          Assert.That(reader.GetBoolean(1));
         }
       }
     }
@@ -211,8 +211,8 @@ public void PingUpdatesState()
     {
       var conn2 = GetConnection();
       KillConnection(conn2);
-      Assert.False(conn2.Ping());
-      Assert.True(conn2.State == ConnectionState.Closed);
+      Assert.That(conn2.Ping(), Is.False);
+      Assert.That(conn2.State == ConnectionState.Closed);
       conn2.Open();
       conn2.Close();
     }
@@ -245,7 +245,7 @@ public void TestConnectingSocketBadHostName()
       connStr.Server = "badHostName";
       MySqlConnection c = new MySqlConnection(connStr.GetConnectionString(true));
       var ex = Assert.Throws<MySqlException>(() => c.Open());
-      if (Platform.IsWindows()) Assert.IsTrue(ex.InnerException.GetType() == typeof(ArgumentException));
+      if (Platform.IsWindows()) Assert.That(ex.InnerException.GetType() == typeof(ArgumentException));
     }
 
     /// <summary>
@@ -265,7 +265,7 @@ public void ConnectionStringNotAffectedByChangeDatabase()
           c.Open();
           string str = c.ConnectionString;
           int index = str.IndexOf("Database=");
-          Assert.AreEqual(-1, index);
+          Assert.That(index, Is.EqualTo(-1));
         }
       }
     }
@@ -284,12 +284,12 @@ public void ConnectionCloseByGC()
       c.Open();
       threadId = c.ServerThread;
       WeakReference wr = new WeakReference(c);
-      Assert.True(wr.IsAlive);
+      Assert.That(wr.IsAlive);
       c = null;
       GC.Collect();
       GC.WaitForPendingFinalizers();
-      Assert.False(wr.IsAlive);
-      Assert.True(check.closed);
+      Assert.That(wr.IsAlive, Is.False);
+      Assert.That(check.closed);
 
       MySqlCommand cmd = new MySqlCommand("KILL " + threadId, Connection);
       cmd.ExecuteNonQuery();
@@ -366,10 +366,10 @@ public async Task TransactionAsync()
 
       MySqlTransaction txn = await Connection.BeginTransactionAsync();
       MySqlConnection c = txn.Connection;
-      Assert.AreEqual(Connection, c);
+      Assert.That(c, Is.EqualTo(Connection));
       MySqlCommand cmd = new MySqlCommand("SELECT name, name2 FROM TranAsyncTest WHERE key2='P'", Connection, txn);
       MySqlTransaction t2 = cmd.Transaction;
-      Assert.AreEqual(txn, t2);
+      Assert.That(t2, Is.EqualTo(txn));
       MySqlDataReader reader = null;
       try
       {
@@ -379,7 +379,7 @@ public async Task TransactionAsync()
       }
       catch (Exception ex)
       {
-        Assert.False(ex.Message != string.Empty, ex.Message);
+        Assert.That(ex.Message != string.Empty, Is.False, ex.Message);
         txn.Rollback();
       }
       finally
@@ -407,9 +407,9 @@ public async Task OpenAndCloseConnectionAsync()
     {
       var conn = new MySqlConnection(Connection.ConnectionString);
       await conn.OpenAsync();
-      Assert.True(conn.State == ConnectionState.Open);
+      Assert.That(conn.State == ConnectionState.Open);
       await conn.CloseAsync();
-      Assert.True(conn.State == ConnectionState.Closed);
+      Assert.That(conn.State == ConnectionState.Closed);
     }
 
     [Test]
@@ -442,7 +442,7 @@ public async Task ClearAllPoolsAsync()
     public async Task GetSchemaCollectionAsync()
     {
       var schemaColl = await Connection.GetSchemaCollectionAsync("MetaDataCollections", null);
-      Assert.NotNull(schemaColl);
+      Assert.That(schemaColl, Is.Not.Null);
     }
 
     #endregion
@@ -481,7 +481,7 @@ public void TestPersistSecurityInfoCachingPasswords()
       c.Open();
       c.Close();
       MySqlConnectionStringBuilder afterOpenSettings = new MySqlConnectionStringBuilder(c.ConnectionString);
-      Assert.AreEqual(connStr.Password, afterOpenSettings.Password);
+      Assert.That(afterOpenSettings.Password, Is.EqualTo(connStr.Password));
 
       // Persist Security Info = false means that it should not be returned
       connStr.PersistSecurityInfo = false;
@@ -489,7 +489,7 @@ public void TestPersistSecurityInfoCachingPasswords()
       c.Open();
       c.Close();
       afterOpenSettings = new MySqlConnectionStringBuilder(c.ConnectionString);
-      Assert.True(String.IsNullOrEmpty(afterOpenSettings.Password));
+      Assert.That(String.IsNullOrEmpty(afterOpenSettings.Password));
     }
 
     /// <summary>
@@ -505,48 +505,48 @@ public void CloneConnectionDisclosePassword()
       MySqlConnection c = new MySqlConnection(connStr.ConnectionString);
 
       // The password, is not returned as part of the connection if the connection is open or has ever been in an open state
-      StringAssert.Contains("password", c.ConnectionString);
+      Assert.That(c.ConnectionString, Does.Contain("password"));
 
       // After open password should not be displayed
       c.Open();
-      StringAssert.DoesNotContain("password", c.ConnectionString);
+      Assert.That(c.ConnectionString, Does.Not.Contain("password"));
 
       // Verify clone from open connection should not show password
       var cloneConnection = (MySqlConnection)c.Clone();
-      StringAssert.DoesNotContain("password", cloneConnection.ConnectionString);
+      Assert.That(cloneConnection.ConnectionString, Does.Not.Contain("password"));
 
       // After close connection the password should not be displayed
       c.Close();
-      StringAssert.DoesNotContain("password", c.ConnectionString);
+      Assert.That(c.ConnectionString, Does.Not.Contain("password"));
 
       // Verify clone connection doesn't show password after open connection
       cloneConnection.Open();
-      StringAssert.DoesNotContain("password", cloneConnection.ConnectionString);
+      Assert.That(cloneConnection.ConnectionString, Does.Not.Contain("password"));
 
       // Verify clone connection doesn't show password after close connection
       cloneConnection.Close();
-      StringAssert.DoesNotContain("password", cloneConnection.ConnectionString);
+      Assert.That(cloneConnection.ConnectionString, Does.Not.Contain("password"));
 
       // Verify password for a clone of closed connection, password should appears
       var closedConnection = new MySqlConnection(connStr.ConnectionString);
       var cloneClosed = (MySqlConnection)closedConnection.Clone();
-      StringAssert.Contains("password", cloneClosed.ConnectionString);
+      Assert.That(cloneClosed.ConnectionString, Does.Contain("password"));
 
       // Open connection of a closed connection clone, password should be empty
-      Assert.False(cloneClosed.hasBeenOpen);
+      Assert.That(cloneClosed.hasBeenOpen, Is.False);
       cloneClosed.Open();
-      StringAssert.DoesNotContain("password", cloneClosed.ConnectionString);
-      Assert.True(cloneClosed.hasBeenOpen);
+      Assert.That(cloneClosed.ConnectionString, Does.Not.Contain("password"));
+      Assert.That(cloneClosed.hasBeenOpen);
 
       // Close connection of a closed connection clone, password should be empty
       cloneClosed.Close();
-      StringAssert.DoesNotContain("password", cloneClosed.ConnectionString);
+      Assert.That(cloneClosed.ConnectionString, Does.Not.Contain("password"));
 
       // Clone Password shloud be present if PersistSecurityInfo is true
       connStr.PersistSecurityInfo = true;
       c = new MySqlConnection(connStr.ConnectionString);
       cloneConnection = (MySqlConnection)c.Clone();
-      StringAssert.Contains("password", cloneConnection.ConnectionString);
+      Assert.That(cloneConnection.ConnectionString, Does.Contain("password"));
     }
 
     [Test]
@@ -561,9 +561,9 @@ public void ConnectionTimeout()
 
       DateTime start = DateTime.Now;
       var ex = Assert.Throws<MySqlException>(() => c.Open());
-      Assert.True(ex.InnerException.InnerException is TimeoutException);
+      Assert.That(ex.InnerException.InnerException is TimeoutException);
       TimeSpan diff = DateTime.Now.Subtract(start);
-      Assert.True(diff.TotalSeconds < 6, $"Timeout exceeded: {diff.TotalSeconds}");
+      Assert.That(diff.TotalSeconds < 6, $"Timeout exceeded: {diff.TotalSeconds}");
     }
 
     [Test]
@@ -624,12 +624,12 @@ public void PersistSecurityInfo()
       MySqlConnectionStringBuilder connStr = new MySqlConnectionStringBuilder(Connection.ConnectionString);
       connStr.PersistSecurityInfo = false;
 
-      Assert.False(String.IsNullOrEmpty(connStr.Password));
+      Assert.That(String.IsNullOrEmpty(connStr.Password), Is.False);
       MySqlConnection c = new MySqlConnection(connStr.GetConnectionString(true));
       c.Open();
       c.Close();
       connStr = new MySqlConnectionStringBuilder(c.ConnectionString);
-      Assert.True(String.IsNullOrEmpty(connStr.Password));
+      Assert.That(String.IsNullOrEmpty(connStr.Password));
     }
 
     /// <summary>
@@ -657,13 +657,13 @@ public void CanOpenConnectionAfterAborting()
     {
       MySqlConnection connection = new MySqlConnection(Connection.ConnectionString);
       connection.Open();
-      Assert.AreEqual(ConnectionState.Open, connection.State);
+      Assert.That(connection.State, Is.EqualTo(ConnectionState.Open));
 
       connection.AbortAsync(false).GetAwaiter().GetResult();
-      Assert.AreEqual(ConnectionState.Closed, connection.State);
+      Assert.That(connection.State, Is.EqualTo(ConnectionState.Closed));
 
       connection.Open();
-      Assert.AreEqual(ConnectionState.Open, connection.State);
+      Assert.That(connection.State, Is.EqualTo(ConnectionState.Open));
 
       connection.Close();
     }
@@ -681,7 +681,7 @@ public void ConnectAttributes()
 
       MySqlCommand cmd = new MySqlCommand("SELECT * FROM performance_schema.session_connect_attrs WHERE PROCESSLIST_ID = connection_id()", Connection);
       MySqlDataReader dr = cmd.ExecuteReader();
-      Assert.True(dr.HasRows, "No session_connect_attrs found");
+      Assert.That(dr.HasRows, "No session_connect_attrs found");
       MySqlConnectAttrs connectAttrs = new MySqlConnectAttrs();
       bool isValidated = false;
       using (dr)
@@ -690,13 +690,13 @@ public void ConnectAttributes()
         {
           if (dr.GetString(1).ToLowerInvariant().Contains("_client_name"))
           {
-            Assert.AreEqual(connectAttrs.ClientName, dr.GetString(2));
+            Assert.That(dr.GetString(2), Is.EqualTo(connectAttrs.ClientName));
             isValidated = true;
             break;
           }
         }
       }
-      Assert.True(isValidated, "Missing _client_name attribute");
+      Assert.That(isValidated, "Missing _client_name attribute");
     }
 
     /// <summary>
@@ -727,7 +727,7 @@ public void PasswordExpiration()
 
         cmd.CommandText = "SELECT 1";
         MySqlException ex = Assert.Throws<MySqlException>(() => cmd.ExecuteScalar());
-        Assert.AreEqual(1820, ex.Number);
+        Assert.That(ex.Number, Is.EqualTo(1820));
 
         if (Version >= new Version(5, 7, 6))
           cmd.CommandText = string.Format("SET PASSWORD = '{0}1'", _EXPIRED_USER);
@@ -754,7 +754,7 @@ public void TestNonSupportedOptions()
       using (MySqlConnection c = new MySqlConnection(connstr))
       {
         c.Open();
-        Assert.AreEqual(ConnectionState.Open, c.State);
+        Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
       }
     }
 
@@ -773,7 +773,7 @@ public void IPv6Connection()
       using (MySqlConnection conn = new MySqlConnection(sb.ToString()))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.State);
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
       }
     }
 
@@ -793,10 +793,10 @@ public void ExpiredPassword(string sql)
       using (MySqlConnection conn = new MySqlConnection(sb.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.State);
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
         MySqlCommand cmd = new MySqlCommand(sql, conn);
         var ex = Assert.Throws<MySqlException>(() => cmd.ExecuteNonQuery());
-        Assert.AreEqual(1820, ex.Number);
+        Assert.That(ex.Number, Is.EqualTo(1820));
       }
     }
 
@@ -835,7 +835,7 @@ public void ExpiredPwdWithOldPassword()
       {
         conn.Open();
         MySqlCommand cmd = new MySqlCommand("SELECT 8", conn);
-        StringAssert.StartsWith("8", cmd.ExecuteScalar().ToString());
+        Assert.That(cmd.ExecuteScalar().ToString(), Does.StartWith("8"));
       }
 
       sb.Password = expiredPwd;
@@ -869,7 +869,7 @@ public void ConnectUsingNamedPipes()
       // Named Pipes connection protocol is not allowed to use SSL connections.
       using var conn = new MySqlConnection(sb.ConnectionString);
       var ex = Assert.Throws<MySqlException>(() => conn.Open());
-      StringAssert.AreEqualIgnoringCase(string.Format(Resources.SslNotAllowedForConnectionProtocol, sb.ConnectionProtocol), ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(string.Format(Resources.SslNotAllowedForConnectionProtocol, sb.ConnectionProtocol)).IgnoreCase);
     }
 
     /// <summary>
@@ -941,7 +941,7 @@ public void ConnectUsingSharedMemory()
       using (var conn = new MySqlConnection(sb.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.State);
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
       }
 
       // Shared Memory connection protocol is not allowed to use SSL connections.
@@ -949,7 +949,7 @@ public void ConnectUsingSharedMemory()
       using (var conn = new MySqlConnection(sb.ConnectionString))
       {
         var ex = Assert.Throws<MySqlException>(() => conn.Open());
-        StringAssert.AreEqualIgnoringCase(string.Format(Resources.SslNotAllowedForConnectionProtocol, sb.ConnectionProtocol), ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(string.Format(Resources.SslNotAllowedForConnectionProtocol, sb.ConnectionProtocol)).IgnoreCase);
       }
     }
 
@@ -1199,7 +1199,7 @@ public void MediumTextMalformedPkg()
 
       string fullQuery = string.Format(query, sb.ToString(0, sb.Length - 2));
       var res = MySqlHelper.ExecuteNonQuery(Connection.ConnectionString + ";ssl-mode=none", fullQuery, mySqlParameters.ToArray());
-      Assert.AreEqual(res, 40000);
+      Assert.That(40000, Is.EqualTo(res));
 
       ExecuteSQL("SET GLOBAL max_allowed_packet=1024000");
       ExecuteSQL($"DROP TABLE `{Settings.Database}`.`testmalformed`;");
@@ -1225,9 +1225,9 @@ public void CompressionUnit()
             {
               if (i == 0)
               {
-                Assert.AreEqual("ON", reader.GetString(1));
+                Assert.That(reader.GetString(1), Is.EqualTo("ON"));
               }
-              Assert.IsNotNull(reader.GetString(1));
+              Assert.That(reader.GetString(1), Is.Not.Null);
               i++;
             }
           }
@@ -1242,7 +1242,7 @@ public void CompressionUnit()
           {
             while (reader.Read())
             {
-              Assert.IsNotNull(reader.GetString(0));
+              Assert.That(reader.GetString(0), Is.Not.Null);
               i++;
             }
           }
@@ -1266,9 +1266,9 @@ public void CompressionUnit()
             {
               if (i == 0)
               {
-                Assert.AreEqual("OFF", reader.GetString(1));
+                Assert.That(reader.GetString(1), Is.EqualTo("OFF"));
               }
-              Assert.IsNotNull(reader.GetString(1));
+              Assert.That(reader.GetString(1), Is.Not.Null);
               i++;
             }
           }
@@ -1284,7 +1284,7 @@ public void CompressionUnit()
           {
             while (reader.Read())
             {
-              Assert.IsNotNull(reader.GetString(0));
+              Assert.That(reader.GetString(0), Is.Not.Null);
               i++;
             }
           }
@@ -1310,7 +1310,7 @@ public void CompressionValidationInClassicProtocol()
           }
 
           dbConn.Open();
-          Assert.AreEqual(ConnectionState.Open, dbConn.State);
+          Assert.That(dbConn.State, Is.EqualTo(ConnectionState.Open));
           MySqlCommand cmd = new MySqlCommand();
           cmd.Connection = dbConn;
           cmd.CommandText = "select * from performance_schema.session_status where variable_name like 'COMPRESSION%' order by 1";
@@ -1327,14 +1327,14 @@ public void CompressionValidationInClassicProtocol()
                   {
                     // Compression should have been set to OFF as UseCompression is set to True in connection string but server is 
                     // started with uncompressed and uncompressed/zstd
-                    Assert.AreEqual("OFF", reader.GetString(1));
+                    Assert.That(reader.GetString(1), Is.EqualTo("OFF"));
                   }
                   else
                   {
-                    Assert.AreEqual("ON", reader.GetString(1));
+                    Assert.That(reader.GetString(1), Is.EqualTo("ON"));
                   }
                 }
-                Assert.IsNotNull(reader.GetString(1));
+                Assert.That(reader.GetString(1), Is.Not.Null);
                 i++;
               }
             }
@@ -1349,7 +1349,7 @@ public void CompressionValidationInClassicProtocol()
             {
               while (reader.Read())
               {
-                Assert.AreEqual(compressionAlgorithms[k], reader.GetString(0));
+                Assert.That(reader.GetString(0), Is.EqualTo(compressionAlgorithms[k]));
                 i++;
               }
             }
@@ -1380,7 +1380,7 @@ public void CompressionValidationInClassicProtocol()
           }
 
           dbConn.Open();
-          Assert.AreEqual(ConnectionState.Open, dbConn.State);
+          Assert.That(dbConn.State, Is.EqualTo(ConnectionState.Open));
           MySqlCommand cmd = new MySqlCommand();
           cmd.Connection = dbConn;
           cmd.CommandText = "select * from performance_schema.session_status where variable_name like 'COMPRESSION%' order by 1";
@@ -1393,9 +1393,9 @@ public void CompressionValidationInClassicProtocol()
               {
                 if (i == 0)
                 {
-                  Assert.AreEqual("OFF", reader.GetString(1));
+                  Assert.That(reader.GetString(1), Is.EqualTo("OFF"));
                 }
-                Assert.IsNotNull(reader.GetString(1));
+                Assert.That(reader.GetString(1), Is.Not.Null);
                 i++;
               }
             }
@@ -1410,7 +1410,7 @@ public void CompressionValidationInClassicProtocol()
             {
               while (reader.Read())
               {
-                Assert.AreEqual(compressionAlgorithms[k], reader.GetString(0));
+                Assert.That(reader.GetString(0), Is.EqualTo(compressionAlgorithms[k]));
                 i++;
               }
             }
@@ -1514,7 +1514,7 @@ public void ExpiredPasswordBug3()
       using (MySqlConnection conn = new MySqlConnection(sb.ConnectionString))
       {
         conn.Open();
-        Assert.True(conn.IsPasswordExpired);
+        Assert.That(conn.IsPasswordExpired);
       }
 
       ExecuteSQL($"ALTER USER '{_EXPIRED_USER}'@'{host}' Identified BY '{_newPwd}'");
@@ -1532,9 +1532,9 @@ public void ExpiredPasswordBug3()
         using (var rdr = cmd.ExecuteReader())
         {
           while (rdr.Read())
-            Assert.IsNotNull(rdr[0].ToString());
+            Assert.That(rdr[0].ToString(), Is.Not.Null);
         }
-        Assert.False(conn.IsPasswordExpired);
+        Assert.That(conn.IsPasswordExpired, Is.False);
       }
     }
 
@@ -1556,7 +1556,7 @@ public void ExpiredPasswordBug4()
       using (MySqlConnection conn = new MySqlConnection(sb.ConnectionString))
       {
         conn.Open();
-        Assert.True(conn.IsPasswordExpired);
+        Assert.That(conn.IsPasswordExpired);
       }
 
       ExecuteSQL($"set password for {expiredFull}='{_newPwd}'");
@@ -1575,9 +1575,9 @@ public void ExpiredPasswordBug4()
           using (var rdr = cmd.ExecuteReader())
           {
             while (rdr.Read())
-              Assert.IsNotNull(rdr[0].ToString());
+              Assert.That(rdr[0].ToString(), Is.Not.Null);
           }
-          Assert.False(conn.IsPasswordExpired);
+          Assert.That(conn.IsPasswordExpired, Is.False);
         }
 
         sb.UserID = _EXPIRED_USER;
@@ -1598,7 +1598,7 @@ public void InvalidConnectTimeoutParameter()
       connStr = $"server={Settings.Server};user={Settings.UserID};port={Settings.Port};password={Settings.Password};connectiontimeout=10000";
       using (var conn = new MySqlConnection(connStr))
       {
-        Assert.IsInstanceOf<MySqlConnection>(conn);
+        Assert.That(conn, Is.InstanceOf<MySqlConnection>());
       }
     }
 
@@ -1607,9 +1607,9 @@ public void ConnectionDispose()
     {
       MySqlConnection conn = new MySqlConnection(Settings.ConnectionString);
       conn.Open();
-      Assert.AreEqual(ConnectionState.Open, conn.connectionState);
+      Assert.That(conn.connectionState, Is.EqualTo(ConnectionState.Open));
       conn.Dispose();
-      Assert.AreEqual(ConnectionState.Closed, conn.connectionState);
+      Assert.That(conn.connectionState, Is.EqualTo(ConnectionState.Closed));
     }
 
     [Test]
@@ -1620,7 +1620,7 @@ public void ConnectionPasswordException()
       using (var conn = new MySqlConnection(myConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.State);
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
       }
 
       myConnectionString = $"server={Host};user={Settings.UserID};port={Port};password=wrong";
@@ -1628,7 +1628,7 @@ public void ConnectionPasswordException()
       {
         var ex = Assert.Throws<MySqlException>(() => conn.Open());
         code = ((MySqlException)ex.GetBaseException()).Number;
-        Assert.AreEqual(1045, code);
+        Assert.That(code, Is.EqualTo(1045));
       }
     }
 
@@ -1727,7 +1727,7 @@ private void ExecuteQueriesSuccess(string sql, string password)
       using (MySqlConnection conn = new MySqlConnection(sb.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.State);
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
         MySqlCommand cmd = new MySqlCommand(sql, conn);
         cmd.ExecuteNonQuery();
       }
@@ -1742,7 +1742,7 @@ private void ExecuteQueriesFail(string sql, string user, string password)
       using (MySqlConnection conn = new MySqlConnection(sb.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.State);
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
         MySqlCommand cmd = new MySqlCommand(sql, conn);
         Assert.Throws<MySqlException>(() => cmd.ExecuteNonQuery());
       }
@@ -1758,7 +1758,7 @@ private void SetupExpirePasswordExecuteQueriesFail(string sql, string password)
       using (MySqlConnection conn = new MySqlConnection(sb.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.State);
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
         MySqlCommand cmd = new MySqlCommand(sql, conn);
         Assert.Throws<MySqlException>(() => cmd.ExecuteNonQuery());
       }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
index 25b9e198c..acb1cea84 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
@@ -65,19 +65,19 @@ private void InternalBytesAndBooleans(bool prepare)
       if (prepare) cmd.Prepare();
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
+        Assert.That(reader.Read());
         Assert.Throws<OverflowException>(() => reader.GetByte(0));
-        Assert.AreEqual(140, reader.GetByte(1));
-        Assert.True(reader.GetBoolean(1));
-        Assert.AreEqual(20, Convert.ToInt32(reader.GetUInt32(2)));
-        Assert.AreEqual(20, reader.GetInt32(2));
+        Assert.That(reader.GetByte(1), Is.EqualTo(140));
+        Assert.That(reader.GetBoolean(1));
+        Assert.That(Convert.ToInt32(reader.GetUInt32(2)), Is.EqualTo(20));
+        Assert.That(reader.GetInt32(2), Is.EqualTo(20));
 
-        Assert.True(reader.Read());
-        Assert.AreEqual(0, reader.GetByte(0));
-        Assert.AreEqual(0, reader.GetByte(1));
-        Assert.False(reader.GetBoolean(1));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetByte(0), Is.EqualTo(0));
+        Assert.That(reader.GetByte(1), Is.EqualTo(0));
+        Assert.That(reader.GetBoolean(1), Is.False);
 
-        Assert.False(reader.Read());
+        Assert.That(reader.Read(), Is.False);
       }
     }
 
@@ -98,21 +98,21 @@ public void TreatTinyAsBool()
       ExecuteSQL("INSERT INTO Test2 VALUES(0)");
       ExecuteSQL("INSERT INTO Test2 VALUES(2)");
       MySqlConnectionStringBuilder builder = new MySqlConnectionStringBuilder(Connection.ConnectionString);
-      Assert.True(builder.TreatTinyAsBoolean);
+      Assert.That(builder.TreatTinyAsBoolean);
 
       MySqlCommand cmd = new MySqlCommand("SELECT * from Test2", Connection);
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         bool b;
-        Assert.True(reader.Read());
+        Assert.That(reader.Read());
         b = (bool)reader.GetValue(0);
-        Assert.True(b);
-        Assert.True(reader.Read());
+        Assert.That(b);
+        Assert.That(reader.Read());
         b = (bool)reader.GetValue(0);
-        Assert.False(b);
-        Assert.True(reader.Read());
+        Assert.That(b, Is.False);
+        Assert.That(reader.Read());
         b = (bool)reader.GetValue(0);
-        Assert.True(b);
+        Assert.That(b);
       }
     }
 
@@ -142,28 +142,28 @@ private void InternalTestFloats(bool prepared)
       if (prepared)
         cmd.Prepare();
       int count = cmd.ExecuteNonQuery();
-      Assert.AreEqual(1, count);
+      Assert.That(count, Is.EqualTo(1));
 
       cmd.Parameters[0].Value = 1.5;
       cmd.Parameters[1].Value = 47.85;
       cmd.Parameters[2].Value = 123.85;
       count = cmd.ExecuteNonQuery();
-      Assert.AreEqual(1, count);
+      Assert.That(count, Is.EqualTo(1));
 
       cmd.CommandText = "SELECT * FROM Test";
       if (prepared)
         cmd.Prepare();
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.True((decimal)2.3 == (decimal)reader.GetFloat(0));
-        Assert.AreEqual(4.6, reader.GetDouble(1));
-        Assert.True((decimal)23.82 == reader.GetDecimal(2));
-
-        Assert.True(reader.Read());
-        Assert.True((decimal)1.5 == (decimal)reader.GetFloat(0));
-        Assert.AreEqual(47.85, reader.GetDouble(1));
-        Assert.True((decimal)123.85 == reader.GetDecimal(2));
+        Assert.That(reader.Read());
+        Assert.That((decimal)2.3 == (decimal)reader.GetFloat(0));
+        Assert.That(reader.GetDouble(1), Is.EqualTo(4.6));
+        Assert.That((decimal)23.82 == reader.GetDecimal(2));
+
+        Assert.That(reader.Read());
+        Assert.That((decimal)1.5 == (decimal)reader.GetFloat(0));
+        Assert.That(reader.GetDouble(1), Is.EqualTo(47.85));
+        Assert.That((decimal)123.85 == reader.GetDecimal(2));
       }
     }
 
@@ -183,20 +183,20 @@ public void TestTime()
         reader.Read();
 
         object value = reader["tm"];
-        Assert.AreEqual(typeof(TimeSpan), value.GetType());
+        Assert.That(value.GetType(), Is.EqualTo(typeof(TimeSpan)));
         TimeSpan ts = (TimeSpan)reader["tm"];
-        Assert.AreEqual(0, ts.Hours);
-        Assert.AreEqual(0, ts.Minutes);
-        Assert.AreEqual(0, ts.Seconds);
+        Assert.That(ts.Hours, Is.EqualTo(0));
+        Assert.That(ts.Minutes, Is.EqualTo(0));
+        Assert.That(ts.Seconds, Is.EqualTo(0));
 
         reader.Read();
         value = reader["tm"];
-        Assert.AreEqual(typeof(TimeSpan), value.GetType());
+        Assert.That(value.GetType(), Is.EqualTo(typeof(TimeSpan)));
         ts = (TimeSpan)reader["tm"];
-        Assert.AreEqual(21, ts.Days);
-        Assert.AreEqual(8, ts.Hours);
-        Assert.AreEqual(45, ts.Minutes);
-        Assert.AreEqual(17, ts.Seconds);
+        Assert.That(ts.Days, Is.EqualTo(21));
+        Assert.That(ts.Hours, Is.EqualTo(8));
+        Assert.That(ts.Minutes, Is.EqualTo(45));
+        Assert.That(ts.Seconds, Is.EqualTo(17));
       }
     }
 
@@ -214,13 +214,13 @@ public void YearType()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.True(1998 == reader.GetUInt32(0));
+        Assert.That(1998 == reader.GetUInt32(0));
         reader.Read();
-        Assert.True(1990 == reader.GetUInt32(0));
+        Assert.That(1990 == reader.GetUInt32(0));
         reader.Read();
-        Assert.True(2004 == reader.GetUInt32(0));
+        Assert.That(2004 == reader.GetUInt32(0));
         reader.Read();
-        Assert.True(0 == reader.GetUInt32(0));
+        Assert.That(0 == reader.GetUInt32(0));
       }
     }
 
@@ -228,16 +228,16 @@ public void YearType()
     public void TypeCoercion()
     {
       MySqlParameter p = new MySqlParameter("?test", 1);
-      Assert.AreEqual(DbType.Int32, p.DbType);
-      Assert.AreEqual(MySqlDbType.Int32, p.MySqlDbType);
+      Assert.That(p.DbType, Is.EqualTo(DbType.Int32));
+      Assert.That(p.MySqlDbType, Is.EqualTo(MySqlDbType.Int32));
 
       p.DbType = DbType.Int64;
-      Assert.AreEqual(DbType.Int64, p.DbType);
-      Assert.AreEqual(MySqlDbType.Int64, p.MySqlDbType);
+      Assert.That(p.DbType, Is.EqualTo(DbType.Int64));
+      Assert.That(p.MySqlDbType, Is.EqualTo(MySqlDbType.Int64));
 
       p.MySqlDbType = MySqlDbType.Int16;
-      Assert.AreEqual(DbType.Int16, p.DbType);
-      Assert.AreEqual(MySqlDbType.Int16, p.MySqlDbType);
+      Assert.That(p.DbType, Is.EqualTo(DbType.Int16));
+      Assert.That(p.MySqlDbType, Is.EqualTo(MySqlDbType.Int16));
     }
 
     [Test]
@@ -288,18 +288,18 @@ public void BitAndDecimal()
         MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", c);
         using (MySqlDataReader reader = cmd.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          Assert.AreEqual(2, reader.GetInt32(0));
-          Assert.AreEqual(3, reader.GetInt32(1));
-          Assert.AreEqual(120, reader.GetInt32(2));
-          Assert.AreEqual(240, reader.GetInt32(3));
-          Assert.AreEqual(1000, reader.GetInt32(4));
-          Assert.True(reader.Read());
-          Assert.True(reader.IsDBNull(0));
-          Assert.True(reader.IsDBNull(1));
-          Assert.AreEqual(100, reader.GetInt32(2));
-          Assert.True(reader.IsDBNull(3));
-          Assert.True(reader.IsDBNull(4));
+          Assert.That(reader.Read());
+          Assert.That(reader.GetInt32(0), Is.EqualTo(2));
+          Assert.That(reader.GetInt32(1), Is.EqualTo(3));
+          Assert.That(reader.GetInt32(2), Is.EqualTo(120));
+          Assert.That(reader.GetInt32(3), Is.EqualTo(240));
+          Assert.That(reader.GetInt32(4), Is.EqualTo(1000));
+          Assert.That(reader.Read());
+          Assert.That(reader.IsDBNull(0));
+          Assert.That(reader.IsDBNull(1));
+          Assert.That(reader.GetInt32(2), Is.EqualTo(100));
+          Assert.That(reader.IsDBNull(3));
+          Assert.That(reader.IsDBNull(4));
         }
       }
     }
@@ -311,24 +311,24 @@ public void DecimalTests()
 
       MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES(?dec)", Connection);
       cmd.Parameters.AddWithValue("?dec", (decimal)2.4);
-      Assert.AreEqual(1, cmd.ExecuteNonQuery());
+      Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(1));
 
       cmd.Prepare();
-      Assert.AreEqual(1, cmd.ExecuteNonQuery());
+      Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(1));
 
       cmd.CommandText = "SELECT * FROM Test";
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.True(reader[0] is Decimal);
-        Assert.AreEqual((decimal)2.4, Convert.ToDecimal(reader[0]));
+        Assert.That(reader.Read());
+        Assert.That(reader[0] is Decimal);
+        Assert.That(Convert.ToDecimal(reader[0]), Is.EqualTo((decimal)2.4));
 
-        Assert.True(reader.Read());
-        Assert.True(reader[0] is Decimal);
-        Assert.AreEqual((decimal)2.4, Convert.ToDecimal(reader[0]));
+        Assert.That(reader.Read());
+        Assert.That(reader[0] is Decimal);
+        Assert.That(Convert.ToDecimal(reader[0]), Is.EqualTo((decimal)2.4));
 
-        Assert.False(reader.Read());
-        Assert.False(reader.NextResult());
+        Assert.That(reader.Read(), Is.False);
+        Assert.That(reader.NextResult(), Is.False);
       }
     }
 
@@ -339,24 +339,24 @@ public void DecimalTests2()
 
       MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES(?dec)", Connection);
       cmd.Parameters.AddWithValue("?dec", (decimal)2.4);
-      Assert.AreEqual(1, cmd.ExecuteNonQuery());
+      Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(1));
 
       cmd.Prepare();
-      Assert.AreEqual(1, cmd.ExecuteNonQuery());
+      Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(1));
 
       cmd.CommandText = "SELECT * FROM Test";
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.True(reader[0] is Decimal);
-        Assert.AreEqual((decimal)2.4, Convert.ToDecimal(reader[0]));
+        Assert.That(reader.Read());
+        Assert.That(reader[0] is Decimal);
+        Assert.That(Convert.ToDecimal(reader[0]), Is.EqualTo((decimal)2.4));
 
-        Assert.True(reader.Read());
-        Assert.True(reader[0] is Decimal);
-        Assert.AreEqual((decimal)2.4, Convert.ToDecimal(reader[0]));
+        Assert.That(reader.Read());
+        Assert.That(reader[0] is Decimal);
+        Assert.That(Convert.ToDecimal(reader[0]), Is.EqualTo((decimal)2.4));
 
-        Assert.False(reader.Read());
-        Assert.False(reader.NextResult());
+        Assert.That(reader.Read(), Is.False);
+        Assert.That(reader.NextResult(), Is.False);
       }
     }
 
@@ -379,10 +379,10 @@ public void Bit()
       cmd.Prepare();
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual(1, Convert.ToInt32(reader[0]));
-        Assert.AreEqual(2, Convert.ToInt32(reader[1]));
-        Assert.AreEqual(3, Convert.ToInt32(reader[2]));
+        Assert.That(reader.Read());
+        Assert.That(Convert.ToInt32(reader[0]), Is.EqualTo(1));
+        Assert.That(Convert.ToInt32(reader[1]), Is.EqualTo(2));
+        Assert.That(Convert.ToInt32(reader[2]), Is.EqualTo(3));
       }
     }
 
@@ -400,10 +400,10 @@ public void UsingInt24InPreparedStatement(bool prepare, int value)
           command.Parameters.AddWithValue("@data", value).MySqlDbType = MySqlDbType.Int24;
           if (prepare) command.Prepare();
           var rowsAffected = command.ExecuteNonQuery();
-          Assert.AreEqual(1, rowsAffected);
+        Assert.That(rowsAffected, Is.EqualTo(1));
           command.CommandText = "SELECT data FROM Test";
           var data = command.ExecuteScalar();
-          Assert.AreEqual(value, data);
+        Assert.That(data, Is.EqualTo(value));
         }
     }
 
@@ -438,9 +438,9 @@ public void TestNegativeTime()
       {
         reader.Read();
         TimeSpan ts = reader.GetTimeSpan("t");
-        Assert.AreEqual(-7, ts.Hours);
-        Assert.AreEqual(-24, ts.Minutes);
-        Assert.AreEqual(0, ts.Seconds);
+        Assert.That(ts.Hours, Is.EqualTo(-7));
+        Assert.That(ts.Minutes, Is.EqualTo(-24));
+        Assert.That(ts.Seconds, Is.EqualTo(0));
       }
     }
 
@@ -456,9 +456,9 @@ public void BinaryAndVarBinary()
         reader.Read();
         byte[] buffer = new byte[2];
         long read = reader.GetBytes(0, 0, buffer, 0, 2);
-        Assert.AreEqual('s', (char)buffer[0]);
-        Assert.AreEqual('o', (char)buffer[1]);
-        Assert.AreEqual(2, read);
+        Assert.That((char)buffer[0], Is.EqualTo('s'));
+        Assert.That((char)buffer[1], Is.EqualTo('o'));
+        Assert.That(read, Is.EqualTo(2));
 
       }
     }
@@ -470,10 +470,10 @@ public void NumericAsBinary()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual("BIGINT", reader.GetDataTypeName(0));
-        Assert.AreEqual(typeof(Int64), reader.GetFieldType(0));
-        Assert.AreEqual("System.Int64", reader.GetValue(0).GetType().FullName);
-        Assert.AreEqual(0, Convert.ToInt32(reader.GetValue(0)));
+        Assert.That(reader.GetDataTypeName(0), Is.EqualTo("BIGINT"));
+        Assert.That(reader.GetFieldType(0), Is.EqualTo(typeof(Int64)));
+        Assert.That(reader.GetValue(0).GetType().FullName, Is.EqualTo("System.Int64"));
+        Assert.That(Convert.ToInt32(reader.GetValue(0)), Is.EqualTo(0));
       }
     }
 
@@ -487,11 +487,11 @@ public void BinaryTypes()
       using (var reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual(typeof(String), reader.GetFieldType("c1"));
-        Assert.AreEqual(typeof(byte[]), reader.GetFieldType("c2"));
-        Assert.AreEqual(typeof(String), reader.GetFieldType("c3"));
-        Assert.AreEqual(typeof(byte[]), reader.GetFieldType("c4"));
-        Assert.AreEqual(typeof(byte[]), reader.GetFieldType("c5"));
+        Assert.That(reader.GetFieldType("c1"), Is.EqualTo(typeof(String)));
+        Assert.That(reader.GetFieldType("c2"), Is.EqualTo(typeof(byte[])));
+        Assert.That(reader.GetFieldType("c3"), Is.EqualTo(typeof(String)));
+        Assert.That(reader.GetFieldType("c4"), Is.EqualTo(typeof(byte[])));
+        Assert.That(reader.GetFieldType("c5"), Is.EqualTo(typeof(byte[])));
       }
     }
 
@@ -508,8 +508,8 @@ AS TRUE_DEFAULT FROM INFORMATION_SCHEMA.COLUMNS
       using (var reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual(typeof(string), reader.GetFieldType(0));
-        Assert.AreEqual(typeof(Int64), reader.GetFieldType(1));
+        Assert.That(reader.GetFieldType(0), Is.EqualTo(typeof(string)));
+        Assert.That(reader.GetFieldType(1), Is.EqualTo(typeof(Int64)));
       }
     }
 
@@ -527,8 +527,8 @@ public void RespectBinaryFlag()
         using (var reader = cmd.ExecuteReader())
         {
           reader.Read();
-          Assert.AreEqual(typeof(string), reader.GetFieldType(0));
-          Assert.AreEqual(typeof(System.Byte[]), reader.GetFieldType(1));
+          Assert.That(reader.GetFieldType(0), Is.EqualTo(typeof(string)));
+          Assert.That(reader.GetFieldType(1), Is.EqualTo(typeof(System.Byte[])));
         }
       }
     }
@@ -546,14 +546,14 @@ public void Boolean()
       using (var reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual(typeof(Boolean), reader.GetFieldType(1));
-        Assert.AreEqual(typeof(SByte), reader.GetFieldType(2));
-        Assert.True(reader.GetBoolean(1));
-        Assert.AreEqual(1, Convert.ToInt32(reader.GetValue(2)));
+        Assert.That(reader.GetFieldType(1), Is.EqualTo(typeof(Boolean)));
+        Assert.That(reader.GetFieldType(2), Is.EqualTo(typeof(SByte)));
+        Assert.That(reader.GetBoolean(1));
+        Assert.That(Convert.ToInt32(reader.GetValue(2)), Is.EqualTo(1));
 
         reader.Read();
-        Assert.False(reader.GetBoolean(1));
-        Assert.AreEqual(0, Convert.ToInt32(reader.GetValue(2)));
+        Assert.That(reader.GetBoolean(1), Is.False);
+        Assert.That(Convert.ToInt32(reader.GetValue(2)), Is.EqualTo(0));
       }
     }
 
@@ -579,10 +579,10 @@ public void Binary16AsGuid()
         using (var reader = cmd2.ExecuteReader())
         {
           reader.Read();
-          Assert.AreEqual(typeof(Guid), reader.GetFieldType(1));
-          Assert.AreEqual(typeof(byte[]), reader.GetFieldType(2));
-          Assert.AreEqual(typeof(byte[]), reader.GetFieldType(3));
-          Assert.AreEqual(g, reader.GetGuid(1));
+          Assert.That(reader.GetFieldType(1), Is.EqualTo(typeof(Guid)));
+          Assert.That(reader.GetFieldType(2), Is.EqualTo(typeof(byte[])));
+          Assert.That(reader.GetFieldType(3), Is.EqualTo(typeof(byte[])));
+          Assert.That(reader.GetGuid(1), Is.EqualTo(g));
         }
 
         string s = BitConverter.ToString(bytes);
@@ -597,7 +597,7 @@ public void Binary16AsGuid()
         {
           reader.Read();
           Guid g1 = reader.GetGuid(1);
-          Assert.AreEqual(g, g1);
+          Assert.That(g1, Is.EqualTo(g));
         }
       }
     }
@@ -641,22 +641,22 @@ Enabled bit(1) NOT NULL, PRIMARY KEY (`Id`))
         LEFT OUTER JOIN Child c ON m.Id=c.MainId ORDER BY m.Descr", Connection);
       using (var reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual("AAA", reader.GetString(0));
-        Assert.True(reader.IsDBNull(1));
-        Assert.True(reader.IsDBNull(2));
-
-        Assert.True(reader.Read());
-        Assert.AreEqual("BBB", reader.GetString(0));
-        Assert.AreEqual(12345, Convert.ToInt32(reader.GetValue(1)));
-        Assert.AreEqual(1, Convert.ToInt32(reader.GetValue(2)));
-
-        Assert.True(reader.Read());
-        Assert.AreEqual("CCC", reader.GetString(0));
-        Assert.True(reader.IsDBNull(1));
-        Assert.True(reader.IsDBNull(2));
-
-        Assert.False(reader.Read());
+        Assert.That(reader.Read());
+        Assert.That(reader.GetString(0), Is.EqualTo("AAA"));
+        Assert.That(reader.IsDBNull(1));
+        Assert.That(reader.IsDBNull(2));
+
+        Assert.That(reader.Read());
+        Assert.That(reader.GetString(0), Is.EqualTo("BBB"));
+        Assert.That(Convert.ToInt32(reader.GetValue(1)), Is.EqualTo(12345));
+        Assert.That(Convert.ToInt32(reader.GetValue(2)), Is.EqualTo(1));
+
+        Assert.That(reader.Read());
+        Assert.That(reader.GetString(0), Is.EqualTo("CCC"));
+        Assert.That(reader.IsDBNull(1));
+        Assert.That(reader.IsDBNull(2));
+
+        Assert.That(reader.Read(), Is.False);
       }
     }
 
@@ -689,7 +689,7 @@ public void GeometryType()
     public void CanParseGeometryValueString()
     {
       var v = MySqlGeometry.Parse("POINT (47.37 -122.21)");
-      Assert.AreEqual("POINT(47.37 -122.21)", v.ToString());
+      Assert.That(v.ToString(), Is.EqualTo("POINT(47.37 -122.21)"));
     }
 
     [Test]
@@ -697,7 +697,7 @@ public void CanTryParseGeometryValueString()
     {
       MySqlGeometry v = new MySqlGeometry(0, 0);
       MySqlGeometry.TryParse("POINT (47.37 -122.21)", out v);
-      Assert.AreEqual("POINT(47.37 -122.21)", v.ToString());
+      Assert.That(v.ToString(), Is.EqualTo("POINT(47.37 -122.21)"));
     }
 
     [Test]
@@ -705,7 +705,7 @@ public void CanTryParseGeometryValueStringWithSRIDValue()
     {
       var mysqlGeometryResult = new MySqlGeometry(0, 0);
       MySqlGeometry.TryParse("SRID=101;POINT (47.37 -122.21)", out mysqlGeometryResult);
-      Assert.AreEqual("SRID=101;POINT(47.37 -122.21)", mysqlGeometryResult.ToString());
+      Assert.That(mysqlGeometryResult.ToString(), Is.EqualTo("SRID=101;POINT(47.37 -122.21)"));
     }
 
     [Test]
@@ -755,7 +755,7 @@ public void CanFetchGeometryAsBinary()
         reader.Read();
         var val = reader.GetValue(0) as Byte[];
         var MyGeometry = new MySqlGeometry(MySqlDbType.Geometry, val);
-        Assert.AreEqual("POINT(47.37 -122.21)", MyGeometry.ToString());
+        Assert.That(MyGeometry.ToString(), Is.EqualTo("POINT(47.37 -122.21)"));
       }
     }
 
@@ -779,7 +779,7 @@ public void CanSaveSridValueOnGeometry()
       using var reader = cmd.ExecuteReader();
       reader.Read();
       var val = reader.GetInt32(0);
-      Assert.AreEqual(101, val);
+      Assert.That(val, Is.EqualTo(101));
     }
 
     [Test]
@@ -803,7 +803,7 @@ public void CanFetchGeometryAsText()
       {
         reader.Read();
         var val = reader.GetString(0);
-        Assert.AreEqual("POINT(47.37 -122.21)", val);
+        Assert.That(val, Is.EqualTo("POINT(47.37 -122.21)"));
       }
     }
 
@@ -830,8 +830,8 @@ public void CanUseReaderGetMySqlGeometry()
         reader.Read();
         var val = reader.GetMySqlGeometry(0);
         var valWithName = reader.GetMySqlGeometry("v");
-        Assert.AreEqual("POINT(47.37 -122.21)", val.ToString());
-        Assert.AreEqual("POINT(47.37 -122.21)", valWithName.ToString());
+        Assert.That(val.ToString(), Is.EqualTo("POINT(47.37 -122.21)"));
+        Assert.That(valWithName.ToString(), Is.EqualTo("POINT(47.37 -122.21)"));
       }
 
       // reading as geometry
@@ -841,8 +841,8 @@ public void CanUseReaderGetMySqlGeometry()
         reader.Read();
         var val = reader.GetMySqlGeometry(0);
         var valWithName = reader.GetMySqlGeometry("v");
-        Assert.AreEqual("POINT(47.37 -122.21)", val.ToString());
-        Assert.AreEqual("POINT(47.37 -122.21)", valWithName.ToString());
+        Assert.That(val.ToString(), Is.EqualTo("POINT(47.37 -122.21)"));
+        Assert.That(valWithName.ToString(), Is.EqualTo("POINT(47.37 -122.21)"));
       }
 
     }
@@ -852,7 +852,7 @@ public void CanGetToStringFromMySqlGeometry()
     {
       MySqlGeometry v = new MySqlGeometry(47.37, -122.21);
       var valToString = v.ToString();
-      Assert.AreEqual("POINT(47.37 -122.21)", valToString);
+      Assert.That(valToString, Is.EqualTo("POINT(47.37 -122.21)"));
     }
 
     /// <summary>
@@ -864,9 +864,9 @@ public void CanCreateMySqlGeometryFromEmptyGeometryCollection()
       var bytes = new byte[] { 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
       MySqlGeometry v = new MySqlGeometry(MySqlDbType.Geometry, bytes);
 #if !NETFRAMEWORK
-      Assert.AreEqual("POINT(3.5E-323 0)", v.ToString());
+      Assert.That(v.ToString(), Is.EqualTo("POINT(3.5E-323 0)"));
 #else
-      Assert.AreEqual("POINT(3.45845952088873E-323 0)", v.ToString());
+      Assert.That(v.ToString(), Is.EqualTo("POINT(3.45845952088873E-323 0)"));
 #endif
     }
 
@@ -890,8 +890,8 @@ public void CanGetMySqlGeometryFromEmptyGeometryCollection()
         reader.Read();
         var val = reader.GetMySqlGeometry(0);
         var valWithName = reader.GetMySqlGeometry("v");
-        Assert.AreEqual("POINT(0 0)", val.ToString());
-        Assert.AreEqual("POINT(0 0)", valWithName.ToString());
+        Assert.That(val.ToString(), Is.EqualTo("POINT(0 0)"));
+        Assert.That(valWithName.ToString(), Is.EqualTo("POINT(0 0)"));
       }
 
       // reading as geometry
@@ -902,11 +902,11 @@ public void CanGetMySqlGeometryFromEmptyGeometryCollection()
         var val = reader.GetMySqlGeometry(0);
         var valWithName = reader.GetMySqlGeometry("v");
 #if !NETFRAMEWORK
-        Assert.AreEqual("POINT(3.5E-323 0)", val.ToString());
-        Assert.AreEqual("POINT(3.5E-323 0)", valWithName.ToString());
+        Assert.That(val.ToString(), Is.EqualTo("POINT(3.5E-323 0)"));
+        Assert.That(valWithName.ToString(), Is.EqualTo("POINT(3.5E-323 0)"));
 #else
-        Assert.AreEqual("POINT(3.45845952088873E-323 0)", val.ToString());
-        Assert.AreEqual("POINT(3.45845952088873E-323 0)", valWithName.ToString());
+        Assert.That(val.ToString(), Is.EqualTo("POINT(3.45845952088873E-323 0)"));
+        Assert.That(valWithName.ToString(), Is.EqualTo("POINT(3.45845952088873E-323 0)"));
 #endif
       }
     }
@@ -928,7 +928,7 @@ public void Bug30169716()
         command.CommandText = "INSERT INTO geometries(data) VALUES(@data); ";
         command.Parameters.AddWithValue("@data", geometry);
         int result = command.ExecuteNonQuery();
-        Assert.AreEqual(1, result);
+        Assert.That(result, Is.EqualTo(1));
       }
     }
 
@@ -952,7 +952,7 @@ public void StoringAndRetrievingDouble()
       {
         reader.Read();
         double d = reader.GetDouble(0);
-        Assert.AreEqual(Math.PI, d);
+        Assert.That(d, Is.EqualTo(Math.PI));
       }
     }
 
@@ -970,9 +970,9 @@ public void SByteFromReader()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual(99, reader.GetSByte(0));
-        Assert.AreEqual(217, reader.GetByte(1));
-        Assert.AreEqual(99, reader.GetByte(0));
+        Assert.That(reader.GetSByte(0), Is.EqualTo(99));
+        Assert.That(reader.GetByte(1), Is.EqualTo(217));
+        Assert.That(reader.GetByte(0), Is.EqualTo(99));
       }
     }
 
@@ -995,8 +995,8 @@ public void NewGuidDataType()
         using (var reader = cmd.ExecuteReader())
         {
           reader.Read();
-          Assert.AreEqual(1, reader.GetValue(0));
-          Assert.AreEqual(guid, reader.GetGuid(1));
+          Assert.That(reader.GetValue(0), Is.EqualTo(1));
+          Assert.That(reader.GetGuid(1), Is.EqualTo(guid));
         }
       }
     }
@@ -1029,11 +1029,11 @@ public void ReadBinary16AsBinary()
           reader.Read();
 
           object o = reader.GetValue(1);
-          Assert.True(o is Guid);
+          Assert.That(o is Guid);
 
           byte[] bytes = new byte[16];
           long size = reader.GetBytes(1, 0, bytes, 0, 16);
-          Assert.AreEqual(16, size);
+          Assert.That(size, Is.EqualTo(16));
         }
       }
     }
@@ -1050,7 +1050,7 @@ public void ReadingUUIDAsGuid()
 
       cmd.CommandText = "SELECT guid FROM Test";
       Guid g = (Guid)cmd.ExecuteScalar();
-      Assert.AreEqual(serverGuid, g);
+      Assert.That(g, Is.EqualTo(serverGuid));
     }
 
     [Test]
@@ -1065,7 +1065,7 @@ public void NewGuidType()
 
       cmd.CommandText = "SELECT guid FROM Test";
       Guid readG = (Guid)cmd.ExecuteScalar();
-      Assert.AreEqual(g, readG);
+      Assert.That(readG, Is.EqualTo(g));
     }
 
     /// <summary>
@@ -1088,9 +1088,9 @@ public void NotGuidType()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.True(reader["id"] is int);
-        Assert.True(reader["val"] is string);
-        Assert.True(reader["guid"] is Guid);
+        Assert.That(reader["id"] is int);
+        Assert.That(reader["val"] is string);
+        Assert.That(reader["guid"] is Guid);
       }
     }
 
@@ -1149,7 +1149,7 @@ public void UTF8Char12AsGuid()
         {
           reader.Read();
           string s = reader.GetString(1);
-          Assert.AreEqual("Name", s);
+          Assert.That(s, Is.EqualTo("Name"));
         }
       }
     }
@@ -1169,13 +1169,13 @@ public void MySqlDecimal()
         reader.Read();
         MySqlDecimal dec = reader.GetMySqlDecimal(1);
         string s = dec.ToString();
-        Assert.AreEqual(9999999999999999999999999999999999.99, dec.ToDouble());
-        Assert.AreEqual("9999999999999999999999999999999999.99", dec.ToString());
+        Assert.That(dec.ToDouble(), Is.EqualTo(9999999999999999999999999999999999.99));
+        Assert.That(dec.ToString(), Is.EqualTo("9999999999999999999999999999999999.99"));
 
         void Value() { _ = dec.Value; }
 
         Exception ex = Assert.Throws<OverflowException>(() => Value());
-        Assert.AreEqual("Value was either too large or too small for a Decimal.", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Value was either too large or too small for a Decimal."));
       }
     }
 
@@ -1199,10 +1199,10 @@ public void DoubleMinValue()
       {
         reader.Read();
         double d = reader.GetDouble(0);
-        Assert.AreEqual(d, double.MinValue);
+        Assert.That(double.MinValue, Is.EqualTo(d));
         reader.Read();
         d = reader.GetDouble(0);
-        Assert.AreEqual(d, double.MaxValue);
+        Assert.That(double.MaxValue, Is.EqualTo(d));
       }
     }
 
@@ -1234,7 +1234,7 @@ public void Timediff()
     {
       MySqlCommand cmd = new MySqlCommand("select timediff('2 0:1:1.0', '4 1:2:3.123456')", Connection);
       var result = cmd.ExecuteScalar();
-      Assert.AreEqual(new TimeSpan(new TimeSpan(-2, -1, -1, -2).Ticks - 1234560), result);
+      Assert.That(result, Is.EqualTo(new TimeSpan(new TimeSpan(-2, -1, -1, -2).Ticks - 1234560)));
     }
 
     [Test]
@@ -1252,8 +1252,8 @@ public void CanReadJsonValue()
       cmd = new MySqlCommand("SELECT jsoncolumn from Test where id = 2 ", Connection);
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual("[\"a\", {\"b\": [true, false]}, [10, 20]]", reader.GetString(0));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetString(0), Is.EqualTo("[\"a\", {\"b\": [true, false]}, [10, 20]]"));
       }
 
       ExecuteSQL("delete from Test");
@@ -1280,13 +1280,13 @@ public void CanReadJsonValue()
       cmd = new MySqlCommand("SELECT jsoncolumn from Test where id = 2", Connection);
       using (var reader = cmd.ExecuteReader())
       {
-        Assert.AreEqual(true, reader.Read(), "Matching the values");
+        Assert.That(reader.Read(), Is.EqualTo(true), "Matching the values");
         var checkValue = "{\"age\": 25, \"name\": \"Bob\"}";
-        Assert.AreEqual(checkValue, reader.GetString(0), "Matching the values");
+        Assert.That(reader.GetString(0), Is.EqualTo(checkValue), "Matching the values");
       }
       cmd = new MySqlCommand("SELECT count(*) from Test", Connection);
       var count = cmd.ExecuteScalar();
-      Assert.AreEqual(5, count);
+      Assert.That(count, Is.EqualTo(5));
 
       cmd = new MySqlCommand(@"INSERT INTO Test VALUES(@id,' { ""name"" : ""harald"",""Date"": ""2013-08-07"",""Time"": ""11:18:29.000000"",""DateTimeOfRegistration"": ""2013-08-07 12:18:29.000000""} ')",
                             Connection);
@@ -1296,10 +1296,10 @@ public void CanReadJsonValue()
       cmd = new MySqlCommand("SELECT jsoncolumn from Test where id=1000", Connection);
       using (var reader = cmd.ExecuteReader())
       {
-        Assert.AreEqual(true, reader.Read(), "Matching the values");
+        Assert.That(reader.Read(), Is.EqualTo(true), "Matching the values");
         var checkValue =
             "{\"Date\": \"2013-08-07\", \"Time\": \"11:18:29.000000\", \"name\": \"harald\", \"DateTimeOfRegistration\": \"2013-08-07 12:18:29.000000\"}";
-        Assert.AreEqual(checkValue, reader.GetString(0), "Matching the values");
+        Assert.That(reader.GetString(0), Is.EqualTo(checkValue), "Matching the values");
       }
 
       //Multiple Columns
@@ -1314,25 +1314,25 @@ public void CanReadJsonValue()
       cmd = new MySqlCommand("SELECT jsoncolumn1 from Test where id=100000", Connection);
       using (var reader = cmd.ExecuteReader())
       {
-        Assert.AreEqual(true, reader.Read(), "Matching the values");
+        Assert.That(reader.Read(), Is.EqualTo(true), "Matching the values");
         var checkValue = "{\"name\": \"bob\"}";
-        Assert.AreEqual(checkValue, reader.GetString(0), "Matching the values");
+        Assert.That(reader.GetString(0), Is.EqualTo(checkValue), "Matching the values");
       }
 
       cmd = new MySqlCommand("SELECT jsoncolumn2 from Test where id=100000", Connection);
       using (var reader = cmd.ExecuteReader())
       {
-        Assert.AreEqual(true, reader.Read(), "Matching the values");
+        Assert.That(reader.Read(), Is.EqualTo(true), "Matching the values");
         var checkValue = "{\"marks\": 97}";
-        Assert.AreEqual(checkValue, reader.GetString(0), "Matching the values");
+        Assert.That(reader.GetString(0), Is.EqualTo(checkValue), "Matching the values");
       }
 
       cmd = new MySqlCommand("SELECT jsoncolumn3 from Test where id=100000", Connection);
       using (var reader = cmd.ExecuteReader())
       {
-        Assert.AreEqual(true, reader.Read(), "Matching the values");
+        Assert.That(reader.Read(), Is.EqualTo(true), "Matching the values");
         var checkValue = "{\"distinction\": true}";
-        Assert.AreEqual(checkValue, reader.GetString(0), "Matching the values");
+        Assert.That(reader.GetString(0), Is.EqualTo(checkValue), "Matching the values");
       }
     }
 
@@ -1355,8 +1355,8 @@ public void CanUpdateJsonValue()
 
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual("[\"a\", {\"b\": [true, false]}, [10, 20]]", reader.GetString(0));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetString(0), Is.EqualTo("[\"a\", {\"b\": [true, false]}, [10, 20]]"));
       }
 
       cmd = new MySqlCommand(@"INSERT INTO Test VALUES(@id,' { ""name"" : ""bob"",""Date"": ""2015-10-09"",""Time"": ""12:18:29.000000"",""DateTimeOfRegistration"": ""2015-10-09 12:18:29.000000""} ')",
@@ -1371,10 +1371,10 @@ public void CanUpdateJsonValue()
       cmd = new MySqlCommand("SELECT jsoncolumn from Test where id=100000", Connection);
       using (var reader = cmd.ExecuteReader())
       {
-        Assert.AreEqual(true, reader.Read(), "Matching the values");
+        Assert.That(reader.Read(), Is.EqualTo(true), "Matching the values");
         var checkValue =
             "{\"Date\": \"2013-08-07\", \"Time\": \"11:18:29.000000\", \"name\": \"harald\", \"DateTimeOfRegistration\": \"2013-08-07 12:18:29.000000\"}";
-        Assert.AreEqual(checkValue, reader.GetString(0), "Matching the values");
+        Assert.That(reader.GetString(0), Is.EqualTo(checkValue), "Matching the values");
       }
 
     }
@@ -1412,8 +1412,8 @@ public void CanUseGeneratedColumns()
 
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.True(reader.GetString(0).Equals("Berlin", StringComparison.CurrentCulture));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetString(0).Equals("Berlin", StringComparison.CurrentCulture));
       }
     }
 
@@ -1434,7 +1434,7 @@ public void DateTimeTreatedAsVarChar()
           using (DataTable schema = reader.GetSchemaTable())
           {
             MySqlDbType providerType = (MySqlDbType)(int)schema.Rows[0]["ProviderType"];
-            Assert.AreEqual(MySqlDbType.DateTime, providerType);
+            Assert.That(providerType, Is.EqualTo(MySqlDbType.DateTime));
           }
         }
       }
@@ -1452,7 +1452,7 @@ public void NullGuid()
       using var reader = cmd.ExecuteReader();
       while (reader.Read())
       {
-        Assert.True(reader.IsDBNull(0));
+        Assert.That(reader.IsDBNull(0));
       }
     }
 
@@ -1470,7 +1470,7 @@ public void ReadChar36ColumnPrepared()
       using var reader = cmd.ExecuteReader();
       while (reader.Read())
       {
-        StringAssert.AreEqualIgnoringCase(guid, reader.GetGuid(0).ToString());
+        Assert.That(reader.GetGuid(0).ToString(), Is.EqualTo(guid).IgnoreCase);
       }
     }
 
@@ -1492,10 +1492,10 @@ public void UnexpectedColumnSize()
         using (var reader = cmd.ExecuteReader())
         {
           var schemaTable = reader.GetSchemaTable();
-          Assert.AreEqual("36", schemaTable.Rows[0]["ColumnSize"].ToString(), "Matching the Column Size");
-          Assert.AreEqual("37", schemaTable.Rows[1]["ColumnSize"].ToString(), "Matching the Column Size");
-          Assert.AreEqual("255", schemaTable.Rows[2]["ColumnSize"].ToString(), "Matching the Column Size");
-          Assert.AreEqual("65535", schemaTable.Rows[3]["ColumnSize"].ToString(), "Matching the Column Size");
+          Assert.That(schemaTable.Rows[0]["ColumnSize"].ToString(), Is.EqualTo("36"), "Matching the Column Size");
+          Assert.That(schemaTable.Rows[1]["ColumnSize"].ToString(), Is.EqualTo("37"), "Matching the Column Size");
+          Assert.That(schemaTable.Rows[2]["ColumnSize"].ToString(), Is.EqualTo("255"), "Matching the Column Size");
+          Assert.That(schemaTable.Rows[3]["ColumnSize"].ToString(), Is.EqualTo("65535"), "Matching the Column Size");
         }
       }
     }
@@ -1522,9 +1522,9 @@ public void ReadJSONLongValues()
       cmd = new MySqlCommand("SELECT jsoncolumn from Test where id = " + i, Connection);
       using (var reader = cmd.ExecuteReader())
       {
-        Assert.AreEqual(true, reader.Read(), "Matching the values");
+        Assert.That(reader.Read(), Is.EqualTo(true), "Matching the values");
         var checkValue = @"{""age"": " + i + "}";
-        Assert.AreEqual(checkValue, reader.GetString(0), "Matching the values");
+        Assert.That(reader.GetString(0), Is.EqualTo(checkValue), "Matching the values");
       }
 
       // long string
@@ -1537,10 +1537,10 @@ public void ReadJSONLongValues()
       cmd = new MySqlCommand("SELECT jsoncolumn from Test where id = 2", Connection);
       using (var reader = cmd.ExecuteReader())
       {
-        Assert.AreEqual(true, reader.Read(), "Matching the values");
+        Assert.That(reader.Read(), Is.EqualTo(true), "Matching the values");
         var checkValue =
             @"{""name"": """ + sb.ToString() + @"""}";
-        Assert.AreEqual(checkValue, reader.GetString(0), "Matching the values");
+        Assert.That(reader.GetString(0), Is.EqualTo(checkValue), "Matching the values");
       }
     }
 
@@ -1562,9 +1562,9 @@ public void ReadJSONValueStress()
 
         using (var reader = cmd.ExecuteReader())
         {
-          Assert.AreEqual(true, reader.Read(), "Matching the values");
+          Assert.That(reader.Read(), Is.EqualTo(true), "Matching the values");
           var checkValue = @"{""age"": " + i + "}";
-          Assert.AreEqual(checkValue, reader.GetString(0), "Matching the values");
+          Assert.That(reader.GetString(0), Is.EqualTo(checkValue), "Matching the values");
         }
       }
     }
@@ -1586,17 +1586,17 @@ public void ZeroTimeValues()
         command.Prepare();
         using (var reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          Assert.AreEqual("00:00:00", reader.GetValue(0).ToString());
-          Assert.AreEqual("00:00:00", reader.GetTimeSpan(0).ToString());
+          Assert.That(reader.Read());
+          Assert.That(reader.GetValue(0).ToString(), Is.EqualTo("00:00:00"));
+          Assert.That(reader.GetTimeSpan(0).ToString(), Is.EqualTo("00:00:00"));
 
-          Assert.True(reader.Read());
-          Assert.AreEqual("01:01:01", reader.GetValue(0).ToString());
-          Assert.AreEqual("01:01:01", reader.GetTimeSpan(0).ToString());
+          Assert.That(reader.Read());
+          Assert.That(reader.GetValue(0).ToString(), Is.EqualTo("01:01:01"));
+          Assert.That(reader.GetTimeSpan(0).ToString(), Is.EqualTo("01:01:01"));
 
-          Assert.True(reader.Read());
-          Assert.AreEqual("00:00:00", reader.GetValue(0).ToString());
-          Assert.AreEqual("00:00:00", reader.GetTimeSpan(0).ToString());
+          Assert.That(reader.Read());
+          Assert.That(reader.GetValue(0).ToString(), Is.EqualTo("00:00:00"));
+          Assert.That(reader.GetTimeSpan(0).ToString(), Is.EqualTo("00:00:00"));
         }
       }
     }
@@ -1618,14 +1618,14 @@ public void TimespanWithMicrosecondsPrepared()
       // Try the INSERT
       cmd.CommandText = "INSERT INTO Test VALUES(@value)";
       cmd.Prepare();
-      Assert.AreEqual(1, cmd.ExecuteNonQuery());
+      Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(1));
 
       // Try the SELECT
       cmd.CommandText = "SELECT tm FROM Test WHERE tm = @value;";
       cmd.Prepare();
       using var reader = cmd.ExecuteReader();
-      Assert.IsTrue(reader.Read());
-      Assert.AreEqual(value, reader.GetValue(0));
+      Assert.That(reader.Read());
+      Assert.That(reader.GetValue(0), Is.EqualTo(value));
     }
 
     /// <summary>
@@ -1648,17 +1648,17 @@ public void GetIntForTinyInt(bool treatAsBool, bool isPrepared)
       using var reader = cmd.ExecuteReader();
       reader.Read();
 
-      Assert.AreEqual(treatAsBool ? 1 : -2, reader.GetSByte(0));
+      Assert.That(reader.GetSByte(0), Is.EqualTo(treatAsBool ? 1 : -2));
       Assert.Throws<OverflowException>(() => reader.GetByte(0));
-      Assert.AreEqual(treatAsBool ? 1 : -2, reader.GetInt16(0));
-      Assert.AreEqual(treatAsBool ? 1 : -2, reader.GetInt32(0));
-      Assert.AreEqual(treatAsBool ? 1 : -2, reader.GetInt64(0));
+      Assert.That(reader.GetInt16(0), Is.EqualTo(treatAsBool ? 1 : -2));
+      Assert.That(reader.GetInt32(0), Is.EqualTo(treatAsBool ? 1 : -2));
+      Assert.That(reader.GetInt64(0), Is.EqualTo(treatAsBool ? 1 : -2));
 
-      Assert.AreEqual(treatAsBool ? 1 : -2, reader.GetFieldValue<sbyte>(0));
+      Assert.That(reader.GetFieldValue<sbyte>(0), Is.EqualTo(treatAsBool ? 1 : -2));
       Assert.Throws<OverflowException>(() => reader.GetFieldValue<byte>(0));
-      Assert.AreEqual(treatAsBool ? 1 : -2, reader.GetFieldValue<short>(0));
-      Assert.AreEqual(treatAsBool ? 1 : -2, reader.GetFieldValue<int>(0));
-      Assert.AreEqual(treatAsBool ? 1 : -2, reader.GetFieldValue<long>(0));
+      Assert.That(reader.GetFieldValue<short>(0), Is.EqualTo(treatAsBool ? 1 : -2));
+      Assert.That(reader.GetFieldValue<int>(0), Is.EqualTo(treatAsBool ? 1 : -2));
+      Assert.That(reader.GetFieldValue<long>(0), Is.EqualTo(treatAsBool ? 1 : -2));
     }
 
     [Test]
@@ -1708,16 +1708,16 @@ public void InsertAndSelectVector(bool prepared)
       using var reader = cmd.ExecuteReader();
       reader.Read();
       var value = reader.GetValue(0);
-      Assert.IsInstanceOf(typeof(byte[]), value);
+      Assert.That(value, Is.InstanceOf(typeof(byte[])));
       byteArray = (byte[])value;
 
       float[] floatArray2 = new float[byteArray.Length / 4];
       Buffer.BlockCopy(byteArray, 0, floatArray2, 0, byteArray.Length);
 
-      Assert.AreEqual(3, floatArray2.Length);
-      Assert.AreEqual(1.2f, floatArray2[0]);
-      Assert.AreEqual(2.3f, floatArray2[1]);
-      Assert.AreEqual(3.4f, floatArray2[2]);
+      Assert.That(floatArray2.Length, Is.EqualTo(3));
+      Assert.That(floatArray2[0], Is.EqualTo(1.2f));
+      Assert.That(floatArray2[1], Is.EqualTo(2.3f));
+      Assert.That(floatArray2[2], Is.EqualTo(3.4f));
     }
 
     [TestCase(false)]
@@ -1742,17 +1742,17 @@ public void VectorReturnedFromSproc(bool prepared)
       cmd.ExecuteNonQuery();
 
       // now the parameter should contain the output value
-      Assert.IsInstanceOf(typeof(byte[]), cmd.Parameters[0].Value);
+      Assert.That(cmd.Parameters[0].Value, Is.InstanceOf(typeof(byte[])));
       byte[] byteArray = (byte[])cmd.Parameters[0].Value;
 
       // now check to see if it has the correct values
       float[] floatArray = new float[byteArray.Length / 4];
       Buffer.BlockCopy(byteArray, 0, floatArray, 0, byteArray.Length);
 
-      Assert.AreEqual(3, floatArray.Length);
-      Assert.AreEqual(1.2f, floatArray[0]);
-      Assert.AreEqual(2.3f, floatArray[1]);
-      Assert.AreEqual(3.4f, floatArray[2]);
+      Assert.That(floatArray.Length, Is.EqualTo(3));
+      Assert.That(floatArray[0], Is.EqualTo(1.2f));
+      Assert.That(floatArray[1], Is.EqualTo(2.3f));
+      Assert.That(floatArray[2], Is.EqualTo(3.4f));
     }
   }
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs
index 8ccb87cf9..2b48c1816 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs
@@ -60,9 +60,9 @@ public void ConvertZeroDateTime()
         MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", c);
         using (MySqlDataReader reader = cmd.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          Assert.AreEqual(DateTime.MinValue.Date, reader.GetDateTime(1).Date);
-          Assert.AreEqual(DateTime.MinValue.Date, reader.GetDateTime(2).Date);
+          Assert.That(reader.Read());
+          Assert.That(reader.GetDateTime(1).Date, Is.EqualTo(DateTime.MinValue.Date));
+          Assert.That(reader.GetDateTime(2).Date, Is.EqualTo(DateTime.MinValue.Date));
         }
       }
     }
@@ -80,18 +80,18 @@ public void TestNotAllowZeroDateAndTime()
       MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", Connection);
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
+        Assert.That(reader.Read());
 
         MySqlDateTime testDate = reader.GetMySqlDateTime(2);
-        Assert.False(testDate.IsValidDateTime, "IsZero is false");
+        Assert.That(testDate.IsValidDateTime, Is.False, "IsZero is false");
 
         Exception ex = Assert.Throws<MySqlConversionException>(() => reader.GetValue(2));
-        Assert.AreEqual("Unable to convert MySQL date/time value to System.DateTime", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Unable to convert MySQL date/time value to System.DateTime"));
 
-        Assert.True(reader.Read());
+        Assert.That(reader.Read());
 
         DateTime dt2 = (DateTime)reader.GetValue(2);
-        Assert.AreEqual(new DateTime(2004, 11, 11).Date, dt2.Date);
+        Assert.That(dt2.Date, Is.EqualTo(new DateTime(2004, 11, 11).Date));
       }
 
       ExecuteSQL($"SET SQL_MODE = '{sql_mode}'");
@@ -108,12 +108,12 @@ public void DateAdd()
       cmd.Parameters.AddWithValue("?someday", now);
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
+        Assert.That(reader.Read());
         DateTime dt = reader.GetDateTime(0);
-        Assert.AreEqual(later.Date, dt.Date);
-        Assert.AreEqual(later.Hour, dt.Hour);
-        Assert.AreEqual(later.Minute, dt.Minute);
-        Assert.AreEqual(later.Second, dt.Second);
+        Assert.That(dt.Date, Is.EqualTo(later.Date));
+        Assert.That(dt.Hour, Is.EqualTo(later.Hour));
+        Assert.That(dt.Minute, Is.EqualTo(later.Minute));
+        Assert.That(dt.Second, Is.EqualTo(later.Second));
       }
     }
 
@@ -130,7 +130,7 @@ public void TestZeroDateTimeException()
       {
         reader.Read();
         Exception ex = Assert.Throws<MySqlConversionException>(() => reader.GetDateTime(2));
-        Assert.AreEqual("Unable to convert MySQL date/time value to System.DateTime", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Unable to convert MySQL date/time value to System.DateTime"));
       }
     }
 
@@ -157,12 +157,12 @@ public void LargeDateTime()
       cmd.CommandText = "SELECT id,dt FROM Test";
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual(DateTime.Parse("9997-10-29").Date, reader.GetDateTime(1).Date);
-        Assert.True(reader.Read());
-        Assert.AreEqual(DateTime.Parse("9997-10-30").Date, reader.GetDateTime(1).Date);
-        Assert.True(reader.Read());
-        Assert.AreEqual(DateTime.Parse("9999-12-31").Date, reader.GetDateTime(1).Date);
+        Assert.That(reader.Read());
+        Assert.That(reader.GetDateTime(1).Date, Is.EqualTo(DateTime.Parse("9997-10-29").Date));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetDateTime(1).Date, Is.EqualTo(DateTime.Parse("9997-10-30").Date));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetDateTime(1).Date, Is.EqualTo(DateTime.Parse("9999-12-31").Date));
       }
     }
 
@@ -180,12 +180,12 @@ public void UsingDatesAsStrings()
       MySqlCommand cmd2 = new MySqlCommand("SELECT * FROM Test", Connection);
       using (var reader = cmd2.ExecuteReader())
       {
-        Assert.True(reader.Read());
+        Assert.That(reader.Read());
         DateTime dt = reader.GetDateTime("dt");
-        Assert.AreEqual(2005, dt.Year);
-        Assert.AreEqual(3, dt.Month);
-        Assert.AreEqual(4, dt.Day);
-        Assert.False(reader.Read());
+        Assert.That(dt.Year, Is.EqualTo(2005));
+        Assert.That(dt.Month, Is.EqualTo(3));
+        Assert.That(dt.Day, Is.EqualTo(4));
+        Assert.That(reader.Read(), Is.False);
       }
     }
 
@@ -258,7 +258,7 @@ public void MySqlDateTimeFormatting()
     {
       DateTime dt = DateTime.Now;
       MySqlDateTime mdt = new MySqlDateTime(dt);
-      Assert.AreEqual(dt.ToString(CultureInfo.InvariantCulture), mdt.ToString());
+      Assert.That(mdt.ToString(), Is.EqualTo(dt.ToString(CultureInfo.InvariantCulture)));
     }
 
     /// <summary>
@@ -280,7 +280,7 @@ public void DateFormat()
       cmd.Parameters.AddWithValue("?datefilter", dt.Date);
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
+        Assert.That(reader.Read());
       }
     }
 
@@ -307,7 +307,7 @@ public void TimeColumnWithMicrosecondsOnPrepare()
         {
           command.Prepare();
           var result = (TimeSpan)command.ExecuteScalar();
-          Assert.True(result.ToString() == "1.02:03:04.5670000");
+          Assert.That(result.ToString() == "1.02:03:04.5670000");
         }
 
         ExecuteSQL(@"Delete from test_time;");
@@ -322,7 +322,7 @@ public void TimeColumnWithMicrosecondsOnPrepare()
         {
           command.Prepare();
           var result = (TimeSpan)command.ExecuteScalar();
-          Assert.True(result.ToString() == "1.02:03:04.0005600");
+          Assert.That(result.ToString() == "1.02:03:04.0005600");
         }
 
       }
@@ -360,7 +360,7 @@ public void CanUpdateMicroseconds()
 
       while (rdr.Read())
       {
-        Assert.AreEqual("12:34:56.123456", rdr.GetDateTime(0).ToString("hh:mm:ss.ffffff"));
+        Assert.That(rdr.GetDateTime(0).ToString("hh:mm:ss.ffffff"), Is.EqualTo("12:34:56.123456"));
       }
       rdr.Close();
     }
@@ -418,7 +418,7 @@ public void CanUpdateMicrosecondsWithPrepare()
 
         while (rdr.Read())
         {
-          Assert.AreEqual("12:34:59.999999", rdr.GetDateTime(0).ToString("hh:mm:ss.ffffff"));
+          Assert.That(rdr.GetDateTime(0).ToString("hh:mm:ss.ffffff"), Is.EqualTo("12:34:59.999999"));
         }
         rdr.Close();
       }
@@ -457,9 +457,9 @@ public void CanUpdateMillisecondsUsingTimeType()
         while (rdr.Read())
         {
 #if !NETFRAMEWORK
-          Assert.AreEqual(345, rdr.GetTimeSpan(0).Milliseconds);
+          Assert.That(rdr.GetTimeSpan(0).Milliseconds, Is.EqualTo(345));
 #else
-          Assert.AreEqual(346, rdr.GetTimeSpan(0).Milliseconds);
+          Assert.That(rdr.GetTimeSpan(0).Milliseconds, Is.EqualTo(346));
 #endif
         }
       }
@@ -505,7 +505,7 @@ public void CanUpdateMillisecondsUsingTimeTypeOnPrepareStatements()
         {
           while (rdr.Read())
           {
-            Assert.AreEqual(2, rdr.GetTimeSpan(0).Milliseconds);
+            Assert.That(rdr.GetTimeSpan(0).Milliseconds, Is.EqualTo(2));
           }
         }
       }
@@ -547,7 +547,7 @@ public void CanUpdateMillisecondsUsingTimeStampType()
 
         while (rdr.Read())
         {
-          Assert.AreEqual(123456, rdr.GetMySqlDateTime(0).Microsecond);
+          Assert.That(rdr.GetMySqlDateTime(0).Microsecond, Is.EqualTo(123456));
         }
         rdr.Close();
       }
@@ -590,7 +590,7 @@ public void CanUpdateMillisecondsUsingTimeStampTypeWithPrepare()
         {
           while (rdr.Read())
           {
-            Assert.AreEqual(123456, rdr.GetMySqlDateTime(0).Microsecond);
+            Assert.That(rdr.GetMySqlDateTime(0).Microsecond, Is.EqualTo(123456));
           }
         }
       }
@@ -617,8 +617,8 @@ public void TimestampValuesAreLocal()
         reader.Read();
         DateTime dt1 = reader.GetDateTime(0);
         DateTime ts = reader.GetDateTime(1);
-        Assert.AreEqual(DateTimeKind.Unspecified, dt1.Kind);
-        Assert.AreEqual(DateTimeKind.Local, ts.Kind);
+        Assert.That(dt1.Kind, Is.EqualTo(DateTimeKind.Unspecified));
+        Assert.That(ts.Kind, Is.EqualTo(DateTimeKind.Local));
       }
     }
 
@@ -656,7 +656,7 @@ public void TimestampCorrectTimezone()
         {
           reader.Read();
           DateTime ts = reader.GetDateTime(1);
-          Assert.AreEqual(DateTimeKind.Utc, ts.Kind);
+          Assert.That(ts.Kind, Is.EqualTo(DateTimeKind.Utc));
         }
         // Now set it to non-UTC
         cmd.CommandText = "set @@global.time_zone = '+5:00'";
@@ -669,7 +669,7 @@ public void TimestampCorrectTimezone()
         {
           reader.Read();
           DateTime ts = reader.GetDateTime(1);
-          Assert.AreEqual(DateTimeKind.Local, ts.Kind);
+          Assert.That(ts.Kind, Is.EqualTo(DateTimeKind.Local));
         }
       }
       finally
@@ -716,7 +716,7 @@ public void CanSaveMillisecondsPrecision3WithPrepare()
 
         while (rdr.Read())
         {
-          Assert.AreEqual("11:09:07.0060", rdr.GetDateTime(0).ToString("hh:mm:ss.ffff"));
+          Assert.That(rdr.GetDateTime(0).ToString("hh:mm:ss.ffff"), Is.EqualTo("11:09:07.0060"));
         }
         rdr.Close();
       }
@@ -743,7 +743,7 @@ public void CanSaveMillisecondsPrecision3()
 
       while (rdr.Read())
       {
-        Assert.AreEqual("11:09:07.0060", rdr.GetDateTime(0).ToString("hh:mm:ss.ffff"));
+        Assert.That(rdr.GetDateTime(0).ToString("hh:mm:ss.ffff"), Is.EqualTo("11:09:07.0060"));
       }
       rdr.Close();
     }
@@ -769,7 +769,7 @@ public void CanSaveMicrosecondsPrecision4()
 
       while (rdr.Read())
       {
-        Assert.AreEqual(dt.ToString("hh:mm:ss.ffff"), rdr.GetDateTime(0).ToString("hh:mm:ss.ffff"));
+        Assert.That(rdr.GetDateTime(0).ToString("hh:mm:ss.ffff"), Is.EqualTo(dt.ToString("hh:mm:ss.ffff")));
       }
       rdr.Close();
     }
@@ -783,7 +783,7 @@ public void ShowMicrosecondError()
       cmd.Connection = Connection;
       string date = cmd.ExecuteScalar().ToString();
       DateTime temp;
-      Assert.True(DateTime.TryParse(date, out temp));
+      Assert.That(DateTime.TryParse(date, out temp));
     }
 
     /// <summary>
@@ -811,7 +811,7 @@ public void CanDefineCurrentTimeStampAsDefaultOnDateTime()
 
       while (reader.Read())
       {
-        Assert.True(DateTime.TryParse(reader.GetDateTime(0).ToString(), out tempDate));
+        Assert.That(DateTime.TryParse(reader.GetDateTime(0).ToString(), out tempDate));
       }
       reader.Close();
     }
@@ -837,13 +837,13 @@ public void ReadAndWriteMicroseconds()
       cmd.CommandText = " SELECT * from ReadAndWriteMicroseconds";
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual(milliseconds.Ticks, reader.GetTimeSpan(1).Ticks);
-        Assert.AreEqual(microseconds.Ticks, reader.GetTimeSpan(2).Ticks);
-        Assert.AreEqual(microseconds.Ticks, reader.GetDateTime(3).Ticks);
-        Assert.AreEqual(microseconds.Millisecond, reader.GetDateTime(3).Millisecond);
-        Assert.AreEqual(microseconds.Millisecond, reader.GetMySqlDateTime(3).Millisecond);
-        Assert.AreEqual((microseconds.Ticks % 10000000) / 10, reader.GetMySqlDateTime(3).Microsecond);
+        Assert.That(reader.Read());
+        Assert.That(reader.GetTimeSpan(1).Ticks, Is.EqualTo(milliseconds.Ticks));
+        Assert.That(reader.GetTimeSpan(2).Ticks, Is.EqualTo(microseconds.Ticks));
+        Assert.That(reader.GetDateTime(3).Ticks, Is.EqualTo(microseconds.Ticks));
+        Assert.That(reader.GetDateTime(3).Millisecond, Is.EqualTo(microseconds.Millisecond));
+        Assert.That(reader.GetMySqlDateTime(3).Millisecond, Is.EqualTo(microseconds.Millisecond));
+        Assert.That(reader.GetMySqlDateTime(3).Microsecond, Is.EqualTo((microseconds.Ticks % 10000000) / 10));
       }
     }
 
@@ -864,7 +864,7 @@ public void TimeZoneOffset()
       {
         using (MySqlConnection conn2 = GetConnection())
         {
-          Assert.AreEqual(timeZoneHours, conn2.driver.timeZoneOffset);
+          Assert.That(conn2.driver.timeZoneOffset, Is.EqualTo(timeZoneHours));
         }
       }
       finally
@@ -894,9 +894,9 @@ public void TimeZoneOffsetUsingReader()
         var myTimestampSb = (DateTime)reader["mytimestampcolumn"];
         var myTimestampGdt = reader.GetDateTime("mytimestampcolumn");
 
-        Assert.True(myTimestampSb.Kind == myTimestampGdt.Kind);
-        Assert.True(conn.driver.timeZoneOffset == ((DateTimeOffset)myTimestampSb).Offset.Hours, $"Driver: {conn.driver.timeZoneOffset}; Sb: {((DateTimeOffset)myTimestampSb).Offset.Hours}");
-        Assert.True(conn.driver.timeZoneOffset == ((DateTimeOffset)myTimestampGdt).Offset.Hours);
+        Assert.That(myTimestampSb.Kind == myTimestampGdt.Kind);
+        Assert.That(conn.driver.timeZoneOffset == ((DateTimeOffset)myTimestampSb).Offset.Hours, $"Driver: {conn.driver.timeZoneOffset}; Sb: {((DateTimeOffset)myTimestampSb).Offset.Hours}");
+        Assert.That(conn.driver.timeZoneOffset == ((DateTimeOffset)myTimestampGdt).Offset.Hours);
 
         reader.Close();
       }
@@ -932,7 +932,7 @@ public void MilisecondsWithTimeColumn()
         {
           reader.Read();
           var val = reader.GetValue(0);
-          StringAssert.StartsWith(timeValue.Substring(0, 14), val.ToString());
+          Assert.That(val.ToString(), Does.StartWith(timeValue.Substring(0, 14)));
         }
 
         cmd.CommandText = "DROP TABLE IF EXISTS T";
@@ -951,7 +951,7 @@ public void MilisecondsWithTimeColumn()
         {
           reader.Read();
           var val = reader.GetTimeSpan(0);
-          StringAssert.StartsWith(timeValue.Substring(0, 12), val.ToString());
+          Assert.That(val.ToString(), Does.StartWith(timeValue.Substring(0, 12)));
         }
       }
     }
@@ -986,9 +986,9 @@ public void IConvertibleImplementation()
     {
       var mySqlDateTime = new MySqlDateTime(DateTime.Now);
 
-      Assert.AreEqual(TypeCode.DateTime, ((IConvertible)mySqlDateTime).GetTypeCode());
-      Assert.NotNull(((IConvertible)mySqlDateTime).ToString());
-      Assert.NotNull(Convert.ToString(mySqlDateTime));
+      Assert.That(((IConvertible)mySqlDateTime).GetTypeCode(), Is.EqualTo(TypeCode.DateTime));
+      Assert.That(((IConvertible)mySqlDateTime).ToString(), Is.Not.Null);
+      Assert.That(Convert.ToString(mySqlDateTime), Is.Not.Null);
     }
   }
 }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs b/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs
index 59a074e65..205c5d3c6 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs
@@ -61,7 +61,7 @@ public void DnsSrvConnectionStringInvalidOptions(string connString)
     public void DnsSrvConnectionStringInvalidConfiguration(string connString, string exceptionMessage)
     {
       var exception = Assert.Throws<ArgumentException>(() => new MySqlConnection(connString));
-      Assert.AreEqual(exceptionMessage, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(exceptionMessage));
     }
 
     [TestCase("server=localhost;port=33060;dns-srv=false;")]
@@ -75,7 +75,7 @@ public void DnsSrvConnectionStringInvalidConfiguration(string connString, string
     public void DnsSrvConnectionStringValidConfiguration(string connString)
     {
       var conn = new MySqlConnection(connString);
-      Assert.NotNull(conn);
+      Assert.That(conn, Is.Not.Null);
     }
 
     [Test]
@@ -86,21 +86,21 @@ public void DnsSrvConnectionAnonymousTypeInvalidConfiguration()
       sb.Port = 3306;
       sb.Server = "localhost";
       var exception = Assert.Throws<ArgumentException>(() => new MySqlConnection(sb.ConnectionString));
-      Assert.AreEqual(Resources.DnsSrvInvalidConnOptionPort, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(Resources.DnsSrvInvalidConnOptionPort));
 
       sb = new MySqlConnectionStringBuilder();
       sb.DnsSrv = true;
       sb.Server = "_mysqlx._tcp.foo.abc.com";
       sb.ConnectionProtocol = MySqlConnectionProtocol.Unix;
       exception = Assert.Throws<ArgumentException>(() => new MySqlConnection(sb.ConnectionString));
-      Assert.AreEqual(Resources.DnsSrvInvalidConnOptionUnixSocket, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(Resources.DnsSrvInvalidConnOptionUnixSocket));
 
       sb = new MySqlConnectionStringBuilder();
       sb.DnsSrv = true;
       sb.Server = "localhost, 10.10.10.10";
       sb.ConnectionProtocol = MySqlConnectionProtocol.Unix;
       exception = Assert.Throws<ArgumentException>(() => new MySqlConnection(sb.ConnectionString));
-      Assert.AreEqual(Resources.DnsSrvInvalidConnOptionMultihost, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(Resources.DnsSrvInvalidConnOptionMultihost));
     }
 
     [Test]
@@ -126,7 +126,7 @@ public void DnsSrvRecordsTest()
 
       var sortedRecords = DnsSrv.SortSrvRecords(dnsRecords.ToList());
 
-      Assert.True(sortedRecords.Select(r => r.Target).SequenceEqual(expectedOrder.Select(r => r.Target)));
+      Assert.That(sortedRecords.Select(r => r.Target).SequenceEqual(expectedOrder.Select(r => r.Target)));
     }
   }
 }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs
index ecb0e9a82..af753b7da 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs
@@ -58,8 +58,8 @@ public void Timeout()
       MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", connection);
 
       Exception ex = Assert.Throws<InvalidOperationException>(() => cmd.ExecuteReader());
-      Assert.AreEqual("Connection must be valid and open.", ex.Message);
-      Assert.AreEqual(ConnectionState.Closed, connection.State);
+      Assert.That(ex.Message, Is.EqualTo("Connection must be valid and open."));
+      Assert.That(connection.State, Is.EqualTo(ConnectionState.Closed));
       connection.Close();
 
     }
@@ -76,7 +76,7 @@ public void ErrorData()
       }
       catch (Exception ex)
       {
-        Assert.AreEqual(1064, ex.Data["Server Error Code"]);
+        Assert.That(ex.Data["Server Error Code"], Is.EqualTo(1064));
       }
     }
 
@@ -100,7 +100,7 @@ public void TimeoutErrorMessages()
         Thread.Sleep(6000);
         command = new MySqlCommand("SELECT CONNECTION_ID();", connection);
         var ex = Assert.Throws<MySqlException>(() => command.ExecuteScalar());
-        Assert.AreEqual((int)MySqlErrorCode.ErrorClientInteractionTimeout, ex.Number);
+        Assert.That(ex.Number, Is.EqualTo((int)MySqlErrorCode.ErrorClientInteractionTimeout));
       }
     }
 
@@ -158,7 +158,7 @@ public void AuthenticationExceptionNumber(string propertyName, object propertyVa
           ExecuteSQL("SET GLOBAL max_connections = 1;");
         }
         MySqlException exDefault = Assert.Throws<MySqlException>(() => conn.Open());
-        Assert.AreEqual(exNumber, exDefault.Number);
+        Assert.That(exDefault.Number, Is.EqualTo(exNumber));
       }
     }
   }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CultureTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CultureTests.cs
index 52f2c24ed..b2b136626 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CultureTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CultureTests.cs
@@ -75,7 +75,7 @@ private void InternalTestFloats(bool prepared)
       if (prepared)
         cmd.Prepare();
       int count = cmd.ExecuteNonQuery();
-      Assert.AreEqual(1, count);
+      Assert.That(count, Is.EqualTo(1));
 
       try
       {
@@ -84,9 +84,9 @@ private void InternalTestFloats(bool prepared)
         using (MySqlDataReader reader = cmd.ExecuteReader())
         {
           reader.Read();
-          Assert.AreEqual((decimal)2.3, (decimal)reader.GetFloat(0));
-          Assert.AreEqual(4.6, reader.GetDouble(1));
-          Assert.AreEqual((decimal)23.82, reader.GetDecimal(2));
+          Assert.That((decimal)reader.GetFloat(0), Is.EqualTo((decimal)2.3));
+          Assert.That(reader.GetDouble(1), Is.EqualTo(4.6));
+          Assert.That(reader.GetDecimal(2), Is.EqualTo((decimal)23.82));
         }
       }
       finally
@@ -134,12 +134,12 @@ public void ArabicCalendars()
 
       MySqlCommand cmd = new MySqlCommand("SELECT dt FROM test", Connection);
       DateTime dt = (DateTime)cmd.ExecuteScalar();
-      Assert.AreEqual(2007, dt.Year);
-      Assert.AreEqual(1, dt.Month);
-      Assert.AreEqual(1, dt.Day);
-      Assert.AreEqual(12, dt.Hour);
-      Assert.AreEqual(30, dt.Minute);
-      Assert.AreEqual(45, dt.Second);
+      Assert.That(dt.Year, Is.EqualTo(2007));
+      Assert.That(dt.Month, Is.EqualTo(1));
+      Assert.That(dt.Day, Is.EqualTo(1));
+      Assert.That(dt.Hour, Is.EqualTo(12));
+      Assert.That(dt.Minute, Is.EqualTo(30));
+      Assert.That(dt.Second, Is.EqualTo(45));
 
       Thread.CurrentThread.CurrentCulture = curCulture;
       Thread.CurrentThread.CurrentUICulture = curUICulture;
@@ -172,9 +172,9 @@ public void FunctionsReturnStringAndDecimal()
             "select *,(select b from bug52187b) as field_b from bug52187a", con);
           DataTable dt = new DataTable();
           da.Fill(dt);
-          Assert.AreEqual(1, dt.Rows.Count);
-          Assert.AreEqual((decimal)1.25, (decimal)dt.Rows[0][0]);
-          Assert.AreEqual((decimal)5.99, (decimal)dt.Rows[0][1]);
+          Assert.That(dt.Rows.Count, Is.EqualTo(1));
+          Assert.That((decimal)dt.Rows[0][0], Is.EqualTo((decimal)1.25));
+          Assert.That((decimal)dt.Rows[0][1], Is.EqualTo((decimal)5.99));
         }
       }
       finally
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DataTypeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DataTypeTests.cs
index dedd778f2..223ab385a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DataTypeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DataTypeTests.cs
@@ -57,9 +57,9 @@ public void UpdateDecimalColumns()
 
       dt.Clear();
       da.Fill(dt);
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual(1, dt.Rows[0]["id"]);
-      Assert.AreEqual((decimal)23.4, Convert.ToDecimal(dt.Rows[0]["dec1"]));
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["id"], Is.EqualTo(1));
+      Assert.That(Convert.ToDecimal(dt.Rows[0]["dec1"]), Is.EqualTo((decimal)23.4));
       cb.Dispose();
     }
 
@@ -100,7 +100,7 @@ public void UnsignedTypes()
       using (MySqlDataReader dr = cmd.ExecuteReader())
       {
         dr.Read();
-        Assert.AreEqual(20, dr.GetUInt16(0));
+        Assert.That(dr.GetUInt16(0), Is.EqualTo(20));
       }
     }
 
@@ -118,11 +118,11 @@ public void DecimalPrecision()
       {
         DataTable dt = reader.GetSchemaTable();
         DataRow columnDefinition = dt.Rows[0];
-        Assert.AreEqual(35, columnDefinition[SchemaTableColumn.NumericPrecision]);
+        Assert.That(columnDefinition[SchemaTableColumn.NumericPrecision], Is.EqualTo(35));
         columnDefinition = dt.Rows[1];
-        Assert.AreEqual(36, columnDefinition[SchemaTableColumn.NumericPrecision]);
+        Assert.That(columnDefinition[SchemaTableColumn.NumericPrecision], Is.EqualTo(36));
         columnDefinition = dt.Rows[2];
-        Assert.AreEqual(36, columnDefinition[SchemaTableColumn.NumericPrecision]);
+        Assert.That(columnDefinition[SchemaTableColumn.NumericPrecision], Is.EqualTo(36));
       }
     }
   }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DateTimeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DateTimeTests.cs
index 07be3e8a5..cba2a0718 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DateTimeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DateTimeTests.cs
@@ -58,14 +58,14 @@ public void TestAllowZeroDateTime()
         {
           reader.Read();
 
-          Assert.True(reader.GetValue(1) is MySqlDateTime);
-          Assert.True(reader.GetValue(2) is MySqlDateTime);
+          Assert.That(reader.GetValue(1) is MySqlDateTime);
+          Assert.That(reader.GetValue(2) is MySqlDateTime);
 
-          Assert.False(reader.GetMySqlDateTime(1).IsValidDateTime);
-          Assert.False(reader.GetMySqlDateTime(2).IsValidDateTime);
+          Assert.That(!reader.GetMySqlDateTime(1).IsValidDateTime);
+          Assert.That(!reader.GetMySqlDateTime(2).IsValidDateTime);
 
           Exception ex = Assert.Throws<MySqlConversionException>(() =>reader.GetDateTime(1));
-          Assert.AreEqual("Unable to convert MySQL date/time value to System.DateTime", ex.Message);
+          Assert.That(ex.Message, Is.EqualTo("Unable to convert MySQL date/time value to System.DateTime"));
         }
 
         DataTable dt = new DataTable();
@@ -83,11 +83,11 @@ public void TestAllowZeroDateTime()
 
         dt.Clear();
         da.Fill(dt);
-        Assert.AreEqual(2, dt.Rows.Count);
+        Assert.That(dt.Rows.Count, Is.EqualTo(2));
         MySqlDateTime date = (MySqlDateTime)dt.Rows[1]["d"];
-        Assert.AreEqual(2003, date.Year);
-        Assert.AreEqual(9, date.Month);
-        Assert.AreEqual(24, date.Day);
+        Assert.That(date.Year, Is.EqualTo(2003));
+        Assert.That(date.Month, Is.EqualTo(9));
+        Assert.That(date.Day, Is.EqualTo(24));
         cb.Dispose();
       }
     }   
@@ -118,10 +118,10 @@ public void SortingMySqlDateTimes()
         DataView dv = dt.DefaultView;
         dv.Sort = "dt ASC";
 
-        Assert.AreEqual(new DateTime(2004, 10, 1).Date, Convert.ToDateTime(dv[0]["dt"]).Date);
-        Assert.AreEqual(new DateTime(2004, 10, 2).Date, Convert.ToDateTime(dv[1]["dt"]).Date);
-        Assert.AreEqual(new DateTime(2004, 11, 1).Date, Convert.ToDateTime(dv[2]["dt"]).Date);
-        Assert.AreEqual(new DateTime(2004, 11, 2).Date, Convert.ToDateTime(dv[3]["dt"]).Date);
+        Assert.That(Convert.ToDateTime(dv[0]["dt"]).Date, Is.EqualTo(new DateTime(2004, 10, 1).Date));
+        Assert.That(Convert.ToDateTime(dv[1]["dt"]).Date, Is.EqualTo(new DateTime(2004, 10, 2).Date));
+        Assert.That(Convert.ToDateTime(dv[2]["dt"]).Date, Is.EqualTo(new DateTime(2004, 11, 1).Date));
+        Assert.That(Convert.ToDateTime(dv[3]["dt"]).Date, Is.EqualTo(new DateTime(2004, 11, 2).Date));
 
         Thread.CurrentThread.CurrentCulture = curCulture;
         Thread.CurrentThread.CurrentUICulture = curUICulture;
@@ -158,8 +158,8 @@ public void InsertDateTimeValue()
         da.Fill(dt);
         cb.Dispose();
 
-        Assert.AreEqual(1, dt.Rows.Count);
-        Assert.AreEqual(now.Date, ((DateTime)dt.Rows[0]["dt"]).Date);
+        Assert.That(dt.Rows.Count, Is.EqualTo(1));
+        Assert.That(((DateTime)dt.Rows[0]["dt"]).Date, Is.EqualTo(now.Date));
       }
     }   
 
@@ -192,7 +192,7 @@ public void DateTimeInDataTable()
 
         dt.Rows.Clear();
         da.Fill(dt);
-        Assert.AreEqual(2, dt.Rows.Count);
+        Assert.That(dt.Rows.Count, Is.EqualTo(2));
         cb.Dispose();
       }
     }     
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
index 71214f36b..115f2b263 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
@@ -48,25 +48,25 @@ public void Collections()
       DataTable dt = Connection.GetSchema();
 
       int row = 0;
-      Assert.AreEqual("MetaDataCollections", dt.Rows[row++][0]);
-      Assert.AreEqual("DataSourceInformation", dt.Rows[row++][0]);
-      Assert.AreEqual("DataTypes", dt.Rows[row++][0]);
-      Assert.AreEqual("Restrictions", dt.Rows[row++][0]);
-      Assert.AreEqual("ReservedWords", dt.Rows[row++][0]);
-      Assert.AreEqual("Databases", dt.Rows[row++][0]);
-      Assert.AreEqual("Tables", dt.Rows[row++][0]);
-      Assert.AreEqual("Columns", dt.Rows[row++][0]);
-      Assert.AreEqual("Users", dt.Rows[row++][0]);
-      Assert.AreEqual("Foreign Keys", dt.Rows[row++][0]);
-      Assert.AreEqual("IndexColumns", dt.Rows[row++][0]);
-      Assert.AreEqual("Indexes", dt.Rows[row++][0]);
-      Assert.AreEqual("Foreign Key Columns", dt.Rows[row++][0]);
-      Assert.AreEqual("UDF", dt.Rows[row++][0]);
-      Assert.AreEqual("Views", dt.Rows[row++][0]);
-      Assert.AreEqual("ViewColumns", dt.Rows[row++][0]);
-      Assert.AreEqual("Procedure Parameters", dt.Rows[row++][0]);
-      Assert.AreEqual("Procedures", dt.Rows[row++][0]);
-      Assert.AreEqual("Triggers", dt.Rows[row++][0]);
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("MetaDataCollections"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("DataSourceInformation"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("DataTypes"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("Restrictions"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("ReservedWords"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("Databases"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("Tables"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("Columns"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("Users"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("Foreign Keys"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("IndexColumns"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("Indexes"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("Foreign Key Columns"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("UDF"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("Views"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("ViewColumns"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("Procedure Parameters"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("Procedures"));
+      Assert.That(dt.Rows[row++][0], Is.EqualTo("Triggers"));
     }
 
     /// <summary>
@@ -86,63 +86,63 @@ public void DataTypes()
         string type = row["TypeName"].ToString();
         Type systemType = Type.GetType(row["DataType"].ToString());
         if (type == "BIT")
-          Assert.AreEqual(typeof(System.UInt64), systemType);
+          Assert.That(systemType, Is.EqualTo(typeof(System.UInt64)));
         else if (type == "DATE" || type == "DATETIME" ||
           type == "TIMESTAMP")
-          Assert.AreEqual(typeof(System.DateTime), systemType);
+          Assert.That(systemType, Is.EqualTo(typeof(System.DateTime)));
         else if (type == "BLOB" || type == "TINYBLOB" ||
              type == "MEDIUMBLOB" || type == "LONGBLOB")
-          Assert.AreEqual(typeof(System.Byte[]), systemType);
+          Assert.That(systemType, Is.EqualTo(typeof(System.Byte[])));
         else if (type == "TIME")
-          Assert.AreEqual(typeof(System.TimeSpan), systemType);
+          Assert.That(systemType, Is.EqualTo(typeof(System.TimeSpan)));
         else if (type == "CHAR" || type == "VARCHAR")
         {
-          Assert.AreEqual(typeof(System.String), systemType);
-          Assert.False(Convert.ToBoolean(row["IsFixedLength"]));
+          Assert.That(systemType, Is.EqualTo(typeof(System.String)));
+          Assert.That(!Convert.ToBoolean(row["IsFixedLength"]));
           string format = type + "({0})";
-          Assert.AreEqual(format, row["CreateFormat"].ToString());
+          Assert.That(row["CreateFormat"].ToString(), Is.EqualTo(format));
         }
         else if (type == "SET" || type == "ENUM")
-          Assert.AreEqual(typeof(System.String), systemType);
+          Assert.That(systemType, Is.EqualTo(typeof(System.String)));
         else if (type == "DOUBLE")
-          Assert.AreEqual(typeof(System.Double), systemType);
+          Assert.That(systemType, Is.EqualTo(typeof(System.Double)));
         else if (type == "SINGLE")
-          Assert.AreEqual(typeof(System.Single), systemType);
+          Assert.That(systemType, Is.EqualTo(typeof(System.Single)));
         else if (type == "TINYINT")
         {
           if (row["CreateFormat"].ToString().EndsWith("UNSIGNED", StringComparison.OrdinalIgnoreCase))
-            Assert.AreEqual(typeof(System.Byte), systemType);
+            Assert.That(systemType, Is.EqualTo(typeof(System.Byte)));
           else
-            Assert.AreEqual(typeof(System.SByte), systemType);
+            Assert.That(systemType, Is.EqualTo(typeof(System.SByte)));
         }
         else if (type == "SMALLINT")
         {
           if (row["CreateFormat"].ToString().EndsWith("UNSIGNED", StringComparison.OrdinalIgnoreCase))
-            Assert.AreEqual(typeof(System.UInt16), systemType);
+            Assert.That(systemType, Is.EqualTo(typeof(System.UInt16)));
           else
-            Assert.AreEqual(typeof(System.Int16), systemType);
+            Assert.That(systemType, Is.EqualTo(typeof(System.Int16)));
         }
         else if (type == "MEDIUMINT" || type == "INT")
         {
           if (row["CreateFormat"].ToString().EndsWith("UNSIGNED", StringComparison.OrdinalIgnoreCase))
-            Assert.AreEqual(typeof(System.UInt32), systemType);
+            Assert.That(systemType, Is.EqualTo(typeof(System.UInt32)));
           else
-            Assert.AreEqual(typeof(System.Int32), systemType);
+            Assert.That(systemType, Is.EqualTo(typeof(System.Int32)));
         }
         else if (type == "BIGINT")
         {
           if (row["CreateFormat"].ToString().EndsWith("UNSIGNED", StringComparison.OrdinalIgnoreCase))
-            Assert.AreEqual(typeof(System.UInt64), systemType);
+            Assert.That(systemType, Is.EqualTo(typeof(System.UInt64)));
           else
-            Assert.AreEqual(typeof(System.Int64), systemType);
+            Assert.That(systemType, Is.EqualTo(typeof(System.Int64)));
         }
         else if (type == "DECIMAL")
         {
-          Assert.AreEqual(typeof(System.Decimal), systemType);
-          Assert.AreEqual("DECIMAL({0},{1})", row["CreateFormat"].ToString());
+          Assert.That(systemType, Is.EqualTo(typeof(System.Decimal)));
+          Assert.That(row["CreateFormat"].ToString(), Is.EqualTo("DECIMAL({0},{1})"));
         }
         else if (type == "TINYINT")
-          Assert.AreEqual(typeof(System.Byte), systemType);
+          Assert.That(systemType, Is.EqualTo(typeof(System.Byte)));
       }
     }
 
@@ -156,20 +156,20 @@ public void Tables()
       restrictions[1] = Connection.Database;
       restrictions[2] = "test1";
       DataTable dt = Connection.GetSchema("Tables", restrictions);
-      Assert.True(dt.Columns["VERSION"].DataType == typeof(UInt64)
+      Assert.That(dt.Columns["VERSION"].DataType == typeof(UInt64)
         || dt.Columns["VERSION"].DataType == typeof(Int64));
-      Assert.True(dt.Columns["TABLE_ROWS"].DataType == typeof(UInt64));
-      Assert.True(dt.Columns["AVG_ROW_LENGTH"].DataType == typeof(UInt64));
-      Assert.True(dt.Columns["DATA_LENGTH"].DataType == typeof(UInt64));
-      Assert.True(dt.Columns["MAX_DATA_LENGTH"].DataType == typeof(UInt64));
-      Assert.True(dt.Columns["INDEX_LENGTH"].DataType == typeof(UInt64));
-      Assert.True(dt.Columns["DATA_FREE"].DataType == typeof(UInt64));
-      Assert.True(dt.Columns["AUTO_INCREMENT"].DataType == typeof(UInt64));
-      Assert.True(dt.Columns["CHECKSUM"].DataType == typeof(UInt64)
+      Assert.That(dt.Columns["TABLE_ROWS"].DataType == typeof(UInt64));
+      Assert.That(dt.Columns["AVG_ROW_LENGTH"].DataType == typeof(UInt64));
+      Assert.That(dt.Columns["DATA_LENGTH"].DataType == typeof(UInt64));
+      Assert.That(dt.Columns["MAX_DATA_LENGTH"].DataType == typeof(UInt64));
+      Assert.That(dt.Columns["INDEX_LENGTH"].DataType == typeof(UInt64));
+      Assert.That(dt.Columns["DATA_FREE"].DataType == typeof(UInt64));
+      Assert.That(dt.Columns["AUTO_INCREMENT"].DataType == typeof(UInt64));
+      Assert.That(dt.Columns["CHECKSUM"].DataType == typeof(UInt64)
         || dt.Columns["CHECKSUM"].DataType == typeof(Int64));
-      Assert.True(dt.Rows.Count == 1);
-      Assert.AreEqual("Tables", dt.TableName);
-      Assert.AreEqual("test1", dt.Rows[0][2]);
+      Assert.That(dt.Rows.Count == 1);
+      Assert.That(dt.TableName, Is.EqualTo("Tables"));
+      Assert.That(dt.Rows[0][2], Is.EqualTo("test1"));
     }
 
     [Test]
@@ -183,63 +183,63 @@ col3 varchar(50) character set utf8, col4 tinyint unsigned,
       restrictions[1] = Connection.Database;
       restrictions[2] = "Test";
       DataTable dt = Connection.GetSchema("Columns", restrictions);
-      Assert.AreEqual(5, dt.Rows.Count);
-      Assert.AreEqual("Columns", dt.TableName);
+      Assert.That(dt.Rows.Count, Is.EqualTo(5));
+      Assert.That(dt.TableName, Is.EqualTo("Columns"));
       if (Connection.driver.Version.isAtLeast(8, 0, 1))
       {
-        Assert.True(dt.Columns["ORDINAL_POSITION"].DataType == typeof(UInt32));
-        Assert.True(dt.Columns["CHARACTER_MAXIMUM_LENGTH"].DataType == typeof(Int64));
-        Assert.True(dt.Columns["NUMERIC_PRECISION"].DataType == typeof(UInt64));
-        Assert.True(dt.Columns["NUMERIC_SCALE"].DataType == typeof(UInt64));
+        Assert.That(dt.Columns["ORDINAL_POSITION"].DataType == typeof(UInt32));
+        Assert.That(dt.Columns["CHARACTER_MAXIMUM_LENGTH"].DataType == typeof(Int64));
+        Assert.That(dt.Columns["NUMERIC_PRECISION"].DataType == typeof(UInt64));
+        Assert.That(dt.Columns["NUMERIC_SCALE"].DataType == typeof(UInt64));
       }
       else
       {
-        Assert.True(dt.Columns["ORDINAL_POSITION"].DataType == typeof(UInt64));
-        Assert.True(dt.Columns["CHARACTER_MAXIMUM_LENGTH"].DataType == typeof(UInt64));
-        Assert.True(dt.Columns["NUMERIC_PRECISION"].DataType == typeof(UInt64));
-        Assert.True(dt.Columns["NUMERIC_SCALE"].DataType == typeof(UInt64));
+        Assert.That(dt.Columns["ORDINAL_POSITION"].DataType == typeof(UInt64));
+        Assert.That(dt.Columns["CHARACTER_MAXIMUM_LENGTH"].DataType == typeof(UInt64));
+        Assert.That(dt.Columns["NUMERIC_PRECISION"].DataType == typeof(UInt64));
+        Assert.That(dt.Columns["NUMERIC_SCALE"].DataType == typeof(UInt64));
       }
 
       // first column
-      Assert.AreEqual((Connection.Database).ToUpper(), dt.Rows[0]["TABLE_SCHEMA"].ToString().ToUpper());
-      Assert.AreEqual("COL1", dt.Rows[0]["COLUMN_NAME"].ToString().ToUpper());
-      Assert.AreEqual(1, Convert.ToInt32(dt.Rows[0]["ORDINAL_POSITION"]));
-      Assert.AreEqual("YES", dt.Rows[0]["IS_NULLABLE"]);
-      Assert.AreEqual("INT", dt.Rows[0]["DATA_TYPE"].ToString().ToUpper());
+      Assert.That(dt.Rows[0]["TABLE_SCHEMA"].ToString().ToUpper(), Is.EqualTo((Connection.Database).ToUpper()));
+      Assert.That(dt.Rows[0]["COLUMN_NAME"].ToString().ToUpper(), Is.EqualTo("COL1"));
+      Assert.That(Convert.ToInt32(dt.Rows[0]["ORDINAL_POSITION"]), Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["IS_NULLABLE"], Is.EqualTo("YES"));
+      Assert.That(dt.Rows[0]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("INT"));
 
       // second column
-      Assert.AreEqual((Connection.Database).ToUpper(), dt.Rows[1]["TABLE_SCHEMA"].ToString().ToUpper());
-      Assert.AreEqual("COL2", dt.Rows[1]["COLUMN_NAME"].ToString().ToUpper());
-      Assert.AreEqual(2, Convert.ToInt32(dt.Rows[1]["ORDINAL_POSITION"]));
-      Assert.AreEqual("YES", dt.Rows[1]["IS_NULLABLE"]);
-      Assert.AreEqual("DECIMAL", dt.Rows[1]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual("DECIMAL(20,5)", dt.Rows[1]["COLUMN_TYPE"].ToString().ToUpper());
-      Assert.AreEqual(20, Convert.ToInt32(dt.Rows[1]["NUMERIC_PRECISION"]));
-      Assert.AreEqual(5, Convert.ToInt32(dt.Rows[1]["NUMERIC_SCALE"]));
+      Assert.That(dt.Rows[1]["TABLE_SCHEMA"].ToString().ToUpper(), Is.EqualTo((Connection.Database).ToUpper()));
+      Assert.That(dt.Rows[1]["COLUMN_NAME"].ToString().ToUpper(), Is.EqualTo("COL2"));
+      Assert.That(Convert.ToInt32(dt.Rows[1]["ORDINAL_POSITION"]), Is.EqualTo(2));
+      Assert.That(dt.Rows[1]["IS_NULLABLE"], Is.EqualTo("YES"));
+      Assert.That(dt.Rows[1]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("DECIMAL"));
+      Assert.That(dt.Rows[1]["COLUMN_TYPE"].ToString().ToUpper(), Is.EqualTo("DECIMAL(20,5)"));
+      Assert.That(Convert.ToInt32(dt.Rows[1]["NUMERIC_PRECISION"]), Is.EqualTo(20));
+      Assert.That(Convert.ToInt32(dt.Rows[1]["NUMERIC_SCALE"]), Is.EqualTo(5));
 
       // third column
-      Assert.AreEqual((Connection.Database).ToUpper(), dt.Rows[2]["TABLE_SCHEMA"].ToString().ToUpper());
-      Assert.AreEqual("COL3", dt.Rows[2]["COLUMN_NAME"].ToString().ToUpper());
-      Assert.AreEqual(3, Convert.ToInt32(dt.Rows[2]["ORDINAL_POSITION"]));
-      Assert.AreEqual("YES", dt.Rows[2]["IS_NULLABLE"]);
-      Assert.AreEqual("VARCHAR", dt.Rows[2]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual("VARCHAR(50)", dt.Rows[2]["COLUMN_TYPE"].ToString().ToUpper());
+      Assert.That(dt.Rows[2]["TABLE_SCHEMA"].ToString().ToUpper(), Is.EqualTo((Connection.Database).ToUpper()));
+      Assert.That(dt.Rows[2]["COLUMN_NAME"].ToString().ToUpper(), Is.EqualTo("COL3"));
+      Assert.That(Convert.ToInt32(dt.Rows[2]["ORDINAL_POSITION"]), Is.EqualTo(3));
+      Assert.That(dt.Rows[2]["IS_NULLABLE"], Is.EqualTo("YES"));
+      Assert.That(dt.Rows[2]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("VARCHAR"));
+      Assert.That(dt.Rows[2]["COLUMN_TYPE"].ToString().ToUpper(), Is.EqualTo("VARCHAR(50)"));
 
       // fourth column
-      Assert.AreEqual((Connection.Database).ToUpper(), dt.Rows[3]["TABLE_SCHEMA"].ToString().ToUpper());
-      Assert.AreEqual("COL4", dt.Rows[3]["COLUMN_NAME"].ToString().ToUpper());
-      Assert.AreEqual(4, Convert.ToInt32(dt.Rows[3]["ORDINAL_POSITION"]));
-      Assert.AreEqual("YES", dt.Rows[3]["IS_NULLABLE"]);
-      Assert.AreEqual("TINYINT", dt.Rows[3]["DATA_TYPE"].ToString().ToUpper());
+      Assert.That(dt.Rows[3]["TABLE_SCHEMA"].ToString().ToUpper(), Is.EqualTo((Connection.Database).ToUpper()));
+      Assert.That(dt.Rows[3]["COLUMN_NAME"].ToString().ToUpper(), Is.EqualTo("COL4"));
+      Assert.That(Convert.ToInt32(dt.Rows[3]["ORDINAL_POSITION"]), Is.EqualTo(4));
+      Assert.That(dt.Rows[3]["IS_NULLABLE"], Is.EqualTo("YES"));
+      Assert.That(dt.Rows[3]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("TINYINT"));
 
       // fifth column
-      Assert.AreEqual((Connection.Database).ToUpper(), dt.Rows[4]["TABLE_SCHEMA"].ToString().ToUpper());
-      Assert.AreEqual("COL5", dt.Rows[4]["COLUMN_NAME"].ToString().ToUpper());
-      Assert.AreEqual(5, Convert.ToInt32(dt.Rows[4]["ORDINAL_POSITION"]));
-      Assert.AreEqual("YES", dt.Rows[4]["IS_NULLABLE"]);
-      Assert.AreEqual("VARCHAR", dt.Rows[4]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual("VARCHAR(20)", dt.Rows[4]["COLUMN_TYPE"].ToString().ToUpper());
-      Assert.AreEqual("BOO", dt.Rows[4]["COLUMN_DEFAULT"].ToString().ToUpper());
+      Assert.That(dt.Rows[4]["TABLE_SCHEMA"].ToString().ToUpper(), Is.EqualTo((Connection.Database).ToUpper()));
+      Assert.That(dt.Rows[4]["COLUMN_NAME"].ToString().ToUpper(), Is.EqualTo("COL5"));
+      Assert.That(Convert.ToInt32(dt.Rows[4]["ORDINAL_POSITION"]), Is.EqualTo(5));
+      Assert.That(dt.Rows[4]["IS_NULLABLE"], Is.EqualTo("YES"));
+      Assert.That(dt.Rows[4]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("VARCHAR"));
+      Assert.That(dt.Rows[4]["COLUMN_TYPE"].ToString().ToUpper(), Is.EqualTo("VARCHAR(20)"));
+      Assert.That(dt.Rows[4]["COLUMN_DEFAULT"].ToString().ToUpper(), Is.EqualTo("BOO"));
     }
 
 
@@ -259,13 +259,13 @@ public void CanGetSchemaInformationGeneratedColumns()
       cmd.ExecuteNonQuery();
 
       DataTable dt = Connection.GetSchema("Columns", new string[] { null, null, "Test", null });
-      Assert.AreEqual(3, dt.Rows.Count);
-      Assert.AreEqual("Columns", dt.TableName);
+      Assert.That(dt.Rows.Count, Is.EqualTo(3));
+      Assert.That(dt.TableName, Is.EqualTo("Columns"));
       if (Version.Major >= 5 && Version.Minor >= 7 && Version.Build >= 6)
       {
-        Assert.AreEqual("char", dt.Rows[2]["DATA_TYPE"]);
-        Assert.AreEqual("Name", dt.Rows[2]["GENERATION_EXPRESSION"].ToString().Trim('`'));
-        Assert.AreEqual("STORED GENERATED", dt.Rows[2]["EXTRA"]);
+        Assert.That(dt.Rows[2]["DATA_TYPE"], Is.EqualTo("char"));
+        Assert.That(dt.Rows[2]["GENERATION_EXPRESSION"].ToString().Trim('`'), Is.EqualTo("Name"));
+        Assert.That(dt.Rows[2]["EXTRA"], Is.EqualTo("STORED GENERATED"));
       }
     }
 
@@ -279,11 +279,11 @@ public void EnumAndSetColumns()
       ExecuteSQL("CREATE TABLE Test (col1 set('A','B','C'), col2 enum('A','B','C'))");
 
       DataTable dt = Connection.GetSchema("Columns", new string[] { null, null, "Test", null });
-      Assert.AreEqual(2, dt.Rows.Count);
-      Assert.AreEqual("set", dt.Rows[0]["DATA_TYPE"]);
-      Assert.AreEqual("enum", dt.Rows[1]["DATA_TYPE"]);
-      Assert.AreEqual("set('A','B','C')", dt.Rows[0]["COLUMN_TYPE"]);
-      Assert.AreEqual("enum('A','B','C')", dt.Rows[1]["COLUMN_TYPE"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(2));
+      Assert.That(dt.Rows[0]["DATA_TYPE"], Is.EqualTo("set"));
+      Assert.That(dt.Rows[1]["DATA_TYPE"], Is.EqualTo("enum"));
+      Assert.That(dt.Rows[0]["COLUMN_TYPE"], Is.EqualTo("set('A','B','C')"));
+      Assert.That(dt.Rows[1]["COLUMN_TYPE"], Is.EqualTo("enum('A','B','C')"));
     }
 
     [Test]
@@ -296,9 +296,9 @@ public void Procedures()
       restrictions[1] = Connection.Database;
       restrictions[2] = "spTest";
       DataTable dt = Connection.GetSchema("Procedures", restrictions);
-      Assert.True(dt.Rows.Count == 1);
-      Assert.AreEqual("Procedures", dt.TableName);
-      Assert.AreEqual("spTest", dt.Rows[0][3]);
+      Assert.That(dt.Rows.Count == 1);
+      Assert.That(dt.TableName, Is.EqualTo("Procedures"));
+      Assert.That(dt.Rows[0][3], Is.EqualTo("spTest"));
     }
 
     /// <summary>
@@ -310,8 +310,8 @@ public void ProcedureParameters()
     {
       var dt = Connection.GetSchema("PROCEDURE PARAMETERS");
 
-      Assert.AreEqual("Procedure Parameters", dt.TableName);
-      Assert.True(dt.Rows.Count > 0);
+      Assert.That(dt.TableName, Is.EqualTo("Procedure Parameters"));
+      Assert.That(dt.Rows.Count > 0);
     }
 
     [Test]
@@ -324,9 +324,9 @@ public void Functions()
       restrictions[1] = Connection.Database;
       restrictions[2] = "spFunc";
       DataTable dt = Connection.GetSchema("Procedures", restrictions);
-      Assert.True(dt.Rows.Count == 1);
-      Assert.AreEqual("Procedures", dt.TableName);
-      Assert.AreEqual("spFunc", dt.Rows[0][3]);
+      Assert.That(dt.Rows.Count == 1);
+      Assert.That(dt.TableName, Is.EqualTo("Procedures"));
+      Assert.That(dt.Rows[0][3], Is.EqualTo("spFunc"));
     }
 
     [Test]
@@ -337,29 +337,29 @@ public void Indexes()
       restrictions[2] = "Test";
       restrictions[1] = Connection.Database;
       DataTable dt = Connection.GetSchema("Indexes", restrictions);
-      Assert.AreEqual(1, dt.Rows.Count);
-      StringAssert.AreEqualIgnoringCase("test", dt.Rows[0]["TABLE_NAME"].ToString());
-      Assert.True((bool)dt.Rows[0]["PRIMARY"]);
-      Assert.True((bool)dt.Rows[0]["UNIQUE"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["TABLE_NAME"].ToString(), Is.EqualTo("test").IgnoreCase);
+      Assert.That((bool)dt.Rows[0]["PRIMARY"]);
+      Assert.That((bool)dt.Rows[0]["UNIQUE"]);
 
       ExecuteSQL("DROP TABLE IF EXISTS Test");
       ExecuteSQL("CREATE TABLE Test (id int, name varchar(50), " +
         "UNIQUE KEY key2 (name))");
 
       dt = Connection.GetSchema("Indexes", restrictions);
-      Assert.AreEqual(1, dt.Rows.Count);
-      StringAssert.AreEqualIgnoringCase("test", dt.Rows[0]["TABLE_NAME"].ToString());
-      Assert.AreEqual("key2", dt.Rows[0]["INDEX_NAME"]);
-      Assert.False((bool)dt.Rows[0]["PRIMARY"]);
-      Assert.True((bool)dt.Rows[0]["UNIQUE"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["TABLE_NAME"].ToString(), Is.EqualTo("test").IgnoreCase);
+      Assert.That(dt.Rows[0]["INDEX_NAME"], Is.EqualTo("key2"));
+      Assert.That(!(bool)dt.Rows[0]["PRIMARY"]);
+      Assert.That((bool)dt.Rows[0]["UNIQUE"]);
 
       restrictions[3] = "key2";
       dt = Connection.GetSchema("Indexes", restrictions);
-      Assert.AreEqual(1, dt.Rows.Count);
-      StringAssert.AreEqualIgnoringCase("test", dt.Rows[0]["TABLE_NAME"].ToString());
-      Assert.AreEqual("key2", dt.Rows[0]["INDEX_NAME"]);
-      Assert.False((bool)dt.Rows[0]["PRIMARY"]);
-      Assert.True((bool)dt.Rows[0]["UNIQUE"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["TABLE_NAME"].ToString(), Is.EqualTo("test").IgnoreCase);
+      Assert.That(dt.Rows[0]["INDEX_NAME"], Is.EqualTo("key2"));
+      Assert.That(!(bool)dt.Rows[0]["PRIMARY"]);
+      Assert.That((bool)dt.Rows[0]["UNIQUE"]);
 
       /// <summary> 
       /// Bug #48101	MySqlConnection.GetSchema on "Indexes" throws when there's a table named "b`a`d" 
@@ -370,11 +370,11 @@ public void Indexes()
 
       restrictions[2] = "Te`s`t";
       dt = Connection.GetSchema("Indexes", restrictions);
-      Assert.AreEqual(1, dt.Rows.Count);
-      StringAssert.AreEqualIgnoringCase("te`s`t", dt.Rows[0]["TABLE_NAME"].ToString());
-      Assert.AreEqual("key2", dt.Rows[0]["INDEX_NAME"]);
-      Assert.False((bool)dt.Rows[0]["PRIMARY"]);
-      Assert.False((bool)dt.Rows[0]["UNIQUE"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["TABLE_NAME"].ToString(), Is.EqualTo("te`s`t").IgnoreCase);
+      Assert.That(dt.Rows[0]["INDEX_NAME"], Is.EqualTo("key2"));
+      Assert.That(!(bool)dt.Rows[0]["PRIMARY"]);
+      Assert.That(!(bool)dt.Rows[0]["UNIQUE"]);
     }
 
     [Test]
@@ -385,9 +385,9 @@ public void IndexColumns()
       restrictions[2] = "Test";
       restrictions[1] = Connection.Database;
       DataTable dt = Connection.GetSchema("IndexColumns", restrictions);
-      Assert.AreEqual(1, dt.Rows.Count);
-      StringAssert.AreEqualIgnoringCase("test", dt.Rows[0]["TABLE_NAME"].ToString());
-      Assert.AreEqual("id", dt.Rows[0]["COLUMN_NAME"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["TABLE_NAME"].ToString(), Is.EqualTo("test").IgnoreCase);
+      Assert.That(dt.Rows[0]["COLUMN_NAME"], Is.EqualTo("id"));
 
       ExecuteSQL("DROP TABLE IF EXISTS Test");
       ExecuteSQL("CREATE TABLE Test (id int, id1 int, id2 int, " +
@@ -396,29 +396,29 @@ public void IndexColumns()
       restrictions[1] = Connection.Database;
       restrictions[4] = "id2";
       dt = Connection.GetSchema("IndexColumns", restrictions);
-      Assert.AreEqual(1, dt.Rows.Count);
-      StringAssert.AreEqualIgnoringCase("test", dt.Rows[0]["TABLE_NAME"].ToString());
-      Assert.AreEqual("id2", dt.Rows[0]["COLUMN_NAME"]);
-      Assert.AreEqual(2, dt.Rows[0]["ORDINAL_POSITION"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["TABLE_NAME"].ToString(), Is.EqualTo("test").IgnoreCase);
+      Assert.That(dt.Rows[0]["COLUMN_NAME"], Is.EqualTo("id2"));
+      Assert.That(dt.Rows[0]["ORDINAL_POSITION"], Is.EqualTo(2));
 
       restrictions[3] = "key1";
       dt = Connection.GetSchema("IndexColumns", restrictions);
-      Assert.AreEqual(1, dt.Rows.Count);
-      StringAssert.AreEqualIgnoringCase("test", dt.Rows[0]["TABLE_NAME"].ToString());
-      Assert.AreEqual("id2", dt.Rows[0]["COLUMN_NAME"]);
-      Assert.AreEqual(2, dt.Rows[0]["ORDINAL_POSITION"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["TABLE_NAME"].ToString(), Is.EqualTo("test").IgnoreCase);
+      Assert.That(dt.Rows[0]["COLUMN_NAME"], Is.EqualTo("id2"));
+      Assert.That(dt.Rows[0]["ORDINAL_POSITION"], Is.EqualTo(2));
 
       restrictions = new string[3];
       restrictions[1] = Connection.Database;
       restrictions[2] = "Test";
       dt = Connection.GetSchema("IndexColumns", restrictions);
-      Assert.AreEqual(2, dt.Rows.Count);
-      StringAssert.AreEqualIgnoringCase("test", dt.Rows[0]["TABLE_NAME"].ToString());
-      Assert.AreEqual("id1", dt.Rows[0]["COLUMN_NAME"]);
-      Assert.AreEqual(1, dt.Rows[0]["ORDINAL_POSITION"]);
-      StringAssert.AreEqualIgnoringCase("test", dt.Rows[0]["TABLE_NAME"].ToString());
-      Assert.AreEqual("id2", dt.Rows[1]["COLUMN_NAME"]);
-      Assert.AreEqual(2, dt.Rows[1]["ORDINAL_POSITION"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(2));
+      Assert.That(dt.Rows[0]["TABLE_NAME"].ToString(), Is.EqualTo("test").IgnoreCase);
+      Assert.That(dt.Rows[0]["COLUMN_NAME"], Is.EqualTo("id1"));
+      Assert.That(dt.Rows[0]["ORDINAL_POSITION"], Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["TABLE_NAME"].ToString(), Is.EqualTo("test").IgnoreCase);
+      Assert.That(dt.Rows[1]["COLUMN_NAME"], Is.EqualTo("id2"));
+      Assert.That(dt.Rows[1]["ORDINAL_POSITION"], Is.EqualTo(2));
 
       restrictions = new string[4];
       ExecuteSQL("DROP TABLE IF EXISTS Test");
@@ -439,9 +439,9 @@ public void Views()
       restrictions[1] = Connection.Database;
       restrictions[2] = "vw";
       DataTable dt = Connection.GetSchema("Views", restrictions);
-      Assert.True(dt.Rows.Count == 1);
-      Assert.AreEqual("Views", dt.TableName);
-      Assert.AreEqual("vw", dt.Rows[0]["TABLE_NAME"]);
+      Assert.That(dt.Rows.Count == 1);
+      Assert.That(dt.TableName, Is.EqualTo("Views"));
+      Assert.That(dt.Rows[0]["TABLE_NAME"], Is.EqualTo("vw"));
     }
 
     [Test]
@@ -454,11 +454,11 @@ public void ViewColumns()
       restrictions[1] = Connection.Database;
       restrictions[2] = "vw";
       DataTable dt = Connection.GetSchema("ViewColumns", restrictions);
-      Assert.True(dt.Rows.Count == 1);
-      Assert.AreEqual("ViewColumns", dt.TableName);
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[0]["VIEW_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("vw", dt.Rows[0]["VIEW_NAME"]);
-      Assert.AreEqual("theTime", dt.Rows[0]["COLUMN_NAME"]);
+      Assert.That(dt.Rows.Count == 1);
+      Assert.That(dt.TableName, Is.EqualTo("ViewColumns"));
+      Assert.That(dt.Rows[0]["VIEW_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[0]["VIEW_NAME"], Is.EqualTo("vw"));
+      Assert.That(dt.Rows[0]["COLUMN_NAME"], Is.EqualTo("theTime"));
     }
 
     [Test]
@@ -474,14 +474,14 @@ public void SingleForeignKey()
       restrictions[1] = Connection.Database;
       restrictions[2] = "child";
       DataTable dt = Connection.GetSchema("Foreign Keys", restrictions);
-      Assert.AreEqual(1, dt.Rows.Count);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
       DataRow row = dt.Rows[0];
-      Assert.AreEqual(Connection.Database.ToLower(), row[1].ToString().ToLower());
-      Assert.AreEqual("c1", row[2]);
-      Assert.AreEqual(Connection.Database.ToLower(), row[4].ToString().ToLower());
-      Assert.AreEqual("child", row[5]);
-      Assert.AreEqual(Connection.Database.ToLower(), row[10].ToString().ToLower());
-      Assert.AreEqual("parent", row[11]);
+      Assert.That(row[1].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(row[2], Is.EqualTo("c1"));
+      Assert.That(row[4].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(row[5], Is.EqualTo("child"));
+      Assert.That(row[10].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(row[11], Is.EqualTo("parent"));
     }
 
     /// <summary>
@@ -507,7 +507,7 @@ public void ForeignKeys()
         "FOREIGN KEY (customer_id) REFERENCES customer(id)) ENGINE=INNODB");
 
       DataTable dt = Connection.GetSchema("Foreign Keys");
-      Assert.True(dt.Columns.Contains("REFERENCED_TABLE_CATALOG"));
+      Assert.That(dt.Columns.Contains("REFERENCED_TABLE_CATALOG"));
     }
 
     [Test]
@@ -532,22 +532,22 @@ public void MultiSingleForeignKey()
       restrictions[1] = Connection.Database;
       restrictions[2] = "product_order";
       DataTable dt = Connection.GetSchema("Foreign Keys", restrictions);
-      Assert.AreEqual(2, dt.Rows.Count);
+      Assert.That(dt.Rows.Count, Is.EqualTo(2));
       DataRow row = dt.Rows[0];
-      Assert.AreEqual(Connection.Database.ToLower(), row[1].ToString().ToLower());
-      Assert.AreEqual("product_order_ibfk_1", row[2]);
-      Assert.AreEqual(Connection.Database.ToLower(), row[4].ToString().ToLower());
-      Assert.AreEqual("product_order", row[5]);
-      Assert.AreEqual(Connection.Database.ToLower(), row[10].ToString().ToLower());
-      Assert.AreEqual("product", row[11]);
+      Assert.That(row[1].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(row[2], Is.EqualTo("product_order_ibfk_1"));
+      Assert.That(row[4].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(row[5], Is.EqualTo("product_order"));
+      Assert.That(row[10].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(row[11], Is.EqualTo("product"));
 
       row = dt.Rows[1];
-      Assert.AreEqual(Connection.Database.ToLower(), row[1].ToString().ToLower());
-      Assert.AreEqual("product_order_ibfk_2", row[2]);
-      Assert.AreEqual(Connection.Database.ToLower(), row[4].ToString().ToLower());
-      Assert.AreEqual("product_order", row[5]);
-      Assert.AreEqual(Connection.Database.ToLower(), row[10].ToString().ToLower());
-      Assert.AreEqual("customer", row[11]);
+      Assert.That(row[1].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(row[2], Is.EqualTo("product_order_ibfk_2"));
+      Assert.That(row[4].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(row[5], Is.EqualTo("product_order"));
+      Assert.That(row[10].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(row[11], Is.EqualTo("customer"));
     }
 
     [Test]
@@ -565,13 +565,13 @@ public void Triggers()
       restrictions[1] = Connection.Database;
       restrictions[2] = "test1";
       DataTable dt = Connection.GetSchema("Triggers", restrictions);
-      Assert.True(dt.Rows.Count == 1);
-      Assert.AreEqual("Triggers", dt.TableName);
-      Assert.AreEqual("trigger1", dt.Rows[0]["TRIGGER_NAME"]);
-      Assert.AreEqual("INSERT", dt.Rows[0]["EVENT_MANIPULATION"]);
-      Assert.AreEqual("test1", dt.Rows[0]["EVENT_OBJECT_TABLE"]);
-      Assert.AreEqual("ROW", dt.Rows[0]["ACTION_ORIENTATION"]);
-      Assert.AreEqual("AFTER", dt.Rows[0]["ACTION_TIMING"]);
+      Assert.That(dt.Rows.Count == 1);
+      Assert.That(dt.TableName, Is.EqualTo("Triggers"));
+      Assert.That(dt.Rows[0]["TRIGGER_NAME"], Is.EqualTo("trigger1"));
+      Assert.That(dt.Rows[0]["EVENT_MANIPULATION"], Is.EqualTo("INSERT"));
+      Assert.That(dt.Rows[0]["EVENT_OBJECT_TABLE"], Is.EqualTo("test1"));
+      Assert.That(dt.Rows[0]["ACTION_ORIENTATION"], Is.EqualTo("ROW"));
+      Assert.That(dt.Rows[0]["ACTION_TIMING"], Is.EqualTo("AFTER"));
     }
 
     [Test]
@@ -584,10 +584,10 @@ public void UsingQuotedRestrictions()
       restrictions[1] = Connection.Database;
       restrictions[2] = "`test1`";
       DataTable dt = Connection.GetSchema("Tables", restrictions);
-      Assert.True(dt.Rows.Count == 1);
-      Assert.AreEqual("Tables", dt.TableName);
-      Assert.AreEqual("test1", dt.Rows[0][2]);
-      Assert.AreEqual("`test1`", restrictions[2]);
+      Assert.That(dt.Rows.Count == 1);
+      Assert.That(dt.TableName, Is.EqualTo("Tables"));
+      Assert.That(dt.Rows[0][2], Is.EqualTo("test1"));
+      Assert.That(restrictions[2], Is.EqualTo("`test1`"));
     }
 
     [Test]
@@ -595,8 +595,8 @@ public void ReservedWords()
     {
       DataTable dt = Connection.GetSchema("ReservedWords");
       foreach (DataRow row in dt.Rows)
-        Assert.False(String.IsNullOrEmpty(row[0] as string));
-      Assert.AreEqual(235, dt.Rows.Count); // number of keywords: 235
+        Assert.That(!String.IsNullOrEmpty(row[0] as string));
+      Assert.That(dt.Rows.Count, Is.EqualTo(235)); // number of keywords: 235
     }
 
     [Test]
@@ -615,22 +615,22 @@ public void GetSchemaCollections()
 
       MySqlSchemaCollection schemaCollection = schema.GetSchema("columns", restrictions);
 
-      Assert.True(schemaCollection.Columns.Count == 20);
-      Assert.True(schemaCollection.Rows.Count == 2);
-      Assert.AreEqual("parent", schemaCollection.Rows[0]["TABLE_NAME"]);
-      Assert.AreEqual("id", schemaCollection.Rows[0]["COLUMN_NAME"]);
+      Assert.That(schemaCollection.Columns.Count == 20);
+      Assert.That(schemaCollection.Rows.Count == 2);
+      Assert.That(schemaCollection.Rows[0]["TABLE_NAME"], Is.EqualTo("parent"));
+      Assert.That(schemaCollection.Rows[0]["COLUMN_NAME"], Is.EqualTo("id"));
 
       schemaCollection = schema.GetForeignKeysAsync(restrictions, false).GetAwaiter().GetResult();
-      Assert.True(schemaCollection.AsDataTable().Columns.Contains("REFERENCED_TABLE_NAME"));
+      Assert.That(schemaCollection.AsDataTable().Columns.Contains("REFERENCED_TABLE_NAME"));
 
       schemaCollection = schema.GetForeignKeyColumnsAsync(restrictions, false).GetAwaiter().GetResult();
-      Assert.True(schemaCollection.AsDataTable().Columns.Contains("REFERENCED_COLUMN_NAME"));
+      Assert.That(schemaCollection.AsDataTable().Columns.Contains("REFERENCED_COLUMN_NAME"));
 
       schemaCollection = schema.GetUDFAsync(restrictions, false).GetAwaiter().GetResult();
-      Assert.True(schemaCollection.AsDataTable().Columns.Contains("RETURN_TYPE"));
+      Assert.That(schemaCollection.AsDataTable().Columns.Contains("RETURN_TYPE"));
 
       schemaCollection = schema.GetUsersAsync(restrictions, false).GetAwaiter().GetResult();
-      Assert.True(schemaCollection.AsDataTable().Columns.Contains("USERNAME"));
+      Assert.That(schemaCollection.AsDataTable().Columns.Contains("USERNAME"));
 
       using (var conn = new MySqlConnection(Connection.ConnectionString))
       {
@@ -639,8 +639,8 @@ public void GetSchemaCollections()
         foreach (DataRow row in table.Rows)
           foreach (DataColumn col in table.Columns)
           {
-            Assert.IsNotNull(col.ColumnName);
-            Assert.IsNotNull(row[col]);
+            Assert.That(col.ColumnName, Is.Not.Null);
+            Assert.That(row[col], Is.Not.Null);
           }
       }
 
@@ -665,11 +665,11 @@ public void ColumnSizeWithOldGuids()
         {
           DataTable schemaTable = reader.GetSchemaTable();
 
-          Assert.AreEqual(36, schemaTable.Rows[0]["ColumnSize"]);
-          Assert.AreEqual(16, schemaTable.Rows[1]["ColumnSize"]);
-          Assert.AreEqual(37, schemaTable.Rows[2]["ColumnSize"]);
-          Assert.AreEqual(255, schemaTable.Rows[3]["ColumnSize"]);
-          Assert.AreEqual(65535, schemaTable.Rows[4]["ColumnSize"]);
+          Assert.That(schemaTable.Rows[0]["ColumnSize"], Is.EqualTo(36));
+          Assert.That(schemaTable.Rows[1]["ColumnSize"], Is.EqualTo(16));
+          Assert.That(schemaTable.Rows[2]["ColumnSize"], Is.EqualTo(37));
+          Assert.That(schemaTable.Rows[3]["ColumnSize"], Is.EqualTo(255));
+          Assert.That(schemaTable.Rows[4]["ColumnSize"], Is.EqualTo(65535));
         }
       }
     }
@@ -692,10 +692,10 @@ public void IsLongProperty()
         using (var reader = cmd.ExecuteReader())
         {
           var schemaTable = reader.GetSchemaTable();
-          Assert.AreEqual("-1", schemaTable.Rows[0]["ColumnSize"].ToString(), "Matching the Column Size");
-          Assert.AreEqual("True", schemaTable.Rows[0]["IsLong"].ToString(), "Matching the Column Size");
-          Assert.AreEqual("-1", schemaTable.Rows[1]["ColumnSize"].ToString(), "Matching the Column Size");
-          Assert.AreEqual("True", schemaTable.Rows[1]["IsLong"].ToString(), "Matching the Column Size");
+          Assert.That(schemaTable.Rows[0]["ColumnSize"].ToString(), Is.EqualTo("-1"), "Matching the Column Size");
+          Assert.That(schemaTable.Rows[0]["IsLong"].ToString(), Is.EqualTo("True"), "Matching the Column Size");
+          Assert.That(schemaTable.Rows[1]["ColumnSize"].ToString(), Is.EqualTo("-1"), "Matching the Column Size");
+          Assert.That(schemaTable.Rows[1]["IsLong"].ToString(), Is.EqualTo("True"), "Matching the Column Size");
         }
       }
     }
@@ -716,8 +716,8 @@ public void NumericPrecisionProperty()
         using (var reader = cmd.ExecuteReader())
         {
           var schemaTable = reader.GetSchemaTable();
-          Assert.AreEqual(8, schemaTable.Rows[0]["NumericPrecision"]);
-          Assert.AreEqual(0, schemaTable.Rows[0]["NumericScale"]);
+          Assert.That(schemaTable.Rows[0]["NumericPrecision"], Is.EqualTo(8));
+          Assert.That(schemaTable.Rows[0]["NumericScale"], Is.EqualTo(0));
         }
       }
     }
@@ -738,7 +738,7 @@ public void GetSchemaReturnColumnsByOrdinalPosition()
       string[] expected = new string[] { "x", "a", "z", "c" };
 
       for (int i = 0; i < rows.Count; i++)
-        Assert.AreEqual(rows[i]["COLUMN_NAME"], expected[i]);
+        Assert.That(expected[i], Is.EqualTo(rows[i]["COLUMN_NAME"]));
     }
 
     [Test, Description("Test to verify different variations in Generated Coloumns")]
@@ -763,22 +763,22 @@ c2 double GENERATED ALWAYS AS(c1 * 101 / 102) Stored COMMENT 'First Gen Col',
 
         using (var reader = cmd.ExecuteReader())
         {
-          Assert.True(reader.Read(), "Matching the values");
-          Assert.True(reader.GetInt32(0).Equals(1000), "Matching the values");
-          Assert.True(reader.GetDouble(1).Equals(990.196078431), "Matching the values");
-          Assert.True(reader.GetInt64(2).Equals(10000000), "Matching the values");
+          Assert.That(reader.Read(), "Matching the values");
+          Assert.That(reader.GetInt32(0).Equals(1000), "Matching the values");
+          Assert.That(reader.GetDouble(1).Equals(990.196078431), "Matching the values");
+          Assert.That(reader.GetInt64(2).Equals(10000000), "Matching the values");
         }
 
         var dt = conn.GetSchema("Columns", new[] { null, null, "Test", null });
-        Assert.AreEqual(3, dt.Rows.Count, "Matching the values");
-        Assert.AreEqual("Columns", dt.TableName, "Matching the values");
-        Assert.AreEqual("int", dt.Rows[0]["DATA_TYPE"].ToString(), "Matching the values");
-        Assert.AreEqual("double", dt.Rows[1]["DATA_TYPE"].ToString(), "Matching the values");
-        Assert.AreEqual("bigint", dt.Rows[2]["DATA_TYPE"].ToString(), "Matching the values");
-        Assert.AreEqual("", dt.Rows[0]["GENERATION_EXPRESSION"].ToString(), "Matching the values");
-        Assert.AreEqual("", dt.Rows[0]["EXTRA"].ToString(), "Matching the values");
-        Assert.AreEqual("STORED GENERATED", dt.Rows[1]["EXTRA"].ToString(), "Matching the values");
-        Assert.AreEqual("VIRTUAL GENERATED", dt.Rows[2]["EXTRA"].ToString(), "Matching the values");
+        Assert.That(dt.Rows.Count, Is.EqualTo(3), "Matching the values");
+        Assert.That(dt.TableName, Is.EqualTo("Columns"), "Matching the values");
+        Assert.That(dt.Rows[0]["DATA_TYPE"].ToString(), Is.EqualTo("int"), "Matching the values");
+        Assert.That(dt.Rows[1]["DATA_TYPE"].ToString(), Is.EqualTo("double"), "Matching the values");
+        Assert.That(dt.Rows[2]["DATA_TYPE"].ToString(), Is.EqualTo("bigint"), "Matching the values");
+        Assert.That(dt.Rows[0]["GENERATION_EXPRESSION"].ToString(), Is.EqualTo(""), "Matching the values");
+        Assert.That(dt.Rows[0]["EXTRA"].ToString(), Is.EqualTo(""), "Matching the values");
+        Assert.That(dt.Rows[1]["EXTRA"].ToString(), Is.EqualTo("STORED GENERATED"), "Matching the values");
+        Assert.That(dt.Rows[2]["EXTRA"].ToString(), Is.EqualTo("VIRTUAL GENERATED"), "Matching the values");
       }
     }
 
@@ -796,12 +796,12 @@ public void GetIndexColumnsWithFullTextIndex()
       {
         string cmdText = $"SELECT name, index_id, table_id, space from INFORMATION_SCHEMA.INNODB_INDEXES WHERE name = '{indexName}'";
         MySqlCommand cmd = new MySqlCommand(cmdText, Connection);
-        StringAssert.AreEqualIgnoringCase(indexName, cmd.ExecuteScalar().ToString());
+        Assert.That(cmd.ExecuteScalar().ToString(), Is.EqualTo(indexName).IgnoreCase);
       }
 
       var indexColumns = Connection.GetSchema("IndexColumns");
       var row = indexColumns.Select("TABLE_NAME = 'Test'");
-      StringAssert.AreEqualIgnoringCase(indexName, row[0]["INDEX_NAME"].ToString());
+      Assert.That(row[0]["INDEX_NAME"].ToString(), Is.EqualTo(indexName).IgnoreCase);
     }
   }
 }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/InstallerTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/InstallerTests.cs
index d028719b0..a8fcbe190 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/InstallerTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/InstallerTests.cs
@@ -112,7 +112,7 @@ public void CanRemoveAssemblyBinding()
                &&
                nodesDependantAssembly[0].ChildNodes[0].Attributes[0].Value.Contains("MySql"))
             {              
-              Assert.True(true, "Error when removing assembly binding redirection");
+              Assert.That(true, "Error when removing assembly binding redirection");
             }
           }
         }        
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
index bdeff2071..c16d037f8 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
@@ -61,7 +61,7 @@ public void EscapeStringMethodCanEscapeQuotationMark()
       cmd.CommandText = "SELECT name FROM Test WHERE id=1";
       string name = (string)cmd.ExecuteScalar();
 
-      Assert.True("test\"name\"" == name, "Update result with quotation mark");
+      Assert.That("test\"name\"" == name, "Update result with quotation mark");
     }
 
     #region Async
@@ -74,12 +74,12 @@ public async Task ExecuteNonQueryAsync()
       try
       {
         int result = await MySqlHelper.ExecuteNonQueryAsync(Connection, "call MSHNonQueryAsyncSpTest", null);
-        Assert.AreNotEqual(-1, result);
+        Assert.That(result, Is.Not.EqualTo(-1));
 
         MySqlCommand cmd = new MySqlCommand("SELECT COUNT(*) FROM MSHNonQueryAsyncTest;", Connection);
         cmd.CommandType = System.Data.CommandType.Text;
         object cnt = cmd.ExecuteScalar();
-        Assert.AreEqual(100, Convert.ToInt32(cnt));
+        Assert.That(Convert.ToInt32(cnt), Is.EqualTo(100));
       }
       finally
       {
@@ -101,34 +101,34 @@ public async Task ExecuteDataSetAsync()
         string sql = "SELECT MSHDataSetAsyncTable1.key FROM MSHDataSetAsyncTable1 WHERE MSHDataSetAsyncTable1.key=1; " +
                      "SELECT MSHDataSetAsyncTable2.key FROM MSHDataSetAsyncTable2 WHERE MSHDataSetAsyncTable2.key=1";
         DataSet ds = await MySqlHelper.ExecuteDatasetAsync(Connection, sql, null);
-        Assert.AreEqual(2, ds.Tables.Count);
-        Assert.AreEqual(1, ds.Tables[0].Rows.Count);
-        Assert.AreEqual(1, ds.Tables[1].Rows.Count);
-        Assert.AreEqual(1, ds.Tables[0].Rows[0]["key"]);
-        Assert.AreEqual(1, ds.Tables[1].Rows[0]["key"]);
+        Assert.That(ds.Tables.Count, Is.EqualTo(2));
+        Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(1));
+        Assert.That(ds.Tables[1].Rows.Count, Is.EqualTo(1));
+        Assert.That(ds.Tables[0].Rows[0]["key"], Is.EqualTo(1));
+        Assert.That(ds.Tables[1].Rows[0]["key"], Is.EqualTo(1));
 
         ds = await MySqlHelper.ExecuteDatasetAsync(Connection, sql);
-        Assert.AreEqual(2, ds.Tables.Count);
-        Assert.AreEqual(1, ds.Tables[0].Rows.Count);
-        Assert.AreEqual(1, ds.Tables[1].Rows[0]["key"]);
+        Assert.That(ds.Tables.Count, Is.EqualTo(2));
+        Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(1));
+        Assert.That(ds.Tables[1].Rows[0]["key"], Is.EqualTo(1));
 
         ds = await MySqlHelper.ExecuteDatasetAsync(Connection.ConnectionString, sql, null);
-        Assert.AreEqual(1, ds.Tables[0].Rows.Count);
-        Assert.AreEqual(1, ds.Tables[1].Rows.Count);
-        Assert.AreEqual(1, ds.Tables[0].Rows[0]["key"]);
+        Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(1));
+        Assert.That(ds.Tables[1].Rows.Count, Is.EqualTo(1));
+        Assert.That(ds.Tables[0].Rows[0]["key"], Is.EqualTo(1));
 
         ds = await MySqlHelper.ExecuteDatasetAsync(Connection.ConnectionString, sql);
-        Assert.AreEqual(2, ds.Tables.Count);
-        Assert.AreEqual(1, ds.Tables[0].Rows.Count);
-        Assert.AreEqual(1, ds.Tables[1].Rows[0]["key"]);
+        Assert.That(ds.Tables.Count, Is.EqualTo(2));
+        Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(1));
+        Assert.That(ds.Tables[1].Rows[0]["key"], Is.EqualTo(1));
 
         ds = await MySqlHelper.ExecuteDatasetAsync(Connection.ConnectionString, sql, CancellationToken.None, null);
-        Assert.AreEqual(2, ds.Tables.Count);
-        Assert.AreEqual(1, ds.Tables[0].Rows.Count);
+        Assert.That(ds.Tables.Count, Is.EqualTo(2));
+        Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(1));
 
         ds = await MySqlHelper.ExecuteDatasetAsync(Connection, sql, CancellationToken.None);
-        Assert.AreEqual(2, ds.Tables.Count);
-        Assert.AreEqual(1, ds.Tables[0].Rows[0]["key"]);
+        Assert.That(ds.Tables.Count, Is.EqualTo(2));
+        Assert.That(ds.Tables[0].Rows[0]["key"], Is.EqualTo(1));
       }
       finally
       {
@@ -147,17 +147,17 @@ public async Task ExecuteReaderAsync()
       {
         using (MySqlDataReader reader = await MySqlHelper.ExecuteReaderAsync(Connection, "call MSHReaderAsyncSpTest"))
         {
-          Assert.NotNull(reader);
-          Assert.True(reader.Read(), "can read");
-          Assert.True(reader.NextResult());
-          Assert.True(reader.Read());
-          Assert.AreEqual("done", reader.GetString(0));
+          Assert.That(reader, Is.Not.Null);
+          Assert.That(reader.Read(), "can read");
+          Assert.That(reader.NextResult());
+          Assert.That(reader.Read());
+          Assert.That(reader.GetString(0), Is.EqualTo("done"));
           reader.Close();
 
           MySqlCommand cmd = new MySqlCommand("SELECT COUNT(*) FROM MSHReaderAsyncTest", Connection);
           cmd.CommandType = CommandType.Text;
           object cnt = cmd.ExecuteScalar();
-          Assert.AreEqual(1, Convert.ToInt32(cnt));
+          Assert.That(Convert.ToInt32(cnt), Is.EqualTo(1));
         }
       }
       finally
@@ -176,7 +176,7 @@ public async Task ExecuteScalarAsync()
       try
       {
         object result = await MySqlHelper.ExecuteScalarAsync(Connection, "SELECT MSHScalarAsyncTable1.key FROM MSHScalarAsyncTable1 WHERE MSHScalarAsyncTable1.key=1;");
-        Assert.AreEqual(1, int.Parse(result.ToString()));
+        Assert.That(int.Parse(result.ToString()), Is.EqualTo(1));
       }
       finally
       {
@@ -193,7 +193,7 @@ public async Task ExecuteDataRowAsync()
       try
       {
         DataRow result = await MySqlHelper.ExecuteDataRowAsync(Connection.ConnectionString, "SELECT name FROM Test WHERE id=1", null);
-        Assert.AreEqual("name", result[0]);
+        Assert.That(result[0], Is.EqualTo("name"));
 
       }
       finally
@@ -216,7 +216,7 @@ public void UpdateDataSet()
 
       MySqlHelper.UpdateDataSet(Connection.ConnectionString, "SELECT * FROM Test", ds, "Test");
       DataRow result = ds.Tables["Test"].Rows[0];
-      Assert.AreEqual("updatedName", result["name"]);
+      Assert.That(result["name"], Is.EqualTo("updatedName"));
     }
 
     [Test]
@@ -235,7 +235,7 @@ public async Task UpdateDataSetAsync()
       {
         await MySqlHelper.UpdateDataSetAsync(Connection.ConnectionString, "SELECT * FROM Test", ds, "Test");
         DataRow result = ds.Tables["Test"].Rows[0];
-        Assert.AreEqual("updatedName", result["name"]);
+        Assert.That(result["name"], Is.EqualTo("updatedName"));
       }
       finally
       {
@@ -252,20 +252,20 @@ public void ExecuteDataset()
 
       DataSet ds = MySqlHelper.ExecuteDataset(Connection, "SELECT * FROM Test");
       Assert.That(ds.Tables, Has.One.Items);
-      Assert.AreEqual(2, ds.Tables[0].Rows.Count);
-      Assert.AreEqual("name", ds.Tables[0].Rows[0][1]);
+      Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(2));
+      Assert.That(ds.Tables[0].Rows[0][1], Is.EqualTo("name"));
 
       MySqlParameter mySqlParameter = new MySqlParameter("@id", 2);
       ds = MySqlHelper.ExecuteDataset(Connection, "SELECT * FROM Test WHERE id = @id", mySqlParameter);
       Assert.That(ds.Tables, Has.One.Items);
-      Assert.AreEqual(1, ds.Tables[0].Rows.Count);
-      Assert.AreEqual("name2", ds.Tables[0].Rows[0][1]);
+      Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(1));
+      Assert.That(ds.Tables[0].Rows[0][1], Is.EqualTo("name2"));
 
       ds = MySqlHelper.ExecuteDataset(Connection.ConnectionString, "SELECT * FROM Test", null);
       Assert.That(ds.Tables, Has.One.Items);
-      Assert.AreEqual(2, ds.Tables[0].Rows.Count);
-      Assert.AreEqual("name", ds.Tables[0].Rows[0][1]);
-      Assert.AreEqual("name2", ds.Tables[0].Rows[1][1]);
+      Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(2));
+      Assert.That(ds.Tables[0].Rows[0][1], Is.EqualTo("name"));
+      Assert.That(ds.Tables[0].Rows[1][1], Is.EqualTo("name2"));
     }
     #endregion
   }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlCommandBuilderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlCommandBuilderTests.cs
index 542c70aa8..ae2b38de7 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlCommandBuilderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlCommandBuilderTests.cs
@@ -58,14 +58,14 @@ public void MultiWord()
       row["multi word"] = 2;
       dt.Rows.Add(row);
       da.Update(dt);
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual(2, dt.Rows[0]["multi word"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["multi word"], Is.EqualTo(2));
 
       dt.Rows[0]["multi word"] = 3;
       da.Update(dt);
       cb.Dispose();
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual(3, dt.Rows[0]["multi word"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["multi word"], Is.EqualTo(3));
     }
 
     [Test]
@@ -80,17 +80,17 @@ public void LastOneWins()
       cb.ConflictOption = ConflictOption.OverwriteChanges;
       DataTable dt = new DataTable();
       da.Fill(dt);
-      Assert.AreEqual(1, dt.Rows.Count);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
 
       ExecuteSQL("UPDATE Test SET name='Test2' WHERE id=1");
 
       dt.Rows[0]["name"] = "Test3";
-      Assert.AreEqual(1, da.Update(dt));
+      Assert.That(da.Update(dt), Is.EqualTo(1));
 
       dt.Rows.Clear();
       da.Fill(dt);
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual("Test3", dt.Rows[0]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("Test3"));
     }
 
     [Test]
@@ -104,18 +104,18 @@ public void NotLastOneWins()
       cb.ConflictOption = ConflictOption.CompareAllSearchableValues;
       DataTable dt = new DataTable();
       da.Fill(dt);
-      Assert.AreEqual(1, dt.Rows.Count);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
 
       ExecuteSQL("UPDATE Test SET name='Test2' WHERE id=1");
       dt.Rows[0]["name"] = "Test3";
       void Update() { da.Update(dt); }
       Exception ex = Assert.Throws<DBConcurrencyException>(() => Update());
-      Assert.AreEqual("Concurrency violation: the UpdateCommand affected 0 of the expected 1 records.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Concurrency violation: the UpdateCommand affected 0 of the expected 1 records."));
 
       dt.Rows.Clear();
       da.Fill(dt);
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual("Test2", dt.Rows[0]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("Test2"));
     }
 
     /// <summary>
@@ -141,9 +141,9 @@ public void UsingFunctions()
       da.SelectCommand.CommandText = "SELECT id, name, CONCAT(name, '  boo') as newname from Test where id=4";
       dt.Clear();
       da.Fill(dt);
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual("test1", dt.Rows[0]["name"]);
-      Assert.AreEqual("test1  boo", dt.Rows[0]["newname"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("test1"));
+      Assert.That(dt.Rows[0]["newname"], Is.EqualTo("test1  boo"));
 
       dt.Rows[0]["id"] = 5;
       da.Update(dt);
@@ -151,8 +151,8 @@ public void UsingFunctions()
       dt.Clear();
       da.SelectCommand.CommandText = "SELECT * FROM Test WHERE id=5";
       da.Fill(dt);
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual("test1", dt.Rows[0]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("test1"));
 
       da.SelectCommand.CommandText = "SELECT *, now() as stime FROM Test WHERE id<4";
       cb = new MySqlCommandBuilder(da);
@@ -235,8 +235,8 @@ public void SemicolonAtEndOfSQL()
       dt.Clear();
       da.Fill(dt);
       cb.Dispose();
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual(2, dt.Rows[0]["id"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["id"], Is.EqualTo(2));
     }
 
     /// <summary>
@@ -257,7 +257,7 @@ public void AutoIncrementColumnsOnInsert()
       DataTable dt = new DataTable();
       da.Fill(dt);
       dt.Columns[0].AutoIncrement = true;
-      Assert.True(dt.Columns[0].AutoIncrement);
+      Assert.That(dt.Columns[0].AutoIncrement);
       dt.Columns[0].AutoIncrementSeed = -1;
       dt.Columns[0].AutoIncrementStep = -1;
       DataRow row = dt.NewRow();
@@ -268,9 +268,9 @@ public void AutoIncrementColumnsOnInsert()
 
       dt.Clear();
       da.Fill(dt);
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual(1, dt.Rows[0]["id"]);
-      Assert.AreEqual("Test", dt.Rows[0]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["id"], Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("Test"));
       cb.Dispose();
     }
 
@@ -298,17 +298,17 @@ public void AutoIncrementColumnsOnInsert2()
       row["name"] = "Test";
       dt.Rows.Add(row);
       da.Update(dt);
-      Assert.AreEqual(1, Convert.ToInt32(dt.Rows[0]["id"]));
-      Assert.AreEqual("Test", dt.Rows[0]["name"]);
+      Assert.That(Convert.ToInt32(dt.Rows[0]["id"]), Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("Test"));
 
       row = dt.NewRow();
       row["name"] = "Test2";
       dt.Rows.Add(row);
       da.Update(dt);
-      Assert.AreEqual(2, Convert.ToInt32(dt.Rows[1]["id"]));
-      Assert.AreEqual("Test2", dt.Rows[1]["name"]);
+      Assert.That(Convert.ToInt32(dt.Rows[1]["id"]), Is.EqualTo(2));
+      Assert.That(dt.Rows[1]["name"], Is.EqualTo("Test2"));
 
-      Assert.AreEqual(1, Convert.ToInt32(dt.Rows[0]["id"]));
+      Assert.That(Convert.ToInt32(dt.Rows[0]["id"]), Is.EqualTo(1));
     }
 
     [Test]
@@ -369,7 +369,7 @@ public void UpdatingWithDateInKey()
       dt.Clear();
       da.SelectCommand.CommandText = "SELECT * FROM Test WHERE cod=6";
       da.Fill(dt);
-      Assert.AreEqual(6, dt.Rows[0]["cod"]);
+      Assert.That(dt.Rows[0]["cod"], Is.EqualTo(6));
     }
 
     /// <summary>
@@ -379,14 +379,14 @@ public void UpdatingWithDateInKey()
     public void QuoteAndUnquoteIdentifiers()
     {
       MySqlCommandBuilder cb = new MySqlCommandBuilder();
-      Assert.AreEqual("`boo`", cb.QuoteIdentifier("boo"));
-      Assert.AreEqual("`bo``o`", cb.QuoteIdentifier("bo`o"));
-      Assert.AreEqual("`boo`", cb.QuoteIdentifier("`boo`"));
+      Assert.That(cb.QuoteIdentifier("boo"), Is.EqualTo("`boo`"));
+      Assert.That(cb.QuoteIdentifier("bo`o"), Is.EqualTo("`bo``o`"));
+      Assert.That(cb.QuoteIdentifier("`boo`"), Is.EqualTo("`boo`"));
 
       // now do the unquoting
-      Assert.AreEqual("boo", cb.UnquoteIdentifier("`boo`"));
-      Assert.AreEqual("`boo", cb.UnquoteIdentifier("`boo"));
-      Assert.AreEqual("bo`o", cb.UnquoteIdentifier("`bo``o`"));
+      Assert.That(cb.UnquoteIdentifier("`boo`"), Is.EqualTo("boo"));
+      Assert.That(cb.UnquoteIdentifier("`boo"), Is.EqualTo("`boo"));
+      Assert.That(cb.UnquoteIdentifier("`bo``o`"), Is.EqualTo("bo`o"));
     }
 
     /// <summary>
@@ -403,8 +403,7 @@ public void BigintUnsignedAsPK()
       var commandBuilder = new MySqlCommandBuilder(adapter);
       var myCommand = commandBuilder.GetUpdateCommand();
 
-      StringAssert.AreEqualIgnoringCase($"UPDATE `test` SET `field1` = @p1 WHERE ((`id` = @p2) AND (`field1` = @p3))",
-        myCommand.CommandText);
+      Assert.That(myCommand.CommandText, Is.EqualTo($"UPDATE `test` SET `field1` = @p1 WHERE ((`id` = @p2) AND (`field1` = @p3))").IgnoreCase);
     }
   }
 }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
index 27effd8f6..0df4429a5 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
@@ -76,15 +76,15 @@ private void FillImpl(bool prepare)
       da.Fill(ds, "Test");
 
       Assert.That(ds.Tables, Has.One.Items);
-      Assert.AreEqual(3, ds.Tables[0].Rows.Count);
+      Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(3));
 
-      Assert.AreEqual(1, ds.Tables[0].Rows[0]["id2"]);
-      Assert.AreEqual(2, ds.Tables[0].Rows[1]["id2"]);
-      Assert.AreEqual(3, ds.Tables[0].Rows[2]["id2"]);
+      Assert.That(ds.Tables[0].Rows[0]["id2"], Is.EqualTo(1));
+      Assert.That(ds.Tables[0].Rows[1]["id2"], Is.EqualTo(2));
+      Assert.That(ds.Tables[0].Rows[2]["id2"], Is.EqualTo(3));
 
-      Assert.AreEqual("Name 1", ds.Tables[0].Rows[0]["name"]);
-      Assert.AreEqual(DBNull.Value, ds.Tables[0].Rows[1]["name"]);
-      Assert.AreEqual(String.Empty, ds.Tables[0].Rows[2]["name"]);
+      Assert.That(ds.Tables[0].Rows[0]["name"], Is.EqualTo("Name 1"));
+      Assert.That(ds.Tables[0].Rows[1]["name"], Is.EqualTo(DBNull.Value));
+      Assert.That(ds.Tables[0].Rows[2]["name"], Is.EqualTo(String.Empty));
     }
 
     [Test]
@@ -103,8 +103,8 @@ public void TestUpdate()
       int count = da.Update(dt);
 
       // make sure our refresh of auto increment values worked
-      Assert.True(count == 1, "checking insert count");
-      Assert.True(dt.Rows[dt.Rows.Count - 1]["id"] != null, "Checking auto increment column");
+      Assert.That(count == 1, "checking insert count");
+      Assert.That(dt.Rows[dt.Rows.Count - 1]["id"] != null, "Checking auto increment column");
 
       dt.Rows.Clear();
       da.Fill(dt);
@@ -116,25 +116,25 @@ public void TestUpdate()
       dt.Rows[0]["tm"] = day1.TimeOfDay;
       count = da.Update(dt);
 
-      Assert.True(dt.Rows[0]["ts"] != null, "checking refresh of record");
-      Assert.True(dt.Rows[0]["id2"] != null, "checking refresh of primary column");
+      Assert.That(dt.Rows[0]["ts"] != null, "checking refresh of record");
+      Assert.That(dt.Rows[0]["id2"] != null, "checking refresh of primary column");
 
       dt.Rows.Clear();
       da.Fill(dt);
 
-      Assert.True(count == 1, "checking update count");
+      Assert.That(count == 1, "checking update count");
       DateTime dateTime = (DateTime)dt.Rows[0]["dt"];
-      Assert.True(day1.Date == dateTime.Date, "checking date");
-      Assert.True(day1.TimeOfDay == (TimeSpan)dt.Rows[0]["tm"], "checking time");
+      Assert.That(day1.Date == dateTime.Date, "checking date");
+      Assert.That(day1.TimeOfDay == (TimeSpan)dt.Rows[0]["tm"], "checking time");
 
       dt.Rows[0].Delete();
       count = da.Update(dt);
 
-      Assert.True(count == 1, "checking insert count");
+      Assert.That(count == 1, "checking insert count");
 
       dt.Rows.Clear();
       da.Fill(dt);
-      Assert.True(dt.Rows.Count == 0, "checking row count");
+      Assert.That(dt.Rows.Count == 0, "checking row count");
       cb.Dispose();
     }
 
@@ -159,8 +159,8 @@ public void OriginalInName()
       dt.Rows.Add(row);
       da.Update(dt);
 
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual(2, dt.Rows[0]["OriginalId"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["OriginalId"], Is.EqualTo(2));
     }
 
     [Test]
@@ -179,13 +179,13 @@ public void UseAdapterPropertyOfCommandBuilder()
       dt.Rows[0]["name"] = "Test Update";
       int updateCnt = da.Update(dt);
 
-      Assert.AreEqual(1, updateCnt);
+      Assert.That(updateCnt, Is.EqualTo(1));
 
       dt.Rows.Clear();
       da.Fill(dt);
 
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual("Test Update", dt.Rows[0]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("Test Update"));
     }
 
     [Test]
@@ -204,13 +204,13 @@ public void UpdateNullTextFieldToEmptyString()
       dt.Rows[0]["name"] = "";
       int updateCnt = da.Update(dt);
 
-      Assert.AreEqual(1, updateCnt);
+      Assert.That(updateCnt, Is.EqualTo(1));
 
       dt.Rows.Clear();
       da.Fill(dt);
 
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual("", dt.Rows[0]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo(""));
     }
 
     [Test]
@@ -230,7 +230,7 @@ public void UpdateExtendedTextFields()
 
       dt.Clear();
       da.Fill(dt);
-      Assert.AreEqual("This is my new note", dt.Rows[0]["notes"]);
+      Assert.That(dt.Rows[0]["notes"], Is.EqualTo("This is my new note"));
     }
 
     [Test]
@@ -244,7 +244,7 @@ public void SelectMoreThan252Rows()
       DataTable dt = new DataTable();
       da.Fill(dt);
 
-      Assert.AreEqual(500, dt.Rows.Count);
+      Assert.That(dt.Rows.Count, Is.EqualTo(500));
     }
 
     [Test]
@@ -258,14 +258,14 @@ public void DiscreteValues()
       DataTable dt = new DataTable();
       da.Fill(dt);
 
-      Assert.AreEqual("Test", dt.Rows[0]["name"]);
-      Assert.AreEqual("Test 1", dt.Rows[1]["name"]);
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("Test"));
+      Assert.That(dt.Rows[1]["name"], Is.EqualTo("Test 1"));
 
-      Assert.AreEqual("Text 1", dt.Rows[0]["b1"]);
-      Assert.AreEqual("Text 2", dt.Rows[1]["b1"]);
+      Assert.That(dt.Rows[0]["b1"], Is.EqualTo("Text 1"));
+      Assert.That(dt.Rows[1]["b1"], Is.EqualTo("Text 2"));
 
-      Assert.AreEqual(new DateTime(2004, 8, 1, 0, 0, 0).ToString(), dt.Rows[0]["dt"].ToString());
-      Assert.AreEqual(new DateTime(2004, 7, 2, 0, 0, 0).ToString(), dt.Rows[1]["dt"].ToString());
+      Assert.That(dt.Rows[0]["dt"].ToString(), Is.EqualTo(new DateTime(2004, 8, 1, 0, 0, 0).ToString()));
+      Assert.That(dt.Rows[1]["dt"].ToString(), Is.EqualTo(new DateTime(2004, 7, 2, 0, 0, 0).ToString()));
     }
 
     [Test]
@@ -280,14 +280,14 @@ public void Bug5798()
       DataTable dt = new DataTable();
       da.Fill(dt);
 
-      Assert.AreEqual(String.Empty, dt.Rows[0]["name"]);
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo(String.Empty));
 
       dt.Rows[0]["name"] = "Test";
       da.Update(dt);
 
       dt.Clear();
       da.Fill(dt);
-      Assert.AreEqual("Test", dt.Rows[0]["name"]);
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("Test"));
     }
 
     [Test]
@@ -312,11 +312,11 @@ public void TestFillWithHelper()
       string sql = "SELECT table1.key FROM table1 WHERE table1.key=1; " +
         "SELECT table2.key FROM table2 WHERE table2.key=1";
       DataSet ds = MySqlHelper.ExecuteDataset(Connection, sql, null);
-      Assert.AreEqual(2, ds.Tables.Count);
-      Assert.AreEqual(1, ds.Tables[0].Rows.Count);
-      Assert.AreEqual(1, ds.Tables[1].Rows.Count);
-      Assert.AreEqual(1, ds.Tables[0].Rows[0]["key"]);
-      Assert.AreEqual(1, ds.Tables[1].Rows[0]["key"]);
+      Assert.That(ds.Tables.Count, Is.EqualTo(2));
+      Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(1));
+      Assert.That(ds.Tables[1].Rows.Count, Is.EqualTo(1));
+      Assert.That(ds.Tables[0].Rows[0]["key"], Is.EqualTo(1));
+      Assert.That(ds.Tables[1].Rows[0]["key"], Is.EqualTo(1));
     }
 
     /// <summary>
@@ -332,7 +332,7 @@ public void AutoIncrementColumns()
       MySqlCommandBuilder cb = new MySqlCommandBuilder(da);
       DataSet ds = new DataSet();
       da.Fill(ds);
-      Assert.AreEqual(1, Convert.ToInt32(ds.Tables[0].Rows[0]["id"]));
+      Assert.That(Convert.ToInt32(ds.Tables[0].Rows[0]["id"]), Is.EqualTo(1));
       DataRow row = ds.Tables[0].NewRow();
       ds.Tables[0].Rows.Add(row);
 
@@ -340,8 +340,8 @@ public void AutoIncrementColumns()
 
       ds.Clear();
       da.Fill(ds);
-      Assert.AreEqual(1, Convert.ToInt32(ds.Tables[0].Rows[0]["id"]));
-      Assert.AreEqual(2, Convert.ToInt32(ds.Tables[0].Rows[1]["id"]));
+      Assert.That(Convert.ToInt32(ds.Tables[0].Rows[0]["id"]), Is.EqualTo(1));
+      Assert.That(Convert.ToInt32(ds.Tables[0].Rows[1]["id"]), Is.EqualTo(2));
       cb.Dispose();
     }
 
@@ -360,9 +360,9 @@ public void Rollup()
       da.Fill(ds);
 
       Assert.That(ds.Tables, Has.One.Items);
-      Assert.AreEqual(3, ds.Tables[0].Rows.Count);
-      Assert.AreEqual(88, ds.Tables[0].Rows[2]["amount"]);
-      Assert.AreEqual(DBNull.Value, ds.Tables[0].Rows[2]["id"]);
+      Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(3));
+      Assert.That(ds.Tables[0].Rows[2]["amount"], Is.EqualTo(88));
+      Assert.That(ds.Tables[0].Rows[2]["id"], Is.EqualTo(DBNull.Value));
     }
 
     /// <summary>
@@ -407,7 +407,7 @@ public void Bug16307()
       {
         reader.Read();
         int intCallNum = Int32.Parse(reader.GetValue(0).ToString());
-        Assert.AreEqual(1, intCallNum);
+        Assert.That(intCallNum, Is.EqualTo(1));
       }
     }
 
@@ -424,24 +424,24 @@ public void QuietOpenAndClose()
       {
         MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", c);
         MySqlCommandBuilder cb = new MySqlCommandBuilder(da);
-        Assert.True(c.State == ConnectionState.Closed);
+        Assert.That(c.State == ConnectionState.Closed);
         DataTable dt = new DataTable();
         da.Fill(dt);
-        Assert.True(c.State == ConnectionState.Closed);
-        Assert.AreEqual(1, dt.Rows.Count);
+        Assert.That(c.State == ConnectionState.Closed);
+        Assert.That(dt.Rows.Count, Is.EqualTo(1));
 
         dt.Rows[0][0] = 2;
         DataRow[] rows = new DataRow[1];
         rows[0] = dt.Rows[0];
         da.Update(dt);
-        Assert.True(c.State == ConnectionState.Closed);
+        Assert.That(c.State == ConnectionState.Closed);
 
         dt.Clear();
         c.Open();
-        Assert.True(c.State == ConnectionState.Open);
+        Assert.That(c.State == ConnectionState.Open);
         da.Fill(dt);
-        Assert.True(c.State == ConnectionState.Open);
-        Assert.AreEqual(1, dt.Rows.Count);
+        Assert.That(c.State == ConnectionState.Open);
+        Assert.That(dt.Rows.Count, Is.EqualTo(1));
         cb.Dispose();
       }
     }
@@ -481,9 +481,9 @@ public void FillWithNulls()
 
       dt.Clear();
       da.Fill(dt);
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual(1, dt.Rows[0]["id"]);
-      Assert.AreEqual("Test1", dt.Rows[0]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["id"], Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("Test1"));
 
       row = dt.NewRow();
       row["name"] = System.DBNull.Value;
@@ -493,9 +493,9 @@ public void FillWithNulls()
 
       dt.Clear();
       da.Fill(dt);
-      Assert.AreEqual(2, dt.Rows.Count);
-      Assert.AreEqual(2, dt.Rows[1]["id"]);
-      Assert.AreEqual(DBNull.Value, dt.Rows[1]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(2));
+      Assert.That(dt.Rows[1]["id"], Is.EqualTo(2));
+      Assert.That(dt.Rows[1]["name"], Is.EqualTo(DBNull.Value));
 
       row = dt.NewRow();
       row["name"] = "Test3";
@@ -505,9 +505,9 @@ public void FillWithNulls()
 
       dt.Clear();
       da.Fill(dt);
-      Assert.AreEqual(3, dt.Rows.Count);
-      Assert.AreEqual(3, dt.Rows[2]["id"]);
-      Assert.AreEqual("Test3", dt.Rows[2]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(3));
+      Assert.That(dt.Rows[2]["id"], Is.EqualTo(3));
+      Assert.That(dt.Rows[2]["name"], Is.EqualTo("Test3"));
       cb.Dispose();
     }
 
@@ -530,7 +530,7 @@ public void PagingFill()
       MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", Connection);
       DataTable dt = new DataTable();
       da.Fill(0, 10, new DataTable[] { dt });
-      Assert.AreEqual(10, dt.Rows.Count);
+      Assert.That(dt.Rows.Count, Is.EqualTo(10));
     }
 
     private string MakeLargeString(int len)
@@ -591,11 +591,11 @@ public void TestBatchingInserts()
 
       dt.Rows.Clear();
       da.Fill(dt);
-      Assert.AreEqual(100, dt.Rows.Count);
+      Assert.That(dt.Rows.Count, Is.EqualTo(100));
       for (int i = 0; i < 100; i++)
       {
-        Assert.AreEqual(i + 1, dt.Rows[i]["id"]);
-        Assert.AreEqual("name " + (i + 1), dt.Rows[i]["name"]);
+        Assert.That(dt.Rows[i]["id"], Is.EqualTo(i + 1));
+        Assert.That(dt.Rows[i]["name"], Is.EqualTo("name " + (i + 1)));
       }
     }
 
@@ -627,13 +627,13 @@ public void TestBatchingUpdates()
 
       dt.Rows.Clear();
       da.Fill(dt);
-      Assert.AreEqual(3, dt.Rows.Count);
-      Assert.AreEqual(2, dt.Rows[0]["id"]);
-      Assert.AreEqual(4, dt.Rows[1]["id"]);
-      Assert.AreEqual(6, dt.Rows[2]["id"]);
-      Assert.AreEqual("new test value", dt.Rows[0]["name"]);
-      Assert.AreEqual("Test 1", dt.Rows[1]["name"]);
-      Assert.AreEqual("new test value #2", dt.Rows[2]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(3));
+      Assert.That(dt.Rows[0]["id"], Is.EqualTo(2));
+      Assert.That(dt.Rows[1]["id"], Is.EqualTo(4));
+      Assert.That(dt.Rows[2]["id"], Is.EqualTo(6));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("new test value"));
+      Assert.That(dt.Rows[1]["name"], Is.EqualTo("Test 1"));
+      Assert.That(dt.Rows[2]["name"], Is.EqualTo("new test value #2"));
     }
 
     [Test]
@@ -675,13 +675,13 @@ public void TestBatchingMixed()
 
       dt.Rows.Clear();
       da.Fill(dt);
-      Assert.AreEqual(3, dt.Rows.Count);
-      Assert.AreEqual(4, dt.Rows[0]["id"]);
-      Assert.AreEqual(6, dt.Rows[1]["id"]);
-      Assert.AreEqual(7, dt.Rows[2]["id"]);
-      Assert.AreEqual("Test 1", dt.Rows[0]["name"]);
-      Assert.AreEqual("new test value #2", dt.Rows[1]["name"]);
-      Assert.AreEqual("foobar", dt.Rows[2]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(3));
+      Assert.That(dt.Rows[0]["id"], Is.EqualTo(4));
+      Assert.That(dt.Rows[1]["id"], Is.EqualTo(6));
+      Assert.That(dt.Rows[2]["id"], Is.EqualTo(7));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("Test 1"));
+      Assert.That(dt.Rows[1]["name"], Is.EqualTo("new test value #2"));
+      Assert.That(dt.Rows[2]["name"], Is.EqualTo("foobar"));
     }
 
     [Test]
@@ -717,9 +717,9 @@ public void TestBatchingInsertsMoreThanMaxPacket()
 
       dt.Rows.Clear();
       da.Fill(dt);
-      Assert.AreEqual(numRows, dt.Rows.Count);
+      Assert.That(dt.Rows.Count, Is.EqualTo(numRows));
       for (int i = 0; i < numRows; i++)
-        Assert.AreEqual(i, dt.Rows[i]["id"]);
+        Assert.That(dt.Rows[i]["id"], Is.EqualTo(i));
     }
 
     [Test]
@@ -733,9 +733,9 @@ public void FunctionsReturnString()
         MySqlDataAdapter da = new MySqlDataAdapter("SELECT CONCAT(1,2)", c);
         DataTable dt = new DataTable();
         da.Fill(dt);
-        Assert.AreEqual(1, dt.Rows.Count);
-        Assert.AreEqual("12", dt.Rows[0][0]);
-        Assert.True(dt.Rows[0][0] is string);
+        Assert.That(dt.Rows.Count, Is.EqualTo(1));
+        Assert.That(dt.Rows[0][0], Is.EqualTo("12"));
+        Assert.That(dt.Rows[0][0] is string);
       }
     }
 
@@ -804,7 +804,7 @@ public void AdapterConcurrentException()
       table.Rows.Add(r);
       da.Update(table);
 
-      Assert.AreEqual(DataRowState.Unchanged, r.RowState);
+      Assert.That(r.RowState, Is.EqualTo(DataRowState.Unchanged));
 
       table.Rows[0].Delete();
 
@@ -814,8 +814,8 @@ public void AdapterConcurrentException()
 
       da.Update(table); // here was concurrencyviolation
       da.Fill(ds);
-      Assert.AreEqual(1, ds.Tables["T"].Rows.Count);
-      Assert.AreEqual("row2", ds.Tables["T"].Rows[0]["field"]);
+      Assert.That(ds.Tables["T"].Rows.Count, Is.EqualTo(1));
+      Assert.That(ds.Tables["T"].Rows[0]["field"], Is.EqualTo("row2"));
     }
 
     /// <summary>
@@ -866,11 +866,11 @@ public void BatchingConnectionClosed()
 
       dt.Rows.Clear();
       da.Fill(dt);
-      Assert.AreEqual(100, dt.Rows.Count);
+      Assert.That(dt.Rows.Count, Is.EqualTo(100));
       for (int i = 0; i < 100; i++)
       {
-        Assert.AreEqual(i + 1, dt.Rows[i]["id"]);
-        Assert.AreEqual("name " + (i + 1), dt.Rows[i]["name"]);
+        Assert.That(dt.Rows[i]["id"], Is.EqualTo(i + 1));
+        Assert.That(dt.Rows[i]["name"], Is.EqualTo("name " + (i + 1)));
       }
 
       foreach (DataRow row in dt.Rows)
@@ -885,7 +885,7 @@ public void BatchingConnectionClosed()
       da.Update(dt);
       dt.Rows.Clear();
       da.Fill(dt);
-      Assert.AreEqual(0, dt.Rows.Count);
+      Assert.That(dt.Rows.Count, Is.EqualTo(0));
 
     }
 
@@ -950,13 +950,13 @@ public void UpdateReturnFirstRecord()
       DataTable table = ds.Tables["bugtable"];
       DataRow row = table.Rows[0];
       row["field"] = "newvalue";
-      Assert.AreEqual(DataRowState.Modified, row.RowState);
-      Assert.AreEqual(0, (int)row["counter"]);
+      Assert.That(row.RowState, Is.EqualTo(DataRowState.Modified));
+      Assert.That((int)row["counter"], Is.EqualTo(0));
 
       da.Update(table);
 
       // Verify that "counter" field was changed by updating stored procedure.
-      Assert.AreEqual(1, (int)row["counter"]);
+      Assert.That((int)row["counter"], Is.EqualTo(1));
     }
 
     [Test]
@@ -973,13 +973,13 @@ public void FillFromStoredProcedureMultipleTimesCreatesExpectedRows()
         adapter.SelectCommand.CommandType = CommandType.StoredProcedure;
         DataTable table = new DataTable();
         adapter.Fill(table);
-        Assert.AreEqual(1, table.Rows.Count);
+        Assert.That(table.Rows.Count, Is.EqualTo(1));
 
         adapter = new MySqlDataAdapter("SimpleSelect", connection);
         adapter.SelectCommand.CommandType = CommandType.StoredProcedure;
         table = new DataTable();
         adapter.Fill(table);
-        Assert.AreEqual(1, table.Rows.Count);
+        Assert.That(table.Rows.Count, Is.EqualTo(1));
 
         MySqlConnection.ClearPool(connection);
       }
@@ -1000,7 +1000,7 @@ public void ChangeStoredProcedureBasedSelectCommandDoesNotThrow()
         adapter.SelectCommand.CommandType = CommandType.StoredProcedure;
         DataTable table = new DataTable();
         adapter.Fill(table);
-        Assert.AreEqual(1, table.Rows.Count);
+        Assert.That(table.Rows.Count, Is.EqualTo(1));
 
         adapter.SelectCommand = new MySqlCommand("SimpleSelect2", connection);
         adapter.SelectCommand.CommandType = CommandType.StoredProcedure;
@@ -1009,7 +1009,7 @@ public void ChangeStoredProcedureBasedSelectCommandDoesNotThrow()
         try
         {
           adapter.Fill(table);
-          Assert.AreEqual(1, table.Rows.Count);
+          Assert.That(table.Rows.Count, Is.EqualTo(1));
         }
         finally
         {
@@ -1037,7 +1037,7 @@ public async Task CommandBuilderAsync()
         var changes = dt.GetChanges();
         var count = da.Update(changes);
         dt.AcceptChanges();
-        Assert.True(count == 1, "checking update count");
+        Assert.That(count == 1, "checking update count");
         await conn.CloseAsync();
       }
 
@@ -1054,7 +1054,7 @@ public async Task CommandBuilderAsync()
         var changes = dt.GetChanges();
         var count = da.Update(changes);
         dt.AcceptChanges();
-        Assert.True(count == 1, "checking update count");
+        Assert.That(count == 1, "checking update count");
         await conn.CloseAsync();
       }
     }
@@ -1105,7 +1105,7 @@ public void BatchOverMaxPacketAllowed()
 
         dataAdapter.UpdateBatchSize = 2;
         var ex = Assert.Throws<MySqlException>(() => dataAdapter.Update(dataRows));
-        StringAssert.AreEqualIgnoringCase(Resources.QueryTooLarge, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(Resources.QueryTooLarge).IgnoreCase);
       }
 
       // setting back to the initial value
@@ -1126,31 +1126,31 @@ public async Task FillAsyncDataSet()
       await da.FillAsync(ds, "DAFillAsyncTest");
 
       Assert.That(ds.Tables, Has.One.Items);
-      Assert.AreEqual(3, ds.Tables[0].Rows.Count);
+      Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(3));
 
-      Assert.AreEqual(1, ds.Tables[0].Rows[0]["id2"]);
-      Assert.AreEqual(2, ds.Tables[0].Rows[1]["id2"]);
-      Assert.AreEqual(3, ds.Tables[0].Rows[2]["id2"]);
+      Assert.That(ds.Tables[0].Rows[0]["id2"], Is.EqualTo(1));
+      Assert.That(ds.Tables[0].Rows[1]["id2"], Is.EqualTo(2));
+      Assert.That(ds.Tables[0].Rows[2]["id2"], Is.EqualTo(3));
 
-      Assert.AreEqual("Name 1", ds.Tables[0].Rows[0]["name"]);
-      Assert.AreEqual(DBNull.Value, ds.Tables[0].Rows[1]["name"]);
-      Assert.AreEqual(String.Empty, ds.Tables[0].Rows[2]["name"]);
+      Assert.That(ds.Tables[0].Rows[0]["name"], Is.EqualTo("Name 1"));
+      Assert.That(ds.Tables[0].Rows[1]["name"], Is.EqualTo(DBNull.Value));
+      Assert.That(ds.Tables[0].Rows[2]["name"], Is.EqualTo(String.Empty));
 
       ds.Reset();
       await da.FillAsync(ds);
 
       Assert.That(ds.Tables, Has.One.Items);
-      Assert.AreEqual(3, ds.Tables[0].Rows.Count);
-      Assert.AreEqual("Name 1", ds.Tables[0].Rows[0]["name"]);
+      Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(3));
+      Assert.That(ds.Tables[0].Rows[0]["name"], Is.EqualTo("Name 1"));
 
       ds.Reset();
       await da.FillAsync(ds, 1, 2, "DAFillAsyncTest");
 
       Assert.That(ds.Tables, Has.One.Items);
-      Assert.AreEqual(2, ds.Tables[0].Rows.Count);
-      Assert.AreEqual(2, ds.Tables[0].Rows[0]["id2"]);
-      Assert.AreEqual(DBNull.Value, ds.Tables[0].Rows[0]["name"]);
-      Assert.AreEqual(String.Empty, ds.Tables[0].Rows[1]["name"]);
+      Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(2));
+      Assert.That(ds.Tables[0].Rows[0]["id2"], Is.EqualTo(2));
+      Assert.That(ds.Tables[0].Rows[0]["name"], Is.EqualTo(DBNull.Value));
+      Assert.That(ds.Tables[0].Rows[1]["name"], Is.EqualTo(String.Empty));
 
       ds.Reset();
       using (MySqlCommand cmd = new MySqlCommand("select * from DAFillAsyncTest", Connection))
@@ -1158,18 +1158,18 @@ public async Task FillAsyncDataSet()
         await da.FillAsync(ds, "DAFillAsyncTest", reader, 0, 1);
 
       Assert.That(ds.Tables, Has.One.Items);
-      Assert.AreEqual(1, ds.Tables[0].Rows.Count);
-      Assert.AreEqual(1, ds.Tables[0].Rows[0]["id2"]);
-      Assert.AreEqual("Name 1", ds.Tables[0].Rows[0]["name"]);
+      Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(1));
+      Assert.That(ds.Tables[0].Rows[0]["id2"], Is.EqualTo(1));
+      Assert.That(ds.Tables[0].Rows[0]["name"], Is.EqualTo("Name 1"));
 
       ds.Reset();
       using (MySqlCommand cmd = new MySqlCommand("select * from DAFillAsyncTest", Connection))
         await da.FillAsync(ds, 0, 2, "DAFillAsyncTest", cmd, CommandBehavior.Default);
 
       Assert.That(ds.Tables, Has.One.Items);
-      Assert.AreEqual(2, ds.Tables[0].Rows.Count);
-      Assert.AreEqual(1, ds.Tables[0].Rows[0]["id2"]);
-      Assert.AreEqual(DBNull.Value, ds.Tables[0].Rows[1]["name"]);
+      Assert.That(ds.Tables[0].Rows.Count, Is.EqualTo(2));
+      Assert.That(ds.Tables[0].Rows[0]["id2"], Is.EqualTo(1));
+      Assert.That(ds.Tables[0].Rows[1]["name"], Is.EqualTo(DBNull.Value));
     }
 
     [Test]
@@ -1185,51 +1185,51 @@ public async Task FillAsyncDataTable()
       DataTable dt = new DataTable();
       await da.FillAsync(dt);
 
-      Assert.AreEqual(3, dt.Rows.Count);
-      Assert.AreEqual(7, dt.Columns.Count);
-      Assert.AreEqual("Name 1", dt.Rows[0]["name"]);
-      Assert.AreEqual(DBNull.Value, dt.Rows[1]["name"]);
-      Assert.AreEqual(String.Empty, dt.Rows[2]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(3));
+      Assert.That(dt.Columns.Count, Is.EqualTo(7));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("Name 1"));
+      Assert.That(dt.Rows[1]["name"], Is.EqualTo(DBNull.Value));
+      Assert.That(dt.Rows[2]["name"], Is.EqualTo(String.Empty));
 
       dt.Reset();
       using (MySqlCommand cmd = new MySqlCommand("select * from DAFillAsyncDtTest", Connection))
       using (MySqlDataReader reader = cmd.ExecuteReader())
         await da.FillAsync(dt, reader);
 
-      Assert.AreEqual(3, dt.Rows.Count);
-      Assert.AreEqual(7, dt.Columns.Count);
-      Assert.AreEqual(1, dt.Rows[0]["id2"]);
-      Assert.AreEqual(2, dt.Rows[1]["id2"]);
-      Assert.AreEqual(3, dt.Rows[2]["id2"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(3));
+      Assert.That(dt.Columns.Count, Is.EqualTo(7));
+      Assert.That(dt.Rows[0]["id2"], Is.EqualTo(1));
+      Assert.That(dt.Rows[1]["id2"], Is.EqualTo(2));
+      Assert.That(dt.Rows[2]["id2"], Is.EqualTo(3));
 
       dt.Reset();
       using (MySqlCommand cmd = new MySqlCommand("select * from DAFillAsyncDtTest", Connection))
         await da.FillAsync(dt, cmd, CommandBehavior.Default);
 
-      Assert.AreEqual(3, dt.Rows.Count);
-      Assert.AreEqual(7, dt.Columns.Count);
-      Assert.AreEqual(DBNull.Value, dt.Rows[1]["name"]);
-      Assert.AreEqual(2, dt.Rows[1]["id2"]);
-      Assert.AreEqual(3, dt.Rows[2]["id2"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(3));
+      Assert.That(dt.Columns.Count, Is.EqualTo(7));
+      Assert.That(dt.Rows[1]["name"], Is.EqualTo(DBNull.Value));
+      Assert.That(dt.Rows[1]["id2"], Is.EqualTo(2));
+      Assert.That(dt.Rows[2]["id2"], Is.EqualTo(3));
 
       dt.Reset();
       DataTable[] dataTables = { dt };
       await da.FillAsync(0, 1, dataTables);
 
       Assert.That(dataTables, Has.One.Items);
-      Assert.AreEqual(1, dataTables[0].Rows.Count);
-      Assert.AreEqual(1, dataTables[0].Rows[0]["id2"]);
-      Assert.AreEqual("Name 1", dataTables[0].Rows[0]["name"]);
+      Assert.That(dataTables[0].Rows.Count, Is.EqualTo(1));
+      Assert.That(dataTables[0].Rows[0]["id2"], Is.EqualTo(1));
+      Assert.That(dataTables[0].Rows[0]["name"], Is.EqualTo("Name 1"));
 
       dt.Reset();
       using (MySqlCommand cmd = new MySqlCommand("select * from DAFillAsyncDtTest", Connection))
         await da.FillAsync(dataTables, 1, 2, cmd, CommandBehavior.Default);
 
       Assert.That(dataTables, Has.One.Items);
-      Assert.AreEqual(2, dataTables[0].Rows.Count);
-      Assert.AreEqual(2, dataTables[0].Rows[0]["id2"]);
-      Assert.AreEqual(DBNull.Value, dataTables[0].Rows[0]["name"]);
-      Assert.AreEqual(String.Empty, dataTables[0].Rows[1]["name"]);
+      Assert.That(dataTables[0].Rows.Count, Is.EqualTo(2));
+      Assert.That(dataTables[0].Rows[0]["id2"], Is.EqualTo(2));
+      Assert.That(dataTables[0].Rows[0]["name"], Is.EqualTo(DBNull.Value));
+      Assert.That(dataTables[0].Rows[1]["name"], Is.EqualTo(String.Empty));
     }
 
     [Test]
@@ -1248,48 +1248,48 @@ public async Task FillSchemaAsync()
       MySqlDataAdapter da = new MySqlDataAdapter(cmd);
       DataTable schema = new DataTable();
       await da.FillSchemaAsync(schema, SchemaType.Source);
-      Assert.AreEqual(2, schema.Columns.Count);
+      Assert.That(schema.Columns.Count, Is.EqualTo(2));
 
       DataSet ds = new DataSet();
       await da.FillSchemaAsync(ds, SchemaType.Source);
-      Assert.True(ds.Tables.Count == 1);
-      Assert.AreEqual(2, ds.Tables[0].Columns.Count);
+      Assert.That(ds.Tables.Count == 1);
+      Assert.That(ds.Tables[0].Columns.Count, Is.EqualTo(2));
 
       ds.Reset();
       using (cmd)
       using (reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly))
         await da.FillSchemaAsync(ds, SchemaType.Source, "DAFillSchemaAsyncTest", reader);
 
-      Assert.True(ds.Tables.Count == 1);
-      Assert.AreEqual(2, ds.Tables[0].Columns.Count);
+      Assert.That(ds.Tables.Count == 1);
+      Assert.That(ds.Tables[0].Columns.Count, Is.EqualTo(2));
 
       ds.Reset();
       using (cmd)
         await da.FillSchemaAsync(ds, SchemaType.Source, cmd, "DAFillSchemaAsyncTest", CommandBehavior.SchemaOnly);
 
-      Assert.True(ds.Tables.Count == 1);
-      Assert.AreEqual(2, ds.Tables[0].Columns.Count);
+      Assert.That(ds.Tables.Count == 1);
+      Assert.That(ds.Tables[0].Columns.Count, Is.EqualTo(2));
 
       ds.Reset();
       using (cmd)
         await da.FillSchemaAsync(ds, SchemaType.Source, "DAFillSchemaAsyncTest", CancellationToken.None);
 
-      Assert.True(ds.Tables.Count == 1);
-      Assert.AreEqual(2, ds.Tables[0].Columns.Count);
+      Assert.That(ds.Tables.Count == 1);
+      Assert.That(ds.Tables[0].Columns.Count, Is.EqualTo(2));
 
       DataTable dataTable = new DataTable();
       using (cmd)
       using (reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly))
         await da.FillSchemaAsync(dataTable, SchemaType.Source, reader);
 
-      Assert.AreEqual(2, dataTable.Columns.Count);
+      Assert.That(dataTable.Columns.Count, Is.EqualTo(2));
 
       dataTable.Reset();
       using (cmd)
         await da.FillSchemaAsync(dataTable, SchemaType.Source, cmd, CommandBehavior.SchemaOnly);
 
-      Assert.AreEqual(2, dataTable.Columns.Count);
-      Assert.AreEqual("id", dataTable.Columns[0].ColumnName);
+      Assert.That(dataTable.Columns.Count, Is.EqualTo(2));
+      Assert.That(dataTable.Columns[0].ColumnName, Is.EqualTo("id"));
     }
 
     [Test]
@@ -1307,8 +1307,8 @@ public async Task UpdateAsync()
       dt.Rows.Add(dr);
       int count = await da.UpdateAsync(dt);
 
-      Assert.True(count == 1, "checking insert count");
-      Assert.True(dt.Rows[dt.Rows.Count - 1]["id"] != null, "Checking auto increment column");
+      Assert.That(count == 1, "checking insert count");
+      Assert.That(dt.Rows[dt.Rows.Count - 1]["id"] != null, "Checking auto increment column");
 
       dt.Rows.Clear();
       da.Fill(dt);
@@ -1320,25 +1320,25 @@ public async Task UpdateAsync()
       dt.Rows[0]["tm"] = day1.TimeOfDay;
       count = await da.UpdateAsync(dt);
 
-      Assert.True(dt.Rows[0]["ts"] != null, "checking refresh of record");
-      Assert.True(dt.Rows[0]["id2"] != null, "checking refresh of primary column");
+      Assert.That(dt.Rows[0]["ts"] != null, "checking refresh of record");
+      Assert.That(dt.Rows[0]["id2"] != null, "checking refresh of primary column");
 
       dt.Rows.Clear();
       da.Fill(dt);
 
-      Assert.True(count == 1, "checking update count");
+      Assert.That(count == 1, "checking update count");
       DateTime dateTime = (DateTime)dt.Rows[0]["dt"];
-      Assert.True(day1.Date == dateTime.Date, "checking date");
-      Assert.True(day1.TimeOfDay == (TimeSpan)dt.Rows[0]["tm"], "checking time");
+      Assert.That(day1.Date == dateTime.Date, "checking date");
+      Assert.That(day1.TimeOfDay == (TimeSpan)dt.Rows[0]["tm"], "checking time");
 
       dt.Rows[0].Delete();
       count = await da.UpdateAsync(dt);
 
-      Assert.True(count == 1, "checking insert count");
+      Assert.That(count == 1, "checking insert count");
 
       dt.Rows.Clear();
       da.Fill(dt);
-      Assert.True(dt.Rows.Count == 0, "checking row count");
+      Assert.That(dt.Rows.Count == 0, "checking row count");
 
       dr = dt.NewRow();
       dr["id2"] = 3;
@@ -1347,7 +1347,7 @@ public async Task UpdateAsync()
 
       DataRow[] dataRows = dt.Select(null, null, DataViewRowState.Added);
       count = await da.UpdateAsync(dataRows);
-      Assert.True(count == 1, "checking update count");
+      Assert.That(count == 1, "checking update count");
 
       DataSet ds = new DataSet();
       da.Fill(ds);
@@ -1357,7 +1357,7 @@ public async Task UpdateAsync()
       ds.Tables[0].Rows.Add(dr);
 
       count = await da.UpdateAsync(ds);
-      Assert.True(count == 1, "checking update count");
+      Assert.That(count == 1, "checking update count");
 
       dr = dt.NewRow();
       dr["id2"] = 4;
@@ -1370,7 +1370,7 @@ public async Task UpdateAsync()
 
       dataRows = dt.Select(null, null, DataViewRowState.Added);
       count = await da.UpdateAsync(dataRows, mapping);
-      Assert.True(count == 1, "checking update count");
+      Assert.That(count == 1, "checking update count");
 
       ds.Reset();
       da.FillSchema(ds, SchemaType.Mapped);
@@ -1381,7 +1381,7 @@ public async Task UpdateAsync()
       ds.Tables[0].Rows.Add(dr);
 
       count = await da.UpdateAsync(ds, "Table");
-      Assert.True(count == 1, "checking update count");
+      Assert.That(count == 1, "checking update count");
 
       cb.Dispose();
     }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataReaderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataReaderTests.cs
index 542ea6f54..0843a85a3 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataReaderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataReaderTests.cs
@@ -50,9 +50,9 @@ public void SchemaOnly()
       using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly))
       {
         DataTable table = reader.GetSchemaTable();
-        Assert.AreEqual(5, table.Rows.Count);
-        Assert.AreEqual(22, table.Columns.Count);
-        Assert.False(reader.Read());
+        Assert.That(table.Rows.Count, Is.EqualTo(5));
+        Assert.That(table.Columns.Count, Is.EqualTo(22));
+        Assert.That(!reader.Read());
       }
     }
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/NETCore20Tests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/NETCore20Tests.cs
index 2d984200c..c559a33e5 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/NETCore20Tests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/NETCore20Tests.cs
@@ -74,11 +74,11 @@ public void ConstraintsTest()
       ds.Relations.Add(dataRelation);
 
       Assert.That(ds.Tables[0].Constraints, Has.One.Items);
-      Assert.IsInstanceOf<UniqueConstraint>(ds.Tables[0].Constraints[0]);
+      Assert.That(ds.Tables[0].Constraints[0], Is.InstanceOf<UniqueConstraint>());
 
-      Assert.AreEqual(2, ds.Tables[1].Constraints.Count);
-      Assert.IsInstanceOf<UniqueConstraint>(ds.Tables[0].Constraints[0]);
-      Assert.IsInstanceOf<ForeignKeyConstraint>(ds.Tables[1].Constraints[1]);
+      Assert.That(ds.Tables[1].Constraints.Count, Is.EqualTo(2));
+      Assert.That(ds.Tables[0].Constraints[0], Is.InstanceOf<UniqueConstraint>());
+      Assert.That(ds.Tables[1].Constraints[1], Is.InstanceOf<ForeignKeyConstraint>());
     }
 
     [Test]
@@ -96,16 +96,16 @@ public void DataTableReaderTest()
 
       using (DataTableReader dataTableReader = new DataTableReader(childDt))
       {
-        Assert.True(dataTableReader.HasRows);
-        Assert.AreEqual(3, dataTableReader.FieldCount);
+        Assert.That(dataTableReader.HasRows);
+        Assert.That(dataTableReader.FieldCount, Is.EqualTo(3));
       }
 
       PropertyCollection propertyCollection = childDt.ExtendedProperties;
       propertyCollection.Add("TimeStamp", DateTime.Now);
       propertyCollection.Add("Version", 1);
 
-      CollectionAssert.IsNotEmpty(childDt.ExtendedProperties);
-      Assert.AreEqual(2, childDt.ExtendedProperties.Count);
+      Assert.That(childDt.ExtendedProperties, Is.Not.Empty);
+      Assert.That(childDt.ExtendedProperties.Count, Is.EqualTo(2));
     }
 
     [Test]
@@ -139,9 +139,9 @@ public void DataViewSettingsTest()
 
       dataViewManager.DataViewSettings[parentDt].Sort = "name";
 
-      Assert.True(dataViewManager.DataViewSettings[childDt].Sort == "");
-      Assert.AreEqual("name", dataViewManager.DataViewSettings[parentDt].Sort);
-      CollectionAssert.IsNotEmpty(dataViewManager.DataViewSettings);
+      Assert.That(dataViewManager.DataViewSettings[childDt].Sort == "");
+      Assert.That(dataViewManager.DataViewSettings[parentDt].Sort, Is.EqualTo("name"));
+      Assert.That(dataViewManager.DataViewSettings, Is.Not.Empty);
     }
 
     [Test]
@@ -157,13 +157,13 @@ public void SchemaColumnTest()
       parentDa.Fill(parentDt);
       parentDt.Columns["id"].Unique = true;
 
-      Assert.True(parentDt.Columns[0].Unique);
-      Assert.False(parentDt.Columns[0].AllowDBNull);
-      Assert.AreEqual("name", parentDt.Columns[1].ColumnName);
+      Assert.That(parentDt.Columns[0].Unique);
+      Assert.That(!parentDt.Columns[0].AllowDBNull);
+      Assert.That(parentDt.Columns[1].ColumnName, Is.EqualTo("name"));
 
-      Assert.AreEqual(0, parentDt.Columns[0].AutoIncrementSeed);
-      Assert.False(parentDt.Columns[0].ReadOnly);
-      Assert.False(parentDt.Columns[1].AutoIncrement);
+      Assert.That(parentDt.Columns[0].AutoIncrementSeed, Is.EqualTo(0));
+      Assert.That(!parentDt.Columns[0].ReadOnly);
+      Assert.That(!parentDt.Columns[1].AutoIncrement);
     }
   }
 }
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ProcedureParameterTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ProcedureParameterTests.cs
index c84deb683..928091759 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ProcedureParameterTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ProcedureParameterTests.cs
@@ -44,23 +44,23 @@ public void ProcedureParameters()
       restrictions[1] = Connection.Database;
       restrictions[2] = "ProcedureParameters";
       DataTable dt = Connection.GetSchema("Procedure Parameters", restrictions);
-      Assert.True(dt.Rows.Count == 2, "Actual result " + dt.Rows.Count);
-      Assert.AreEqual("Procedure Parameters", dt.TableName);
-      Assert.AreEqual(Connection.Database, dt.Rows[0]["SPECIFIC_SCHEMA"].ToString());
-      Assert.AreEqual("ProcedureParameters", dt.Rows[0]["SPECIFIC_NAME"].ToString());
-      Assert.AreEqual("id", dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(1, dt.Rows[0]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[0]["PARAMETER_MODE"]);
+      Assert.That(dt.Rows.Count == 2, "Actual result " + dt.Rows.Count);
+      Assert.That(dt.TableName, Is.EqualTo("Procedure Parameters"));
+      Assert.That(dt.Rows[0]["SPECIFIC_SCHEMA"].ToString(), Is.EqualTo(Connection.Database));
+      Assert.That(dt.Rows[0]["SPECIFIC_NAME"].ToString(), Is.EqualTo("ProcedureParameters"));
+      Assert.That(dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("id"));
+      Assert.That(dt.Rows[0]["ORDINAL_POSITION"], Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["PARAMETER_MODE"], Is.EqualTo("IN"));
 
       restrictions[4] = "name";
       dt.Clear();
       dt = Connection.GetSchema("Procedure Parameters", restrictions);
-      Assert.AreEqual(1, dt.Rows.Count);
-      Assert.AreEqual(Connection.Database, dt.Rows[0]["SPECIFIC_SCHEMA"].ToString());
-      Assert.AreEqual("ProcedureParameters", dt.Rows[0]["SPECIFIC_NAME"].ToString());
-      Assert.AreEqual("name", dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(2, dt.Rows[0]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[0]["PARAMETER_MODE"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["SPECIFIC_SCHEMA"].ToString(), Is.EqualTo(Connection.Database));
+      Assert.That(dt.Rows[0]["SPECIFIC_NAME"].ToString(), Is.EqualTo("ProcedureParameters"));
+      Assert.That(dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("name"));
+      Assert.That(dt.Rows[0]["ORDINAL_POSITION"], Is.EqualTo(2));
+      Assert.That(dt.Rows[0]["PARAMETER_MODE"], Is.EqualTo("IN"));
 
       ExecuteSQL("DROP FUNCTION IF EXISTS spFunc");
       ExecuteSQL("CREATE FUNCTION spFunc (id int) RETURNS INT BEGIN RETURN 1; END");
@@ -69,17 +69,17 @@ public void ProcedureParameters()
       restrictions[1] = Connection.Database;
       restrictions[2] = "spFunc";
       dt = Connection.GetSchema("Procedure Parameters", restrictions);
-      Assert.True(dt.Rows.Count == 2);
-      Assert.AreEqual("Procedure Parameters", dt.TableName);
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[0]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("spfunc", dt.Rows[0]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual(0, dt.Rows[0]["ORDINAL_POSITION"]);
-
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[1]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("spfunc", dt.Rows[1]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("id", dt.Rows[1]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(1, dt.Rows[1]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[1]["PARAMETER_MODE"]);
+      Assert.That(dt.Rows.Count == 2);
+      Assert.That(dt.TableName, Is.EqualTo("Procedure Parameters"));
+      Assert.That(dt.Rows[0]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[0]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("spfunc"));
+      Assert.That(dt.Rows[0]["ORDINAL_POSITION"], Is.EqualTo(0));
+
+      Assert.That(dt.Rows[1]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[1]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("spfunc"));
+      Assert.That(dt.Rows[1]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("id"));
+      Assert.That(dt.Rows[1]["ORDINAL_POSITION"], Is.EqualTo(1));
+      Assert.That(dt.Rows[1]["PARAMETER_MODE"], Is.EqualTo("IN"));
     }
 
     /// <summary>
@@ -98,24 +98,24 @@ public void ProcedureParameters2()
       restrictions[2] = "spTest";
       DataTable dt = Connection.GetSchema("Procedure Parameters", restrictions);
 
-      Assert.True(dt.Rows.Count == 2, "Actual result " + dt.Rows.Count);
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[0]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[0]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("/*id*/", dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(1, dt.Rows[0]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[0]["PARAMETER_MODE"]);
-      Assert.AreEqual("VARCHAR", dt.Rows[0]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual(20, dt.Rows[0]["CHARACTER_MAXIMUM_LENGTH"]);
-      Assert.AreEqual(20, dt.Rows[0]["CHARACTER_OCTET_LENGTH"]);
-
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[1]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[1]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("result2", dt.Rows[1]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(2, dt.Rows[1]["ORDINAL_POSITION"]);
-      Assert.AreEqual("OUT", dt.Rows[1]["PARAMETER_MODE"]);
-      Assert.AreEqual("DECIMAL", dt.Rows[1]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual(10, Convert.ToInt32(dt.Rows[1]["NUMERIC_PRECISION"]));
-      Assert.AreEqual(2, dt.Rows[1]["NUMERIC_SCALE"]);
+      Assert.That(dt.Rows.Count == 2, "Actual result " + dt.Rows.Count);
+      Assert.That(dt.Rows[0]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[0]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("/*id*/"));
+      Assert.That(dt.Rows[0]["ORDINAL_POSITION"], Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[0]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("VARCHAR"));
+      Assert.That(dt.Rows[0]["CHARACTER_MAXIMUM_LENGTH"], Is.EqualTo(20));
+      Assert.That(dt.Rows[0]["CHARACTER_OCTET_LENGTH"], Is.EqualTo(20));
+
+      Assert.That(dt.Rows[1]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[1]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[1]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("result2"));
+      Assert.That(dt.Rows[1]["ORDINAL_POSITION"], Is.EqualTo(2));
+      Assert.That(dt.Rows[1]["PARAMETER_MODE"], Is.EqualTo("OUT"));
+      Assert.That(dt.Rows[1]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("DECIMAL"));
+      Assert.That(Convert.ToInt32(dt.Rows[1]["NUMERIC_PRECISION"]), Is.EqualTo(10));
+      Assert.That(dt.Rows[1]["NUMERIC_SCALE"], Is.EqualTo(2));
     }
 
     [Test]
@@ -147,96 +147,96 @@ _SONGS_LIST varchar(8000) character set latin1,
       restrictions[2] = "spTest";
       DataTable dt = Connection.GetSchema("Procedure Parameters", restrictions);
 
-      Assert.True(dt.Rows.Count == 12, "Rows count failed");
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[0]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[0]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("_action", dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(1, dt.Rows[0]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[0]["PARAMETER_MODE"]);
-      Assert.AreEqual("VARCHAR", dt.Rows[0]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual(20, dt.Rows[0]["CHARACTER_OCTET_LENGTH"]);
-
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[1]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[1]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("/*dumb-identifier-1*/", dt.Rows[1]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(2, dt.Rows[1]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[1]["PARAMETER_MODE"]);
-      Assert.AreEqual("INT", dt.Rows[1]["DATA_TYPE"].ToString().ToUpper());
-
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[2]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[2]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("#dumb-identifier-2", dt.Rows[2]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(3, dt.Rows[2]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[2]["PARAMETER_MODE"]);
-      Assert.AreEqual("INT", dt.Rows[2]["DATA_TYPE"].ToString().ToUpper());
-
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[3]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[3]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("--dumb-identifier-3", dt.Rows[3]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(4, dt.Rows[3]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[3]["PARAMETER_MODE"]);
-      Assert.AreEqual("INT", dt.Rows[3]["DATA_TYPE"].ToString().ToUpper());
-
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[4]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[4]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("_client_id", dt.Rows[4]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(5, dt.Rows[4]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[4]["PARAMETER_MODE"]);
-      Assert.AreEqual("INT", dt.Rows[4]["DATA_TYPE"].ToString().ToUpper());
-
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[5]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[5]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("_login_id", dt.Rows[5]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(6, dt.Rows[5]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[5]["PARAMETER_MODE"]);
-      Assert.AreEqual("INT", dt.Rows[5]["DATA_TYPE"].ToString().ToUpper());
-
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[6]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[6]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("_where", dt.Rows[6]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(7, dt.Rows[6]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[6]["PARAMETER_MODE"]);
-      Assert.AreEqual("VARCHAR", dt.Rows[6]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual(2000, dt.Rows[6]["CHARACTER_OCTET_LENGTH"]);
-
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[7]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[7]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("_sort", dt.Rows[7]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(8, dt.Rows[7]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[7]["PARAMETER_MODE"]);
-      Assert.AreEqual("VARCHAR", dt.Rows[7]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual(8000, dt.Rows[7]["CHARACTER_OCTET_LENGTH"]);
-
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[8]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[8]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("_sql", dt.Rows[8]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(9, dt.Rows[8]["ORDINAL_POSITION"]);
-      Assert.AreEqual("OUT", dt.Rows[8]["PARAMETER_MODE"]);
-      Assert.AreEqual("VARCHAR", dt.Rows[8]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual(8000, dt.Rows[8]["CHARACTER_OCTET_LENGTH"]);
-
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[9]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[9]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("_song_id", dt.Rows[9]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(10, dt.Rows[9]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[9]["PARAMETER_MODE"]);
-      Assert.AreEqual("INT", dt.Rows[9]["DATA_TYPE"].ToString().ToUpper());
-
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[10]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[10]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("_notes", dt.Rows[10]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(11, dt.Rows[10]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[10]["PARAMETER_MODE"]);
-      Assert.AreEqual("VARCHAR", dt.Rows[10]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual(2000, dt.Rows[10]["CHARACTER_OCTET_LENGTH"]);
-
-      Assert.AreEqual(Connection.Database.ToLower(), dt.Rows[11]["SPECIFIC_SCHEMA"].ToString().ToLower());
-      Assert.AreEqual("sptest", dt.Rows[11]["SPECIFIC_NAME"].ToString().ToLower());
-      Assert.AreEqual("_result", dt.Rows[11]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(12, dt.Rows[11]["ORDINAL_POSITION"]);
-      Assert.AreEqual("OUT", dt.Rows[11]["PARAMETER_MODE"]);
-      Assert.AreEqual("VARCHAR", dt.Rows[11]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual(10, dt.Rows[11]["CHARACTER_OCTET_LENGTH"]);
+      Assert.That(dt.Rows.Count == 12, Is.True, "Rows count failed");
+      Assert.That(dt.Rows[0]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[0]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("_action"));
+      Assert.That(dt.Rows[0]["ORDINAL_POSITION"], Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[0]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("VARCHAR"));
+      Assert.That(dt.Rows[0]["CHARACTER_OCTET_LENGTH"], Is.EqualTo(20));
+
+      Assert.That(dt.Rows[1]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[1]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[1]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("/*dumb-identifier-1*/"));
+      Assert.That(dt.Rows[1]["ORDINAL_POSITION"], Is.EqualTo(2));
+      Assert.That(dt.Rows[1]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[1]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("INT"));
+
+      Assert.That(dt.Rows[2]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[2]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[2]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("#dumb-identifier-2"));
+      Assert.That(dt.Rows[2]["ORDINAL_POSITION"], Is.EqualTo(3));
+      Assert.That(dt.Rows[2]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[2]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("INT"));
+
+      Assert.That(dt.Rows[3]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[3]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[3]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("--dumb-identifier-3"));
+      Assert.That(dt.Rows[3]["ORDINAL_POSITION"], Is.EqualTo(4));
+      Assert.That(dt.Rows[3]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[3]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("INT"));
+
+      Assert.That(dt.Rows[4]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[4]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[4]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("_client_id"));
+      Assert.That(dt.Rows[4]["ORDINAL_POSITION"], Is.EqualTo(5));
+      Assert.That(dt.Rows[4]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[4]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("INT"));
+
+      Assert.That(dt.Rows[5]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[5]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[5]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("_login_id"));
+      Assert.That(dt.Rows[5]["ORDINAL_POSITION"], Is.EqualTo(6));
+      Assert.That(dt.Rows[5]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[5]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("INT"));
+
+      Assert.That(dt.Rows[6]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[6]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[6]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("_where"));
+      Assert.That(dt.Rows[6]["ORDINAL_POSITION"], Is.EqualTo(7));
+      Assert.That(dt.Rows[6]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[6]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("VARCHAR"));
+      Assert.That(dt.Rows[6]["CHARACTER_OCTET_LENGTH"], Is.EqualTo(2000));
+
+      Assert.That(dt.Rows[7]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[7]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[7]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("_sort"));
+      Assert.That(dt.Rows[7]["ORDINAL_POSITION"], Is.EqualTo(8));
+      Assert.That(dt.Rows[7]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[7]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("VARCHAR"));
+      Assert.That(dt.Rows[7]["CHARACTER_OCTET_LENGTH"], Is.EqualTo(8000));
+
+      Assert.That(dt.Rows[8]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[8]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[8]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("_sql"));
+      Assert.That(dt.Rows[8]["ORDINAL_POSITION"], Is.EqualTo(9));
+      Assert.That(dt.Rows[8]["PARAMETER_MODE"], Is.EqualTo("OUT"));
+      Assert.That(dt.Rows[8]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("VARCHAR"));
+      Assert.That(dt.Rows[8]["CHARACTER_OCTET_LENGTH"], Is.EqualTo(8000));
+
+      Assert.That(dt.Rows[9]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[9]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[9]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("_song_id"));
+      Assert.That(dt.Rows[9]["ORDINAL_POSITION"], Is.EqualTo(10));
+      Assert.That(dt.Rows[9]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[9]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("INT"));
+
+      Assert.That(dt.Rows[10]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[10]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[10]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("_notes"));
+      Assert.That(dt.Rows[10]["ORDINAL_POSITION"], Is.EqualTo(11));
+      Assert.That(dt.Rows[10]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[10]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("VARCHAR"));
+      Assert.That(dt.Rows[10]["CHARACTER_OCTET_LENGTH"], Is.EqualTo(2000));
+
+      Assert.That(dt.Rows[11]["SPECIFIC_SCHEMA"].ToString().ToLower(), Is.EqualTo(Connection.Database.ToLower()));
+      Assert.That(dt.Rows[11]["SPECIFIC_NAME"].ToString().ToLower(), Is.EqualTo("sptest"));
+      Assert.That(dt.Rows[11]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("_result"));
+      Assert.That(dt.Rows[11]["ORDINAL_POSITION"], Is.EqualTo(12));
+      Assert.That(dt.Rows[11]["PARAMETER_MODE"], Is.EqualTo("OUT"));
+      Assert.That(dt.Rows[11]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("VARCHAR"));
+      Assert.That(dt.Rows[11]["CHARACTER_OCTET_LENGTH"], Is.EqualTo(10));
     }
 
     [Test]
@@ -252,17 +252,17 @@ public void ProcedureParameters4()
       restrictions[2] = "ProcedureParameters4";
       DataTable dt = Connection.GetSchema("Procedure Parameters", restrictions);
 
-      Assert.True(dt.Rows.Count == 1, "Actual Result " + dt.Rows.Count);
-      Assert.AreEqual(Connection.Database, dt.Rows[0]["SPECIFIC_SCHEMA"].ToString());
-      Assert.AreEqual("ProcedureParameters4", dt.Rows[0]["SPECIFIC_NAME"].ToString());
-      Assert.AreEqual("name", dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(1, dt.Rows[0]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[0]["PARAMETER_MODE"]);
-      Assert.AreEqual("VARCHAR", dt.Rows[0]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual(1200, dt.Rows[0]["CHARACTER_MAXIMUM_LENGTH"]);
-      Assert.AreEqual(3600, dt.Rows[0]["CHARACTER_OCTET_LENGTH"]);
-      Assert.AreEqual(charset, dt.Rows[0]["CHARACTER_SET_NAME"]);
-      Assert.AreEqual($"{charset}_general_ci", dt.Rows[0]["COLLATION_NAME"]);
+      Assert.That(dt.Rows.Count == 1, Is.True, "Actual Result " + dt.Rows.Count);
+      Assert.That(dt.Rows[0]["SPECIFIC_SCHEMA"].ToString(), Is.EqualTo(Connection.Database));
+      Assert.That(dt.Rows[0]["SPECIFIC_NAME"].ToString(), Is.EqualTo("ProcedureParameters4"));
+      Assert.That(dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("name"));
+      Assert.That(dt.Rows[0]["ORDINAL_POSITION"], Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[0]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("VARCHAR"));
+      Assert.That(dt.Rows[0]["CHARACTER_MAXIMUM_LENGTH"], Is.EqualTo(1200));
+      Assert.That(dt.Rows[0]["CHARACTER_OCTET_LENGTH"], Is.EqualTo(3600));
+      Assert.That(dt.Rows[0]["CHARACTER_SET_NAME"], Is.EqualTo(charset));
+      Assert.That(dt.Rows[0]["COLLATION_NAME"], Is.EqualTo($"{charset}_general_ci"));
     }
 
     [Test]
@@ -276,23 +276,23 @@ public void ProcedureParameters5()
       restrictions[2] = "ProcedureParameters5";
       DataTable dt = Connection.GetSchema("Procedure Parameters", restrictions);
 
-      Assert.True(dt.Rows.Count == 2);
-      Assert.AreEqual(Connection.Database, dt.Rows[0]["SPECIFIC_SCHEMA"].ToString());
-      Assert.AreEqual("ProcedureParameters5", dt.Rows[0]["SPECIFIC_NAME"].ToString());
-      Assert.AreEqual("name", dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(1, dt.Rows[0]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[0]["PARAMETER_MODE"]);
-      Assert.AreEqual("VARCHAR", dt.Rows[0]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual("latin1", dt.Rows[0]["CHARACTER_SET_NAME"]);
-      Assert.AreEqual(1200, dt.Rows[0]["CHARACTER_OCTET_LENGTH"]);
-
-      Assert.AreEqual(Connection.Database, dt.Rows[1]["SPECIFIC_SCHEMA"].ToString());
-      Assert.AreEqual("ProcedureParameters5", dt.Rows[1]["SPECIFIC_NAME"].ToString());
-      Assert.AreEqual("name2", dt.Rows[1]["PARAMETER_NAME"].ToString().ToLower());
-      Assert.AreEqual(2, dt.Rows[1]["ORDINAL_POSITION"]);
-      Assert.AreEqual("IN", dt.Rows[1]["PARAMETER_MODE"]);
-      Assert.AreEqual("TEXT", dt.Rows[1]["DATA_TYPE"].ToString().ToUpper());
-      Assert.AreEqual("ucs2", dt.Rows[1]["CHARACTER_SET_NAME"]);
+      Assert.That(dt.Rows.Count == 2, Is.True);
+      Assert.That(dt.Rows[0]["SPECIFIC_SCHEMA"].ToString(), Is.EqualTo(Connection.Database));
+      Assert.That(dt.Rows[0]["SPECIFIC_NAME"].ToString(), Is.EqualTo("ProcedureParameters5"));
+      Assert.That(dt.Rows[0]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("name"));
+      Assert.That(dt.Rows[0]["ORDINAL_POSITION"], Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[0]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("VARCHAR"));
+      Assert.That(dt.Rows[0]["CHARACTER_SET_NAME"], Is.EqualTo("latin1"));
+      Assert.That(dt.Rows[0]["CHARACTER_OCTET_LENGTH"], Is.EqualTo(1200));
+
+      Assert.That(dt.Rows[1]["SPECIFIC_SCHEMA"].ToString(), Is.EqualTo(Connection.Database));
+      Assert.That(dt.Rows[1]["SPECIFIC_NAME"].ToString(), Is.EqualTo("ProcedureParameters5"));
+      Assert.That(dt.Rows[1]["PARAMETER_NAME"].ToString().ToLower(), Is.EqualTo("name2"));
+      Assert.That(dt.Rows[1]["ORDINAL_POSITION"], Is.EqualTo(2));
+      Assert.That(dt.Rows[1]["PARAMETER_MODE"], Is.EqualTo("IN"));
+      Assert.That(dt.Rows[1]["DATA_TYPE"].ToString().ToUpper(), Is.EqualTo("TEXT"));
+      Assert.That(dt.Rows[1]["CHARACTER_SET_NAME"], Is.EqualTo("ucs2"));
     }
 
     [Test]
@@ -314,19 +314,13 @@ name VARCHAR(20) /* this is a comment */ CHARACTER SET ascii,
         restrictions[2] = "DTD_Identifier";
         DataTable dt = Connection.GetSchema("Procedure Parameters", restrictions);
 
-        Assert.True(dt.Rows.Count == 6, "Actual Result " + dt.Rows.Count);
-        Assert.AreEqual("INT(10) UNSIGNED ZEROFILL",
-          dt.Rows[0]["DTD_IDENTIFIER"].ToString().ToUpper());
-        Assert.AreEqual("DECIMAL(10,2)",
-          dt.Rows[1]["DTD_IDENTIFIER"].ToString().ToUpper());
-        Assert.AreEqual("VARCHAR(20)",
-          dt.Rows[2]["DTD_IDENTIFIER"].ToString().ToUpper());
-        Assert.AreEqual("TINYTEXT",
-          dt.Rows[3]["DTD_IDENTIFIER"].ToString().ToUpper());
-        Assert.AreEqual("ENUM('A','B','C')",
-          dt.Rows[4]["DTD_IDENTIFIER"].ToString().ToUpper());
-        Assert.AreEqual("SET('1','2','3')",
-          dt.Rows[5]["DTD_IDENTIFIER"].ToString().ToUpper());
+        Assert.That(dt.Rows.Count == 6, Is.True, "Actual Result " + dt.Rows.Count);
+        Assert.That(dt.Rows[0]["DTD_IDENTIFIER"].ToString().ToUpper(), Is.EqualTo("INT(10) UNSIGNED ZEROFILL"));
+        Assert.That(dt.Rows[1]["DTD_IDENTIFIER"].ToString().ToUpper(), Is.EqualTo("DECIMAL(10,2)"));
+        Assert.That(dt.Rows[2]["DTD_IDENTIFIER"].ToString().ToUpper(), Is.EqualTo("VARCHAR(20)"));
+        Assert.That(dt.Rows[3]["DTD_IDENTIFIER"].ToString().ToUpper(), Is.EqualTo("TINYTEXT"));
+        Assert.That(dt.Rows[4]["DTD_IDENTIFIER"].ToString().ToUpper(), Is.EqualTo("ENUM('A','B','C')"));
+        Assert.That(dt.Rows[5]["DTD_IDENTIFIER"].ToString().ToUpper(), Is.EqualTo("SET('1','2','3')"));
         conn.Close();
       }
     }
@@ -351,20 +345,20 @@ name VARCHAR(20) /* this is a comment */ CHARACTER SET ascii,
         cmd.CommandText = "PossibleValues";
         cmd.CommandType = CommandType.StoredProcedure;
         MySqlCommandBuilder.DeriveParameters(cmd);
-        Assert.Null(cmd.Parameters["@id"].PossibleValues);
-        Assert.Null(cmd.Parameters["@dec1"].PossibleValues);
-        Assert.Null(cmd.Parameters["@name"].PossibleValues);
-        Assert.Null(cmd.Parameters["@t1"].PossibleValues);
+        Assert.That(cmd.Parameters["@id"].PossibleValues, Is.Null);
+        Assert.That(cmd.Parameters["@dec1"].PossibleValues, Is.Null);
+        Assert.That(cmd.Parameters["@name"].PossibleValues, Is.Null);
+        Assert.That(cmd.Parameters["@t1"].PossibleValues, Is.Null);
         MySqlParameter t2 = cmd.Parameters["@t2"];
-        Assert.NotNull(t2.PossibleValues);
-        Assert.AreEqual("a", t2.PossibleValues[0]);
-        Assert.AreEqual("b", t2.PossibleValues[1]);
-        Assert.AreEqual("c", t2.PossibleValues[2]);
+        Assert.That(t2.PossibleValues, Is.Not.Null);
+        Assert.That(t2.PossibleValues[0], Is.EqualTo("a"));
+        Assert.That(t2.PossibleValues[1], Is.EqualTo("b"));
+        Assert.That(t2.PossibleValues[2], Is.EqualTo("c"));
         MySqlParameter t3 = cmd.Parameters["@t3"];
-        Assert.NotNull(t3.PossibleValues);
-        Assert.AreEqual("1", t3.PossibleValues[0]);
-        Assert.AreEqual("2", t3.PossibleValues[1]);
-        Assert.AreEqual("3", t3.PossibleValues[2]);
+        Assert.That(t3.PossibleValues, Is.Not.Null);
+        Assert.That(t3.PossibleValues[0], Is.EqualTo("1"));
+        Assert.That(t3.PossibleValues[1], Is.EqualTo("2"));
+        Assert.That(t3.PossibleValues[2], Is.EqualTo("3"));
         conn.Close();
       }
 
@@ -379,20 +373,20 @@ name VARCHAR(20) /* this is a comment */ CHARACTER SET ascii,
         cmd.CommandText = "PossibleValues";
         cmd.CommandType = CommandType.StoredProcedure;
         MySqlCommandBuilder.DeriveParameters(cmd);
-        Assert.Null(cmd.Parameters["@id"].PossibleValues);
-        Assert.Null(cmd.Parameters["@dec1"].PossibleValues);
-        Assert.Null(cmd.Parameters["@name"].PossibleValues);
-        Assert.Null(cmd.Parameters["@t1"].PossibleValues);
+        Assert.That(cmd.Parameters["@id"].PossibleValues, Is.Null);
+        Assert.That(cmd.Parameters["@dec1"].PossibleValues, Is.Null);
+        Assert.That(cmd.Parameters["@name"].PossibleValues, Is.Null);
+        Assert.That(cmd.Parameters["@t1"].PossibleValues, Is.Null);
         MySqlParameter t2 = cmd.Parameters["@t2"];
-        Assert.NotNull(t2.PossibleValues);
-        Assert.AreEqual("a", t2.PossibleValues[0]);
-        Assert.AreEqual("b", t2.PossibleValues[1]);
-        Assert.AreEqual("c", t2.PossibleValues[2]);
+        Assert.That(t2.PossibleValues, Is.Not.Null);
+        Assert.That(t2.PossibleValues[0], Is.EqualTo("a"));
+        Assert.That(t2.PossibleValues[1], Is.EqualTo("b"));
+        Assert.That(t2.PossibleValues[2], Is.EqualTo("c"));
         MySqlParameter t3 = cmd.Parameters["@t3"];
-        Assert.NotNull(t3.PossibleValues);
-        Assert.AreEqual("1", t3.PossibleValues[0]);
-        Assert.AreEqual("2", t3.PossibleValues[1]);
-        Assert.AreEqual("3", t3.PossibleValues[2]);
+        Assert.That(t3.PossibleValues, Is.Not.Null);
+        Assert.That(t3.PossibleValues[0], Is.EqualTo("1"));
+        Assert.That(t3.PossibleValues[1], Is.EqualTo("2"));
+        Assert.That(t3.PossibleValues[2], Is.EqualTo("3"));
         conn.Close();
       }
     }
@@ -468,7 +462,7 @@ SQL SECURITY INVOKER
         da.SelectCommand = cmd;
         DataSet ds = new DataSet();
         da.Fill(ds);
-        Assert.True(ds.Tables.Count > 0);
+        Assert.That(ds.Tables.Count > 0, Is.True);
 
         //Test with not existing procedure
         cmd.CommandText = "get_hello3";
@@ -481,7 +475,7 @@ SQL SECURITY INVOKER
         if (hasPrivileges)
         {
           da.Fill(ds);
-          Assert.True(ds.Tables.Count > 0);
+          Assert.That(ds.Tables.Count > 0, Is.True);
         }
         else
         {
@@ -528,15 +522,15 @@ OUT value INT
             while (reader.Read())
             {
               var stdout1 = reader.GetInt32(0);
-              Assert.AreEqual(2, stdout1);
+              Assert.That(stdout1, Is.EqualTo(2));
               var schema = reader.GetSchemaTable();
-              Assert.NotNull(schema);
-              Assert.True(reader.HasRows);
-              Assert.AreEqual(1, reader.FieldCount);
+              Assert.That(schema, Is.Not.Null);
+              Assert.That(reader.HasRows, Is.True);
+              Assert.That(reader.FieldCount, Is.EqualTo(1));
             }
           }
           var outparam1 = _outputParam.Value;
-          Assert.AreEqual(1, outparam1);
+          Assert.That(outparam1, Is.EqualTo(1));
         }
 
 
@@ -562,12 +556,12 @@ OUT value INT
           {
             reader.Read();
             var schema = reader.GetSchemaTable();
-            Assert.Null(schema);
-            Assert.False(reader.HasRows);
-            Assert.AreEqual(0, reader.FieldCount);
+            Assert.That(schema, Is.Null);
+            Assert.That(reader.HasRows, Is.False);
+            Assert.That(reader.FieldCount, Is.EqualTo(0));
           }
           var outparam1 = _outputParam2.Value;
-          Assert.AreEqual(1, outparam1);
+          Assert.That(outparam1, Is.EqualTo(1));
         }
       }
     }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ReplicationTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ReplicationTests.cs
index 7f9f37d80..67c647fa6 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ReplicationTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ReplicationTests.cs
@@ -46,7 +46,7 @@ public void Simple()
         }
         catch (MySqlException ex)
         {
-          StringAssert.Contains("Replicated", ex.Message);
+          Assert.That(ex.Message, Does.Contain("Replicated"));
         }
       }
     }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs
index 865d0c484..825615432 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs
@@ -125,7 +125,7 @@ public void HardenedThreadAbortException()
       t.Abort();
       t.Join();
 
-      Assert.NotNull(lastException);
+      Assert.That(lastException, Is.Not.Null);
 
       if (lastException is MySqlException)
       {
@@ -134,7 +134,7 @@ public void HardenedThreadAbortException()
       }
 
       //Assert.InstanceOf(typeof(ThreadAbortException), lastException);
-      Assert.IsInstanceOf<ThreadAbortException>(lastException);
+      Assert.That(lastException, Is.InstanceOf<ThreadAbortException>());
     }
   }
 }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
index be448303a..51ff85733 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
@@ -50,7 +50,7 @@ private void CommandRunner(MySqlCommand cmdToRun)
     {
       object o = cmdToRun.ExecuteScalar();
       resetEvent.Set();
-      Assert.Null(o);
+      Assert.That(o, Is.Null);
     }
 
 #if NETFRAMEWORK
@@ -77,7 +77,7 @@ public void CancelSingleQuery()
       // now cancel the command
       cmd.Cancel();
 
-      Assert.True(resetEvent.WaitOne(30 * 1000), "timeout");
+      Assert.That(resetEvent.WaitOne(30 * 1000), "timeout");
     }
 #endif
 
@@ -115,13 +115,13 @@ public void WaitTimeoutExpiring()
         catch (MySqlException ex)
         {
           if (Version < new Version("8.0.24"))
-            StringAssert.StartsWith("Fatal", ex.Message);
+            Assert.That(ex.Message, Does.StartWith("Fatal"));
           else
-            StringAssert.StartsWith("The client was disconnected", ex.Message);
+            Assert.That(ex.Message, Does.StartWith("The client was disconnected"));
         }
 
-        Assert.AreEqual(1, stateChangeCount);
-        Assert.AreEqual(ConnectionState.Closed, c.State);
+        Assert.That(stateChangeCount, Is.EqualTo(1));
+        Assert.That(c.State, Is.EqualTo(ConnectionState.Closed));
       }
 
       using (MySqlConnection c = new MySqlConnection(connStr))
@@ -130,7 +130,7 @@ public void WaitTimeoutExpiring()
         MySqlCommand cmd = new MySqlCommand("SELECT now() as thetime, database() as db", c);
         using (MySqlDataReader r = cmd.ExecuteReader())
         {
-          Assert.True(r.Read());
+          Assert.That(r.Read(), Is.True);
         }
       }
     }
@@ -218,17 +218,17 @@ public void CancelSelect()
           }
           catch (MySqlException ex)
           {
-            Assert.True(ex.Number == (int)MySqlErrorCode.QueryInterrupted);
+            Assert.That(ex.Number, Is.EqualTo((int)MySqlErrorCode.QueryInterrupted));
             if (rows < 1000)
             {
               bool readOK = reader.Read();
-              Assert.False(readOK);
+              Assert.That(readOK, Is.False);
             }
           }
 
         }
       }
-      Assert.True(rows < 1000);
+      Assert.That(rows < 1000);
     }
 
     /// <summary>
@@ -262,11 +262,11 @@ public void ConnectionStringModifiedAfterCancel()
         }
         catch (MySqlException ex)
         {
-          Assert.True(ex.InnerException is TimeoutException);
-          Assert.True(c.State == ConnectionState.Open);
+          Assert.That(ex.InnerException is TimeoutException, Is.True);
+          Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
         }
         string connStr2 = c.ConnectionString.ToLower(CultureInfo.InvariantCulture);
-        Assert.AreEqual(connStr1.ToLower(CultureInfo.InvariantCulture), connStr2);
+        Assert.That(connStr2, Is.EqualTo(connStr1.ToLower(CultureInfo.InvariantCulture)));
         c.Close();        
       }
      
@@ -311,7 +311,7 @@ public void NetWriteTimeoutExpiring()
             // normally and then the problem, described above, occurs
             for (; i < rows; i++)
             {
-              Assert.False(!reader.Read(),"unexpected 'false' from reader.Read");
+              Assert.That(!reader.Read(), Is.False, "unexpected 'false' from reader.Read");
               if (i % 10 == 0)
                 Thread.Sleep(1);
               object v = reader.GetValue(1);
@@ -337,7 +337,7 @@ public void NetWriteTimeoutExpiring()
 
         // IT is relatively hard to predict where
         Console.WriteLine("Warning: all reads completed!");
-        Assert.True(i == rows);
+        Assert.That(i, Is.EqualTo(rows));
       }
     }
   }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs
index 62ccf2c49..290638392 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs
@@ -44,12 +44,12 @@ public class TypeTests : TestBase
     public void TestSerializationMySqlDataTime()
     {
       MySqlDateTime dt = new MySqlDateTime(2011, 10, 6, 11, 38, 01, 0);
-      Assert.AreEqual(2011, dt.Year);
-      Assert.AreEqual(10, dt.Month);
-      Assert.AreEqual(6, dt.Day);
-      Assert.AreEqual(11, dt.Hour);
-      Assert.AreEqual(38, dt.Minute);
-      Assert.AreEqual(1, dt.Second);
+      Assert.That(dt.Year, Is.EqualTo(2011));
+      Assert.That(dt.Month, Is.EqualTo(10));
+      Assert.That(dt.Day, Is.EqualTo(6));
+      Assert.That(dt.Hour, Is.EqualTo(11));
+      Assert.That(dt.Minute, Is.EqualTo(38));
+      Assert.That(dt.Second, Is.EqualTo(1));
       System.Runtime.Serialization.Formatters.Binary.BinaryFormatter bf =
         new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
       MemoryStream ms = new MemoryStream(1024);
@@ -57,12 +57,12 @@ public void TestSerializationMySqlDataTime()
       ms.Position = 0;
       object o = bf.Deserialize(ms);
       dt = (MySqlDateTime)o;
-      Assert.AreEqual(2011, dt.Year);
-      Assert.AreEqual(10, dt.Month);
-      Assert.AreEqual(6, dt.Day);
-      Assert.AreEqual(11, dt.Hour);
-      Assert.AreEqual(38, dt.Minute);
-      Assert.AreEqual(1, dt.Second);
+      Assert.That(dt.Year, Is.EqualTo(2011));
+      Assert.That(dt.Month, Is.EqualTo(10));
+      Assert.That(dt.Day, Is.EqualTo(6));
+      Assert.That(dt.Hour, Is.EqualTo(11));
+      Assert.That(dt.Minute, Is.EqualTo(38));
+      Assert.That(dt.Second, Is.EqualTo(1));
     }
 #endif
   }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs
index 5ac06fdc8..84652a091 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs
@@ -65,25 +65,25 @@ public void NotReadingEveryField()
         reader.Read();
         reader.GetInt32(0);  // access  the first field
         reader.Read();
-        Assert.True(reader.NextResult());
+        Assert.That(reader.NextResult(), Is.True);
         reader.Read();
-        Assert.AreEqual("Test3", reader.GetString(1));
-        Assert.False(reader.NextResult());
+        Assert.That(reader.GetString(1), Is.EqualTo("Test3"));
+        Assert.That(reader.NextResult(), Is.False);
       }
 
-      Assert.AreEqual(12, listener.Strings.Count);
-      StringAssert.Contains("Query Opened: SELECT * FROM Test; SELECT * FROM Test WHERE id > 2", listener.Strings[0]);
-      StringAssert.Contains("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1", listener.Strings[1]);
-      StringAssert.Contains("Usage Advisor Warning: Query does not use an index", listener.Strings[2]);
-      StringAssert.Contains("Usage Advisor Warning: Skipped 2 rows. Consider a more focused query.", listener.Strings[3]);
-      StringAssert.Contains("Usage Advisor Warning: The following columns were not accessed: name", listener.Strings[4]);
-      StringAssert.Contains("Resultset Closed. Total rows=4, skipped rows=2, size (bytes)=32", listener.Strings[5]);
-      StringAssert.Contains("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1", listener.Strings[6]);
-      StringAssert.Contains("Usage Advisor Warning: Query does not use an index", listener.Strings[7]);
-      StringAssert.Contains("Usage Advisor Warning: Skipped 1 rows. Consider a more focused query.", listener.Strings[8]);
-      StringAssert.Contains("Usage Advisor Warning: The following columns were not accessed: id", listener.Strings[9]);
-      StringAssert.Contains("Resultset Closed. Total rows=2, skipped rows=1, size (bytes)=16", listener.Strings[10]);
-      StringAssert.Contains("Query Closed", listener.Strings[11]);
+      Assert.That(listener.Strings.Count, Is.EqualTo(12));
+      Assert.That(listener.Strings[0], Does.Contain("Query Opened: SELECT * FROM Test; SELECT * FROM Test WHERE id > 2"));
+      Assert.That(listener.Strings[1], Does.Contain("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1"));
+      Assert.That(listener.Strings[2], Does.Contain("Usage Advisor Warning: Query does not use an index"));
+      Assert.That(listener.Strings[3], Does.Contain("Usage Advisor Warning: Skipped 2 rows. Consider a more focused query."));
+      Assert.That(listener.Strings[4], Does.Contain("Usage Advisor Warning: The following columns were not accessed: name"));
+      Assert.That(listener.Strings[5], Does.Contain("Resultset Closed. Total rows=4, skipped rows=2, size (bytes)=32"));
+      Assert.That(listener.Strings[6], Does.Contain("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1"));
+      Assert.That(listener.Strings[7], Does.Contain("Usage Advisor Warning: Query does not use an index"));
+      Assert.That(listener.Strings[8], Does.Contain("Usage Advisor Warning: Skipped 1 rows. Consider a more focused query."));
+      Assert.That(listener.Strings[9], Does.Contain("Usage Advisor Warning: The following columns were not accessed: id"));
+      Assert.That(listener.Strings[10], Does.Contain("Resultset Closed. Total rows=2, skipped rows=1, size (bytes)=16"));
+      Assert.That(listener.Strings[11], Does.Contain("Query Closed"));
     }
 
     [Test]
@@ -105,24 +105,24 @@ public void NotReadingEveryRow()
       {
         reader.Read();
         reader.Read();
-        Assert.True(reader.NextResult());
+        Assert.That(reader.NextResult(), Is.True);
         reader.Read();
         reader.Read();
-        Assert.False(reader.NextResult());
+        Assert.That(reader.NextResult(), Is.False);
       }
 
-      Assert.AreEqual(11, listener.Strings.Count);
-      StringAssert.Contains("Query Opened: SELECT * FROM Test; SELECT * FROM Test WHERE id > 2", listener.Strings[0]);
-      StringAssert.Contains("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1", listener.Strings[1]);
-      StringAssert.Contains("Usage Advisor Warning: Query does not use an index", listener.Strings[2]);
-      StringAssert.Contains("Usage Advisor Warning: Skipped 2 rows. Consider a more focused query.", listener.Strings[3]);
-      StringAssert.Contains("Usage Advisor Warning: The following columns were not accessed: id,name", listener.Strings[4]);
-      StringAssert.Contains("Resultset Closed. Total rows=4, skipped rows=2, size (bytes)=32", listener.Strings[5]);
-      StringAssert.Contains("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1", listener.Strings[6]);
-      StringAssert.Contains("Usage Advisor Warning: Query does not use an index", listener.Strings[7]);
-      StringAssert.Contains("Usage Advisor Warning: The following columns were not accessed: id,name", listener.Strings[8]);
-      StringAssert.Contains("Resultset Closed. Total rows=2, skipped rows=0, size (bytes)=16", listener.Strings[9]);
-      StringAssert.Contains("Query Closed", listener.Strings[10]);
+      Assert.That(listener.Strings, Has.Count.EqualTo(11));
+      Assert.That(listener.Strings[0], Does.Contain("Query Opened: SELECT * FROM Test; SELECT * FROM Test WHERE id > 2"));
+      Assert.That(listener.Strings[1], Does.Contain("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1"));
+      Assert.That(listener.Strings[2], Does.Contain("Usage Advisor Warning: Query does not use an index"));
+      Assert.That(listener.Strings[3], Does.Contain("Usage Advisor Warning: Skipped 2 rows. Consider a more focused query."));
+      Assert.That(listener.Strings[4], Does.Contain("Usage Advisor Warning: The following columns were not accessed: id,name"));
+      Assert.That(listener.Strings[5], Does.Contain("Resultset Closed. Total rows=4, skipped rows=2, size (bytes)=32"));
+      Assert.That(listener.Strings[6], Does.Contain("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1"));
+      Assert.That(listener.Strings[7], Does.Contain("Usage Advisor Warning: Query does not use an index"));
+      Assert.That(listener.Strings[8], Does.Contain("Usage Advisor Warning: The following columns were not accessed: id,name"));
+      Assert.That(listener.Strings[9], Does.Contain("Resultset Closed. Total rows=2, skipped rows=0, size (bytes)=16"));
+      Assert.That(listener.Strings[10], Does.Contain("Query Closed"));
     }
 
     [Test]
@@ -145,13 +145,13 @@ public void FieldConversion()
         string str = reader.GetString(1);
       }
 
-      Assert.AreEqual(6, listener.Strings.Count);
-      StringAssert.Contains("Query Opened: SELECT * FROM Test", listener.Strings[0]);
-      StringAssert.Contains("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1", listener.Strings[1]);
-      StringAssert.Contains("Usage Advisor Warning: Query does not use an index", listener.Strings[2]);
-      StringAssert.Contains("Usage Advisor Warning: The field 'id' was converted to the following types: Int16,Int64", listener.Strings[3]);
-      StringAssert.Contains("Resultset Closed. Total rows=1, skipped rows=0, size (bytes)=8", listener.Strings[4]);
-      StringAssert.Contains("Query Closed", listener.Strings[5]);
+      Assert.That(listener.Strings.Count, Is.EqualTo(6));
+      Assert.That(listener.Strings[0], Does.Contain("Query Opened: SELECT * FROM Test"));
+      Assert.That(listener.Strings[1], Does.Contain("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1"));
+      Assert.That(listener.Strings[2], Does.Contain("Usage Advisor Warning: Query does not use an index"));
+      Assert.That(listener.Strings[3], Does.Contain("Usage Advisor Warning: The field 'id' was converted to the following types: Int16,Int64"));
+      Assert.That(listener.Strings[4], Does.Contain("Resultset Closed. Total rows=1, skipped rows=0, size (bytes)=8"));
+      Assert.That(listener.Strings[5], Does.Contain("Query Closed"));
     }
 
     [Test]
@@ -174,13 +174,13 @@ public void NoIndexUsed()
         reader.Read();
       }
 
-      Assert.AreEqual(6, listener.Strings.Count);
-      StringAssert.Contains("Query Opened: SELECT name FROM Test WHERE id=3", listener.Strings[0]);
-      StringAssert.Contains("Resultset Opened: field(s) = 1, affected rows = -1, inserted id = -1", listener.Strings[1]);
-      StringAssert.Contains("Usage Advisor Warning: Query does not use an index", listener.Strings[2]);
-      StringAssert.Contains("Usage Advisor Warning: The following columns were not accessed: name", listener.Strings[3]);
-      StringAssert.Contains("Resultset Closed. Total rows=1, skipped rows=0, size (bytes)=6", listener.Strings[4]);
-      StringAssert.Contains("Query Closed", listener.Strings[5]);
+      Assert.That(listener.Strings.Count, Is.EqualTo(6));
+      Assert.That(listener.Strings[0], Does.Contain("Query Opened: SELECT name FROM Test WHERE id=3"));
+      Assert.That(listener.Strings[1], Does.Contain("Resultset Opened: field(s) = 1, affected rows = -1, inserted id = -1"));
+      Assert.That(listener.Strings[2], Does.Contain("Usage Advisor Warning: Query does not use an index"));
+      Assert.That(listener.Strings[3], Does.Contain("Usage Advisor Warning: The following columns were not accessed: name"));
+      Assert.That(listener.Strings[4], Does.Contain("Resultset Closed. Total rows=1, skipped rows=0, size (bytes)=6"));
+      Assert.That(listener.Strings[5], Does.Contain("Query Closed"));
     }
 
     [Test]
@@ -203,13 +203,13 @@ public void BadIndexUsed()
         reader.Read();
       }
 
-      Assert.AreEqual(6, listener.Strings.Count);
-      StringAssert.Contains("Query Opened: SELECT name FROM Test WHERE id=3", listener.Strings[0]);
-      StringAssert.Contains("Resultset Opened: field(s) = 1, affected rows = -1, inserted id = -1", listener.Strings[1]);
-      StringAssert.Contains("Usage Advisor Warning: Query does not use an index", listener.Strings[2]);
-      StringAssert.Contains("Usage Advisor Warning: The following columns were not accessed: name", listener.Strings[3]);
-      StringAssert.Contains("Resultset Closed. Total rows=1, skipped rows=0, size (bytes)=6", listener.Strings[4]);
-      StringAssert.Contains("Query Closed", listener.Strings[5]);
+      Assert.That(listener.Strings.Count, Is.EqualTo(6));
+      Assert.That(listener.Strings[0], Does.Contain("Query Opened: SELECT name FROM Test WHERE id=3"));
+      Assert.That(listener.Strings[1], Does.Contain("Resultset Opened: field(s) = 1, affected rows = -1, inserted id = -1"));
+      Assert.That(listener.Strings[2], Does.Contain("Usage Advisor Warning: Query does not use an index"));
+      Assert.That(listener.Strings[3], Does.Contain("Usage Advisor Warning: The following columns were not accessed: name"));
+      Assert.That(listener.Strings[4], Does.Contain("Resultset Closed. Total rows=1, skipped rows=0, size (bytes)=6"));
+      Assert.That(listener.Strings[5], Does.Contain("Query Closed"));
     }
   }
 }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs
index f5b437ce5..152b6a5a7 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs
@@ -67,11 +67,11 @@ public void SimpleLogging()
         }
       }
       //Assert.AreEqual(4, listener.Strings.Count);
-      Assert.AreEqual(27, listener.Strings.Count);
-      StringAssert.Contains("Query Opened: SELECT * FROM Test", listener.Strings[listener.Strings.Count - 5]);
-      StringAssert.Contains("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1", listener.Strings[listener.Strings.Count - 4]);
-      StringAssert.Contains("Resultset Closed. Total rows=4, skipped rows=4, size (bytes)=32", listener.Strings[listener.Strings.Count - 3]);
-      StringAssert.Contains("Query Closed", listener.Strings[listener.Strings.Count - 2]);
+      Assert.That(listener.Strings.Count, Is.EqualTo(27));
+      Assert.That(listener.Strings[listener.Strings.Count - 5], Does.Contain("Query Opened: SELECT * FROM Test"));
+      Assert.That(listener.Strings[listener.Strings.Count - 4], Does.Contain("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1"));
+      Assert.That(listener.Strings[listener.Strings.Count - 3], Does.Contain("Resultset Closed. Total rows=4, skipped rows=4, size (bytes)=32"));
+      Assert.That(listener.Strings[listener.Strings.Count - 2], Does.Contain("Query Closed"));
     }
 
     [Test]
@@ -91,16 +91,16 @@ public void Warnings()
         cmd.ExecuteNonQuery();
       }
 
-      Assert.AreEqual(32, listener.Strings.Count);
-      StringAssert.Contains("Query Opened: INSERT IGNORE INTO Test VALUES (1, 'abcdef')", listener.Strings[listener.Strings.Count - 10]);
-      StringAssert.Contains("Resultset Opened: field(s) = 0, affected rows = 1, inserted id = 0", listener.Strings[listener.Strings.Count - 9]);
-      StringAssert.Contains("Resultset Closed. Total rows=0, skipped rows=0, size (bytes)=0", listener.Strings[listener.Strings.Count - 8]);
-      StringAssert.Contains("Query Opened: SHOW WARNINGS", listener.Strings[listener.Strings.Count - 7]);
-      StringAssert.Contains("Resultset Opened: field(s) = 3, affected rows = -1, inserted id = -1", listener.Strings[listener.Strings.Count - 6]);
-      StringAssert.Contains("Resultset Closed. Total rows=1, skipped rows=0, size (bytes)=55", listener.Strings[listener.Strings.Count - 5]);
-      StringAssert.Contains("Query Closed", listener.Strings[listener.Strings.Count - 4]);
-      StringAssert.Contains("MySql Warning: Level=Warning, Code=1265, Message=Data truncated for column 'name' at row 1", listener.Strings[listener.Strings.Count - 3]);
-      StringAssert.Contains("Query Closed", listener.Strings[listener.Strings.Count - 2]);
+      Assert.That(listener.Strings.Count, Is.EqualTo(32));
+      Assert.That(listener.Strings[listener.Strings.Count - 10], Does.Contain("Query Opened: INSERT IGNORE INTO Test VALUES (1, 'abcdef')"));
+      Assert.That(listener.Strings[listener.Strings.Count - 9], Does.Contain("Resultset Opened: field(s) = 0, affected rows = 1, inserted id = 0"));
+      Assert.That(listener.Strings[listener.Strings.Count - 8], Does.Contain("Resultset Closed. Total rows=0, skipped rows=0, size (bytes)=0"));
+      Assert.That(listener.Strings[listener.Strings.Count - 7], Does.Contain("Query Opened: SHOW WARNINGS"));
+      Assert.That(listener.Strings[listener.Strings.Count - 6], Does.Contain("Resultset Opened: field(s) = 3, affected rows = -1, inserted id = -1"));
+      Assert.That(listener.Strings[listener.Strings.Count - 5], Does.Contain("Resultset Closed. Total rows=1, skipped rows=0, size (bytes)=55"));
+      Assert.That(listener.Strings[listener.Strings.Count - 4], Does.Contain("Query Closed"));
+      Assert.That(listener.Strings[listener.Strings.Count - 3], Does.Contain("MySql Warning: Level=Warning, Code=1265, Message=Data truncated for column 'name' at row 1"));
+      Assert.That(listener.Strings[listener.Strings.Count - 2], Does.Contain("Query Closed"));
     }
 
     [Test]
@@ -121,10 +121,10 @@ public void ProviderNormalizingQuery()
         logConn.Open();
         MySqlCommand cmd = new MySqlCommand(sql.ToString(), logConn);
         cmd.ExecuteNonQuery();
-      }      
+      }
 
-      Assert.AreEqual(28, listener.Strings.Count);
-      StringAssert.EndsWith("SELECT ?", listener.Strings[listener.Strings.Count - 5]);
+      Assert.That(listener.Strings.Count, Is.EqualTo(28));
+      Assert.That(listener.Strings[listener.Strings.Count - 5], Does.EndWith("SELECT ?"));
     }
 
     /// <summary>
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs
index 869f11e03..8432c7a44 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs
@@ -72,11 +72,11 @@ public void BulkLoadSimple()
       loader.Timeout = 0;
       loader.Local = true;
       int count = loader.Load();
-      Assert.AreEqual(200, count);
+      Assert.That(count, Is.EqualTo(200));
 
       DataTable dt = Utils.FillTable("SELECT * FROM Test", Connection);
-      Assert.AreEqual(200, dt.Rows.Count);
-      Assert.AreEqual("'Test'", dt.Rows[0][1].ToString().Trim());
+      Assert.That(dt.Rows.Count, Is.EqualTo(200));
+      Assert.That(dt.Rows[0][1].ToString().Trim(), Is.EqualTo("'Test'"));
     }
 
     [Test]
@@ -103,11 +103,11 @@ public void BulkLoadReadOnlyFile()
         loader.Timeout = 0;
         loader.Local = true;
         int count = loader.Load();
-        Assert.AreEqual(200, count);
+        Assert.That(count, Is.EqualTo(200));
 
         DataTable dt = Utils.FillTable("SELECT * FROM Test", Connection);
-        Assert.AreEqual(200, dt.Rows.Count);
-        Assert.AreEqual("'Test'", dt.Rows[0][1].ToString().Trim());
+        Assert.That(dt.Rows.Count, Is.EqualTo(200));
+        Assert.That(dt.Rows[0][1].ToString().Trim(), Is.EqualTo("'Test'"));
       }
       finally
       {
@@ -137,10 +137,10 @@ public void BulkLoadSimple2()
       loader.LineTerminator = "xxx";
       loader.Local = true;
       int count = loader.Load();
-      Assert.AreEqual(200, count);
+      Assert.That(count, Is.EqualTo(200));
 
       MySqlCommand cmd = new MySqlCommand("SELECT COUNT(*) FROM Test", Connection);
-      Assert.AreEqual(200, Convert.ToInt32(cmd.ExecuteScalar()));
+      Assert.That(Convert.ToInt32(cmd.ExecuteScalar()), Is.EqualTo(200));
     }
 
     [Test]
@@ -165,10 +165,10 @@ public void BulkLoadSimple3()
       loader.NumberOfLinesToSkip = 50;
       loader.Local = true;
       int count = loader.Load();
-      Assert.AreEqual(150, count);
+      Assert.That(count, Is.EqualTo(150));
 
       MySqlCommand cmd = new MySqlCommand("SELECT COUNT(*) FROM Test", Connection);
-      Assert.AreEqual(150, Convert.ToInt32(cmd.ExecuteScalar()));
+      Assert.That(Convert.ToInt32(cmd.ExecuteScalar()), Is.EqualTo(150));
     }
 
     [Test]
@@ -199,10 +199,10 @@ public void BulkLoadSimple4()
       loader.LinePrefix = "bbb";
       loader.Local = true;
       int count = loader.Load();
-      Assert.AreEqual(200, count);
+      Assert.That(count, Is.EqualTo(200));
 
       MySqlCommand cmd = new MySqlCommand("SELECT COUNT(*) FROM Test", Connection);
-      Assert.AreEqual(200, Convert.ToInt32(cmd.ExecuteScalar()));
+      Assert.That(Convert.ToInt32(cmd.ExecuteScalar()), Is.EqualTo(200));
     }
 
     [Test]
@@ -226,12 +226,12 @@ public void BulkLoadFieldQuoting()
       loader.FieldQuotationOptional = true;
       loader.Local = true;
       int count = loader.Load();
-      Assert.AreEqual(200, count);
+      Assert.That(count, Is.EqualTo(200));
 
       DataTable dt = Utils.FillTable("SELECT * FROM Test", Connection);
-      Assert.AreEqual(200, dt.Rows.Count);
-      Assert.AreEqual("col1", dt.Rows[0][1]);
-      Assert.AreEqual("col2", dt.Rows[0][2].ToString().Trim());
+      Assert.That(dt.Rows.Count, Is.EqualTo(200));
+      Assert.That(dt.Rows[0][1], Is.EqualTo("col1"));
+      Assert.That(dt.Rows[0][2].ToString().Trim(), Is.EqualTo("col2"));
     }
 
     [Test]
@@ -255,12 +255,12 @@ public void BulkLoadEscaping()
       loader.FieldTerminator = ",";
       loader.Local = true;
       int count = loader.Load();
-      Assert.AreEqual(200, count);
+      Assert.That(count, Is.EqualTo(200));
 
       DataTable dt = Utils.FillTable("SELECT * FROM Test", Connection);
-      Assert.AreEqual(200, dt.Rows.Count);
-      Assert.AreEqual("col1still col1", dt.Rows[0][1]);
-      Assert.AreEqual("col2", dt.Rows[0][2].ToString().Trim());
+      Assert.That(dt.Rows.Count, Is.EqualTo(200));
+      Assert.That(dt.Rows[0][1], Is.EqualTo("col1still col1"));
+      Assert.That(dt.Rows[0][2].ToString().Trim(), Is.EqualTo("col2"));
     }
 
     [Test]
@@ -283,7 +283,7 @@ public void BulkLoadConflictOptionReplace()
       loader.FieldTerminator = ",";
       loader.Local = true;
       int count = loader.Load();
-      Assert.AreEqual(20, count);
+      Assert.That(count, Is.EqualTo(20));
 
       path = Path.GetTempFileName();
       sw = new StreamWriter(new FileStream(path, FileMode.Create));
@@ -302,8 +302,8 @@ public void BulkLoadConflictOptionReplace()
       loader.Load();
 
       DataTable dt = Utils.FillTable("SELECT * FROM Test", Connection);
-      Assert.AreEqual(20, dt.Rows.Count);
-      Assert.AreEqual("col2", dt.Rows[0][1].ToString().Trim());
+      Assert.That(dt.Rows.Count, Is.EqualTo(20));
+      Assert.That(dt.Rows[0][1].ToString().Trim(), Is.EqualTo("col2"));
     }
 
     [Test]
@@ -326,7 +326,7 @@ public void BulkLoadConflictOptionIgnore()
       loader.FieldTerminator = ",";
       loader.Local = true;
       int count = loader.Load();
-      Assert.AreEqual(20, count);
+      Assert.That(count, Is.EqualTo(20));
 
       path = Path.GetTempFileName();
       sw = new StreamWriter(new FileStream(path, FileMode.Create));
@@ -345,8 +345,8 @@ public void BulkLoadConflictOptionIgnore()
       loader.Load();
 
       DataTable dt = Utils.FillTable("SELECT * FROM Test", Connection);
-      Assert.AreEqual(20, dt.Rows.Count);
-      Assert.AreEqual("col1", dt.Rows[0][1].ToString().Trim());
+      Assert.That(dt.Rows.Count, Is.EqualTo(20));
+      Assert.That(dt.Rows[0][1].ToString().Trim(), Is.EqualTo("col1"));
     }
 
     #region AsyncTests
@@ -373,8 +373,8 @@ public void BulkLoadSimpleAsync()
         int dataLoaded = loadResult.Result;
         DataTable dt = Utils.FillTable("SELECT * FROM BulkLoadSimpleAsyncTest", Connection);
 
-        Assert.AreEqual(dataLoaded, dt.Rows.Count);
-        Assert.AreEqual("'Test'", dt.Rows[0][1].ToString().Trim());
+        Assert.That(dt.Rows.Count, Is.EqualTo(dataLoaded));
+        Assert.That(dt.Rows[0][1].ToString().Trim(), Is.EqualTo("'Test'"));
       }).Wait();
     }
 
@@ -406,8 +406,8 @@ public void BulkLoadReadOnlyFileAsync()
           int dataLoaded = loadResult.Result;
 
           DataTable dt = Utils.FillTable("SELECT * FROM BulkLoadReadOnlyFileAsyncTest", Connection);
-          Assert.AreEqual(dataLoaded, dt.Rows.Count);
-          Assert.AreEqual("'Test'", dt.Rows[0][1].ToString().Trim());
+          Assert.That(dt.Rows.Count, Is.EqualTo(dataLoaded));
+          Assert.That(dt.Rows[0][1].ToString().Trim(), Is.EqualTo("'Test'"));
         }).Wait();
       }
       finally
@@ -442,9 +442,9 @@ public void BulkLoadFieldQuotingAsync()
         int dataLoaded = loadResult.Result;
         DataTable dt = Utils.FillTable("SELECT * FROM BulkLoadFieldQuotingAsyncTest", Connection);
 
-        Assert.AreEqual(dataLoaded, dt.Rows.Count);
-        Assert.AreEqual("col1", dt.Rows[0][1]);
-        Assert.AreEqual("col2", dt.Rows[0][2].ToString().Trim());
+        Assert.That(dt.Rows.Count, Is.EqualTo(dataLoaded));
+        Assert.That(dt.Rows[0][1], Is.EqualTo("col1"));
+        Assert.That(dt.Rows[0][2].ToString().Trim(), Is.EqualTo("col2"));
       }).Wait();
     }
 
@@ -473,9 +473,9 @@ public void BulkLoadEscapingAsync()
         int dataLoaded = loadResult.Result;
         DataTable dt = Utils.FillTable("SELECT * FROM BulkLoadEscapingAsyncTest", Connection);
 
-        Assert.AreEqual(dataLoaded, dt.Rows.Count);
-        Assert.AreEqual("col1still col1", dt.Rows[0][1]);
-        Assert.AreEqual("col2", dt.Rows[0][2].ToString().Trim());
+        Assert.That(dt.Rows.Count, Is.EqualTo(dataLoaded));
+        Assert.That(dt.Rows[0][1], Is.EqualTo("col1still col1"));
+        Assert.That(dt.Rows[0][2].ToString().Trim(), Is.EqualTo("col2"));
       }).Wait();
     }
 
@@ -517,8 +517,8 @@ public void BulkLoadConflictOptionReplaceAsync()
 
       loader.LoadAsync().Wait();
       DataTable dt = Utils.FillTable("SELECT * FROM BulkLoadConflictOptionReplaceAsyncTest", Connection);
-      Assert.AreEqual(20, dt.Rows.Count);
-      Assert.AreEqual("col2", dt.Rows[0][1].ToString().Trim());
+      Assert.That(dt.Rows.Count, Is.EqualTo(20));
+      Assert.That(dt.Rows[0][1].ToString().Trim(), Is.EqualTo("col2"));
     }
 
     [Test]
@@ -563,8 +563,8 @@ public void BulkLoadConflictOptionIgnoreAsync()
       {
         int dataLoaded = loadResult.Result;
         DataTable dt = Utils.FillTable("SELECT * FROM BulkLoadConflictOptionIgnoreAsyncTest", Connection);
-        Assert.AreEqual(20, dt.Rows.Count);
-        Assert.AreEqual("col1", dt.Rows[0][1].ToString().Trim());
+        Assert.That(dt.Rows.Count, Is.EqualTo(20));
+        Assert.That(dt.Rows[0][1].ToString().Trim(), Is.EqualTo("col1"));
       }).Wait();
     }
 
@@ -596,10 +596,10 @@ public void BulkLoadColumnOrderAsync()
       {
         int dataLoaded = loadResult.Result;
         DataTable dt = Utils.FillTable("SELECT * FROM BulkLoadColumnOrderAsyncTest", Connection);
-        Assert.AreEqual(20, dt.Rows.Count);
-        Assert.AreEqual("col1", dt.Rows[0][1]);
-        Assert.AreEqual("col2", dt.Rows[0][2]);
-        Assert.AreEqual("col3", dt.Rows[0][3].ToString().Trim());
+        Assert.That(dt.Rows.Count, Is.EqualTo(20));
+        Assert.That(dt.Rows[0][1], Is.EqualTo("col1"));
+        Assert.That(dt.Rows[0][2], Is.EqualTo("col2"));
+        Assert.That(dt.Rows[0][3].ToString().Trim(), Is.EqualTo("col3"));
       }).Wait();
     }
     #endregion
@@ -636,13 +636,13 @@ public void BulkLoadColumnOrder()
       loader.Columns.Add("n1");
       loader.Local = true;
       int count = loader.Load();
-      Assert.AreEqual(20, count);
+      Assert.That(count, Is.EqualTo(20));
 
       DataTable dt = Utils.FillTable("SELECT * FROM Test", Connection);
-      Assert.AreEqual(20, dt.Rows.Count);
-      Assert.AreEqual("col1", dt.Rows[0][1]);
-      Assert.AreEqual("col2", dt.Rows[0][2]);
-      Assert.AreEqual("col3", dt.Rows[0][3].ToString().Trim());
+      Assert.That(dt.Rows.Count, Is.EqualTo(20));
+      Assert.That(dt.Rows[0][1], Is.EqualTo("col1"));
+      Assert.That(dt.Rows[0][2], Is.EqualTo("col2"));
+      Assert.That(dt.Rows[0][3].ToString().Trim(), Is.EqualTo("col3"));
     }
 
     /// <summary>
@@ -703,11 +703,11 @@ public void BulkLoadUsingSafePath(bool allowLoadLocalInfile, string allowLoadLoc
       if (shouldPass)
       {
         int count = loader.Load();
-        Assert.AreEqual(200, count);
+        Assert.That(count, Is.EqualTo(200));
 
         DataTable dt = Utils.FillTable("SELECT * FROM Test", Connection);
-        Assert.AreEqual(200, dt.Rows.Count);
-        Assert.AreEqual("'Test'", dt.Rows[0][1].ToString().Trim());
+        Assert.That(dt.Rows.Count, Is.EqualTo(200));
+        Assert.That(dt.Rows[0][1].ToString().Trim(), Is.EqualTo("'Test'"));
       }
       else if (isSymLink && !Directory.Exists(allowLoadLocalInfileInPath))
         Assert.Ignore("For the symbolic link test to run, it should be manually created before executing it.");
@@ -716,11 +716,11 @@ public void BulkLoadUsingSafePath(bool allowLoadLocalInfile, string allowLoadLoc
         var ex = Assert.Throws<MySqlException>(() => loader.Load());
         if (allowLoadLocalInfileInPath == " " || allowLoadLocalInfileInPath is null)
           if (Version > new Version(8, 0))
-            Assert.AreEqual("Loading local data is disabled; this must be enabled on both the client and server sides", ex.Message);
+            Assert.That(ex.Message, Is.EqualTo("Loading local data is disabled; this must be enabled on both the client and server sides"));
           else
-            Assert.AreEqual("The used command is not allowed with this MySQL version", ex.Message);
+            Assert.That(ex.Message, Is.EqualTo("The used command is not allowed with this MySQL version"));
         else
-          StringAssert.Contains("allowloadlocalinfileinpath", ex.Message);
+          Assert.That(ex.Message, Does.Contain("allowloadlocalinfileinpath"));
       }
 
       File.Delete(path);
@@ -755,10 +755,10 @@ public void InsertFilesInDatabase()
         cmd.Parameters.AddWithValue("@FileSize", fileSize);
         cmd.Parameters.AddWithValue("@File", rawData);
         var result = cmd.ExecuteNonQuery();
-        Assert.IsNotNull(result);
+        Assert.That(result, Is.Not.Null);
         cmd.CommandText = "select count(*) from file;";
         var count = cmd.ExecuteScalar();
-        Assert.AreEqual(1, count);
+        Assert.That(count, Is.EqualTo(1));
       }
     }
 
@@ -783,11 +783,11 @@ public void BulkLoadStream()
       loader.Timeout = 0;
       loader.Local = true;
       int count = loader.Load(stream);
-      Assert.AreEqual(200, count);
+      Assert.That(count, Is.EqualTo(200));
 
       DataTable dt = Utils.FillTable("SELECT * FROM Test", Connection);
-      Assert.AreEqual(200, dt.Rows.Count);
-      Assert.AreEqual("'Test'", dt.Rows[0][1].ToString().Trim());
+      Assert.That(dt.Rows.Count, Is.EqualTo(200));
+      Assert.That(dt.Rows[0][1].ToString().Trim(), Is.EqualTo("'Test'"));
     }
 
     [Test]
@@ -817,10 +817,10 @@ public void BulkLoadStream2()
       loader.LinePrefix = "bbb";
       loader.Local = true;
       int count = loader.Load(stream);
-      Assert.AreEqual(200, count);
+      Assert.That(count, Is.EqualTo(200));
 
       using MySqlCommand cmd = new MySqlCommand("SELECT COUNT(*) FROM Test", Connection);
-      Assert.AreEqual(200, Convert.ToInt32(cmd.ExecuteScalar()));
+      Assert.That(Convert.ToInt32(cmd.ExecuteScalar()), Is.EqualTo(200));
     }
 
     [Test]
@@ -847,13 +847,13 @@ public void BulkLoadStreamColumnOrder()
       loader.Columns.Add("n1");
       loader.Local = true;
       int count = loader.Load(stream);
-      Assert.AreEqual(20, count);
+      Assert.That(count, Is.EqualTo(20));
 
       DataTable dt = Utils.FillTable("SELECT * FROM Test", Connection);
-      Assert.AreEqual(20, dt.Rows.Count);
-      Assert.AreEqual("col1", dt.Rows[0][1]);
-      Assert.AreEqual("col2", dt.Rows[0][2]);
-      Assert.AreEqual("col3", dt.Rows[0][3].ToString().Trim());
+      Assert.That(dt.Rows.Count, Is.EqualTo(20));
+      Assert.That(dt.Rows[0][1], Is.EqualTo("col1"));
+      Assert.That(dt.Rows[0][2], Is.EqualTo("col2"));
+      Assert.That(dt.Rows[0][3].ToString().Trim(), Is.EqualTo("col3"));
     }
   }
 }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySqlDataReaderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/MySqlDataReaderTests.cs
index 9ebad9a27..29f4647b5 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySqlDataReaderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySqlDataReaderTests.cs
@@ -68,25 +68,25 @@ public void TestMultipleResultsets()
       cmd = new MySqlCommand("SELECT id FROM Test WHERE id<50; SELECT * FROM Test WHERE id >= 50;", Connection);
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.NotNull(reader);
-        Assert.True(reader.HasRows);
-        Assert.True(reader.Read());
-        Assert.AreEqual(1, reader.FieldCount);
-        Assert.True(reader.NextResult());
-        Assert.True(reader.HasRows);
-        Assert.AreEqual(5, reader.FieldCount);
+        Assert.That(reader, Is.Not.Null);
+        Assert.That(reader.HasRows);
+        Assert.That(reader.Read());
+        Assert.That(reader.FieldCount, Is.EqualTo(1));
+        Assert.That(reader.NextResult());
+        Assert.That(reader.HasRows);
+        Assert.That(reader.FieldCount, Is.EqualTo(5));
       }
 
       // now do it again
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.NotNull(reader);
-        Assert.True(reader.HasRows);
-        Assert.True(reader.Read());
-        Assert.AreEqual(1, reader.FieldCount);
-        Assert.True(reader.NextResult());
-        Assert.True(reader.HasRows);
-        Assert.AreEqual(5, reader.FieldCount);
+        Assert.That(reader, Is.Not.Null);
+        Assert.That(reader.HasRows);
+        Assert.That(reader.Read());
+        Assert.That(reader.FieldCount, Is.EqualTo(1));
+        Assert.That(reader.NextResult());
+        Assert.That(reader.HasRows);
+        Assert.That(reader.FieldCount, Is.EqualTo(5));
       }
     }
 
@@ -107,26 +107,26 @@ public void GetBytes()
         reader.Read();
 
         long sizeBytes = reader.GetBytes(4, 0, null, 0, 0);
-        Assert.AreEqual(len, sizeBytes);
+        Assert.That(sizeBytes, Is.EqualTo(len));
 
         byte[] buff1 = new byte[len / 2];
         byte[] buff2 = new byte[len - (len / 2)];
         long buff1cnt = reader.GetBytes(4, 0, buff1, 0, len / 2);
         long buff2cnt = reader.GetBytes(4, buff1cnt, buff2, 0, buff2.Length);
-        Assert.AreEqual(buff1.Length, buff1cnt);
-        Assert.AreEqual(buff2.Length, buff2cnt);
+        Assert.That(buff1cnt, Is.EqualTo(buff1.Length));
+        Assert.That(buff2cnt, Is.EqualTo(buff2.Length));
 
         for (int i = 0; i < buff1.Length; i++)
-          Assert.AreEqual(bytes[i], buff1[i]);
+          Assert.That(buff1[i], Is.EqualTo(bytes[i]));
 
         for (int i = 0; i < buff2.Length; i++)
-          Assert.AreEqual(bytes[buff1.Length + i], buff2[i]);
+          Assert.That(buff2[i], Is.EqualTo(bytes[buff1.Length + i]));
       }
 
       //  now check with sequential access
       using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
       {
-        Assert.True(reader.Read());
+        Assert.That(reader.Read());
         int mylen = len;
         byte[] buff = new byte[8192];
         int startIndex = 0;
@@ -134,9 +134,9 @@ public void GetBytes()
         {
           int readLen = Math.Min(mylen, buff.Length);
           int retVal = (int)reader.GetBytes(4, startIndex, buff, 0, readLen);
-          Assert.AreEqual(readLen, retVal);
+          Assert.That(retVal, Is.EqualTo(readLen));
           for (int i = 0; i < readLen; i++)
-            Assert.AreEqual(bytes[startIndex + i], buff[i]);
+            Assert.That(buff[i], Is.EqualTo(bytes[startIndex + i]));
           startIndex += readLen;
           mylen -= readLen;
         }
@@ -155,10 +155,10 @@ public void TestSingleResultSetBehavior()
       using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleResult))
       {
         bool result = reader.Read();
-        Assert.True(result);
+        Assert.That(result);
 
         result = reader.NextResult();
-        Assert.False(result);
+        Assert.That(result, Is.False);
       }
     }
 
@@ -180,23 +180,23 @@ public void GetSchema()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         DataTable dt = reader.GetSchemaTable();
-        Assert.True(true == (Boolean)dt.Rows[0]["IsAutoIncrement"], "Checking auto increment");
-        Assert.False((bool)dt.Rows[0]["IsUnique"], "Checking IsUnique");
-        Assert.True((bool)dt.Rows[0]["IsKey"]);
-        Assert.True(false == (Boolean)dt.Rows[0]["AllowDBNull"], "Checking AllowDBNull");
-        Assert.True(false == (Boolean)dt.Rows[1]["AllowDBNull"], "Checking AllowDBNull");
-        Assert.AreEqual(255, dt.Rows[1]["ColumnSize"]);
-        Assert.AreEqual(40, dt.Rows[2]["ColumnSize"]);
+        Assert.That(true == (Boolean)dt.Rows[0]["IsAutoIncrement"], "Checking auto increment");
+        Assert.That((bool)dt.Rows[0]["IsUnique"], Is.False, "Checking IsUnique");
+        Assert.That((bool)dt.Rows[0]["IsKey"]);
+        Assert.That(false == (Boolean)dt.Rows[0]["AllowDBNull"], "Checking AllowDBNull");
+        Assert.That(false == (Boolean)dt.Rows[1]["AllowDBNull"], "Checking AllowDBNull");
+        Assert.That(dt.Rows[1]["ColumnSize"], Is.EqualTo(255));
+        Assert.That(dt.Rows[2]["ColumnSize"], Is.EqualTo(40));
 
         // udec column
-        Assert.AreEqual(21, dt.Rows[5]["ColumnSize"]);
-        Assert.AreEqual(20, dt.Rows[5]["NumericPrecision"]);
-        Assert.AreEqual(6, dt.Rows[5]["NumericScale"]);
+        Assert.That(dt.Rows[5]["ColumnSize"], Is.EqualTo(21));
+        Assert.That(dt.Rows[5]["NumericPrecision"], Is.EqualTo(20));
+        Assert.That(dt.Rows[5]["NumericScale"], Is.EqualTo(6));
 
         // dec column
-        Assert.AreEqual(46, dt.Rows[6]["ColumnSize"]);
-        Assert.AreEqual(44, dt.Rows[6]["NumericPrecision"]);
-        Assert.AreEqual(3, dt.Rows[6]["NumericScale"]);
+        Assert.That(dt.Rows[6]["ColumnSize"], Is.EqualTo(46));
+        Assert.That(dt.Rows[6]["NumericPrecision"], Is.EqualTo(44));
+        Assert.That(dt.Rows[6]["NumericScale"], Is.EqualTo(3));
       }
     }
 
@@ -212,9 +212,9 @@ public void CloseConnectionBehavior()
         MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", c2);
         using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.CloseConnection))
         {
-          Assert.True(reader.Read());
+          Assert.That(reader.Read());
           reader.Close();
-          Assert.True(c2.State == ConnectionState.Closed);
+          Assert.That(c2.State == ConnectionState.Closed);
         }
       }
     }
@@ -230,18 +230,18 @@ public void SingleRowBehavior()
       MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", Connection);
       using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
       {
-        Assert.True(reader.Read(), "First read");
-        Assert.False(reader.Read(), "Second read");
-        Assert.False(reader.NextResult(), "Trying NextResult");
+        Assert.That(reader.Read(), "First read");
+        Assert.That(reader.Read(), Is.False, "Second read");
+        Assert.That(reader.NextResult(), Is.False, "Trying NextResult");
       }
 
       cmd.CommandText = "SELECT * FROM Test where id=1";
       using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual("test1", reader.GetString(1));
-        Assert.False(reader.Read());
-        Assert.False(reader.NextResult());
+        Assert.That(reader.Read());
+        Assert.That(reader.GetString(1), Is.EqualTo("test1"));
+        Assert.That(reader.Read(), Is.False);
+        Assert.That(reader.NextResult(), Is.False);
       }
     }
 
@@ -256,23 +256,23 @@ public void SingleRowBehaviorWithLimit()
       MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test LIMIT 2", Connection);
       using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
       {
-        Assert.True(reader.Read(), "First read");
-        Assert.False(reader.Read(), "Second read");
-        Assert.False(reader.NextResult(), "Trying NextResult");
+        Assert.That(reader.Read(), "First read");
+        Assert.That(reader.Read(), Is.False, "Second read");
+        Assert.That(reader.NextResult(), Is.False, "Trying NextResult");
       }
 
       using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
       {
-        Assert.True(reader.Read(), "First read");
-        Assert.False(reader.Read(), "Second read");
-        Assert.False(reader.NextResult(), "Trying NextResult");
+        Assert.That(reader.Read(), "First read");
+        Assert.That(reader.Read(), Is.False, "Second read");
+        Assert.That(reader.NextResult(), Is.False, "Trying NextResult");
       }
 
       using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
       {
-        Assert.True(reader.Read(), "First read");
-        Assert.False(reader.Read(), "Second read");
-        Assert.False(reader.NextResult(), "Trying NextResult");
+        Assert.That(reader.Read(), "First read");
+        Assert.That(reader.Read(), Is.False, "Second read");
+        Assert.That(reader.NextResult(), Is.False, "Trying NextResult");
       }
     }
 
@@ -285,11 +285,11 @@ public void SimpleSingleRow()
       MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", Connection);
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read(), "First read");
-        Assert.AreEqual(1, reader.GetInt32(0));
-        Assert.AreEqual("test1", reader.GetString(1));
-        Assert.False(reader.Read(), "Second read");
-        Assert.False(reader.NextResult(), "Trying NextResult");
+        Assert.That(reader.Read(), "First read");
+        Assert.That(reader.GetInt32(0), Is.EqualTo(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("test1"));
+        Assert.That(reader.Read(), Is.False, "Second read");
+        Assert.That(reader.NextResult(), Is.False, "Trying NextResult");
       }
     }
 
@@ -305,25 +305,25 @@ public void ConsecutiveNulls()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual(1, reader.GetValue(0));
-        Assert.AreEqual("Test", reader.GetValue(1));
-        Assert.AreEqual("Test", reader.GetString(1));
-        Assert.AreEqual(DBNull.Value, reader.GetValue(2));
+        Assert.That(reader.GetValue(0), Is.EqualTo(1));
+        Assert.That(reader.GetValue(1), Is.EqualTo("Test"));
+        Assert.That(reader.GetString(1), Is.EqualTo("Test"));
+        Assert.That(reader.GetValue(2), Is.EqualTo(DBNull.Value));
         reader.Read();
-        Assert.AreEqual(2, reader.GetValue(0));
-        Assert.AreEqual(DBNull.Value, reader.GetValue(1));
+        Assert.That(reader.GetValue(0), Is.EqualTo(2));
+        Assert.That(reader.GetValue(1), Is.EqualTo(DBNull.Value));
         Exception ex = Assert.Throws<SqlNullValueException>(() => reader.GetString(1));
-        Assert.AreEqual("Data is Null. This method or property cannot be called on Null values.", ex.Message);
-        Assert.False(reader.IsDBNull(2));
+        Assert.That(ex.Message, Is.EqualTo("Data is Null. This method or property cannot be called on Null values."));
+        Assert.That(reader.IsDBNull(2), Is.False);
         reader.Read();
-        Assert.AreEqual(3, reader.GetValue(0));
-        Assert.AreEqual("Test2", reader.GetValue(1));
-        Assert.AreEqual("Test2", reader.GetString(1));
-        Assert.AreEqual(DBNull.Value, reader.GetValue(2));
+        Assert.That(reader.GetValue(0), Is.EqualTo(3));
+        Assert.That(reader.GetValue(1), Is.EqualTo("Test2"));
+        Assert.That(reader.GetString(1), Is.EqualTo("Test2"));
+        Assert.That(reader.GetValue(2), Is.EqualTo(DBNull.Value));
         ex = Assert.Throws<SqlNullValueException>(() => reader.GetMySqlDateTime(2));
-        Assert.AreEqual("Data is Null. This method or property cannot be called on Null values.", ex.Message);
-        Assert.False(reader.Read());
-        Assert.False(reader.NextResult());
+        Assert.That(ex.Message, Is.EqualTo("Data is Null. This method or property cannot be called on Null values."));
+        Assert.That(reader.Read(), Is.False);
+        Assert.That(reader.NextResult(), Is.False);
       }
     }
 
@@ -352,16 +352,16 @@ public void SequentialAccessBehavior()
       MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", Connection);
       using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
       {
-        Assert.True(reader.Read());
-        Assert.False(reader.IsDBNull(0));
+        Assert.That(reader.Read());
+        Assert.That(reader.IsDBNull(0), Is.False);
         int i = reader.GetInt32(0);
         string s = reader.GetString(1);
-        Assert.AreEqual(1, i);
-        Assert.AreEqual("test1", s);
+        Assert.That(i, Is.EqualTo(1));
+        Assert.That(s, Is.EqualTo("test1"));
 
         // this next line should throw an exception
         Exception ex = Assert.Throws<MySqlException>(() => i = reader.GetInt32(0));
-        Assert.AreEqual("Invalid attempt to read a prior column using SequentialAccess", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Invalid attempt to read a prior column using SequentialAccess"));
       }
     }
 
@@ -377,7 +377,7 @@ public void ReadingTextFields()
       {
         reader.Read();
         string s = reader["t1"].ToString();
-        Assert.AreEqual("Text value", s);
+        Assert.That(s, Is.EqualTo("Text value"));
       }
     }
 
@@ -408,7 +408,7 @@ public void GetChar()
       {
         reader.Read();
         char achar = reader.GetChar(1);
-        Assert.AreEqual('a', achar);
+        Assert.That(achar, Is.EqualTo('a'));
       }
     }
 
@@ -419,12 +419,12 @@ public void ReaderOnNonQuery()
       MySqlCommand cmd = new MySqlCommand("INSERT INTO Test (id,name) VALUES (1,'Test')", Connection);
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.False(reader.Read());
+        Assert.That(reader.Read(), Is.False);
         reader.Close();
 
         cmd.CommandText = "SELECT name FROM Test";
         object v = cmd.ExecuteScalar();
-        Assert.AreEqual("Test", v);
+        Assert.That(v, Is.EqualTo("Test"));
       }
     }
 
@@ -456,69 +456,69 @@ public void TestManyDifferentResultsets()
       {
         //First ResultSet, should have 49 rows.
         //SELECT id FROM Test WHERE id<?param1;
-        Assert.True(reader.HasRows);
-        Assert.AreEqual(1, reader.FieldCount);
+        Assert.That(reader.HasRows);
+        Assert.That(reader.FieldCount, Is.EqualTo(1));
         for (int i = 0; i < 49; i++)
         {
-          Assert.True(reader.Read());
+          Assert.That(reader.Read());
         }
-        Assert.False(reader.Read());
+        Assert.That(reader.Read(), Is.False);
 
         //Second ResultSet, should have no rows.
         //SELECT id,name FROM Test WHERE id = -50;
-        Assert.True(reader.NextResult());
-        Assert.False(reader.HasRows);
-        Assert.AreEqual(2, reader.FieldCount);
-        Assert.False(reader.Read());
+        Assert.That(reader.NextResult());
+        Assert.That(reader.HasRows, Is.False);
+        Assert.That(reader.FieldCount, Is.EqualTo(2));
+        Assert.That(reader.Read(), Is.False);
 
 
         //Third ResultSet, should have 51 rows.
         //SELECT * FROM Test WHERE id >= ?param1;
-        Assert.True(reader.NextResult());
-        Assert.True(reader.HasRows);
-        Assert.AreEqual(5, reader.FieldCount);
+        Assert.That(reader.NextResult());
+        Assert.That(reader.HasRows);
+        Assert.That(reader.FieldCount, Is.EqualTo(5));
         for (int i = 0; i < 51; i++)
         {
-          Assert.True(reader.Read());
+          Assert.That(reader.Read());
         }
-        Assert.False(reader.Read());
+        Assert.That(reader.Read(), Is.False);
 
 
         //Fourth ResultSet, should have no rows.
         //SELECT id, dt, b1 FROM Test WHERE id = -50;
-        Assert.True(reader.NextResult());
-        Assert.False(reader.HasRows);
-        Assert.AreEqual(3, reader.FieldCount); //Will Fail if uncommented expected 3 returned 5
-        Assert.False(reader.Read());
+        Assert.That(reader.NextResult());
+        Assert.That(reader.HasRows, Is.False);
+        Assert.That(reader.FieldCount, Is.EqualTo(3)); //Will Fail if uncommented expected 3 returned 5
+        Assert.That(reader.Read(), Is.False);
 
         //Fifth ResultSet, should have no rows.
         //SELECT b1 FROM Test WHERE id = -50;
-        Assert.True(reader.NextResult());
-        Assert.False(reader.HasRows);
-        Assert.AreEqual(1, reader.FieldCount); //Will Fail if uncommented expected 1 returned 5
-        Assert.False(reader.Read());
+        Assert.That(reader.NextResult());
+        Assert.That(reader.HasRows, Is.False);
+        Assert.That(reader.FieldCount, Is.EqualTo(1)); //Will Fail if uncommented expected 1 returned 5
+        Assert.That(reader.Read(), Is.False);
 
         //Sixth ResultSet, should have 49 rows.
         //SELECT id, dt, b1 FROM Test WHERE id < ?param1;
-        Assert.True(reader.NextResult());
-        Assert.True(reader.HasRows);
-        Assert.AreEqual(3, reader.FieldCount); //Will Fail if uncommented expected 3 returned 5
+        Assert.That(reader.NextResult());
+        Assert.That(reader.HasRows);
+        Assert.That(reader.FieldCount, Is.EqualTo(3)); //Will Fail if uncommented expected 3 returned 5
         for (int i = 0; i < 49; i++)
         {
-          Assert.True(reader.Read());
+          Assert.That(reader.Read());
         }
-        Assert.False(reader.Read());
+        Assert.That(reader.Read(), Is.False);
 
         //Seventh ResultSet, should have 51 rows.
         //SELECT b1 FROM Test WHERE id >= ?param1;
-        Assert.True(reader.NextResult());
-        Assert.True(reader.HasRows);
-        Assert.AreEqual(1, reader.FieldCount); //Will Fail if uncommented expected 1 returned 5
+        Assert.That(reader.NextResult());
+        Assert.That(reader.HasRows);
+        Assert.That(reader.FieldCount, Is.EqualTo(1)); //Will Fail if uncommented expected 1 returned 5
         for (int i = 0; i < 51; i++)
         {
-          Assert.True(reader.Read());
+          Assert.That(reader.Read());
         }
-        Assert.False(reader.Read());
+        Assert.That(reader.Read(), Is.False);
       }
     }
 
@@ -539,25 +539,25 @@ public void TestMultipleResultsWithQueryCacheOn()
 
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.NotNull(reader);
-        Assert.True(reader.HasRows);
-        Assert.True(reader.Read());
-        Assert.AreEqual(1, reader.FieldCount);
-        Assert.True(reader.NextResult());
-        Assert.True(reader.HasRows);
-        Assert.AreEqual(5, reader.FieldCount);
+        Assert.That(reader, Is.Not.Null);
+        Assert.That(reader.HasRows);
+        Assert.That(reader.Read());
+        Assert.That(reader.FieldCount, Is.EqualTo(1));
+        Assert.That(reader.NextResult());
+        Assert.That(reader.HasRows);
+        Assert.That(reader.FieldCount, Is.EqualTo(5));
       }
 
       // now do it again
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.NotNull(reader);
-        Assert.True(reader.HasRows);
-        Assert.True(reader.Read());
-        Assert.AreEqual(1, reader.FieldCount);
-        Assert.True(reader.NextResult());
-        Assert.True(reader.HasRows);
-        Assert.AreEqual(5, reader.FieldCount);
+        Assert.That(reader, Is.Not.Null);
+        Assert.That(reader.HasRows);
+        Assert.That(reader.Read());
+        Assert.That(reader.FieldCount, Is.EqualTo(1));
+        Assert.That(reader.NextResult());
+        Assert.That(reader.HasRows);
+        Assert.That(reader.FieldCount, Is.EqualTo(5));
       }
     }
 
@@ -572,7 +572,7 @@ public void AffectedRows()
       {
         reader.Read();
         reader.Close();
-        Assert.AreEqual(-1, reader.RecordsAffected);
+        Assert.That(reader.RecordsAffected, Is.EqualTo(-1));
       }
     }
 
@@ -591,7 +591,7 @@ public void InvalidTimestamp()
         Assert.Throws<MySqlException>(() => reader = cmd.ExecuteReader());
       else
       {
-        CollectionAssert.IsEmpty(reader = cmd.ExecuteReader());
+        Assert.That(reader = cmd.ExecuteReader(), Is.Empty);
         reader.Close();
       }
     }
@@ -629,7 +629,7 @@ public void GetSchemaTableOnEmptyResultset()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         DataTable dt = reader.GetSchemaTable();
-        Assert.Null(dt);
+        Assert.That(dt, Is.Null);
       }
     }
 
@@ -645,8 +645,8 @@ public void IsDbNullOnNonNullFields()
       MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", Connection);
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.False(reader.IsDBNull(1));
+        Assert.That(reader.Read());
+        Assert.That(reader.IsDBNull(1), Is.False);
       }
     }
 
@@ -691,7 +691,7 @@ public void CloseConnectionBehavior2()
         MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", c2);
         using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.CloseConnection))
         {
-          Assert.True(reader.Read());
+          Assert.That(reader.Read());
         }
       }
     }
@@ -710,26 +710,26 @@ public void CommandBehaviorSchemaOnly()
       MySqlCommand cmd = new MySqlCommand("select * from doesnotexist", Connection);
       MySqlDataReader reader;
       Exception ex = Assert.Throws<MySqlException>(() => reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly));
-      StringAssert.Contains(".doesnotexist' doesn't exist", ex.Message);
+      Assert.That(ex.Message, Does.Contain(".doesnotexist' doesn't exist"));
 
       // Check that failed ExecuteReader did not leave SQL_SELECT_LIMIT
       // set to 0.
       cmd.CommandText = "select now()";
       reader = cmd.ExecuteReader();
-      Assert.True(reader.Read());
+      Assert.That(reader.Read());
       reader.Close();
 
 
       // Check that CommandBehavior.SchemaOnly does not return rows
       reader = cmd.ExecuteReader(CommandBehavior.SchemaOnly);
-      Assert.False(reader.Read());
+      Assert.That(reader.Read(), Is.False);
       reader.Close();
 
 
       reader = cmd.ExecuteReader();
       // Check that prior setting of CommandBehavior did not 
       // leave SQL_SELECT_LIMIT set to 0
-      Assert.True(reader.Read());
+      Assert.That(reader.Read());
       reader.Close();
     }
 
@@ -748,8 +748,8 @@ public void ColumnsWithSameName()
         reader.Read();
         string name1 = reader.GetString(0);
         string name2 = reader.GetString(1);
-        Assert.AreEqual(name1, name2);
-        Assert.AreEqual("test", name1);
+        Assert.That(name2, Is.EqualTo(name1));
+        Assert.That(name1, Is.EqualTo("test"));
       }
 
       cmd.CommandText = "SELECT 'a' AS XYZ, 'b' as Xyz";
@@ -773,7 +773,7 @@ public void Bug47467()
         reader.Read();
         Type t = reader.GetFieldType("c1");
         Exception ex = Assert.Throws<IndexOutOfRangeException>(() => reader.GetOrdinal("nocol"));
-        Assert.True(ex.Message.IndexOf("nocol") != -1);
+        Assert.That(ex.Message.IndexOf("nocol") != -1);
       }
     }
 
@@ -802,7 +802,7 @@ public void GetStream()
         using (var stream = reader.GetStream(0))
         {
           string result = UTF8Encoding.UTF8.GetString(((MemoryStream)stream).ToArray());
-          StringAssert.AreEqualIgnoringCase(str, result);
+          Assert.That(result, Is.EqualTo(str).IgnoreCase);
         }
       }
     }
@@ -835,12 +835,12 @@ public void GetFieldValue()
       using (var reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual(1, reader.GetFieldValue<int>(0));
-        Assert.AreEqual(1.23, reader.GetFieldValue<decimal>(1));
-        Assert.AreEqual("test", reader.GetFieldValue<string>(2));
-        Assert.AreEqual(dateTime.ToShortDateString(), reader.GetFieldValue<DateTime>(3).ToShortDateString());
-        Assert.AreEqual(true, reader.GetFieldValue<bool>(4));
-        StringAssert.AreEqualIgnoringCase(str, Encoding.UTF8.GetString(((MemoryStream)reader.GetFieldValue<Stream>(5)).ToArray()));
+        Assert.That(reader.GetFieldValue<int>(0), Is.EqualTo(1));
+        Assert.That(reader.GetFieldValue<decimal>(1), Is.EqualTo(1.23));
+        Assert.That(reader.GetFieldValue<string>(2), Is.EqualTo("test"));
+        Assert.That(reader.GetFieldValue<DateTime>(3).ToShortDateString(), Is.EqualTo(dateTime.ToShortDateString()));
+        Assert.That(reader.GetFieldValue<bool>(4), Is.EqualTo(true));
+        Assert.That(Encoding.UTF8.GetString(((MemoryStream)reader.GetFieldValue<Stream>(5)).ToArray()), Is.EqualTo(str).IgnoreCase);
       }
     }
   }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/OutputParametersBatch.cs b/MySQL.Data/tests/MySql.Data.Tests/OutputParametersBatch.cs
index 2f1ddbbee..9fb16057c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/OutputParametersBatch.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/OutputParametersBatch.cs
@@ -58,7 +58,7 @@ protected override void Cleanup()
     public void OutputParameters()
     {
       // we don't want to run this test under no access
-      Assert.True(Settings.CheckParameters);
+      Assert.That(Settings.CheckParameters);
 
       // create our procedure
       ExecuteSQL("CREATE PROCEDURE spTest(out value VARCHAR(350), OUT intVal INT, " +
@@ -89,14 +89,13 @@ public void OutputParameters()
       if (prepare) cmd.Prepare();
       int rowsAffected = cmd.ExecuteNonQuery();
 
-      Assert.AreEqual(0, rowsAffected);
-      Assert.AreEqual("42", cmd.Parameters[0].Value);
-      Assert.AreEqual(33, cmd.Parameters[1].Value);
-      Assert.AreEqual(new DateTime(2004, 6, 5, 7, 58, 9),
-               Convert.ToDateTime(cmd.Parameters[2].Value));
-      Assert.AreEqual((decimal)1.2, (decimal)(float)cmd.Parameters[3].Value);
-      Assert.AreEqual("test", cmd.Parameters[4].Value);
-      Assert.AreEqual(66, cmd.Parameters[5].Value);
+      Assert.That(rowsAffected, Is.EqualTo(0));
+      Assert.That(cmd.Parameters[0].Value, Is.EqualTo("42"));
+      Assert.That(cmd.Parameters[1].Value, Is.EqualTo(33));
+      Assert.That(Convert.ToDateTime(cmd.Parameters[2].Value), Is.EqualTo(new DateTime(2004, 6, 5, 7, 58, 9)));
+      Assert.That((decimal)(float)cmd.Parameters[3].Value, Is.EqualTo((decimal)1.2));
+      Assert.That(cmd.Parameters[4].Value, Is.EqualTo("test"));
+      Assert.That(cmd.Parameters[5].Value, Is.EqualTo(66));
     }
 
     [Test]
@@ -116,10 +115,10 @@ public void InputOutputParameters()
       cmd.Parameters[2].Direction = ParameterDirection.Output;
       if (prepare) cmd.Prepare();
       int rowsAffected = cmd.ExecuteNonQuery();
-      Assert.AreEqual(0, rowsAffected);
-      Assert.AreEqual("beginningending", cmd.Parameters[0].Value);
-      Assert.AreEqual(66, cmd.Parameters[1].Value);
-      Assert.AreEqual(99, cmd.Parameters[2].Value);
+      Assert.That(rowsAffected, Is.EqualTo(0));
+      Assert.That(cmd.Parameters[0].Value, Is.EqualTo("beginningending"));
+      Assert.That(cmd.Parameters[1].Value, Is.EqualTo(66));
+      Assert.That(cmd.Parameters[2].Value, Is.EqualTo(99));
     }
 
     [Test]
@@ -136,8 +135,8 @@ public void ExecuteScalar()
       cmd.Parameters[1].Direction = ParameterDirection.Output;
       if (prepare) cmd.Prepare();
       object result = cmd.ExecuteScalar();
-      Assert.AreEqual("Test", result);
-      Assert.AreEqual("valuein", cmd.Parameters[1].Value);
+      Assert.That(result, Is.EqualTo("Test"));
+      Assert.That(cmd.Parameters[1].Value, Is.EqualTo("valuein"));
     }
 
     [Test]
@@ -154,11 +153,11 @@ public void ExecuteReaderTest()
       if (prepare) cmd.Prepare();
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.False(reader.NextResult());
-        Assert.False(reader.Read());
+        Assert.That(reader.Read());
+        Assert.That(reader.NextResult(), Is.False);
+        Assert.That(reader.Read(), Is.False);
       }
-      Assert.AreEqual(2, cmd.Parameters[0].Value);
+      Assert.That(cmd.Parameters[0].Value, Is.EqualTo(2));
     }
 
     [Test]
@@ -171,7 +170,7 @@ public void FunctionNoParams()
       cmd.CommandType = CommandType.Text;
       if (prepare) cmd.Prepare();
       object result = cmd.ExecuteScalar();
-      Assert.AreEqual("Test", result);
+      Assert.That(result, Is.EqualTo("Test"));
     }
 
     [Test]
@@ -184,7 +183,7 @@ public void FunctionParams()
       cmd.CommandType = CommandType.Text;
       if (prepare) cmd.Prepare();
       object result = cmd.ExecuteScalar();
-      Assert.AreEqual(26, result);
+      Assert.That(result, Is.EqualTo(26));
     }
 
     /// <summary>
@@ -206,7 +205,7 @@ public void CallingStoredFunctionasProcedure()
       cmd.Parameters.Add(retVal);
       if (prepare) cmd.Prepare();
       cmd.ExecuteNonQuery();
-      Assert.AreEqual(44, cmd.Parameters[1].Value);
+      Assert.That(cmd.Parameters[1].Value, Is.EqualTo(44));
     }
 
     [Test]
@@ -260,8 +259,8 @@ public void UnsignedOutputParameters()
       cmd.ExecuteNonQuery();
 
       object o = cmd.Parameters[0].Value;
-      Assert.True(o is ulong);
-      Assert.AreEqual(1, Convert.ToInt32(o));
+      Assert.That(o is ulong);
+      Assert.That(Convert.ToInt32(o), Is.EqualTo(1));
     }
 
     [Test]
@@ -276,7 +275,7 @@ public void CallingFunctionWithoutReturnParameter()
       cmd.Parameters.AddWithValue("?p_kiosk", 2);
       cmd.Parameters.AddWithValue("?p_user", 4);
       Exception ex = Assert.Throws<InvalidOperationException>(() => { if (prepare) cmd.Prepare(); cmd.ExecuteNonQuery(); });
-      Assert.AreEqual(ex.Message, "Attempt to call stored function 'fnTest' without specifying a return parameter");
+      Assert.That("Attempt to call stored function 'fnTest' without specifying a return parameter", Is.EqualTo(ex.Message));
     }
 
     /// <summary>
@@ -318,16 +317,16 @@ public void BinaryAndVarBinaryParameters()
       cmd.ExecuteNonQuery();
 
       byte[] out1 = (byte[])cmd.Parameters[0].Value;
-      Assert.AreEqual('o', (char)out1[0]);
-      Assert.AreEqual('u', (char)out1[1]);
-      Assert.AreEqual('t', (char)out1[2]);
-      Assert.AreEqual('1', (char)out1[3]);
+      Assert.That((char)out1[0], Is.EqualTo('o'));
+      Assert.That((char)out1[1], Is.EqualTo('u'));
+      Assert.That((char)out1[2], Is.EqualTo('t'));
+      Assert.That((char)out1[3], Is.EqualTo('1'));
 
       out1 = (byte[])cmd.Parameters[1].Value;
-      Assert.AreEqual('o', (char)out1[0]);
-      Assert.AreEqual('u', (char)out1[1]);
-      Assert.AreEqual('t', (char)out1[2]);
-      Assert.AreEqual('2', (char)out1[3]);
+      Assert.That((char)out1[0], Is.EqualTo('o'));
+      Assert.That((char)out1[1], Is.EqualTo('u'));
+      Assert.That((char)out1[2], Is.EqualTo('t'));
+      Assert.That((char)out1[3], Is.EqualTo('2'));
     }
 
     /// <summary>
@@ -350,7 +349,7 @@ RETURNS double NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER
       if (prepare) command.Prepare();
       command.ExecuteNonQuery();
       double balance = Convert.ToDouble(command.Parameters["?Balance"].Value);
-      Assert.AreEqual(1.0, balance);
+      Assert.That(balance, Is.EqualTo(1.0));
     }
 
     /// <summary>
@@ -373,8 +372,8 @@ public void OutputParametersWithNewParamHandling()
         if (prepare) cmd.Prepare();
         int rowsAffected = cmd.ExecuteNonQuery();
 
-        Assert.AreEqual(0, rowsAffected);
-        Assert.AreEqual("42", cmd.Parameters[0].Value);
+        Assert.That(rowsAffected, Is.EqualTo(0));
+        Assert.That(cmd.Parameters[0].Value, Is.EqualTo("42"));
       }
     }
 
@@ -399,8 +398,8 @@ public void FunctionWithNewParamHandling()
         if (prepare) cmd.Prepare();
         int rowsAffected = cmd.ExecuteNonQuery();
 
-        Assert.AreEqual(0, rowsAffected);
-        Assert.AreEqual(22, cmd.Parameters[1].Value);
+        Assert.That(rowsAffected, Is.EqualTo(0));
+        Assert.That(cmd.Parameters[1].Value, Is.EqualTo(22));
       }
     }
 
@@ -421,7 +420,7 @@ public void BitTypeAsOutParameter()
       cmd.Parameters.Add("x", MySqlDbType.Bit).Direction = ParameterDirection.Output;
       if (prepare) cmd.Prepare();
       cmd.ExecuteNonQuery();
-      Assert.AreEqual(0, Convert.ToInt32(cmd.Parameters[0].Value));
+      Assert.That(Convert.ToInt32(cmd.Parameters[0].Value), Is.EqualTo(0));
     }
 
     /// <summary>
@@ -463,12 +462,12 @@ public void RunWithoutSelectPrivsThrowException()
         if (prepare) cmd.Prepare();
         cmd.ExecuteNonQuery();
 
-        Assert.AreEqual(6, cmd.Parameters[1].Value);
-        Assert.AreEqual(6, cmd.Parameters[2].Value);
+        Assert.That(cmd.Parameters[1].Value, Is.EqualTo(6));
+        Assert.That(cmd.Parameters[2].Value, Is.EqualTo(6));
       }
       catch (InvalidOperationException iex)
       {
-        StringAssert.StartsWith("Unable to retrieve", iex.Message);
+        Assert.That(iex.Message, Does.StartWith("Unable to retrieve"));
       }
       finally
       {
@@ -500,8 +499,8 @@ public void NoAccessToProcedureBodies()
         if (prepare) cmd.Prepare();
         cmd.ExecuteNonQuery();
 
-        Assert.AreEqual(6, cmd.Parameters[1].Value);
-        Assert.AreEqual(3, cmd.Parameters[2].Value);
+        Assert.That(cmd.Parameters[1].Value, Is.EqualTo(6));
+        Assert.That(cmd.Parameters[2].Value, Is.EqualTo(3));
       }
     }
   }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs
index 41448db0a..ce075ed76 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs
@@ -76,19 +76,19 @@ public void TestQuoting()
       {
         reader = cmd.ExecuteReader();
         reader.Read();
-        Assert.AreEqual("my ' value", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("my ' value"));
         reader.Read();
-        Assert.AreEqual(@"my "" value", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo(@"my "" value"));
         reader.Read();
-        Assert.AreEqual("my ` value", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("my ` value"));
         reader.Read();
-        Assert.AreEqual("my ´ value", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("my ´ value"));
         reader.Read();
-        Assert.AreEqual(@"my \ value", reader.GetString(1));
+        Assert.That(reader.GetString(1), Is.EqualTo(@"my \ value"));
       }
       catch (Exception ex)
       {
-        Assert.False(ex.Message == String.Empty, ex.Message);
+        Assert.That(ex.Message == String.Empty, Is.False, ex.Message);
       }
       finally
       {
@@ -109,41 +109,41 @@ public void TestDateTimeParameter()
       cmd.Parameters.Add(new MySqlParameter("?time", time));
       cmd.Parameters.Add(new MySqlParameter("?dt", dt));
       int cnt = cmd.ExecuteNonQuery();
-      Assert.True(cnt == 1, "Insert count");
+      Assert.That(cnt == 1, "Insert count");
 
       cmd = new MySqlCommand("SELECT tm, dt, ts FROM Test WHERE id=1", Connection);
       MySqlDataReader reader = cmd.ExecuteReader();
       reader.Read();
       TimeSpan time2 = (TimeSpan)reader.GetValue(0);
-      Assert.AreEqual(time, time2);
+      Assert.That(time2, Is.EqualTo(time));
 
       DateTime dt2 = reader.GetDateTime(1);
-      Assert.AreEqual(dt, dt2);
+      Assert.That(dt2, Is.EqualTo(dt));
 
       DateTime ts2 = reader.GetDateTime(2);
       reader.Close();
 
       // now check the timestamp column.  We won't check the minute or second for obvious reasons
       DateTime now = DateTime.Now;
-      Assert.AreEqual(now.Year, ts2.Year);
-      Assert.AreEqual(now.Month, ts2.Month);
-      Assert.AreEqual(now.Day, ts2.Day);
-      Assert.AreEqual(now.Hour, ts2.Hour);
+      Assert.That(ts2.Year, Is.EqualTo(now.Year));
+      Assert.That(ts2.Month, Is.EqualTo(now.Month));
+      Assert.That(ts2.Day, Is.EqualTo(now.Day));
+      Assert.That(ts2.Hour, Is.EqualTo(now.Hour));
 
       // now we'll set some nulls and see how they are handled
       cmd = new MySqlCommand("UPDATE Test SET tm=?ts, dt=?dt WHERE id=1", Connection);
       cmd.Parameters.Add(new MySqlParameter("?ts", DBNull.Value));
       cmd.Parameters.Add(new MySqlParameter("?dt", DBNull.Value));
       cnt = cmd.ExecuteNonQuery();
-      Assert.True(cnt == 1, "Update null count");
+      Assert.That(cnt == 1, "Update null count");
 
       cmd = new MySqlCommand("SELECT tm, dt FROM Test WHERE id=1", Connection);
       reader = cmd.ExecuteReader();
       reader.Read();
       object tso = reader.GetValue(0);
       object dto = reader.GetValue(1);
-      Assert.True(tso == DBNull.Value, "Time column");
-      Assert.True(dto == DBNull.Value, "DateTime column");
+      Assert.That(tso == DBNull.Value, "Time column");
+      Assert.That(dto == DBNull.Value, "DateTime column");
 
       reader.Close();
 
@@ -159,7 +159,7 @@ public void NestedQuoting()
       MySqlCommand cmd = new MySqlCommand("INSERT INTO Test (id, name) " +
         "VALUES(1, 'this is ?\"my value\"')", Connection);
       int count = cmd.ExecuteNonQuery();
-      Assert.AreEqual(1, count);
+      Assert.That(count, Is.EqualTo(1));
     }
 
     [Test]
@@ -168,16 +168,16 @@ public void SetDbType()
       IDbCommand cmd = Connection.CreateCommand();
       IDbDataParameter prm = cmd.CreateParameter();
       prm.DbType = DbType.Int64;
-      Assert.AreEqual(DbType.Int64, prm.DbType);
+      Assert.That(prm.DbType, Is.EqualTo(DbType.Int64));
       prm.Value = 3;
-      Assert.AreEqual(DbType.Int64, prm.DbType);
+      Assert.That(prm.DbType, Is.EqualTo(DbType.Int64));
 
       MySqlParameter p = new MySqlParameter("name", MySqlDbType.Int64);
-      Assert.AreEqual(DbType.Int64, p.DbType);
-      Assert.AreEqual(MySqlDbType.Int64, p.MySqlDbType);
+      Assert.That(p.DbType, Is.EqualTo(DbType.Int64));
+      Assert.That(p.MySqlDbType, Is.EqualTo(MySqlDbType.Int64));
       p.Value = 3;
-      Assert.AreEqual(DbType.Int64, p.DbType);
-      Assert.AreEqual(MySqlDbType.Int64, p.MySqlDbType);
+      Assert.That(p.DbType, Is.EqualTo(DbType.Int64));
+      Assert.That(p.MySqlDbType, Is.EqualTo(MySqlDbType.Int64));
     }
 
     [Test]
@@ -236,9 +236,9 @@ public void MemoryStreamAsParameterValue()
         using (MySqlDataReader reader = cmd.ExecuteReader())
         {
           reader.Read();
-          Assert.AreEqual("abcd", Convert.ToString(reader[0]));
-          Assert.AreEqual("efgh", Encoding.Default.GetString((byte[])reader[1]));
-          Assert.AreEqual("5678", Convert.ToString(reader[2]));
+          Assert.That(Convert.ToString(reader[0]), Is.EqualTo("abcd"));
+          Assert.That(Encoding.Default.GetString((byte[])reader[1]), Is.EqualTo("efgh"));
+          Assert.That(Convert.ToString(reader[2]), Is.EqualTo("5678"));
         }
       }
     }
@@ -251,8 +251,8 @@ public void ParameterClone2()
     {
       var param = new MySqlParameter("@param", MySqlDbType.MediumText);
       var clone = param.Clone();
-      Assert.AreEqual(MySqlDbType.MediumText, param.MySqlDbType); // Prints "MediumText"
-      Assert.AreEqual(MySqlDbType.MediumText, clone.MySqlDbType); // Prints "VarChar"
+      Assert.That(param.MySqlDbType, Is.EqualTo(MySqlDbType.MediumText)); // Prints "MediumText"
+      Assert.That(clone.MySqlDbType, Is.EqualTo(MySqlDbType.MediumText)); // Prints "VarChar"
     }
 
 
@@ -279,17 +279,17 @@ public void ParameterClone()
 
       var clonedparam = param.Clone();
 
-      Assert.AreEqual(DbType.Int32, clonedparam.DbType);
-      Assert.AreEqual(ParameterDirection.Output, clonedparam.Direction);
-      Assert.AreEqual(System.Text.Encoding.UTF8, clonedparam.Encoding);
-      Assert.IsTrue(clonedparam.IsNullable);
-      Assert.AreEqual(MySqlDbType.Int32, clonedparam.MySqlDbType);
-      Assert.AreEqual("test", clonedparam.ParameterName);
-      Assert.AreEqual((byte)3, clonedparam.Precision);
-      Assert.AreEqual((byte)2, clonedparam.Scale);
-      Assert.AreEqual(1, clonedparam.Size);
-      Assert.IsTrue(clonedparam.SourceColumnNullMapping);
-      Assert.AreEqual(1, clonedparam.Value);
+      Assert.That(clonedparam.DbType, Is.EqualTo(DbType.Int32));
+      Assert.That(clonedparam.Direction, Is.EqualTo(ParameterDirection.Output));
+      Assert.That(clonedparam.Encoding, Is.EqualTo(System.Text.Encoding.UTF8));
+      Assert.That(clonedparam.IsNullable);
+      Assert.That(clonedparam.MySqlDbType, Is.EqualTo(MySqlDbType.Int32));
+      Assert.That(clonedparam.ParameterName, Is.EqualTo("test"));
+      Assert.That(clonedparam.Precision, Is.EqualTo((byte)3));
+      Assert.That(clonedparam.Scale, Is.EqualTo((byte)2));
+      Assert.That(clonedparam.Size, Is.EqualTo(1));
+      Assert.That(clonedparam.SourceColumnNullMapping);
+      Assert.That(clonedparam.Value, Is.EqualTo(1));
     }
 
     /// <summary>
@@ -311,7 +311,7 @@ public void ParameterDirectionOutputTextCommand(bool preparedCommand)
         if (preparedCommand) cmd.Prepare();
 
         cmd.ExecuteNonQuery();
-        Assert.AreEqual(1234, cmd.Parameters["@outputParam"].Value);
+        Assert.That(cmd.Parameters["@outputParam"].Value, Is.EqualTo(1234));
       }
     }
 
@@ -338,10 +338,10 @@ public void AllowUnnamedParameters()
       cmd.ExecuteNonQuery();
 
       cmd.CommandText = "SELECT id FROM Test";
-      Assert.AreEqual(1, cmd.ExecuteScalar());
+      Assert.That(cmd.ExecuteScalar(), Is.EqualTo(1));
 
       cmd.CommandText = "SELECT name FROM Test";
-      Assert.AreEqual("test", cmd.ExecuteScalar());
+      Assert.That(cmd.ExecuteScalar(), Is.EqualTo("test"));
     }
 
     [Test]
@@ -355,7 +355,7 @@ public void NullParameterValue()
 
       cmd.CommandText = "SELECT name FROM Test WHERE id=1";
       object name = cmd.ExecuteScalar();
-      Assert.AreEqual(DBNull.Value, name);
+      Assert.That(name, Is.EqualTo(DBNull.Value));
     }
 
     /// <summary>
@@ -369,7 +369,7 @@ public void DefaultType()
       p.ParameterName = "?boo";
       p.Value = "test";
       MySqlParameter mp = (MySqlParameter)p;
-      Assert.AreEqual(MySqlDbType.VarChar, mp.MySqlDbType);
+      Assert.That(mp.MySqlDbType, Is.EqualTo(MySqlDbType.VarChar));
     }
 
     [Test]
@@ -393,15 +393,15 @@ public void OddCharsInParameterNames()
 
       cmd.CommandText = "SELECT name FROM Test WHERE id=1";
       object name = cmd.ExecuteScalar();
-      Assert.AreEqual("Test", name);
+      Assert.That(name, Is.EqualTo("Test"));
 
       cmd.CommandText = "SELECT name FROM Test WHERE id=2";
       name = cmd.ExecuteScalar();
-      Assert.AreEqual("Test2", name);
+      Assert.That(name, Is.EqualTo("Test2"));
 
       cmd.CommandText = "SELECT name FROM Test WHERE id=3";
       name = cmd.ExecuteScalar();
-      Assert.AreEqual("Test3", name);
+      Assert.That(name, Is.EqualTo("Test3"));
     }
 
     /// <summary>
@@ -429,10 +429,10 @@ public void UnTypedParameterBeingReused()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.True(reader.IsDBNull(2));
+        Assert.That(reader.IsDBNull(2));
         reader.Read();
-        Assert.False(reader.IsDBNull(2));
-        Assert.False(reader.Read());
+        Assert.That(reader.IsDBNull(2), Is.False);
+        Assert.That(reader.Read(), Is.False);
       }
     }
 
@@ -461,19 +461,19 @@ public void WithAndWithoutMarker()
 
       MySqlCommand cmd = new MySqlCommand("INSERT INTO Test (id, name) VALUES (?id, ?name)", Connection);
       cmd.Parameters.AddWithValue("id", 1);
-      Assert.AreEqual(-1, cmd.Parameters.IndexOf("?id"));
+      Assert.That(cmd.Parameters.IndexOf("?id"), Is.EqualTo(-1));
       cmd.Parameters.AddWithValue("name", "test");
       cmd.ExecuteNonQuery();
 
       cmd.Parameters.Clear();
       cmd.Parameters.AddWithValue("?id", 2);
-      Assert.AreEqual(-1, cmd.Parameters.IndexOf("id"));
+      Assert.That(cmd.Parameters.IndexOf("id"), Is.EqualTo(-1));
       cmd.Parameters.AddWithValue("?name", "test2");
       cmd.ExecuteNonQuery();
 
       cmd.CommandText = "SELECT COUNT(*) FROM Test";
       object count = cmd.ExecuteScalar();
-      Assert.AreEqual(2, Convert.ToInt32(count));
+      Assert.That(Convert.ToInt32(count), Is.EqualTo(2));
     }
 
     [Test]
@@ -482,11 +482,11 @@ public void DoubleAddingParameters()
       ExecuteSQL("CREATE TABLE Test (id INT NOT NULL, name VARCHAR(100), dt DATETIME, tm TIME, ts TIMESTAMP, PRIMARY KEY(id))");
       MySqlCommand cmd = new MySqlCommand("INSERT INTO Test (id, name) VALUES (?id, ?name)", Connection);
       cmd.Parameters.AddWithValue("id", 1);
-      Assert.AreEqual(-1, cmd.Parameters.IndexOf("?id"));
-      Assert.AreEqual(-1, cmd.Parameters.IndexOf("@id"));
+      Assert.That(cmd.Parameters.IndexOf("?id"), Is.EqualTo(-1));
+      Assert.That(cmd.Parameters.IndexOf("@id"), Is.EqualTo(-1));
       cmd.Parameters.AddWithValue("name", "test");
       Exception ex = Assert.Throws<MySqlException>(() => cmd.Parameters.AddWithValue("?id", 2));
-      Assert.AreEqual("Parameter '?id' has already been defined.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Parameter '?id' has already been defined."));
     }
 
     /// <summary>
@@ -519,7 +519,7 @@ public void AddingParametersUsingInsert()
       MySqlCommand cmd = new MySqlCommand();
       cmd.Parameters.Insert(0, new MySqlParameter("?id", MySqlDbType.Int32));
       MySqlParameter p = cmd.Parameters["?id"];
-      Assert.AreEqual("?id", p.ParameterName);
+      Assert.That(p.ParameterName, Is.EqualTo("?id"));
     }
 
     /// <summary>
@@ -538,7 +538,7 @@ public void FindParameterAfterRemoval()
       cmd.Parameters.Add("?id6", MySqlDbType.Int32);
       cmd.Parameters.RemoveAt("?id1");
       MySqlParameter p = cmd.Parameters["?id6"];
-      Assert.AreEqual("?id6", p.ParameterName);
+      Assert.That(p.ParameterName, Is.EqualTo("?id6"));
     }
 
     /// <summary>
@@ -576,7 +576,7 @@ public void StringParameterSizeSetAfterValue()
       MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", Connection);
       DataTable dt = new DataTable();
       da.Fill(dt);
-      Assert.AreEqual("123", dt.Rows[0][0]);
+      Assert.That(dt.Rows[0][0], Is.EqualTo("123"));
 
       cmd.Parameters.Clear();
       cmd.Parameters.Add("?p1", MySqlDbType.VarChar);
@@ -586,7 +586,7 @@ public void StringParameterSizeSetAfterValue()
 
       dt.Clear();
       da.Fill(dt);
-      Assert.AreEqual("1234567890", dt.Rows[1][0]);
+      Assert.That(dt.Rows[1][0], Is.EqualTo("1234567890"));
     }
 
     /// <summary>
@@ -597,11 +597,11 @@ public void NonInputParametersToCtor()
     {
       MySqlParameter p = new MySqlParameter("?p1", MySqlDbType.VarChar, 20,
           ParameterDirection.InputOutput, true, 0, 0, "id", DataRowVersion.Current, 0);
-      Assert.AreEqual(ParameterDirection.InputOutput, p.Direction);
+      Assert.That(p.Direction, Is.EqualTo(ParameterDirection.InputOutput));
 
       MySqlParameter p1 = new MySqlParameter("?p1", MySqlDbType.VarChar, 20,
           ParameterDirection.Output, true, 0, 0, "id", DataRowVersion.Current, 0);
-      Assert.AreEqual(ParameterDirection.Output, p1.Direction);
+      Assert.That(p1.Direction, Is.EqualTo(ParameterDirection.Output));
     }
 
     [Test]
@@ -618,8 +618,8 @@ public void UseAtSignForParameters()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual(33, reader.GetInt32(0));
-        Assert.AreEqual("Test", reader.GetString(1));
+        Assert.That(reader.GetInt32(0), Is.EqualTo(33));
+        Assert.That(reader.GetString(1), Is.EqualTo("Test"));
       }
     }
 
@@ -634,7 +634,7 @@ public void CanCreateMySQLParameterWithNullability()
       MySqlParameter p = new MySqlParameter("?id", MySqlDbType.Decimal, 2,
                                           ParameterDirection.Input, true, 1, 1, "sourceColumn", DataRowVersion.Default, 1);
 
-      Assert.True(p.IsNullable);
+      Assert.That(p.IsNullable);
     }
 
     /// <summary>
@@ -647,7 +647,7 @@ public void CanCreateMySQLParameterWithPrecision()
       MySqlParameter p = new MySqlParameter("?id", MySqlDbType.Decimal, 2,
                                           ParameterDirection.Input, true, Byte.MaxValue, 1, "sourceColumn", DataRowVersion.Default, 1);
 
-      Assert.AreEqual(p.Precision, Byte.MaxValue);
+      Assert.That(Byte.MaxValue, Is.EqualTo(p.Precision));
     }
 
 
@@ -662,7 +662,7 @@ public void CanCreateMySQLParameterWithScale()
       MySqlParameter p = new MySqlParameter("?id", MySqlDbType.Decimal, 2,
                                           ParameterDirection.Input, true, 1, Byte.MaxValue, "sourceColumn", DataRowVersion.Default, 1);
 
-      Assert.AreEqual(p.Scale, Byte.MaxValue);
+      Assert.That(Byte.MaxValue, Is.EqualTo(p.Scale));
     }
 
     /// <summary>
@@ -680,10 +680,10 @@ public void CanIdentifyParameterWithOutName()
       cmd.ExecuteNonQuery();
 
       cmd.CommandText = "SELECT id FROM Test";
-      Assert.AreEqual(1, cmd.ExecuteScalar());
+      Assert.That(cmd.ExecuteScalar(), Is.EqualTo(1));
 
       cmd.CommandText = "SELECT name FROM Test";
-      Assert.AreEqual("test", cmd.ExecuteScalar());
+      Assert.That(cmd.ExecuteScalar(), Is.EqualTo("test"));
     }
 
     /// <summary>
@@ -696,7 +696,7 @@ public void CanThrowAnExceptionWhenMixingParameterNaming()
       cmd.Parameters.AddWithValue("?Id", 1);
       cmd.Parameters.AddWithValue("?name", "test");
       Exception ex = Assert.Throws<MySqlException>(() => cmd.ExecuteNonQuery());
-      Assert.AreEqual("Fatal error encountered during command execution.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Fatal error encountered during command execution."));
     }
 
     /// <summary>
@@ -718,7 +718,7 @@ public void TreatTinyAsBooleanWhenNull()
           while (reader.Read())
           {
             if (!(reader["testcol"] is DBNull))
-              Assert.True(reader["testcol"] is bool);
+              Assert.That(reader["testcol"] is bool);
           }
         }
       }
@@ -750,7 +750,7 @@ public void TreatTinyAsBooleanWhenCallingPrepare()
           using (var reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
           {
             reader.Read();
-            Assert.False(reader["test_val"] is bool);
+            Assert.That(reader["test_val"] is bool, Is.False);
           }
         }
 
@@ -769,7 +769,7 @@ public void TreatTinyAsBooleanWhenCallingPrepare()
           using (var reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
           {
             reader.Read();
-            Assert.True(reader["test_val"] is bool);
+            Assert.That(reader["test_val"] is bool);
           }
         }
 
@@ -790,7 +790,7 @@ public void ZeroParameterAsNull()
       var query = "SELECT * FROM audit t1 WHERE t1.Permanent = ?IsFalse";
       MySqlParameter[] parameters = { new MySqlParameter() { ParameterName = "IsFalse", Value = 0 } };
       var ds = MySqlHelper.ExecuteDataset(Connection.ConnectionString, query, parameters);
-      Assert.AreEqual(ds.Tables[0].Rows.Count, 1);
+      Assert.That(1, Is.EqualTo(ds.Tables[0].Rows.Count));
     }
 
     /// <summary>
@@ -813,7 +813,7 @@ public void DefaultNullValue()
       {
         while (reader.Read())
         {
-          Assert.IsTrue(reader.IsDBNull(0));
+          Assert.That(reader.IsDBNull(0));
         }
       }
     }
@@ -851,7 +851,7 @@ public void CastingEnum(Enum name, string typeName)
         MySqlCommand command = new MySqlCommand(sql, conn);
         command.Parameters.AddWithValue("@ID", name);
         MySqlDataReader rdr = command.ExecuteReader();
-        Assert.IsNotNull(rdr);
+        Assert.That(rdr, Is.Not.Null);
       }
     }
 
@@ -869,16 +869,16 @@ public void InvalidParameterIndex()
       cmd.Parameters.Insert(1, new MySqlParameter("test1", "test1"));
       cmd.Parameters.Insert(0, new MySqlParameter("testNew0", "test2"));
 
-      Assert.True(cmd.Parameters.IndexOf("testNew0") == 0);
-      Assert.True(cmd.Parameters.IndexOf("test0") == 1);
-      Assert.True(cmd.Parameters.IndexOf("test1") == 2);
+      Assert.That(cmd.Parameters.IndexOf("testNew0") == 0);
+      Assert.That(cmd.Parameters.IndexOf("test0") == 1);
+      Assert.That(cmd.Parameters.IndexOf("test1") == 2);
 
       cmd.Parameters.AddWithValue("", "test3");
-      Assert.True(cmd.Parameters.Count == 4);
-      Assert.True(cmd.Parameters.IndexOf("Parameter4") == 3);
+      Assert.That(cmd.Parameters.Count == 4);
+      Assert.That(cmd.Parameters.IndexOf("Parameter4") == 3);
 
       cmd.Parameters.Insert(1, new MySqlParameter("lastTest", "test4"));
-      Assert.True(cmd.Parameters.IndexOf("lastTest") == 1);
+      Assert.That(cmd.Parameters.IndexOf("lastTest") == 1);
     }
 
     /// <summary>
@@ -905,8 +905,8 @@ public void InsertValueAfterNull()
 
       dt.Clear();
       da.Fill(dt);
-      Assert.AreEqual(2, dt.Rows.Count);
-      Assert.AreEqual(2, dt.Rows[1]["foo"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(2));
+      Assert.That(dt.Rows[1]["foo"], Is.EqualTo(2));
     }
 
     /// <summary>
@@ -926,15 +926,15 @@ public void CloneParameterAssignSourceColumnNullMapping()
       dataAdapter.Fill(dataTable);
 
       using (var cmd = new MySqlCommand(query, Connection))
-        Assert.AreEqual(1, cmd.ExecuteScalar());
-      Assert.AreEqual(1, dataTable.Rows.Count);
+        Assert.That(cmd.ExecuteScalar(), Is.EqualTo(1));
+      Assert.That(dataTable.Rows.Count, Is.EqualTo(1));
 
       dataTable.Rows[0].Delete();
       dataAdapter.Update(dataTable);
 
       using (var cmd = new MySqlCommand(query, Connection))
-        Assert.IsNull(cmd.ExecuteScalar());
-      Assert.AreEqual(0, dataTable.Rows.Count);
+        Assert.That(cmd.ExecuteScalar(), Is.Null);
+      Assert.That(dataTable.Rows.Count, Is.EqualTo(0));
     }
 
     /// <summary>
@@ -948,10 +948,10 @@ public void InitializeParameter()
       var newParam = cmd.CreateParameter();
       var newIntParam = new MySqlParameter("newIntParam", 3);
 
-      Assert.AreEqual(MySqlDbType.VarChar, newParam.MySqlDbType);
-      Assert.AreEqual(DbType.String, newParam.DbType);
-      Assert.AreEqual(MySqlDbType.Int32, newIntParam.MySqlDbType);
-      Assert.AreEqual(DbType.Int32, newIntParam.DbType);
+      Assert.That(newParam.MySqlDbType, Is.EqualTo(MySqlDbType.VarChar));
+      Assert.That(newParam.DbType, Is.EqualTo(DbType.String));
+      Assert.That(newIntParam.MySqlDbType, Is.EqualTo(MySqlDbType.Int32));
+      Assert.That(newIntParam.DbType, Is.EqualTo(DbType.Int32));
     }
 
     /// <summary>
@@ -988,8 +988,8 @@ public void AddObjectPerformance()
       sw2.Stop();
       Console.Write(sw2.Elapsed);
 
-      Assert.True(sw1.Elapsed.TotalSeconds < 1);
-      Assert.True(sw2.Elapsed.TotalSeconds < 1);
+      Assert.That(sw1.Elapsed.TotalSeconds < 1);
+      Assert.That(sw2.Elapsed.TotalSeconds < 1);
     }
   }
 }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
index 5ad5212e1..5e502aed6 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
@@ -59,7 +59,7 @@ public void BasicConnection()
       {
         c = new MySqlConnection(Settings.ConnectionString);
         c.Open();
-        Assert.AreEqual(serverThread, c.ServerThread);
+        Assert.That(c.ServerThread, Is.EqualTo(serverThread));
         c.Close();
       }
 
@@ -81,7 +81,7 @@ public void BasicConnection()
         for (int j = 0; j < connArray.Length; j++)
         {
           if (i != j)
-            Assert.True(connArray[i].ServerThread != connArray[j].ServerThread);
+            Assert.That(connArray[i].ServerThread != connArray[j].ServerThread);
         }
       }
 
@@ -110,7 +110,7 @@ public void OpenKilled()
       int secondThreadId = c.ServerThread;
       KillConnection(c);
       c.Close();
-      Assert.False(threadId == secondThreadId);
+      Assert.That(threadId == secondThreadId, Is.False);
     }
 
     [Test]
@@ -126,7 +126,7 @@ public void ReclaimBrokenConnection()
       // now attempting to open a connection should fail
       MySqlConnection c2 = new MySqlConnection(connStr);
       Exception ex = Assert.Throws<MySqlException>(() => c2.Open());
-      StringAssert.Contains("error connecting: Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.", ex.Message);
+      Assert.That(ex.Message, Does.Contain("error connecting: Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool."));
 
       // we now kill the first connection to simulate a server stoppage
       KillConnection(c);
@@ -134,7 +134,7 @@ public void ReclaimBrokenConnection()
       // now we do something on the first connection
 
       ex = Assert.Throws<InvalidOperationException>(() => c.ChangeDatabase("mysql"));
-      StringAssert.Contains("The connection is not open.", ex.Message);
+      Assert.That(ex.Message, Does.Contain("The connection is not open."));
 
       // Opening a connection now should work
       MySqlConnection connection = new MySqlConnection(connStr);
@@ -155,12 +155,12 @@ public void TestUserReset()
 
         cmd.CommandText = "SELECT @testvar";
         object var = cmd.ExecuteScalar();
-        Assert.AreEqual("5", var);
+        Assert.That(var, Is.EqualTo("5"));
         c.Close();
 
         c.Open();
         object var2 = cmd.ExecuteScalar();
-        Assert.AreEqual(DBNull.Value, var2);
+        Assert.That(var2, Is.EqualTo(DBNull.Value));
         KillConnection(c);
       }
     }
@@ -182,7 +182,7 @@ public void TestAbort()
       using (MySqlConnection c1 = new MySqlConnection(connStr))
       {
         c1.Open();
-        Assert.True(c1.ServerThread != threadId);
+        Assert.That(c1.ServerThread != threadId);
         KillConnection(c1);
       }
     }
@@ -211,7 +211,7 @@ public void UTF8AfterClosing()
 
         cmd = new MySqlCommand("SELECT value FROM test WHERE id = 1", con);
         string firstS = cmd.ExecuteScalar().ToString();
-        Assert.AreEqual(originalValue, firstS);
+        Assert.That(firstS, Is.EqualTo(originalValue));
 
         con.Close();
         con.Open();
@@ -222,7 +222,7 @@ public void UTF8AfterClosing()
 
         KillConnection(con);
         con.Close();
-        Assert.AreEqual(firstS, secondS);
+        Assert.That(secondS, Is.EqualTo(firstS));
       }
     }
 
@@ -285,7 +285,7 @@ public void NewTest()
             if (recdr.Read())
             {
               int x = recdr.GetOrdinal("name");
-              Assert.AreEqual(1, x);
+              Assert.That(x, Is.EqualTo(1));
             }
           }
         }
@@ -465,7 +465,7 @@ public void TestBadConnections()
         using (MySqlConnection connection = new MySqlConnection(builder.ConnectionString))
         {
           Exception ex = Assert.Throws<MySqlException>(() => connection.Open());
-          if (Platform.IsWindows()) Assert.True(ex.InnerException.GetType() == typeof(ArgumentException));
+          if (Platform.IsWindows()) Assert.That(ex.InnerException.GetType() == typeof(ArgumentException));
         }
         Thread.Sleep(50);
       }
@@ -558,7 +558,7 @@ private void CacheServerPropertiesInternal(bool cache)
         KillConnection(c);
       }
       int count = listener.CountLinesContaining("SHOW VARIABLES");
-      Assert.AreEqual(cache ? 1 : 2, count);
+      Assert.That(count, Is.EqualTo(cache ? 1 : 2));
     }
 
     [Test]
@@ -588,7 +588,7 @@ public void CacheServerPropertiesCausePacketTooLarge()
         c1.Open();
         MySqlCommand cmd = new MySqlCommand("SELECT Count(*) from test", c1);
         var count = cmd.ExecuteScalar();
-        Assert.AreEqual(3, Convert.ToInt32(count));
+        Assert.That(Convert.ToInt32(count), Is.EqualTo(3));
       }
 
       ExecuteSQL("DROP TABLE test ");
@@ -626,13 +626,13 @@ public void MultipleConnectionWithPooling()
 
       // Get a connection out of the pool.
       myConnection1.Open();
-      Assert.AreEqual(ConnectionState.Open, myConnection1.State);
+      Assert.That(myConnection1.State, Is.EqualTo(ConnectionState.Open));
       // Get a second connection out of the pool.
       myConnection2.Open();
-      Assert.AreEqual(ConnectionState.Open, myConnection2.State);
+      Assert.That(myConnection2.State, Is.EqualTo(ConnectionState.Open));
       // Open a third connection.
       myConnection3.Open();
-      Assert.AreEqual(ConnectionState.Open, myConnection3.State);
+      Assert.That(myConnection3.State, Is.EqualTo(ConnectionState.Open));
       // Return the all connections to the pool.
       myConnection1.Close();
       myConnection2.Close();
@@ -644,7 +644,7 @@ public void MultipleConnectionWithPooling()
       myConnection3.Open();
       myConnection4.Open();
       Exception ex = Assert.Throws<MySqlException>(() => myConnection5.Open());
-      StringAssert.Contains("Timeout", ex.Message);
+      Assert.That(ex.Message, Does.Contain("Timeout"));
 
       myConnection1.Close();
       myConnection2.Close();
@@ -677,7 +677,7 @@ public void CloseWaitScenario1()
         var tcpConnections = ipProperties.GetActiveTcpConnections();
         foreach (var info in tcpConnections)
           if (info.LocalEndPoint.Address.ToString() == "127.0.0.1" && info.LocalEndPoint.Port.ToString() == Port.ToString())
-            Assert.True(info.State.ToString() != "CLOSE_WAIT");
+            Assert.That(info.State.ToString() != "CLOSE_WAIT");
       }
       foreach (var item in connectionList)
       {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs b/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs
index 9c0e94a3f..226e5abcb 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs
@@ -55,11 +55,11 @@ public void Simple()
       cmd.Prepare();
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual(1, reader.GetInt32(0));
-        Assert.AreEqual((decimal)345.12, reader.GetDecimal(1));
-        Assert.AreEqual("abcd", reader.GetString(2));
-        Assert.AreEqual(2019, reader.GetInt16(3));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetInt32(0), Is.EqualTo(1));
+        Assert.That(reader.GetDecimal(1), Is.EqualTo((decimal)345.12));
+        Assert.That(reader.GetString(2), Is.EqualTo("abcd"));
+        Assert.That(reader.GetInt16(3), Is.EqualTo(2019));
       }
     }
 
@@ -89,8 +89,8 @@ public void SimplePrepareBeforeParms()
       {
         // Fetch the first record
         reader.Read();
-        Assert.AreEqual(1, reader.GetInt32(0));
-        Assert.AreEqual(2, reader.GetInt32(1));
+        Assert.That(reader.GetInt32(0), Is.EqualTo(1));
+        Assert.That(reader.GetInt32(1), Is.EqualTo(2));
       }
     }
 
@@ -120,7 +120,7 @@ public void DateAndTimes()
       cmd.Parameters.AddWithValue("?tm", timeSp);
       cmd.Prepare();
       int count = cmd.ExecuteNonQuery();
-      Assert.True(count == 1, "Records affected by insert");
+      Assert.That(count == 1, "Records affected by insert");
 
       cmd.CommandText = "SELECT * FROM Test";
       cmd.Prepare();
@@ -128,21 +128,21 @@ public void DateAndTimes()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.True(reader.GetInt32(0) == 1, "Id column");
-        Assert.True(dt.Date == reader.GetDateTime(1).Date, "Date column");
+        Assert.That(reader.GetInt32(0) == 1, "Id column");
+        Assert.That(dt.Date == reader.GetDateTime(1).Date, "Date column");
 
         DateTime dt2 = reader.GetDateTime(2);
-        Assert.AreEqual(dt.Date, dt2.Date);
-        Assert.AreEqual(dt.Hour, dt2.Hour);
-        Assert.AreEqual(dt.Minute, dt2.Minute);
-        Assert.AreEqual(dt.Second, dt2.Second);
+        Assert.That(dt2.Date, Is.EqualTo(dt.Date));
+        Assert.That(dt2.Hour, Is.EqualTo(dt.Hour));
+        Assert.That(dt2.Minute, Is.EqualTo(dt.Minute));
+        Assert.That(dt2.Second, Is.EqualTo(dt.Second));
 
         TimeSpan ts2 = reader.GetTimeSpan(3);
-        Assert.AreEqual(timeSp.Days, ts2.Days);
-        Assert.AreEqual(timeSp.Hours, ts2.Hours);
-        Assert.AreEqual(timeSp.Minutes, ts2.Minutes);
-        Assert.AreEqual(timeSp.Seconds, ts2.Seconds);
-        Assert.True(dt.Date == reader.GetDateTime(4).Date, "Timestamp column");
+        Assert.That(ts2.Days, Is.EqualTo(timeSp.Days));
+        Assert.That(ts2.Hours, Is.EqualTo(timeSp.Hours));
+        Assert.That(ts2.Minutes, Is.EqualTo(timeSp.Minutes));
+        Assert.That(ts2.Seconds, Is.EqualTo(timeSp.Seconds));
+        Assert.That(dt.Date == reader.GetDateTime(4).Date, "Timestamp column");
       }
     }
 
@@ -155,12 +155,12 @@ public void ResetCommandText()
       MySqlCommand cmd = new MySqlCommand("SELECT id FROM Test", Connection);
       cmd.Prepare();
       object o = cmd.ExecuteScalar();
-      Assert.AreEqual(1, o);
+      Assert.That(o, Is.EqualTo(1));
 
       cmd.CommandText = "SELECT name FROM Test";
       cmd.Prepare();
       o = cmd.ExecuteScalar();
-      Assert.AreEqual("Test", o);
+      Assert.That(o, Is.EqualTo("Test"));
 
     }
 
@@ -199,7 +199,7 @@ public void DifferentParameterOrder()
       cmd.Parameters.Add(name);
       cmd.Parameters.Add(id3);
       cmd.Prepare();
-      Assert.AreEqual(1, cmd.ExecuteNonQuery());
+      Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(1));
 
       cmd.Parameters.Clear();
 
@@ -211,13 +211,13 @@ public void DifferentParameterOrder()
       cmd.Parameters.Add(name);
 
       cmd.Prepare();
-      Assert.AreEqual(1, cmd.ExecuteNonQuery());
+      Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(1));
 
       cmd.CommandText = "SELECT id3 FROM Test WHERE id=1";
-      Assert.AreEqual(3, cmd.ExecuteScalar());
+      Assert.That(cmd.ExecuteScalar(), Is.EqualTo(3));
 
       cmd.CommandText = "SELECT name FROM Test WHERE id=2";
-      Assert.AreEqual(DBNull.Value, cmd.ExecuteScalar());
+      Assert.That(cmd.ExecuteScalar(), Is.EqualTo(DBNull.Value));
     }
 
     [Test]
@@ -235,20 +235,20 @@ public void Blobs()
       cmd.Parameters.AddWithValue("?text1", inStr);
       cmd.Prepare();
       int count = cmd.ExecuteNonQuery();
-      Assert.AreEqual(1, count);
+      Assert.That(count, Is.EqualTo(1));
 
       cmd.CommandText = "SELECT * FROM Test";
       cmd.Prepare();
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual(1, reader.GetInt32(0));
-        Assert.AreEqual(bytes.Length, reader.GetBytes(1, 0, null, 0, 0));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetInt32(0), Is.EqualTo(1));
+        Assert.That(reader.GetBytes(1, 0, null, 0, 0), Is.EqualTo(bytes.Length));
         byte[] outBytes = new byte[bytes.Length];
         reader.GetBytes(1, 0, outBytes, 0, bytes.Length);
         for (int x = 0; x < bytes.Length; x++)
-          Assert.AreEqual(bytes[x], outBytes[x]);
-        Assert.AreEqual(inStr, reader.GetString(2));
+          Assert.That(outBytes[x], Is.EqualTo(bytes[x]));
+        Assert.That(reader.GetString(2), Is.EqualTo(inStr));
       }
     }
 
@@ -268,13 +268,13 @@ public void SimpleTest2()
         // Fetch the first record
         reader.Read();
 
-        Assert.AreEqual(1, reader.GetInt32(0));
-        Assert.AreEqual(2, reader.GetInt32(1));
-        Assert.AreEqual(3, reader.GetInt32(2));
-        Assert.AreEqual(4, reader.GetInt32(3));
-        Assert.AreEqual(5, reader.GetInt32(4));
-        Assert.AreEqual(6, reader.GetInt32(5));
-        Assert.AreEqual(7, reader.GetInt32(6));
+        Assert.That(reader.GetInt32(0), Is.EqualTo(1));
+        Assert.That(reader.GetInt32(1), Is.EqualTo(2));
+        Assert.That(reader.GetInt32(2), Is.EqualTo(3));
+        Assert.That(reader.GetInt32(3), Is.EqualTo(4));
+        Assert.That(reader.GetInt32(4), Is.EqualTo(5));
+        Assert.That(reader.GetInt32(5), Is.EqualTo(6));
+        Assert.That(reader.GetInt32(6), Is.EqualTo(7));
       }
     }
 
@@ -314,23 +314,23 @@ public void Bug6271()
       cmd.Parameters.AddWithValue("?dt", dt);
       cmd.Prepare();
       int count = cmd.ExecuteNonQuery();
-      Assert.AreEqual(1, count);
+      Assert.That(count, Is.EqualTo(1));
 
       cmd.CommandText = "SELECT * FROM Test2";
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual("Ceci est un nom", reader.GetString(1));
-        Assert.AreEqual(dt.ToString("G"), reader.GetDateTime(4).ToString("G"));
-        Assert.AreEqual("Ceci est une description facile à plantouiller", reader.GetString(2));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetString(1), Is.EqualTo("Ceci est un nom"));
+        Assert.That(reader.GetDateTime(4).ToString("G"), Is.EqualTo(dt.ToString("G")));
+        Assert.That(reader.GetString(2), Is.EqualTo("Ceci est une description facile à plantouiller"));
 
         long len = reader.GetBytes(3, 0, null, 0, 0);
-        Assert.AreEqual(xpDOSG_Avatar.Length, len);
+        Assert.That(len, Is.EqualTo(xpDOSG_Avatar.Length));
         byte[] outBytes = new byte[len];
         reader.GetBytes(3, 0, outBytes, 0, (int)len);
 
         for (int x = 0; x < xpDOSG_Avatar.Length; x++)
-          Assert.AreEqual(xpDOSG_Avatar[x], outBytes[x]);
+          Assert.That(outBytes[x], Is.EqualTo(xpDOSG_Avatar[x]));
       }
     }
 
@@ -387,8 +387,7 @@ public void InsertAccentedCharacters()
         cmd.ExecuteNonQuery();
 
         MySqlCommand cmd2 = new MySqlCommand("SELECT input FROM Test", conn2);
-        Assert.AreEqual("irache martínez@yahoo.es aol.com",
-          cmd2.ExecuteScalar());
+        Assert.That(cmd2.ExecuteScalar(), Is.EqualTo("irache martínez@yahoo.es aol.com"));
       }
     }
 
@@ -413,17 +412,17 @@ public void UsingParametersTwice()
       cmd.Parameters["?st"].Value = 1;
       cmd.Parameters["?sc"].Value = 42;
       int result = cmd.ExecuteNonQuery();
-      Assert.AreEqual(1, result);
+      Assert.That(result, Is.EqualTo(1));
 
       MySqlCommand cmd2 = new MySqlCommand("SELECT * FROM Test", Connection);
       using (var reader = cmd2.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual("test", reader.GetString("input"));
-        Assert.AreEqual(1, reader.GetValue(reader.GetOrdinal("state")));
-        Assert.AreEqual(42, reader.GetValue(reader.GetOrdinal("score")));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetString("input"), Is.EqualTo("test"));
+        Assert.That(reader.GetValue(reader.GetOrdinal("state")), Is.EqualTo(1));
+        Assert.That(reader.GetValue(reader.GetOrdinal("score")), Is.EqualTo(42));
 
-        Assert.False(reader.Read());
+        Assert.That(reader.Read(), Is.False);
       }
     }
 
@@ -470,7 +469,7 @@ public void MoreParametersOutOfOrder()
 
       cmd.Prepare();
       int cnt = cmd.ExecuteNonQuery();
-      Assert.AreEqual(1, cnt);
+      Assert.That(cnt, Is.EqualTo(1));
     }
 
     /// <summary>
@@ -494,11 +493,11 @@ public void ParameterLengths()
       MySqlCommand cmd2 = new MySqlCommand("SELECT * FROM Test", Connection);
       using (var reader = cmd2.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual(1, reader.GetValue(reader.GetOrdinal("id")));
-        Assert.AreEqual("short string", reader.GetString("name"));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetValue(reader.GetOrdinal("id")), Is.EqualTo(1));
+        Assert.That(reader.GetString("name"), Is.EqualTo("short string"));
 
-        Assert.False(reader.Read());
+        Assert.That(reader.Read(), Is.False);
       }
     }
 
@@ -525,22 +524,22 @@ public void UnsignedTinyInt()
       command.Parameters.AddWithValue("?id", (byte)127);
       command.Prepare();
       int count = Convert.ToInt32(command.ExecuteScalar());
-      Assert.AreEqual(1, count);
+      Assert.That(count, Is.EqualTo(1));
 
       command.Parameters.Clear();
       command.Parameters.AddWithValue("?id", (byte)128);
       count = Convert.ToInt32(command.ExecuteScalar());
-      Assert.AreEqual(1, count);
+      Assert.That(count, Is.EqualTo(1));
 
       command.Parameters.Clear();
       command.Parameters.AddWithValue("?id", (byte)255);
       count = Convert.ToInt32(command.ExecuteScalar());
-      Assert.AreEqual(1, count);
+      Assert.That(count, Is.EqualTo(1));
 
       command.Parameters.Clear();
       command.Parameters.AddWithValue("?id", "255");
       count = Convert.ToInt32(command.ExecuteScalar());
-      Assert.AreEqual(1, count);
+      Assert.That(count, Is.EqualTo(1));
     }
 
     /// <summary>
@@ -563,16 +562,16 @@ public void UnsignedValues()
       cmd.Parameters[1].Value = UInt32.MaxValue;
       cmd.Parameters[2].Value = 16777215;
       cmd.Parameters[3].Value = UInt16.MaxValue;
-      Assert.AreEqual(1, cmd.ExecuteNonQuery());
+      Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(1));
       cmd.CommandText = "SELECT * FROM Test";
       cmd.CommandType = CommandType.Text;
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual(UInt64.MaxValue, reader.GetUInt64(0));
-        Assert.AreEqual(UInt32.MaxValue, reader.GetUInt32(1));
-        Assert.AreEqual(16777215, Convert.ToInt32(reader.GetUInt32(2)));
-        Assert.AreEqual(UInt16.MaxValue, reader.GetUInt16(3));
+        Assert.That(reader.GetUInt64(0), Is.EqualTo(UInt64.MaxValue));
+        Assert.That(reader.GetUInt32(1), Is.EqualTo(UInt32.MaxValue));
+        Assert.That(Convert.ToInt32(reader.GetUInt32(2)), Is.EqualTo(16777215));
+        Assert.That(reader.GetUInt16(3), Is.EqualTo(UInt16.MaxValue));
       }
     }
 
@@ -608,7 +607,7 @@ PRIMARY KEY(`one`)
         cmd.Parameters.AddWithValue("@One", "test").MySqlDbType = MySqlDbType.VarChar;
         cmd.Prepare();
         var result = cmd.ExecuteNonQuery();
-        Assert.AreEqual(1, result);
+        Assert.That(result, Is.EqualTo(1));
       }
     }
 
@@ -621,7 +620,7 @@ public void PrepareEmptyString()
       MySqlCommand cmd = new MySqlCommand("", Connection);
       cmd.Prepare();
       Exception ex = Assert.Throws<InvalidOperationException>(() => cmd.ExecuteNonQuery());
-      Assert.AreEqual("The CommandText property has not been properly initialized.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The CommandText property has not been properly initialized."));
     }
 
     /// <summary>
@@ -640,7 +639,7 @@ public void CompoundStatements()
       cmd.Parameters.Add("?t1", MySqlDbType.Int32);
       cmd.Parameters.Add("?t2", MySqlDbType.Int32);
       Exception ex = Assert.Throws<MySqlException>(() => cmd.Prepare());
-      StringAssert.Contains("You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version", ex.Message);
+      Assert.That(ex.Message, Does.Contain("You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version"));
     }
 
     [Test]
@@ -693,7 +692,7 @@ public void ClosingCommandsProperly()
           }
         }
         c.Ping();
-        Assert.AreEqual(initialCount, GetPreparedStatementCount());
+        Assert.That(GetPreparedStatementCount(), Is.EqualTo(initialCount));
       }
     }
 
@@ -723,13 +722,13 @@ public void InsertingUnsignedTinyInt()
       MySqlCommand cmd2 = new MySqlCommand("SELECT * FROM Test", Connection);
       using (var reader = cmd2.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual(127, Convert.ToInt32(reader.GetValue(0)));
-        Assert.AreEqual(1, Convert.ToInt32(reader.GetValue(1)));
-        Assert.AreEqual(2, Convert.ToInt32(reader.GetValue(2)));
-        Assert.AreEqual(3, Convert.ToInt32(reader.GetValue(3)));
+        Assert.That(reader.Read());
+        Assert.That(Convert.ToInt32(reader.GetValue(0)), Is.EqualTo(127));
+        Assert.That(Convert.ToInt32(reader.GetValue(1)), Is.EqualTo(1));
+        Assert.That(Convert.ToInt32(reader.GetValue(2)), Is.EqualTo(2));
+        Assert.That(Convert.ToInt32(reader.GetValue(3)), Is.EqualTo(3));
 
-        Assert.False(reader.Read());
+        Assert.That(reader.Read(), Is.False);
       }
     }
 
@@ -784,7 +783,7 @@ internal void NegativeTime(bool prepared)
         {
           reader.Read();
           TimeSpan t = reader.GetTimeSpan(1);
-          Assert.AreEqual(ts, t);
+          Assert.That(t, Is.EqualTo(ts));
         }
       }
     }
@@ -802,9 +801,9 @@ private void ReadNegativeTime(bool prepared)
       {
         reader.Read();
         TimeSpan ts = reader.GetTimeSpan(1);
-        Assert.AreEqual(0, ts.Hours);
-        Assert.AreEqual(-10, ts.Minutes);
-        Assert.AreEqual(0, ts.Seconds);
+        Assert.That(ts.Hours, Is.EqualTo(0));
+        Assert.That(ts.Minutes, Is.EqualTo(-10));
+        Assert.That(ts.Seconds, Is.EqualTo(0));
       }
     }
 
@@ -825,12 +824,12 @@ public void ZeroTimePrepared()
       {
         reader.Read();
         var t = reader.GetValue(0);
-        Assert.AreEqual("00:00:00", t.ToString());
+        Assert.That(t.ToString(), Is.EqualTo("00:00:00"));
 
         TimeSpan timeSpan = reader.GetTimeSpan(0);
-        Assert.AreEqual(0, timeSpan.Hours);
-        Assert.AreEqual(0, timeSpan.Minutes);
-        Assert.AreEqual(0, timeSpan.Seconds);
+        Assert.That(timeSpan.Hours, Is.EqualTo(0));
+        Assert.That(timeSpan.Minutes, Is.EqualTo(0));
+        Assert.That(timeSpan.Seconds, Is.EqualTo(0));
       }
     }
 
@@ -847,17 +846,17 @@ public void SprocOutputParams()
       cmd.Prepare();
 
       cmd.Parameters[0].Value = 20;
-      Assert.AreEqual(0, cmd.ExecuteNonQuery());
-      Assert.AreEqual(20, cmd.Parameters[1].Value);
+      Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(0));
+      Assert.That(cmd.Parameters[1].Value, Is.EqualTo(20));
 
       ExecuteSQL("DROP PROCEDURE IF EXISTS spOutTest");
       ExecuteSQL("CREATE PROCEDURE spOutTest(id INT, OUT age INT) BEGIN SET age=age*2; END");
 
       cmd.Parameters[0].Value = 1;
       cmd.Parameters[1].Value = 20;
-      Assert.AreEqual(0, cmd.ExecuteNonQuery());
+      Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(0));
 
-      Assert.IsInstanceOf<DBNull>(cmd.Parameters[1].Value);
+      Assert.That(cmd.Parameters[1].Value, Is.InstanceOf<DBNull>());
     }
 
 
@@ -874,8 +873,8 @@ public void SprocInputOutputParams()
 
       cmd.Parameters[0].Value = 1;
       cmd.Parameters[1].Value = 20;
-      Assert.AreEqual(0, cmd.ExecuteNonQuery());
-      Assert.AreEqual(40, cmd.Parameters[1].Value);
+      Assert.That(cmd.ExecuteNonQuery(), Is.EqualTo(0));
+      Assert.That(cmd.Parameters[1].Value, Is.EqualTo(40));
     }
 
     /// <summary>
@@ -898,7 +897,7 @@ public void BigIntUnsigned()
       {
         rdr.Read();
         UInt64 v = rdr.GetUInt64(0);
-        Assert.AreEqual(3000000000, v);
+        Assert.That(v, Is.EqualTo(3000000000));
       }
     }
 
@@ -924,7 +923,7 @@ public void InconsistentBehaviorForSelectLimit()
         int rows = 0;
         while (result.Read())
           rows += 1;
-        Assert.AreEqual(3, rows);
+        Assert.That(rows, Is.EqualTo(3));
       }
     }
 
@@ -953,7 +952,7 @@ public void MySqlDbTypeEnumParameter()
       command.CommandText = "SELECT * FROM Test";
       using var reader = command.ExecuteReader();
       while (reader.Read())
-        Assert.True(dataEnum.Contains(reader.GetString(0)));
+        Assert.That(dataEnum.Contains(reader.GetString(0)));
     }
   }
 }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs b/MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs
index b6d5b6f42..2baad18ac 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs
@@ -58,19 +58,19 @@ public void ExecuteScriptWithProcedures()
       script.Connection = Connection;
       script.Delimiter = "$$";
       int count = script.Execute();
-      Assert.AreEqual(10, count);
+      Assert.That(count, Is.EqualTo(10));
 
       MySqlCommand cmd = new MySqlCommand(
         String.Format(@"SELECT COUNT(*) FROM information_schema.routines WHERE
         routine_schema = '{0}' AND routine_name LIKE 'spTest1-%'",
         Connection.Database), Connection);
-      Assert.AreEqual(10, Convert.ToInt32(cmd.ExecuteScalar()));
+      Assert.That(Convert.ToInt32(cmd.ExecuteScalar()), Is.EqualTo(10));
     }
 
     void ExecuteScriptWithProcedures_QueryExecuted(object sender, MySqlScriptEventArgs e)
     {
       string stmt = String.Format(statementTemplate1, statementCount++, null);
-      Assert.AreEqual(stmt, e.StatementText);
+      Assert.That(e.StatementText, Is.EqualTo(stmt));
     }
 
     private string statementTemplate2 = @"INSERT INTO Test (id, name) VALUES ({0}, 'a "" na;me'){1}";
@@ -89,16 +89,16 @@ public void ExecuteScriptWithInserts()
       script.Connection = Connection;
       script.StatementExecuted += new MySqlStatementExecutedEventHandler(ExecuteScriptWithInserts_StatementExecuted);
       int count = script.Execute();
-      Assert.AreEqual(10, count);
+      Assert.That(count, Is.EqualTo(10));
 
       MySqlCommand cmd = new MySqlCommand("SELECT COUNT(*) FROM Test", Connection);
-      Assert.AreEqual(10, Convert.ToInt32(cmd.ExecuteScalar()));
+      Assert.That(Convert.ToInt32(cmd.ExecuteScalar()), Is.EqualTo(10));
     }
 
     void ExecuteScriptWithInserts_StatementExecuted(object sender, MySqlScriptEventArgs e)
     {
       string stmt = String.Format(statementTemplate2, statementCount++, null);
-      Assert.AreEqual(stmt, e.StatementText);
+      Assert.That(e.StatementText, Is.EqualTo(stmt));
     }
 
     [Test]
@@ -116,11 +116,11 @@ public void ExecuteScriptContinueOnFailure()
       script.Connection = Connection;
       script.Error += new MySqlScriptErrorEventHandler(ExecuteScript_ContinueOnError);
       int count = script.Execute();
-      Assert.AreEqual((int)10, count);
-      Assert.AreEqual((int)1, statementCount);
+      Assert.That(count, Is.EqualTo((int)10));
+      Assert.That(statementCount, Is.EqualTo((int)1));
 
       MySqlCommand cmd = new MySqlCommand("SELECT COUNT(*) FROM Test", Connection);
-      Assert.AreEqual(10, Convert.ToInt32(cmd.ExecuteScalar()));
+      Assert.That(Convert.ToInt32(cmd.ExecuteScalar()), Is.EqualTo(10));
     }
 
     void ExecuteScript_ContinueOnError(object sender, MySqlScriptErrorEventArgs args)
@@ -144,11 +144,11 @@ public void ExecuteScriptNotContinueOnFailure()
       script.Connection = Connection;
       script.Error += new MySqlScriptErrorEventHandler(ExecuteScript_NotContinueOnError);
       int count = script.Execute();
-      Assert.AreEqual(5, count);
-      Assert.AreEqual(1, statementCount);
+      Assert.That(count, Is.EqualTo(5));
+      Assert.That(statementCount, Is.EqualTo(1));
 
       MySqlCommand cmd = new MySqlCommand("SELECT COUNT(*) FROM Test", Connection);
-      Assert.AreEqual(5, Convert.ToInt32(cmd.ExecuteScalar()));
+      Assert.That(Convert.ToInt32(cmd.ExecuteScalar()), Is.EqualTo(5));
     }
 
     void ExecuteScript_NotContinueOnError(object sender, MySqlScriptErrorEventArgs args)
@@ -170,7 +170,7 @@ public void ExecuteScriptWithUserVariables()
         MySqlScript script = new MySqlScript(scriptText);
         script.Connection = c;
         int count = script.Execute();
-        Assert.AreEqual(1, count);
+        Assert.That(count, Is.EqualTo(1));
       }
     }
 
@@ -256,17 +256,17 @@ public async Task ExecuteScriptWithProceduresAsync()
       script.StatementExecuted += new MySqlStatementExecutedEventHandler(delegate(object sender, MySqlScriptEventArgs e)
       {
         string stmt = String.Format(spTpl, statementCount++, null);
-        Assert.AreEqual(stmt, e.StatementText);
+        Assert.That(e.StatementText, Is.EqualTo(stmt));
       });
       script.Connection = Connection;
       script.Delimiter = "$$";
       int count = await script.ExecuteAsync();
-      Assert.AreEqual(10, count);
+      Assert.That(count, Is.EqualTo(10));
 
       MySqlCommand cmd = new MySqlCommand(
         String.Format(@"SELECT COUNT(*) FROM information_schema.routines WHERE routine_schema = '{0}' AND routine_name LIKE 'SEScriptWithProceduresAsyncSpTest%'",
         Connection.Database), Connection);
-      Assert.AreEqual(10, Convert.ToInt32(cmd.ExecuteScalar()));
+      Assert.That(Convert.ToInt32(cmd.ExecuteScalar()), Is.EqualTo(10));
     }
 
     [Test]
@@ -285,13 +285,13 @@ public async Task ExecuteScriptWithInsertsAsync()
       script.StatementExecuted += new MySqlStatementExecutedEventHandler(delegate(object sender, MySqlScriptEventArgs e)
       {
         string stmt = String.Format(queryTpl, statementCount++, null);
-        Assert.AreEqual(stmt, e.StatementText);
+        Assert.That(e.StatementText, Is.EqualTo(stmt));
       });
       int count = await script.ExecuteAsync();
-      Assert.AreEqual(10, count);
+      Assert.That(count, Is.EqualTo(10));
 
       MySqlCommand cmd = new MySqlCommand("SELECT COUNT(*) FROM SEScriptWithInsertsAsyncTest", Connection);
-      Assert.AreEqual(10, Convert.ToInt32(cmd.ExecuteScalar()));
+      Assert.That(Convert.ToInt32(cmd.ExecuteScalar()), Is.EqualTo(10));
     }
     #endregion
 
@@ -313,7 +313,7 @@ public void ScriptDelimiter()
         script.Query = sql;
         script.Delimiter = "??";
         var count = script.Execute();
-        Assert.AreEqual(3, count);
+        Assert.That(count, Is.EqualTo(3));
       }
     }
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs b/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs
index bea676d27..b2719f841 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs
@@ -49,11 +49,11 @@ public void TestReader()
 
       MySqlTransaction txn = Connection.BeginTransaction();
       MySqlConnection c = txn.Connection;
-      Assert.AreEqual(Connection, c);
+      Assert.That(c, Is.EqualTo(Connection));
       MySqlCommand cmd = new MySqlCommand("SELECT name, name2 FROM Test WHERE key2='P'",
         Connection, txn);
       MySqlTransaction t2 = cmd.Transaction;
-      Assert.AreEqual(txn, t2);
+      Assert.That(t2, Is.EqualTo(txn));
       MySqlDataReader reader = null;
       try
       {
@@ -63,7 +63,7 @@ public void TestReader()
       }
       catch (Exception ex)
       {
-        Assert.False(ex.Message != string.Empty, ex.Message);
+        Assert.That(ex.Message != string.Empty, Is.False, ex.Message);
         txn.Rollback();
       }
       finally
@@ -81,7 +81,7 @@ public void NestedTransactions()
       MySqlTransaction t1 = Connection.BeginTransaction();
 
       Exception ex = Assert.Throws<InvalidOperationException>(() => { Connection.BeginTransaction(); });
-      Assert.AreEqual("Nested transactions are not supported.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Nested transactions are not supported."));
 
       t1.Rollback();
     }
@@ -99,7 +99,7 @@ public void BeginTransactionOnPreviouslyOpenConnection()
       }
       catch (Exception ex)
       {
-        Assert.AreEqual("The connection is not open.", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("The connection is not open."));
       }
     }
 
@@ -128,12 +128,12 @@ public void CommitAfterConnectionDead()
         //try
         //{
         Exception ex = Assert.Throws<InvalidOperationException>(() => trans.Commit());
-        Assert.AreEqual("Connection must be valid and open to commit transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Connection must be valid and open to commit transaction"));
         //}
         //catch (Exception)
         //{
         //}
-        Assert.AreEqual(ConnectionState.Closed, c.State);
+        Assert.That(c.State, Is.EqualTo(ConnectionState.Closed));
         c.Close();    // this should work even though we are closed
       }
     }
@@ -155,7 +155,7 @@ public void DisposingCallsRollback()
       Type t = txn.GetType();
       FieldInfo fi = t.GetField("open", BindingFlags.Instance | BindingFlags.NonPublic);
       bool isOpen = (bool)fi.GetValue(txn);
-      Assert.False(isOpen);
+      Assert.That(isOpen, Is.False);
     }
 
     [Test]
@@ -197,7 +197,7 @@ public void TransactionScope()
         myTransaction.Rollback(); // to rollback actions
         cmdtoexec.CommandText = "select count(*) from transactiontable";
         var count = cmdtoexec.ExecuteScalar();
-        Assert.AreEqual(0,count);
+        Assert.That(count, Is.EqualTo(0));
       }
     }
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs b/MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs
index c3129f6bd..a6579225c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs
@@ -48,8 +48,8 @@ public void Simple()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual(1, reader.GetInt32(0));
-        Assert.AreEqual("A", reader.GetString(1));
+        Assert.That(reader.GetInt32(0), Is.EqualTo(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("A"));
       }
     }
   }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
index 5dce64220..713fb3a99 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
@@ -64,8 +64,8 @@ public void SslModePreferredByDefault()
       MySqlCommand command = new MySqlCommand("SHOW SESSION STATUS LIKE 'Ssl_version';", Connection);
       using (MySqlDataReader reader = command.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        StringAssert.StartsWith("TLSv1", reader.GetString(1));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetString(1), Does.StartWith("TLSv1"));
       }
     }
 
@@ -83,8 +83,8 @@ public void SslModeOverriden()
         MySqlCommand command = new MySqlCommand("SHOW SESSION STATUS LIKE 'Ssl_version';", connection);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          Assert.AreEqual(string.Empty, reader.GetString(1));
+          Assert.That(reader.Read());
+          Assert.That(reader.GetString(1), Is.EqualTo(string.Empty));
         }
       }
     }
@@ -98,42 +98,42 @@ public void RepeatedSslConnectionOptions()
       var builder = new MySqlConnectionStringBuilder(Settings.ConnectionString);
       builder.SslCa = _sslCa;
       var conn = new MySqlConnection($"{builder.ConnectionString};sslca={repeatedOption}");
-      Assert.AreEqual(repeatedOption, conn.Settings.SslCa);
+      Assert.That(conn.Settings.SslCa, Is.EqualTo(repeatedOption));
 
       builder = new MySqlConnectionStringBuilder(Settings.ConnectionString);
       builder.CertificateFile = _sslCa;
       conn = new MySqlConnection($"{builder.ConnectionString};certificatefile={repeatedOption}");
-      Assert.AreEqual(repeatedOption, conn.Settings.CertificateFile);
+      Assert.That(conn.Settings.CertificateFile, Is.EqualTo(repeatedOption));
 
       builder = new MySqlConnectionStringBuilder(Settings.ConnectionString);
       builder.SslCa = _sslCa;
       conn = new MySqlConnection($"{builder.ConnectionString};certificatefile={repeatedOption}");
-      Assert.AreEqual(repeatedOption, conn.Settings.CertificateFile);
+      Assert.That(conn.Settings.CertificateFile, Is.EqualTo(repeatedOption));
 
       builder = new MySqlConnectionStringBuilder(Settings.ConnectionString);
       builder.CertificateFile = _sslCa;
       conn = new MySqlConnection($"{builder.ConnectionString};sslca={repeatedOption}");
-      Assert.AreEqual(repeatedOption, conn.Settings.SslCa);
+      Assert.That(conn.Settings.SslCa, Is.EqualTo(repeatedOption));
 
       builder = new MySqlConnectionStringBuilder(Settings.ConnectionString);
       builder.SslCa = _sslCa;
       conn = new MySqlConnection($"{builder.ConnectionString};sslcert={_sslCert};sslkey={_sslKey};sslca={repeatedOption}");
-      Assert.AreEqual(repeatedOption, conn.Settings.SslCa);
+      Assert.That(conn.Settings.SslCa, Is.EqualTo(repeatedOption));
 
       builder = new MySqlConnectionStringBuilder(Settings.ConnectionString);
       builder.CertificatePassword = "pass";
       conn = new MySqlConnection($"{builder.ConnectionString};certificatepassword={repeatedOption}");
-      Assert.AreEqual(repeatedOption, conn.Settings.CertificatePassword);
+      Assert.That(conn.Settings.CertificatePassword, Is.EqualTo(repeatedOption));
 
       builder = new MySqlConnectionStringBuilder(Settings.ConnectionString);
       builder.SslCert = _sslCert;
       conn = new MySqlConnection($"{builder.ConnectionString};sslcert={repeatedOption}");
-      Assert.AreEqual(repeatedOption, conn.Settings.SslCert);
+      Assert.That(conn.Settings.SslCert, Is.EqualTo(repeatedOption));
 
       builder = new MySqlConnectionStringBuilder(Settings.ConnectionString);
       builder.SslKey = _sslKey;
       conn = new MySqlConnection($"{builder.ConnectionString};sslkey={repeatedOption}");
-      Assert.AreEqual(repeatedOption, conn.Settings.SslKey);
+      Assert.That(conn.Settings.SslKey, Is.EqualTo(repeatedOption));
     }
 
     [Test]
@@ -173,8 +173,8 @@ public void SslPreferredByDefault()
       MySqlCommand command = new MySqlCommand("SHOW SESSION STATUS LIKE 'Ssl_version';", Connection);
       using (MySqlDataReader reader = command.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        StringAssert.StartsWith("TLSv1", reader.GetString(1));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetString(1), Does.StartWith("TLSv1"));
       }
     }
 
@@ -192,8 +192,8 @@ public void SslOverrided()
         MySqlCommand command = new MySqlCommand("SHOW SESSION STATUS LIKE 'Ssl_version';", connection);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          Assert.AreEqual(string.Empty, reader.GetString(1));
+          Assert.That(reader.Read());
+          Assert.That(reader.GetString(1), Is.EqualTo(string.Empty));
         }
       }
     }
@@ -226,15 +226,15 @@ public void TlsVersionTest(string tlsVersion, int error)
       {
         case 1:
           ex = Assert.Throws<ArgumentException>(SetTlsVersion).Message;
-          StringAssert.AreEqualIgnoringCase(Resources.TlsVersionsEmpty, ex);
+          Assert.That(ex, Is.EqualTo(Resources.TlsVersionsEmpty).IgnoreCase);
           break;
         case 2:
           ex = Assert.Throws<ArgumentException>(SetTlsVersion).Message;
-          StringAssert.AreEqualIgnoringCase(Resources.TlsUnsupportedVersions, ex);
+          Assert.That(ex, Is.EqualTo(Resources.TlsUnsupportedVersions).IgnoreCase);
           break;
         case 3:
           ex = Assert.Throws<ArgumentException>(SetTlsVersion).Message;
-          StringAssert.AreEqualIgnoringCase(Resources.TlsNonValidProtocols, ex);
+          Assert.That(ex, Is.EqualTo(Resources.TlsNonValidProtocols).IgnoreCase);
           break;
         default:
           SetTlsVersion();
@@ -243,17 +243,17 @@ public void TlsVersionTest(string tlsVersion, int error)
           using (conn)
           {
             conn.Open();
-            Assert.AreEqual(ConnectionState.Open, conn.State);
+            Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
 
             MySqlCommand cmd = conn.CreateCommand();
             cmd.CommandText = "SHOW SESSION STATUS LIKE 'ssl_version'";
 
             using MySqlDataReader dr = cmd.ExecuteReader();
-            Assert.True(dr.Read());
+            Assert.That(dr.Read());
             if (error==4)
-              StringAssert.AreEqualIgnoringCase(tlsVersion, dr[1].ToString());
+              Assert.That(dr[1].ToString(), Is.EqualTo(tlsVersion).IgnoreCase);
             else
-              StringAssert.AreEqualIgnoringCase(tlsdefault, dr[1].ToString());
+              Assert.That(dr[1].ToString(), Is.EqualTo(tlsdefault).IgnoreCase);
           }
           break;
       }
@@ -275,14 +275,14 @@ public void TlsVersionNoSslTest(string tlsVersion)
       using (var conn = new MySqlConnection(builder.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.State);
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
 
         MySqlCommand cmd = conn.CreateCommand();
         cmd.CommandText = "SHOW SESSION STATUS LIKE 'ssl_version'";
 
         using MySqlDataReader dr = cmd.ExecuteReader();
-        Assert.True(dr.Read());
-        Assert.IsEmpty(dr[1].ToString());
+        Assert.That(dr.Read());
+        Assert.That(dr[1].ToString(), Is.Empty);
       }
     }
     #endregion
@@ -306,12 +306,12 @@ public void CanConnectUsingFileBasedCertificate()
       using (MySqlConnection c = new MySqlConnection(connstr))
       {
         c.Open();
-        Assert.AreEqual(ConnectionState.Open, c.State);
+        Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
         MySqlCommand command = new MySqlCommand("SHOW SESSION STATUS LIKE 'Ssl_version';", c);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          StringAssert.StartsWith("TLSv1", reader.GetString(1));
+          Assert.That(reader.Read());
+          Assert.That(reader.GetString(1), Does.StartWith("TLSv1"));
         }
       }
     }
@@ -325,19 +325,19 @@ public void ConnectUsingPFXCertificates()
       using (MySqlConnection c = new MySqlConnection(connstr))
       {
         c.Open();
-        Assert.AreEqual(ConnectionState.Open, c.State);
+        Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
         MySqlCommand command = new MySqlCommand("SHOW SESSION STATUS LIKE 'Ssl_version';", c);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          StringAssert.StartsWith("TLSv1", reader.GetString(1));
+          Assert.That(reader.Read());
+          Assert.That(reader.GetString(1), Does.StartWith("TLSv1"));
         }
 
         command = new MySqlCommand("show variables like 'tls_version'", c);
         using (MySqlDataReader reader = command.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          StringAssert.Contains("TLS", reader.GetString(1));
+          Assert.That(reader.Read());
+          Assert.That(reader.GetString(1), Does.Contain("TLS"));
         }
       }
 
@@ -386,7 +386,7 @@ public void InvalidCertificateThumbprint()
       using (var conn = new MySqlConnection(csb.ConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.connectionState);
+        Assert.That(conn.connectionState, Is.EqualTo(ConnectionState.Open));
       }
     }
 
@@ -401,20 +401,20 @@ public void SslCertificateConnectionOptionsExistAndDefaultToNull()
       var builder = new MySqlConnectionStringBuilder();
 
       // Options exist.
-      Assert.True(builder.values.ContainsKey("sslca"));
-      Assert.True(builder.values.ContainsKey("sslcert"));
-      Assert.True(builder.values.ContainsKey("sslkey"));
+      Assert.That(builder.values.ContainsKey("sslca"));
+      Assert.That(builder.values.ContainsKey("sslcert"));
+      Assert.That(builder.values.ContainsKey("sslkey"));
 
       // Options default to null.
-      Assert.Null(builder["sslca"]);
-      Assert.Null(builder["sslcert"]);
-      Assert.Null(builder["sslkey"]);
-      Assert.Null(builder["ssl-ca"]);
-      Assert.Null(builder["ssl-cert"]);
-      Assert.Null(builder["ssl-key"]);
-      Assert.Null(builder.SslCa);
-      Assert.Null(builder.SslCert);
-      Assert.Null(builder.SslKey);
+      Assert.That(builder["sslca"], Is.Null);
+      Assert.That(builder["sslcert"], Is.Null);
+      Assert.That(builder["sslkey"], Is.Null);
+      Assert.That(builder["ssl-ca"], Is.Null);
+      Assert.That(builder["ssl-cert"], Is.Null);
+      Assert.That(builder["ssl-key"], Is.Null);
+      Assert.That(builder.SslCa, Is.Null);
+      Assert.That(builder.SslCert, Is.Null);
+      Assert.That(builder.SslKey, Is.Null);
 
       // Null or whitespace options are ignored.
       var connectionString = $"host={Settings.Server};user={Settings.UserID};port={Settings.Port};password={Settings.Password};";
@@ -424,9 +424,9 @@ public void SslCertificateConnectionOptionsExistAndDefaultToNull()
       builder.SslKey = "  ";
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
-        Assert.Null(connection.Settings.SslCa);
-        Assert.Null(connection.Settings.SslCert);
-        Assert.AreEqual("  ", connection.Settings.SslKey);
+        Assert.That(connection.Settings.SslCa, Is.Null);
+        Assert.That(connection.Settings.SslCert, Is.Null);
+        Assert.That(connection.Settings.SslKey, Is.EqualTo("  "));
         connection.Open();
         connection.Close();
       }
@@ -435,9 +435,9 @@ public void SslCertificateConnectionOptionsExistAndDefaultToNull()
       connectionString = $"{connectionString}sslca=;sslcert=;sslkey=";
       using (var connection = new MySqlConnection(connectionString))
       {
-        Assert.Null(connection.Settings.SslCa);
-        Assert.Null(connection.Settings.SslCert);
-        Assert.Null(connection.Settings.SslKey);
+        Assert.That(connection.Settings.SslCa, Is.Null);
+        Assert.That(connection.Settings.SslCert, Is.Null);
+        Assert.That(connection.Settings.SslKey, Is.Null);
         connection.Open();
         connection.Close();
       }
@@ -452,16 +452,16 @@ public void MissingSslCaConnectionOption()
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(string.Format(Resources.FilePathNotSet, nameof(Settings.SslCa)), exception.InnerException.Message);
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(string.Format(Resources.FilePathNotSet, nameof(Settings.SslCa))));
       }
 
       builder.SslMode = MySqlSslMode.VerifyFull;
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(string.Format(Resources.FilePathNotSet, nameof(Settings.SslCa)), exception.InnerException.Message);
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(string.Format(Resources.FilePathNotSet, nameof(Settings.SslCa))));
       }
     }
 
@@ -476,8 +476,8 @@ public void MissingSslCertConnectionOption()
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(string.Format(Resources.FilePathNotSet, nameof(Settings.SslCert)), exception.InnerException.Message);
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(string.Format(Resources.FilePathNotSet, nameof(Settings.SslCert))));
       }
     }
 
@@ -493,8 +493,8 @@ public void MissingSslKeyConnectionOption()
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(string.Format(Resources.FilePathNotSet, nameof(Settings.SslKey)), exception.InnerException.Message);
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(string.Format(Resources.FilePathNotSet, nameof(Settings.SslKey))));
       }
     }
 
@@ -508,8 +508,8 @@ public void InvalidFileNameForSslCaConnectionOption()
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(Resources.FileNotFound, exception.InnerException.Message);
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(Resources.FileNotFound));
       }
     }
 
@@ -524,8 +524,8 @@ public void InvalidFileNameForSslCertConnectionOption()
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(Resources.FileNotFound, exception.InnerException.Message);
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(Resources.FileNotFound));
       }
     }
 
@@ -541,8 +541,8 @@ public void InvalidFileNameForSslKeyConnectionOption()
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(Resources.FileNotFound, exception.InnerException.Message);
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(Resources.FileNotFound));
       }
     }
 
@@ -582,7 +582,7 @@ public void ConnectUsingAllCertificates()
         try { connection.Open(); }
         catch (Exception ex)
         {
-          Assert.True(ex is MySqlException ||
+          Assert.That(ex is MySqlException ||
           ex is AuthenticationException ||
           ex is FormatException, ex.Message);
         }
@@ -633,8 +633,8 @@ public void AttemptConnectionWithDummyPemCertificates()
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(Resources.FileIsNotACertificate, exception.InnerException.Message, $"Cert. path: {_sslCa}");
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(Resources.FileIsNotACertificate), $"Cert. path: {_sslCa}");
       }
 
       builder.SslCa = _sslCa;
@@ -643,8 +643,8 @@ public void AttemptConnectionWithDummyPemCertificates()
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(Resources.FileIsNotACertificate, exception.InnerException.Message);
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(Resources.FileIsNotACertificate));
       }
 
       builder.SslCa = _sslCa;
@@ -654,8 +654,8 @@ public void AttemptConnectionWithDummyPemCertificates()
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(Resources.FileIsNotAKey, exception.InnerException.Message);
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(Resources.FileIsNotAKey));
       }
     }
 
@@ -669,8 +669,8 @@ public void AttemptConnectionWithSwitchedPemCertificates()
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(Resources.SslCertificateIsNotCA, exception.InnerException.Message);
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(Resources.SslCertificateIsNotCA));
       }
 
       builder.SslCa = _sslKey;
@@ -678,8 +678,8 @@ public void AttemptConnectionWithSwitchedPemCertificates()
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(Resources.FileIsNotACertificate, exception.InnerException.Message);
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(Resources.FileIsNotACertificate));
       }
 
       builder.SslCa = _sslCa;
@@ -688,8 +688,8 @@ public void AttemptConnectionWithSwitchedPemCertificates()
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(Resources.InvalidSslCertificate, exception.InnerException.Message);
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(Resources.InvalidSslCertificate));
       }
 
       builder.SslCert = _sslCert;
@@ -698,8 +698,8 @@ public void AttemptConnectionWithSwitchedPemCertificates()
       using (var connection = new MySqlConnection(builder.ConnectionString))
       {
         var exception = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.AreEqual(Resources.SslConnectionError, exception.Message);
-        Assert.AreEqual(Resources.FileIsNotAKey, exception.InnerException.Message);
+        Assert.That(exception.Message, Is.EqualTo(Resources.SslConnectionError));
+        Assert.That(exception.InnerException.Message, Is.EqualTo(Resources.FileIsNotAKey));
       }
     }
 
@@ -722,7 +722,7 @@ public void MaxConnectionsWithPersistAndGlobalVariables()
           connectionList.Add(c1);
         }
         Exception ex = Assert.Throws<MySqlException>(() => conn.Open());
-        StringAssert.Contains("Too many connections", ex.Message);
+        Assert.That(ex.Message, Does.Contain("Too many connections"));
       }
       foreach (var item in connectionList)
       {
@@ -742,7 +742,7 @@ public void MaxConnectionsWithPersistAndGlobalVariables()
           connectionList.Add(c1);
         }
         Exception ex = Assert.Throws<MySqlException>(() => conn.Open());
-        StringAssert.Contains("Too many connections", ex.Message);
+        Assert.That(ex.Message, Does.Contain("Too many connections"));
       }
       foreach (var item in connectionList)
       {
@@ -760,7 +760,7 @@ public void ShowVariablesRemoved()
       using (var dbConn = new MySqlConnection(Settings.ConnectionString))
       {
         dbConn.Open();//Manually verify in server log that show variables is not present
-        Assert.AreEqual(ConnectionState.Open, dbConn.State);
+        Assert.That(dbConn.State, Is.EqualTo(ConnectionState.Open));
       }
     }
 
@@ -779,22 +779,22 @@ public void ConnectUsingCertificateFileAndTlsVersion()
         MySqlCommand cmd = new MySqlCommand("show variables like '%tls_version%'", connection);
         using (MySqlDataReader reader = cmd.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          StringAssert.Contains("TLSv1", reader.GetString(1));
+          Assert.That(reader.Read());
+          Assert.That(reader.GetString(1), Does.Contain("TLSv1"));
         }
 
         cmd = new MySqlCommand("show status like 'Ssl_cipher'", connection);
         using (MySqlDataReader reader = cmd.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          Assert.True(reader.GetString(1).ToString().Length > 0);
+          Assert.That(reader.Read());
+          Assert.That(reader.GetString(1).ToString().Length > 0);
         }
 
         cmd = new MySqlCommand("show status like 'Ssl_version'", connection);
         using (MySqlDataReader reader = cmd.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          StringAssert.AreEqualIgnoringCase("TLSv1.2", reader.GetString(1));
+          Assert.That(reader.Read());
+          Assert.That(reader.GetString(1), Is.EqualTo("TLSv1.2").IgnoreCase);
         }
       }
     }
@@ -821,7 +821,7 @@ public void CorrectSslcaWrongSslkeySslcertRequiredMode()
         using (var c = new MySqlConnection(connClassic.ConnectionString))
         {
           c.Open();
-          Assert.AreEqual(ConnectionState.Open, c.State);
+          Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
         }
 
         connClassic = new MySqlConnectionStringBuilder();
@@ -835,7 +835,7 @@ public void CorrectSslcaWrongSslkeySslcertRequiredMode()
         using (var c = new MySqlConnection(connClassic.ConnectionString))
         {
           c.Open();
-          Assert.AreEqual(ConnectionState.Open, c.State);
+          Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
         }
 
         connClassic = new MySqlConnectionStringBuilder();
@@ -850,7 +850,7 @@ public void CorrectSslcaWrongSslkeySslcertRequiredMode()
         using (var c = new MySqlConnection(connClassic.ConnectionString))
         {
           c.Open();
-          Assert.AreEqual(ConnectionState.Open, c.State);
+          Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
         }
 
         var conn = new MySqlXConnectionStringBuilder();
@@ -865,7 +865,7 @@ public void CorrectSslcaWrongSslkeySslcertRequiredMode()
         using (var c = new MySqlConnection(connClassic.ConnectionString))
         {
           c.Open();
-          Assert.AreEqual(ConnectionState.Open, c.State);
+          Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
         }
 
         conn = new MySqlXConnectionStringBuilder();
@@ -879,7 +879,7 @@ public void CorrectSslcaWrongSslkeySslcertRequiredMode()
         using (var c = new MySqlConnection(connClassic.ConnectionString))
         {
           c.Open();
-          Assert.AreEqual(ConnectionState.Open, c.State);
+          Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
         }
       }
     }
@@ -899,7 +899,7 @@ public void CorrectSslcaNoSslkeyorCertRequiredMode()
       using (var c = new MySqlConnection(connClassic.ConnectionString))
       {
         c.Open();
-        Assert.AreEqual(ConnectionState.Open, c.State);
+        Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
       }
 
       connClassic = new MySqlConnectionStringBuilder();
@@ -911,7 +911,7 @@ public void CorrectSslcaNoSslkeyorCertRequiredMode()
       using (var c = new MySqlConnection(connClassic.ConnectionString))
       {
         c.Open();
-        Assert.AreEqual(ConnectionState.Open, c.State);
+        Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
       }
 
       connClassic = new MySqlConnectionStringBuilder();
@@ -924,7 +924,7 @@ public void CorrectSslcaNoSslkeyorCertRequiredMode()
       using (var c = new MySqlConnection(connClassic.ConnectionString))
       {
         c.Open();
-        Assert.AreEqual(ConnectionState.Open, c.State);
+        Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
       }
 
       connClassic = new MySqlConnectionStringBuilder();
@@ -937,7 +937,7 @@ public void CorrectSslcaNoSslkeyorCertRequiredMode()
       using (var c = new MySqlConnection(connClassic.ConnectionString))
       {
         c.Open();
-        Assert.AreEqual(ConnectionState.Open, c.State);
+        Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
       }
 
       var conn = new MySqlXConnectionStringBuilder();
@@ -950,7 +950,7 @@ public void CorrectSslcaNoSslkeyorCertRequiredMode()
       using (var c = new MySqlConnection(conn.ConnectionString))
       {
         c.Open();
-        Assert.AreEqual(ConnectionState.Open, c.State);
+        Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
       }
 
       conn = new MySqlXConnectionStringBuilder();
@@ -962,7 +962,7 @@ public void CorrectSslcaNoSslkeyorCertRequiredMode()
       using (var c = new MySqlConnection(conn.ConnectionString))
       {
         c.Open();
-        Assert.AreEqual(ConnectionState.Open, c.State);
+        Assert.That(c.State, Is.EqualTo(ConnectionState.Open));
       }
     }
 
@@ -987,7 +987,7 @@ public void SecurityTlsCheck()
             conn.Open();
             MySqlCommand cmd = new MySqlCommand("SELECT variable_value FROM performance_schema.session_status WHERE VARIABLE_NAME='Ssl_version'", conn);
             object result = cmd.ExecuteScalar();
-            Assert.AreEqual(tlsVersion, result);
+            Assert.That(result, Is.EqualTo(tlsVersion));
           }
         }
 
@@ -998,10 +998,10 @@ public void SecurityTlsCheck()
           {
             // TLSv1.0 and TLSv1.1 has been deprecated in Ubuntu 20.04 so an exception is thrown
             try { conn.Open(); }
-            catch (Exception ex) { Assert.True(ex is AuthenticationException); return; }
+            catch (Exception ex) { Assert.That(ex is AuthenticationException); return; }
             MySqlCommand cmd = new MySqlCommand("SELECT variable_value FROM performance_schema.session_status WHERE VARIABLE_NAME='Ssl_version'", conn);
             object result = cmd.ExecuteScalar();
-            Assert.True(result.ToString().StartsWith("TLSv1"));
+            Assert.That(result.ToString().StartsWith("TLSv1"));
           }
         }
       }
@@ -1023,7 +1023,7 @@ public void InvalidTlsversionValues()
 
       // Not supported protocols
       var ex = Assert.Throws<ArgumentException>(() => conn = new MySqlConnection(conStr + $";ssl-mode={MySqlSslMode.Required};tls-version=[TLSv1];tls-version=[TLSv1]"));
-      StringAssert.AreEqualIgnoringCase("TLS protocols TLSv1 and TLSv1.1 are no longer supported. Accepted values are TLSv1.2 and TLSv1.3", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("TLS protocols TLSv1 and TLSv1.1 are no longer supported. Accepted values are TLSv1.2 and TLSv1.3").IgnoreCase);
 
       // Repeated options are allowed
       Assert.DoesNotThrow(() => conn = new MySqlConnection(conStr + $";ssl-mode={MySqlSslMode.Required};tls-version=[TLSv1.1,TLSv1.2];tls-version=[TLSv1.2]"));
@@ -1043,7 +1043,7 @@ public void SslUserWithoutSslParams()
         cmd.ExecuteNonQuery();
         var rdr1 = cmd.ExecuteReader();
         while (rdr1.Read())
-          Assert.True(rdr1.GetValue(1).ToString().Trim() == "");
+          Assert.That(rdr1.GetValue(1).ToString().Trim() == "");
       }
 
       connstr = $"server={Host};user={Settings.UserID};port={Port};password=;sslmode={MySqlSslMode.Disabled}";
@@ -1070,7 +1070,7 @@ public void PositiveSslConnectionWithCertificates()
         {
           while (rdr.Read())
           {
-            Assert.True(rdr.GetValue(1).ToString().Trim().Contains("TLSv1"));
+            Assert.That(rdr.GetValue(1).ToString().Trim().Contains("TLSv1"));
           }
         }
 
@@ -1079,7 +1079,7 @@ public void PositiveSslConnectionWithCertificates()
         {
           while (rdr.Read())
           {
-            Assert.True(rdr.GetValue(1).ToString().Trim().Length > 0);
+            Assert.That(rdr.GetValue(1).ToString().Trim().Length > 0);
           }
         }
 
@@ -1088,7 +1088,7 @@ public void PositiveSslConnectionWithCertificates()
         {
           while (rdr.Read())
           {
-            Assert.True(rdr.GetValue(1).ToString().StartsWith("TLSv1"));
+            Assert.That(rdr.GetValue(1).ToString().StartsWith("TLSv1"));
           }
         }
       }
@@ -1103,7 +1103,7 @@ public void PositiveSslConnectionWithCertificates()
         {
           while (rdr.Read())
           {
-            Assert.True(rdr.GetValue(1).ToString().Trim().Contains("TLSv1"));
+            Assert.That(rdr.GetValue(1).ToString().Trim().Contains("TLSv1"));
           }
         }
 
@@ -1113,7 +1113,7 @@ public void PositiveSslConnectionWithCertificates()
         {
           while (rdr.Read())
           {
-            Assert.True(rdr.GetValue(1).ToString().Trim().Length > 0);
+            Assert.That(rdr.GetValue(1).ToString().Trim().Length > 0);
           }
         }
         cmd.Connection = c;
@@ -1122,7 +1122,7 @@ public void PositiveSslConnectionWithCertificates()
         {
           while (rdr.Read())
           {
-            Assert.True(rdr.GetValue(1).ToString().StartsWith("TLSv1"));
+            Assert.That(rdr.GetValue(1).ToString().StartsWith("TLSv1"));
           }
         }
       }
@@ -1149,8 +1149,8 @@ public void SslOptionsCombinedWhenDisabled(MySqlSslMode sslMode, string sslOptio
       reader.Read();
       string encryption = reader.GetString(1);
 
-      Assert.IsEmpty(encryption);
-      Assert.AreEqual(ConnectionState.Open, conn.State);
+      Assert.That(encryption, Is.Empty);
+      Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
     }
 
     [Test]
@@ -1165,8 +1165,8 @@ public void SslRequiredOverDisabled()
       reader.Read();
       string encryption = reader.GetString(1);
 
-      Assert.IsNotEmpty(encryption);
-      Assert.AreEqual(ConnectionState.Open, conn.State);
+      Assert.That(encryption, Is.Not.Empty);
+      Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
     }
 
     /// <summary>
@@ -1194,7 +1194,7 @@ public void SslChainedCertificates(MySqlSslMode sslMode)
       using var conn = new MySqlConnection(stringBuilder.ConnectionString);
       conn.Open();
 
-      Assert.IsTrue(conn.State == ConnectionState.Open);
+      Assert.That(conn.State == ConnectionState.Open);
     }
 
     #region Methods
diff --git a/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs b/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs
index 1a053144b..8a96eafd1 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs
@@ -65,7 +65,7 @@ public void ReturningResultset()
         p.Value = 21;
 
         decimal id = (decimal)cmd.ExecuteScalar();
-        Assert.AreEqual(21, id);
+        Assert.That(id, Is.EqualTo(21));
       }
     }
 
@@ -81,17 +81,17 @@ public void NonQuery()
       cmd.CommandType = CommandType.StoredProcedure;
       cmd.Parameters.AddWithValue("?value", 2);
       int rowsAffected = cmd.ExecuteNonQuery();
-      Assert.AreEqual(1, rowsAffected);
+      Assert.That(rowsAffected, Is.EqualTo(1));
 
       cmd.CommandText = "SELECT * FROM Test";
       cmd.CommandType = CommandType.Text;
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual(2, reader.GetInt32(0));
-        Assert.AreEqual("Test", reader.GetString(1));
-        Assert.False(reader.Read());
-        Assert.False(reader.NextResult());
+        Assert.That(reader.Read());
+        Assert.That(reader.GetInt32(0), Is.EqualTo(2));
+        Assert.That(reader.GetString(1), Is.EqualTo("Test"));
+        Assert.That(reader.Read(), Is.False);
+        Assert.That(reader.NextResult(), Is.False);
       }
     }
 
@@ -123,7 +123,7 @@ public void NoInOutMarker()
       cmd.CommandType = CommandType.StoredProcedure;
       cmd.Parameters.AddWithValue("?valin", "myvalue");
       object val = cmd.ExecuteScalar();
-      Assert.AreEqual("myvalue", val);
+      Assert.That(val, Is.EqualTo("myvalue"));
     }
 
     [Test]
@@ -147,8 +147,8 @@ public void ExecuteScalar2()
       MySqlCommand cmd = new MySqlCommand("spTest", Connection);
       cmd.CommandType = CommandType.StoredProcedure;
       object result = cmd.ExecuteScalar();
-      Assert.AreEqual(1, result);
-      Assert.True(result is Int32);
+      Assert.That(result, Is.EqualTo(1));
+      Assert.That(result is Int32);
     }
 
     [Test]
@@ -174,11 +174,11 @@ private void MultipleResultsetsImpl(bool prepare)
       if (prepare) cmd.Prepare();
       cmd.CommandType = CommandType.StoredProcedure;
       MySqlDataReader reader = cmd.ExecuteReader();
-      Assert.True(reader.Read());
-      Assert.True(reader.NextResult());
-      Assert.True(reader.Read());
-      Assert.False(reader.NextResult());
-      Assert.False(reader.Read());
+      Assert.That(reader.Read());
+      Assert.That(reader.NextResult());
+      Assert.That(reader.Read());
+      Assert.That(reader.NextResult(), Is.False);
+      Assert.That(reader.Read(), Is.False);
       reader.Close();
 
       DataSet ds = new DataSet();
@@ -188,12 +188,12 @@ private void MultipleResultsetsImpl(bool prepare)
       da.FillError += new FillErrorEventHandler(da_FillError);
       fillError = null;
       da.Fill(ds);
-      Assert.AreEqual(2, ds.Tables.Count);
-      Assert.AreEqual(1, Convert.ToInt32(ds.Tables[0].Rows.Count));
-      Assert.AreEqual(1, Convert.ToInt32(ds.Tables[1].Rows.Count));
-      Assert.AreEqual(1, Convert.ToInt32(ds.Tables[0].Rows[0][0]));
-      Assert.AreEqual(2, Convert.ToInt32(ds.Tables[1].Rows[0][0]));
-      Assert.Null(fillError);
+      Assert.That(ds.Tables.Count, Is.EqualTo(2));
+      Assert.That(Convert.ToInt32(ds.Tables[0].Rows.Count), Is.EqualTo(1));
+      Assert.That(Convert.ToInt32(ds.Tables[1].Rows.Count), Is.EqualTo(1));
+      Assert.That(Convert.ToInt32(ds.Tables[0].Rows[0][0]), Is.EqualTo(1));
+      Assert.That(Convert.ToInt32(ds.Tables[1].Rows[0][0]), Is.EqualTo(2));
+      Assert.That(fillError, Is.Null);
     }
 
     private static string fillError = null;
@@ -213,7 +213,7 @@ public void ExecuteWithCreate()
       MySqlCommand cmd = new MySqlCommand(sql, Connection);
       cmd.Parameters.Add(new MySqlParameter("?v", 33));
       object val = cmd.ExecuteScalar();
-      Assert.AreEqual(33, val);
+      Assert.That(val, Is.EqualTo(33));
     }
 
     /// <summary>
@@ -232,14 +232,14 @@ public void OtherProcSigs()
       cmd.Parameters.AddWithValue("?val2", 4);
       decimal val = (decimal)cmd.ExecuteScalar();
       Decimal d = new Decimal(20.4);
-      Assert.AreEqual(d, val);
+      Assert.That(val, Is.EqualTo(d));
 
       // create our second procedure
       ExecuteSQL("DROP PROCEDURE IF EXISTS spTest");
       ExecuteSQL("CREATE PROCEDURE spTest( \r\n) BEGIN  SELECT 4; END");
       cmd.Parameters.Clear();
       object val1 = cmd.ExecuteScalar();
-      Assert.AreEqual(4, Convert.ToInt32(val1));
+      Assert.That(Convert.ToInt32(val1), Is.EqualTo(4));
     }
 
     /// <summary>
@@ -255,7 +255,7 @@ public void NoDefaultDatabase()
       MySqlCommand cmd = new MySqlCommand("spTest", Connection);
       cmd.CommandType = CommandType.StoredProcedure;
       object val = cmd.ExecuteScalar();
-      Assert.AreEqual(4, Convert.ToInt32(val));
+      Assert.That(Convert.ToInt32(val), Is.EqualTo(4));
 
       cmd.CommandText = String.Format("USE `{0}`", dbName);
       cmd.CommandType = CommandType.Text;
@@ -264,7 +264,7 @@ public void NoDefaultDatabase()
       cmd.CommandText = String.Format("`{0}`.spTest", Connection.Database);
       cmd.CommandType = CommandType.StoredProcedure;
       val = cmd.ExecuteScalar();
-      Assert.AreEqual(4, Convert.ToInt32(val));
+      Assert.That(Convert.ToInt32(val), Is.EqualTo(4));
 
       cmd.CommandText = String.Format("USE `{0}`", Connection.Database);
       cmd.CommandType = CommandType.Text;
@@ -300,7 +300,7 @@ public void DecimalAsParameter()
       cmd.CommandType = CommandType.StoredProcedure;
       cmd.Parameters.AddWithValue("?d", 21);
       decimal d = (decimal)cmd.ExecuteScalar();
-      Assert.AreEqual(21, d);
+      Assert.That(d, Is.EqualTo(21));
     }
 
     /// <summary>
@@ -316,7 +316,7 @@ public void ParmWithCharacterSet()
       cmd.CommandType = CommandType.StoredProcedure;
       cmd.Parameters.AddWithValue("?P", "This is my value");
       string p = (string)cmd.ExecuteScalar();
-      Assert.AreEqual("This is my value", p);
+      Assert.That(p, Is.EqualTo("This is my value"));
     }
 
     /// <summary>
@@ -335,7 +335,7 @@ public void SpecialCharacters()
         cmd.CommandType = CommandType.StoredProcedure;
 
         string val = (string)cmd.ExecuteScalar();
-        Assert.AreEqual("This is my value", val);
+        Assert.That(val, Is.EqualTo("This is my value"));
       }
       finally
       {
@@ -354,7 +354,7 @@ public void CallingSPWithPrepare()
       cmd.Prepare();
 
       int p = (int)cmd.ExecuteScalar();
-      Assert.AreEqual(33, p);
+      Assert.That(p, Is.EqualTo(33));
     }
 
     /// <summary>
@@ -383,10 +383,10 @@ public void MultipleRecords()
       DataTable dt = new DataTable();
       da.Fill(dt);
 
-      Assert.AreEqual(1, dt.Rows[0]["id"]);
-      Assert.AreEqual(2, dt.Rows[1]["id"]);
-      Assert.AreEqual("First record", dt.Rows[0]["name"]);
-      Assert.AreEqual("Second record", dt.Rows[1]["name"]);
+      Assert.That(dt.Rows[0]["id"], Is.EqualTo(1));
+      Assert.That(dt.Rows[1]["id"], Is.EqualTo(2));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("First record"));
+      Assert.That(dt.Rows[1]["name"], Is.EqualTo("Second record"));
     }
 
     /// <summary>
@@ -440,8 +440,8 @@ public void ProcedureCache()
         System.Diagnostics.Trace.Listeners.Remove(myListener);
 
         // now see how many times our listener recorded a cache hit
-        Assert.AreEqual(190, myListener.Find("from procedure cache"));
-        Assert.AreEqual(10, myListener.Find("from server"));
+        Assert.That(myListener.Find("from procedure cache"), Is.EqualTo(190));
+        Assert.That(myListener.Find("from server"), Is.EqualTo(10));
       }
     }
 
@@ -542,7 +542,7 @@ public void ProcEnumParamTest()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual("P", reader.GetString(0));
+        Assert.That(reader.GetString(0), Is.EqualTo("P"));
       }
     }
 
@@ -565,7 +565,7 @@ public void GetSchema()
       MySqlDataAdapter da = new MySqlDataAdapter(cmd);
       DataTable schema = new DataTable();
       da.FillSchema(schema, SchemaType.Source);
-      Assert.AreEqual(2, schema.Columns.Count);
+      Assert.That(schema.Columns.Count, Is.EqualTo(2));
     }
 
     /// <summary>
@@ -622,14 +622,14 @@ public void UsingUInt64AsParam()
     public void CatalogWithHyphens()
     {
       // make sure this test is valid
-      Assert.True(Connection.Database.IndexOf('-') != -1);
+      Assert.That(Connection.Database.IndexOf('-') != -1);
 
       MySqlCommand cmd = new MySqlCommand("CREATE PROCEDURE spTest() BEGIN SELECT 1; END", Connection);
       cmd.ExecuteNonQuery();
 
       cmd.CommandText = "spTest";
       cmd.CommandType = CommandType.StoredProcedure;
-      Assert.AreEqual(1, Convert.ToInt32(cmd.ExecuteScalar()));
+      Assert.That(Convert.ToInt32(cmd.ExecuteScalar()), Is.EqualTo(1));
     }
 
     [Test]
@@ -677,7 +677,7 @@ public void SPWithSpaceInParameterType()
       cmd.Parameters.Add("@myparam", MySqlDbType.Decimal).Value = 20;
       cmd.CommandType = CommandType.StoredProcedure;
       object o = cmd.ExecuteScalar();
-      Assert.AreEqual(1, Convert.ToInt32(o));
+      Assert.That(Convert.ToInt32(o), Is.EqualTo(1));
     }
 
     private void ParametersInReverseOrderInternal(bool isOwner)
@@ -705,13 +705,13 @@ private void ParametersInReverseOrderInternal(bool isOwner)
         da.Fill(dt);
         if (!isOwner)
         {
-          Assert.AreEqual("World", dt.Rows[0][0]);
-          Assert.AreEqual("Hello", dt.Rows[0][1]);
+          Assert.That(dt.Rows[0][0], Is.EqualTo("World"));
+          Assert.That(dt.Rows[0][1], Is.EqualTo("Hello"));
         }
         else
         {
-          Assert.AreEqual("Hello", dt.Rows[0]["P1"]);
-          Assert.AreEqual("World", dt.Rows[0]["P2"]);
+          Assert.That(dt.Rows[0]["P1"], Is.EqualTo("Hello"));
+          Assert.That(dt.Rows[0]["P2"], Is.EqualTo("World"));
         }
       }
     }
@@ -737,7 +737,7 @@ public void DeriveParameters()
       MySqlCommand cmd = new MySqlCommand("spTest", Connection);
       cmd.CommandType = CommandType.StoredProcedure;
       MySqlCommandBuilder.DeriveParameters(cmd);
-      Assert.AreEqual(2, cmd.Parameters.Count);
+      Assert.That(cmd.Parameters.Count, Is.EqualTo(2));
     }
 
     /// <summary>
@@ -795,7 +795,7 @@ public void GetProcedureParametersDoesNotRequireSelectFromMySqlProceduresTable()
 
         MySqlSchemaCollection parametersTable = isp.GetProcedureParametersAsync(rest, new MySqlSchemaCollection(procTable), false).GetAwaiter().GetResult();
 
-        Assert.NotNull(parametersTable);
+        Assert.That(parametersTable, Is.Not.Null);
       }
     }
 
@@ -816,7 +816,7 @@ public void NamesWithPeriods()
           cmd.Parameters.AddWithValue("?p", 2);
           cmd.CommandType = CommandType.StoredProcedure;
           var result = cmd.ExecuteScalar();
-          Assert.AreEqual(2, result);
+          Assert.That(result, Is.EqualTo(2));
         }
       }
       //Database and stored procedure contains "."
@@ -830,7 +830,7 @@ public void NamesWithPeriods()
           cmd.Parameters.AddWithValue("?p", 3);
           cmd.CommandType = CommandType.StoredProcedure;
           var result = cmd.ExecuteScalar();
-          Assert.AreEqual(3, result);
+          Assert.That(result, Is.EqualTo(3));
         }
       }
     }
@@ -849,7 +849,7 @@ public void GetSchemaProcedures()
         if (table.Rows.Count > 0)
         {
           var column = table.Rows[0]["ROUTINE_DEFINITION"];
-          Assert.IsNotEmpty(column.ToString());
+          Assert.That(column.ToString(), Is.Not.Empty);
         }
       }
     }
@@ -870,11 +870,11 @@ public void ProcedureWithoutDbNameInConnString()
         MySqlCommand command = conn.CreateCommand();
         command.CommandText = $"test_prepare.spTest";
         command.CommandType = CommandType.StoredProcedure;
-        Assert.AreEqual(1, command.ExecuteScalar());
+        Assert.That(command.ExecuteScalar(), Is.EqualTo(1));
 
         command.CommandText = $"`test_prepare`.`spTest`";
         command.CommandType = CommandType.StoredProcedure;
-        Assert.AreEqual(1, command.ExecuteScalar());
+        Assert.That(command.ExecuteScalar(), Is.EqualTo(1));
       }
     }
 
@@ -913,7 +913,7 @@ public void VerifyParametersType()
         cmd.Prepare();
         cmd.ExecuteNonQuery();
         var result = cmd.Parameters["@value"].Value;
-        Assert.AreEqual("test value", result);
+        Assert.That(result, Is.EqualTo("test value"));
 
         //call Prepare() when SP and MySqlParameter have different data types
         cmd = new MySqlCommand("spTest", connection);
@@ -950,7 +950,7 @@ public void PassJsonParameter()
 
         cmd = new MySqlCommand("SELECT jsonValue FROM Test", conn);
         cmd.CommandType = CommandType.Text;
-        StringAssert.AreEqualIgnoringCase(json, cmd.ExecuteScalar().ToString().Replace(" ", ""));
+        Assert.That(cmd.ExecuteScalar().ToString().Replace(" ", ""), Is.EqualTo(json).IgnoreCase);
       }
     }
 
@@ -967,7 +967,7 @@ public void PassBoolParameter()
         cmd.CommandType = CommandType.StoredProcedure;
         cmd.Parameters.Add(new MySqlParameter { ParameterName = "success", Value = true, MySqlDbType = MySqlDbType.Int32 });
         cmd.Prepare();
-        Assert.IsTrue(Convert.ToBoolean(cmd.ExecuteScalar()));
+        Assert.That(Convert.ToBoolean(cmd.ExecuteScalar()));
       }
     }
 
@@ -994,7 +994,7 @@ public void PassDateTimeParameter()
         var result = cmd.Parameters["@value"].Value;
 
         DateTime dateTime = new DateTime(2020, 11, 27, 12, 25, 59);
-        Assert.AreEqual(dateTime, result);
+        Assert.That(result, Is.EqualTo(dateTime));
       }
 
       ExecuteSQL("DROP PROCEDURE spTest");
@@ -1013,7 +1013,7 @@ public void PassDateTimeParameter()
 
         cmd = new MySqlCommand("SELECT dateTime FROM Test", conn);
         cmd.CommandType = CommandType.Text;
-        Assert.AreEqual(dateTime, cmd.ExecuteScalar());
+        Assert.That(cmd.ExecuteScalar(), Is.EqualTo(dateTime));
       }
     }
 
@@ -1067,7 +1067,7 @@ public void EventsStatementsHistory()
       {
         while (rdr.Read())
         {
-          Assert.AreEqual("5", rdr.GetString(0));
+          Assert.That(rdr.GetString(0), Is.EqualTo("5"));
         }
       }
 
@@ -1082,11 +1082,11 @@ public void EventsStatementsHistory()
           }
         }
       }
-      Assert.True(testResult);
+      Assert.That(testResult);
 
       cmd = new MySqlCommand($"SELECT count(*) FROM information_schema.routines WHERE 1=1 AND ROUTINE_SCHEMA='{Settings.Database}' AND ROUTINE_NAME='{spName}';", Connection);
       var count = cmd.ExecuteScalar();
-      Assert.AreEqual(1, count);
+      Assert.That(count, Is.EqualTo(1));
 
     }
 
@@ -1106,11 +1106,11 @@ public void FullyQualifiedProcedures()
         MySqlCommand command = conn.CreateCommand();
         command.CommandText = $"`Test`.`spTest`";
         command.CommandType = CommandType.StoredProcedure;
-        Assert.AreEqual(1, command.ExecuteScalar());
+        Assert.That(command.ExecuteScalar(), Is.EqualTo(1));
 
         command.CommandText = $"Test.spTest";
         command.CommandType = CommandType.StoredProcedure;
-        Assert.AreEqual(1, command.ExecuteScalar());
+        Assert.That(command.ExecuteScalar(), Is.EqualTo(1));
       }
     }
 
@@ -1135,7 +1135,7 @@ public void StoredProceduresWithBackticks(string quotedName, string spNameCnet)
         command.CommandText = spNameCnet;
         command.CommandType = CommandType.StoredProcedure;
 
-        Assert.AreEqual(1, command.ExecuteScalar());
+        Assert.That(command.ExecuteScalar(), Is.EqualTo(1));
       }
     }
 
@@ -1157,7 +1157,7 @@ public void StoredProceduresWithBackticks2(string schema, string spName, string
         command.CommandText = spNameCnet;
         command.CommandType = CommandType.StoredProcedure;
 
-        Assert.AreEqual(1, command.ExecuteScalar());
+        Assert.That(command.ExecuteScalar(), Is.EqualTo(1));
       }
 
       ExecuteSQL($"DROP SCHEMA {schema};", true);
@@ -1220,7 +1220,7 @@ public void StoredProceduresWithBackticksExceptionRaised(string schema, string s
     [TestCase("`   foo`.bar", true)]
     public void IsSyntacticallyCorrect(string spName, bool isIt)
     {
-      Assert.IsTrue(MySqlClient.StoredProcedure.IsSyntacticallyCorrect(spName) == isIt);
+      Assert.That(MySqlClient.StoredProcedure.IsSyntacticallyCorrect(spName) == isIt);
     }
   }
 }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs b/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs
index 66a4334ff..bb46478ba 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs
@@ -76,12 +76,12 @@ public void TestMultiPacket()
           reader.Read();
           byte[] dataOut = new byte[len];
           long count = reader.GetBytes(2, 0, dataOut, 0, len);
-          Assert.AreEqual(len, count);
+          Assert.That(count, Is.EqualTo(len));
           int i = 0;
           try
           {
             for (; i < len; i++)
-              Assert.AreEqual(dataIn[i], dataOut[i]);
+              Assert.That(dataOut[i], Is.EqualTo(dataIn[i]));
           }
           catch (Exception)
           {
@@ -90,10 +90,10 @@ public void TestMultiPacket()
 
           reader.Read();
           count = reader.GetBytes(2, 0, dataOut, 0, len);
-          Assert.AreEqual(len, count);
+          Assert.That(count, Is.EqualTo(len));
 
           for (int x = 0; x < len; x++)
-            Assert.AreEqual(dataIn2[x], dataOut[x]);
+            Assert.That(dataOut[x], Is.EqualTo(dataIn2[x]));
         }
       }
     }
@@ -121,12 +121,12 @@ public void TestSequence()
       {
         while (reader.Read())
         {
-          Assert.True(i2 + 1 == reader.GetInt32(0), "Sequence out of order");
+          Assert.That(i2 + 1 == reader.GetInt32(0), "Sequence out of order");
           i2++;
         }
         reader.Close();
 
-        Assert.AreEqual(8000, i2);
+        Assert.That(i2, Is.EqualTo(8000));
         cmd = new MySqlCommand("delete from Test where id >= 100", Connection);
         cmd.ExecuteNonQuery();
       }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs b/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs
index 23b31e307..9b27c98ff 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs
@@ -48,7 +48,7 @@ public void ShowCreateTable()
       DataTable dt = Utils.FillTable("SHOW CREATE TABLE Test", Connection);
 
       Assert.That(dt.Rows, Has.One.Items);
-      Assert.AreEqual(2, dt.Columns.Count);
+      Assert.That(dt.Columns.Count, Is.EqualTo(2));
     }
 
     [Test]
@@ -72,10 +72,10 @@ public void ProblemCharsInSQLUTF8()
         cmd.CommandText = "SELECT * FROM Test";
         using (MySqlDataReader reader = cmd.ExecuteReader())
         {
-          Assert.True(reader.Read());
-          Assert.AreEqual(1, reader.GetInt32(0));
-          Assert.AreEqual("This is my;test ? string–’‘’“”…", reader.GetString(1));
-          Assert.AreEqual("My MT string: ?", reader.GetString(2));
+          Assert.That(reader.Read());
+          Assert.That(reader.GetInt32(0), Is.EqualTo(1));
+          Assert.That(reader.GetString(1), Is.EqualTo("This is my;test ? string–’‘’“”…"));
+          Assert.That(reader.GetString(2), Is.EqualTo("My MT string: ?"));
         }
       }
     }
@@ -96,10 +96,10 @@ public void ProblemCharsInSQL()
       cmd.CommandText = "SELECT * FROM Test";
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
-        Assert.True(reader.Read());
-        Assert.AreEqual(1, reader.GetInt32(0));
-        Assert.AreEqual("This is my;test ? string-'''\"\".", reader.GetString(1));
-        Assert.AreEqual("My MT string: ?", reader.GetString(2));
+        Assert.That(reader.Read());
+        Assert.That(reader.GetInt32(0), Is.EqualTo(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("This is my;test ? string-'''\"\"."));
+        Assert.That(reader.GetString(2), Is.EqualTo("My MT string: ?"));
       }
     }
 
@@ -136,11 +136,11 @@ private void LoadFile(MySqlConnection conn, string path)
 
         object cnt = 0;
         cnt = cmd.ExecuteNonQuery();
-        Assert.AreEqual(200000, Convert.ToInt32(cnt));
+        Assert.That(Convert.ToInt32(cnt), Is.EqualTo(200000));
 
         cmd.CommandText = "SELECT COUNT(*) FROM Test";
         cnt = cmd.ExecuteScalar();
-        Assert.AreEqual(200000, Convert.ToInt32(cnt));
+        Assert.That(Convert.ToInt32(cnt), Is.EqualTo(200000));
       }
     }
 
@@ -196,7 +196,7 @@ public void Sum()
       {
         reader.Read();
         object o = reader[0];
-        Assert.AreEqual(1, Convert.ToInt32(o));
+        Assert.That(Convert.ToInt32(o), Is.EqualTo(1));
       }
     }
 
@@ -213,8 +213,8 @@ public void Sum2()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual(1, reader.GetInt32(0));
-        Assert.AreEqual(110, reader.GetDouble(1));
+        Assert.That(reader.GetInt32(0), Is.EqualTo(1));
+        Assert.That(reader.GetDouble(1), Is.EqualTo(110));
       }
     }
 
@@ -239,11 +239,11 @@ public void SettingAutoIncrementColumns()
 
       MySqlCommand cmd = new MySqlCommand("SELECT name FROM Test WHERE id=1", Connection);
       object name = cmd.ExecuteScalar();
-      Assert.AreEqual("One", name);
+      Assert.That(name, Is.EqualTo("One"));
 
       cmd.CommandText = "SELECT name FROM Test WHERE id=3";
       name = cmd.ExecuteScalar();
-      Assert.AreEqual("Two", name);
+      Assert.That(name, Is.EqualTo("Two"));
       Assert.Throws<MySqlException>(() => ExecuteSQL("INSERT INTO Test (id, name2) values (5, 'Three')"));
     }
 
@@ -262,7 +262,7 @@ public void FoundRows()
       cmd.ExecuteNonQuery();
       cmd.CommandText = "SELECT FOUND_ROWS()";
       object cnt = cmd.ExecuteScalar();
-      Assert.AreEqual(1000, Convert.ToInt32(cnt));
+      Assert.That(Convert.ToInt32(cnt), Is.EqualTo(1000));
     }
 
     [Test]
@@ -277,7 +277,7 @@ public void AutoIncrement()
       {
         reader.Read();
         int ident = Int32.Parse(reader.GetValue(0).ToString());
-        Assert.AreEqual(1, ident);
+        Assert.That(ident, Is.EqualTo(1));
       }
     }
 
@@ -312,7 +312,7 @@ public void ErrorMessage()
       catch (MySqlException ex)
       {
         string s = ex.Message;
-        Assert.False(s.StartsWith("#", StringComparison.Ordinal));
+        Assert.That(s.StartsWith("#", StringComparison.Ordinal), Is.False);
       }
     }
 
@@ -326,12 +326,12 @@ public void Describe()
       var reader = ExecuteReader("DESCRIBE Test");
       using (reader)
       {
-        Assert.True(reader.GetFieldType(0) == typeof(string));
-        Assert.True(reader.GetFieldType(1) == typeof(string));
-        Assert.True(reader.GetFieldType(2) == typeof(string));
-        Assert.True(reader.GetFieldType(3) == typeof(string));
-        Assert.True(reader.GetFieldType(4) == typeof(string));
-        Assert.True(reader.GetFieldType(5) == typeof(string));
+        Assert.That(reader.GetFieldType(0) == typeof(string));
+        Assert.That(reader.GetFieldType(1) == typeof(string));
+        Assert.That(reader.GetFieldType(2) == typeof(string));
+        Assert.That(reader.GetFieldType(3) == typeof(string));
+        Assert.That(reader.GetFieldType(4) == typeof(string));
+        Assert.That(reader.GetFieldType(5) == typeof(string));
       }
     }
 
@@ -343,7 +343,7 @@ public void ShowTableStatus()
       using (reader)
       {
         reader.Read();
-        Assert.True(reader[0].GetType() == typeof(string));
+        Assert.That(reader[0].GetType() == typeof(string));
       }
     }
 
@@ -355,9 +355,9 @@ public void NullAsAType()
     {
       DataTable dt = Utils.FillTable(@"SELECT 'localhost' as SERVER_NAME,
         null as CATALOG_NAME, database() as SCHEMA_NAME", Connection);
-      Assert.True(dt.Rows[0][0].GetType() == typeof(string));
-      Assert.AreEqual(DBNull.Value, dt.Rows[0][1]);
-      Assert.True(dt.Rows[0][2].GetType() == typeof(string));
+      Assert.That(dt.Rows[0][0].GetType() == typeof(string));
+      Assert.That(dt.Rows[0][1], Is.EqualTo(DBNull.Value));
+      Assert.That(dt.Rows[0][2].GetType() == typeof(string));
     }
 
     [Test]
@@ -396,9 +396,9 @@ public void ShowProcessList()
         }
         DataRow row = dt.Rows[0];
 
-        Assert.True(row["User"].GetType().Name == "String");
-        Assert.True(row["Host"].GetType().Name == "String");
-        Assert.True(row["Command"].GetType().Name == "String");
+        Assert.That(row["User"].GetType().Name == "String");
+        Assert.That(row["Host"].GetType().Name == "String");
+        Assert.That(row["Command"].GetType().Name == "String");
       }
     }
 
@@ -407,7 +407,7 @@ public void SemisAtStartAndEnd()
     {
       using (MySqlCommand cmd = new MySqlCommand(";;SELECT 1;;;", Connection))
       {
-        Assert.AreEqual(1, Convert.ToInt32(cmd.ExecuteScalar()));
+        Assert.That(Convert.ToInt32(cmd.ExecuteScalar()), Is.EqualTo(1));
       }
     }
 
@@ -421,23 +421,23 @@ public void Bug51610()
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual("ABC", reader.GetString(0));
-        Assert.AreEqual(0, reader.GetInt32(1));
+        Assert.That(reader.GetString(0), Is.EqualTo("ABC"));
+        Assert.That(reader.GetInt32(1), Is.EqualTo(0));
       }
 
       cmd.CommandText = "SELECT 'ABC', (0-`QOH`) from (SELECT 1 as `QOH`) `d1`";
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual("ABC", reader.GetString(0));
-        Assert.AreEqual(-1, reader.GetInt32(1));
+        Assert.That(reader.GetString(0), Is.EqualTo("ABC"));
+        Assert.That(reader.GetInt32(1), Is.EqualTo(-1));
       }
 
       cmd.CommandText = "SELECT 'test 2010-03-04 @ 10:14'";
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual("test 2010-03-04 @ 10:14", reader.GetString(0));
+        Assert.That(reader.GetString(0), Is.EqualTo("test 2010-03-04 @ 10:14"));
       }
 
     }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs b/MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs
index 15a090262..453e707c5 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs
@@ -58,11 +58,11 @@ public void CommentsInSQL()
       MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", Connection);
       DataTable table = new DataTable();
       da.Fill(table);
-      Assert.AreEqual(1, table.Rows[0]["id"]);
-      Assert.AreEqual("Test", table.Rows[0]["name"]);
-      Assert.AreEqual(2, table.Rows.Count);
-      Assert.AreEqual(2, table.Rows[1]["id"]);
-      Assert.AreEqual("Test2", table.Rows[1]["name"]);
+      Assert.That(table.Rows[0]["id"], Is.EqualTo(1));
+      Assert.That(table.Rows[0]["name"], Is.EqualTo("Test"));
+      Assert.That(table.Rows.Count, Is.EqualTo(2));
+      Assert.That(table.Rows[1]["id"], Is.EqualTo(2));
+      Assert.That(table.Rows[1]["name"], Is.EqualTo("Test2"));
     }
 
     [Test]
@@ -71,17 +71,17 @@ public void LastInsertid()
       ExecuteSQL("CREATE TABLE Test(id int auto_increment, name varchar(20), primary key(id))");
       MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES(NULL, 'test')", Connection);
       cmd.ExecuteNonQuery();
-      Assert.AreEqual(1, cmd.LastInsertedId);
+      Assert.That(cmd.LastInsertedId, Is.EqualTo(1));
 
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
       }
-      Assert.AreEqual(2, cmd.LastInsertedId);
+      Assert.That(cmd.LastInsertedId, Is.EqualTo(2));
 
       cmd.CommandText = "SELECT id FROM Test";
       cmd.ExecuteScalar();
-      Assert.AreEqual(-1, cmd.LastInsertedId);
+      Assert.That(cmd.LastInsertedId, Is.EqualTo(-1));
     }
 
     [Test]
diff --git a/MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs b/MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs
index 68eefe76b..828a75ef7 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs
@@ -58,7 +58,7 @@ public void SimpleTableCaching()
         // now run the query again but this time it shouldn't generate a call to the database
         ConsumeReader(cmd);
       }
-      Assert.AreEqual(1, listener.Find("Resultset Opened: field(s) = 3"));
+      Assert.That(listener.Find("Resultset Opened: field(s) = 3"), Is.EqualTo(1));
     }
 
     [Test]
@@ -83,7 +83,7 @@ public void ConnectionStringExpiry()
         // since our next query is past the cache age of 1 second
         ConsumeReader(cmd);
       }
-      Assert.AreEqual(2, listener.Find("Resultset Opened: field(s) = 3"));
+      Assert.That(listener.Find("Resultset Opened: field(s) = 3"), Is.EqualTo(2));
     }
 
     [Test]
@@ -111,7 +111,7 @@ public void SettingAgeOnCommand()
         // to 20 seconds on our command
         ConsumeReader(cmd);
       }
-      Assert.AreEqual(1, listener.Find("Resultset Opened: field(s) = 3"));
+      Assert.That(listener.Find("Resultset Opened: field(s) = 3"), Is.EqualTo(1));
     }
 
     private void ConsumeReader(MySqlCommand cmd)
@@ -119,18 +119,18 @@ private void ConsumeReader(MySqlCommand cmd)
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
-        Assert.AreEqual(1, reader.GetInt32(0));
-        Assert.AreEqual("boo", reader.GetString(1));
-        Assert.AreEqual("hoo", reader.GetString(2));
+        Assert.That(reader.GetInt32(0), Is.EqualTo(1));
+        Assert.That(reader.GetString(1), Is.EqualTo("boo"));
+        Assert.That(reader.GetString(2), Is.EqualTo("hoo"));
         reader.Read();
-        Assert.AreEqual(2, reader.GetInt32(0));
-        Assert.AreEqual("first", reader.GetString(1));
-        Assert.AreEqual("last", reader.GetString(2));
+        Assert.That(reader.GetInt32(0), Is.EqualTo(2));
+        Assert.That(reader.GetString(1), Is.EqualTo("first"));
+        Assert.That(reader.GetString(2), Is.EqualTo("last"));
         reader.Read();
-        Assert.AreEqual(3, reader.GetInt32(0));
-        Assert.AreEqual("fred", reader.GetString(1));
-        Assert.AreEqual("flintstone", reader.GetString(2));
-        Assert.False(reader.Read());
+        Assert.That(reader.GetInt32(0), Is.EqualTo(3));
+        Assert.That(reader.GetString(1), Is.EqualTo("fred"));
+        Assert.That(reader.GetString(2), Is.EqualTo("flintstone"));
+        Assert.That(reader.Read(), Is.False);
       }
     }
   }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs b/MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs
index a8a0b83f5..fcaa8b25e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs
@@ -38,11 +38,11 @@ public class Tokenizer : TestBase
     public void Simple()
     {
       SqlTokenizer tokenizer = new SqlTokenizer("SELECT * FROM Test");
-      Assert.AreEqual("SELECT", tokenizer.NextToken());
-      Assert.AreEqual("*", tokenizer.NextToken());
-      Assert.AreEqual("FROM", tokenizer.NextToken());
-      Assert.AreEqual("Test", tokenizer.NextToken());
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("SELECT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("*"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("FROM"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("Test"));
+      Assert.That(tokenizer.NextToken(), Is.Null);
     }
 
     [Test]
@@ -52,20 +52,20 @@ public void DashSingleLineComment()
       string sql = String.Format("SELECT {0} * FROM Test", comment);
       SqlTokenizer tokenizer = new SqlTokenizer(sql);
       tokenizer.ReturnComments = true;
-      Assert.AreEqual("SELECT", tokenizer.NextToken());
-      Assert.AreEqual(comment, tokenizer.NextToken());
-      Assert.AreEqual("*", tokenizer.NextToken());
-      Assert.AreEqual("FROM", tokenizer.NextToken());
-      Assert.AreEqual("Test", tokenizer.NextToken());
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("SELECT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo(comment));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("*"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("FROM"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("Test"));
+      Assert.That(tokenizer.NextToken(), Is.Null);
 
       tokenizer = new SqlTokenizer(sql);
       tokenizer.ReturnComments = false;
-      Assert.AreEqual("SELECT", tokenizer.NextToken());
-      Assert.AreEqual("*", tokenizer.NextToken());
-      Assert.AreEqual("FROM", tokenizer.NextToken());
-      Assert.AreEqual("Test", tokenizer.NextToken());
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("SELECT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("*"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("FROM"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("Test"));
+      Assert.That(tokenizer.NextToken(), Is.Null);
     }
 
     [Test]
@@ -75,20 +75,20 @@ public void HashSingleLineComment()
       string sql = String.Format("SELECT {0} * FROM Test", comment);
       SqlTokenizer tokenizer = new SqlTokenizer(sql);
       tokenizer.ReturnComments = true;
-      Assert.AreEqual("SELECT", tokenizer.NextToken());
-      Assert.AreEqual(comment, tokenizer.NextToken());
-      Assert.AreEqual("*", tokenizer.NextToken());
-      Assert.AreEqual("FROM", tokenizer.NextToken());
-      Assert.AreEqual("Test", tokenizer.NextToken());
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("SELECT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo(comment));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("*"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("FROM"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("Test"));
+      Assert.That(tokenizer.NextToken(), Is.Null);
 
       tokenizer = new SqlTokenizer(sql);
       tokenizer.ReturnComments = false;
-      Assert.AreEqual("SELECT", tokenizer.NextToken());
-      Assert.AreEqual("*", tokenizer.NextToken());
-      Assert.AreEqual("FROM", tokenizer.NextToken());
-      Assert.AreEqual("Test", tokenizer.NextToken());
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("SELECT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("*"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("FROM"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("Test"));
+      Assert.That(tokenizer.NextToken(), Is.Null);
     }
 
     [Test]
@@ -98,20 +98,20 @@ public void MultiLineComment()
       string sql = String.Format("SELECT{0} * FROM Test", comment);
       SqlTokenizer tokenizer = new SqlTokenizer(sql);
       tokenizer.ReturnComments = true;
-      Assert.AreEqual("SELECT", tokenizer.NextToken());
-      Assert.AreEqual(comment.Trim(), tokenizer.NextToken());
-      Assert.AreEqual("*", tokenizer.NextToken());
-      Assert.AreEqual("FROM", tokenizer.NextToken());
-      Assert.AreEqual("Test", tokenizer.NextToken());
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("SELECT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo(comment.Trim()));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("*"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("FROM"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("Test"));
+      Assert.That(tokenizer.NextToken(), Is.Null);
 
       tokenizer = new SqlTokenizer(sql);
       tokenizer.ReturnComments = false;
-      Assert.AreEqual("SELECT", tokenizer.NextToken());
-      Assert.AreEqual("*", tokenizer.NextToken());
-      Assert.AreEqual("FROM", tokenizer.NextToken());
-      Assert.AreEqual("Test", tokenizer.NextToken());
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("SELECT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("*"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("FROM"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("Test"));
+      Assert.That(tokenizer.NextToken(), Is.Null);
     }
 
     [Test]
@@ -120,19 +120,19 @@ public void Parameter()
       string sql = "SELECT * FROM Test WHERE id=@id AND id2=?id2";
       SqlTokenizer tokenizer = new SqlTokenizer(sql);
       tokenizer.ReturnComments = true;
-      Assert.AreEqual("SELECT", tokenizer.NextToken());
-      Assert.AreEqual("*", tokenizer.NextToken());
-      Assert.AreEqual("FROM", tokenizer.NextToken());
-      Assert.AreEqual("Test", tokenizer.NextToken());
-      Assert.AreEqual("WHERE", tokenizer.NextToken());
-      Assert.AreEqual("id", tokenizer.NextToken());
-      Assert.AreEqual("=", tokenizer.NextToken());
-      Assert.AreEqual("@id", tokenizer.NextToken());
-      Assert.AreEqual("AND", tokenizer.NextToken());
-      Assert.AreEqual("id2", tokenizer.NextToken());
-      Assert.AreEqual("=", tokenizer.NextToken());
-      Assert.AreEqual("?id2", tokenizer.NextToken());
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("SELECT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("*"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("FROM"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("Test"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("WHERE"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("id"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("="));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("@id"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("AND"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("id2"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("="));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("?id2"));
+      Assert.That(tokenizer.NextToken(), Is.Null);
     }
 
     [Test]
@@ -141,9 +141,9 @@ public void NextParameter()
       string sql = "SELECT * FROM Test WHERE id=@id AND id2=?id2";
       SqlTokenizer tokenizer = new SqlTokenizer(sql);
       tokenizer.ReturnComments = true;
-      Assert.AreEqual("@id", tokenizer.NextParameter());
-      Assert.AreEqual("?id2", tokenizer.NextParameter());
-      Assert.Null(tokenizer.NextParameter());
+      Assert.That(tokenizer.NextParameter(), Is.EqualTo("@id"));
+      Assert.That(tokenizer.NextParameter(), Is.EqualTo("?id2"));
+      Assert.That(tokenizer.NextParameter(), Is.Null);
     }
 
     [Test]
@@ -152,15 +152,15 @@ public void ParameterWithSpecialCharacters()
       string sql = "SELECT * FROM Test WHERE id=@id_$123";
       SqlTokenizer tokenizer = new SqlTokenizer(sql);
       tokenizer.ReturnComments = true;
-      Assert.AreEqual("SELECT", tokenizer.NextToken());
-      Assert.AreEqual("*", tokenizer.NextToken());
-      Assert.AreEqual("FROM", tokenizer.NextToken());
-      Assert.AreEqual("Test", tokenizer.NextToken());
-      Assert.AreEqual("WHERE", tokenizer.NextToken());
-      Assert.AreEqual("id", tokenizer.NextToken());
-      Assert.AreEqual("=", tokenizer.NextToken());
-      Assert.AreEqual("@id_$123", tokenizer.NextToken());
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("SELECT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("*"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("FROM"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("Test"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("WHERE"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("id"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("="));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("@id_$123"));
+      Assert.That(tokenizer.NextToken(), Is.Null);
     }
 
     [Test]
@@ -169,13 +169,13 @@ public void StringLiteral()
       string sql = "SELECT 'a', 1, 'b'";
       SqlTokenizer tokenizer = new SqlTokenizer(sql);
       tokenizer.ReturnComments = false;
-      Assert.AreEqual("SELECT", tokenizer.NextToken());
-      Assert.AreEqual("'a'", tokenizer.NextToken());
-      Assert.AreEqual(",", tokenizer.NextToken());
-      Assert.AreEqual("1", tokenizer.NextToken());
-      Assert.AreEqual(",", tokenizer.NextToken());
-      Assert.AreEqual("'b'", tokenizer.NextToken());
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("SELECT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("'a'"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo(","));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("1"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo(","));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("'b'"));
+      Assert.That(tokenizer.NextToken(), Is.Null);
     }
 
     [Test]
@@ -184,13 +184,13 @@ public void UserVariable()
       string sql = "SELECT 'a', 1, @@myVar";
       SqlTokenizer tokenizer = new SqlTokenizer(sql);
       tokenizer.ReturnComments = false;
-      Assert.AreEqual("SELECT", tokenizer.NextToken());
-      Assert.AreEqual("'a'", tokenizer.NextToken());
-      Assert.AreEqual(",", tokenizer.NextToken());
-      Assert.AreEqual("1", tokenizer.NextToken());
-      Assert.AreEqual(",", tokenizer.NextToken());
-      Assert.AreEqual("@@myVar", tokenizer.NextToken());
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("SELECT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("'a'"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo(","));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("1"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo(","));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("@@myVar"));
+      Assert.That(tokenizer.NextToken(), Is.Null);
     }
 
     [Test]
@@ -199,16 +199,16 @@ public void AnsiQuotes()
       string sql = "SELECT 'a', \"a\", `a`";
       SqlTokenizer tokenizer = new SqlTokenizer(sql);
       tokenizer.AnsiQuotes = false;
-      Assert.AreEqual("SELECT", tokenizer.NextToken());
-      Assert.AreEqual("'a'", tokenizer.NextToken());
-      Assert.True(tokenizer.Quoted);
-      Assert.AreEqual(",", tokenizer.NextToken());
-      Assert.AreEqual("\"a\"", tokenizer.NextToken());
-      Assert.True(tokenizer.Quoted);
-      Assert.AreEqual(",", tokenizer.NextToken());
-      Assert.AreEqual("`a`", tokenizer.NextToken());
-      Assert.True(tokenizer.Quoted);
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("SELECT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("'a'"));
+      Assert.That(tokenizer.Quoted);
+      Assert.That(tokenizer.NextToken(), Is.EqualTo(","));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("\"a\""));
+      Assert.That(tokenizer.Quoted);
+      Assert.That(tokenizer.NextToken(), Is.EqualTo(","));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("`a`"));
+      Assert.That(tokenizer.Quoted);
+      Assert.That(tokenizer.NextToken(), Is.Null);
     }
 
     [Test]
@@ -217,25 +217,25 @@ public void ParseProcBody()
       string sql = "CREATE PROCEDURE spTest(testid INT, testname VARCHAR(20)) BEGIN SELECT 1; END";
       SqlTokenizer tokenizer = new SqlTokenizer(sql);
       tokenizer.AnsiQuotes = false;
-      Assert.AreEqual("CREATE", tokenizer.NextToken());
-      Assert.AreEqual("PROCEDURE", tokenizer.NextToken());
-      Assert.AreEqual("spTest", tokenizer.NextToken());
-      Assert.AreEqual("(", tokenizer.NextToken());
-      Assert.AreEqual("testid", tokenizer.NextToken());
-      Assert.AreEqual("INT", tokenizer.NextToken());
-      Assert.AreEqual(",", tokenizer.NextToken());
-      Assert.AreEqual("testname", tokenizer.NextToken());
-      Assert.AreEqual("VARCHAR", tokenizer.NextToken());
-      Assert.AreEqual("(", tokenizer.NextToken());
-      Assert.AreEqual("20", tokenizer.NextToken());
-      Assert.AreEqual(")", tokenizer.NextToken());
-      Assert.AreEqual(")", tokenizer.NextToken());
-      Assert.AreEqual("BEGIN", tokenizer.NextToken());
-      Assert.AreEqual("SELECT", tokenizer.NextToken());
-      Assert.AreEqual("1", tokenizer.NextToken());
-      Assert.AreEqual(";", tokenizer.NextToken());
-      Assert.AreEqual("END", tokenizer.NextToken());
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("CREATE"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("PROCEDURE"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("spTest"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("("));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("testid"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("INT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo(","));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("testname"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("VARCHAR"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("("));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("20"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo(")"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo(")"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("BEGIN"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("SELECT"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("1"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo(";"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("END"));
+      Assert.That(tokenizer.NextToken(), Is.Null);
     }
 
     /// <summary>
@@ -251,13 +251,13 @@ public void NoSpaceAroundEquals()
       cmd.ExecuteNonQuery();
       cmd.CommandText = "SELECT name FROM Test";
       object o = cmd.ExecuteScalar();
-      Assert.AreEqual("test -- test", o);
+      Assert.That(o, Is.EqualTo("test -- test"));
 
       cmd.CommandText = "UPDATE Test SET name='Can you explain this ?';";
       cmd.ExecuteNonQuery();
       cmd.CommandText = "SELECT name FROM Test";
       o = cmd.ExecuteScalar();
-      Assert.AreEqual("Can you explain this ?", o);
+      Assert.That(o, Is.EqualTo("Can you explain this ?"));
     }
 
     [Test]
@@ -266,11 +266,11 @@ public void Slash()
       string sql = "AND // OR";
       SqlTokenizer tokenizer = new SqlTokenizer(sql);
       tokenizer.AnsiQuotes = false;
-      Assert.AreEqual("AND", tokenizer.NextToken());
-      Assert.AreEqual("/", tokenizer.NextToken());
-      Assert.AreEqual("/", tokenizer.NextToken());
-      Assert.AreEqual("OR", tokenizer.NextToken());
-      Assert.Null(tokenizer.NextToken());
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("AND"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("/"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("/"));
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("OR"));
+      Assert.That(tokenizer.NextToken(), Is.Null);
     }
 
     [Test]
@@ -280,17 +280,17 @@ public void SqlServerMode()
       SqlTokenizer tokenizer = new SqlTokenizer(sql);
       tokenizer.SqlServerMode = true;
       tokenizer.NextToken();
-      Assert.AreEqual("`a`", tokenizer.NextToken());
-      Assert.True(tokenizer.Quoted);
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("`a`"));
+      Assert.That(tokenizer.Quoted);
       tokenizer.NextToken();  // read ,
-      Assert.AreEqual("[id]", tokenizer.NextToken());
-      Assert.True(tokenizer.Quoted);
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("[id]"));
+      Assert.That(tokenizer.Quoted);
       tokenizer.NextToken();  // read ,
-      Assert.AreEqual("[name]", tokenizer.NextToken());
-      Assert.True(tokenizer.Quoted);
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("[name]"));
+      Assert.That(tokenizer.Quoted);
       tokenizer.NextToken();  // read FROM
-      Assert.AreEqual("[Test]", tokenizer.NextToken());
-      Assert.True(tokenizer.Quoted);
+      Assert.That(tokenizer.NextToken(), Is.EqualTo("[Test]"));
+      Assert.That(tokenizer.Quoted);
     }
   }
 }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs b/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
index 665f677ed..585875433 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
@@ -57,7 +57,7 @@ void TransactionScopeInternal(bool commit)
 
         cmd.CommandText = "SELECT COUNT(*) FROM Test";
         object count = cmd.ExecuteScalar();
-        Assert.AreEqual(commit ? 1 : 0, Convert.ToInt32(count));
+        Assert.That(Convert.ToInt32(count), Is.EqualTo(commit ? 1 : 0));
       }
     }
 
@@ -96,7 +96,7 @@ public void TransactionScopeWithIsolationLevel()
           {
             reader.Read();
             string level = reader.GetString(1);
-            Assert.AreEqual("READ-COMMITTED", level);
+            Assert.That(level, Is.EqualTo("READ-COMMITTED"));
           }
         }
       }
@@ -116,7 +116,7 @@ public void TransactionScopeWithIsolationLevel()
           {
             reader.Read();
             string level = reader.GetString(1);
-            Assert.AreEqual("READ-UNCOMMITTED", level);
+            Assert.That(level, Is.EqualTo("READ-UNCOMMITTED"));
           }
         }
       }
@@ -137,7 +137,7 @@ public void TransactionReadOnlyIsAvailable()
         {
           reader.Read();
           if (Connection.driver.Version.isAtLeast(5, 7, 0))
-            Assert.AreEqual("OFF", reader.GetString(1));
+            Assert.That(reader.GetString(1), Is.EqualTo("OFF"));
         }
       }
     }
@@ -170,7 +170,7 @@ public void RollingBackOnClose()
         MySqlCommand cmd2 = new MySqlCommand("SELECT COUNT(*) from Test", c2);
         c2.BeginTransaction();
         object count = cmd2.ExecuteScalar();
-        Assert.AreEqual(0, Convert.ToInt32(count));
+        Assert.That(Convert.ToInt32(count), Is.EqualTo(0));
       }
 
       MySqlConnection connection = new MySqlConnection(connStr);
@@ -270,7 +270,7 @@ public void ManualEnlistment()
         ExecuteSQL("UNLOCK TABLES");
       }
       MySqlCommand cmd2 = new MySqlCommand("LOCK TABLES test READ; SELECT COUNT(*) FROM test", c);
-      Assert.AreEqual(1, Convert.ToInt32(cmd2.ExecuteScalar()));
+      Assert.That(Convert.ToInt32(cmd2.ExecuteScalar()), Is.EqualTo(1));
       ExecuteSQL("UNLOCK TABLES");
       c.Dispose();
       KillPooledConnection(connStr);
@@ -432,8 +432,8 @@ private void NestedScopeInternalTest(
            ((long)MySqlHelper.ExecuteScalar(Connection, "select count(*) from T where str = 'inner'") == 1);
         bool outerChangesVisible =
             ((long)MySqlHelper.ExecuteScalar(Connection, "select count(*) from T where str = 'outer'") == 1);
-        Assert.AreEqual(innerChangesVisible, expectInnerChangesVisible);
-        Assert.AreEqual(outerChangesVisible, expectOuterChangesVisible);
+        Assert.That(expectInnerChangesVisible, Is.EqualTo(innerChangesVisible));
+        Assert.That(expectOuterChangesVisible, Is.EqualTo(outerChangesVisible));
       }
       finally
       {
@@ -526,7 +526,7 @@ private void ReusingSameConnection(bool pooling, bool complete)
           c2.Open();
           MySqlCommand cmd2 = new MySqlCommand("INSERT INTO Test (key2) VALUES ('b')", c2);
           cmd2.ExecuteNonQuery();
-          Assert.AreEqual(c1Thread, c2.ServerThread);
+          Assert.That(c2.ServerThread, Is.EqualTo(c1Thread));
         }
 
         if (complete)
@@ -538,13 +538,13 @@ private void ReusingSameConnection(bool pooling, bool complete)
       da.Fill(dt);
       if (complete)
       {
-        Assert.AreEqual(2, dt.Rows.Count);
-        Assert.AreEqual("a", dt.Rows[0][0]);
-        Assert.AreEqual("b", dt.Rows[1][0]);
+        Assert.That(dt.Rows.Count, Is.EqualTo(2));
+        Assert.That(dt.Rows[0][0], Is.EqualTo("a"));
+        Assert.That(dt.Rows[1][0], Is.EqualTo("b"));
       }
       else
       {
-        Assert.AreEqual(0, dt.Rows.Count);
+        Assert.That(dt.Rows.Count, Is.EqualTo(0));
       }
     }
 
@@ -586,7 +586,7 @@ public void ScopeTimeoutWithMySqlHelper()
         }
       }
       long count = (long)MySqlHelper.ExecuteScalar(connStr, "select count(*) from test");
-      Assert.AreEqual(0, count);
+      Assert.That(count, Is.EqualTo(0));
     }
 
     /// <summary>
@@ -629,10 +629,10 @@ public void AttemptToUseConnectionAfterScopeTimeout()
           Thread.Sleep(500);
           Assert.Throws<TransactionAbortedException>(() => cmd.ExecuteNonQuery());
         }
-        Assert.True(c.State == ConnectionState.Open);
+        Assert.That(c.State == ConnectionState.Open);
         cmd.CommandText = "select count(*) from Test";
         long count = (long)cmd.ExecuteScalar();
-        Assert.AreEqual(0, count);
+        Assert.That(count, Is.EqualTo(0));
       }
     }
 
@@ -661,7 +661,7 @@ public void SnapshotIsolationLevelThrowsNotSupportedException()
       {
         newcon.Open();
         var ex = Assert.Throws<NotSupportedException>(() => newcon.BeginTransaction(System.Data.IsolationLevel.Snapshot));
-        Assert.AreEqual("Snapshot isolation level is not supported.", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Snapshot isolation level is not supported."));
       }
     }
 
@@ -706,7 +706,7 @@ public void Bug26035791()
 
           cmd2 = new MySqlCommand(@"select count(*) from TransTest", db, transaction);
           int.TryParse(cmd2.ExecuteScalar().ToString(), out int n1); // If ReadUncommitted is applied we should be able to read inserted record before commit
-          Assert.True(n1 == 2);
+          Assert.That(n1 == 2);
           transaction.Commit();
         }
         ExecuteSQL("drop table TransTest");
@@ -716,7 +716,7 @@ public void Bug26035791()
           reader.Read();
           finalLevel = reader.GetString(1);
         }
-        Assert.AreEqual(initialLevel, finalLevel); // Isolation level should be the same after the transaction
+        Assert.That(finalLevel, Is.EqualTo(initialLevel)); // Isolation level should be the same after the transaction
       }
     }
 
@@ -766,7 +766,7 @@ public void TransactionWithAutoCommit()
       {
         connection.Open();
         var transaction = connection.BeginTransaction();
-        Assert.IsNotNull(transaction);
+        Assert.That(transaction, Is.Not.Null);
         var myCommand = connection.CreateCommand();
         myCommand.CommandText = "INSERT INTO `Test` VALUES (1);";
         var result = myCommand.ExecuteNonQuery();
diff --git a/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs b/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs
index ce79a457a..3499e1f32 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs
@@ -51,7 +51,7 @@ public void ConnectionTest()
       using (MySqlConnection conn = new MySqlConnection(unixConnectionString))
       {
         conn.Open();
-        Assert.AreEqual(ConnectionState.Open, conn.State);
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
       }
     }
   }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
index 764700cf3..9f2055353 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
@@ -111,7 +111,7 @@ public virtual void BaseTearDown()
         if (SchemaExistsInDatabase(schema))
           s.DropSchema(schemaName);
         schema.Session.DropSchema(schemaName);
-        Assert.False(SchemaExistsInDatabase(schema));
+        Assert.That(SchemaExistsInDatabase(schema), Is.False);
       }
 
       DropUsers();
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
index 6bb3b881b..d04d0e200 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
@@ -51,16 +51,16 @@ public void SimpleFind()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       var foundDocs = ExecuteFindStatement(coll.Find("pages > 20"));
-      Assert.True(foundDocs.Next());
-      Assert.True(foundDocs.Current["title"].ToString() == "Book 2");
-      Assert.True(foundDocs.Next());
-      Assert.True(foundDocs.Current["title"].ToString() == "Book 3");
-      Assert.True(foundDocs.Next());
-      Assert.True(foundDocs.Current["title"].ToString() == "Book 4");
-      Assert.False(foundDocs.Next());
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"].ToString() == "Book 2");
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"].ToString() == "Book 3");
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"].ToString() == "Book 4");
+      Assert.That(foundDocs.Next(), Is.False);
     }
 
     [Test]
@@ -75,16 +75,16 @@ public void SimpleFindWithSort()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       var foundDocs = ExecuteFindStatement(coll.Find("pages > 20").Sort("pages DESC"));
-      Assert.True(foundDocs.Next());
-      Assert.True(foundDocs.Current["title"].ToString() == "Book 4");
-      Assert.True(foundDocs.Next());
-      Assert.True(foundDocs.Current["title"].ToString() == "Book 3");
-      Assert.True(foundDocs.Next());
-      Assert.True(foundDocs.Current["title"].ToString() == "Book 2");
-      Assert.False(foundDocs.Next());
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"].ToString() == "Book 4");
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"].ToString() == "Book 3");
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"].ToString() == "Book 2");
+      Assert.That(foundDocs.Next(), Is.False);
     }
 
     [Test]
@@ -99,16 +99,16 @@ public void SimpleFindWithLimitAndOffset()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       var foundDocs = ExecuteFindStatement(coll.Find("pages > 20").Limit(1));
-      Assert.True(foundDocs.Next());
-      Assert.True(foundDocs.Current["title"].ToString() == "Book 2");
-      Assert.False(foundDocs.Next());
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"].ToString() == "Book 2");
+      Assert.That(foundDocs.Next(), Is.False);
 
       var resultDocs = ExecuteFindStatement(coll.Find("pages > 20").Offset(1).Limit(2)).FetchAll();
-      Assert.AreEqual(40, resultDocs[0]["pages"]);
-      Assert.AreEqual(50, resultDocs[1]["pages"]);
+      Assert.That(resultDocs[0]["pages"], Is.EqualTo(40));
+      Assert.That(resultDocs[1]["pages"], Is.EqualTo(50));
 
       // Limit out of range.
       Assert.Throws<ArgumentOutOfRangeException>(() => ExecuteFindStatement(coll.Find().Limit(0)));
@@ -127,12 +127,12 @@ public void FindConditional()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       var foundDocs = ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pAges", 40));
-      Assert.True(foundDocs.Next());
-      Assert.True(foundDocs.Current["title"].ToString() == "Book 3");
-      Assert.False(foundDocs.Next());
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"].ToString() == "Book 3");
+      Assert.That(foundDocs.Next(), Is.False);
     }
 
     [Test]
@@ -147,15 +147,15 @@ public void BindDbDoc()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       DbDoc docParams = new DbDoc(new { pages1 = 30, pages2 = 40 });
       var foundDocs = ExecuteFindStatement(coll.Find("pages = :Pages1 || pages = :Pages2").Bind(docParams));
-      Assert.True(foundDocs.Next());
-      Assert.AreEqual("Book 2", foundDocs.Current["title"]);
-      Assert.True(foundDocs.Next());
-      Assert.AreEqual("Book 3", foundDocs.Current["title"]);
-      Assert.False(foundDocs.Next());
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"], Is.EqualTo("Book 2"));
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"], Is.EqualTo("Book 3"));
+      Assert.That(foundDocs.Next(), Is.False);
     }
 
     [Test]
@@ -170,15 +170,15 @@ public void BindJsonAsAnonymous()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       var jsonParams = new { pages1 = 30, pages2 = 40 };
       var foundDocs = ExecuteFindStatement(coll.Find("pages = :Pages1 || pages = :Pages2").Bind(jsonParams));
-      Assert.True(foundDocs.Next());
-      Assert.AreEqual("Book 2", foundDocs.Current["title"]);
-      Assert.True(foundDocs.Next());
-      Assert.AreEqual("Book 3", foundDocs.Current["title"]);
-      Assert.False(foundDocs.Next());
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"], Is.EqualTo("Book 2"));
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"], Is.EqualTo("Book 3"));
+      Assert.That(foundDocs.Next(), Is.False);
     }
 
     [Test]
@@ -193,15 +193,15 @@ public void BindJsonAsString()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       var jsonParams = "{ \"pages1\" : 30, \"pages2\" : 40 }";
       var foundDocs = ExecuteFindStatement(coll.Find("pages = :Pages1 || pages = :Pages2").Bind(jsonParams));
-      Assert.True(foundDocs.Next());
-      Assert.AreEqual("Book 2", foundDocs.Current["title"]);
-      Assert.True(foundDocs.Next());
-      Assert.AreEqual("Book 3", foundDocs.Current["title"]);
-      Assert.False(foundDocs.Next());
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"], Is.EqualTo("Book 2"));
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Current["title"], Is.EqualTo("Book 3"));
+      Assert.That(foundDocs.Next(), Is.False);
     }
 
     [Test]
@@ -211,10 +211,10 @@ public void RowLockingNotSupportedInOlderVersions()
       Collection coll = CreateCollection("test");
 
       Exception ex = Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll.Find().LockShared()));
-      Assert.AreEqual("This functionality is only supported from server version 8.0.3 onwards.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("This functionality is only supported from server version 8.0.3 onwards."));
 
       ex = Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll.Find().LockExclusive()));
-      Assert.AreEqual("This functionality is only supported from server version 8.0.3 onwards.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("This functionality is only supported from server version 8.0.3 onwards."));
     }
 
     [Test]
@@ -283,11 +283,11 @@ public void SharedLockForbidsToModifyDocuments()
 
         // Modify() is allowed for non-locked documents.
         Result result = ExecuteModifyStatement(coll2.Modify("_id = 2").Set("a", 2));
-        Assert.AreEqual(1, result.AffectedItemsCount);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
         // Session1 blocks, Modify() is not allowed for locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         Exception ex = Assert.Throws<MySqlException>(() => ExecuteModifyStatement(coll2.Modify("_id = 1").Set("a", 2)));
-        Assert.AreEqual("Lock wait timeout exceeded; try restarting transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Lock wait timeout exceeded; try restarting transaction"));
 
         ExecuteSQLStatement(session.SQL("ROLLBACK"));
         // Modify() is allowed since document isn't locked anymore.
@@ -323,13 +323,13 @@ public void ExclusiveLockForbidsToModifyDocuments()
 
         // Modify() is allowed for non-locked documents.
         Result result = ExecuteModifyStatement(coll2.Modify("_id = 2").Set("a", 2));
-        Assert.AreEqual(1, result.AffectedItemsCount);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
         // Session2 blocks, Modify() is not allowed for locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         Exception ex = Assert.Throws<MySqlException>(() => ExecuteModifyStatement(coll2.Modify("_id = 1").Set("a", 2)));
-        Assert.AreEqual("Lock wait timeout exceeded; try restarting transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Lock wait timeout exceeded; try restarting transaction"));
         ex = Assert.Throws<MySqlException>(() => ExecuteModifyStatement(coll2.Modify("_id = 1").Change("a", 12)));
-        Assert.AreEqual("Lock wait timeout exceeded; try restarting transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Lock wait timeout exceeded; try restarting transaction"));
 
         ExecuteSQLStatement(session.SQL("ROLLBACK"));
         // Modify() is allowed since document isn't locked anymore.
@@ -369,7 +369,7 @@ public void SharedLockAfterExclusiveLock()
         // Session2 blocks due to LockExclusive() not allowing to read locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         Exception ex = Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll2.Find("_id = 1").LockShared()));
-        Assert.AreEqual("Lock wait timeout exceeded; try restarting transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Lock wait timeout exceeded; try restarting transaction"));
 
         // Session unlocks documents.
         ExecuteSQLStatement(session.SQL("ROLLBACK"));
@@ -402,7 +402,7 @@ public void ExclusiveLockAfterSharedLock()
 
         ExecuteSQLStatement(session.SQL("START TRANSACTION"));
         var docResult = ExecuteFindStatement(coll.Find("_id in (1, 3)").LockShared());
-        Assert.AreEqual(2, docResult.FetchAll().Count);
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(2));
 
         ExecuteSQLStatement(session2.SQL("START TRANSACTION"));
         // Should return immediately since document isn't locked.
@@ -413,7 +413,7 @@ public void ExclusiveLockAfterSharedLock()
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         Exception ex = Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll2.Find("_id = 1").LockExclusive()));
-        Assert.AreEqual("Lock wait timeout exceeded; try restarting transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Lock wait timeout exceeded; try restarting transaction"));
 
         // Session unlocks documents.
         ExecuteSQLStatement(session.SQL("ROLLBACK"));
@@ -454,7 +454,7 @@ public void ExclusiveLockAfterExclusiveLock()
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         Exception ex = Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll2.Find("_id = 1").LockExclusive()));
-        Assert.AreEqual("Lock wait timeout exceeded; try restarting transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Lock wait timeout exceeded; try restarting transaction"));
 
         // Session unlocks documents.
         ExecuteSQLStatement(session.SQL("ROLLBACK"));
@@ -481,13 +481,13 @@ public void InOperatorWithListOfValues()
       Assert.That(ExecuteFindStatement(coll.Find("b[0] NOT IN (0,2,3)")).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(coll.Find("b[1] not in (\"a\", \"b\", \"c\")")).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(coll.Find("a in [1,2,3]")).FetchAll(), Has.One.Items);
-      CollectionAssert.IsEmpty(ExecuteFindStatement(coll.Find("a in [2,3,4]")).FetchAll());
+      Assert.That(ExecuteFindStatement(coll.Find("a in [2,3,4]")).FetchAll(), Is.Empty);
       Assert.That(ExecuteFindStatement(coll.Find("a NOT in [0,2,3]")).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(coll.Find("b not IN [1,2,3]")).FetchAll(), Has.One.Items);
-      CollectionAssert.IsEmpty(ExecuteFindStatement(coll.Find("b[0] not IN [1,2,3]")).FetchAll());
-      CollectionAssert.IsEmpty(ExecuteFindStatement(coll.Find("c NOT IN [1,2,3]")).FetchAll());
-      CollectionAssert.IsEmpty(ExecuteFindStatement(coll.Find("a IN ('', ' ')")).FetchAll());
-      CollectionAssert.IsEmpty(ExecuteFindStatement(coll.Find("'' IN (1,2,3)")).FetchAll());
+      Assert.That(ExecuteFindStatement(coll.Find("b[0] not IN [1,2,3]")).FetchAll(), Is.Empty);
+      Assert.That(ExecuteFindStatement(coll.Find("c NOT IN [1,2,3]")).FetchAll(), Is.Empty);
+      Assert.That(ExecuteFindStatement(coll.Find("a IN ('', ' ')")).FetchAll(), Is.Empty);
+      Assert.That(ExecuteFindStatement(coll.Find("'' IN (1,2,3)")).FetchAll(), Is.Empty);
       Assert.That(ExecuteFindStatement(coll.Find("d IN ('')")).FetchAll(), Has.One.Items);
 
       Collection movies = CreateCollection("movies");
@@ -495,28 +495,28 @@ public void InOperatorWithListOfValues()
       ExecuteAddStatement(movies.Add(new DbDoc(docString)));
 
       Assert.That(ExecuteFindStatement(movies.Find("(1>5) in (true, false)")).FetchAll(), Has.One.Items);
-      CollectionAssert.IsEmpty(ExecuteFindStatement(movies.Find("(1+5) in (1, 2, 3, 4, 5)")).FetchAll());
+      Assert.That(ExecuteFindStatement(movies.Find("(1+5) in (1, 2, 3, 4, 5)")).FetchAll(), Is.Empty);
       Assert.That(ExecuteFindStatement(movies.Find("('a'>'b') in (true, false)")).FetchAll(), Has.One.Items);
       Assert.Throws<MySqlException>(() => ExecuteFindStatement(movies.Find("(1>5) in [true, false]")).FetchAll());
       Assert.Throws<MySqlException>(() => ExecuteFindStatement(movies.Find("(1+5) in [1, 2, 3, 4, 5]")).FetchAll());
       Assert.Throws<MySqlException>(() => ExecuteFindStatement(movies.Find("('a'>'b') in [true, false]")).FetchAll());
       Assert.That(ExecuteFindStatement(movies.Find("true IN [(1>5), !(false), (true || false), (false && true)]")).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(movies.Find("true IN ((1>5), !(false), (true || false), (false && true))")).FetchAll(), Has.One.Items);
-      CollectionAssert.IsEmpty(ExecuteFindStatement(movies.Find("{\"field\":true} IN (\"mystring\", 124, myvar, othervar.jsonobj)")).FetchAll());
-      CollectionAssert.IsEmpty(ExecuteFindStatement(movies.Find("actor.name IN ['a name', null, (1<5-4), myvar.jsonobj.name]")).FetchAll());
+      Assert.That(ExecuteFindStatement(movies.Find("{\"field\":true} IN (\"mystring\", 124, myvar, othervar.jsonobj)")).FetchAll(), Is.Empty);
+      Assert.That(ExecuteFindStatement(movies.Find("actor.name IN ['a name', null, (1<5-4), myvar.jsonobj.name]")).FetchAll(), Is.Empty);
       Assert.That(ExecuteFindStatement(movies.Find("!false && true IN [true]")).FetchAll(), Has.One.Items);
       Assert.Throws<MySqlException>(() => ExecuteFindStatement(movies.Find("1-5/2*2 > 3-2/1*2 IN [true, false]")).FetchAll());
-      CollectionAssert.IsEmpty(ExecuteFindStatement(movies.Find("true IN [1-5/2*2 > 3-2/1*2]")).FetchAll());
+      Assert.That(ExecuteFindStatement(movies.Find("true IN [1-5/2*2 > 3-2/1*2]")).FetchAll(), Is.Empty);
       Assert.That(ExecuteFindStatement(movies.Find(" 'African Egg' IN ('African Egg', 1, true, NULL, [0,1,2], { 'title' : 'Atomic Firefighter' }) ")).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(movies.Find(" 1 IN ('African Egg', 1, true, NULL, [0,1,2], { 'title' : 'Atomic Firefighter' }) ")).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(movies.Find(" [0,1,2] IN ('African Egg', 1, true, NULL, [0,1,2], { 'title' : 'Atomic Firefighter' }) ")).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(movies.Find(" { 'title' : 'Atomic Firefighter' } IN ('African Egg', 1, true, NULL, [0,1,2], { 'title' : 'Atomic Firefighter' }) ")).FetchAll(), Has.One.Items);
-      CollectionAssert.IsEmpty(ExecuteFindStatement(movies.Find("title IN ('African Egg', 'The Witcher', 'Jurassic Perk')")).FetchAll());
+      Assert.That(ExecuteFindStatement(movies.Find("title IN ('African Egg', 'The Witcher', 'Jurassic Perk')")).FetchAll(), Is.Empty);
       Assert.That(ExecuteFindStatement(movies.Find("releaseyear IN (2006, 2010, 2017)")).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(movies.Find("1 IN [1,2,3]")).FetchAll(), Has.One.Items);
-      CollectionAssert.IsEmpty(ExecuteFindStatement(movies.Find("0 IN [1,2,3]")).FetchAll());
+      Assert.That(ExecuteFindStatement(movies.Find("0 IN [1,2,3]")).FetchAll(), Is.Empty);
       Assert.That(ExecuteFindStatement(movies.Find("0 NOT IN [1,2,3]")).FetchAll(), Has.One.Items);
-      CollectionAssert.IsEmpty(ExecuteFindStatement(movies.Find("1 NOT IN [1,2,3]")).FetchAll());
+      Assert.That(ExecuteFindStatement(movies.Find("1 NOT IN [1,2,3]")).FetchAll(), Is.Empty);
       Assert.That(ExecuteFindStatement(movies.Find("releaseyear IN [2006, 2007, 2008]")).FetchAll(), Has.One.Items);
     }
 
@@ -534,10 +534,10 @@ public void InOperatorWithCompExpr()
       Assert.That(ExecuteFindStatement(coll.Find("c.e[0] in [1,2,3]")).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(coll.Find("5 in f[*].x")).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(coll.Find("3 in c.e")).FetchAll(), Has.One.Items);
-      CollectionAssert.IsEmpty(ExecuteFindStatement(coll.Find("5 in c.e")).FetchAll());
-      CollectionAssert.IsEmpty(ExecuteFindStatement(coll.Find("\"foo\" in " + docString)).FetchAll());
-      CollectionAssert.IsEmpty(ExecuteFindStatement(coll.Find("\"a\" in " + docString)).FetchAll());
-      CollectionAssert.IsEmpty(ExecuteFindStatement(coll.Find("a in " + docString)).FetchAll());
+      Assert.That(ExecuteFindStatement(coll.Find("5 in c.e")).FetchAll(), Is.Empty);
+      Assert.That(ExecuteFindStatement(coll.Find("\"foo\" in " + docString)).FetchAll(), Is.Empty);
+      Assert.That(ExecuteFindStatement(coll.Find("\"a\" in " + docString)).FetchAll(), Is.Empty);
+      Assert.That(ExecuteFindStatement(coll.Find("a in " + docString)).FetchAll(), Is.Empty);
       Assert.That(ExecuteFindStatement(coll.Find("{\"a\":1} in " + docString)).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(coll.Find("\"foo\" in b")).FetchAll(), Has.One.Items);
 
@@ -546,13 +546,13 @@ public void InOperatorWithCompExpr()
       ExecuteAddStatement(movies.Add(new DbDoc(docString)));
 
       Assert.That(ExecuteFindStatement(movies.Find("{ \"name\" : \"MILLA PECK\" } IN actors")).FetchAll(), Has.One.Items);
-      CollectionAssert.IsEmpty(ExecuteFindStatement(movies.Find("'African Egg' in movietitle")).FetchAll());
+      Assert.That(ExecuteFindStatement(movies.Find("'African Egg' in movietitle")).FetchAll(), Is.Empty);
       Assert.Throws<MySqlException>(() => ExecuteFindStatement(movies.Find("(1 = NULL) IN title")).FetchAll());
       Assert.Throws<MySqlException>(() => ExecuteFindStatement(movies.Find("NOT NULL IN title")).FetchAll());
       Assert.That(ExecuteFindStatement(movies.Find("[\"Rusty Couturier\", \"Angelic Orduno\", \"Carin Postell\"] IN additionalinfo.writers")).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(movies.Find("{ \"name\" : \"MILLA PECK\", \"country\" : \"Mexico\", \"birthdate\": \"12 Jan 1984\"} IN actors")).FetchAll(), Has.One.Items);
-      CollectionAssert.IsEmpty(ExecuteFindStatement(movies.Find("true IN title")).FetchAll());
-      CollectionAssert.IsEmpty(ExecuteFindStatement(movies.Find("false IN genre")).FetchAll());
+      Assert.That(ExecuteFindStatement(movies.Find("true IN title")).FetchAll(), Is.Empty);
+      Assert.That(ExecuteFindStatement(movies.Find("false IN genre")).FetchAll(), Is.Empty);
       Assert.That(ExecuteFindStatement(movies.Find("'Sharice Legaspi' IN additionalinfo.director")).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(movies.Find("'Mexico' IN actors[*].country")).FetchAll(), Has.One.Items);
       Assert.That(ExecuteFindStatement(movies.Find("'Angelic Orduno' IN additionalinfo.writers")).FetchAll(), Has.One.Items);
@@ -568,7 +568,7 @@ public void InOperatorWithJsonArrays()
       ExecuteAddStatement(coll.Add(new DbDoc(docString)));
 
       Assert.That(ExecuteFindStatement(coll.Find("\"1001\" in $._id")).FetchAll(), Has.One.Items);
-      CollectionAssert.IsEmpty(ExecuteFindStatement(coll.Find("\"1002\" in $._id")).FetchAll());
+      Assert.That(ExecuteFindStatement(coll.Find("\"1002\" in $._id")).FetchAll(), Is.Empty);
       Assert.That(ExecuteFindStatement(coll.Find("(1+2) in (1, 2, 3)")).FetchAll(), Has.One.Items);
       Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll.Find("(1+2) in [1, 2, 3]")).FetchAll());
       Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll.Find("(1+2) in $.ARR")).FetchAll());
@@ -586,7 +586,7 @@ public void GetOne()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       // Expected exceptions.
       Assert.Throws<ArgumentNullException>(() => coll.GetOne(null));
@@ -595,19 +595,19 @@ public void GetOne()
 
       // Get document using numeric parameter.
       DbDoc document = coll.GetOne(1);
-      Assert.AreEqual(1, document.Id);
-      Assert.AreEqual("Book 1", document["title"]);
-      Assert.AreEqual(20, Convert.ToInt32(document["pages"]));
+      Assert.That(document.Id, Is.EqualTo(1));
+      Assert.That(document["title"], Is.EqualTo("Book 1"));
+      Assert.That(Convert.ToInt32(document["pages"]), Is.EqualTo(20));
 
       // Get document using string parameter.
       document = coll.GetOne("3");
-      Assert.AreEqual(3, document.Id);
-      Assert.AreEqual("Book 3", document["title"]);
-      Assert.AreEqual(40, Convert.ToInt32(document["pages"]));
+      Assert.That(document.Id, Is.EqualTo(3));
+      Assert.That(document["title"], Is.EqualTo("Book 3"));
+      Assert.That(Convert.ToInt32(document["pages"]), Is.EqualTo(40));
 
       // Get a non-existing document.
       document = coll.GetOne(5);
-      Assert.Null(document);
+      Assert.That(document, Is.Null);
     }
 
     public enum LockMode { Exclusive, Shared }
@@ -650,7 +650,7 @@ public void LockExclusiveAndSharedWithWaitingOptions(LockContention lockOption,
           {
             case LockContention.Default:
               // error 1205 Lock wait timeout exceeded; try restarting transaction
-              Assert.AreEqual(1205u, Assert.Throws<MySqlException>(() => ExecuteFindStatement(stmt2).FetchAll()).Code);
+              Assert.That(Assert.Throws<MySqlException>(() => ExecuteFindStatement(stmt2).FetchAll()).Code, Is.EqualTo(1205u));
               break;
             case LockContention.NoWait:
               // error 1205 Lock wait timeout exceeded; try restarting transaction
@@ -658,16 +658,16 @@ public void LockExclusiveAndSharedWithWaitingOptions(LockContention lockOption,
               if (session.XSession.GetServerVersion().isAtLeast(8, 0, 5))
                 // error 3572 Statement aborted because lock(s) could not be acquired immediately and NOWAIT is set
                 expectedError = 3572;
-              Assert.AreEqual(expectedError, Assert.Throws<MySqlException>(() => ExecuteFindStatement(stmt2).FetchAll()).Code);
+              Assert.That(Assert.Throws<MySqlException>(() => ExecuteFindStatement(stmt2).FetchAll()).Code, Is.EqualTo(expectedError));
               break;
             case LockContention.SkipLocked:
               if (!session.XSession.GetServerVersion().isAtLeast(8, 0, 5))
               {
                 // error 1205 Lock wait timeout exceeded; try restarting transaction
-                Assert.AreEqual(1205u, Assert.Throws<MySqlException>(() => ExecuteFindStatement(stmt2).FetchAll()).Code);
+                Assert.That(Assert.Throws<MySqlException>(() => ExecuteFindStatement(stmt2).FetchAll()).Code, Is.EqualTo(1205u));
                 break;
               }
-              CollectionAssert.IsEmpty(ExecuteFindStatement(stmt2).FetchAll());
+              Assert.That(ExecuteFindStatement(stmt2).FetchAll(), Is.Empty);
               break;
             default:
               throw new NotImplementedException(lockOption.ToString());
@@ -694,56 +694,56 @@ public void Grouping()
         new { _id = 7, name = "elizabeth olsen", age = 31}
       };
       Result r = ExecuteAddStatement(collection.Add(docs));
-      Assert.AreEqual(7, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(7));
 
       // GroupBy operation.
       // GroupBy returns 5 rows since age 45 and 24 is repeated.
       var result = ExecuteFindStatement(collection.Find().Fields("_id as ID", "name as Name", "age as Age").GroupBy("age"));
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       // GroupBy with null.
       result = ExecuteFindStatement(collection.Find().Fields("_id as ID", "name as Name", "age as Age").GroupBy(null));
-      Assert.AreEqual(7, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(7));
       result = ExecuteFindStatement(collection.Find().Fields("_id as ID", "name as Name", "age as Age").GroupBy(null, null));
-      Assert.AreEqual(7, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(7));
       result = ExecuteFindStatement(collection.Find().Fields("_id as ID", "name as Name", "age as Age").GroupBy(null, "age"));
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       // Having operation.
       // Having reduces the original 5 rows to 3 since 2 rows have a cnt=2, due to the repeated names.
       result = ExecuteFindStatement(collection.Find().Fields("_id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having("cnt = 1"));
-      Assert.AreEqual(3, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(3));
 
       // Having with null.
       result = ExecuteFindStatement(collection.Find().Fields("_id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having(null));
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       // GroupBy with invalid field name.
       var ex = Assert.Throws<MySqlException>(() => ExecuteFindStatement(collection.Find().Fields("_id as ID", "name as Name", "age as Age").GroupBy("none")));
-      Assert.AreEqual("Unknown column 'none' in 'group statement'", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Unknown column 'none' in 'group statement'"));
 
       // GroupBy with empty strings.
       var ex2 = Assert.Throws<ArgumentException>(() => ExecuteFindStatement(collection.Find().Fields("_id as ID", "name as Name", "age as Age").GroupBy("")));
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex2.Message);
+      Assert.That(ex2.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
       ex2 = Assert.Throws<ArgumentException>(() => ExecuteFindStatement(collection.Find().Fields("_id as ID", "name as Name", "age as Age").GroupBy(" ")));
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex2.Message);
+      Assert.That(ex2.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
       ex2 = Assert.Throws<ArgumentException>(() => ExecuteFindStatement(collection.Find().Fields("_id as ID", "name as Name", "age as Age").GroupBy(string.Empty)));
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex2.Message);
+      Assert.That(ex2.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
 
       // Having with invalid field name.
       ex = Assert.Throws<MySqlException>(() => ExecuteFindStatement(collection.Find().Fields("_id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having("none = 1")));
-      Assert.AreEqual("Invalid expression in grouping criteria", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Invalid expression in grouping criteria"));
 
       // Having with empty strings.
       ex2 = Assert.Throws<ArgumentException>(() => ExecuteFindStatement(collection.Find().Fields("_id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having("")));
-      Assert.AreEqual("Unable to parse query ''", ex2.Message);
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex2.InnerException.Message);
+      Assert.That(ex2.Message, Is.EqualTo("Unable to parse query ''"));
+      Assert.That(ex2.InnerException.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
       ex2 = Assert.Throws<ArgumentException>(() => ExecuteFindStatement(collection.Find().Fields("_id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having(" ")));
-      Assert.AreEqual("Unable to parse query ' '", ex2.Message);
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex2.InnerException.Message);
+      Assert.That(ex2.Message, Is.EqualTo("Unable to parse query ' '"));
+      Assert.That(ex2.InnerException.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
       ex2 = Assert.Throws<ArgumentException>(() => ExecuteFindStatement(collection.Find().Fields("_id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having(string.Empty)));
-      Assert.AreEqual("Unable to parse query ''", ex2.Message);
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex2.InnerException.Message);
+      Assert.That(ex2.Message, Is.EqualTo("Unable to parse query ''"));
+      Assert.That(ex2.InnerException.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
     }
 
     [Test]
@@ -758,18 +758,18 @@ public void Fields()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4ul, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4ul));
 
       // Single field.
       var result = ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pAges", 40).Fields("title"));
       var document = result.FetchOne();
       Assert.That(document.values, Has.One.Items);
-      Assert.AreEqual("Book 3", document["title"]);
+      Assert.That(document["title"], Is.EqualTo("Book 3"));
 
       // Null values are ignored.
       result = ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pAges", 40).Fields(null));
       document = result.FetchOne();
-      Assert.AreEqual(3, document.values.Count);
+      Assert.That(document.values.Count, Is.EqualTo(3));
 
       // Null values are ignored.
       result = ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pAges", 40).Fields("title", null));
@@ -780,41 +780,41 @@ public void Fields()
       result = ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pAges", 40).Fields(new string[] { "title" }));
       document = result.FetchOne();
       Assert.That(document.values, Has.One.Items);
-      Assert.AreEqual("Book 3", document["title"]);
+      Assert.That(document["title"], Is.EqualTo("Book 3"));
 
       // Single field with alias.
       result = ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pages", 20).Fields("title as title2"));
       document = result.FetchOne();
       Assert.That(document.values, Has.One.Items);
-      Assert.AreEqual("Book 1", document["title2"]);
-      Assert.False(document.values.ContainsKey("title"));
+      Assert.That(document["title2"], Is.EqualTo("Book 1"));
+      Assert.That(document.values.ContainsKey("title"), Is.False);
 
       // Unexistent field returns null.
       result = ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pages", 20).Fields("book"));
       document = result.FetchOne();
       Assert.That(document.values, Has.One.Items);
-      Assert.Null(document["book"]);
+      Assert.That(document["book"], Is.Null);
 
       // Unexistent field with alias returns null.
       result = ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pages", 20).Fields("book as book1"));
       document = result.FetchOne();
       Assert.That(document.values, Has.One.Items);
-      Assert.Null(document["book1"]);
+      Assert.That(document["book1"], Is.Null);
 
       // Multiple fields.
       result = ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pAges", 40).Fields("title", "pages", "other"));
       document = result.FetchOne();
-      Assert.AreEqual(3, document.values.Count);
-      Assert.AreEqual("Book 3", document["title"]);
-      Assert.AreEqual(40, document["pages"]);
-      Assert.Null(document["other"]);
+      Assert.That(document.values.Count, Is.EqualTo(3));
+      Assert.That(document["title"], Is.EqualTo("Book 3"));
+      Assert.That(document["pages"], Is.EqualTo(40));
+      Assert.That(document["other"], Is.Null);
 
       // Multiple fields in array.
       result = ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pAges", 40).Fields(new string[] { "title", "pages" }));
       document = result.FetchOne();
-      Assert.AreEqual(2, document.values.Count);
-      Assert.AreEqual("Book 3", document["title"]);
-      Assert.AreEqual(40, document["pages"]);
+      Assert.That(document.values.Count, Is.EqualTo(2));
+      Assert.That(document["title"], Is.EqualTo("Book 3"));
+      Assert.That(document["pages"], Is.EqualTo(40));
 
       // Sending a document doesn't generate an error.
       result = ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pages", 20).Fields("{\"_id\":\"1004\",\"F1\": 1234 }"));
@@ -822,15 +822,15 @@ public void Fields()
 
       // Empty string and white space raises error.
       var ex = Assert.Throws<ArgumentException>(() => ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pAges", 40).Fields("")));
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
       ex = Assert.Throws<ArgumentException>(() => ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pAges", 40).Fields("  ")));
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
       ex = Assert.Throws<ArgumentException>(() => ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pAges", 40).Fields(string.Empty)));
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
 
       // Multiple word field name raises error.
       ex = Assert.Throws<ArgumentException>(() => result = ExecuteFindStatement(coll.Find("pages = :Pages").Bind("pAges", 40).Fields("Book 1")));
-      Assert.AreEqual("Expression has unexpected token '1' at position 1.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Expression has unexpected token '1' at position 1."));
     }
 
     [TestCase("", "")]
@@ -849,26 +849,26 @@ public void FindIdAsString(string prefix, string suffix)
         new {  _id = $"{prefix}4{suffix}", title = $"{prefix}Book 4{suffix}", pages = 50 },
       };
       r = coll.Add(docs).Execute();
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       var findStmt = coll.Find("_id = :id and pages = :pages").Bind("id", $"{prefix}3{suffix}").Bind("pages", 40);
       var doc = ExecuteFindStatement(findStmt);
       var books = doc.FetchAll();
       Assert.That(books, Has.One.Items);
-      Assert.AreEqual($"{prefix}3{suffix}", books[0]["_id"]);
+      Assert.That(books[0]["_id"], Is.EqualTo($"{prefix}3{suffix}"));
 
       findStmt = coll.Find("_id = :id and pages = :pages").Bind("Id", $"{prefix}2{suffix}").Bind("Pages", 30);
       doc = ExecuteFindStatement(findStmt);
       books = doc.FetchAll();
       Assert.That(books, Has.One.Items);
-      Assert.AreEqual($"{prefix}2{suffix}", books[0]["_id"]);
+      Assert.That(books[0]["_id"], Is.EqualTo($"{prefix}2{suffix}"));
 
       findStmt = coll.Find("title = :title").Bind("Title", $"{prefix}Book 4{suffix}");
       doc = ExecuteFindStatement(findStmt);
       books = doc.FetchAll();
       Assert.That(books, Has.One.Items);
-      Assert.AreEqual($"{prefix}4{suffix}", books[0]["_id"]);
-      Assert.AreEqual(50, books[0]["pages"]);
+      Assert.That(books[0]["_id"], Is.EqualTo($"{prefix}4{suffix}"));
+      Assert.That(books[0]["pages"], Is.EqualTo(50));
     }
 
     [TestCase(":hobbies IN $.additionalinfo.hobbies", "hobbies", "painting", 4)]
@@ -886,15 +886,15 @@ public void InOperatorBindingJson(string condition, string bind, string value, i
         new { _id = 4, title = $"Book 4", pages = 50, additionalinfo = new DbDoc("{\"company\":\"zxc\",\"vehicle\":\"boat\",\"hobbies\":\"painting\"}") },
       };
       r = coll.Add(docs).Execute();
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       var findStmt = coll.Find(condition);
       if (bind != null) findStmt.Bind(bind, value);
       var result = findStmt.Execute().FetchAll();
-      Assert.AreEqual(id == 0 ? 0 : 1, result.Count);
+      Assert.That(result.Count, Is.EqualTo(id == 0 ? 0 : 1));
       if (id > 0)
       {
-        Assert.AreEqual(id, result[0]["_id"]);
+        Assert.That(result[0]["_id"], Is.EqualTo(id));
       }
     }
 
@@ -911,36 +911,36 @@ public void FindUsingOverlaps()
       coll.Add("{ \"_id\":6, \"title\": \"Book 6\",\"list\":[\" \"]}").Execute();
 
       var result = ExecuteFindStatement(coll.Find("[7] OVERLAPS $.list")).FetchAll();
-      Assert.AreEqual("Book 2", result[0]["title"]);
+      Assert.That(result[0]["title"], Is.EqualTo("Book 2"));
       result = ExecuteFindStatement(coll.Find("[8] overlaps $.list")).FetchAll();
-      CollectionAssert.IsEmpty(result);
+      Assert.That(result, Is.Empty);
       result = ExecuteFindStatement(coll.Find("[1, 4] OVERLAPS $.list")).FetchAll();
-      CollectionAssert.IsNotEmpty(result);
-      Assert.AreEqual("Book 1", result[0]["title"]);
-      Assert.AreEqual("Book 3", result[1]["title"]);
+      Assert.That(result, Is.Not.Empty);
+      Assert.That(result[0]["title"], Is.EqualTo("Book 1"));
+      Assert.That(result[1]["title"], Is.EqualTo("Book 3"));
       result = ExecuteFindStatement(coll.Find("$.list OVERLAPS [1, 2]")).FetchAll();
-      CollectionAssert.IsNotEmpty(result);
-      Assert.AreEqual("Book 1", result[0]["title"]);
-      Assert.AreEqual("Book 4", result[1]["title"]);
+      Assert.That(result, Is.Not.Empty);
+      Assert.That(result[0]["title"], Is.EqualTo("Book 1"));
+      Assert.That(result[1]["title"], Is.EqualTo("Book 4"));
       result = ExecuteFindStatement(coll.Find("'Book 1' NOT OVERLAPS $.title").Fields("_id")).FetchAll();
-      Assert.AreEqual(5, result.Count);
-      Assert.AreEqual(3, result[1].Id);
+      Assert.That(result.Count, Is.EqualTo(5));
+      Assert.That(result[1].Id, Is.EqualTo(3));
       result = ExecuteFindStatement(coll.Find(":title NOT OVERLAPS $.title").Bind("title", "Book 1").Fields("_id")).FetchAll();
-      Assert.AreEqual(5, result.Count);
-      Assert.AreEqual(4, result[2].Id);
+      Assert.That(result.Count, Is.EqualTo(5));
+      Assert.That(result[2].Id, Is.EqualTo(4));
       result = ExecuteFindStatement(coll.Find("$.list OVERLAPS :list").Bind("list", 9)).FetchAll();
-      Assert.AreEqual("Book 3", result[0]["title"]);
+      Assert.That(result[0]["title"], Is.EqualTo("Book 3"));
       var jsonParams = new { list = 4 };
       result = ExecuteFindStatement(coll.Find("$.list OVERLAPS :list").Bind(jsonParams).Fields("count(_id) as ID", "title as Title", "list as List").
         GroupBy("title", "list").Having("ID > 0")).FetchAll();
-      Assert.AreEqual(2, result.Count);
-      Assert.AreEqual("Book 1", result[0]["Title"]);
+      Assert.That(result.Count, Is.EqualTo(2));
+      Assert.That(result[0]["Title"], Is.EqualTo("Book 1"));
       result = ExecuteFindStatement(coll.Find("[''] OVERLAPS $.list")).FetchAll();
       Assert.That(result, Has.One.Items);
-      Assert.AreEqual(5, result[0].Id);
+      Assert.That(result[0].Id, Is.EqualTo(5));
       result = ExecuteFindStatement(coll.Find("[' '] OVERLAPS $.list")).FetchAll();
       Assert.That(result, Has.One.Items);
-      Assert.AreEqual(6, result[0].Id);
+      Assert.That(result[0].Id, Is.EqualTo(6));
 
       Assert.Throws<ArgumentException>(() => ExecuteFindStatement(coll.Find("$.list OVERLAPS -")).FetchAll());
       Assert.Throws<ArgumentException>(() => ExecuteFindStatement(coll.Find("[2, 9] OVERLAPS")).FetchAll());
@@ -968,43 +968,43 @@ public void FindGroupByHaving()
         };
 
       Result r = collection.Add(docs1).Execute();
-      Assert.AreEqual(8, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(8));
 
       // GroupBy operation.
       // GroupBy returns 5 rows since age 45 and 24 is repeated.
       var result = collection.Find().Fields("_id as ID", "name as Name", "age as Age").GroupBy("age").Execute();
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
       result = collection.Find().Fields("_id as ID", "name as Name", "profit as Profit", "test as test").GroupBy("test").Having("test=1.92").Execute();
-      Assert.AreEqual(1, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(1));
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>=31").
           Sort("profit DESC").Execute();
-      Assert.AreEqual(result.FetchAll().Count, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(result.FetchAll().Count));
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30 && max($.age)<32")
          .Execute();
-      Assert.AreEqual(2, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(2));
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>300000000")
         .Execute();
-      Assert.AreEqual(0, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(0));
 
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30").
           Having("max($.age)<32")
          .Execute();
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30").
          Having("max($.age)<32").Limit(5)
         .Execute();
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30").
          Having("max($.age)<32").Limit(3)
         .Execute();
-      Assert.AreEqual(3, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(3));
 
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30").
           Having("max($.age)<32").Limit(3).Offset(2)
          .Execute();
-      Assert.AreEqual(3, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(3));
 
       Assert.Throws<ArgumentException>(() => collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("date=21/11/2011").Execute());
     }
@@ -1028,7 +1028,7 @@ public void FindLimitOffset()
       };
 
       Result r = collection.Add(docs1).Execute();
-      Assert.AreEqual(8, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(8));
 
       // GroupBy operation.
       // GroupBy returns 5 rows since age 45 and 24 is repeated.
@@ -1040,52 +1040,52 @@ public void FindLimitOffset()
       k = result1.FetchAll().Count;
 
       var result = collection.Find().Fields("_id as ID", "name as Name", "age as Age").GroupBy("age").Execute();
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
       result = collection.Find().Fields("_id as ID", "name as Name", "profit as Profit", "test as test").GroupBy("test").Having("test=1.92").Execute();
-      Assert.AreEqual(1, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(1));
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>=31").
           Sort("profit DESC").Execute();
-      Assert.AreEqual(result.FetchAll().Count, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(result.FetchAll().Count));
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30 && max($.age)<32")
           .Execute();
-      Assert.AreEqual(2, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(2));
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>300000000")
         .Execute();
-      Assert.AreEqual(0, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(0));
 
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30").
           Having("max($.age)<32")
           .Execute();
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30").
           Having("max($.age)<32").Limit(5)
         .Execute();
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30").
           Having("max($.age)<32").Limit(3)
         .Execute();
-      Assert.AreEqual(3, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(3));
 
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30").
           Having("max($.age)<32").Limit(3).Offset(2)
           .Execute();
-      Assert.AreEqual(3, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(3));
 
       result = collection.Find().Fields("$._id as _id", "$.test as test").GroupBy("$.test").Limit(5).Offset(1).Execute();
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       result = collection.Find().Fields("$._id as _id", "$.test as test").GroupBy("$.test").Limit(5).Offset(-1).Execute();
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       result = collection.Find().Fields("$._id as _id", "$.test as test").GroupBy("$.test").Limit(8).Execute();
-      Assert.AreEqual(8, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(8));
 
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30").
               Having("max($.age)<32").Limit(3).Offset(-1)
             .Execute();
-      Assert.AreEqual(3, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(3));
 
       Assert.Throws<ArgumentOutOfRangeException>(() => collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30").
           Having("max($.age)<32").Limit(-1).Offset(0)
@@ -1105,10 +1105,10 @@ public void FindLimitOffset()
       var res = collection.Add(jsonlist).Execute();
 
       result = collection.Find().Fields("$.F1 as F1", "$.F2 as F2").GroupBy("$.F1").Limit(3).Offset(1).Execute();
-      Assert.AreEqual(3, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(3));
 
       result = collection.Find().Fields("$.F1 as F1", "$.F2 as F2").GroupBy("$.F1").Limit(3).Offset(1844674407370955161).Execute();
-      Assert.AreEqual(0, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(0));
     }
 
     [Test, Description("Collection.Find().Limit(x,y)")]
@@ -1129,7 +1129,7 @@ public void FindLimitOffsetDeprecated()
       };
 
       Result r = collection.Add(docs1).Execute();
-      Assert.AreEqual(8, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(8));
 
       // GroupBy operation.
       var result1 = collection.Find().Limit(2).Offset(-2378723).Execute();
@@ -1168,17 +1168,17 @@ public void FindLimitOffsetDeprecated()
       var result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30").
           Having("max($.age)<32").Limit(3).Offset(2)
           .Execute();
-      Assert.AreEqual(3, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(3));
 
       result = collection.Find().Fields("$._id as _id", "$.test as test").GroupBy("$.test").Limit(5).Offset(1).Execute();
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
       result = collection.Find().Fields("$._id as _id", "$.test as test").GroupBy("$.test").Limit(5).Offset(-1).Execute();
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       result = collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30").
       Having("max($.age)<32").Limit(3).Offset(-1)
       .Execute();
-      Assert.AreEqual(3, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(3));
 
       Assert.Throws<ArgumentOutOfRangeException>(() => collection.Find().Fields("max($.age) as age", "max($.profit) as Profit", "max($.test) as test").GroupBy("$.test").Having("max($.age)>30").
       Having("max($.age)<32").Limit(-1).Offset(0)
@@ -1226,14 +1226,14 @@ public void CollectionDbdoc()
       string[] test1 = new string[] { "_id=1" };
       string[] test2 = new string[] { "_id=2" };
       var res = col.Find("$._id = 1").Execute().FetchAll();
-      Assert.AreEqual(1, res.Count, "Matching the find count");
-      Assert.AreEqual(d1.ToString(), res[0].ToString(), "Matching the string");
+      Assert.That(res.Count, Is.EqualTo(1), "Matching the find count");
+      Assert.That(res[0].ToString(), Is.EqualTo(d1.ToString()), "Matching the string");
       res = col.Find("$._id = 2").Execute().FetchAll();
-      Assert.AreEqual(1, res.Count, "Matching the find count");
-      Assert.AreEqual(d2.ToString(), res[0].ToString(), "Matching the string");
+      Assert.That(res.Count, Is.EqualTo(1), "Matching the find count");
+      Assert.That(res[0].ToString(), Is.EqualTo(d2.ToString()), "Matching the string");
       res = col.Find("$._id = 3").Execute().FetchAll();
-      Assert.AreEqual(1, res.Count, "Matching the find count");
-      Assert.AreEqual(d3.ToString(), res[0].ToString(), "Matching the string");
+      Assert.That(res.Count, Is.EqualTo(1), "Matching the find count");
+      Assert.That(res[0].ToString(), Is.EqualTo(d3.ToString()), "Matching the string");
 
     }
 
@@ -1262,14 +1262,14 @@ public void CollectionIDPresentDbdocBlank()
       string[] test1 = new string[] { "_id=1" };
       string[] test2 = new string[] { "_id=2" };
       var res = col.Find("$._id = 1").Execute().FetchAll();
-      Assert.AreEqual(1, res.Count, "Matching the find count");
-      Assert.AreEqual(d1.ToString(), res[0].ToString(), "Matching the string");
+      Assert.That(res.Count, Is.EqualTo(1), "Matching the find count");
+      Assert.That(res[0].ToString(), Is.EqualTo(d1.ToString()), "Matching the string");
       res = col.Find("$._id = 2").Execute().FetchAll();
-      Assert.AreEqual(1, res.Count, "Matching the find count");
-      Assert.AreEqual(d2.ToString(), res[0].ToString(), "Matching the string");
+      Assert.That(res.Count, Is.EqualTo(1), "Matching the find count");
+      Assert.That(res[0].ToString(), Is.EqualTo(d2.ToString()), "Matching the string");
       res = col.Find("$._id = 3").Execute().FetchAll();
-      Assert.AreEqual(1, res.Count, "Matching the find count");
-      Assert.AreEqual(d3.ToString(), res[0].ToString(), "Matching the string");
+      Assert.That(res.Count, Is.EqualTo(1), "Matching the find count");
+      Assert.That(res[0].ToString(), Is.EqualTo(d3.ToString()), "Matching the string");
     }
 
     /// <summary>
@@ -1344,12 +1344,12 @@ public void ExclusiveLocksAndCommit(int scenario)
         var coll2 = session2.GetSchema("test").GetCollection("test");
         session.SQL("START TRANSACTION").Execute();
         var docResult = coll.Find("_id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         docResult = coll2.Find("_id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
@@ -1359,7 +1359,7 @@ public void ExclusiveLocksAndCommit(int scenario)
 
         session.Commit();
         var result = coll2.Modify("a = 1").Set("a", 12).Execute();
-        Assert.AreEqual(1, result.AffectedItemsCount);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
       }
@@ -1390,7 +1390,7 @@ public void SharedLockAndCommit(LockMode? lockMode)
 
         session.SQL("START TRANSACTION").Execute();
         var docResult = coll.Find("_id = 1").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
@@ -1406,7 +1406,7 @@ public void SharedLockAndCommit(LockMode? lockMode)
             docResult = coll2.Find("_id = 2").Execute();
             break;
         }
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 returns immediately.
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
@@ -1419,7 +1419,7 @@ public void SharedLockAndCommit(LockMode? lockMode)
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = coll2.Modify("a = 1").Set("a", 12).Execute();
-        Assert.AreEqual(1, result.AffectedItemsCount);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
@@ -1468,7 +1468,7 @@ public void SharedAndExclusiveLockWithSkipAndNoWait(LockMode lockMode)
             docResult = coll2.Find("_id = :id").LockShared(LockContention.SkipLocked).Bind("id", 1).Execute();
             break;
         }
-        Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the document ID");
 
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
@@ -1497,7 +1497,7 @@ public void MultipleLocksWithNowaitAndSkiplock()
 
         session.SQL("START TRANSACTION").Execute();
         var docResult = coll.Find("_id = 1").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
 
@@ -1505,13 +1505,13 @@ public void MultipleLocksWithNowaitAndSkiplock()
         Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll2.Find("_id = :id").LockExclusive(LockContention.SkipLocked).LockExclusive(LockContention.NoWait).Bind("id", 1)));
 
         docResult = coll2.Find("_id = :id").LockExclusive(LockContention.SkipLocked).LockShared(LockContention.NoWait).Bind("id", 1).Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         docResult = coll2.Find("_id = :id").LockExclusive(LockContention.SkipLocked).LockShared(LockContention.SkipLocked).Bind("id", 1).Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         docResult = coll2.Find("_id = :id").LockShared(LockContention.SkipLocked).LockExclusive(LockContention.SkipLocked).Bind("id", 1).Execute();
-        Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the document ID");
 
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
@@ -1540,19 +1540,19 @@ public void LockSharedMultipleReads()
 
         session.SQL("START TRANSACTION").Execute();
         var docResult = coll.Find("_id >1").LockShared().Execute();
-        Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
 
         docResult = coll2.Find("_id < 3").LockShared(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID");
 
         docResult = coll2.Find("_id < 3").LockShared(LockContention.NoWait).Execute();
-        Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID");
 
         docResult = coll2.Find("_id < 3").LockExclusive(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
@@ -1581,16 +1581,16 @@ public void LockExclusiveMultipleReads()
 
         session.SQL("START TRANSACTION").Execute();
         var docResult = coll.Find("_id >1").LockExclusive().Execute();
-        Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
 
         docResult = coll2.Find("_id < 3").LockShared(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         docResult = coll2.Find("_id < 3").LockExclusive(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
@@ -1619,15 +1619,15 @@ public void LockSharedAndModify()
 
         session.SQL("START TRANSACTION").Execute();
         var docResult = coll.Find("_id = 1").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         docResult = coll2.Find("_id = 1").Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
         // Should allow to modify immediately since document isn't locked.
         var result = coll2.Modify("_id = 2").Set("a", 10).Execute();
-        Assert.AreEqual(1, (int)result.AffectedItemsCount, "Match being done");
+        Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Match being done");
         Assert.Throws<MySqlException>(() => ExecuteModifyStatement(coll2.Modify("_id = 1").Change("a", 10)));
 
         session.SQL("ROLLBACK").Execute();
@@ -1659,14 +1659,14 @@ public void LockSharedTwoSessions()
 
         session.SQL("START TRANSACTION").Execute();
         var docResult = coll.Find("_id = 1").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         docResult = coll2.Find("_id = 2").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         // Should return immediately due to LockShared() allows reading by other sessions.
         docResult = coll2.Find("_id = 1").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
       }
@@ -1696,20 +1696,20 @@ public void LockExclusiveFindAndLockSharedFind()
 
         session.SQL("START TRANSACTION").Execute();
         var docResult = coll.Find("_id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         docResult = coll2.Find("_id = 2").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
         // Session2 blocks due to LockExclusive() not allowing to read locked documents.
         Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll2.Find("_id = 1").LockShared()));
         // Session unlocks documents.
         session.SQL("ROLLBACK").Execute();
         docResult = coll2.Find("_id = 1").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         docResult = coll.Find("_id = 1").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         session2.SQL("ROLLBACK").Execute();
       }
 
@@ -1738,21 +1738,21 @@ public void LockSharedFindAndExclusiveLocks()
 
         session.SQL("START TRANSACTION").Execute();
         var docResult = coll.Find("_id = 1").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document IDs");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document IDs");
         docResult = coll.Find("_id = 3").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document IDs");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document IDs");
         session2.SQL("START TRANSACTION").Execute();
 
         // Should return immediately since document isn't locked.
         docResult = coll2.Find("_id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         // Should return immediately due to LockShared() allows reading by other sessions.
         docResult = coll2.Find("_id = 2").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
         // Session1 blocks due to LockExclusive() not allowing to read locked documents.
         coll2.Find("_id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll2.Find("_id = 1").LockExclusive()));
         Assert.Throws<MySqlException>(() => ExecuteModifyStatement(coll2.Modify("_id = 1").Set("a", 100)));
         // Session unlocks documents.
@@ -1785,11 +1785,11 @@ public void LockExclusiveWithRollback()
 
         session.SQL("START TRANSACTION").Execute();
         var docResult = coll.Find("_id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document IDs");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document IDs");
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately due to LockShared() allows reading by other sessions.
         docResult = coll2.Find("_id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         session.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
         Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll.Find("_id = 2").LockExclusive()));
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
@@ -1798,10 +1798,10 @@ public void LockExclusiveWithRollback()
         // Session unlocks documents.
         session2.SQL("ROLLBACK").Execute();
         docResult = coll.Find("_id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         session.SQL("ROLLBACK").Execute();
         docResult = coll2.Find("_id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
       }
 
       ExecuteSQLStatement(session.SQL("SET autocommit = 1"));
@@ -1828,18 +1828,18 @@ public void LockExclusiveWithINSelection()
         var coll2 = session2.GetSchema("test").GetCollection("test");
         session.SQL("START TRANSACTION").Execute();
         var docResult = coll.Find("_id in (1,3)").LockExclusive().Execute();
-        Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID");
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         docResult = coll2.Find("_id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         // Should return immediately due to LockShared() allows reading by other sessions.
         docResult = coll2.Find("_id = 2").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
         // Session1 blocks due to LockExclusive() not allowing to read locked documents.
         coll2.Find("_id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll2.Find("_id = 1").LockExclusive()));
         Assert.Throws<MySqlException>(() => ExecuteModifyStatement(coll2.Modify("_id = 1").Set("a", 100)));
         // Session unlocks documents.
@@ -1871,18 +1871,18 @@ public void LockSharedReadTwice()
 
         session.SQL("START TRANSACTION").Execute();
         var docResult = coll.Find("_id = 1").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         session2.SQL("START TRANSACTION").Execute();
 
         // Should return immediately since document isn't locked.
         docResult = coll2.Find("_id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         docResult = coll2.Find("_id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         docResult = coll2.Find("_id = 2").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         docResult = coll2.Find("_id = 2").LockShared().Execute();
-        Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         // Session unlocks documents.
         session2.SQL("ROLLBACK").Execute();
         session.SQL("ROLLBACK").Execute();
@@ -1899,16 +1899,16 @@ public void FindInJsonObjects()
       var col = CreateCollection("my_collection_1");
       string json = @"{ ""_id"": 0, ""title"": ""Book 0"" ,""pages"": 10,""name"": ""Jeoff Archer""}";
       Result r = col.Add(json).Execute();
-      Assert.AreEqual(1, (int)r.AffectedItemsCount, "Matching Affected Records Count");
+      Assert.That((int)r.AffectedItemsCount, Is.EqualTo(1), "Matching Affected Records Count");
       var foundDocs = col.Find("1 in (1,2,3,6)").Execute();
-      Assert.AreEqual(1, foundDocs.FetchAll().Count, "Matching Count");
+      Assert.That(foundDocs.FetchAll().Count, Is.EqualTo(1), "Matching Count");
       //var result = col.Find("0 in $._id").Fields("$.name as name, $.pages as pages, $.title as title").Execute();
       foundDocs = col.Find("'Book 0' in $.title").Execute();
-      Assert.AreEqual(1, foundDocs.FetchAll().Count, "Matching Count");
+      Assert.That(foundDocs.FetchAll().Count, Is.EqualTo(1), "Matching Count");
       foundDocs = col.Find("100 in _id").Execute();
-      Assert.AreEqual(0, foundDocs.FetchAll().Count, "Matching Count");
+      Assert.That(foundDocs.FetchAll().Count, Is.EqualTo(0), "Matching Count");
       foundDocs = col.Find("100 not in _id").Execute();
-      Assert.AreEqual(1, foundDocs.FetchAll().Count, "Matching Count");
+      Assert.That(foundDocs.FetchAll().Count, Is.EqualTo(1), "Matching Count");
 
       json = @"{ ""_id"" : 99950, ""city"" : ""KETCHIKAN"", ""loc"" : ""[ -133.18479, 55.942471 ]"", ""pop"" : 422, ""state"" : ""AK"" }";
       r = col.Add(json).Execute();
@@ -1922,7 +1922,7 @@ public void FindInJsonObjects()
       d2.SetValue("pages", 20);
       d2.SetValue("person", new { name = "Fred", age = 45 });
 
-      Assert.AreEqual(d.Equals(d2), true, "Matching");
+      Assert.That(true, Is.EqualTo(d.Equals(d2)), "Matching");
       col.Add(d).Execute();
 
 
@@ -1955,32 +1955,32 @@ public void FindInJsonObjects()
 
       var result = col.Find("0 in $._id").Fields("$._id as _id,$.name as name, $.pages as pages, $.title as title").Execute();
       var res1 = result.FetchOne();
-      Assert.AreEqual(0, res1["_id"]);
-      Assert.AreEqual("Jeoff Archer", res1["name"]);
-      Assert.AreEqual(10, res1["pages"]);
-      Assert.AreEqual("Book 0", res1["title"]);
+      Assert.That(res1["_id"], Is.EqualTo(0));
+      Assert.That(res1["name"], Is.EqualTo("Jeoff Archer"));
+      Assert.That(res1["pages"], Is.EqualTo(10));
+      Assert.That(res1["title"], Is.EqualTo("Book 0"));
 
       result = col.Find("0 in $._id OR 1 in $._id").Fields("$._id as _id,$.name as name, $.pages as pages, $.title as title").Execute();
       res1 = result.FetchOne();
-      Assert.AreEqual(0, res1["_id"]);
-      Assert.AreEqual("Jeoff Archer", res1["name"]);
-      Assert.AreEqual(10, res1["pages"]);
-      Assert.AreEqual("Book 0", res1["title"]);
+      Assert.That(res1["_id"], Is.EqualTo(0));
+      Assert.That(res1["name"], Is.EqualTo("Jeoff Archer"));
+      Assert.That(res1["pages"], Is.EqualTo(10));
+      Assert.That(res1["title"], Is.EqualTo("Book 0"));
 
       result = col.Find("0 not in $._id").Fields("$._id as _id,$.name as name, $.pages as pages, $.title as title").Execute();
       var res2 = result.FetchAll();
-      Assert.AreEqual(6, res2.Count, "Matching the find count");
+      Assert.That(res2.Count, Is.EqualTo(6), "Matching the find count");
 
       result = col.Find("'Jeoff Archer' in $.name").Execute();
       res1 = result.FetchOne();
-      Assert.AreEqual(0, res1["_id"]);
-      Assert.AreEqual("Jeoff Archer", res1["name"]);
-      Assert.AreEqual(10, res1["pages"]);
-      Assert.AreEqual("Book 0", res1["title"]);
+      Assert.That(res1["_id"], Is.EqualTo(0));
+      Assert.That(res1["name"], Is.EqualTo("Jeoff Archer"));
+      Assert.That(res1["pages"], Is.EqualTo(10));
+      Assert.That(res1["title"], Is.EqualTo("Book 0"));
 
       result = col.Find("0 not in $._id").Fields().Execute();
       res2 = result.FetchAll();
-      Assert.IsNotNull(res2[0]["_id"]);
+      Assert.That(res2[0]["_id"], Is.Not.Null);
 
       var test = new DbDoc();
       test.SetValue("_id", 1);
@@ -1995,10 +1995,10 @@ public void FindInJsonObjects()
               "'ABBBBBBBBBBBBBBXXXXXXXXXXXXXXXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYTTTTTTYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYABBBBBBBBBBBBBBXXXXXXXXXXXXXXXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYTTTTTTYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYABBBBBBBBBBBBBBXXXXXXXXXXXXXXXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYTTTTTTYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYABBBBBBBBBBBBBBXXXXXXXXXXXXXXXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYTTTTTTYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYABBBBBBBBBBBBBBXXXXXXXXXXXXXXXYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYTTTTTTYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY' in $.name")
           .Execute();
       var docs1 = foundDocs2.FetchAll();
-      Assert.AreEqual(1, docs1.Count);
+      Assert.That(docs1.Count, Is.EqualTo(1));
       foundDocs2 = coll.Find("3488888888.9 in $.age").Execute();
       docs1 = foundDocs2.FetchAll();
-      Assert.AreEqual(1, docs1.Count);
+      Assert.That(docs1.Count, Is.EqualTo(1));
     }
 
     [Test, Description("Test MySQLX plugin Collection Array or Object contains operator Scenarios-3")]
@@ -2022,17 +2022,17 @@ public void FindAndCountJsonValues()
           .Execute();
       var docs = col.Find().Execute();
       var result1 = col.Find("\"10-15-2017\" in $.misc").Execute().FetchAll().Count;
-      Assert.AreEqual(1, result1);
+      Assert.That(result1, Is.EqualTo(1));
       result1 = col.Find("\"10-15-2019\" in $.misc").Execute().FetchAll().Count;
-      Assert.AreEqual(0, result1);
+      Assert.That(result1, Is.EqualTo(0));
       var doc = docs.FetchOne();
       var result = col.Find("1 in $.age").Fields("$.name as name, $.age as age, $.misc as misc").Sort("name DESC").Execute();
-      Assert.AreEqual(3, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(3));
       var coll = CreateCollection("test");
       coll.Add(new DbDoc("{ \"a\": 1, \"b\": [ 1, \"value\" ], \"d\":\"\", \"ARR1\":[\"Field-1-Data-0\"] }")).Execute();
       result = coll.Find("JSON_TYPE($.ARR1) = 'ARRAY' AND \"Field-1-Data-0\" in $.ARR1").Execute();
       var count = result.FetchAll().Count;
-      Assert.AreEqual(1, count);
+      Assert.That(count, Is.EqualTo(1));
 
     }
 
@@ -2048,9 +2048,9 @@ public void CheckCountAfterSort()
       coll.Add("{ \"name\": [\"name1\", \"name2\", \"name3\"], \"age\": 1 , \"misc\": 1.2}").Execute();
       coll.Add("{ \"name\": {\"first\" : \"ABCDEF1\", \"middle\" : \"ABCDEF2\", \"last\" : \"ABCDEF3\"}, \"age\": 1 , \"misc\": 1.2}").Execute();
       var docs = coll.Find("4 in $.age").Execute().FetchAll().Count;
-      Assert.True(docs > 0);
+      Assert.That(docs > 0);
       var res3 = coll.Find("4 in $.age").Sort("name ASC").Execute().FetchAll();
-      Assert.AreEqual(docs, res3.Count);
+      Assert.That(res3.Count, Is.EqualTo(docs));
     }
 
     [Test, Description("Test MySQLX plugin Find with overlap Bugs")]
@@ -2067,11 +2067,11 @@ public void FindUsingOverLapsBug()
         coll.Add("{\"" + splName[i] + "\":\"data" + i + "\",\"ID\":" + i + "}").Execute();
         var docs2 = coll.Find("$.ID OVERLAPS " + i).Fields("$.`" + splName[i] + "` as col1,$.ID as Id").Execute();
         var res2 = docs2.FetchOne();
-        Assert.AreEqual(i.ToString(), res2["Id"].ToString(), "Matching the ID");
+        Assert.That(res2["Id"].ToString(), Is.EqualTo(i.ToString()), "Matching the ID");
         if (i == 30)
-          Assert.AreEqual("data" + i, "data30", "Matching the String");
+          Assert.That("data30", Is.EqualTo("data" + i), "Matching the String");
         else
-          Assert.AreEqual("data" + i, res2["col1"].ToString(), "Matching the String");
+          Assert.That(res2["col1"].ToString(), Is.EqualTo("data" + i), "Matching the String");
       }
 
       coll = CreateCollection("test");
@@ -2109,25 +2109,25 @@ public void FindUsingOverLapsBug()
 
       var docs = coll.Find("$._id OVERLAPS 1100").Fields("$_id as _id,$.F1 as f1, $.F2 as f2, $.F3 as f3").Execute();
       var res1 = docs.FetchOne();
-      Assert.AreEqual("1100", res1["_id"].ToString());
-      Assert.AreEqual("Field-1-Data-100", res1["f1"].ToString());
-      Assert.AreEqual("Field-2-Data-100", res1["f2"].ToString());
-      Assert.AreEqual("400", res1["f3"].ToString());
+      Assert.That(res1["_id"].ToString(), Is.EqualTo("1100"));
+      Assert.That(res1["f1"].ToString(), Is.EqualTo("Field-1-Data-100"));
+      Assert.That(res1["f2"].ToString(), Is.EqualTo("Field-2-Data-100"));
+      Assert.That(res1["f3"].ToString(), Is.EqualTo("400"));
       Assert.Throws<ArgumentException>(() => ExecuteFindStatement(coll.Find("$.F2 OVERLAPS #").Fields("$_id as _id,$.F1 as f1, $.F2 as f2, $.F3 as f3")));
 
       docs = coll.Find("$.F2 OVERLAPS 'ABCD'").Fields("$_id as _id,$.F1 as f1, $.F2 as f2, $.F3 as f3").Execute();
       res1 = docs.FetchOne();
-      Assert.AreEqual("1005", res1["_id"]);
-      Assert.AreEqual(123, res1["f1"]);
-      Assert.AreEqual("ABCD", res1["f2"]);
+      Assert.That(res1["_id"], Is.EqualTo("1005"));
+      Assert.That(res1["f1"], Is.EqualTo(123));
+      Assert.That(res1["f2"], Is.EqualTo("ABCD"));
       Assert.Throws<ArgumentException>(() => ExecuteFindStatement(coll.Find("$.F2 OVERLAPS [1234").Fields("$_id as _id,$.F1 as f1, $.F2 as f2, $.F3 as f3")));
       Assert.Throws<ArgumentException>(() => ExecuteFindStatement(coll.Find("$.F2 OVERLAPS S()R%^").Fields("$_id as _id,$.F1 as f1, $.F2 as f2, $.F3 as f3")));
 
       docs = coll.Find("$.F2 OVERLAPS 'S()R%^'").Fields("$_id as _id,$.F1 as f1, $.F2 as f2, $.F3 as f3").Execute();
       res1 = docs.FetchOne();
-      Assert.AreEqual("1007", res1["_id"]);
-      Assert.AreEqual(123, res1["f1"]);
-      Assert.AreEqual("S()R%^", res1["f2"]);
+      Assert.That(res1["_id"], Is.EqualTo("1007"));
+      Assert.That(res1["f1"], Is.EqualTo(123));
+      Assert.That(res1["f2"], Is.EqualTo("S()R%^"));
     }
 
     [Test, Description("Test MySQLX plugin Find with overlap and Many conditions")]
@@ -2152,7 +2152,7 @@ public void FindUsingOverLapsManyConditions()
         j++;
       }
       var docs = coll.Find(query).Execute();
-      Assert.True(docs.FetchAll().Count > 0);
+      Assert.That(docs.FetchAll().Count > 0);
     }
 
     [Test, Description("Deprecated Find Where")]
@@ -2167,11 +2167,11 @@ public void FindWhere()
                   new {  _id = 4, title = "Book 4", pages = 50 },
                   };
       var result1 = collection.Add(docs).Execute();
-      Assert.AreEqual(4, result1.AffectedItemsCount);
+      Assert.That(result1.AffectedItemsCount, Is.EqualTo(4));
 
       //Deprecated Find().Where() in 8.0.17
       var result2 = collection.Find("$._id = 1").Where("true").Execute().FetchAll();
-      Assert.AreEqual(4, result2.Count);
+      Assert.That(result2.Count, Is.EqualTo(4));
     }
 
     [Test, Description("Test MySQLX plugin Collection match count")]
@@ -2218,35 +2218,35 @@ public void CollectionFindFieldMatchingCount()
       var final = col.Add(d1, d2).Add(d3).Execute();
       var res1 = col.Find().Fields("{\"_id\":\"1\",\"books\": \"test1\" }").Fields("{\"_id\":\"2\",\"books\": \"test2\" }").Fields("{\"_id\":\"3\",\"books\": \"test3\" }").Execute().FetchAll();
       res1 = col.Find().Fields(new string[] { "_id", "books", "count" }).Execute().FetchAll();
-      Assert.AreEqual(3, res1.Count, "Matching the find count");
-      Assert.AreEqual(d1.ToString(), res1[0].ToString(), "Matching the doc string 1");
-      Assert.AreEqual(d2.ToString(), res1[1].ToString(), "Matching the doc string 2");
-      Assert.AreEqual(d3.ToString(), res1[2].ToString(), "Matching the doc string 3");
+      Assert.That(res1.Count, Is.EqualTo(3), "Matching the find count");
+      Assert.That(res1[0].ToString(), Is.EqualTo(d1.ToString()), "Matching the doc string 1");
+      Assert.That(res1[1].ToString(), Is.EqualTo(d2.ToString()), "Matching the doc string 2");
+      Assert.That(res1[2].ToString(), Is.EqualTo(d3.ToString()), "Matching the doc string 3");
       final = col.Add(new DbDoc[] { d4, d5 }).Execute();
       var res2 = col.Find().Fields("$._id as _id,$.books as books, $.count as count").Execute().FetchAll();
-      Assert.AreEqual(5, res2.Count, "Matching the find count");
-      Assert.AreEqual(d1.ToString(), res2[0].ToString(), "Matching the doc string 1");
-      Assert.AreEqual(d2.ToString(), res2[1].ToString(), "Matching the doc string 2");
-      Assert.AreEqual(d3.ToString(), res2[2].ToString(), "Matching the doc string 3");
-      Assert.AreEqual(d4.ToString(), res2[3].ToString(), "Matching the doc string 4");
-      Assert.AreEqual(d5.ToString(), res2[4].ToString(), "Matching the doc string 5");
+      Assert.That(res2.Count, Is.EqualTo(5), "Matching the find count");
+      Assert.That(res2[0].ToString(), Is.EqualTo(d1.ToString()), "Matching the doc string 1");
+      Assert.That(res2[1].ToString(), Is.EqualTo(d2.ToString()), "Matching the doc string 2");
+      Assert.That(res2[2].ToString(), Is.EqualTo(d3.ToString()), "Matching the doc string 3");
+      Assert.That(res2[3].ToString(), Is.EqualTo(d4.ToString()), "Matching the doc string 4");
+      Assert.That(res2[4].ToString(), Is.EqualTo(d5.ToString()), "Matching the doc string 5");
       final = col.Add(d6, d7).Execute();
       var res3 = col.Find().Sort("count ASC").Execute().FetchAll();
-      Assert.AreEqual(d6.ToString(), res3[0].ToString(), "Matching the doc string 7");
-      Assert.AreEqual(d1.ToString(), res3[1].ToString(), "Matching the doc string 1");
-      Assert.AreEqual(d2.ToString(), res3[2].ToString(), "Matching the doc string 2");
-      Assert.AreEqual(d3.ToString(), res3[3].ToString(), "Matching the doc string 3");
-      Assert.AreEqual(d4.ToString(), res3[4].ToString(), "Matching the doc string 4");
-      Assert.AreEqual(d5.ToString(), res3[5].ToString(), "Matching the doc string 5");
-      Assert.AreEqual(d7.ToString(), res3[6].ToString(), "Matching the doc string 6");
+      Assert.That(res3[0].ToString(), Is.EqualTo(d6.ToString()), "Matching the doc string 7");
+      Assert.That(res3[1].ToString(), Is.EqualTo(d1.ToString()), "Matching the doc string 1");
+      Assert.That(res3[2].ToString(), Is.EqualTo(d2.ToString()), "Matching the doc string 2");
+      Assert.That(res3[3].ToString(), Is.EqualTo(d3.ToString()), "Matching the doc string 3");
+      Assert.That(res3[4].ToString(), Is.EqualTo(d4.ToString()), "Matching the doc string 4");
+      Assert.That(res3[5].ToString(), Is.EqualTo(d5.ToString()), "Matching the doc string 5");
+      Assert.That(res3[6].ToString(), Is.EqualTo(d7.ToString()), "Matching the doc string 6");
       var res4 = col.Find().Sort("count DESC").Execute().FetchAll();
-      Assert.AreEqual(d7.ToString(), res4[0].ToString(), "Matching the doc string 6");
-      Assert.AreEqual(d5.ToString(), res4[1].ToString(), "Matching the doc string 1");
-      Assert.AreEqual(d4.ToString(), res4[2].ToString(), "Matching the doc string 2");
-      Assert.AreEqual(d3.ToString(), res4[3].ToString(), "Matching the doc string 3");
-      Assert.AreEqual(d2.ToString(), res4[4].ToString(), "Matching the doc string 4");
-      Assert.AreEqual(d1.ToString(), res4[5].ToString(), "Matching the doc string 5");
-      Assert.AreEqual(d6.ToString(), res4[6].ToString(), "Matching the doc string 7");
+      Assert.That(res4[0].ToString(), Is.EqualTo(d7.ToString()), "Matching the doc string 6");
+      Assert.That(res4[1].ToString(), Is.EqualTo(d5.ToString()), "Matching the doc string 1");
+      Assert.That(res4[2].ToString(), Is.EqualTo(d4.ToString()), "Matching the doc string 2");
+      Assert.That(res4[3].ToString(), Is.EqualTo(d3.ToString()), "Matching the doc string 3");
+      Assert.That(res4[4].ToString(), Is.EqualTo(d2.ToString()), "Matching the doc string 4");
+      Assert.That(res4[5].ToString(), Is.EqualTo(d1.ToString()), "Matching the doc string 5");
+      Assert.That(res4[6].ToString(), Is.EqualTo(d6.ToString()), "Matching the doc string 7");
       col.Modify("_id = 1").Unset("count").Unset("books").Execute();
       col.Modify("_id = 1").Set("count", 10).Set("books", "test1").Execute();
 
@@ -2260,21 +2260,21 @@ public void CollectionGetNameSchemaCount()
 
       Result r = col.Add(@"{ ""_id"": 1, ""foo"": 1 }").Execute();
       long count = col.Count();
-      Assert.AreEqual(count, 1, "Matching the Collection Count");
+      Assert.That(1, Is.EqualTo(count), "Matching the Collection Count");
 
       var collectionName = col.Name;
-      Assert.AreEqual(collectionName, "my_collection_123456789", "Matching the collection Name");
+      Assert.That("my_collection_123456789", Is.EqualTo(collectionName), "Matching the collection Name");
 
       var schema = col.Schema.Name;
-      Assert.AreEqual(schema, schemaName, "Matching the Schema Name");
+      Assert.That(schemaName, Is.EqualTo(schema), "Matching the Schema Name");
 
       r = col.Add(@"{ ""_id"": 2, ""foo"": 2 }").Execute();
       count = col.Count();
-      Assert.AreEqual(count, 2, "Matching the Collection Count");
+      Assert.That(2, Is.EqualTo(count), "Matching the Collection Count");
 
       r = col.Remove("_id=2").Execute();
       count = col.Count();
-      Assert.AreEqual(count, 1, "Matching the Collection Count");
+      Assert.That(1, Is.EqualTo(count), "Matching the Collection Count");
       session.Schema.DropCollection("my_collection_123456789");
     }
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BasicSelectTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BasicSelectTests.cs
index 0037b7cb0..20b6a73c0 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BasicSelectTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BasicSelectTests.cs
@@ -45,12 +45,12 @@ public void SimpleSelect()
 
       RowResult result = ExecuteSelectStatement(books.Select("name", "pages"));
       var rows = result.FetchAll();
-      Assert.True(result.Columns.Count == 2);
-      Assert.True(rows.Count == 2);
+      Assert.That(result.Columns.Count == 2);
+      Assert.That(rows.Count == 2);
 
       var result2 = session.SQL("Select* from test.books").Execute();
       var row2 = result2.FetchOne();
-      Assert.True(result2.Columns.Count == 3);
+      Assert.That(result2.Columns.Count == 3);
     }
 
     [Test]
@@ -61,7 +61,7 @@ public void SimpleSelectWithWhere()
 
       RowResult result = ExecuteSelectStatement(books.Select("name", "pages").Where("pages > 250"));
       var rows = result.FetchAll();
-      Assert.True(result.Columns.Count == 2);
+      Assert.That(result.Columns.Count == 2);
       Assert.That(rows, Has.One.Items);
     }
 
@@ -97,7 +97,7 @@ public void LockExclusiveAndSharedWithWaitingOptions(LockContention lockOption,
         RowResult r1 = ExecuteSelectStatement(t1.Select().Where("id = :id").Bind("id", 1).LockExclusive());
         var rows1 = r1.FetchAll();
         Assert.That(rows1, Has.One.Items);
-        Assert.AreEqual(1, rows1[0]["id"]);
+        Assert.That(rows1[0]["id"], Is.EqualTo(1));
 
         // second session tries to read the locked row
         using (Session s2 = MySQLX.GetSession(ConnectionString))
@@ -115,7 +115,7 @@ public void LockExclusiveAndSharedWithWaitingOptions(LockContention lockOption,
           {
             case LockContention.Default:
               // error 1205 Lock wait timeout exceeded; try restarting transaction
-              Assert.AreEqual(1205u, Assert.Throws<MySqlException>(() => ExecuteSelectStatement(stmt2).FetchAll()).Code);
+              Assert.That(Assert.Throws<MySqlException>(() => ExecuteSelectStatement(stmt2).FetchAll()).Code, Is.EqualTo(1205u));
               break;
             case LockContention.NoWait:
               // error 1205 Lock wait timeout exceeded; try restarting transaction
@@ -123,18 +123,18 @@ public void LockExclusiveAndSharedWithWaitingOptions(LockContention lockOption,
               if (session.XSession.GetServerVersion().isAtLeast(8, 0, 5))
                 // error 3572 Statement aborted because lock(s) could not be acquired immediately and NOWAIT is set
                 expectedError = 3572;
-              Assert.AreEqual(expectedError, Assert.Throws<MySqlException>(() => ExecuteSelectStatement(stmt2).FetchAll()).Code);
+              Assert.That(Assert.Throws<MySqlException>(() => ExecuteSelectStatement(stmt2).FetchAll()).Code, Is.EqualTo(expectedError));
               break;
             case LockContention.SkipLocked:
               if (!session.XSession.GetServerVersion().isAtLeast(8, 0, 5))
               {
                 // error 1205 Lock wait timeout exceeded; try restarting transaction
-                Assert.AreEqual(1205u, Assert.Throws<MySqlException>(() => ExecuteSelectStatement(stmt2).FetchAll()).Code);
+                Assert.That(Assert.Throws<MySqlException>(() => ExecuteSelectStatement(stmt2).FetchAll()).Code, Is.EqualTo(1205u));
                 break;
               }
               var rows2 = ExecuteSelectStatement(stmt2).FetchAll();
               Assert.That(rows2, Has.One.Items);
-              Assert.AreEqual(2, rows2[0]["id"]);
+              Assert.That(rows2[0]["id"], Is.EqualTo(2));
               break;
             default:
               throw new NotImplementedException(lockOption.ToString());
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
index d0d1090cf..be95bf4c2 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
@@ -61,7 +61,7 @@ public void DefaultCharSet()
 
       using (var session = MySQLX.GetSession(ConnectionString))
       {
-        Assert.AreEqual("utf8mb4", session.Settings.CharacterSet);
+        Assert.That(session.Settings.CharacterSet, Is.EqualTo("utf8mb4"));
       }
 
       using (var connection = new MySqlConnection(ConnectionStringRoot))
@@ -70,26 +70,26 @@ public void DefaultCharSet()
         MySqlCommand cmd = new MySqlCommand("SHOW VARIABLES LIKE 'character_set_connection'", connection);
         MySqlDataReader reader = cmd.ExecuteReader();
         reader.Read();
-        Assert.AreEqual("utf8mb4", reader.GetString("Value"));
+        Assert.That(reader.GetString("Value"), Is.EqualTo("utf8mb4"));
         reader.Close();
 
         cmd.CommandText = "SHOW VARIABLES LIKE 'character_set_database'";
         reader = cmd.ExecuteReader();
         reader.Read();
-        Assert.AreEqual("utf8mb4", reader.GetString("Value"));
+        Assert.That(reader.GetString("Value"), Is.EqualTo("utf8mb4"));
         reader.Close();
 
         cmd.CommandText = "SHOW VARIABLES LIKE 'character_set_server'";
         reader = cmd.ExecuteReader();
         reader.Read();
-        Assert.AreEqual("utf8mb4", reader.GetString("Value"));
+        Assert.That(reader.GetString("Value"), Is.EqualTo("utf8mb4"));
         reader.Close();
 
         cmd.CommandText = "SHOW VARIABLES LIKE 'collation_%'";
         reader = cmd.ExecuteReader();
         while (reader.Read())
         {
-          Assert.AreEqual("utf8mb4_0900_ai_ci", reader.GetString("Value"));
+          Assert.That(reader.GetString("Value"), Is.EqualTo("utf8mb4_0900_ai_ci"));
         }
         reader.Close();
       }
@@ -105,7 +105,7 @@ public void ValidateCollationMapList()
         connection.Open();
         var command = new MySqlCommand("SELECT id, collation_name FROM INFORMATION_SCHEMA.COLLATIONS", connection);
         var reader = command.ExecuteReader();
-        Assert.True(reader.HasRows);
+        Assert.That(reader.HasRows);
 
         while (reader.Read())
         {
@@ -115,7 +115,7 @@ public void ValidateCollationMapList()
           if (!_serverVersion.isAtLeast(8, 0, 30) && collationName.Contains("utf8_"))
             collationName = collationName.Replace("utf8_", "utf8mb3_");
 
-          Assert.AreEqual(CollationMap.GetCollationName(id), collationName);
+          Assert.That(collationName, Is.EqualTo(CollationMap.GetCollationName(id)));
         }
       }
     }
@@ -132,12 +132,12 @@ public void Utf8mb4CharsetExists()
       {
         // Search utf8mb4 database.
         var result = ExecuteSQLStatement(session.SQL("SHOW COLLATION WHERE id = 255"));
-        Assert.True(result.HasData);
+        Assert.That(result.HasData);
         var data = result.FetchOne();
-        Assert.AreEqual("utf8mb4_0900_ai_ci", data.GetString("Collation"));
+        Assert.That(data.GetString("Collation"), Is.EqualTo("utf8mb4_0900_ai_ci"));
 
         // Check in CollationMap.
-        Assert.AreEqual("utf8mb4_0900_ai_ci", CollationMap.GetCollationName(255));
+        Assert.That(CollationMap.GetCollationName(255), Is.EqualTo("utf8mb4_0900_ai_ci"));
       }
     }
 
@@ -150,25 +150,25 @@ public void IllegalMixCollations()
       using (Session session = MySQLX.GetSession(ConnectionString))
       {
         var result = ExecuteSQLStatement(session.SQL("SHOW COLLATION WHERE `Default` ='Yes';"));
-        Assert.True(result.HasData);
+        Assert.That(result.HasData);
       }
 
       using (Session session = MySQLX.GetSession(ConnectionString + ";charset=latin1"))
       {
         var result = ExecuteSQLStatement(session.SQL("SHOW COLLATION WHERE `Default` ='Yes';"));
-        Assert.True(result.HasData);
+        Assert.That(result.HasData);
       }
 
       using (Session session = MySQLX.GetSession(ConnectionString + ";charset=utf8mb4"))
       {
         var result = ExecuteSQLStatement(session.SQL("SHOW COLLATION WHERE `Default` ='Yes';"));
-        Assert.True(result.HasData);
+        Assert.That(result.HasData);
       }
 
       using (Session session = MySQLX.GetSession(ConnectionString + ";charset=utf-8"))
       {
         var result = ExecuteSQLStatement(session.SQL("SHOW COLLATION WHERE `Default` ='Yes';"));
-        Assert.True(result.HasData);
+        Assert.That(result.HasData);
       }
     }
 
@@ -196,29 +196,29 @@ public void NamesAreReturnedAsStrings()
         ExecuteSQL("SELECT * FROM view2");
 
         List<Table> tables = test.GetTables();
-        Assert.AreEqual(4, tables.Count);
-        Assert.AreEqual(2, tables.FindAll(i => !i.IsView).Count);
-        Assert.AreEqual(2, tables.FindAll(i => i.IsView).Count);
+        Assert.That(tables.Count, Is.EqualTo(4));
+        Assert.That(tables.FindAll(i => !i.IsView).Count, Is.EqualTo(2));
+        Assert.That(tables.FindAll(i => i.IsView).Count, Is.EqualTo(2));
         ExecuteSelectStatement(tables[0].Select());
         ExecuteSelectStatement(tables[1].Select());
         ExecuteSelectStatement(tables[2].Select());
         ExecuteSelectStatement(tables[3].Select());
-        Assert.AreEqual("test1", tables[0].Name);
-        Assert.AreEqual("test2", tables[1].Name);
-        Assert.AreEqual("view1", tables[2].Name);
-        Assert.AreEqual("view2", tables[3].Name);
+        Assert.That(tables[0].Name, Is.EqualTo("test1"));
+        Assert.That(tables[1].Name, Is.EqualTo("test2"));
+        Assert.That(tables[2].Name, Is.EqualTo("view1"));
+        Assert.That(tables[3].Name, Is.EqualTo("view2"));
 
         Table table = test.GetTable("test2");
-        Assert.AreEqual("test2", table.Name);
+        Assert.That(table.Name, Is.EqualTo("test2"));
 
         Collection c = test.CreateCollection("coll");
 
         List<Collection> collections = test.GetCollections();
         Assert.That(collections, Has.One.Items);
-        Assert.AreEqual("coll", collections[0].Name);
+        Assert.That(collections[0].Name, Is.EqualTo("coll"));
 
         Collection collection = test.GetCollection("coll");
-        Assert.AreEqual("coll", collection.Name);
+        Assert.That(collection.Name, Is.EqualTo("coll"));
       }
     }
 
@@ -288,39 +288,39 @@ public void ColumnDefaultDatatypes()
       for (int i = 0; i < columns.Length; i++)
       {
         var tableType = result.Columns[i].Type;
-        Assert.AreEqual(columnTypeMatch[i], tableType.ToString(), "Matching the table Type");
+        Assert.That(tableType.ToString(), Is.EqualTo(columnTypeMatch[i]), "Matching the table Type");
         string tableLabel = result.Columns[i].TableLabel;
-        Assert.AreEqual("address", tableLabel, "Matching the table label");
+        Assert.That(tableLabel, Is.EqualTo("address"), "Matching the table label");
         string columnName = result.Columns[i].ColumnName;
-        Assert.AreEqual(columns[i].ToString(), columnName, "Matching the Column Name");
+        Assert.That(columnName, Is.EqualTo(columns[i].ToString()), "Matching the Column Name");
         string columnLabel = result.Columns[i].ColumnLabel;
-        Assert.AreEqual(columns[i].ToString(), columnLabel, "Matching the Column Label");
+        Assert.That(columnLabel, Is.EqualTo(columns[i].ToString()), "Matching the Column Label");
         uint columnLength = result.Columns[i].Length;
-        Assert.AreEqual(columnLength, columnLength, "Matching the Column Length");
+        Assert.That(columnLength, Is.EqualTo(columnLength), "Matching the Column Length");
         var columnType = result.Columns[i].Type;
-        Assert.AreEqual(columnTypeMatch[i], columnType.ToString(), "Matching the Column Type");
+        Assert.That(columnType.ToString(), Is.EqualTo(columnTypeMatch[i]), "Matching the Column Type");
         var columnFD = result.Columns[i].FractionalDigits;
-        Assert.AreEqual(FDLength[i], columnFD, "Matching the Column FD");
+        Assert.That(columnFD, Is.EqualTo(FDLength[i]), "Matching the Column FD");
         var columnIsSigned = result.Columns[i].IsNumberSigned;
-        Assert.AreEqual(columnIsSignedMatch[i], columnIsSigned.ToString(), "Matching whether column is signed or not");
+        Assert.That(columnIsSigned.ToString(), Is.EqualTo(columnIsSignedMatch[i]), "Matching whether column is signed or not");
         string columnCollation = result.Columns[i].CollationName;
         if (i == 10 || i == 11 || i == 12 || i == 13 || i == 14 || i == 20 || i == 21)
-          Assert.AreEqual(columnCollation, columnCollation, "Matching the Collation Name for default characters");
+          Assert.That(columnCollation, Is.EqualTo(columnCollation), "Matching the Collation Name for default characters");
         else if (i == 15 || i == 16 || i == 17 || i == 18 || i == 19)
-          Assert.AreEqual("binary", columnCollation, "Matching the Collation Name for default characters");
+          Assert.That(columnCollation, Is.EqualTo("binary"), "Matching the Collation Name for default characters");
         else
-          Assert.AreEqual(null, columnCollation, "Matching the Collation Name as null for data types other than characters");
+          Assert.That(columnCollation, Is.EqualTo(null), "Matching the Collation Name as null for data types other than characters");
         string columnCharacterSet = result.Columns[i].CharacterSetName;
         if (i == 10 || i == 11 || i == 12 || i == 13 || i == 14 || i == 20 || i == 21)
-          Assert.AreEqual(columnCharacterSet, columnCharacterSet, "Matching the CharacterSet Name for default characters");
+          Assert.That(columnCharacterSet, Is.EqualTo(columnCharacterSet), "Matching the CharacterSet Name for default characters");
         else if (i == 15 || i == 16 || i == 17 || i == 18 || i == 19)
-          Assert.AreEqual("binary", columnCharacterSet, "Matching the Collation Name for default characters");
+          Assert.That(columnCharacterSet, Is.EqualTo("binary"), "Matching the Collation Name for default characters");
         else
-          Assert.AreEqual(null, columnCharacterSet, "Matching the Collation Name as null for data types other than characters");
+          Assert.That(columnCharacterSet, Is.EqualTo(null), "Matching the Collation Name as null for data types other than characters");
         var columnIsPadded = result.Columns[i].IsPadded;
-        Assert.AreEqual(columnIsPaddedMatch[i], columnIsPadded.ToString(), "Matching whether column is padded or not");
+        Assert.That(columnIsPadded.ToString(), Is.EqualTo(columnIsPaddedMatch[i]), "Matching whether column is padded or not");
         var columnClrType = result.Columns[i].ClrType;
-        Assert.AreEqual(clrTypeMatch[i], columnClrType.ToString(), "Matching whether column CLR Type");
+        Assert.That(columnClrType.ToString(), Is.EqualTo(clrTypeMatch[i]), "Matching whether column CLR Type");
       }
     }
 
@@ -388,37 +388,37 @@ public void ColumnCustomDatatypes()
       for (int i = 0; i < columns.Length; i++)
       {
         string tableLabel = result.Columns[i].TableLabel;
-        Assert.AreEqual("address", tableLabel, "Matching the table label");
+        Assert.That(tableLabel, Is.EqualTo("address"), "Matching the table label");
         string columnName = result.Columns[i].ColumnName;
-        Assert.AreEqual(columns[i].ToString(), columnName, "Matching the Column Name");
+        Assert.That(columnName, Is.EqualTo(columns[i].ToString()), "Matching the Column Name");
         string columnLabel = result.Columns[i].ColumnLabel;
-        Assert.AreEqual(columns[i].ToString(), columnLabel, "Matching the Column Label");
+        Assert.That(columnLabel, Is.EqualTo(columns[i].ToString()), "Matching the Column Label");
         uint columnLength = result.Columns[i].Length;
-        Assert.AreEqual(Length[i], columnLength, "Matching the Column Length");
+        Assert.That(columnLength, Is.EqualTo(Length[i]), "Matching the Column Length");
         var columnType = result.Columns[i].Type;
-        Assert.AreEqual(columnTypeMatch[i], columnType.ToString(), "Matching the Column Type");
+        Assert.That(columnType.ToString(), Is.EqualTo(columnTypeMatch[i]), "Matching the Column Type");
         var columnFD = result.Columns[i].FractionalDigits;
-        Assert.AreEqual(FDLength[i], columnFD, "Matching the Column FD");
+        Assert.That(columnFD, Is.EqualTo(FDLength[i]), "Matching the Column FD");
         var columnIsSigned = result.Columns[i].IsNumberSigned;
-        Assert.AreEqual(columnIsSignedMatch[i], columnIsSigned.ToString(), "Matching whether column is signed or not");
+        Assert.That(columnIsSigned.ToString(), Is.EqualTo(columnIsSignedMatch[i]), "Matching whether column is signed or not");
         string columnCollation = result.Columns[i].CollationName;
         if (i == 10 || i == 11 || i == 12 || i == 13 || i == 14 || i == 20 || i == 21)
-          Assert.AreEqual(columnCollation, columnCollation, "Matching the Collation Name for default characters");
+          Assert.That(columnCollation, Is.EqualTo(columnCollation), "Matching the Collation Name for default characters");
         else if (i == 15 || i == 16 || i == 17 || i == 18 || i == 19)
-          Assert.AreEqual("binary", columnCollation, "Matching the Collation Name for default characters");
+          Assert.That(columnCollation, Is.EqualTo("binary"), "Matching the Collation Name for default characters");
         else
-          Assert.AreEqual(null, columnCollation, "Matching the Collation Name as null for data types other than characters");
+          Assert.That(columnCollation, Is.EqualTo(null), "Matching the Collation Name as null for data types other than characters");
         string columnCharacterSet = result.Columns[i].CharacterSetName;
         if (i == 10 || i == 11 || i == 12 || i == 13 || i == 14 || i == 20 || i == 21)
-          StringAssert.AreEqualIgnoringCase(defaultCharset, columnCharacterSet, "Matching the CharacterSet Name for default characters");
+          Assert.That(columnCharacterSet, Is.EqualTo(defaultCharset).IgnoreCase, "Matching the CharacterSet Name for default characters");
         else if (i == 15 || i == 16 || i == 17 || i == 18 || i == 19)
-          Assert.AreEqual("binary", columnCharacterSet, "Matching the Collation Name for default characters");
+          Assert.That(columnCharacterSet, Is.EqualTo("binary"), "Matching the Collation Name for default characters");
         else
-          Assert.AreEqual(null, columnCharacterSet, "Matching the Collation Name as null for data types other than characters");
+          Assert.That(columnCharacterSet, Is.EqualTo(null), "Matching the Collation Name as null for data types other than characters");
         var columnIsPadded = result.Columns[i].IsPadded;
-        Assert.AreEqual(columnIsPaddedMatch[i], columnIsPadded.ToString(), "Matching whether column is padded or not");
+        Assert.That(columnIsPadded.ToString(), Is.EqualTo(columnIsPaddedMatch[i]), "Matching whether column is padded or not");
         var columnClrType = result.Columns[i].ClrType;
-        Assert.AreEqual(clrTypeMatch[i], columnClrType.ToString(), "Matching whether column CLR Type");
+        Assert.That(columnClrType.ToString(), Is.EqualTo(clrTypeMatch[i]), "Matching whether column CLR Type");
       }
       session.SQL($"drop table if exists address").Execute();
     }
@@ -481,73 +481,73 @@ public void ColumnJoin()
       for (int i = 0; i < columns1.Length; i++)
       {
         string tableName = result1.Columns[i].TableName;
-        Assert.AreEqual("result1", tableName, "Matching the table name");
+        Assert.That(tableName, Is.EqualTo("result1"), "Matching the table name");
         string tableLabel = result1.Columns[i].TableLabel;
-        Assert.AreEqual("result1", tableLabel, "Matching the table label");
+        Assert.That(tableLabel, Is.EqualTo("result1"), "Matching the table label");
         string columnName = result1.Columns[i].ColumnName;
-        Assert.AreEqual(columns1[i].ToString(), columnName, "Matching the Column Name");
+        Assert.That(columnName, Is.EqualTo(columns1[i].ToString()), "Matching the Column Name");
         string columnLabel = result1.Columns[i].ColumnLabel;
-        Assert.AreEqual(columns1[i].ToString(), columnLabel, "Matching the Column Label");
+        Assert.That(columnLabel, Is.EqualTo(columns1[i].ToString()), "Matching the Column Label");
         uint columnLength = result1.Columns[i].Length;
-        Assert.AreEqual(Length1[i], Length1[i], "Matching the Column Length");
+        Assert.That(Length1[i], Is.EqualTo(Length1[i]), "Matching the Column Length");
         var columnType = result1.Columns[i].Type;
-        Assert.AreEqual(columnTypeMatch1[i], columnType.ToString(), "Matching the Column Type");
+        Assert.That(columnType.ToString(), Is.EqualTo(columnTypeMatch1[i]), "Matching the Column Type");
         var columnFD = result1.Columns[i].FractionalDigits;
-        Assert.AreEqual(FDLength1[i], columnFD, "Matching the Column FD");
+        Assert.That(columnFD, Is.EqualTo(FDLength1[i]), "Matching the Column FD");
         var columnIsSigned = result1.Columns[i].IsNumberSigned;
-        Assert.AreEqual(columnIsSignedMatch1[i], columnIsSigned.ToString(), "Matching whether column is signed or not");
+        Assert.That(columnIsSigned.ToString(), Is.EqualTo(columnIsSignedMatch1[i]), "Matching whether column is signed or not");
         string columnCollation = result1.Columns[i].CollationName;
         if (i == 2 || i == 5)
         {
-          StringAssert.Contains(defaultCharset, columnCollation, "Matching the Collation Name for default characters");
+          Assert.That(columnCollation, Does.Contain(defaultCharset), "Matching the Collation Name for default characters");
         }
         else
         {
-          Assert.AreEqual(null, columnCollation, "Matching the Collation Name as null for data types other than characters");
+          Assert.That(columnCollation, Is.EqualTo(null), "Matching the Collation Name as null for data types other than characters");
         }
         string columnCharacterSet = result1.Columns[i].CharacterSetName;
         if (i == 2 || i == 5)
-          StringAssert.AreEqualIgnoringCase(defaultCharset, columnCharacterSet, "Matching the CharacterSet Name for default characters");
+          Assert.That(columnCharacterSet, Is.EqualTo(defaultCharset).IgnoreCase, "Matching the CharacterSet Name for default characters");
         else
-          Assert.AreEqual(null, columnCharacterSet, "Matching the Collation Name as null for data types other than characters");
+          Assert.That(columnCharacterSet, Is.EqualTo(null), "Matching the Collation Name as null for data types other than characters");
         var columnIsPadded = result1.Columns[i].IsPadded;
-        Assert.AreEqual(columnIsPaddedMatch1[i], columnIsPadded.ToString(), "Matching whether column is padded or not");
+        Assert.That(columnIsPadded.ToString(), Is.EqualTo(columnIsPaddedMatch1[i]), "Matching whether column is padded or not");
         var columnClrType = result1.Columns[i].ClrType;
-        Assert.AreEqual(clrTypeMatch1[i], columnClrType.ToString(), "Matching whether column CLR Type");
+        Assert.That(columnClrType.ToString(), Is.EqualTo(clrTypeMatch1[i]), "Matching whether column CLR Type");
       }
 
       for (int i = 0; i < columns2.Length; i++)
       {
         string tableName = result2.Columns[i].TableName;
-        Assert.AreEqual("result2", tableName, "Matching the table name");
+        Assert.That(tableName, Is.EqualTo("result2"), "Matching the table name");
         string tableLabel = result2.Columns[i].TableLabel;
-        Assert.AreEqual("result2", tableLabel, "Matching the table label");
+        Assert.That(tableLabel, Is.EqualTo("result2"), "Matching the table label");
         string columnName = result2.Columns[i].ColumnName;
-        Assert.AreEqual(columns2[i].ToString(), columnName, "Matching the Column Name");
+        Assert.That(columnName, Is.EqualTo(columns2[i].ToString()), "Matching the Column Name");
         string columnLabel = result2.Columns[i].ColumnLabel;
-        Assert.AreEqual(columns2[i].ToString(), columnLabel, "Matching the Column Label");
+        Assert.That(columnLabel, Is.EqualTo(columns2[i].ToString()), "Matching the Column Label");
         uint columnLength = result2.Columns[i].Length;
-        Assert.AreEqual(Length2[i], columnLength, "Matching the Column Length");
+        Assert.That(columnLength, Is.EqualTo(Length2[i]), "Matching the Column Length");
         var columnType = result2.Columns[i].Type;
-        Assert.AreEqual(columnTypeMatch2[i], columnType.ToString(), "Matching the Column Type");
+        Assert.That(columnType.ToString(), Is.EqualTo(columnTypeMatch2[i]), "Matching the Column Type");
         var columnFD = result2.Columns[i].FractionalDigits;
-        Assert.AreEqual(FDLength2[i], columnFD, "Matching the Column FD");
+        Assert.That(columnFD, Is.EqualTo(FDLength2[i]), "Matching the Column FD");
         var columnIsSigned = result2.Columns[i].IsNumberSigned;
-        Assert.AreEqual(columnIsSignedMatch2[i], columnIsSigned.ToString(), "Matching whether column is signed or not");
+        Assert.That(columnIsSigned.ToString(), Is.EqualTo(columnIsSignedMatch2[i]), "Matching whether column is signed or not");
         string columnCollation = result2.Columns[i].CollationName;
         if (i == 2)
-          StringAssert.Contains(defaultCharset, columnCollation, "Matching the Collation Name for default characters");
+          Assert.That(columnCollation, Does.Contain(defaultCharset), "Matching the Collation Name for default characters");
         else
-          Assert.AreEqual(null, columnCollation, "Matching the Collation Name as null for data types other than characters");
+          Assert.That(columnCollation, Is.EqualTo(null), "Matching the Collation Name as null for data types other than characters");
         string columnCharacterSet = result2.Columns[i].CharacterSetName;
         if (i == 2)
-          StringAssert.AreEqualIgnoringCase(defaultCharset, columnCharacterSet, "Matching the CharacterSet Name for default characters");
+          Assert.That(columnCharacterSet, Is.EqualTo(defaultCharset).IgnoreCase, "Matching the CharacterSet Name for default characters");
         else
-          Assert.AreEqual(null, columnCharacterSet, "Matching the Collation Name as null for data types other than characters");
+          Assert.That(columnCharacterSet, Is.EqualTo(null), "Matching the Collation Name as null for data types other than characters");
         var columnIsPadded = result2.Columns[i].IsPadded;
-        Assert.AreEqual(columnIsPaddedMatch2[i], columnIsPadded.ToString(), "Matching whether column is padded or not");
+        Assert.That(columnIsPadded.ToString(), Is.EqualTo(columnIsPaddedMatch2[i]), "Matching whether column is padded or not");
         var columnClrType = result2.Columns[i].ClrType;
-        Assert.AreEqual(clrTypeMatch2[i], columnClrType.ToString(), "Matching whether column CLR Type");
+        Assert.That(columnClrType.ToString(), Is.EqualTo(clrTypeMatch2[i]), "Matching whether column CLR Type");
       }
 
       session.SQL("DROP TABLE if exists test").Execute();
@@ -555,95 +555,95 @@ public void ColumnJoin()
       session.SQL("INSERT INTO test VALUES('Bob')").Execute();
       result2 = session.GetSchema(schemaName).GetTable("test").Select("1 + 1 as a", "b").Execute();
       var rows = result2.FetchAll();
-      Assert.AreEqual(2, result2.Columns.Count, "Matching Column Count");
-
-      Assert.AreEqual(null, result2.Columns[0].SchemaName, "Matching Column Schema Name");
-      Assert.AreEqual(null, result2.Columns[0].TableName, "Matching Column Table Name");
-      Assert.AreEqual(null, result2.Columns[0].TableLabel, "Matching Column Table Label");
-      Assert.AreEqual(null, result2.Columns[0].ColumnName, "Matching Column Name");
-      Assert.AreEqual("a", result2.Columns[0].ColumnLabel, "Matching Column Label");
-      Assert.AreEqual("Tinyint", result2.Columns[0].Type.ToString(), "Matching Column Type");
-      Assert.AreEqual(3u, result2.Columns[0].Length, "Matching Column Length");
-      Assert.AreEqual(0u, result2.Columns[0].FractionalDigits, "Matching Column FD");
-      Assert.AreEqual(true, result2.Columns[0].IsNumberSigned, "Matching Column Is Signed");
-      Assert.AreEqual(null, result2.Columns[0].CharacterSetName, "Matching Character Set Name");
-      Assert.AreEqual(null, result2.Columns[0].CollationName, "Matching Collation Name");
-      Assert.AreEqual(false, result2.Columns[0].IsPadded, "Matching Column Padded");
-
-      Assert.AreEqual(schemaName, result2.Columns[1].SchemaName, "Matching Column Schema Name");
-      Assert.AreEqual("test", result2.Columns[1].TableName, "Matching Column Table Name");
-      Assert.AreEqual("test", result2.Columns[1].TableLabel, "Matching Column Table Label");
-      Assert.AreEqual("b", result2.Columns[1].ColumnName, "Matching Column Name");
-      Assert.AreEqual("b", result2.Columns[1].ColumnLabel, "Matching Column Label");
-      Assert.AreEqual("String", result2.Columns[1].Type.ToString(), "Matching Column Type");
-      Assert.AreEqual(1020u, result2.Columns[1].Length, "Matching Column Length");
-      Assert.AreEqual(0u, result2.Columns[1].FractionalDigits, "Matching Column FD");
-      Assert.AreEqual(false, result2.Columns[1].IsNumberSigned, "Matching Column Is Signed");
-      Assert.AreEqual(defaultCharset, result2.Columns[1].CharacterSetName, "Matching Character Set Name");
-      StringAssert.Contains(defaultCharset, result2.Columns[1].CollationName, "Matching Collation Name");
-      Assert.AreEqual(false, result2.Columns[1].IsPadded, "Matching Column Padded");
+      Assert.That(result2.Columns.Count, Is.EqualTo(2), "Matching Column Count");
+
+      Assert.That(result2.Columns[0].SchemaName, Is.EqualTo(null), "Matching Column Schema Name");
+      Assert.That(result2.Columns[0].TableName, Is.EqualTo(null), "Matching Column Table Name");
+      Assert.That(result2.Columns[0].TableLabel, Is.EqualTo(null), "Matching Column Table Label");
+      Assert.That(result2.Columns[0].ColumnName, Is.EqualTo(null), "Matching Column Name");
+      Assert.That(result2.Columns[0].ColumnLabel, Is.EqualTo("a"), "Matching Column Label");
+      Assert.That(result2.Columns[0].Type.ToString(), Is.EqualTo("Tinyint"), "Matching Column Type");
+      Assert.That(result2.Columns[0].Length, Is.EqualTo(3u), "Matching Column Length");
+      Assert.That(result2.Columns[0].FractionalDigits, Is.EqualTo(0u), "Matching Column FD");
+      Assert.That(result2.Columns[0].IsNumberSigned, Is.EqualTo(true), "Matching Column Is Signed");
+      Assert.That(result2.Columns[0].CharacterSetName, Is.EqualTo(null), "Matching Character Set Name");
+      Assert.That(result2.Columns[0].CollationName, Is.EqualTo(null), "Matching Collation Name");
+      Assert.That(result2.Columns[0].IsPadded, Is.EqualTo(false), "Matching Column Padded");
+
+      Assert.That(result2.Columns[1].SchemaName, Is.EqualTo(schemaName), "Matching Column Schema Name");
+      Assert.That(result2.Columns[1].TableName, Is.EqualTo("test"), "Matching Column Table Name");
+      Assert.That(result2.Columns[1].TableLabel, Is.EqualTo("test"), "Matching Column Table Label");
+      Assert.That(result2.Columns[1].ColumnName, Is.EqualTo("b"), "Matching Column Name");
+      Assert.That(result2.Columns[1].ColumnLabel, Is.EqualTo("b"), "Matching Column Label");
+      Assert.That(result2.Columns[1].Type.ToString(), Is.EqualTo("String"), "Matching Column Type");
+      Assert.That(result2.Columns[1].Length, Is.EqualTo(1020u), "Matching Column Length");
+      Assert.That(result2.Columns[1].FractionalDigits, Is.EqualTo(0u), "Matching Column FD");
+      Assert.That(result2.Columns[1].IsNumberSigned, Is.EqualTo(false), "Matching Column Is Signed");
+      Assert.That(result2.Columns[1].CharacterSetName, Is.EqualTo(defaultCharset), "Matching Character Set Name");
+      Assert.That(result2.Columns[1].CollationName, Does.Contain(defaultCharset), "Matching Collation Name");
+      Assert.That(result2.Columns[1].IsPadded, Is.EqualTo(false), "Matching Column Padded");
 
       session.SQL("create table test1(c1 int,c2 double GENERATED ALWAYS AS (c1*101/102) Stored COMMENT 'First Gen Col',c3 Json GENERATED ALWAYS AS (concat('{\"F1\":',c1,'}')) VIRTUAL COMMENT 'Second Gen /**/Col', c4 bigint GENERATED ALWAYS as (c1*10000) VIRTUAL UNIQUE KEY Comment '3rd Col' NOT NULL)").Execute();
       session.SQL("insert into test1(c1) values(1000)").Execute();
       result2 = session.GetSchema(schemaName).GetTable("test1").Select("c1").Execute();
 
-      Assert.AreEqual(schemaName, result2.Columns[0].SchemaName, "Matching Column Schema Name");
-      Assert.AreEqual("test1", result2.Columns[0].TableName, "Matching Column Table Name");
-      Assert.AreEqual("test1", result2.Columns[0].TableLabel, "Matching Column Table Label");
-      Assert.AreEqual("c1", result2.Columns[0].ColumnName, "Matching Column Name");
-      Assert.AreEqual("c1", result2.Columns[0].ColumnLabel, "Matching Column Label");
-      Assert.AreEqual("Int", result2.Columns[0].Type.ToString(), "Matching Column Type");
-      Assert.AreEqual(11, result2.Columns[0].Length, "Matching Column Length");
-      Assert.AreEqual(0u, result2.Columns[0].FractionalDigits, "Matching Column FD");
-      Assert.AreEqual(true, result2.Columns[0].IsNumberSigned, "Matching Column Is Signed");
-      Assert.AreEqual(null, result2.Columns[0].CharacterSetName, "Matching Character Set Name");
-      Assert.AreEqual(null, result2.Columns[0].CollationName, "Matching Collation Name");
-      Assert.AreEqual(false, result2.Columns[0].IsPadded, "Matching Column Padded");
+      Assert.That(result2.Columns[0].SchemaName, Is.EqualTo(schemaName), "Matching Column Schema Name");
+      Assert.That(result2.Columns[0].TableName, Is.EqualTo("test1"), "Matching Column Table Name");
+      Assert.That(result2.Columns[0].TableLabel, Is.EqualTo("test1"), "Matching Column Table Label");
+      Assert.That(result2.Columns[0].ColumnName, Is.EqualTo("c1"), "Matching Column Name");
+      Assert.That(result2.Columns[0].ColumnLabel, Is.EqualTo("c1"), "Matching Column Label");
+      Assert.That(result2.Columns[0].Type.ToString(), Is.EqualTo("Int"), "Matching Column Type");
+      Assert.That(result2.Columns[0].Length, Is.EqualTo(11), "Matching Column Length");
+      Assert.That(result2.Columns[0].FractionalDigits, Is.EqualTo(0u), "Matching Column FD");
+      Assert.That(result2.Columns[0].IsNumberSigned, Is.EqualTo(true), "Matching Column Is Signed");
+      Assert.That(result2.Columns[0].CharacterSetName, Is.EqualTo(null), "Matching Character Set Name");
+      Assert.That(result2.Columns[0].CollationName, Is.EqualTo(null), "Matching Collation Name");
+      Assert.That(result2.Columns[0].IsPadded, Is.EqualTo(false), "Matching Column Padded");
 
       result2 = session.GetSchema(schemaName).GetTable("test1").Select("c2").Execute();
 
-      Assert.AreEqual(schemaName, result2.Columns[0].SchemaName, "Matching Column Schema Name");
-      Assert.AreEqual("test1", result2.Columns[0].TableName, "Matching Column Table Name");
-      Assert.AreEqual("test1", result2.Columns[0].TableLabel, "Matching Column Table Label");
-      Assert.AreEqual("c2", result2.Columns[0].ColumnName, "Matching Column Name");
-      Assert.AreEqual("c2", result2.Columns[0].ColumnLabel, "Matching Column Label");
-      Assert.AreEqual("Double", result2.Columns[0].Type.ToString(), "Matching Column Type");
-      Assert.AreEqual(22, result2.Columns[0].Length, "Matching Column Length");
-      Assert.AreEqual(31, result2.Columns[0].FractionalDigits, "Matching Column FD");
-      Assert.AreEqual(false, result2.Columns[0].IsNumberSigned, "Matching Column Is Signed");
-      Assert.AreEqual(null, result2.Columns[0].CharacterSetName, "Matching Character Set Name");
-      Assert.AreEqual(null, result2.Columns[0].CollationName, "Matching Collation Name");
-      Assert.AreEqual(false, result2.Columns[0].IsPadded, "Matching Column Padded");
+      Assert.That(result2.Columns[0].SchemaName, Is.EqualTo(schemaName), "Matching Column Schema Name");
+      Assert.That(result2.Columns[0].TableName, Is.EqualTo("test1"), "Matching Column Table Name");
+      Assert.That(result2.Columns[0].TableLabel, Is.EqualTo("test1"), "Matching Column Table Label");
+      Assert.That(result2.Columns[0].ColumnName, Is.EqualTo("c2"), "Matching Column Name");
+      Assert.That(result2.Columns[0].ColumnLabel, Is.EqualTo("c2"), "Matching Column Label");
+      Assert.That(result2.Columns[0].Type.ToString(), Is.EqualTo("Double"), "Matching Column Type");
+      Assert.That(result2.Columns[0].Length, Is.EqualTo(22), "Matching Column Length");
+      Assert.That(result2.Columns[0].FractionalDigits, Is.EqualTo(31), "Matching Column FD");
+      Assert.That(result2.Columns[0].IsNumberSigned, Is.EqualTo(false), "Matching Column Is Signed");
+      Assert.That(result2.Columns[0].CharacterSetName, Is.EqualTo(null), "Matching Character Set Name");
+      Assert.That(result2.Columns[0].CollationName, Is.EqualTo(null), "Matching Collation Name");
+      Assert.That(result2.Columns[0].IsPadded, Is.EqualTo(false), "Matching Column Padded");
 
       result2 = session.GetSchema(schemaName).GetTable("test1").Select("c3").Execute();
 
-      Assert.AreEqual(schemaName, result2.Columns[0].SchemaName, "Matching Column Schema Name");
-      Assert.AreEqual("test1", result2.Columns[0].TableName, "Matching Column Table Name");
-      Assert.AreEqual("test1", result2.Columns[0].TableLabel, "Matching Column Table Label");
-      Assert.AreEqual("c3", result2.Columns[0].ColumnName, "Matching Column Name");
-      Assert.AreEqual("c3", result2.Columns[0].ColumnLabel, "Matching Column Label");
-      Assert.AreEqual("Json", result2.Columns[0].Type.ToString(), "Matching Column Type");
-      Assert.AreEqual(4294967295, result2.Columns[0].Length, "Matching Column Length");
-      Assert.AreEqual(0u, result2.Columns[0].FractionalDigits, "Matching Column FD");
-      Assert.AreEqual(false, result2.Columns[0].IsNumberSigned, "Matching Column Is Signed");
-      Assert.AreEqual("binary", result2.Columns[0].CharacterSetName, "Matching Character Set Name");
-      Assert.AreEqual("binary", result2.Columns[0].CollationName, "Matching Collation Name");
-      Assert.AreEqual(false, result2.Columns[0].IsPadded, "Matching Column Padded");
+      Assert.That(result2.Columns[0].SchemaName, Is.EqualTo(schemaName), "Matching Column Schema Name");
+      Assert.That(result2.Columns[0].TableName, Is.EqualTo("test1"), "Matching Column Table Name");
+      Assert.That(result2.Columns[0].TableLabel, Is.EqualTo("test1"), "Matching Column Table Label");
+      Assert.That(result2.Columns[0].ColumnName, Is.EqualTo("c3"), "Matching Column Name");
+      Assert.That(result2.Columns[0].ColumnLabel, Is.EqualTo("c3"), "Matching Column Label");
+      Assert.That(result2.Columns[0].Type.ToString(), Is.EqualTo("Json"), "Matching Column Type");
+      Assert.That(result2.Columns[0].Length, Is.EqualTo(4294967295), "Matching Column Length");
+      Assert.That(result2.Columns[0].FractionalDigits, Is.EqualTo(0u), "Matching Column FD");
+      Assert.That(result2.Columns[0].IsNumberSigned, Is.EqualTo(false), "Matching Column Is Signed");
+      Assert.That(result2.Columns[0].CharacterSetName, Is.EqualTo("binary"), "Matching Character Set Name");
+      Assert.That(result2.Columns[0].CollationName, Is.EqualTo("binary"), "Matching Collation Name");
+      Assert.That(result2.Columns[0].IsPadded, Is.EqualTo(false), "Matching Column Padded");
 
       result2 = session.GetSchema(schemaName).GetTable("test1").Select("c4").Execute();
 
-      Assert.AreEqual(schemaName, result2.Columns[0].SchemaName, "Matching Column Schema Name");
-      Assert.AreEqual("test1", result2.Columns[0].TableName, "Matching Column Table Name");
-      Assert.AreEqual("test1", result2.Columns[0].TableLabel, "Matching Column Table Label");
-      Assert.AreEqual("c4", result2.Columns[0].ColumnName, "Matching Column Name");
-      Assert.AreEqual("c4", result2.Columns[0].ColumnLabel, "Matching Column Label");
-      Assert.AreEqual("Bigint", result2.Columns[0].Type.ToString(), "Matching Column Type");
-      Assert.AreEqual(20, result2.Columns[0].Length, "Matching Column Length");
-      Assert.AreEqual(0u, result2.Columns[0].FractionalDigits, "Matching Column FD");
-      Assert.AreEqual(true, result2.Columns[0].IsNumberSigned, "Matching Column Is Signed");
-      Assert.AreEqual(null, result2.Columns[0].CharacterSetName, "Matching Character Set Name");
-      Assert.AreEqual(null, result2.Columns[0].CollationName, "Matching Collation Name");
-      Assert.AreEqual(false, result2.Columns[0].IsPadded, "Matching Column Padded");
+      Assert.That(result2.Columns[0].SchemaName, Is.EqualTo(schemaName), "Matching Column Schema Name");
+      Assert.That(result2.Columns[0].TableName, Is.EqualTo("test1"), "Matching Column Table Name");
+      Assert.That(result2.Columns[0].TableLabel, Is.EqualTo("test1"), "Matching Column Table Label");
+      Assert.That(result2.Columns[0].ColumnName, Is.EqualTo("c4"), "Matching Column Name");
+      Assert.That(result2.Columns[0].ColumnLabel, Is.EqualTo("c4"), "Matching Column Label");
+      Assert.That(result2.Columns[0].Type.ToString(), Is.EqualTo("Bigint"), "Matching Column Type");
+      Assert.That(result2.Columns[0].Length, Is.EqualTo(20), "Matching Column Length");
+      Assert.That(result2.Columns[0].FractionalDigits, Is.EqualTo(0u), "Matching Column FD");
+      Assert.That(result2.Columns[0].IsNumberSigned, Is.EqualTo(true), "Matching Column Is Signed");
+      Assert.That(result2.Columns[0].CharacterSetName, Is.EqualTo(null), "Matching Character Set Name");
+      Assert.That(result2.Columns[0].CollationName, Is.EqualTo(null), "Matching Collation Name");
+      Assert.That(result2.Columns[0].IsPadded, Is.EqualTo(false), "Matching Column Padded");
 
       session.SQL("DROP TABLE if exists test").Execute();
       session.SQL("DROP TABLE if exists test1").Execute();
@@ -684,33 +684,33 @@ public void ColumnCharacterDefaultDatatype()
       for (int i = 0; i < columns.Length; i++)
       {
         string tableLabel = result.Columns[i].TableLabel;
-        Assert.AreEqual("address", tableLabel, "Matching the table label");
+        Assert.That(tableLabel, Is.EqualTo("address"), "Matching the table label");
         string columnName = result.Columns[i].ColumnName;
-        Assert.AreEqual(columns[i].ToString(), columnName, "Matching the Column Name");
+        Assert.That(columnName, Is.EqualTo(columns[i].ToString()), "Matching the Column Name");
         string columnLabel = result.Columns[i].ColumnLabel;
-        Assert.AreEqual(columns[i].ToString(), columnLabel, "Matching the Column Label");
+        Assert.That(columnLabel, Is.EqualTo(columns[i].ToString()), "Matching the Column Label");
         uint columnLength = result.Columns[i].Length;
-        Assert.AreEqual(columnLength, columnLength, "Matching the Column Length");
+        Assert.That(columnLength, Is.EqualTo(columnLength), "Matching the Column Length");
         var columnType = result.Columns[i].Type;
-        Assert.AreEqual(columnTypeMatch[i], columnType.ToString(), "Matching the Column Type");
+        Assert.That(columnType.ToString(), Is.EqualTo(columnTypeMatch[i]), "Matching the Column Type");
         var columnFD = result.Columns[i].FractionalDigits;
-        Assert.AreEqual(FDLength[i], columnFD, "Matching the Column FD");
+        Assert.That(columnFD, Is.EqualTo(FDLength[i]), "Matching the Column FD");
         var columnIsSigned = result.Columns[i].IsNumberSigned;
-        Assert.AreEqual(columnIsSignedMatch[i], columnIsSigned.ToString(), "Matching whether column is signed or not");
+        Assert.That(columnIsSigned.ToString(), Is.EqualTo(columnIsSignedMatch[i]), "Matching whether column is signed or not");
         string columnCollation = result.Columns[i].CollationName;
         if (i == 1 || i == 2 || i == 3 || i == 4 || i == 5)
-          Assert.AreEqual(columnCollation, columnCollation, "Matching the Collation Name for default characters");
+          Assert.That(columnCollation, Is.EqualTo(columnCollation), "Matching the Collation Name for default characters");
         else
-          Assert.AreEqual(null, columnCollation, "Matching the Collation Name as null for data types other than characters");
+          Assert.That(columnCollation, Is.EqualTo(null), "Matching the Collation Name as null for data types other than characters");
         string columnCharacterSet = result.Columns[i].CharacterSetName;
         if (i == 1 || i == 2 || i == 3 || i == 4 || i == 5)
-          Assert.AreEqual(columnCharacterSet, columnCharacterSet, "Matching the CharacterSet Name for default characters");
+          Assert.That(columnCharacterSet, Is.EqualTo(columnCharacterSet), "Matching the CharacterSet Name for default characters");
         else
-          Assert.AreEqual(null, columnCharacterSet, "Matching the Collation Name as null for data types other than characters");
+          Assert.That(columnCharacterSet, Is.EqualTo(null), "Matching the Collation Name as null for data types other than characters");
         var columnIsPadded = result.Columns[i].IsPadded;
-        Assert.AreEqual(columnIsPaddedMatch[i], columnIsPadded.ToString(), "Matching whether column is padded or not");
+        Assert.That(columnIsPadded.ToString(), Is.EqualTo(columnIsPaddedMatch[i]), "Matching whether column is padded or not");
         var columnClrType = result.Columns[i].ClrType;
-        Assert.AreEqual(clrTypeMatch[i], columnClrType.ToString(), "Matching whether column CLR Type");
+        Assert.That(columnClrType.ToString(), Is.EqualTo(clrTypeMatch[i]), "Matching whether column CLR Type");
       }
       session.SQL("DROP TABLE if exists address").Execute();
     }
@@ -747,33 +747,33 @@ public void ColumnCharacterCustomDatatype()
       for (int i = 0; i < columns.Length; i++)
       {
         string tableLabel = result.Columns[i].TableLabel;
-        Assert.AreEqual("address", tableLabel, "Matching the table label");
+        Assert.That(tableLabel, Is.EqualTo("address"), "Matching the table label");
         string columnName = result.Columns[i].ColumnName;
-        Assert.AreEqual(columns[i].ToString(), columnName, "Matching the Column Name");
+        Assert.That(columnName, Is.EqualTo(columns[i].ToString()), "Matching the Column Name");
         string columnLabel = result.Columns[i].ColumnLabel;
-        Assert.AreEqual(columns[i].ToString(), columnLabel, "Matching the Column Label");
+        Assert.That(columnLabel, Is.EqualTo(columns[i].ToString()), "Matching the Column Label");
         uint columnLength = result.Columns[i].Length;
-        Assert.AreEqual(Length[i], columnLength, "Matching the Column Length");
+        Assert.That(columnLength, Is.EqualTo(Length[i]), "Matching the Column Length");
         var columnType = result.Columns[i].Type;
-        Assert.AreEqual(columnTypeMatch[i], columnType.ToString(), "Matching the Column Type");
+        Assert.That(columnType.ToString(), Is.EqualTo(columnTypeMatch[i]), "Matching the Column Type");
         var columnFD = result.Columns[i].FractionalDigits;
-        Assert.AreEqual(FDLength[i], columnFD, "Matching the Column FD");
+        Assert.That(columnFD, Is.EqualTo(FDLength[i]), "Matching the Column FD");
         var columnIsSigned = result.Columns[i].IsNumberSigned;
-        Assert.AreEqual(columnIsSignedMatch[i], columnIsSigned.ToString(), "Matching whether column is signed or not");
+        Assert.That(columnIsSigned.ToString(), Is.EqualTo(columnIsSignedMatch[i]), "Matching whether column is signed or not");
         string columnCollation = result.Columns[i].CollationName;
         if (i == 1 || i == 2 || i == 3 || i == 4 || i == 5)
-          StringAssert.Contains(defaultCharset, columnCollation, "Matching the Collation Name for big5_chinese_ci characters");
+          Assert.That(columnCollation, Does.Contain(defaultCharset), "Matching the Collation Name for big5_chinese_ci characters");
         else
-          Assert.AreEqual(null, columnCollation, "Matching the Collation Name as null for data types other than characters");
+          Assert.That(columnCollation, Is.EqualTo(null), "Matching the Collation Name as null for data types other than characters");
         string columnCharacterSet = result.Columns[i].CharacterSetName;
         if (i == 1 || i == 2 || i == 3 || i == 4 || i == 5)
-          StringAssert.AreEqualIgnoringCase(defaultCharset, columnCharacterSet, "Matching the CharacterSet Name for big5 characters");
+          Assert.That(columnCharacterSet, Is.EqualTo(defaultCharset).IgnoreCase, "Matching the CharacterSet Name for big5 characters");
         else
-          Assert.AreEqual(null, columnCharacterSet, "Matching the Collation Name as null for data types other than characters");
+          Assert.That(columnCharacterSet, Is.EqualTo(null), "Matching the Collation Name as null for data types other than characters");
         var columnIsPadded = result.Columns[i].IsPadded;
-        Assert.AreEqual(columnIsPaddedMatch[i], columnIsPadded.ToString(), "Matching whether column is padded or not");
+        Assert.That(columnIsPadded.ToString(), Is.EqualTo(columnIsPaddedMatch[i]), "Matching whether column is padded or not");
         var columnClrType = result.Columns[i].ClrType;
-        Assert.AreEqual(clrTypeMatch[i], columnClrType.ToString(), "Matching whether column CLR Type");
+        Assert.That(columnClrType.ToString(), Is.EqualTo(clrTypeMatch[i]), "Matching whether column CLR Type");
       }
       session.SQL("Drop table if exists address").Execute();
     }
@@ -790,29 +790,29 @@ public void ColumnCharacterGeometricDatatype()
       for (int i = 0; i < columns.Length; i++)
       {
         string tableName = result.Columns[i].TableName;
-        Assert.AreEqual("geotest", tableName, "Matching the table name");
+        Assert.That(tableName, Is.EqualTo("geotest"), "Matching the table name");
         string tableLabel = result.Columns[i].TableLabel;
-        Assert.AreEqual("geotest", tableLabel, "Matching the table label");
+        Assert.That(tableLabel, Is.EqualTo("geotest"), "Matching the table label");
         string columnName = result.Columns[i].ColumnName;
-        Assert.AreEqual(columns[i].ToString(), columnName, "Matching the Column Name");
+        Assert.That(columnName, Is.EqualTo(columns[i].ToString()), "Matching the Column Name");
         string columnLabel = result.Columns[i].ColumnLabel;
-        Assert.AreEqual(columns[i].ToString(), columnLabel, "Matching the Column Label");
+        Assert.That(columnLabel, Is.EqualTo(columns[i].ToString()), "Matching the Column Label");
         uint columnLength = result.Columns[i].Length;
-        Assert.AreEqual(0, columnLength, "Matching the Column Length");
+        Assert.That(columnLength, Is.EqualTo(0), "Matching the Column Length");
         var columnType = result.Columns[i].Type;
-        Assert.AreEqual("Geometry", columnType.ToString(), "Matching the Column Type");
+        Assert.That(columnType.ToString(), Is.EqualTo("Geometry"), "Matching the Column Type");
         var columnFD = result.Columns[i].FractionalDigits;
-        Assert.AreEqual(0, columnFD, "Matching the Column FD");
+        Assert.That(columnFD, Is.EqualTo(0), "Matching the Column FD");
         var columnIsSigned = result.Columns[i].IsNumberSigned;
-        Assert.AreEqual(false, columnIsSigned, "Matching whether column is signed or not");
+        Assert.That(columnIsSigned, Is.EqualTo(false), "Matching whether column is signed or not");
         string columnCollation = result.Columns[i].CollationName;
-        Assert.AreEqual(null, columnCollation, "Matching the Collation Name for default characters");
+        Assert.That(columnCollation, Is.EqualTo(null), "Matching the Collation Name for default characters");
         string columnCharacterSet = result.Columns[i].CharacterSetName;
-        Assert.AreEqual(null, columnCharacterSet, "Matching the Collation Name as null for data types other than characters");
+        Assert.That(columnCharacterSet, Is.EqualTo(null), "Matching the Collation Name as null for data types other than characters");
         var columnIsPadded = result.Columns[i].IsPadded;
-        Assert.AreEqual(false, columnIsPadded, "Matching whether column is padded or not");
+        Assert.That(columnIsPadded, Is.EqualTo(false), "Matching whether column is padded or not");
         var columnClrType = result.Columns[i].ClrType;
-        Assert.AreEqual("System.Byte[]", columnClrType.ToString(), "Matching whether column CLR Type");
+        Assert.That(columnClrType.ToString(), Is.EqualTo("System.Byte[]"), "Matching whether column CLR Type");
       }
     }
 
@@ -832,30 +832,30 @@ public void ColumnCharacterBlobDatatype()
       for (int i = 0; i < columns.Length; i++)
       {
         string tableName = result.Columns[i].TableName;
-        Assert.AreEqual("geotest", tableName, "Matching the table name");
+        Assert.That(tableName, Is.EqualTo("geotest"), "Matching the table name");
         string tableLabel = result.Columns[i].TableLabel;
-        Assert.AreEqual("geotest", tableLabel, "Matching the table label");
+        Assert.That(tableLabel, Is.EqualTo("geotest"), "Matching the table label");
         string columnName = result.Columns[i].ColumnName;
-        Assert.AreEqual(columns[i].ToString(), columnName, "Matching the Column Name");
+        Assert.That(columnName, Is.EqualTo(columns[i].ToString()), "Matching the Column Name");
         string columnLabel = result.Columns[i].ColumnLabel;
-        Assert.AreEqual(columns[i].ToString(), columnLabel, "Matching the Column Label");
+        Assert.That(columnLabel, Is.EqualTo(columns[i].ToString()), "Matching the Column Label");
         uint columnLength = result.Columns[i].Length;
-        Assert.AreEqual(ColumnLength[i], columnLength, "Matching the Column Length");
+        Assert.That(columnLength, Is.EqualTo(ColumnLength[i]), "Matching the Column Length");
         var columnType = result.Columns[i].Type;
-        Assert.AreEqual(columnTypeMatch[i], columnType.ToString(), "Matching the Column Type");
+        Assert.That(columnType.ToString(), Is.EqualTo(columnTypeMatch[i]), "Matching the Column Type");
         var columnFD = result.Columns[i].FractionalDigits;
-        Assert.AreEqual(0, columnFD, "Matching the Column FD");
+        Assert.That(columnFD, Is.EqualTo(0), "Matching the Column FD");
         var columnIsSigned = result.Columns[i].IsNumberSigned;
-        Assert.AreEqual("False", columnIsSigned.ToString(), "Matching whether column is signed or not");
+        Assert.That(columnIsSigned.ToString(), Is.EqualTo("False"), "Matching whether column is signed or not");
         string columnCollation = result.Columns[i].CollationName;
-        Assert.AreEqual("binary", columnCollation, "Matching the Collation Name for default characters");
+        Assert.That(columnCollation, Is.EqualTo("binary"), "Matching the Collation Name for default characters");
         string columnCharacterSet = result.Columns[i].CharacterSetName;
         //Character name returns binary for blob
-        Assert.AreEqual("binary", columnCharacterSet, "Matching the Collation Name as null for data types other than characters");
+        Assert.That(columnCharacterSet, Is.EqualTo("binary"), "Matching the Collation Name as null for data types other than characters");
         var columnIsPadded = result.Columns[i].IsPadded;
-        Assert.AreEqual("False", columnIsPadded.ToString(), "Matching whether column is padded or not");
+        Assert.That(columnIsPadded.ToString(), Is.EqualTo("False"), "Matching whether column is padded or not");
         var columnClrType = result.Columns[i].ClrType;
-        Assert.AreEqual("System.Byte[]", columnClrType.ToString(), "Matching whether column CLR Type");
+        Assert.That(columnClrType.ToString(), Is.EqualTo("System.Byte[]"), "Matching whether column CLR Type");
       }
     }
 
@@ -876,7 +876,7 @@ public void LanguageSpecificCollations()
       var database_name = "collation_test";
       session.DropSchema(database_name);
       var CommandText1 = "SHOW VARIABLES LIKE 'collation_%';";
-      Assert.AreEqual(charset, session.Settings.CharacterSet, "Matching the character set of the session");
+      Assert.That(session.Settings.CharacterSet, Is.EqualTo(charset), "Matching the character set of the session");
 
       for (var i = 0; i < collationname.Length; i++)
       {
@@ -886,18 +886,18 @@ public void LanguageSpecificCollations()
         session.SQL("USE " + database_name).Execute();
         session.SQL("create table x(id int,name char(25));").Execute();
         var res = session.SQL("insert into x values(10,'AXTREF');").Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
         session.SQL("insert into x values(20,'Trädgårdsvägen');").Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
         session.SQL("insert into x values(30,'foo𝌆bar');").Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
         session.SQL("insert into x values(40,'Dolphin:🐬');").Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
 
         var dbCharset = session.SQL("select @@character_set_database;").Execute().FirstOrDefault();
         var dbCollation = session.SQL("select @@collation_database").Execute().FirstOrDefault();
-        Assert.AreEqual(dbCharset[0], charset);
-        Assert.AreEqual(dbCollation[0], collationname[i]);
+        Assert.That(charset, Is.EqualTo(dbCharset[0]));
+        Assert.That(collationname[i], Is.EqualTo(dbCollation[0]));
         session.DropSchema(database_name);
       }
     }
@@ -926,7 +926,7 @@ public void VerifyRenamedCollations()
 
       var database_name = "collation_test";
       session.DropSchema(database_name);
-      Assert.AreEqual(charset, sessionX.Settings.CharacterSet, "Matching the character set of the session");
+      Assert.That(sessionX.Settings.CharacterSet, Is.EqualTo(charset), "Matching the character set of the session");
 
       for (var i = 0; i < collationname.Length; i++)
       {
@@ -935,18 +935,18 @@ public void VerifyRenamedCollations()
         sessionX.SQL("USE " + database_name).Execute();
         sessionX.SQL("CREATE TABLE x(id int,name char(25));").Execute();
         var res = sessionX.SQL("insert into x values(10,'AXTREF');").Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
         sessionX.SQL("insert into x values(20,'Trädgårdsvägen');").Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
         sessionX.SQL("insert into x values(30,'foo𝌆bar');").Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
         sessionX.SQL("insert into x values(40,'Dolphin:🐬');").Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
 
         var dbCharset = sessionX.SQL("select @@character_set_database;").Execute().FirstOrDefault();
         var dbCollation = sessionX.SQL("select @@collation_database").Execute().FirstOrDefault();
-        Assert.AreEqual(dbCharset[0], charset);
-        Assert.AreEqual(dbCollation[0], collationname[i]);
+        Assert.That(charset, Is.EqualTo(dbCharset[0]));
+        Assert.That(collationname[i], Is.EqualTo(dbCollation[0]));
         sessionX.DropSchema(database_name);
       }
     }
@@ -962,7 +962,7 @@ public void VerifyLatinCharsetAndCollation()
       var charset = "latin1";
       var collationname = "latin1_danish_ci";
       var defaultCharset = "utf8mb4";
-      Assert.AreEqual(defaultCharset, session.Settings.CharacterSet, "Matching the character set of the session");
+      Assert.That(session.Settings.CharacterSet, Is.EqualTo(defaultCharset), "Matching the character set of the session");
       session.DropSchema(database_name);
       var CommandText1 = $"CREATE DATABASE {database_name} CHARACTER SET {charset} COLLATE {collationname}";
       session.SQL(CommandText1).Execute();
@@ -970,11 +970,11 @@ public void VerifyLatinCharsetAndCollation()
       session.SQL("create table x(id int,name char(25));").Execute();
       session.SQL("insert into x values(10,'AXTREF');").Execute();
       RowResult result1 = session.GetSchema(database_name).GetTable("x").Select("id").Execute();
-      Assert.AreEqual(null, result1.Columns[0].CharacterSetName, "id-charset");
-      Assert.AreEqual(null, result1.Columns[0].CollationName, "id-collation");
+      Assert.That(result1.Columns[0].CharacterSetName, Is.EqualTo(null), "id-charset");
+      Assert.That(result1.Columns[0].CollationName, Is.EqualTo(null), "id-collation");
       result1 = session.GetSchema(database_name).GetTable("x").Select("name").Execute();
-      StringAssert.AreEqualIgnoringCase(defaultCharset, result1.Columns[0].CharacterSetName, "name-charset");
-      StringAssert.Contains(defaultCharset, result1.Columns[0].CollationName, "name-collation");
+      Assert.That(result1.Columns[0].CharacterSetName, Is.EqualTo(defaultCharset).IgnoreCase, "name-charset");
+      Assert.That(result1.Columns[0].CollationName, Does.Contain(defaultCharset), "name-collation");
       session.DropSchema(database_name);
     }
 
@@ -997,7 +997,7 @@ public void Utf8mb4BinaryNopadCollationTable()
 
       var database_name = "collation_test";
 
-      Assert.AreEqual(charset, session.Settings.CharacterSet, "Matching the character set of the session");
+      Assert.That(session.Settings.CharacterSet, Is.EqualTo(charset), "Matching the character set of the session");
       session.DropSchema(database_name);
       CommandText1 = "CREATE DATABASE " + database_name;
       var sqlRes = session.SQL(CommandText1).Execute();
@@ -1006,13 +1006,13 @@ public void Utf8mb4BinaryNopadCollationTable()
       Table t = session.GetSchema(database_name).GetTable("t");
       t.Insert().Values(foo).Execute();
       Row r = t.Select().Limit(1).Execute().FetchOne();
-      Assert.AreEqual(foo, r[0].ToString(), "Compare extracted string");
+      Assert.That(r[0].ToString(), Is.EqualTo(foo), "Compare extracted string");
 
       session.DropSchema(database_name);
       CommandText1 = "SHOW VARIABLES LIKE 'collation_%';";
       sqlRes = session.SQL(CommandText1).Execute();
       while (sqlRes.Next()) ;
-      Assert.AreEqual(collation, sqlRes.Rows.ToArray()[0][1].ToString(), "Matching the collation");
+      Assert.That(sqlRes.Rows.ToArray()[0][1].ToString(), Is.EqualTo(collation), "Matching the collation");
 
       for (var i = 0; i < collationname.Count; i++)
       {
@@ -1026,15 +1026,15 @@ public void Utf8mb4BinaryNopadCollationTable()
         session.SQL("insert into x values(40,'Dolphin:🐬');").Execute();
         t = session.GetSchema(database_name).GetTable("x");
         var res = t.Select().Execute().FetchAll();
-        Assert.AreEqual("AXTREF", res[0][1].ToString(), "Matching the data");
-        Assert.AreEqual("Trädgårdsvägen", res[1][1].ToString(), "Matching the data");
-        Assert.AreEqual("foo𝌆bar", res[2][1].ToString(), "Matching the data");
-        Assert.AreEqual("Dolphin:🐬", res[3][1].ToString(), "Matching the data");
+        Assert.That(res[0][1].ToString(), Is.EqualTo("AXTREF"), "Matching the data");
+        Assert.That(res[1][1].ToString(), Is.EqualTo("Trädgårdsvägen"), "Matching the data");
+        Assert.That(res[2][1].ToString(), Is.EqualTo("foo𝌆bar"), "Matching the data");
+        Assert.That(res[3][1].ToString(), Is.EqualTo("Dolphin:🐬"), "Matching the data");
         RowResult result_collation = t.Select("name").Execute();
         var collationName = result_collation.Columns[0].CollationName;
-        Assert.AreEqual(collationname[i], collationName, "Matching the collation");
+        Assert.That(collationName, Is.EqualTo(collationname[i]), "Matching the collation");
         var characterName = result_collation.Columns[0].CharacterSetName;
-        Assert.AreEqual(charset, characterName, "Matching the charset");
+        Assert.That(characterName, Is.EqualTo(charset), "Matching the charset");
         session.DropSchema(database_name);
       }
 
@@ -1050,15 +1050,15 @@ public void Utf8mb4BinaryNopadCollationTable()
         session.SQL("insert into x values(40,'Dolphin:🐬');").Execute();
         t = session.GetSchema(database_name).GetTable("x");
         var res = t.Select().Execute().FetchAll();
-        Assert.AreEqual("AXTREF", res[0][1].ToString(), "Matching the data");
-        Assert.AreEqual("Trädgårdsvägen", res[1][1].ToString(), "Matching the data");
-        Assert.AreEqual("foo𝌆bar", res[2][1].ToString(), "Matching the data");
-        Assert.AreEqual("Dolphin:🐬", res[3][1].ToString(), "Matching the data");
+        Assert.That(res[0][1].ToString(), Is.EqualTo("AXTREF"), "Matching the data");
+        Assert.That(res[1][1].ToString(), Is.EqualTo("Trädgårdsvägen"), "Matching the data");
+        Assert.That(res[2][1].ToString(), Is.EqualTo("foo𝌆bar"), "Matching the data");
+        Assert.That(res[3][1].ToString(), Is.EqualTo("Dolphin:🐬"), "Matching the data");
         RowResult result_collation = t.Select("name").Execute();
         var collationName = result_collation.Columns[0].CollationName;
-        Assert.AreEqual(collationname[i], collationName, "Matching the collation");
+        Assert.That(collationName, Is.EqualTo(collationname[i]), "Matching the collation");
         var characterName = result_collation.Columns[0].CharacterSetName;
-        Assert.AreEqual(charset, characterName, "Matching the charset");
+        Assert.That(characterName, Is.EqualTo(charset), "Matching the charset");
         session.DropSchema(database_name);
         //ALTER
         CommandText1 = "CREATE DATABASE " + database_name;
@@ -1072,15 +1072,15 @@ public void Utf8mb4BinaryNopadCollationTable()
         session.SQL("insert into x values(40,'Dolphin:🐬');").Execute();
         t = session.GetSchema(database_name).GetTable("x");
         res = t.Select().Execute().FetchAll();
-        Assert.AreEqual("AXTREF", res[0][1].ToString(), "Matching the data");
-        Assert.AreEqual("Trädgårdsvägen", res[1][1].ToString(), "Matching the data");
-        Assert.AreEqual("foo𝌆bar", res[2][1].ToString(), "Matching the data");
-        Assert.AreEqual("Dolphin:🐬", res[3][1].ToString(), "Matching the data");
+        Assert.That(res[0][1].ToString(), Is.EqualTo("AXTREF"), "Matching the data");
+        Assert.That(res[1][1].ToString(), Is.EqualTo("Trädgårdsvägen"), "Matching the data");
+        Assert.That(res[2][1].ToString(), Is.EqualTo("foo𝌆bar"), "Matching the data");
+        Assert.That(res[3][1].ToString(), Is.EqualTo("Dolphin:🐬"), "Matching the data");
         result_collation = t.Select("name").Execute();
         collationName = result_collation.Columns[0].CollationName;
-        Assert.AreEqual(collationname[i], collationName, "Matching the collation");
+        Assert.That(collationName, Is.EqualTo(collationname[i]), "Matching the collation");
         characterName = result_collation.Columns[0].CharacterSetName;
-        Assert.AreEqual(charset, characterName, "Matching the charset");
+        Assert.That(characterName, Is.EqualTo(charset), "Matching the charset");
         session.DropSchema(database_name);
       }
 
@@ -1098,7 +1098,7 @@ public void Utf8mb4BinaryNopadCollationTable()
           session.SQL($"insert into x values({k},'{t_char}')").Execute();
           t = session.GetSchema(database_name).GetTable("x");
           r = t.Select().Limit(1).Execute().FetchOne();
-          Assert.AreEqual(t_char.ToString(), r[1].ToString(), "Compare extracted string");
+          Assert.That(r[1].ToString(), Is.EqualTo(t_char.ToString()), "Compare extracted string");
         }
         session.DropSchema(database_name);
 
@@ -1112,7 +1112,7 @@ public void Utf8mb4BinaryNopadCollationTable()
           session.SQL($"insert into x values({k},'{t_char}')").Execute();
           t = session.GetSchema(database_name).GetTable("x");
           r = t.Select().Limit(1).Execute().FetchOne();
-          Assert.AreEqual(t_char.ToString(), r[1].ToString(), "Compare extracted string");
+          Assert.That(r[1].ToString(), Is.EqualTo(t_char.ToString()), "Compare extracted string");
         }
         session.DropSchema(database_name);
       }
@@ -1136,7 +1136,7 @@ public void Utf8mb4BinaryNopadCollationTable()
 
       using (var sessiontest = MySQLX.GetSession(mysqlx0.ConnectionString))
       {
-        Assert.AreEqual(charset, sessiontest.Settings.CharacterSet, "Matching the character set of the session");
+        Assert.That(sessiontest.Settings.CharacterSet, Is.EqualTo(charset), "Matching the character set of the session");
         sessiontest.DropSchema(database_name);
         CommandText1 = "CREATE DATABASE " + database_name;
         sqlRes = sessiontest.SQL(CommandText1).Execute();
@@ -1145,7 +1145,7 @@ public void Utf8mb4BinaryNopadCollationTable()
         t = sessiontest.GetSchema(database_name).GetTable("t");
         t.Insert().Values(foo).Execute();
         r = t.Select().Limit(1).Execute().FetchOne();
-        Assert.AreEqual(foo, r[0].ToString(), "Compare extracted string");
+        Assert.That(r[0].ToString(), Is.EqualTo(foo), "Compare extracted string");
         sessiontest.DropSchema(database_name);
       }
     }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
index 1a8ac5077..d3c8d0ceb 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
@@ -56,13 +56,13 @@ public void RandomMethodWithBasicFormatConnectionString()
       // Single host.
       using (var session = MySQLX.GetSession(ConnectionString))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // Multiple hosts.
       using (var session = MySQLX.GetSession($"server=10.10.10.10, {Host}, 20.20.20.20, 30.30.30.30;port={XPort};uid=test;password=test;connecttimeout={connectionTimeout}"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // Multiple hosts with IPv6
@@ -70,23 +70,23 @@ public void RandomMethodWithBasicFormatConnectionString()
       {
         using (var session = MySQLX.GetSession($"server=10.10.10.10, {localServerIpv6}, 20.20.20.20, 30.30.30.30;port={XPort};uid=test;password=test;connecttimeout={connectionTimeout}"))
         {
-          Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+          Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
       }
 
       // Multiple hosts using synonyms for "server" connection option.
       using (var session = MySQLX.GetSession($"host=10.10.10.10, {Host};port={XPort};uid=test;password=test;connecttimeout=" + connectionTimeout))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // Multiple hosts. All attempts fail.
       Exception ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession($"server= 10.10.10.10, 20.20.20.20 ;port={XPort};uid=test;password=test;connecttimeout={connectionTimeout}"));
-      Assert.AreEqual("Unable to connect to any of the specified MySQL hosts.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Unable to connect to any of the specified MySQL hosts."));
 
       // Providing port number as part of the host name.
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server= 10.10.10.10:33050, 20.20.20.20:33060, {Host}:{XPort} ;port={XPort};uid=test;password=test;connecttimeout={connectionTimeout}"));
-      Assert.AreEqual("Providing a port number as part of the host address isn't supported when using connection strings in basic format or anonymous objects. Use URI format instead.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Providing a port number as part of the host address isn't supported when using connection strings in basic format or anonymous objects. Use URI format instead."));
     }
 
     [Test]
@@ -97,13 +97,13 @@ public void RandomMethodWithUriFormatConnectionString()
       // Single host.
       using (var session = MySQLX.GetSession($"mysqlx://test:test@{Host}:{XPort}?connecttimeout={connectionTimeout}"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // Single host and port as an array. Successful connection.
       using (var session = MySQLX.GetSession($"mysqlx://test:test@[{Host}:" + XPort + "]?connecttimeout=" + connectionTimeout))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // Single host as an array. Failed connection.
@@ -112,13 +112,13 @@ public void RandomMethodWithUriFormatConnectionString()
       // Multiple hosts.
       using (var session = MySQLX.GetSession($"mysqlx://test:test@[192.1.10.10,{Host}:" + XPort + "]?connecttimeout=" + connectionTimeout))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // Multiple hosts and a schema.
       using (var session = MySQLX.GetSession($"mysqlx://test:test@[192.1.10.10,{Host}:" + XPort + "]/test?connecttimeout=" + connectionTimeout))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // Multiple hosts which may or may not contain a port number.
@@ -126,7 +126,7 @@ public void RandomMethodWithUriFormatConnectionString()
       {
         using (var session = MySQLX.GetSession($"mysqlx://test:test@[192.1.10.10,120.0.0.2:22000,[{localServerIpv6}]:{XPort}]/test?connecttimeout={connectionTimeout}"))
         {
-          Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+          Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
       }
     }
@@ -141,13 +141,13 @@ public void RandomMethodWithAnonymousTypes()
       // Single host.
       using (var session = MySQLX.GetSession(new { server = Host, port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // Multiple hosts.
       using (var session = MySQLX.GetSession(new { server = $"10.10.10.10, {Host}", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // Multiple hosts with IPv6      
@@ -155,23 +155,23 @@ public void RandomMethodWithAnonymousTypes()
       {
         using (var session = MySQLX.GetSession(new { server = $"10.10.10.10, {localServerIpv6}", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }))
         {
-          Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+          Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
       }
 
       // Multiple hosts using synonyms for "server" connection option. First attempt fails, second is succesful.
       using (var session = MySQLX.GetSession(new { datasource = $"10.10.10.10, {Host}", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // Multiple hosts. All attempts fail.
       Exception ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession(new { server = "10.10.10.10, 20.20.20.20", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.AreEqual("Unable to connect to any of the specified MySQL hosts.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Unable to connect to any of the specified MySQL hosts."));
 
       // Providing port number as part of the host name.
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(new { server = "10.10.10.10:33060, 20.20.20.20:33060", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.AreEqual("Providing a port number as part of the host address isn't supported when using connection strings in basic format or anonymous objects. Use URI format instead.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Providing a port number as part of the host address isn't supported when using connection strings in basic format or anonymous objects. Use URI format instead."));
     }
 
     [Test]
@@ -189,11 +189,11 @@ public void PriorityMethodWithBasicFormatConnectionString()
           Session newSession = MySQLX.GetSession($"server=(address={Host},priority=100);port=" + XPort + ";uid=test;password=test;");
           sessions.Add(newSession);
         }
-        Assert.False(true, "MySqlException should be thrown");
+        Assert.That(true, Is.False, "MySqlException should be thrown");
       }
       catch (MySqlException exception)
       {
-        Assert.AreEqual(ResourcesX.UnableToOpenSession, exception.Message);
+        Assert.That(exception.Message, Is.EqualTo(ResourcesX.UnableToOpenSession));
       }
       finally
       {
@@ -202,20 +202,20 @@ public void PriorityMethodWithBasicFormatConnectionString()
 
       using (var session = MySQLX.GetSession($"server=(address={Host},priority=100);port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(Host, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(Host));
       }
 
       using (var session = MySQLX.GetSession($"server=(address=server.example,priority=50),(address={Host},priority=100);port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(Host, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(Host));
       }
 
       using (var session = MySQLX.GetSession($"server=(address=server.example,priority=100),(address={Host},priority=25),(address=192.0.10.56,priority=75);port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(Host, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(Host));
       }
 
       using (var session = MySQLX.GetSession(new
@@ -227,33 +227,33 @@ public void PriorityMethodWithBasicFormatConnectionString()
         sslmode = MySqlSslMode.Disabled
       }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(Host, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(Host));
       }
 
       using (var session = MySQLX.GetSession($"server=(address=server.example,priority=100),(address={Host},priority=25),(address=192.0.10.56,priority=75);port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(Host, session.Settings.Server);
-        Assert.AreEqual("server.example", FailoverManager.FailoverGroup.Hosts[0].Host);
-        Assert.AreEqual("192.0.10.56", FailoverManager.FailoverGroup.Hosts[1].Host);
-        Assert.AreEqual(Host, FailoverManager.FailoverGroup.Hosts[2].Host);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(Host));
+        Assert.That(FailoverManager.FailoverGroup.Hosts[0].Host, Is.EqualTo("server.example"));
+        Assert.That(FailoverManager.FailoverGroup.Hosts[1].Host, Is.EqualTo("192.0.10.56"));
+        Assert.That(FailoverManager.FailoverGroup.Hosts[2].Host, Is.EqualTo(Host));
       }
 
       // Priority outside the 0-100 allowed range.
       Exception ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server=(address=server.example,priority=-20),(address={Host},priority=100);port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout));
-      Assert.AreEqual("The priority must be between 0 and 100.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100."));
 
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server=(address=server.example,priority=-50),(address={Host},priority=101);port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout));
-      Assert.AreEqual("The priority must be between 0 and 100.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100."));
 
       // Set priority for a subset of the hosts.
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server=(address=server.example),(address={Host},priority=100);port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout));
-      Assert.AreEqual("You must either assign no priority to any of the hosts or give a priority for every host.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server=(address=server.example,priority=50),(address={Host});port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout));
-      Assert.AreEqual("You must either assign no priority to any of the hosts or give a priority for every host.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server=(address=server.example,priority=50),(address={Host},priority=100),(address=server.example);port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout));
-      Assert.AreEqual("You must either assign no priority to any of the hosts or give a priority for every host.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
 
       // Automatically set priority if no priority is given.
       string hostList = string.Empty;
@@ -266,11 +266,11 @@ public void PriorityMethodWithBasicFormatConnectionString()
 
       using (var session = MySQLX.GetSession($"server={hostList};port={XPort};uid=test;password=test;connecttimeout={connectionTimeout}"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         priority = 100;
         foreach (var host in FailoverManager.FailoverGroup.Hosts)
         {
-          Assert.AreEqual(priority != 0 ? priority-- : 0, host.Priority);
+          Assert.That(host.Priority, Is.EqualTo(priority != 0 ? priority-- : 0));
         }
       }
     }
@@ -290,11 +290,11 @@ public void PriorityMethodWithUriFormatConnectonString()
           Session newSession = MySQLX.GetSession($"mysqlx://test:test@[(address={Host}:" + XPort + ",priority=50)]?connecttimeout=" + connectionTimeout);
           sessions.Add(newSession);
         }
-        Assert.False(true, "MySqlException should be thrown");
+        Assert.That(true, Is.False, "MySqlException should be thrown");
       }
       catch (MySqlException exception)
       {
-        Assert.AreEqual(ResourcesX.UnableToOpenSession, exception.Message);
+        Assert.That(exception.Message, Is.EqualTo(ResourcesX.UnableToOpenSession));
       }
       finally
       {
@@ -303,39 +303,39 @@ public void PriorityMethodWithUriFormatConnectonString()
 
       using (var session = MySQLX.GetSession($"mysqlx://test:test@[(address=server.example,priority=50),(address={Host}:{XPort},priority=100)]?connecttimeout=" + connectionTimeout))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(Host, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(Host));
       }
 
       using (var session = MySQLX.GetSession($"mysqlx://test:test@[(address=server.example,priority=50),(address={Host}:{XPort},priority=100)]?connecttimeout=" + connectionTimeout))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(Host, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(Host));
       }
 
       using (var session = MySQLX.GetSession($"mysqlx://test:test@[(address=server.example,priority=100),(address={Host}:{XPort},priority=25),(address=192.0.10.56,priority=75)]?connecttimeout=" + connectionTimeout))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(Host, session.Settings.Server);
-        Assert.AreEqual("server.example", FailoverManager.FailoverGroup.Hosts[0].Host);
-        Assert.AreEqual("192.0.10.56", FailoverManager.FailoverGroup.Hosts[1].Host);
-        Assert.AreEqual(Host, FailoverManager.FailoverGroup.Hosts[2].Host);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(Host));
+        Assert.That(FailoverManager.FailoverGroup.Hosts[0].Host, Is.EqualTo("server.example"));
+        Assert.That(FailoverManager.FailoverGroup.Hosts[1].Host, Is.EqualTo("192.0.10.56"));
+        Assert.That(FailoverManager.FailoverGroup.Hosts[2].Host, Is.EqualTo(Host));
       }
 
       // Priority outside the 0-100 allowed range.
       Exception ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"mysqlx://test:test@[(address=server.example,priority=-20),(address={Host}:{XPort},priority=100)]?connecttimeout=" + connectionTimeout));
-      Assert.AreEqual("The priority must be between 0 and 100.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100."));
 
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"mysqlx://test:test@[(address=server.example,priority=50),(address={Host}:{XPort},priority=101)]?connecttimeout=" + connectionTimeout));
-      Assert.AreEqual("The priority must be between 0 and 100.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100."));
 
       // Set priority for a subset of the hosts.
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"mysqlx://test:test@[(address=server.example),(address={Host}:{XPort},priority=100)]?connecttimeout=" + connectionTimeout));
-      Assert.AreEqual("You must either assign no priority to any of the hosts or give a priority for every host.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"mysqlx://test:test@[(address=server.example,priority=100),(address={Host}:{XPort})]?connecttimeout=" + connectionTimeout));
-      Assert.AreEqual("You must either assign no priority to any of the hosts or give a priority for every host.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"mysqlx://test:test@[(address=server.example),(address={Host}:{XPort}),(address=server2.example,priority=100)]?connecttimeout=" + connectionTimeout));
-      Assert.AreEqual("You must either assign no priority to any of the hosts or give a priority for every host.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
 
       // Automatically set priority if no priority is given.
       string hostList = string.Empty;
@@ -348,11 +348,11 @@ public void PriorityMethodWithUriFormatConnectonString()
 
       using (var session = MySQLX.GetSession($"mysqlx://test:test@[{hostList}]?connecttimeout=" + connectionTimeout))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         priority = 100;
         foreach (var host in FailoverManager.FailoverGroup.Hosts)
         {
-          Assert.AreEqual(priority != 0 ? priority-- : 0, host.Priority);
+          Assert.That(host.Priority, Is.EqualTo(priority != 0 ? priority-- : 0));
         }
       }
     }
@@ -375,11 +375,11 @@ public void PriorityMethodWithAnonymousTypes()
           sessions.Add(newSession);
         }
 
-        Assert.False(true, "MySqlException should be thrown");
+        Assert.That(true, Is.False, "MySqlException should be thrown");
       }
       catch (MySqlException exception)
       {
-        Assert.AreEqual(ResourcesX.UnableToOpenSession, exception.Message);
+        Assert.That(exception.Message, Is.EqualTo(ResourcesX.UnableToOpenSession));
       }
       finally
       {
@@ -388,44 +388,44 @@ public void PriorityMethodWithAnonymousTypes()
 
       using (var session = MySQLX.GetSession(new { server = $"(address={Host},priority=100)", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(Host, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(Host));
       }
 
       using (var session = MySQLX.GetSession(new { server = $"(address=server.example,priority=50),(address={Host},priority=100)", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(Host, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(Host));
       }
 
       using (var session = MySQLX.GetSession(new { server = $"(address=server.example,priority=100),(address={Host},priority=25),(address=192.0.10.56,priority=75)", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(Host, session.Settings.Server);
-        Assert.AreEqual("server.example", FailoverManager.FailoverGroup.Hosts[0].Host);
-        Assert.AreEqual("192.0.10.56", FailoverManager.FailoverGroup.Hosts[1].Host);
-        Assert.AreEqual(Host, FailoverManager.FailoverGroup.Hosts[2].Host);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(Host));
+        Assert.That(FailoverManager.FailoverGroup.Hosts[0].Host, Is.EqualTo("server.example"));
+        Assert.That(FailoverManager.FailoverGroup.Hosts[1].Host, Is.EqualTo("192.0.10.56"));
+        Assert.That(FailoverManager.FailoverGroup.Hosts[2].Host, Is.EqualTo(Host));
       }
 
       using (var session = MySQLX.GetSession(new { host = $"(address={Host},priority=2),(address={Host},priority=3)", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // Priority outside the 0-100 allowed range.
       Exception ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(new { server = $"(address=server.example,priority=-20),(address={Host},priority=100)", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.AreEqual("The priority must be between 0 and 100.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100."));
 
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(new { server = $"(address=server.example,priority=-50),(address={Host},priority=101)", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.AreEqual("The priority must be between 0 and 100.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100."));
 
       // Set priority for a subset of the hosts.
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(new { server = $"(address=server.example),(address={Host},priority=100)", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.AreEqual("You must either assign no priority to any of the hosts or give a priority for every host.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(new { server = $"(address=server.example,priority=50),(address={Host})", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.AreEqual("You must either assign no priority to any of the hosts or give a priority for every host.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(new { server = $"(address=server.example,priority=50),(address={Host},priority=100),(address=server.example)", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.AreEqual("You must either assign no priority to any of the hosts or give a priority for every host.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
 
       // Automatically set priority if no priority is given.
       string hostList = string.Empty;
@@ -438,11 +438,11 @@ public void PriorityMethodWithAnonymousTypes()
 
       using (var session = MySQLX.GetSession(new { server = hostList, port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         priority = 100;
         foreach (var host in FailoverManager.FailoverGroup.Hosts)
         {
-          Assert.AreEqual(priority != 0 ? priority-- : 0, host.Priority);
+          Assert.That(host.Priority, Is.EqualTo(priority != 0 ? priority-- : 0));
         }
       }
     }
@@ -482,12 +482,12 @@ public void ManyInvalidHost()
                                               sb.UserID + ";password=" + sb.Password + ";connect-timeout=" +
                                               connectionTimeout + ";ssl-mode=Required"))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var schema = session1.GetSchema("test");
-        Assert.IsNotNull(schema);
+        Assert.That(schema, Is.Not.Null);
         schema.DropCollection("test123");
         var testColl = schema.CreateCollection("test123");
-        Assert.IsNotNull(testColl);
+        Assert.That(testColl, Is.Not.Null);
         schema.DropCollection("test123");
       }
 
@@ -501,12 +501,12 @@ public void ManyInvalidHost()
       var connStr = "mysqlx://test:test@[" + hostList + "]" + "?ssl-mode=Required";
       using (var session1 = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var schema = session1.GetSchema("test");
-        Assert.IsNotNull(schema);
+        Assert.That(schema, Is.Not.Null);
         schema.DropCollection("test123");
         var testColl = schema.CreateCollection("test123");
-        Assert.IsNotNull(testColl);
+        Assert.That(testColl, Is.Not.Null);
         schema.DropCollection("test123");
       }
 
@@ -527,12 +527,12 @@ public void ManyInvalidHost()
         sslmode = MySqlSslMode.Disabled
       }))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var schema = session.GetSchema("test");
-        Assert.IsNotNull(schema);
+        Assert.That(schema, Is.Not.Null);
         schema.DropCollection("test123");
         var testColl = schema.CreateCollection("test123");
-        Assert.IsNotNull(testColl);
+        Assert.That(testColl, Is.Not.Null);
         schema.DropCollection("test123");
       }
     }
@@ -546,7 +546,7 @@ public void TwoValidHost()
       var connStr = $"mysqlx://test:test@[ (address={Host}:{XPort}, priority=0,address={Host}:{XPort}, priority=100)]?ssl-mode=Required";
       using (var sessionTest = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, sessionTest.InternalSession.SessionState);
+        Assert.That(sessionTest.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       var address_priority = $"(address = {Host}, priority = 0),(address={Host}, priority=100)";
@@ -555,7 +555,7 @@ public void TwoValidHost()
                 ";password=" + sb.Password + ";ssl-mode=Required";
       using (var sessionTest = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, sessionTest.InternalSession.SessionState);
+        Assert.That(sessionTest.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       using (var sessionTest = MySQLX.GetSession(new
@@ -567,7 +567,7 @@ public void TwoValidHost()
         sslmode = MySqlSslMode.Disabled
       }))
       {
-        Assert.AreEqual(SessionState.Open, sessionTest.InternalSession.SessionState);
+        Assert.That(sessionTest.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
     }
@@ -583,7 +583,7 @@ public void TwoValidHostWithDefaultPort()
 
       using (var sessionTest = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, sessionTest.InternalSession.SessionState);
+        Assert.That(sessionTest.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       var address_priority = $"(address={Host}, priority=0),(address={Host}, priority=100)";
@@ -591,7 +591,7 @@ public void TwoValidHostWithDefaultPort()
                 ";ssl-mode=Required;" + "port=" + sb.Port;
       using (var sessionTest = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, sessionTest.InternalSession.SessionState);
+        Assert.That(sessionTest.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
       using (var sessionTest = MySQLX.GetSession(new
       {
@@ -602,7 +602,7 @@ public void TwoValidHostWithDefaultPort()
         port = sb.Port
       }))
       {
-        Assert.AreEqual(SessionState.Open, sessionTest.InternalSession.SessionState);
+        Assert.That(sessionTest.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
     }
 
@@ -622,26 +622,26 @@ public void IteratedPriority()
         var test = "server=" + hostList[i] + ";uid=test;password=test;connect-timeout=" + connectionTimeout + ";ssl-mode=required;" + "port=" + XPort;
         using (var session1 = MySQLX.GetSession(test))
         {
-          Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+          Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
 
         using (var session1 = MySQLX.GetSession("server=" + hostList[i] + ";port=" + XPort + ";uid=test;password=test;connect-timeout=" + connectionTimeout + ";ssl-mode=Required"))
         {
-          Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+          Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
 
         hostList[i] = "(address=" + Host + ":" + XPort + ",priority=" + (priority != 0 ? priority-- : 0) + ")";
         var connStr = "mysqlx://test:test@[" + hostList[i] + "]?ssl-mode=Required";
         using (var session1 = MySQLX.GetSession(connStr))
         {
-          Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+          Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
 
         hostListPort[i] = $"(address={Host}:{XPort},priority={(priority != 0 ? priority-- : 0)})";
         connStr = "mysqlx://test:test@[" + hostList[i] + "]?ssl-mode=Required";
         using (var session1 = MySQLX.GetSession(connStr))
         {
-          Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+          Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
 
         hostList[i] = "(address=" + Host + ",priority=" + (priority != 0 ? priority-- : 0) + ")";
@@ -654,7 +654,7 @@ public void IteratedPriority()
           sslmode = MySqlSslMode.Required
         }))
         {
-          Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+          Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
       }
     }
@@ -671,14 +671,14 @@ public void PriorityWithSsl()
 
       using (var session1 = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       connStr = $"mysqlx://test:test@[ (address={Host}:{XPort}, priority=100)]" +
                 $"/?ssl-mode=Required&ssl-ca-pwd={certificatePassword}&ssl-ca={sslCa}";
       using (var session1 = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       connStr = $"mysqlx://test:test@[ (address={Host}" + ":" + XPort + ", priority=100)]" +
@@ -689,14 +689,14 @@ public void PriorityWithSsl()
       connStr = "server=" + address_priority + ";port=" + XPort + ";uid=test;password=test;ssl-mode=VerifyCA;ssl-ca-pwd=pass;ssl-ca=" + sslCa;
       using (var session1 = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       address_priority = $"(address = {Host}, priority = 25)";
       connStr = "server=" + address_priority + ";port=" + XPort + ";uid=test;password=test;ssl-mode=Required;ssl-ca-pwd=" + certificatePassword + ";ssl-ca=" + sslCa;
       using (var session1 = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       connStr = "server=" + address_priority + ";port=" + XPort + ";uid=test;password=test;ssl-mode=VerifyFull;ssl-ca-pwd=" +
@@ -714,7 +714,7 @@ public void PriorityWithSsl()
         CertificatePassword = certificatePassword
       }))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       using (var session1 = MySQLX.GetSession(new
@@ -728,7 +728,7 @@ public void PriorityWithSsl()
         CertificatePassword = certificatePassword
       }))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       Assert.Catch(() => MySQLX.GetSession(new
@@ -765,7 +765,7 @@ public void SingleHostWithPriorityVerifyFull()
         CertificatePassword = certificatePassword
       }))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
     }
     #endregion
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
index 3b981419d..895fc3c1c 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
@@ -84,7 +84,7 @@ public void ParseConnectionOptionsTest(ClientOptions clientOptions)
     {
       Client.ConnectionOptions poolingOptions = (Client.ConnectionOptions)clientOptions.Options;
       Client.ConnectionOptions connectionOptionsResult = Client.ParseConnectionOptions(clientOptions.ConnectionOptions);
-      Assert.True(poolingOptions.Equals(connectionOptionsResult));
+      Assert.That(poolingOptions.Equals(connectionOptionsResult));
     }
 
     public struct InvalidOptions
@@ -253,7 +253,7 @@ public void PoolingTest(PoolingTestData poolingTestData)
             Session session = client.GetSession();
             string host = session.SQL("SELECT host FROM information_schema.PROCESSLIST where id=CONNECTION_ID()").Execute().FetchOne().GetString("host");
             sessions.Add(session);
-            Assert.Contains(host, hosts);
+            Assert.That(hosts, Does.Contain(host));
           }
           closeSessions.Invoke();
         }
@@ -273,8 +273,8 @@ public void QueueTimeoutTest()
           Stopwatch stopwatch = Stopwatch.StartNew();
           TimeoutException ex = Assert.Throws<TimeoutException>(() => { Session session2 = client.GetSession(); });
           stopwatch.Stop();
-          Assert.AreEqual(ResourcesX.PoolingQueueTimeout, ex.Message);
-          Assert.True(stopwatch.ElapsedMilliseconds >= timeout);
+          Assert.That(ex.Message, Is.EqualTo(ResourcesX.PoolingQueueTimeout));
+          Assert.That(stopwatch.ElapsedMilliseconds >= timeout);
         }
       }
     }
@@ -288,10 +288,10 @@ public void ReuseSessions()
       using (Client client = MySQLX.GetClient(ConnectionString, new { pooling = new { maxSize = size, queueTimeout = timeout } }))
       {
         Session session = client.GetSession();
-        Assert.AreEqual((sbyte)5, session.SQL("SELECT 5").Execute().FetchOne()[0]);
+        Assert.That(session.SQL("SELECT 5").Execute().FetchOne()[0], Is.EqualTo((sbyte)5));
         session.Close();
         MySqlException ex = Assert.Throws<MySqlException>(() => { session.SQL("SELECT 5").Execute(); });
-        Assert.AreEqual(ResourcesX.InvalidSession, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidSession));
       }
     }
 
@@ -323,7 +323,7 @@ public void MultiHostTest(MultiHostData multiHostData)
       {
         using (Session session = client.GetSession())
         {
-          Assert.AreEqual((sbyte)8, session.SQL("SELECT 8").Execute().FetchOne()[0]);
+          Assert.That(session.SQL("SELECT 8").Execute().FetchOne()[0], Is.EqualTo((sbyte)8));
         }
       }
     }
@@ -354,9 +354,9 @@ public void CloseTests(CloseData closeData)
           session.DropSchema(schemaName);
           session.CreateSchema(schemaName);
           client.Close();
-          Assert.AreEqual(SessionState.Closed, session.XSession.SessionState);
+          Assert.That(session.XSession.SessionState, Is.EqualTo(SessionState.Closed));
           MySqlException ex = Assert.Throws<MySqlException>(() => { closeData.Action.Invoke(session); });
-          Assert.AreEqual(ResourcesX.InvalidSession, ex.Message);
+          Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidSession));
         }
       }
     }
@@ -402,22 +402,22 @@ private void ResetTestBeforeClose(Session session, int id)
       session.SQL(string.Format("SET @a='session{0}'", id)).Execute();
 
       SqlResult res = session.SQL("SELECT @a AS a").Execute();
-      Assert.AreEqual("session" + id, res.FetchAll()[0][0]);
+      Assert.That(res.FetchAll()[0][0], Is.EqualTo("session" + id));
       res = session.SQL("SHOW CREATE TABLE testResetSession" + id).Execute();
-      Assert.AreEqual("testResetSession" + id, res.FetchAll()[0][0]);
+      Assert.That(res.FetchAll()[0][0], Is.EqualTo("testResetSession" + id));
     }
 
     private void ResetTestAfterClose(Session session, int threadId, int id)
     {
-      Assert.AreEqual(threadId, session.ThreadId);
+      Assert.That(session.ThreadId, Is.EqualTo(threadId));
       SqlResult res = session.SQL("SELECT @a IS NULL").Execute();
-      Assert.AreEqual((sbyte)1, res.FetchOne()[0]);
+      Assert.That(res.FetchOne()[0], Is.EqualTo((sbyte)1));
       var ex = Assert.Throws<MySqlException>(() => session.SQL("SHOW CREATE TABLE testResetSession" + id).Execute());
-      StringAssert.AreEqualIgnoringCase(string.Format("Table 'test.testresetsession{0}' doesn't exist", id), ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(string.Format("Table 'test.testresetsession{0}' doesn't exist", id)).IgnoreCase);
 
       session.SQL(string.Format("SET @a='session{0}'", id)).Execute();
       res = session.SQL("SELECT @a AS a").Execute();
-      Assert.AreEqual("session" + id, res.FetchAll()[0][0]);
+      Assert.That(res.FetchAll()[0][0], Is.EqualTo("session" + id));
     }
 
     /// <summary>
@@ -453,13 +453,13 @@ public void ConnectionAttributes()
 
       // Errors
       var ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";connection-attributes=[_key=value]"));
-      Assert.AreEqual(ResourcesX.InvalidUserDefinedAttribute, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidUserDefinedAttribute));
 
       ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";connection-attributes=123"));
-      Assert.AreEqual(ResourcesX.InvalidConnectionAttributes, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidConnectionAttributes));
 
       ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";connection-attributes=[key=value,key=value2]"));
-      Assert.AreEqual(string.Format(ResourcesX.DuplicateUserDefinedAttribute, "key"), ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(string.Format(ResourcesX.DuplicateUserDefinedAttribute, "key")));
 
       MySqlXConnectionStringBuilder builder = new MySqlXConnectionStringBuilder();
       builder.Server = Host;
@@ -467,7 +467,7 @@ public void ConnectionAttributes()
       builder.UserID = RootUser;
       builder.ConnectionAttributes = ";";
       ex = Assert.Throws<MySqlException>(() => MySQLX.GetClient(builder.ConnectionString, "{ \"pooling\": { \"enabled\": true } }"));
-      Assert.AreEqual("The requested value ';' is invalid for the given keyword 'connection-attributes'.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The requested value ';' is invalid for the given keyword 'connection-attributes'."));
     }
 
     private void TestConnectionAttributes(string connString, Dictionary<string, object> userAttrs = null)
@@ -477,31 +477,31 @@ private void TestConnectionAttributes(string connString, Dictionary<string, obje
       using (Client client = MySQLX.GetClient(connString, "{ \"pooling\": { \"enabled\": true } }"))
       using (Session session = client.GetSession())
       {
-        Assert.AreEqual(SessionState.Open, session.XSession.SessionState);
+        Assert.That(session.XSession.SessionState, Is.EqualTo(SessionState.Open));
         var result = session.SQL(sql).Execute().FetchAll();
 
         if (session.Settings.ConnectionAttributes == "false")
-          Assert.IsEmpty(result);
+          Assert.That(result, Is.Empty);
         else
         {
-          Assert.IsNotEmpty(result);
+          Assert.That(result, Is.Not.Empty);
           MySqlConnectAttrs clientAttrs = new MySqlConnectAttrs();
 
           if (userAttrs == null)
           {
-            Assert.AreEqual(8, result.Count);
+            Assert.That(result.Count, Is.EqualTo(8));
 
             foreach (Row row in result)
-              StringAssert.StartsWith("_", row[1].ToString());
+              Assert.That(row[1].ToString(), Does.StartWith("_"));
           }
           else
           {
-            Assert.AreEqual(11, result.Count);
+            Assert.That(result.Count, Is.EqualTo(11));
 
             for (int i = 0; i < userAttrs.Count; i++)
             {
-              Assert.True(userAttrs.ContainsKey(result.ElementAt(i)[1].ToString()));
-              Assert.True(userAttrs.ContainsValue(result.ElementAt(i)[2]));
+              Assert.That(userAttrs.ContainsKey(result.ElementAt(i)[1].ToString()));
+              Assert.That(userAttrs.ContainsValue(result.ElementAt(i)[2]));
             }
           }
         }
@@ -539,9 +539,9 @@ public void ResetConnectionPooling()
         if (res0.HasData)
         {
           var row = res0.FetchOne();
-          Assert.NotNull(row);
+          Assert.That(row, Is.Not.Null);
           connectionID1 = row[0].ToString();
-          Assert.NotNull(connectionID1);
+          Assert.That(connectionID1, Is.Not.Null);
         }
         session1.Close();
         session2 = client1.GetSession();
@@ -549,9 +549,9 @@ public void ResetConnectionPooling()
         if (res0.HasData)
         {
           var row = res0.FetchOne();
-          Assert.NotNull(row);
+          Assert.That(row, Is.Not.Null);
           connectionID1 = row[0].ToString();
-          Assert.NotNull(connectionID1);
+          Assert.That(connectionID1, Is.Not.Null);
         }
         s = session2.GetSchema("newtest");
         col = s.GetCollection("test");
@@ -628,12 +628,12 @@ public void InvalidExceptionMaxConnection()
 
       Client client1 = MySQLX.GetClient(ConnectionStringUri, new { pooling = new { maxSize = 2 } });
       Session session1 = client1.GetSession();
-      Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+      Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
 
       session1.Close();
       session1 = client1.GetSession();
       Session session2 = client1.GetSession();
-      Assert.AreEqual(SessionState.Open, session2.InternalSession.SessionState);
+      Assert.That(session2.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
 
       Client client2 = MySQLX.GetClient(ConnectionStringUri, new { pooling = new { maxSize = 2 } });
       Assert.Catch(() => client2.GetSession());
@@ -743,31 +743,31 @@ public void MaxSizeOptionTests(string inputType)
           using (var client1 = MySQLX.GetClient(ConnectionString, (inputType == "string" ? connectionpooling : connectionpoolingObject)[i]))
           {
             var session1 = client1.GetSession();
-            Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+            Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
           //Uri
           using (var client1 = MySQLX.GetClient(ConnectionStringUri, (inputType == "string" ? connectionpooling : connectionpoolingObject)[i]))
           {
             var session1 = client1.GetSession();
-            Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+            Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
           //Connectin Object
           using (var client1 = MySQLX.GetClient(connObject, (inputType == "string" ? connectionpooling : connectionpoolingObject)[i]))
           {
             var session1 = client1.GetSession();
-            Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+            Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
         }
         else
         {
           Exception ex = Assert.Catch(() => MySQLX.GetClient(ConnectionString, (inputType == "string" ? connectionpooling : connectionpoolingObject)[i]));
-          Assert.True(ex.Message.Contains("'pooling.maxSize' does not support value"), "Expected Exception");
+          Assert.That(ex.Message.Contains("'pooling.maxSize' does not support value"), "Expected Exception");
 
           ex = Assert.Catch(() => MySQLX.GetClient(ConnectionStringUri, (inputType == "string" ? connectionpooling : connectionpoolingObject)[i]));
-          Assert.True(ex.Message.Contains("'pooling.maxSize' does not support value"), "Expected Exception");
+          Assert.That(ex.Message.Contains("'pooling.maxSize' does not support value"), "Expected Exception");
 
           ex = Assert.Catch(() => MySQLX.GetClient(connObject, (inputType == "string" ? connectionpooling : connectionpoolingObject)[i]));
-          Assert.True(ex.Message.Contains("'pooling.maxSize' does not support value"), "Expected Exception");
+          Assert.That(ex.Message.Contains("'pooling.maxSize' does not support value"), "Expected Exception");
         }
       }
     }
@@ -834,7 +834,7 @@ public void QueueTimeoutOptionTests(string inputType)
             Stopwatch stopwatch = Stopwatch.StartNew();
             Assert.Catch(() => client1.GetSession());
             stopwatch.Stop();
-            Assert.True(stopwatch.ElapsedMilliseconds >= timeoutMS);
+            Assert.That(stopwatch.ElapsedMilliseconds >= timeoutMS);
           }
 
           //Uri
@@ -845,7 +845,7 @@ public void QueueTimeoutOptionTests(string inputType)
             Stopwatch stopwatch = Stopwatch.StartNew();
             Assert.Catch(() => client1.GetSession());
             stopwatch.Stop();
-            Assert.True(stopwatch.ElapsedMilliseconds >= timeoutMS);
+            Assert.That(stopwatch.ElapsedMilliseconds >= timeoutMS);
           }
 
           //Anonymous Object
@@ -856,7 +856,7 @@ public void QueueTimeoutOptionTests(string inputType)
             Stopwatch stopwatch = Stopwatch.StartNew();
             Assert.Catch(() => client1.GetSession());
             stopwatch.Stop();
-            Assert.True(stopwatch.ElapsedMilliseconds >= timeoutMS);
+            Assert.That(stopwatch.ElapsedMilliseconds >= timeoutMS);
           }
         }
         else
@@ -899,13 +899,13 @@ public void InvalidConnectionOptions(string inputType)
       {
         //Connection string
         Exception ex = Assert.Catch(() => MySQLX.GetClient(ConnectionString, (inputType == "string" ? connectionpooling : connectionpoolingObject)[i]));
-        Assert.True(ex is ArgumentNullException || ex is ArgumentException);
+        Assert.That(ex is ArgumentNullException || ex is ArgumentException);
         //Uri
         ex = Assert.Catch(() => MySQLX.GetClient(ConnectionStringUri, (inputType == "string" ? connectionpooling : connectionpoolingObject)[i]));
-        Assert.True(ex is ArgumentNullException || ex is ArgumentException);
+        Assert.That(ex is ArgumentNullException || ex is ArgumentException);
         //Anonymous object
         ex = Assert.Catch(() => MySQLX.GetClient(connObject, (inputType == "string" ? connectionpooling : connectionpoolingObject)[i]));
-        Assert.True(ex is ArgumentNullException || ex is ArgumentException);
+        Assert.That(ex is ArgumentNullException || ex is ArgumentException);
       }
     }
 
@@ -942,10 +942,10 @@ public void MultipleHostsAndPriorityTests(string inputType, int hostNameOrIP)
         using (var localSession = client1.GetSession())
         {
           var schema = localSession.GetSchema("test");
-          Assert.IsNotNull(schema);
+          Assert.That(schema, Is.Not.Null);
           schema.DropCollection("test123");
           var testColl = schema.CreateCollection("test123");
-          Assert.IsNotNull(testColl);
+          Assert.That(testColl, Is.Not.Null);
           schema.DropCollection("test123");
         }
       }
@@ -973,10 +973,10 @@ public void MultipleHostsAndPriorityTests(string inputType, int hostNameOrIP)
         using (var localSession = client1.GetSession())
         {
           var schema = localSession.GetSchema("test");
-          Assert.IsNotNull(schema);
+          Assert.That(schema, Is.Not.Null);
           schema.DropCollection("test123");
           var testColl = schema.CreateCollection("test123");
-          Assert.IsNotNull(testColl);
+          Assert.That(testColl, Is.Not.Null);
           schema.DropCollection("test123");
         }
       }
@@ -998,10 +998,10 @@ public void MultipleHostsAndPriorityTests(string inputType, int hostNameOrIP)
         using (var localSession = client1.GetSession())
         {
           var schema = localSession.GetSchema("test");
-          Assert.IsNotNull(schema);
+          Assert.That(schema, Is.Not.Null);
           schema.DropCollection("test123");
           var testColl = schema.CreateCollection("test123");
-          Assert.IsNotNull(testColl);
+          Assert.That(testColl, Is.Not.Null);
           schema.DropCollection("test123");
         }
       }
@@ -1036,41 +1036,41 @@ public void SessionCreatedByClient()
       using (var client1 = MySQLX.GetClient(ConnectionString, connectionpoolingObject))
       {
         var rs1 = client1.GetSession();
-        Assert.AreEqual(SessionState.Open, rs1.InternalSession.SessionState);
+        Assert.That(rs1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       using (var client1 = MySQLX.GetClient(ConnectionStringUri, connectionpoolingObject))
       {
         client1.GetSession();
         var rs1 = client1.GetSession();
-        Assert.AreEqual(SessionState.Open, rs1.InternalSession.SessionState);
+        Assert.That(rs1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       using (var client1 = MySQLX.GetClient(connObject, connectionpoolingObject))
       {
         client1.GetSession();
         var rs1 = client1.GetSession();
-        Assert.AreEqual(SessionState.Open, rs1.InternalSession.SessionState);
+        Assert.That(rs1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       using (var client1 = MySQLX.GetClient(ConnectionString, connectionpooling))
       {
         var rs1 = client1.GetSession();
-        Assert.AreEqual(SessionState.Open, rs1.InternalSession.SessionState);
+        Assert.That(rs1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       using (var client1 = MySQLX.GetClient(ConnectionStringUri, connectionpooling))
       {
         client1.GetSession();
         var rs1 = client1.GetSession();
-        Assert.AreEqual(SessionState.Open, rs1.InternalSession.SessionState);
+        Assert.That(rs1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       using (var client1 = MySQLX.GetClient(connObject, connectionpooling))
       {
         client1.GetSession();
         var rs1 = client1.GetSession();
-        Assert.AreEqual(SessionState.Open, rs1.InternalSession.SessionState);
+        Assert.That(rs1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
     }
@@ -1372,7 +1372,7 @@ public void SessionResetConnectionState()
         }
         else { col1 = db1.CreateCollection("my_collection1"); }
         col1 = db1.GetCollection("my_collection1", true);
-        Assert.IsNotNull(col1);
+        Assert.That(col1, Is.Not.Null);
 
         var db2 = session2.GetSchema("test2");
         if (db2.ExistsInDatabase())
@@ -1389,7 +1389,7 @@ public void SessionResetConnectionState()
         }
         else { col2 = db2.CreateCollection("my_collection2"); }
         col2 = db2.GetCollection("my_collection2", true);
-        Assert.IsNotNull(col2);
+        Assert.That(col2, Is.Not.Null);
         session1.Close();
 
         DbDoc DbDocs1 = new DbDoc();
@@ -1398,21 +1398,21 @@ public void SessionResetConnectionState()
 
         db1 = session1.GetSchema("test1");
         Exception ex = Assert.Throws<MySqlException>(() => db1.ExistsInDatabase());
-        StringAssert.Contains("Session state is not valid", ex.Message);
+        Assert.That(ex.Message, Does.Contain("Session state is not valid"));
 
         var result = col2.Add(DbDocs1).Execute();
-        Assert.IsNotNull(result);
+        Assert.That(result, Is.Not.Null);
 
         session1 = client1.GetSession();
         db1 = session1.GetSchema("test1");
         col1 = db1.GetCollection("my_collection1", true);
         result = col1.Add(DbDocs1).Execute();
-        Assert.IsNotNull(result);
+        Assert.That(result, Is.Not.Null);
         session1.Close();
 
         db1 = session1.GetSchema("test1");
         ex = Assert.Throws<MySqlException>(() => db1.ExistsInDatabase());
-        StringAssert.Contains("Session state is not valid", ex.Message);
+        Assert.That(ex.Message, Does.Contain("Session state is not valid"));
 
         session2.DropSchema("test1");
         session2.DropSchema("test2");
@@ -1442,16 +1442,16 @@ public void ConnectionAttributesLongValue()
         //Connection String
         using (var s1 = MySQLX.GetSession($"{ConnectionString};connectionattributes={maxCombi}"))
         {
-          Assert.AreEqual(SessionState.Open, s1.InternalSession.SessionState);
+          Assert.That(s1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           var truncatedValues = (int)session.SQL("SHOW STATUS LIKE 'Performance_schema_session_connect_attrs_lost'").Execute().First()[0];
-          Assert.True(truncatedValues > connectAttributesLost);
+          Assert.That(truncatedValues > connectAttributesLost);
         }
         //Uri
         using (var s1 = MySQLX.GetSession($"{ConnectionStringUri}?connectionattributes={maxCombi}"))
         {
-          Assert.AreEqual(SessionState.Open, s1.InternalSession.SessionState);
+          Assert.That(s1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           var truncatedValues = (int)session.SQL("SHOW STATUS LIKE 'Performance_schema_session_connect_attrs_lost'").Execute().First()[0];
-          Assert.True(truncatedValues > connectAttributesLost);
+          Assert.That(truncatedValues > connectAttributesLost);
         }
         //Anonymous Object
         using (var s1 = MySQLX.GetSession(new
@@ -1463,9 +1463,9 @@ public void ConnectionAttributesLongValue()
           ConnectionAttributes = maxCombi
         }))
         {
-          Assert.AreEqual(SessionState.Open, s1.InternalSession.SessionState);
+          Assert.That(s1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           var truncatedValues = (int)session.SQL("SHOW STATUS LIKE 'Performance_schema_session_connect_attrs_lost'").Execute().First()[0];
-          Assert.True(truncatedValues > connectAttributesLost);
+          Assert.That(truncatedValues > connectAttributesLost);
         }
       }
     }
@@ -1479,7 +1479,7 @@ public void GetSessionExceptionWithConnetionAttribute()
       , "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual("The requested value '=' is invalid for the given keyword 'connection-attributes'.", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("The requested value '=' is invalid for the given keyword 'connection-attributes'."));
       }
     }
 
@@ -1497,7 +1497,7 @@ public void ConnectionAttributesWithArrays()
         {
           using (Session session1 = client.GetSession())
           {
-            Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+            Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
         }
         //Uri
@@ -1505,7 +1505,7 @@ public void ConnectionAttributesWithArrays()
         {
           using (Session session1 = client.GetSession())
           {
-            Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+            Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
         }
         //Anonymous Object
@@ -1514,7 +1514,7 @@ public void ConnectionAttributesWithArrays()
         {
           using (Session session1 = client.GetSession())
           {
-            Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+            Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
         }
         //MySqlXConnectionStringBuilder
@@ -1534,24 +1534,24 @@ public void ConnectionAttributesWithArrays()
         {
           using (Session session1 = client.GetSession())
           {
-            Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+            Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
         }
         //Connection string
         using (Session session1 = MySQLX.GetSession(ConnectionString + ";connection-attributes=" + arrayCases[i]))
         {
-          Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+          Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
         //Uri
         using (Session session1 = MySQLX.GetSession(ConnectionStringUri + "?connection-attributes=" + arrayCases[i]))
         {
-          Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+          Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
         //Anonymous Object
         sb = new MySqlXConnectionStringBuilder(ConnectionString);
         using (Session session1 = MySQLX.GetSession(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = arrayCases[i] }))
         {
-          Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+          Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
         //MySqlXConnectionStringBuilder
         mysqlx0 = new MySqlXConnectionStringBuilder(ConnectionString);
@@ -1568,7 +1568,7 @@ public void ConnectionAttributesWithArrays()
         mysqlx0.ConnectionAttributes = arrayCases[i].ToString();
         using (Session session1 = MySQLX.GetSession(mysqlx0.ConnectionString))
         {
-          Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+          Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
       }
     }
@@ -1582,7 +1582,7 @@ public void NormalConnectionWithUri()
       {
         using (Session session1 = client.GetSession())
         {
-          Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+          Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
       }
     }
@@ -1609,20 +1609,20 @@ public void ConnectionAttributesKeyRepeatedChars()
       using (Client client = MySQLX.GetClient(ConnectionString + ";connection-attributes=[quua=bar,quua=qux,key]", "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
       //Uri
       using (Client client = MySQLX.GetClient(ConnectionStringUri + "?connection-attributes=[quua=bar,quua=qux,key];", "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
       //Anonymous Object
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
       using (Client client = MySQLX.GetClient(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = "[quua=bar,quua=qux,key=]" }, "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
 
       if (Platform.IsWindows())
@@ -1642,18 +1642,18 @@ public void ConnectionAttributesKeyRepeatedChars()
         using (Client client = MySQLX.GetClient(mysqlx0.ConnectionString, "{ \"pooling\": { \"enabled\": true } }"))
         {
           Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-          Assert.AreEqual(expectedMsg, ex.Message);
+          Assert.That(ex.Message, Is.EqualTo(expectedMsg));
         }
         //Connection String
         Exception ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";connection-attributes=[quua=bar,quua=qux,key]"));
-        Assert.AreEqual(expectedMsg, ex1.Message);
+        Assert.That(ex1.Message, Is.EqualTo(expectedMsg));
         //Uri
         ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUri + "?connection-attributes=[quua=bar,quua=qux,key];"));
-        Assert.AreEqual(expectedMsg, ex1.Message);
+        Assert.That(ex1.Message, Is.EqualTo(expectedMsg));
         //Anonymous Object
         sb = new MySqlXConnectionStringBuilder(ConnectionString);
         ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = "[quua=bar,quua=qux,key=]" }));
-        Assert.AreEqual(expectedMsg, ex1.Message);
+        Assert.That(ex1.Message, Is.EqualTo(expectedMsg));
         //MySqlXConnectionStringBuilder
         mysqlx0 = new MySqlXConnectionStringBuilder(ConnectionString);
         mysqlx0.Database = schemaName;
@@ -1667,7 +1667,7 @@ public void ConnectionAttributesKeyRepeatedChars()
         mysqlx0.CertificateThumbprint = "";
         mysqlx0.ConnectionAttributes = "[quua=bar,quua=qux,key=]";
         ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(mysqlx0.ConnectionString));
-        Assert.AreEqual(expectedMsg, ex1.Message);
+        Assert.That(ex1.Message, Is.EqualTo(expectedMsg));
       }
     }
 
@@ -1679,20 +1679,20 @@ public void ConnectionAttributesWithKey33Chars()
       using (Client client = MySQLX.GetClient(ConnectionString + ";connection-attributes=[foo32foo32foo32foo32foo32foo32323=bar,quua=qux,key]", "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(errorMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(errorMsg));
       }
 
       using (Client client = MySQLX.GetClient(ConnectionStringUri + "?connection-attributes=[foo32foo32foo32foo32foo32foo32323=bar,quua=qux,key];", "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(errorMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(errorMsg));
       }
 
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
       using (Client client = MySQLX.GetClient(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = "[foo32foo32foo32foo32foo32foo32323=bar,quua=qux,key=]" }, "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(errorMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(errorMsg));
       }
 
       if (Platform.IsWindows())
@@ -1710,18 +1710,18 @@ public void ConnectionAttributesWithKey33Chars()
         using (Client client = MySQLX.GetClient(mysqlx0.ConnectionString, "{ \"pooling\": { \"enabled\": true } }"))
         {
           Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-          Assert.AreEqual(errorMsg, ex.Message);
+          Assert.That(ex.Message, Is.EqualTo(errorMsg));
         }
 
         Exception ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";connection-attributes=[foo32foo32foo32foo32foo32foo32323=bar,quua=qux,key]"));
-        Assert.AreEqual(errorMsg, ex1.Message);
+        Assert.That(ex1.Message, Is.EqualTo(errorMsg));
 
         ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUri + "?connection-attributes=[foo32foo32foo32foo32foo32foo32323=bar,quua=qux,key];"));
-        Assert.AreEqual(errorMsg, ex1.Message);
+        Assert.That(ex1.Message, Is.EqualTo(errorMsg));
 
         sb = new MySqlXConnectionStringBuilder(ConnectionString);
         ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = "[foo32foo32foo32foo32foo32foo32323=bar,quua=qux,key=]" }));
-        Assert.AreEqual(errorMsg, ex1.Message);
+        Assert.That(ex1.Message, Is.EqualTo(errorMsg));
 
         mysqlx0 = new MySqlXConnectionStringBuilder(ConnectionString);
         mysqlx0.CharacterSet = "utf8mb4";
@@ -1734,7 +1734,7 @@ public void ConnectionAttributesWithKey33Chars()
         mysqlx0.CertificateThumbprint = "";
         mysqlx0.ConnectionAttributes = "[foo32foo32foo32foo32foo32foo32323=bar,quua=qux,key=]";
         ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(mysqlx0.ConnectionString));
-        Assert.AreEqual(errorMsg, ex1.Message);
+        Assert.That(ex1.Message, Is.EqualTo(errorMsg));
       }
     }
 
@@ -1750,20 +1750,20 @@ public void ConnectionAttributesInvalidCombinations()
         using (Client client = MySQLX.GetClient(ConnectionString + ";connection-attributes=" + invalid[i], "{ \"pooling\": { \"enabled\": true } }"))
         {
           Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-          Assert.True(errorMsgs.Contains(ex.Message));
+          Assert.That(errorMsgs.Contains(ex.Message));
         }
         //Uri
         using (Client client = MySQLX.GetClient(ConnectionStringUri + "?connection-attributes=" + invalid[i], "{ \"pooling\": { \"enabled\": true } }"))
         {
           Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-          Assert.True(errorMsgs.Contains(ex.Message));
+          Assert.That(errorMsgs.Contains(ex.Message));
         }
         //Anonymous object
         MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
         using (Client client = MySQLX.GetClient(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = invalid[i] }, "{ \"pooling\": { \"enabled\": true } }"))
         {
           Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-          Assert.True(errorMsgs.Contains(ex.Message));
+          Assert.That(errorMsgs.Contains(ex.Message));
         }
 
         if (Platform.IsWindows())
@@ -1783,19 +1783,19 @@ public void ConnectionAttributesInvalidCombinations()
           using (Client client = MySQLX.GetClient(mysqlx0.ConnectionString, "{ \"pooling\": { \"enabled\": true } }"))
           {
             Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-            Assert.True(errorMsgs.Contains(ex.Message));
+            Assert.That(errorMsgs.Contains(ex.Message));
           }
 
           //Connection String
           Exception ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";connection-attributes=" + invalid[i]));
-          Assert.True(errorMsgs.Contains(ex1.Message));
+          Assert.That(errorMsgs.Contains(ex1.Message));
           //Uri
           ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUri + "?connection-attributes=" + invalid[i]));
-          Assert.True(errorMsgs.Contains(ex1.Message));
+          Assert.That(errorMsgs.Contains(ex1.Message));
           //Anonymous object
           sb = new MySqlXConnectionStringBuilder(ConnectionString);
           ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = invalid[i] }));
-          Assert.True(errorMsgs.Contains(ex1.Message));
+          Assert.That(errorMsgs.Contains(ex1.Message));
           //MySqlXConnectionStringBuilder
           mysqlx0 = new MySqlXConnectionStringBuilder(ConnectionString);
           mysqlx0.Database = schemaName;
@@ -1809,7 +1809,7 @@ public void ConnectionAttributesInvalidCombinations()
           mysqlx0.CertificateThumbprint = "";
           mysqlx0.ConnectionAttributes = invalid[i].ToString();
           ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(mysqlx0.ConnectionString));
-          Assert.True(errorMsgs.Contains(ex1.Message));
+          Assert.That(errorMsgs.Contains(ex1.Message));
         }
       }
     }
@@ -1827,7 +1827,7 @@ public void ConnectionAttributesValidCombinations()
         {
           using (Session session = client.GetSession())
           {
-            Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+            Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
         }
 
@@ -1835,7 +1835,7 @@ public void ConnectionAttributesValidCombinations()
         {
           using (Session session = client.GetSession())
           {
-            Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+            Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
         }
 
@@ -1844,7 +1844,7 @@ public void ConnectionAttributesValidCombinations()
         {
           using (Session session = client.GetSession())
           {
-            Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+            Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
         }
 
@@ -1863,24 +1863,24 @@ public void ConnectionAttributesValidCombinations()
         {
           using (Session session = client.GetSession())
           {
-            Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+            Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
         }
 
         using (Session session = MySQLX.GetSession(ConnectionString + ";connection-attributes=" + invalid[i]))
         {
-          Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+          Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
 
         using (Session session = MySQLX.GetSession(ConnectionStringUri + "?connection-attributes=" + invalid[i]))
         {
-          Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+          Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
 
         sb = new MySqlXConnectionStringBuilder(ConnectionString);
         using (Session session = MySQLX.GetSession(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = invalid[i] }))
         {
-          Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+          Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
 
         mysqlx0 = new MySqlXConnectionStringBuilder(ConnectionString);
@@ -1897,7 +1897,7 @@ public void ConnectionAttributesValidCombinations()
 
         using (Session session = MySQLX.GetSession(mysqlx0.ConnectionString))
         {
-          Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+          Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
       }
     }
@@ -1912,7 +1912,7 @@ public void ConnectionAttributesKeySpecialChars()
       {
         using (Session session = client.GetSession())
         {
-          Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+          Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
       }
 
@@ -1920,7 +1920,7 @@ public void ConnectionAttributesKeySpecialChars()
       {
         using (Session session = client.GetSession())
         {
-          Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+          Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
       }
 
@@ -1935,7 +1935,7 @@ public void ConnectionAttributesKeySpecialChars()
       {
         using (Session session = client.GetSession())
         {
-          Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+          Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
       }
 
@@ -1954,18 +1954,18 @@ public void ConnectionAttributesKeySpecialChars()
       {
         using (Session session = client.GetSession())
         {
-          Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+          Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
       }
 
       using (Session session = MySQLX.GetSession(ConnectionString + ";connection-attributes=[@#$%^&*()=bar,quua=*(&^&#$%,key]"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       using (Session session = MySQLX.GetSession(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = "[@#$%^&*()=bar,quua=*(&^&#$%,key=]" }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       mysqlx0 = new MySqlXConnectionStringBuilder(ConnectionString);
@@ -1981,7 +1981,7 @@ public void ConnectionAttributesKeySpecialChars()
       mysqlx0.ConnectionAttributes = "[@#$%^&*()=bar,quua=*(&^&#$%,key=]";
       using (Session session = MySQLX.GetSession(mysqlx0.ConnectionString))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
     }
@@ -1997,19 +1997,19 @@ public void ConnectionAttributesKeyWithUnderLineChars()
       using (Client client = MySQLX.GetClient(ConnectionString + ";connection-attributes=[_foo32=bar,quua=qux,key]", "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
       //Uri
       using (Client client = MySQLX.GetClient(ConnectionStringUri + "?connection-attributes=[_foo32=bar,quua=qux,key];", "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
       //Anonymous object
       using (Client client = MySQLX.GetClient(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = "[_foo32=bar,quua=qux,key=]" }, "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
 
       MySqlXConnectionStringBuilder mysqlx0 = new MySqlXConnectionStringBuilder(ConnectionString);
@@ -2026,18 +2026,18 @@ public void ConnectionAttributesKeyWithUnderLineChars()
       using (Client client = MySQLX.GetClient(mysqlx0.ConnectionString, "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
 
       //Connection string
       Exception ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";connection-attributes=[_foo32=bar,quua=qux,key]"));
-      Assert.AreEqual(expectedMsg, ex1.Message);
+      Assert.That(ex1.Message, Is.EqualTo(expectedMsg));
       //Uri
       ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUri + "?connection-attributes=[_foo32=bar,quua=qux,key];"));
-      Assert.AreEqual(expectedMsg, ex1.Message);
+      Assert.That(ex1.Message, Is.EqualTo(expectedMsg));
       //Anonymous object
       ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = "[_foo32=bar,quua=qux,key=]" }));
-      Assert.AreEqual(expectedMsg, ex1.Message);
+      Assert.That(ex1.Message, Is.EqualTo(expectedMsg));
       //MySqlXConnectionStringBuilder
       mysqlx0 = new MySqlXConnectionStringBuilder(ConnectionString);
       mysqlx0.Database = schemaName;
@@ -2051,7 +2051,7 @@ public void ConnectionAttributesKeyWithUnderLineChars()
       mysqlx0.CertificateThumbprint = "";
       mysqlx0.ConnectionAttributes = "[_foo32=bar,quua=qux,key=]";
       ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(mysqlx0.ConnectionString));
-      Assert.AreEqual(expectedMsg, ex1.Message);
+      Assert.That(ex1.Message, Is.EqualTo(expectedMsg));
 
     }
 
@@ -2066,21 +2066,21 @@ public void ConnectionAttributesKeyBlankChars()
       using (Client client = MySQLX.GetClient(ConnectionString + ";connection-attributes=[=bar,quua=qux,key]", "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
 
       //Uri
       using (Client client = MySQLX.GetClient(ConnectionStringUri + "?connection-attributes=[=bar,quua=qux,key];", "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
 
       //Anonymous object
       using (Client client = MySQLX.GetClient(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = "[=bar,quua=qux,key=]" }, "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
 
       //MySqlXConnectionStringBuilder
@@ -2098,18 +2098,18 @@ public void ConnectionAttributesKeyBlankChars()
       using (Client client = MySQLX.GetClient(mysqlx0.ConnectionString, "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
 
       //Connection String
       Exception ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";connection-attributes=[=bar,quua=qux,key]"));
-      Assert.AreEqual(expectedMsg, ex1.Message);
+      Assert.That(ex1.Message, Is.EqualTo(expectedMsg));
       //Uri
       ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUri + "?connection-attributes=[=bar,quua=qux,key];"));
-      Assert.AreEqual(expectedMsg, ex1.Message);
+      Assert.That(ex1.Message, Is.EqualTo(expectedMsg));
       //Anonymous object
       ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = "[=bar,quua=qux,key=]" }));
-      Assert.AreEqual(expectedMsg, ex1.Message);
+      Assert.That(ex1.Message, Is.EqualTo(expectedMsg));
       //MySqlXConnectionStringBuilder
       mysqlx0 = new MySqlXConnectionStringBuilder(ConnectionString);
       mysqlx0.Database = schemaName;
@@ -2123,7 +2123,7 @@ public void ConnectionAttributesKeyBlankChars()
       mysqlx0.CertificateThumbprint = "";
       mysqlx0.ConnectionAttributes = "[=bar,quua=qux,key=]";
       ex1 = Assert.Throws<MySqlException>(() => MySQLX.GetSession(mysqlx0.ConnectionString));
-      Assert.AreEqual(expectedMsg, ex1.Message);
+      Assert.That(ex1.Message, Is.EqualTo(expectedMsg));
 
     }
 
@@ -2139,19 +2139,19 @@ public void ConnectionAttributesValue1025Chars()
       using (Client client = MySQLX.GetClient(ConnectionString + $";connection-attributes={strValue}", "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Catch(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
       //Uri
       using (Client client = MySQLX.GetClient(ConnectionStringUri + $"?connection-attributes={strValue};", "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Catch(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
       //Anonymous object
       using (Client client = MySQLX.GetClient(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = strValue }, "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Catch(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
 
       //MySqlXConnectionStringBuilder
@@ -2169,17 +2169,17 @@ public void ConnectionAttributesValue1025Chars()
       using (Client client = MySQLX.GetClient(mysqlx0.ConnectionString, "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Catch(() => client.GetSession());
-        Assert.AreEqual(expectedMsg, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(expectedMsg));
       }
       //Connection String
       Exception ex2 = Assert.Catch(() => MySQLX.GetSession(ConnectionString + $";connection-attributes={strValue}"));
-      Assert.AreEqual(expectedMsg, ex2.Message);
+      Assert.That(ex2.Message, Is.EqualTo(expectedMsg));
       //Uri
       ex2 = Assert.Catch(() => MySQLX.GetSession(ConnectionStringUri + $"?connection-attributes={strValue};"));
-      Assert.AreEqual(expectedMsg, ex2.Message);
+      Assert.That(ex2.Message, Is.EqualTo(expectedMsg));
       //Anonymous object
       ex2 = Assert.Catch(() => MySQLX.GetSession(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = strValue }));
-      Assert.AreEqual(expectedMsg, ex2.Message);
+      Assert.That(ex2.Message, Is.EqualTo(expectedMsg));
       //MySqlXConnectionStringBuilder
       mysqlx0 = new MySqlXConnectionStringBuilder(ConnectionString);
       mysqlx0.Database = schemaName;
@@ -2193,7 +2193,7 @@ public void ConnectionAttributesValue1025Chars()
       mysqlx0.CertificateThumbprint = "";
       mysqlx0.ConnectionAttributes = strValue;
       ex2 = Assert.Catch(() => MySQLX.GetSession(mysqlx0.ConnectionString));
-      Assert.AreEqual(expectedMsg, ex2.Message);
+      Assert.That(ex2.Message, Is.EqualTo(expectedMsg));
 
     }
 
@@ -2212,12 +2212,12 @@ public void SessionRestore()
         if (res0.HasData)
         {
           var row = res0.FetchOne();
-          Assert.AreEqual("big5", row[1].ToString());
+          Assert.That(row[1].ToString(), Is.EqualTo("big5"));
         }
         session1.Close();
         Session session2 = client.GetSession();
         string threadId2 = session2.SQL("SELECT THREAD_ID FROM performance_schema.threads WHERE PROCESSLIST_ID=CONNECTION_ID()").Execute().FetchOne()[0].ToString();
-        Assert.True(threadId1.Equals(threadId2));
+        Assert.That(threadId1.Equals(threadId2));
         session2.Close();
       }
     }
@@ -2283,8 +2283,8 @@ public void MultiSessionAuthentication()
         Session session4_1 = client.GetSession();
         string threadId5 = session3_1.SQL("SELECT THREAD_ID FROM performance_schema.threads WHERE PROCESSLIST_ID=CONNECTION_ID()").Execute().FetchOne()[0].ToString();
         string threadId6 = session4_1.SQL("SELECT THREAD_ID FROM performance_schema.threads WHERE PROCESSLIST_ID=CONNECTION_ID()").Execute().FetchOne()[0].ToString();
-        Assert.False(threadId3.Equals(threadId5));
-        Assert.False(threadId4.Equals(threadId6));
+        Assert.That(threadId3.Equals(threadId5), Is.False);
+        Assert.That(threadId4.Equals(threadId6), Is.False);
       }
     }
 
@@ -2312,7 +2312,7 @@ public void VerifyDataCleanupAfterClientClose(Client _client1, int iteration, st
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("big5", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("big5"));
       }
       _client1.Close();
       _client1 = MySQLX.GetClient(connectionString, clientOptions);
@@ -2321,7 +2321,7 @@ public void VerifyDataCleanupAfterClientClose(Client _client1, int iteration, st
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("utf8mb4", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("utf8mb4"));
       }
     }
 
@@ -2342,7 +2342,7 @@ public void VerifyDataCleanupOneSession(Client client1, int iteration)
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("big5", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("big5"));
       }
       sess0.Close();
       Session sess4 = client1.GetSession();
@@ -2350,7 +2350,7 @@ public void VerifyDataCleanupOneSession(Client client1, int iteration)
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("utf8mb4", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("utf8mb4"));
       }
     }
 
@@ -2370,7 +2370,7 @@ public void CompareConnectionIDs(Client client1, int maxTimeout, bool maxTimeout
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("big5", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("big5"));
       }
       res0 = sess0.SQL("SELECT CONNECTION_ID()").Execute();
       if (res0.HasData)
@@ -2386,7 +2386,7 @@ public void CompareConnectionIDs(Client client1, int maxTimeout, bool maxTimeout
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("utf8mb4", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("utf8mb4"));
       }
       res0 = sess0.SQL("SELECT CONNECTION_ID()").Execute();
       if (res0.HasData)
@@ -2403,7 +2403,7 @@ public void CompareConnectionIDs(Client client1, int maxTimeout, bool maxTimeout
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("big5", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("big5"));
       }
       res0 = sess0.SQL("SELECT CONNECTION_ID()").Execute();
       if (res0.HasData)
@@ -2420,7 +2420,7 @@ public void CompareConnectionIDs(Client client1, int maxTimeout, bool maxTimeout
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("utf8mb4", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("utf8mb4"));
       }
       res0 = sess0.SQL("SELECT CONNECTION_ID()").Execute();
       if (res0.HasData)
@@ -2432,15 +2432,15 @@ public void CompareConnectionIDs(Client client1, int maxTimeout, bool maxTimeout
       sess0.Close();
       if (maxTimeoutGreater)
       {
-        Assert.False(connectionID1.Equals(connectionID2));
+        Assert.That(connectionID1.Equals(connectionID2), Is.False);
       }
       if (maxTimeoutGreater)
       {
-        Assert.AreNotEqual(cID3, cID2);
+        Assert.That(cID2, Is.Not.EqualTo(cID3));
       }
       else
       {
-        Assert.True(cID3 == cID2);
+        Assert.That(cID3 == cID2);
       }
     }
 
@@ -2459,7 +2459,7 @@ public void CompareConnectionIDs(Client client1, Client client2, Client client3)
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("big5", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("big5"));
       }
       res0 = sess0.SQL("SELECT CONNECTION_ID()").Execute();
       if (res0.HasData)
@@ -2473,7 +2473,7 @@ public void CompareConnectionIDs(Client client1, Client client2, Client client3)
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("utf8mb4", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("utf8mb4"));
       }
       res0 = sess0.SQL("SELECT CONNECTION_ID()").Execute();
       if (res0.HasData)
@@ -2493,7 +2493,7 @@ public void CompareConnectionIDs(Client client1, Client client2, Client client3)
       if (res.HasData)
       {
         var row = res.FetchOne();
-        Assert.AreEqual("big5", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("big5"));
       }
       res = sess.SQL("SELECT CONNECTION_ID()").Execute();
       if (res.HasData)
@@ -2507,7 +2507,7 @@ public void CompareConnectionIDs(Client client1, Client client2, Client client3)
       if (res.HasData)
       {
         var row = res.FetchOne();
-        Assert.AreEqual("utf8mb4", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("utf8mb4"));
       }
       res = sess.SQL("SELECT CONNECTION_ID()").Execute();
       if (res.HasData)
@@ -2516,7 +2516,7 @@ public void CompareConnectionIDs(Client client1, Client client2, Client client3)
         connectionID2 = row[0].ToString();
       }
       sess.Close();
-      Assert.False(connectionID1.Equals(connectionID2));
+      Assert.That(connectionID1.Equals(connectionID2), Is.False);
     }
 
     /// <summary>
@@ -2534,7 +2534,7 @@ public void CompareConnectionIDs(Client client1, int maxTimeout, bool maxTimeout
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("big5", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("big5"));
       }
       res0 = sess0.SQL("SELECT CONNECTION_ID()").Execute();
       if (res0.HasData)
@@ -2550,7 +2550,7 @@ public void CompareConnectionIDs(Client client1, int maxTimeout, bool maxTimeout
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("utf8mb4", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("utf8mb4"));
       }
       res0 = sess0.SQL("SELECT CONNECTION_ID()").Execute();
       if (res0.HasData)
@@ -2567,7 +2567,7 @@ public void CompareConnectionIDs(Client client1, int maxTimeout, bool maxTimeout
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("big5", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("big5"));
       }
       res0 = sess0.SQL("SELECT CONNECTION_ID()").Execute();
       if (res0.HasData)
@@ -2584,7 +2584,7 @@ public void CompareConnectionIDs(Client client1, int maxTimeout, bool maxTimeout
       if (res0.HasData)
       {
         var row = res0.FetchOne();
-        Assert.AreEqual("utf8mb4", row[1].ToString());
+        Assert.That(row[1].ToString(), Is.EqualTo("utf8mb4"));
       }
       res0 = sess0.SQL("SELECT CONNECTION_ID()").Execute();
       if (res0.HasData)
@@ -2596,19 +2596,19 @@ public void CompareConnectionIDs(Client client1, int maxTimeout, bool maxTimeout
       sess0.Close();
       if (maxTimeoutGreater)
       {
-        Assert.False(connectionID1.Equals(connectionID2), "Connection ID Matches when a session is closed and opened again");
+        Assert.That(connectionID1.Equals(connectionID2), Is.False, "Connection ID Matches when a session is closed and opened again");
       }
       if (maxTimeout.CompareTo(sleepTimeout) > 0)
       {
-        Assert.True(cID3 != cID2);
+        Assert.That(cID3 != cID2);
       }
       else if (maxTimeout.CompareTo(sleepTimeout) == 0)
       {
-        Assert.True(cID1 == cID2);
+        Assert.That(cID1 == cID2);
       }
       else
       {
-        Assert.True(cID1 == cID2);
+        Assert.That(cID1 == cID2);
       }
 
     }
@@ -2623,9 +2623,9 @@ public void TestClientQueueTimeout(Client client, int minTime, int maxTime)
     {
       Stopwatch stopwatch = Stopwatch.StartNew();
       Exception ex = Assert.Throws<TimeoutException>(() => client.GetSession());
-      StringAssert.Contains("timeout", ex.Message);
+      Assert.That(ex.Message, Does.Contain("timeout"));
       stopwatch.Stop();
-      Assert.True(stopwatch.ElapsedMilliseconds > minTime && stopwatch.ElapsedMilliseconds < maxTime);
+      Assert.That(stopwatch.ElapsedMilliseconds > minTime && stopwatch.ElapsedMilliseconds < maxTime);
     }
 
     /// <summary>
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs
index 46afde1da..98f85067e 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs
@@ -55,7 +55,7 @@ public void NotificationKill()
       using (Session session1 = MySQLX.GetSession(ConnectionString))
       {
         Schema test = session1.GetSchema("test");
-        Assert.AreEqual(SessionState.Open, session1.XSession.SessionState);
+        Assert.That(session1.XSession.SessionState, Is.EqualTo(SessionState.Open));
         var threadId1 = (UInt64)session1.ThreadId;
 
         // Kill connection
@@ -63,9 +63,9 @@ public void NotificationKill()
         Thread.Sleep(5000);
 
         Exception ex = Assert.Throws<MySqlException>(() => session1.SQL("select 1").Execute());
-        StringAssert.Contains(ResourcesX.NoticeKilledConnection, ex.Message);
+        Assert.That(ex.Message, Does.Contain(ResourcesX.NoticeKilledConnection));
 
-        Assert.AreEqual(SessionState.Closed, session1.XSession.SessionState);
+        Assert.That(session1.XSession.SessionState, Is.EqualTo(SessionState.Closed));
       }
     }
 
@@ -79,14 +79,14 @@ public void NotificationIdle()
       ExecuteSqlAsRoot("SET GLOBAL mysqlx_wait_timeout = 5");
       using (Session localsession = MySQLX.GetSession(ConnectionString))
       {
-        Assert.AreEqual(SessionState.Open, localsession.XSession.SessionState);
+        Assert.That(localsession.XSession.SessionState, Is.EqualTo(SessionState.Open));
         //wait for server to kill idle connection
         Thread.Sleep(7000);
 
         Exception ex = Assert.Throws<MySqlException>(() => localsession.SQL("select 1").Execute());
-        StringAssert.Contains(ResourcesX.NoticeIdleConnection, ex.Message);
+        Assert.That(ex.Message, Does.Contain(ResourcesX.NoticeIdleConnection));
 
-        Assert.AreEqual(SessionState.Closed, localsession.XSession.SessionState);
+        Assert.That(localsession.XSession.SessionState, Is.EqualTo(SessionState.Closed));
       }
       ExecuteSqlAsRoot("SET GLOBAL mysqlx_read_timeout = 28800");
       ExecuteSqlAsRoot("SET GLOBAL mysqlx_wait_timeout = 28800");
@@ -122,8 +122,8 @@ public void CloseWarningsWithCollections(CloseData closeData)
       Thread.Sleep(5000);
 
       MySqlException ex = Assert.Throws<MySqlException>(() => { closeData.Action.Invoke(sessionCol); });
-      Assert.AreEqual(ResourcesX.NoticeKilledConnection, ex.Message);
-      Assert.AreEqual(SessionState.Closed, sessionCol.XSession.SessionState);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.NoticeKilledConnection));
+      Assert.That(sessionCol.XSession.SessionState, Is.EqualTo(SessionState.Closed));
     }
 
     //Shutdown server Notice, exception expected
@@ -135,16 +135,16 @@ public void NotificationShutdown()
 
       using (Session localsession = MySQLX.GetSession(BaseTest.ConnectionString))
       {
-        Assert.AreEqual(SessionState.Open, localsession.XSession.SessionState);
+        Assert.That(localsession.XSession.SessionState, Is.EqualTo(SessionState.Open));
 
         // Shutdown local MySQL Server
         ShutdownServer();
         Thread.Sleep(2000);
 
         Exception ex = Assert.Throws<MySqlException>(() => localsession.SQL("select 1").Execute());
-        StringAssert.Contains(ResourcesX.NoticeServerShutdown, ex.Message);
+        Assert.That(ex.Message, Does.Contain(ResourcesX.NoticeServerShutdown));
 
-        Assert.AreEqual(SessionState.Closed, localsession.XSession.SessionState);
+        Assert.That(localsession.XSession.SessionState, Is.EqualTo(SessionState.Closed));
       }
     }
 
@@ -176,24 +176,24 @@ public void PoolTestCloseOneConnection()
 
         //verify session 1 open
         var result1 = session1.SQL("select sqrt(9) as raiz;").Execute().FetchOne().GetString("raiz");
-        StringAssert.Contains("3", result1);
+        Assert.That(result1, Does.Contain("3"));
 
         //try to use session 2
         Exception ex1 = Assert.Throws<MySqlException>(() => session2.SQL("select sqrt(9) as raiz;").Execute());
-        StringAssert.Contains(ResourcesX.NoticeKilledConnection, ex1.Message);
+        Assert.That(ex1.Message, Does.Contain(ResourcesX.NoticeKilledConnection));
 
         //verify session 3 open
         var result2 = session3.SQL("select sqrt(9) as raiz;").Execute().FetchOne().GetString("raiz");
-        StringAssert.Contains("3", result2);
+        Assert.That(result2, Does.Contain("3"));
 
         //try to use session 2 once it is Invalid
         Exception ex2 = Assert.Throws<MySqlException>(() => session2.SQL("SELECT 5").Execute());
-        Assert.AreEqual(ResourcesX.InvalidSession, ex2.Message);
+        Assert.That(ex2.Message, Is.EqualTo(ResourcesX.InvalidSession));
 
         //reuse session2
         session2 = client.GetSession();
         var result3 = session2.SQL("select sqrt(9) as raiz;").Execute().FetchOne().GetString("raiz");
-        StringAssert.Contains("3", result3);
+        Assert.That(result3, Does.Contain("3"));
       }
     }
 
@@ -216,13 +216,13 @@ public void PoolTestShutdown()
 
         // All connections should receive a close notification and become closed and invalid
         Exception ex1 = Assert.Throws<MySqlException>(() => session1.SQL("select sqrt(9) as raiz;").Execute());
-        StringAssert.Contains(ResourcesX.NoticeServerShutdown, ex1.Message);
+        Assert.That(ex1.Message, Does.Contain(ResourcesX.NoticeServerShutdown));
 
         Exception ex2 = Assert.Throws<MySqlException>(() => session2.SQL("select sqrt(9) as raiz;").Execute());
-        StringAssert.Contains(ResourcesX.NoticeServerShutdown, ex2.Message);
+        Assert.That(ex2.Message, Does.Contain(ResourcesX.NoticeServerShutdown));
 
         Exception ex3 = Assert.Throws<MySqlException>(() => session3.SQL("select sqrt(9) as raiz;").Execute());
-        StringAssert.Contains(ResourcesX.NoticeServerShutdown, ex3.Message);
+        Assert.That(ex3.Message, Does.Contain(ResourcesX.NoticeServerShutdown));
       }
     }
 
@@ -243,10 +243,10 @@ public void PoolWithIdleConnections()
         Thread.Sleep(8000);
 
         Exception ex1 = Assert.Throws<MySqlException>(() => session1.SQL("select sqrt(9) as raiz;").Execute());
-        StringAssert.Contains(ResourcesX.NoticeIdleConnection, ex1.Message);
+        Assert.That(ex1.Message, Does.Contain(ResourcesX.NoticeIdleConnection));
 
         Exception ex2 = Assert.Throws<MySqlException>(() => session2.SQL("select sqrt(9) as raiz;").Execute());
-        StringAssert.Contains(ResourcesX.NoticeIdleConnection, ex2.Message);
+        Assert.That(ex2.Message, Does.Contain(ResourcesX.NoticeIdleConnection));
 
       }
       ExecuteSqlAsRoot("SET GLOBAL mysqlx_read_timeout = 28800");
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs
index 6c9c393df..4e8fec078 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs
@@ -54,7 +54,7 @@ public void CollectionInsert()
       Task.WaitAll(tasksList.ToArray(), TimeSpan.FromMinutes(1));
 
       var count = session.SQL("SELECT COUNT(*) FROM test.test").Execute().FetchOne()[0];
-      Assert.AreEqual(count, coll.Count());
+      Assert.That(coll.Count(), Is.EqualTo(count));
     }
 
     [Test]
@@ -78,15 +78,15 @@ public void MultipleFindAsync()
         tasksList.Add(coll.Find("age = :age").Bind("AgE", i).ExecuteAsync());
       }
 
-      Assert.True(Task.WaitAll(tasksList.ToArray(), TimeSpan.FromMinutes(2)), "WaitAll timeout");
+      Assert.That(Task.WaitAll(tasksList.ToArray(), TimeSpan.FromMinutes(2)), "WaitAll timeout");
       foreach (Task<DocResult<DbDoc>> task in tasksList)
       {
         var doc = task.Result.FetchOne();
         string value = task.Result.Current["age"].ToString();
-        Assert.False(validator.Contains(value), value + " value exists");
+        Assert.That(validator.Contains(value), Is.False, value + " value exists");
         validator.Add(value);
       }
-      Assert.AreEqual(docs, validator.Count);
+      Assert.That(validator.Count, Is.EqualTo(docs));
     }
 
     [Test, Description("Create valid index using a document field type of array and setting array to true/with single key on all possible datatypes concurrently)")]
@@ -102,7 +102,7 @@ public async Task IndexArrayMultiThreading()
       int v1 = await IndexArrayMultiThreading_T1();
       int v2 = await IndexArrayMultiThreading_T2();
 
-      Assert.AreEqual(2, v1 + v2);
+      Assert.That(v1 + v2, Is.EqualTo(2));
     }
 
     private async Task<int> IndexArrayMultiThreading_T1()
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
index df880847c..3da6ab3cb 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
@@ -48,37 +48,37 @@ public void IncorrectlyFormatedIndexDefinition()
       var collection = CreateCollection("test");
 
       Exception ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"type\": \"INDEX\" }"));
-      Assert.AreEqual("Field 'fields' is mandatory.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Field 'fields' is mandatory."));
 
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"TEXT\" } ], \"unexpectedField\" : false }"));
-      Assert.AreEqual("Field name 'unexpectedField' is not allowed.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Field name 'unexpectedField' is not allowed."));
 
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"fields\":$.myField, \"types\":\"TEXT\" } ] }"));
-      Assert.AreEqual("Field 'field' is mandatory.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Field 'field' is mandatory."));
 
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"types\":\"TEXT\" } ] }"));
-      Assert.AreEqual("Field 'type' is mandatory.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Field 'type' is mandatory."));
 
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"TEXT\", \"unexpectedField\" : false } ] }"));
-      Assert.AreEqual("Field name 'unexpectedField' is not allowed.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Field name 'unexpectedField' is not allowed."));
 
       if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
       collection = CreateCollection("test");
 
       ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"INT\" } ], \"type\":\"indexa\" }"));
-      Assert.AreEqual("Argument value 'indexa' for index type is invalid", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Argument value 'indexa' for index type is invalid"));
 
       ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"INT\" } ], \"type\":\"OTheR\" }"));
-      Assert.AreEqual("Argument value 'OTheR' for index type is invalid", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Argument value 'OTheR' for index type is invalid"));
 
       ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex1", "{\"fields\": [ { \"field\":$.myGeoJsonField, \"type\":\"GEOJSON\" } ], \"type\":\"Spatial\" }"));
-      Assert.AreEqual("GEOJSON index requires 'constraint.required: TRUE", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("GEOJSON index requires 'constraint.required: TRUE"));
 
       ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex2", "{\"fields\": [ { \"field\":$.myGeoJsonField, \"type\":\"GEOJSON\" } ], \"type\":\"spatial\" }"));
-      Assert.AreEqual("GEOJSON index requires 'constraint.required: TRUE", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("GEOJSON index requires 'constraint.required: TRUE"));
 
       ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex3", "{\"fields\": [ { \"field\":$.myGeoJsonField, \"type\":\"GEOJSON\" } ], \"type\":\"sPaTiAl\" }"));
-      Assert.AreEqual("GEOJSON index requires 'constraint.required: TRUE", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("GEOJSON index requires 'constraint.required: TRUE"));
     }
 
     [Test]
@@ -215,11 +215,11 @@ public void DropIndex()
 
       collection.DropIndex("myIndex");
       Exception ex = Assert.Throws<Exception>(() => ValidateIndex("myIndex", "test", "t10", false, false, false, 1, 10));
-      Assert.AreEqual("Index not found.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Index not found."));
       ex = Assert.Throws<Exception>(() => ValidateIndex("myIndex", "test", "t10", false, true, false, 2, 10));
-      Assert.AreEqual("Index not found.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Index not found."));
       ex = Assert.Throws<Exception>(() => ValidateIndex("myIndex", "test", "i_u", false, false, true, 3));
-      Assert.AreEqual("Index not found.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Index not found."));
     }
 
     [Test]
@@ -229,7 +229,7 @@ public void CreateIndexWithDuplicateName()
 
       collection.CreateIndex("myUniqueIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"INT\" } ] }");
       Exception ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myUniqueIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"INT\" } ] }"));
-      Assert.AreEqual("Duplicate key name 'myUniqueIndex'", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Duplicate key name 'myUniqueIndex'"));
     }
 
     [Test]
@@ -238,11 +238,11 @@ public void CreateIndexWithInvalidJsonDocumentDefinition()
       var collection = CreateCollection("test");
 
       Exception ex = Assert.Throws<Exception>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\" = $.myField, \"type\" = \"TEXT\" } ] }"));
-      Assert.AreEqual("The value provided is not a valid JSON document. Expected token ':'", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The value provided is not a valid JSON document. Expected token ':'"));
       ex = Assert.Throws<Exception>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"TEXT\" ] }"));
-      Assert.AreEqual("The value provided is not a valid JSON document. Expected token ','", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The value provided is not a valid JSON document. Expected token ','"));
       ex = Assert.Throws<Exception>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, type:\"TEXT\" } }"));
-      Assert.AreEqual("The value provided is not a valid JSON document. Expected token '\"'", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The value provided is not a valid JSON document. Expected token '\"'"));
     }
 
     [Test]
@@ -251,15 +251,15 @@ public void CreateIndexWithInvalidJsonDocumentStructure()
       var collection = CreateCollection("test");
 
       Exception ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"INT\", \"myCustomField\":\"myCustomValue\" } ] }"));
-      Assert.AreEqual("Field name 'myCustomField' is not allowed.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Field name 'myCustomField' is not allowed."));
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"mytype\":\"INT\" } ] }"));
-      Assert.AreEqual("Field 'type' is mandatory.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Field 'type' is mandatory."));
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"myfield\":$.myField, \"type\":\"INT\" } ] }"));
-      Assert.AreEqual("Field 'field' is mandatory.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Field 'field' is mandatory."));
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.name, \"type\":\"TEXT\" , \"myCustomField\":\"myCustomValue\"} ] }"));
-      Assert.AreEqual("Field name 'myCustomField' is not allowed.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Field name 'myCustomField' is not allowed."));
       ex = Assert.Throws<Exception>(() => collection.CreateIndex("myIndex", ""));
-      Assert.AreEqual("The value provided is not a valid JSON document. Index was outside the bounds of the array.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The value provided is not a valid JSON document. Index was outside the bounds of the array."));
     }
 
     [Test]
@@ -268,9 +268,9 @@ public void CreateIndexWithTypeNotIndexOrSpatial()
       var collection = CreateCollection("test");
 
       Exception ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"INT\" } ], \"type\":\"indexa\" }"));
-      Assert.AreEqual("Argument value 'indexa' for index type is invalid", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Argument value 'indexa' for index type is invalid"));
       ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"INT\" } ], \"type\":\"OTheR\" }"));
-      Assert.AreEqual("Argument value 'OTheR' for index type is invalid", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Argument value 'OTheR' for index type is invalid"));
     }
 
     [Test]
@@ -279,7 +279,7 @@ public void CreateSpatialIndexWithRequiredSetToFalse()
       var collection = CreateCollection("test");
 
       Exception ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"GEOJSON\", \"required\":false, \"options\":2, \"srid\":4326 } ], \"type\":\"SPATIAL\" }"));
-      Assert.AreEqual("GEOJSON index requires 'constraint.required: TRUE", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("GEOJSON index requires 'constraint.required: TRUE"));
     }
 
     [Test]
@@ -289,13 +289,13 @@ public void CreateIndexWithInvalidType()
 
       // Missing key length for text type.
       Exception ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex", "{ \"fields\": [ { \"field\":\"$.myField\", \"type\":\"Text\" } ] }"));
-      StringAssert.EndsWith("used in key specification without a key length", ex.Message);
+      Assert.That(ex.Message, Does.EndWith("used in key specification without a key length"));
 
       // Invalid index types.
       ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex", "{ \"fields\": [ { \"field\":\"$.myField\", \"type\":\"Texta\" } ] }"));
-      StringAssert.EndsWith("Invalid or unsupported type specification 'Texta'", ex.Message);
+      Assert.That(ex.Message, Does.EndWith("Invalid or unsupported type specification 'Texta'"));
       ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex", "{ \"fields\": [ { \"field\":\"$.myField\", \"type\":\"INTO\" } ] }"));
-      StringAssert.EndsWith("Invalid or unsupported type specification 'INTO'", ex.Message);
+      Assert.That(ex.Message, Does.EndWith("Invalid or unsupported type specification 'INTO'"));
       try
       {
         collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.name, \"type\":\"Datetime\"} ] }");
@@ -317,10 +317,10 @@ public void CreateIndexWithInvalidGeojsonOptions()
       var collection = CreateCollection("test");
 
       Exception ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex", "{ \"fields\": [ { \"field\":\"$.myField\", \"type\":\"INT\", \"options\":2, \"srid\":4326 } ] }"));
-      Assert.AreEqual("Unsupported argument specification for '$.myField'", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Unsupported argument specification for '$.myField'"));
 
       ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"GEOJSON\", \"options\":2, \"srid\":4326 } ], \"type\":\"SPATIAL\" }"));
-      Assert.AreEqual("GEOJSON index requires 'constraint.required: TRUE", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("GEOJSON index requires 'constraint.required: TRUE"));
     }
 
     [Test]
@@ -341,9 +341,9 @@ public void ValidIndexNames()
       collection.DropIndex("-myIndex");
 
       Exception ex = Assert.Throws<MySqlException>(() => collection.CreateIndex(null, "{\"fields\": [ { \"field\":$.name, \"type\":\"TEXT(64)\" , \"required\":true} ] }"));
-      Assert.AreEqual("Invalid value for argument 'name'", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Invalid value for argument 'name'"));
       ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex1243536464r4urgfu4rgh43urvbnu4rgh4u3rive39irgf9r4fri3jgnfi", "{\"fields\": [ { \"field\":$.name, \"type\":\"TEXT(64)\" , \"required\":true} ] }"));
-      Assert.AreEqual("Identifier name 'myIndex1243536464r4urgfu4rgh43urvbnu4rgh4u3rive39irgf9r4fri3jgnfi' is too long", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Identifier name 'myIndex1243536464r4urgfu4rgh43urvbnu4rgh4u3rive39irgf9r4fri3jgnfi' is too long"));
     }
 
     [Test]
@@ -395,15 +395,15 @@ public void AddIndexAndInsertRecords()
     {
       if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
       Collection testColl = CreateCollection("test1");
-      Assert.IsTrue(testColl.ExistsInDatabase());
+      Assert.That(testColl.ExistsInDatabase());
       testColl.CreateIndex("testIndex", "{\"fields\": [ { \"field\":$.myId, \"type\":\"INTEGER UNSIGNED\" , \"required\":true} ] }");
       testColl.CreateIndex("testIndex1", "{\"fields\": [ { \"field\":$.myAge, \"type\":\"FLOAT UNSIGNED\" , \"required\":true} ] }");
       var result = testColl.Add(new { myId = 1, myAge = 35.1, _id = 1 }).Add(new { myId = 2, myAge = 41.9, _id = 2 }).Execute();
-      Assert.True(result.AffectedItemsCount > 0);
+      Assert.That(result.AffectedItemsCount > 0);
       Collection testCol2 = CreateCollection("test2");
       testCol2.CreateIndex("testIndex2", "{\"fields\": [ { \"field\":$.myId, \"type\":\"INT\" , \"required\":true} ] }");
       result = testCol2.Add(new { myId = 1 }).Execute();
-      Assert.True(result.AffectedItemsCount > 0);
+      Assert.That(result.AffectedItemsCount > 0);
     }
 
     [Test, Description("Create valid index on a single key with all options")]
@@ -416,7 +416,7 @@ public void InsertWithValidIndexAndNoIndex()
       Assert.Throws<MySqlException>(() => ExecuteAddStatement(col.Add(new { age = 10 })));
       col.DropIndex("myIndex");
       result = col.Add(new { age = 10 }).Execute();
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
     }
 
     [Test, Description("Create a valid index on a single key of all DATATYPES.Datatypes supported: INT [UNSIGNED] TINYINT [UNSIGNED] SMALLINT [UNSIGNED] MEDIUMINT [UNSIGNED] INTEGER [UNSIGNED] BIGINT [UNSIGNED] REAL [UNSIGNED] FLOAT [UNSIGNED] DOUBLE [UNSIGNED] DECIMAL [UNSIGNED] NUMERIC [UNSIGNED] DATE TIME TIMESTAMP DATETIME TEXT[(length)]")]
@@ -482,7 +482,7 @@ public void IndexWithMismatchedDatatypes()
       Result result = col.Add(new { name = "Sakila", age = 15 }).Execute();
       Thread.Sleep(2000);
       Exception ex = Assert.Throws<MySqlException>(() => col.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.name, \"type\":\"DATETIME\"} ] }"));
-      StringAssert.Contains("Incorrect datetime value", ex.Message);
+      Assert.That(ex.Message, Does.Contain("Incorrect datetime value"));
     }
 
     [Test, Description("Create an index specifiying SPATIAL as the index type for a non spatial data type and vice versa")]
@@ -583,7 +583,7 @@ public void CountRecordsInsertedWithValidIndex()
       result = col.Add(new { name = "Maria", age = 20 }).Execute();
       result = col.Add(new { name = "Maria", age = 21 }).Execute();
       var Removing = col.Remove("name='Maria'").Execute();
-      Assert.AreEqual(2, (int)Removing.AffectedItemsCount, "Matches");
+      Assert.That((int)Removing.AffectedItemsCount, Is.EqualTo(2), "Matches");
     }
 
     [Test, Description("Create invalid index with non-existent key")]
@@ -633,14 +633,14 @@ public void IndexWithArrayOptionSingleKeyAfterInsertData()
       collection.Add(doc11).Execute();
       collection.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "Time" + "\", \"array\": true}]}");
       var docResult = collection.Find("'23:59:59.15' in myField").Execute();
-      Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID");
       docResult = collection.Find("'1' in $.myField").Execute();
-      Assert.AreEqual(3, docResult.FetchAll().Count, "Matching the document ID");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(3), "Matching the document ID");
       docResult = collection.Find("1 in $.myField").Execute();
-      Assert.AreEqual(3, docResult.FetchAll().Count, "Matching the document ID");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(3), "Matching the document ID");
       docResult = collection.Find(":myField IN $.myField").Bind("myField", "23:59:59.15").Execute();
       docResult = collection.Find(":myField IN $._id").Bind("myField", true).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
       collection = CreateCollection("test");
       collection.Add(doc).Execute();
@@ -839,13 +839,13 @@ public void IndexWithArrayOptionSingleKeyBeforeInsertData()
       doc = new[] { new { _id = 1, name = "Char", myField = new[] { "foo@mail.com" } } };
       collection.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "CHAR(11)" + "\", \"array\": true}]}");
       Exception ex = Assert.Throws<MySqlException>(() => collection.Add(doc).Execute());
-      Assert.AreEqual("Data too long for functional index 'myIndex'.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Data too long for functional index 'myIndex'."));
 
       collection = CreateCollection("test");
       var doc1 = new[] { new { _id = 1, name = "Char", myField = "foo@mail.com" } };
       collection.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "CHAR(11)" + "\", \"array\": true}]}");
       ex = Assert.Throws<MySqlException>(() => collection.Add(doc1).Execute());
-      Assert.AreEqual("Data too long for functional index 'myIndex'.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Data too long for functional index 'myIndex'."));
 
       collection = CreateCollection("test");
       doc = new[] { new { _id = 1, name = "Binary", myField = new[] { "foo@mail.com", "bar@mail.com", "qux@mail.com" } } };
@@ -997,34 +997,34 @@ public void IndexArrayCombinations()
       Assert.Throws<FormatException>(() => coll.CreateIndex("charArrayIndex1", "{\"fields\": [{\"field\": \"$.charField1\", \"array\": true}]}"));
 
       Exception e = Assert.Throws<MySqlException>(() => coll.CreateIndex("intArrayIndex1", "{\"fields\": [{\"field\": \"$.intField1\", \"type\": \"SIGNED INTEGER\", \"array\": null}]}"));
-      Assert.AreEqual(expectedException, e.Message, "Matching the expected exception");
+      Assert.That(e.Message, Is.EqualTo(expectedException), "Matching the expected exception");
 
       e = Assert.Throws<MySqlException>(() => coll.CreateIndex("intArrayIndex1", "{\"fields\": [{\"field\": \"$.intField1\", \"type\": \"SIGNED INTEGER\", \"array\": NULL}]}"));
-      Assert.AreEqual(expectedException, e.Message, "Matching the expected exception");
+      Assert.That(e.Message, Is.EqualTo(expectedException), "Matching the expected exception");
 
       e = Assert.Throws<MySqlException>(() => coll.CreateIndex("uintArrayIndex1", "{\"fields\": [{\"field\": \"$.uintField\", \"type\": \"UNSIGNED INTEGER\", \"array\": null}]}"));
-      Assert.AreEqual(expectedException, e.Message, "Matching the expected exception");
+      Assert.That(e.Message, Is.EqualTo(expectedException), "Matching the expected exception");
 
       e = Assert.Throws<MySqlException>(() => coll.CreateIndex("floatArrayIndex1", "{\"fields\": [{\"field\": \"$.floatField\", \"type\": \"DECIMAL(10,2)\", \"array\": null}]}"));
-      Assert.AreEqual(expectedException, e.Message, "Matching the expected exception");
+      Assert.That(e.Message, Is.EqualTo(expectedException), "Matching the expected exception");
 
       e = Assert.Throws<MySqlException>(() => coll.CreateIndex("floatArrayIndex1", "{\"fields\": [{\"field\": \"$.floatField\", \"type\": \"DECIMAL(10,2)\", \"array\": NULL}]}"));
-      Assert.AreEqual(expectedException, e.Message, "Matching the expected exception");
+      Assert.That(e.Message, Is.EqualTo(expectedException), "Matching the expected exception");
 
       e = Assert.Throws<MySqlException>(() => coll.CreateIndex("dateArrayIndex1", "{\"fields\": [{\"field\": \"$.dateField\", \"type\": \"DATE\", \"array\": null}]}"));
-      Assert.AreEqual(expectedException, e.Message, "Matching the expected exception");
+      Assert.That(e.Message, Is.EqualTo(expectedException), "Matching the expected exception");
 
       e = Assert.Throws<MySqlException>(() => coll.CreateIndex("datetimeArrayIndex1", "{\"fields\": [{\"field\": \"$.datetimeField\", \"type\": \"DATETIME\", \"array\": null}]}"));
-      Assert.AreEqual(expectedException, e.Message, "Matching the expected exception");
+      Assert.That(e.Message, Is.EqualTo(expectedException), "Matching the expected exception");
 
       e = Assert.Throws<MySqlException>(() => coll.CreateIndex("timeArrayIndex1", "{\"fields\": [{\"field\": \"$.timeField\", \"type\": \"TIME\", \"array\": null}]}"));
-      Assert.AreEqual(expectedException, e.Message, "Matching the expected exception");
+      Assert.That(e.Message, Is.EqualTo(expectedException), "Matching the expected exception");
 
       e = Assert.Throws<MySqlException>(() => coll.CreateIndex("charArrayIndex1", "{\"fields\": [{\"field\": \"$.charField\", \"type\": \"CHAR(256)\", \"array\": null}]}"));
-      Assert.AreEqual(expectedException, e.Message, "Matching the expected exception");
+      Assert.That(e.Message, Is.EqualTo(expectedException), "Matching the expected exception");
 
       e = Assert.Throws<MySqlException>(() => coll.CreateIndex("binaryArrayIndex1", "{\"fields\": [{\"field\": \"$.binaryField\", \"type\": \"BINARY(256)\", \"array\": null}]}"));
-      Assert.AreEqual(expectedException, e.Message, "Matching the expected exception");
+      Assert.That(e.Message, Is.EqualTo(expectedException), "Matching the expected exception");
 
       Assert.Throws<MySqlException>(() => ExecuteAddStatement(coll.Add("{\"intField\" : [1,[2, 3],4], \"uintField\" : [51,[52, 53],54], \"dateField\" : [\"2019-1-1\", [\"2019-2-1\", \"2019-3-1\"], \"2019-4-1\"], " +
             "\"datetimeField\" : [\"9999-12-30 23:59:59\", [\"9999-12-31 23:59:59\"], \"9999-12-31 23:59:59\"], \"charField\" : [\"abcd1\", \"abcd1\", \"abcd2\", \"abcd4\"], " +
@@ -1041,7 +1041,7 @@ public void IndexArrayCombinations()
       for (int i = 0; i < fields.Length; i++)
       {
         var res = coll.Add(fields[i]).Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
       }
 
       fields = new string[] {"{\"intField\" : []}", "{\"uintField\" : []}", "{\"charField\" : []}",
@@ -1049,7 +1049,7 @@ public void IndexArrayCombinations()
       for (int i = 0; i < fields.Length; i++)
       {
         var res = coll.Add(fields[i]).Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
       }
 
       fields = new string[] { "[]", "[]", "[]", "[]", "[]", "[]", "[]", "[]" };
@@ -1153,7 +1153,7 @@ public void IndexArrayCombinations()
       DbDoc doc = docs.FetchOne();
       var findStatement = coll.Find("57.6");
       var res1 = findStatement.Execute().FetchAll();
-      Assert.AreEqual(5, res1.Count, "Matching the find count");
+      Assert.That(res1.Count, Is.EqualTo(5), "Matching the find count");
 
       coll = CreateCollection("test");
 
@@ -1244,17 +1244,17 @@ public void IndexArrayBugWorkAround()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "Time" + "\", \"array\": true}]}");
       var docResult = coll.Find("CAST(CAST('12:00:00' as TIME) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time");
       docResult = coll.Find("CAST(CAST('9:00:00' as TIME) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time");
       docResult = coll.Find("CAST(CAST(:dt as TIME) as JSON) in $.myField").Bind("dt", "9:00:00").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as TIME) as JSON) in $.myField").Bind("dt", "12:00:00").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time-With Bind");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "9:00:00").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time-With Bind-Bug");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "01:01:01.001").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time-With Bind-Bug");
 
       coll = CreateCollection("test");
       doc = new[] { new { _id = 1, name = "Decimal", myField = "5" } };
@@ -1263,19 +1263,19 @@ public void IndexArrayBugWorkAround()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "Decimal" + "\", \"array\": true}]}");
       docResult = coll.Find("CAST(CAST('3.0' as DECIMAL) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal");
       docResult = coll.Find("CAST(CAST('5' as DECIMAL) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal");
       docResult = coll.Find("CAST(CAST(:dt as DECIMAL) as JSON) in $.myField").Bind("dt", "5").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as DECIMAL) as JSON) in $.myField").Bind("dt", "3.0").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal-With Bind");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "5").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal-With Bind-Bug");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", 5).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal-With Bind-Bug");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", 3.0).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal-With Bind-Bug");
 
       coll = CreateCollection("test");
       doc = new[] { new { _id = 1, name = "Date", myField = "2019-01-04" } };
@@ -1284,19 +1284,19 @@ public void IndexArrayBugWorkAround()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "Date" + "\", \"array\": true}]}");
       docResult = coll.Find("CAST(CAST('2019-01-04' as DATE) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date");
       docResult = coll.Find("CAST(CAST('2019-01-01' as DATE) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date");
       docResult = coll.Find("CAST(CAST(:dt as DATE) as JSON) in $.myField").Bind("dt", "2019-01-04").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as DATE) as JSON) in $.myField").Bind("dt", "2019-01-01").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date-With Bind");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", 2019 - 01 - 04).Execute();
-      Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the document ID-Date-With Bind-Bug");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "2019-01-04").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date-With Bind-Bug");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "2019-01-01").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date-With Bind-Bug");
 
       coll = CreateCollection("test");
       doc = new[] { new { _id = 1, name = "DateTime", myField = "9999-02-02 01:20:33" } };
@@ -1305,17 +1305,17 @@ public void IndexArrayBugWorkAround()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "DateTime" + "\", \"array\": true}]}");
       docResult = coll.Find("CAST(CAST('1000-01-01 00:00:00' as DATETIME) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-DateTime");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-DateTime");
       docResult = coll.Find("CAST(CAST('9999-02-02 01:20:33' as DATETIME) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-DateTime");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-DateTime");
       docResult = coll.Find("CAST(CAST(:dt as DATETIME) as JSON) in $.myField").Bind("dt", "9999-02-02 01:20:33").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as DATETIME) as JSON) in $.myField").Bind("dt", "9999-12-31 23:59:59").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date-With Bind");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "9999-02-02 01:20:33").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-DateTime-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-DateTime-With Bind-Bug");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "1000-01-01 00:00:00").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-DateTime-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-DateTime-With Bind-Bug");
 
       coll = CreateCollection("test");
       doc = new[] { new { _id = 1, name = "Signed", myField = "100" } };
@@ -1324,19 +1324,19 @@ public void IndexArrayBugWorkAround()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "Signed" + "\", \"array\": true}]}");
       docResult = coll.Find("CAST(CAST('100' as SIGNED) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED");
       docResult = coll.Find("CAST(CAST('3' as SIGNED) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED");
       docResult = coll.Find("CAST(CAST(:dt as SIGNED) as JSON) in $.myField").Bind("dt", "100").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as SIGNED) as JSON) in $.myField").Bind("dt", "19").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED-With Bind");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", 100).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Signed-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Signed-With Bind");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "100").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Signed-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Signed-With Bind");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "3").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Signed-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Signed-With Bind");
 
       coll = CreateCollection("test");
       doc = new[] { new { _id = 1, name = "SIGNED INTEGER", myField = "100" } };
@@ -1345,21 +1345,21 @@ public void IndexArrayBugWorkAround()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "SIGNED INTEGER" + "\", \"array\": true}]}");
       docResult = coll.Find("CAST(CAST('100' as SIGNED INTEGER) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER");
       docResult = coll.Find("CAST(CAST('3' as SIGNED INTEGER) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER");
       docResult = coll.Find("CAST(CAST(:dt as SIGNED INTEGER) as JSON) in $.myField").Bind("dt", "100").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as SIGNED INTEGER) as JSON) in $.myField").Bind("dt", "19").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", 100).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "100").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", 3).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "3").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
 
       coll = CreateCollection("test");
       doc = new[] { new { _id = 1, name = "Unsigned", myField = "100" } };
@@ -1368,21 +1368,21 @@ public void IndexArrayBugWorkAround()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "Unsigned" + "\", \"array\": true}]}");
       docResult = coll.Find("CAST(CAST('100' as UNSIGNED) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned");
       docResult = coll.Find("CAST(CAST('3' as UNSIGNED) as JSON) in $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned");
       docResult = coll.Find("CAST(CAST(:dt as UNSIGNED) as JSON) in $.myField").Bind("dt", "100").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as UNSIGNED) as JSON) in $.myField").Bind("dt", "19").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", 100).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind-Bug");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "100").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind-Bug");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", 3).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind-Bug");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "3").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind-Bug");
 
       coll = CreateCollection("test");
       doc = new[] { new { _id = 1, name = "Char", myField = "too@mail.com" } };
@@ -1391,9 +1391,9 @@ public void IndexArrayBugWorkAround()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "CHAR(128)" + "\", \"array\": true}]}");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "too@mail.com").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-CHAR(128)-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-CHAR(128)-With Bind");
       docResult = coll.Find(":dt IN $.myField").Bind("dt", "foo@mail.com").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-CHAR(128)-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-CHAR(128)-With Bind");
     }
 
     /// <summary>
@@ -1409,34 +1409,34 @@ public void IndexArrayWorkAroundOverlaps()
       coll.Add(doc).Execute();
       coll.Add(doc22).Execute();
       var docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "9:00:00").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind-Bug before index creation");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time-With Bind-Bug before index creation");
       docResult = coll.Find(":dt not overlaps $.myField").Bind("dt", "9:00:00").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind-Bug before index creation");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time-With Bind-Bug before index creation");
       docResult = coll.Find("CAST(CAST('01:01:01.001' as TIME) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the document ID-Time before index creation");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the document ID-Time before index creation");
       docResult = coll.Find("CAST(CAST('01:01:01.001' as TIME) as JSON) not overlaps $.myField").Execute();
-      Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID-Time before index creation");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID-Time before index creation");
 
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "Time" + "\", \"array\": true}]}");
 
       docResult = coll.Find("CAST(CAST('12:00:00' as TIME) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time");
       docResult = coll.Find("CAST(CAST('9:00:00' as TIME) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time");
       docResult = coll.Find("CAST(CAST(:dt as TIME) as JSON) overlaps $.myField").Bind("dt", "9:00:00").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as TIME) as JSON) overlaps $.myField").Bind("dt", "12:00:00").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time-With Bind");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "9:00:00").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time-With Bind-Bug");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "01:01:01.001").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time-With Bind-Bug");
       docResult = coll.Find(":dt not overlaps $.myField").Bind("dt", "01:01:01.001").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time-With Bind-Bug");
       docResult = coll.Find(":dt not IN $.myField").Bind("dt", "01:01:01.001").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time-With Bind-Bug");
       docResult = coll.Find("CAST(CAST(:dt as TIME) as JSON) not overlaps $.myField").Bind("dt", "12:00:00").Execute();
-      Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID-Time-With Bind");
 
       coll = CreateCollection("test");
 
@@ -1445,35 +1445,35 @@ public void IndexArrayWorkAroundOverlaps()
       coll.Add(doc).Execute();
       coll.Add(doc22).Execute();
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "5").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-DECIMAL-With Bind-Bug before index creation");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-DECIMAL-With Bind-Bug before index creation");
       docResult = coll.Find(":dt not overlaps $.myField").Bind("dt", "5").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-DECIMAL-With Bind-Bug before index creation");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-DECIMAL-With Bind-Bug before index creation");
       docResult = coll.Find("CAST(CAST('5' as DECIMAL) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the document ID-DECIMAL before index creation");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the document ID-DECIMAL before index creation");
       docResult = coll.Find("CAST(CAST('5' as DECIMAL) as JSON) not overlaps $.myField").Execute();
-      Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID-DECIMAL before index creation");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID-DECIMAL before index creation");
 
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "Decimal" + "\", \"array\": true}]}");
       docResult = coll.Find("CAST(CAST('3.0' as DECIMAL) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal");
       docResult = coll.Find("CAST(CAST('5' as DECIMAL) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal");
       docResult = coll.Find("CAST(CAST(:dt as DECIMAL) as JSON) overlaps $.myField").Bind("dt", "5").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as DECIMAL) as JSON) overlaps $.myField").Bind("dt", "3.0").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal-With Bind");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "5").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal-With Bind-Bug");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", 5).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal-With Bind-Bug");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", 3.0).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal-With Bind-Bug");
       docResult = coll.Find(":dt not overlaps $.myField").Bind("dt", "5").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Decimal-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Decimal-With Bind-Bug");
       docResult = coll.Find(":dt not overlaps $.myField").Bind("dt", 3.0).Execute();
-      Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID-Decimal-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID-Decimal-With Bind-Bug");
       docResult = coll.Find("CAST(CAST(:dt as DECIMAL) as JSON) not overlaps $.myField").Bind("dt", "3.0").Execute();
-      Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID-Decimal-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID-Decimal-With Bind");
 
       coll = CreateCollection("test");
 
@@ -1483,23 +1483,23 @@ public void IndexArrayWorkAroundOverlaps()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "Date" + "\", \"array\": true}]}");
       docResult = coll.Find("CAST(CAST('2019-01-04' as DATE) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date");
       docResult = coll.Find("CAST(CAST('2019-01-01' as DATE) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date");
       docResult = coll.Find("CAST(CAST(:dt as DATE) as JSON) overlaps $.myField").Bind("dt", "2019-01-04").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as DATE) as JSON) overlaps $.myField").Bind("dt", "2019-01-01").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date-With Bind");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", 2019 - 01 - 04).Execute();
-      Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the document ID-Date-With Bind-Bug");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "2019-01-04").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date-With Bind-Bug");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "2019-01-01").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date-With Bind-Bug");
       docResult = coll.Find(":dt not overlaps $.myField").Bind("dt", "2019-01-01").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date-With Bind-Bug");
       docResult = coll.Find("CAST(CAST(:dt as DATE) as JSON) not overlaps $.myField").Bind("dt", "2019-01-04").Execute();
-      Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID-Date-With Bind");
 
       coll = CreateCollection("test");
 
@@ -1509,21 +1509,21 @@ public void IndexArrayWorkAroundOverlaps()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "DateTime" + "\", \"array\": true}]}");
       docResult = coll.Find("CAST(CAST('1000-01-01 00:00:00' as DATETIME) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-DateTime");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-DateTime");
       docResult = coll.Find("CAST(CAST('9999-02-02 01:20:33' as DATETIME) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-DateTime");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-DateTime");
       docResult = coll.Find("CAST(CAST(:dt as DATETIME) as JSON) overlaps $.myField").Bind("dt", "9999-02-02 01:20:33").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as DATETIME) as JSON) overlaps $.myField").Bind("dt", "9999-12-31 23:59:59").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Date-With Bind");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "9999-02-02 01:20:33").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-DateTime-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-DateTime-With Bind-Bug");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "1000-01-01 00:00:00").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-DateTime-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-DateTime-With Bind-Bug");
       docResult = coll.Find(":dt not overlaps $.myField").Bind("dt", "1000-01-01 00:00:00").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-DateTime-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-DateTime-With Bind-Bug");
       docResult = coll.Find("CAST(CAST(:dt as DATETIME) as JSON) not overlaps $.myField").Bind("dt", "9999-12-31 23:59:59").Execute();
-      Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID-Date-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID-Date-With Bind");
 
       coll = CreateCollection("test");
 
@@ -1533,23 +1533,23 @@ public void IndexArrayWorkAroundOverlaps()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "Signed" + "\", \"array\": true}]}");
       docResult = coll.Find("CAST(CAST('100' as SIGNED) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED");
       docResult = coll.Find("CAST(CAST('3' as SIGNED) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED");
       docResult = coll.Find("CAST(CAST(:dt as SIGNED) as JSON) overlaps $.myField").Bind("dt", "100").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as SIGNED) as JSON) overlaps $.myField").Bind("dt", "19").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED-With Bind");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", 100).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Signed-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Signed-With Bind");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "100").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Signed-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Signed-With Bind");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "3").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Signed-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Signed-With Bind");
       docResult = coll.Find(":dt not overlaps $.myField").Bind("dt", "100").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Signed-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Signed-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as SIGNED) as JSON) not overlaps $.myField").Bind("dt", "19").Execute();
-      Assert.AreEqual(2, docResult.FetchAll().Count, "Matching the document ID-SIGNED-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(2), "Matching the document ID-SIGNED-With Bind");
 
       coll = CreateCollection("test");
       doc = new[] { new { _id = 1, name = "SIGNED INTEGER", myField = "100" } };
@@ -1558,25 +1558,25 @@ public void IndexArrayWorkAroundOverlaps()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "SIGNED INTEGER" + "\", \"array\": true}]}");
       docResult = coll.Find("CAST(CAST('100' as SIGNED INTEGER) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER");
       docResult = coll.Find("CAST(CAST('3' as SIGNED INTEGER) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER");
       docResult = coll.Find("CAST(CAST(:dt as SIGNED INTEGER) as JSON) overlaps $.myField").Bind("dt", "100").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as SIGNED INTEGER) as JSON) overlaps $.myField").Bind("dt", "19").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", 100).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "100").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", 3).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "3").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
       docResult = coll.Find(":dt not overlaps $.myField").Bind("dt", "3").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind-Bug");
       docResult = coll.Find("CAST(CAST(:dt as SIGNED INTEGER) as JSON) overlaps $.myField").Bind("dt", "19").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-SIGNED INTEGER-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-SIGNED INTEGER-With Bind");
 
       coll = CreateCollection("test");
       doc = new[] { new { _id = 1, name = "Unsigned", myField = "100" } };
@@ -1585,25 +1585,25 @@ public void IndexArrayWorkAroundOverlaps()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "Unsigned" + "\", \"array\": true}]}");
       docResult = coll.Find("CAST(CAST('100' as UNSIGNED) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned");
       docResult = coll.Find("CAST(CAST('3' as UNSIGNED) as JSON) overlaps $.myField").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned");
       docResult = coll.Find("CAST(CAST(:dt as UNSIGNED) as JSON) overlaps $.myField").Bind("dt", "100").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind");
       docResult = coll.Find("CAST(CAST(:dt as UNSIGNED) as JSON) overlaps $.myField").Bind("dt", "19").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", 100).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind-Bug");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "100").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind-Bug");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", 3).Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind-Bug");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "3").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind-Bug");
       docResult = coll.Find(":dt not overlaps $.myField").Bind("dt", "3").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind-Bug");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind-Bug");
       docResult = coll.Find("CAST(CAST(:dt as UNSIGNED) as JSON) overlaps $.myField").Bind("dt", "19").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Unsigned-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Unsigned-With Bind");
 
       coll = CreateCollection("test");
       doc = new[] { new { _id = 1, name = "Char", myField = "too@mail.com" } };
@@ -1612,11 +1612,11 @@ public void IndexArrayWorkAroundOverlaps()
       coll.Add(doc22).Execute();
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"" + "CHAR(128)" + "\", \"array\": true}]}");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "too@mail.com").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-CHAR(128)-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-CHAR(128)-With Bind");
       docResult = coll.Find(":dt overlaps $.myField").Bind("dt", "foo@mail.com").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-CHAR(128)-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-CHAR(128)-With Bind");
       docResult = coll.Find(":dt not overlaps $.myField").Bind("dt", "foo@mail.com").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-CHAR(128)-With Bind");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-CHAR(128)-With Bind");
     }
 
     [Test, Description("Index using overlaps")]
@@ -1635,34 +1635,34 @@ public void IndexArrayWithOverlaps()
       coll.Add(doc34).Execute();
 
       var docResult = coll.Find(":dt overlaps $.myField1").Bind("dt", "9:00:00").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the document ID-Time-With Bind-Bug before index creation");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID-Time-With Bind-Bug before index creation");
       coll.CreateIndex("myIndex1", "{\"fields\": [{\"field\": $.myField1, \"type\":\"" + "Time" + "\", \"array\": true}]}");
       coll.CreateIndex("myIndex2", "{\"fields\": [{\"field\": $.myField2, \"type\":\"" + "Time" + "\", \"array\": true}]}");
       coll.CreateIndex("myIndex3", "{\"fields\": [{\"field\": $.myField3, \"type\":\"" + "Time" + "\", \"array\": true}]}");
       coll.CreateIndex("myIndex4", "{\"fields\": [{\"field\": $.myField1, \"type\":\"" + "Time" + "\", \"array\": true}]}");
       coll.CreateIndex("myIndex5", "{\"fields\": [{\"field\": $.myField3, \"type\":\"" + "Time" + "\", \"array\": true}]}");
       docResult = coll.Find("myIndex1 overlaps myIndex2").Execute();
-      Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the indexes using overlaps");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the indexes using overlaps");
       docResult = coll.Find("myIndex2 overlaps myIndex3").Execute();
-      Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the indexes using overlaps");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the indexes using overlaps");
       docResult = coll.Find("myIndex2 not overlaps myIndex3").Execute();
-      Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the indexes using not overlaps");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the indexes using not overlaps");
       docResult = coll.Find("myIndex1 overlaps myIndex4").Execute();
-      Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the indexes using overlaps");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the indexes using overlaps");
       docResult = coll.Find("'myIndex3' overlaps 'myIndex5'").Execute();
-      Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the indexes using overlaps");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the indexes using overlaps");
       docResult = coll.Find("$.myField3 overlaps $.myField2").Execute();
-      Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the indexes using overlaps");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the indexes using overlaps");
       docResult = coll.Find("$.myField1 overlaps $.myField3").Execute();
-      Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the indexes using overlaps");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the indexes using overlaps");
       docResult = coll.Find("$.myField2 overlaps $.myField4").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the indexes using overlaps");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the indexes using overlaps");
       docResult = coll.Find("$.myField2 not overlaps $.myField4").Execute();
-      Assert.AreEqual(0, docResult.FetchAll().Count, "Matching the indexes using not overlaps");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(0), "Matching the indexes using not overlaps");
       docResult = coll.Find("$.myField5 overlaps $.myField3").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the indexes using overlaps");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the indexes using overlaps");
       docResult = coll.Find("$.myField5 not overlaps $.myField3").Execute();
-      Assert.AreEqual(1, docResult.FetchAll().Count, "Matching the indexes using not overlaps");
+      Assert.That(docResult.FetchAll().Count, Is.EqualTo(1), "Matching the indexes using not overlaps");
     }
 
     [Test, Description("multikey scenarios with observations")]
@@ -1733,7 +1733,7 @@ public void CreateCollectionMultipleIndexDataType()
     {
       if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
       Collection testColl = CreateCollection("test");
-      Assert.AreEqual(true, testColl.ExistsInDatabase(), "ExistsInDatabase failed");
+      Assert.That(testColl.ExistsInDatabase(), Is.EqualTo(true), "ExistsInDatabase failed");
 
       testColl.CreateIndex("testIndex12", "{\"fields\": [ { \"field\":$.myId, \"type\":\"DOUBLE\" , \"required\":true} ] }");
       testColl.CreateIndex("testIndex", "{\"fields\": [ { \"field\":$.myId, \"type\":\"DOUBLE UNSIGNED\" , \"required\":true} ] }");
@@ -1745,11 +1745,11 @@ public void CreateCollectionMultipleIndexDataType()
       testColl.Add(new { myId = 990.196078431, myAge = 10000000 }).Execute();
       testColl.DropIndex("testIndex");
       var result = testColl.Add(new { myId = 990.196078431, myAge = 10000000 }).Execute();
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
       testColl.DropIndex("testIndex1");
       result = testColl.Add(new { myId = 990.196078431, myAge = 10000000 }).Execute();
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
       Assert.Throws<MySqlException>(() => testColl.CreateIndex("testIndex2", "{\"fields\": [ { \"field\":$.myName, \"type\":\"TEXT\" , \"required\":true} ] }"));
     }
 
@@ -1758,7 +1758,7 @@ public void CreateCollectionMultipleIndexStress()
     {
       if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
       Collection testColl = CreateCollection("test");
-      Assert.AreEqual(true, testColl.ExistsInDatabase(), "ExistsInDatabase failed");
+      Assert.That(testColl.ExistsInDatabase(), Is.EqualTo(true), "ExistsInDatabase failed");
 
       testColl.CreateIndex("testIndex", "{\"fields\": [ { \"field\":$.myId, \"type\":\"TINYINT UNSIGNED\" , \"required\":true} ] }");
       testColl.CreateIndex("testIndex1", "{\"fields\": [ { \"field\":$.myAge, \"type\":\"SMALLINT UNSIGNED\" , \"required\":true} ] }");
@@ -1822,27 +1822,27 @@ private void ValidateIndex(string fieldName, string collectionName, string dataT
               continue;
 
             indexFound = true;
-            Assert.AreEqual(collectionName, reader["Table"]);
-            Assert.AreEqual(unique ? 0 : 1, Convert.ToInt16(reader["Non_unique"]));
+            Assert.That(reader["Table"], Is.EqualTo(collectionName));
+            Assert.That(Convert.ToInt16(reader["Non_unique"]), Is.EqualTo(unique ? 0 : 1));
 
             if (!array && !string.IsNullOrEmpty(reader["Column_name"].ToString()))
             {
               var columnNameTokens = reader["Column_name"].ToString().Split('_');
-              Assert.AreEqual(dataType, isUnsigned ? string.Format("{0}_{1}", columnNameTokens[1], columnNameTokens[2]) : columnNameTokens[1]);
+              Assert.That(isUnsigned ? string.Format("{0}_{1}", columnNameTokens[1], columnNameTokens[2]) : columnNameTokens[1], Is.EqualTo(dataType));
             }
             else if (array && !string.IsNullOrEmpty(reader["Expression"].ToString()))
             {
               string expression = reader["Expression"].ToString();
               int pos = reader["Expression"].ToString().IndexOf(" as ");
               expression = expression.Substring(pos + 4);
-              StringAssert.Contains("array", expression);
+              Assert.That(expression, Does.Contain("array"));
               expression = expression.Substring(0, expression.IndexOf(" array"));
               Assert.That(dataType, Is.EqualTo(expression.Replace(" ", string.Empty)).IgnoreCase);
             }
 
-            Assert.AreEqual(required ? "" : "YES", reader["Null"]);
+            Assert.That(reader["Null"], Is.EqualTo(required ? "" : "YES"));
             if (length != null)
-              Assert.AreEqual(length, Convert.ToInt32(reader["Sub_part"]));
+              Assert.That(Convert.ToInt32(reader["Sub_part"]), Is.EqualTo(length));
             break;
           }
         }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
index 00d73b3d8..e2e1ac3a0 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
@@ -63,7 +63,7 @@ public void GetAllCollections()
       Collection book = CreateCollection("book");
       List<Collection> collections = book.Schema.GetCollections();
       Assert.That(collections, Has.One.Items);
-      Assert.True(collections[0].Name == "book");
+      Assert.That(collections[0].Name == "book");
       book.Schema.DropCollection("book");
     }
 
@@ -73,15 +73,15 @@ public void CreateAndDropCollection()
       Session s = GetSession();
       Schema test = s.GetSchema("test");
       Collection testColl = test.CreateCollection("test");
-      Assert.True(CollectionExistsInDatabase(testColl));
+      Assert.That(CollectionExistsInDatabase(testColl));
 
       // Drop existing collection.
       test.DropCollection("test");
-      Assert.False(CollectionExistsInDatabase(testColl));
+      Assert.That(CollectionExistsInDatabase(testColl), Is.False);
 
       // Drop non-existing collection.
       test.DropCollection("test");
-      Assert.False(CollectionExistsInDatabase(testColl));
+      Assert.That(CollectionExistsInDatabase(testColl), Is.False);
 
       //dropCollection when the object to drop contains invalid characters
       test.DropCollection("%^&!@~*(&*(*&:><?}{:");
@@ -99,10 +99,10 @@ public void CreateCollectionIndex()
       Session session = GetSession();
       Schema test = session.GetSchema(schemaName);
       Collection testColl = test.CreateCollection("test");
-      Assert.True(CollectionExistsInDatabase(testColl), "ExistsInDatabase failed");
+      Assert.That(CollectionExistsInDatabase(testColl), "ExistsInDatabase failed");
       testColl.CreateIndex("testIndex", "{ \"fields\": [ { \"field\":$.myId, \"type\":\"INT\", \"required\":true } ] }");
       var result = ExecuteAddStatement(testColl.Add(new { myId = 1 }).Add(new { myId = 2 }));
-      Assert.AreEqual(result.AffectedItemsCount, 2);
+      Assert.That(2, Is.EqualTo(result.AffectedItemsCount));
     }
 
     [Test]
@@ -151,7 +151,7 @@ public void ValidateExistence()
       Session session = GetSession();
       Schema schema = session.GetSchema(schemaName);
       var ex = Assert.Throws<MySqlException>(() => schema.GetCollection("nonExistentCollection", true));
-      Assert.AreEqual("Collection 'nonExistentCollection' does not exist.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Collection 'nonExistentCollection' does not exist."));
     }
 
     [Test]
@@ -164,9 +164,9 @@ public void CountCollection()
 
       // Zero records
       var collection = schema.GetCollection("testCount");
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
       var table = schema.GetTable("testCount");
-      Assert.AreEqual(count, table.Count());
+      Assert.That(table.Count(), Is.EqualTo(count));
 
       // Insert some records
       var stm = collection.Add(@"{ ""_id"": 1, ""foo"": 1 }")
@@ -174,22 +174,22 @@ public void CountCollection()
         .Add(@"{ ""_id"": 3, ""foo"": 3 }");
       stm.Execute();
       count = session.SQL("SELECT COUNT(*) FROM test.testCount").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       table.Insert("doc").Values(@"{ ""_id"": 4, ""foo"": 4 }").Execute();
       count = session.SQL("SELECT COUNT(*) FROM test.testCount").Execute().FetchOne()[0];
-      Assert.AreEqual(count, table.Count());
+      Assert.That(table.Count(), Is.EqualTo(count));
 
       collection.RemoveOne(2);
       count = session.SQL("SELECT COUNT(*) FROM test.testCount").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
-      Assert.AreEqual(count, table.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
+      Assert.That(table.Count(), Is.EqualTo(count));
 
       // Collection/Table does not exist
       var ex = Assert.Throws<MySqlException>(() => schema.GetCollection("testCount_").Count());
-      Assert.AreEqual("Collection 'testCount_' does not exist in schema 'test'.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Collection 'testCount_' does not exist in schema 'test'."));
       ex = Assert.Throws<MySqlException>(() => schema.GetTable("testCount_").Count());
-      Assert.AreEqual("Table 'testCount_' does not exist in schema 'test'.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Table 'testCount_' does not exist in schema 'test'."));
     }
 
     [Test]
@@ -235,7 +235,7 @@ public void CreateCollectionWithOptions()
       options.ReuseExisting = false;
       options.Validation = val;
       Collection testColl = test.CreateCollection("testWithSchemaValidation", options);
-      Assert.True(CollectionExistsInDatabase(testColl));
+      Assert.That(CollectionExistsInDatabase(testColl));
 
       //Bug #30830962
       options = new CreateCollectionOptions();
@@ -245,7 +245,7 @@ public void CreateCollectionWithOptions()
       testbug1.Add(@"{ ""latitude"": 20, ""longitude"": 30 }").Execute();
       testbug1.Add(@"{ ""sexo"": 1, ""edad"": 20 }").Execute();
       int.TryParse(session.SQL("SELECT COUNT(*) FROM test.bug_0962").Execute().FetchOne()[0].ToString(), out int expected_count);
-      Assert.AreEqual(2, expected_count);  //Collection is created as STRICT with empty json schema,both records were inserted
+      Assert.That(expected_count, Is.EqualTo(2));  //Collection is created as STRICT with empty json schema,both records were inserted
 
       options = new CreateCollectionOptions();
       val = new Validation() { Schema = str };
@@ -253,90 +253,90 @@ public void CreateCollectionWithOptions()
       testbug1 = test.CreateCollection("bug_0962b", options);// adding an schema from
       testbug1.Add(@"{ ""latitude"": 20, ""longitude"": 30 }").Execute();
       var invalidEx = Assert.Throws<MySqlException>(() => testbug1.Add(@"{ ""sexo"": 1, ""edad"": 20 }").Execute());
-      StringAssert.Contains("Document is not valid according to the schema assigned to collection", invalidEx.Message);
+      Assert.That(invalidEx.Message, Does.Contain("Document is not valid according to the schema assigned to collection"));
 
       // Create a Collection passing a reuse_existing parameter to server
       CreateCollectionOptions options_reuse = new CreateCollectionOptions();
       options_reuse.ReuseExisting = false;
       options_reuse.Validation = val;
       Collection testCol2 = test.CreateCollection("testReuseExisting_1", options_reuse);
-      Assert.True(CollectionExistsInDatabase(testCol2));
+      Assert.That(CollectionExistsInDatabase(testCol2));
 
       //Insert Valid record with Level Strict
       var insert_statement = testColl.Add(@"{ ""latitude"": 20, ""longitude"": 30 }");
       insert_statement.Execute();
       var count = session.SQL("SELECT COUNT(*) FROM test.testWithSchemaValidation").Execute().FetchOne()[0];
-      Assert.AreEqual(count, testColl.Count());
+      Assert.That(testColl.Count(), Is.EqualTo(count));
 
       //Insert invalid record with Level Strict
       insert_statement = testColl.Add(@"{ ""OtherField"": ""value"", ""Age"": 30 }");
       var invalidInsertEx = Assert.Throws<MySqlException>(() => insert_statement.Execute());
-      StringAssert.Contains("Document is not valid according to the schema assigned to collection", invalidInsertEx.Message);
+      Assert.That(invalidInsertEx.Message, Does.Contain("Document is not valid according to the schema assigned to collection"));
 
       //Test: Old MySQL Server Version exceptions
       if (!(session.Version.isAtLeast(8, 0, 19)))
       {
         //FR6.2
         var ex1 = Assert.Throws<MySqlException>(() => test.CreateCollection("testInvalid", options));
-        StringAssert.Contains("Invalid number of arguments, expected 2 but got 3, " +
-        "The server doesn't support the requested operation. Please update the MySQL Server and/or Client library", ex1.Message);
+        Assert.That(ex1.Message, Does.Contain("Invalid number of arguments, expected 2 but got 3, " +
+        "The server doesn't support the requested operation. Please update the MySQL Server and/or Client library"));
 
         //FR6.3
         test.CreateCollection("testInvalid");
         ModifyCollectionOptions modifyOptions = new ModifyCollectionOptions();
         modifyOptions.Validation = val;
         var ex2 = Assert.Throws<MySqlException>(() => test.ModifyCollection("testInvalid", modifyOptions));
-        StringAssert.Contains("Invalid mysqlx command modify_collection_options, " +
-        "The server doesn't support the requested operation. Please update the MySQL Server and/or Client library", ex2.Message);
+        Assert.That(ex2.Message, Does.Contain("Invalid mysqlx command modify_collection_options, " +
+        "The server doesn't support the requested operation. Please update the MySQL Server and/or Client library"));
       }
 
       //Create collection with json schema and level OFF. Try to insert document matches this schema
       options = new CreateCollectionOptions();
       options.Validation = new Validation() { Level = ValidationLevel.OFF, Schema = str };
       Collection col_test = test.CreateCollection("Test_2b_1", options);
-      Assert.True(CollectionExistsInDatabase(col_test));
+      Assert.That(CollectionExistsInDatabase(col_test));
       insert_statement = col_test.Add(@"{ ""latitude"": 120, ""longitude"": 78 }");
       insert_statement.Execute();
       count = session.SQL("SELECT COUNT(*) FROM test.Test_2b_1").Execute().FetchOne()[0];
-      Assert.AreEqual(count, col_test.Count());
+      Assert.That(col_test.Count(), Is.EqualTo(count));
 
       //Create collection with json schema and level OFF,ReuseExisting set to true, Try to insert
       options = new CreateCollectionOptions();
       options.Validation = new Validation() { Level = ValidationLevel.OFF, Schema = str };
       options.ReuseExisting = true;
       col_test = test.CreateCollection("Test_2b_2", options);
-      Assert.True(CollectionExistsInDatabase(col_test));
+      Assert.That(CollectionExistsInDatabase(col_test));
       insert_statement = col_test.Add(@"{ ""latitude"": 20, ""longitude"": 42 }");
       insert_statement.Execute();
       count = session.SQL("SELECT COUNT(*) FROM test.Test_2b_2").Execute().FetchOne()[0];
-      Assert.AreEqual(count, col_test.Count());
+      Assert.That(col_test.Count(), Is.EqualTo(count));
 
       //Create collection with only schema option, Try to insert
       options = new CreateCollectionOptions();
       options.Validation = new Validation() { Schema = str };
       col_test = test.CreateCollection("Test_2b_3", options);
-      Assert.True(CollectionExistsInDatabase(col_test));
+      Assert.That(CollectionExistsInDatabase(col_test));
       insert_statement = col_test.Add(@"{ ""latitude"": 5, ""longitude"": 10 }");
       insert_statement.Execute();
       count = session.SQL("SELECT COUNT(*) FROM test.Test_2b_3").Execute().FetchOne()[0];
-      Assert.AreEqual(count, col_test.Count());
+      Assert.That(col_test.Count(), Is.EqualTo(count));
 
       //Create collection with only schema option,ReuseExisting set to true, Try to insert
       options = new CreateCollectionOptions();
       options.Validation = new Validation() { Schema = str };
       options.ReuseExisting = true;
       col_test = test.CreateCollection("Test_2b_4", options);
-      Assert.True(CollectionExistsInDatabase(col_test));
+      Assert.That(CollectionExistsInDatabase(col_test));
       insert_statement = col_test.Add(@"{ ""latitude"": 25, ""longitude"": 52 }");
       insert_statement.Execute();
       count = session.SQL("SELECT COUNT(*) FROM test.Test_2b_4").Execute().FetchOne()[0];
-      Assert.AreEqual(count, col_test.Count());
+      Assert.That(col_test.Count(), Is.EqualTo(count));
 
       //Create collection with only level option
       options = new CreateCollectionOptions();
       options.Validation = new Validation() { Level = ValidationLevel.OFF };
       col_test = test.CreateCollection("Test_2b_5", options);
-      Assert.True(CollectionExistsInDatabase(col_test));
+      Assert.That(CollectionExistsInDatabase(col_test));
 
       //ResuseExisting = false should throw exception for an existing collection
       CreateCollectionOptions testReuseOptions = new CreateCollectionOptions();
@@ -344,12 +344,12 @@ public void CreateCollectionWithOptions()
       testReuseOptions.Validation = new Validation() { Level = ValidationLevel.OFF };
       test.CreateCollection("testReuse");
       var exreuse = Assert.Throws<MySqlException>(() => test.CreateCollection("testReuse", testReuseOptions));
-      StringAssert.AreEqualIgnoringCase("Table 'testReuse' already exists", exreuse.Message);
+      Assert.That(exreuse.Message, Is.EqualTo("Table 'testReuse' already exists").IgnoreCase);
 
       //Test: Resuse Existing = True should return existing collection
       testReuseOptions.ReuseExisting = true;
       var existing = test.CreateCollection("testReuse", testReuseOptions);
-      Assert.True(CollectionExistsInDatabase(existing));
+      Assert.That(CollectionExistsInDatabase(existing));
 
       //Create collection and prepare test data with json schema and level STRICT
       CreateCollectionOptions prepareOptions = new CreateCollectionOptions();
@@ -358,13 +358,13 @@ public void CreateCollectionWithOptions()
       res_stm.Execute();
       var num = session.SQL("SELECT COUNT(*) FROM test.TestCreateInsert").Execute().FetchOne()[0];
       var collection_test = test.GetCollection("TestCreateInsert");
-      Assert.AreEqual(num, collection_test.Count());
+      Assert.That(collection_test.Count(), Is.EqualTo(num));
 
       //Passing invalid Schema
       options = new CreateCollectionOptions();
       options.Validation = new Validation() { Level = ValidationLevel.STRICT, Schema = "Not Valid JSON Schema" };
       Exception ex_schema = Assert.Throws<Exception>(() => test.CreateCollection("testInvalidSchema", options));
-      StringAssert.Contains(@"The value provided is not a valid JSON document.", ex_schema.Message);
+      Assert.That(ex_schema.Message, Does.Contain(@"The value provided is not a valid JSON document."));
 
       //Testing an schema with different data types
       str = "{\"id\": \"http://json-schema.org/geo\","
@@ -385,20 +385,20 @@ public void CreateCollectionWithOptions()
       options = new CreateCollectionOptions();
       options.Validation = new Validation() { Level = ValidationLevel.STRICT, Schema = str };
       Collection person_col = test.CreateCollection("testWithPersonSchema", options);
-      Assert.True(CollectionExistsInDatabase(person_col));
+      Assert.That(CollectionExistsInDatabase(person_col));
       person_col.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       var rows = session.SQL("SELECT COUNT(*) FROM test.testWithPersonSchema").Execute().FetchOne()[0];
-      Assert.AreEqual(rows, person_col.Count());
+      Assert.That(person_col.Count(), Is.EqualTo(rows));
 
       // Create an existing collection with different schema
       options = new CreateCollectionOptions();
       options.ReuseExisting = true;
       options.Validation = new Validation() { Level = ValidationLevel.STRICT, Schema = str };
       Collection col_schema1 = test.CreateCollection("testSchema1", options);
-      Assert.True(CollectionExistsInDatabase(col_schema1));
+      Assert.That(CollectionExistsInDatabase(col_schema1));
 
       col_schema1.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
-      Assert.AreEqual(1, col_schema1.Count());
+      Assert.That(col_schema1.Count(), Is.EqualTo(1));
       var sqlDefinition1 = session.SQL("SHOW CREATE TABLE test.testSchema1").Execute().FetchOne()[1];
 
 
@@ -420,31 +420,31 @@ public void CreateCollectionWithOptions()
       options.Validation = new Validation() { Level = ValidationLevel.STRICT, Schema = schema2 };
       Collection col_schema2 = test.CreateCollection("testSchema1", options);
       var sqlDefinition2 = session.SQL("SHOW CREATE TABLE test.testSchema1").Execute().FetchOne()[1];
-      Assert.AreEqual(sqlDefinition1, sqlDefinition2);
+      Assert.That(sqlDefinition2, Is.EqualTo(sqlDefinition1));
 
       //Create a collection without sending reuseExisting parameter and insert record
       Collection original_col1 = test.CreateCollection("testOriginal1");
-      Assert.True(CollectionExistsInDatabase(original_col1));
+      Assert.That(CollectionExistsInDatabase(original_col1));
       original_col1.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       rows = session.SQL("SELECT COUNT(*) FROM test.testOriginal1").Execute().FetchOne()[0];
-      Assert.AreEqual(rows, original_col1.Count());
+      Assert.That(original_col1.Count(), Is.EqualTo(rows));
 
       //Create a new collection sending reuseExisting as true, insert record
       Collection original_col2 = test.CreateCollection("testOriginal2", true);
-      Assert.True(CollectionExistsInDatabase(original_col2));
+      Assert.That(CollectionExistsInDatabase(original_col2));
       original_col2.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       rows = session.SQL("SELECT COUNT(*) FROM test.testOriginal2").Execute().FetchOne()[0];
-      Assert.AreEqual(rows, original_col2.Count());
+      Assert.That(original_col2.Count(), Is.EqualTo(rows));
 
       //Create an existing collection sending reuseExisting as true, insert record
       Collection original_col3 = test.CreateCollection("testOriginal2", true);
-      Assert.True(CollectionExistsInDatabase(original_col3));
+      Assert.That(CollectionExistsInDatabase(original_col3));
       original_col3.Add(@"{ ""name"": ""John2"", ""age"": 12 }").Execute();
-      Assert.AreEqual(2, original_col3.Count());
+      Assert.That(original_col3.Count(), Is.EqualTo(2));
 
       //Create an existing collection sending reuseExisting as false,exception expected
       var ex_existing = Assert.Throws<MySqlException>(() => test.CreateCollection("testOriginal2", false));
-      StringAssert.AreEqualIgnoringCase(@"Table 'testOriginal2' already exists", ex_existing.Message);
+      Assert.That(ex_existing.Message, Is.EqualTo(@"Table 'testOriginal2' already exists").IgnoreCase);
 
       //Modify collection with only level option
       ModifyCollectionOptions Test_Options = new ModifyCollectionOptions();
@@ -456,20 +456,20 @@ public void CreateCollectionWithOptions()
                                      .Add(@"{ ""OtherField"": ""value"", ""Age"": 30 }");
       insert_statement.Execute();
       count = session.SQL("SELECT COUNT(*) FROM test.testWithSchemaValidation").Execute().FetchOne()[0];
-      Assert.AreEqual(count, col_Test_2a_1.Count());
+      Assert.That(col_Test_2a_1.Count(), Is.EqualTo(count));
 
       //Modify collection with only schema option
       Test_Options.Validation = new Validation() { Schema = "{ }" };
       test.ModifyCollection("testWithSchemaValidation", Test_Options);
       var sqlCreate = session.SQL("SHOW CREATE TABLE test.testWithSchemaValidation").Execute().FetchOne()[1];
-      Assert.True(sqlCreate.ToString().Contains(@"'{\r\n}'") || sqlCreate.ToString().Contains("{}"));
+      Assert.That(sqlCreate.ToString().Contains(@"'{\r\n}'") || sqlCreate.ToString().Contains("{}"));
 
       //Passing null as parameter to ModifyCollection
       var emptyOptions = new ModifyCollectionOptions();
       emptyOptions.Validation = new Validation() { };
       test.CreateCollection("testnull");
       exreuse = Assert.Throws<MySqlException>(() => test.ModifyCollection("testnull", null));
-      Assert.AreEqual(@"Arguments value used under ""validation"" must be an object with at least one field", exreuse.Message);
+      Assert.That(exreuse.Message, Is.EqualTo(@"Arguments value used under ""validation"" must be an object with at least one field"));
 
       test.DropCollection("testWithSchemaValidation");
       test.DropCollection("bug_0962");
@@ -508,13 +508,13 @@ public void PreparedStatementWithNumericStrings()
       var stmt = coll.Find("_id=:v").Bind("v", "1");
       var res = stmt.Execute();
       var values = res.FetchOne();
-      Assert.AreEqual(1, Convert.ToInt32(values.values["_id"]));
-      StringAssert.AreEqualIgnoringCase("foo", values.values["title"].ToString());
+      Assert.That(Convert.ToInt32(values.values["_id"]), Is.EqualTo(1));
+      Assert.That(values.values["title"].ToString(), Is.EqualTo("foo").IgnoreCase);
 
       res = coll.Find("_id=:v").Bind("v", "2").Execute();
       values = res.FetchOne();
-      Assert.AreEqual(2, Convert.ToInt32(values.values["_id"]));
-      StringAssert.AreEqualIgnoringCase("bar", values.values["title"].ToString());
+      Assert.That(Convert.ToInt32(values.values["_id"]), Is.EqualTo(2));
+      Assert.That(values.values["title"].ToString(), Is.EqualTo("bar").IgnoreCase);
     }
 
     [Test, Description("Verify Count method for Tables,Collections,Collection As Table,Views with different combinations")]
@@ -526,14 +526,14 @@ public void AdditionalCountTests()
       var count = session.SQL("SELECT COUNT(*) FROM test.testCount").Execute().FetchOne()[0];
       var collection = schema.GetCollection("testCount");
       var collectionAsTable = schema.GetCollectionAsTable("testCount");
-      Assert.AreEqual(count, collection.Count());
-      Assert.AreEqual(count, collectionAsTable.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
+      Assert.That(collectionAsTable.Count(), Is.EqualTo(count));
 
       session.SQL($"USE {schemaName}").Execute();
       session.SQL("create table test1(name VARCHAR(40), age INT)").Execute();
       count = session.SQL($"SELECT COUNT(*) FROM {schemaName}.test1").Execute().FetchOne()[0];
       Table table = session.GetSchema(schemaName).GetTable("test1");
-      Assert.AreEqual(count, collectionAsTable.Count());
+      Assert.That(collectionAsTable.Count(), Is.EqualTo(count));
 
       var result = table.Insert("name", "age")
         .Values("MARK", "34")
@@ -541,13 +541,13 @@ public void AdditionalCountTests()
         .Values("TEST", "50")
        .Execute();
 
-      Assert.AreEqual((ulong)3, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo((ulong)3));
       var selectResult = table.Select().Execute();
       while (selectResult.Next()) ;
-      Assert.AreEqual(3, selectResult.Rows.Count);
-      Assert.AreEqual("MARK", selectResult.Rows.ToArray()[0][0].ToString());
+      Assert.That(selectResult.Rows.Count, Is.EqualTo(3));
+      Assert.That(selectResult.Rows.ToArray()[0][0].ToString(), Is.EqualTo("MARK"));
       count = session.SQL($"SELECT COUNT(*) FROM {schemaName}.test1").Execute().FetchOne()[0];
-      Assert.AreEqual(count, table.Count());
+      Assert.That(table.Count(), Is.EqualTo(count));
 
       // Insert some records
       var stm = collection.Add(@"{ ""_id"": 1, ""foo"": 1 }")
@@ -555,19 +555,19 @@ public void AdditionalCountTests()
         .Add(@"{ ""_id"": 3, ""foo"": 3 }");
       stm.Execute();
       count = session.SQL("SELECT COUNT(*) FROM test.testCount").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
       collectionAsTable = schema.GetCollectionAsTable("testCount");
-      Assert.AreEqual(count, collectionAsTable.Count());
+      Assert.That(collectionAsTable.Count(), Is.EqualTo(count));
 
       table = schema.GetTable("testCount");
       table.Insert("doc").Values(@"{ ""_id"": 4, ""foo"": 4 }").Execute();
       count = session.SQL($"SELECT COUNT(*) FROM {schemaName}.testCount").Execute().FetchOne()[0];
-      Assert.AreEqual(count, table.Count());
+      Assert.That(table.Count(), Is.EqualTo(count));
 
       collection.RemoveOne(2);
       count = session.SQL($"SELECT COUNT(*) FROM {schemaName}.testCount").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
-      Assert.AreEqual(count, table.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
+      Assert.That(table.Count(), Is.EqualTo(count));
 
       // Collection/Table does not exist
       Assert.Throws<MySqlException>(() => schema.GetCollection("testCount_").Count());
@@ -585,7 +585,7 @@ public void AdditionalCountTests()
       session.SQL("CREATE VIEW view2 AS select * from test2").Execute();
       session.SQL("SELECT * FROM view2").Execute();
       count = session.SQL("SELECT COUNT(*) FROM view1").Execute().FetchOne()[0];
-      Assert.AreEqual(count, schema.GetTable("view1").Count());
+      Assert.That(schema.GetTable("view1").Count(), Is.EqualTo(count));
       schema.DropCollection("testCount");
       session.SQL("DROP TABLE IF EXISTS test1").Execute();
       session.SQL("DROP TABLE IF EXISTS test2").Execute();
@@ -607,16 +607,16 @@ public void ExceptionsInCount()
       var count = session.SQL("SELECT COUNT(*) FROM test.testCount").Execute().FetchOne()[0];
       Schema schema = session.GetSchema(schemaName);
       var collection = schema.GetCollection("testCount");
-      Assert.AreEqual(4, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(4));
 
       coll.Add(new { _id = 5, title = "Book 5", pages = 60 }).Execute();
       count = session.SQL("SELECT COUNT(*) FROM test.testCount").Execute().FetchOne()[0];
       schema = session.GetSchema(schemaName);
       collection = schema.GetCollection("testCount");
-      Assert.AreEqual(5, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(5));
 
       Table table = session.GetSchema("test").GetTable("testCount");
-      Assert.AreEqual(5, table.Count());
+      Assert.That(table.Count(), Is.EqualTo(5));
 
       // Expected exceptions.
       Assert.Throws<ArgumentNullException>(() => coll.RemoveOne(null));
@@ -625,47 +625,47 @@ public void ExceptionsInCount()
       Assert.Throws<ArgumentNullException>(() => coll.RemoveOne(" "));
 
       // Remove sending numeric parameter.
-      Assert.AreEqual(1, coll.RemoveOne(1).AffectedItemsCount);
-      Assert.AreEqual(4, collection.Count());
-      Assert.AreEqual(4, table.Count());
+      Assert.That(coll.RemoveOne(1).AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(collection.Count(), Is.EqualTo(4));
+      Assert.That(table.Count(), Is.EqualTo(4));
 
       // Remove sending string parameter.
-      Assert.AreEqual(1, coll.RemoveOne("3").AffectedItemsCount);
-      Assert.AreEqual(3, collection.Count());
-      Assert.AreEqual(3, table.Count());
+      Assert.That(coll.RemoveOne("3").AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(collection.Count(), Is.EqualTo(3));
+      Assert.That(table.Count(), Is.EqualTo(3));
 
       // Remove an auto-generated id.
       var document = coll.Find("pages = 60").Execute().FetchOne();
-      Assert.AreEqual(1, coll.RemoveOne(document.Id).AffectedItemsCount);
-      Assert.AreEqual(2, collection.Count());
-      Assert.AreEqual(2, table.Count());
+      Assert.That(coll.RemoveOne(document.Id).AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(collection.Count(), Is.EqualTo(2));
+      Assert.That(table.Count(), Is.EqualTo(2));
 
       // Remove a non-existing document.
-      Assert.AreEqual(0, coll.RemoveOne(5).AffectedItemsCount);
-      Assert.AreEqual(2, collection.Count());
-      Assert.AreEqual(2, table.Count());
+      Assert.That(coll.RemoveOne(5).AffectedItemsCount, Is.EqualTo(0));
+      Assert.That(collection.Count(), Is.EqualTo(2));
+      Assert.That(table.Count(), Is.EqualTo(2));
 
       // Add or ReplaceOne
-      Assert.AreEqual(1, coll.AddOrReplaceOne(5, new { _id = 5, title = "Book 5", pages = 60 }).
-          AffectedItemsCount);
-      Assert.AreEqual(3, collection.Count());
-      Assert.AreEqual(3, table.Count());
+      Assert.That(coll.AddOrReplaceOne(5, new { _id = 5, title = "Book 5", pages = 60 }).
+          AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(collection.Count(), Is.EqualTo(3));
+      Assert.That(table.Count(), Is.EqualTo(3));
 
       // Add or ReplaceOne
-      Assert.AreEqual(2, coll.AddOrReplaceOne(2, new { title = "Book 50", pages = 60 }).
-          AffectedItemsCount);
-      Assert.AreEqual(3, collection.Count());
-      Assert.AreEqual(3, table.Count());
+      Assert.That(coll.AddOrReplaceOne(2, new { title = "Book 50", pages = 60 }).
+          AffectedItemsCount, Is.EqualTo(2));
+      Assert.That(collection.Count(), Is.EqualTo(3));
+      Assert.That(table.Count(), Is.EqualTo(3));
 
       // Add or ReplaceOne
-      Assert.AreEqual(1, coll.AddOrReplaceOne(6, new { _id = 6, title = "Book 6", pages = 70 }).
-          AffectedItemsCount);
-      Assert.AreEqual(4, collection.Count());
-      Assert.AreEqual(4, table.Count());
+      Assert.That(coll.AddOrReplaceOne(6, new { _id = 6, title = "Book 6", pages = 70 }).
+          AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(collection.Count(), Is.EqualTo(4));
+      Assert.That(table.Count(), Is.EqualTo(4));
 
       var result = coll.Modify("_id = 5").Set("title", "Book 5").Execute();
-      Assert.AreEqual(4, collection.Count());
-      Assert.AreEqual(4, table.Count());
+      Assert.That(collection.Count(), Is.EqualTo(4));
+      Assert.That(table.Count(), Is.EqualTo(4));
 
       coll = CreateCollection("testCount");
 
@@ -696,10 +696,10 @@ public void ExceptionsInCount()
       count = session.SQL("SELECT COUNT(*) FROM test.testCount").Execute().FetchOne()[0];
       schema = session.GetSchema(schemaName);
       collection = schema.GetCollection("testCount");
-      Assert.AreEqual(2000, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(2000));
 
       r = coll.Remove("_id = :_id").Bind("_id", 1000).Execute();
-      Assert.AreEqual(1999, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(1999));
     }
 
     [Test, Description("Verify MultiThreading with count")]
@@ -729,10 +729,10 @@ private Task<int> SubProcessA()
         var res = coll.Add(jsonlist).Execute();
         var count = sessionA.SQL("SELECT COUNT(*) FROM test.testCount").Execute().FetchOne()[0];
         var collection = schema.GetCollection("testCount");
-        Assert.AreEqual(1000, collection.Count());
+        Assert.That(collection.Count(), Is.EqualTo(1000));
 
         var r = coll.Remove("_id = :_id").Bind("_id", 1001).Execute();
-        Assert.AreEqual(999, collection.Count());
+        Assert.That(collection.Count(), Is.EqualTo(999));
       }
       return Task.FromResult(0);
     }
@@ -752,14 +752,14 @@ private Task<int> SubProcessB()
         {
           if (collection.Count() > 5)
           {
-            Assert.AreEqual(999, collection.Count());
+            Assert.That(collection.Count(), Is.EqualTo(999));
             break;
           }
         }
         while (true);
 
         var r = coll.Remove("_id = :_id").Bind("_id", 1100).Execute();
-        Assert.AreEqual(998, collection.Count());
+        Assert.That(collection.Count(), Is.EqualTo(998));
       }
       return Task.FromResult(0);
     }
@@ -796,7 +796,7 @@ public void DropObjectsUnderStress()
       {
         session.CreateSchema("validSchema");
         session.DropSchema("validSchema");
-        Assert.False(session.GetSchema("validSchema").ExistsInDatabase());
+        Assert.That(session.GetSchema("validSchema").ExistsInDatabase(), Is.False);
       }
 
     }
@@ -856,7 +856,7 @@ public void SchemaValidation_S1()
       var collection = schema.CreateCollection("coll1", options);
       collection.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       var count = session.SQL("select count(*) from coll1").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       val.Level = ValidationLevel.OFF;
       val.Schema = doc1;
@@ -865,7 +865,7 @@ public void SchemaValidation_S1()
       collection = schema.CreateCollection("coll1", options);
       collection.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       count = session.SQL("select count(*) from coll1").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       val.Level = ValidationLevel.OFF;
       val.Schema = doc1;
@@ -874,21 +874,21 @@ public void SchemaValidation_S1()
       collection = schema.CreateCollection("coll2", options);
       collection.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       count = session.SQL("select count(*) from coll2").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options.Validation = new Validation() { Level = ValidationLevel.OFF, Schema = doc1 };
       options.ReuseExisting = false;
       collection = schema.CreateCollection("coll3", options);
       collection.Add(@"{ ""name"": ""Ram"" , ""age"": 22 }").Execute();
       count = session.SQL("select count(*) from coll3").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options.Validation = new Validation() { Level = ValidationLevel.OFF, Schema = doc1 };
       options.ReuseExisting = true;
       collection = schema.CreateCollection("coll3", options);
       collection.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       count = session.SQL("select count(*) from coll3").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       var doc3 = "{\"id\": \"http://json-schema.org/geo\","
                   + "\"$schema\": \"http://json-schema.org/draft-06/schema#\","
@@ -911,7 +911,7 @@ public void SchemaValidation_S1()
       collection = schema.ModifyCollection("coll1", options1);
       collection.Add(@"{ ""latitude"": 20, ""longitude"": 30 }");
       count = session.SQL("select count(*) from coll1").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       var doc4 = "{\"id\": \"http://json-schema.org/geo\","
                            + "\"$schema\": \"http://json-schema.org/draft-06/schema#\","
@@ -931,13 +931,13 @@ public void SchemaValidation_S1()
       collection = schema.ModifyCollection("coll3", options1);
       collection.Add(@"{ ""name"": ""Samar"" }");
       count = session.SQL("select count(*) from coll3").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options1.Validation = new Validation() { Level = ValidationLevel.OFF, Schema = doc1 };
       collection = schema.ModifyCollection("coll2", options1);
       collection.Add(@"{ ""name"": ""Ram"" , ""age"": 22 }").Execute();
       count = session.SQL("select count(*) from coll2").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       val.Level = ValidationLevel.STRICT;
       val.Schema = doc1;
@@ -945,7 +945,7 @@ public void SchemaValidation_S1()
       collection = schema.ModifyCollection("coll2", options1);
       collection.Add(@"{ ""name"": ""Ram"" , ""age"": 22 }").Execute();
       count = session.SQL("select count(*) from coll2").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
     }
 
     [Test, Description("Checking the createcollection() and ModifyCollection() with either the level or the schema")]
@@ -977,9 +977,9 @@ public void SchemaValidation_S2()
       collection.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       var result = session.SQL("select * from coll4").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]);
+        Assert.That(res[0], Is.Not.Null);
       var count = session.SQL("select count(*) from coll4").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options.Validation = new Validation { Schema = doc1 };
       options.ReuseExisting = true;
@@ -987,16 +987,16 @@ public void SchemaValidation_S2()
       collection.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       result = session.SQL("select * from coll4").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]);
+        Assert.That(res[0], Is.Not.Null);
       count = session.SQL("select count(*) from coll4").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options.Validation = new Validation { Schema = doc1 };
       options.ReuseExisting = true;
       collection = schema.CreateCollection("colltesting", options);
       Assert.Throws<MySqlException>(() => ExecuteAddStatement(collection.Add(@"{ ""name"": ""John"", ""age"": ""52"" }")));
       count = session.SQL("select count(*) from colltesting").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       var doc2 = "{\"id\":\"http://json-schema.org/geo\","
                      + "\"$schema\": \"http://json-schema.org/draft-06/schema#\","
@@ -1033,9 +1033,9 @@ public void SchemaValidation_S2()
       collection.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       result = session.SQL("select * from coll5").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]);
+        Assert.That(res[0], Is.Not.Null);
       count = session.SQL("select count(*) from coll5").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options.Validation = new Validation { Level = ValidationLevel.STRICT };
       options.ReuseExisting = false;
@@ -1043,18 +1043,18 @@ public void SchemaValidation_S2()
       collection.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       result = session.SQL("select * from coll6").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]);
+        Assert.That(res[0], Is.Not.Null);
       count = session.SQL("select count(*) from coll6").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options1.Validation = new Validation() { Schema = doc1 };
       collection = schema.ModifyCollection("coll6", options1);
       collection.Add(@"{ ""name"": ""Ram"" , ""age"": 22 }").Execute();
       result = session.SQL("select * from coll6").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]);
+        Assert.That(res[0], Is.Not.Null);
       count = session.SQL("select count(*) from coll6").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options1.Validation = new Validation() { Schema = doc1 };
       collection = schema.ModifyCollection("colltesting", options1);
@@ -1068,18 +1068,18 @@ public void SchemaValidation_S2()
       collection.Add(@"{ ""name"": ""Ram"" , ""age"": 22 }").Execute();
       result = session.SQL("select * from coll4").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]);
+        Assert.That(res[0], Is.Not.Null);
       count = session.SQL("select count(*) from coll4").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options1.Validation = new Validation() { Level = ValidationLevel.STRICT };
       collection = schema.ModifyCollection("coll5", options1);
       collection.Add(@"{ ""name"": ""Ram"" , ""age"": 22 }").Execute();
       result = session.SQL("select * from coll5").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]);
+        Assert.That(res[0], Is.Not.Null);
       count = session.SQL("select count(*) from coll5").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options1.Validation = new Validation() { };
       Assert.Throws<MySqlException>(() => schema.ModifyCollection("coll2", options1));
@@ -1126,7 +1126,7 @@ public void SchemaValidation_S2()
       foreach (Row res in result)
         Console.WriteLine("test with enum: " + res[0]);
       count = session.SQL("select count(*) from collEnum").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
     }
 
     [Test, Description("Checking the error messages with different level")]
@@ -1158,9 +1158,9 @@ public void SchemaValidation_S3()
       collection.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       var result = session.SQL("select * from coll7").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]);
+        Assert.That(res[0], Is.Not.Null);
       var count = session.SQL("select count(*) from coll7").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options.Validation = new Validation { Schema = doc1, Level = ValidationLevel.STRICT };
       options.ReuseExisting = false;
@@ -1168,9 +1168,9 @@ public void SchemaValidation_S3()
       collection.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       result = session.SQL("select * from collext").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]); ;
+        Assert.That(res[0], Is.Not.Null); ;
       count = session.SQL("select count(*) from collext").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       var doc2 = "{\"id\":\"http://json-schema.org/geo\","
                 + "\"$schema\": \"http://json-schema.org/draft-06/schema#\","
@@ -1207,9 +1207,9 @@ public void SchemaValidation_S3()
       collection.Add(@"{ ""name"": ""John"", ""age"": 52 }").Execute();
       result = session.SQL("select * from coll8").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]); ;
+        Assert.That(res[0], Is.Not.Null); ;
       count = session.SQL("select count(*) from coll8").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options.Validation = new Validation { Schema = doc1, Level = ValidationLevel.STRICT };
       options.ReuseExisting = false;
@@ -1226,18 +1226,18 @@ public void SchemaValidation_S3()
       collection.Add(@"{""longitude"":""99""}").Execute();
       result = session.SQL("select * from coll10").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]); ;
+        Assert.That(res[0], Is.Not.Null); ;
       count = session.SQL("select count(*) from coll10").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options1.Validation = new Validation { Schema = doc1, Level = ValidationLevel.OFF };
       collection = schema.ModifyCollection("coll10", options1);
       collection.Add(@"{ ""name"": 67  }").Execute();
       result = session.SQL("select * from coll10").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]); ;
+        Assert.That(res[0], Is.Not.Null); ;
       count = session.SQL("select count(*) from coll10").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options.Validation = new Validation { Schema = doc1, Level = ValidationLevel.STRICT };
       options.ReuseExisting = false;
@@ -1245,9 +1245,9 @@ public void SchemaValidation_S3()
       collection.Add(@"{""_id"":1,""name"": ""John"", ""age"": 52}").Execute();
       result = session.SQL("select * from coll").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]); ;
+        Assert.That(res[0], Is.Not.Null); ;
       count = session.SQL("select count(*) from coll").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
     }
 
     /// <summary>
@@ -1304,9 +1304,9 @@ public void ModifyCollectionSchemaValidation()
       collection.Add(@"{""fruits"": [ ""apple"", ""orange"", ""pear"" ],""vegetables"": [{""veggieName"": ""potato"",""veggieLike"": true},{""veggieName"": ""broccoli"",""veggieLike"": false}]}").Execute();
       var result = session.SQL("select * from coll20").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]);
+        Assert.That(res[0], Is.Not.Null);
       var count = session.SQL("select count(*) from coll20").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options.Validation = new Validation { Level = ValidationLevel.STRICT, Schema = doc1 };
       options.ReuseExisting = false;
@@ -1314,9 +1314,9 @@ public void ModifyCollectionSchemaValidation()
       collection.Add(@"{""fruits"": [ ""apple"", ""orange"", ""pear"" ],""vegetables"": [{""veggieName"": ""potato"",""veggieLike"": true},{""veggieName"": ""broccoli"",""veggieLike"": false}]}").Execute();
       result = session.SQL("select * from coll21").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]);
+        Assert.That(res[0], Is.Not.Null);
       count = session.SQL("select count(*) from coll21").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       val.Level = ValidationLevel.STRICT;
       val.Schema = doc1;
@@ -1326,9 +1326,9 @@ public void ModifyCollectionSchemaValidation()
       collection.Add(@"{""fruits"": [ ""apple"", ""orange"", ""pear"" ],""vegetables"": [{""veggieName"": ""potato"",""veggieLike"": true},{""veggieName"": ""broccoli"",""veggieLike"": false}]}").Execute();
       result = session.SQL("select * from coll20").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]);
+        Assert.That(res[0], Is.Not.Null);
       count = session.SQL("select count(*) from coll20").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options.Validation = new Validation { Level = ValidationLevel.STRICT, Schema = doc1 };
       options.ReuseExisting = true;
@@ -1336,9 +1336,9 @@ public void ModifyCollectionSchemaValidation()
       collection.Add(@"{""fruits"": [ ""apple"", ""orange"", ""pear"" ],""vegetables"": [{""veggieName"": ""potato"",""veggieLike"": true},{""veggieName"": ""broccoli"",""veggieLike"": false}]}").Execute();
       result = session.SQL("select * from coll21").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]);
+        Assert.That(res[0], Is.Not.Null);
       count = session.SQL("select count(*) from coll21").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       val.Level = ValidationLevel.OFF;
       val.Schema = doc1;
@@ -1348,9 +1348,9 @@ public void ModifyCollectionSchemaValidation()
       collection.Add(@"{""fruits"": [ 78, ""orange"", ""pear"" ],""vegetables"": [{""veggieName"": ""potato"",""veggieLike"": true},{""veggieName"": ""broccoli"",""veggieLike"": false}]}").Execute();
       result = session.SQL("select * from coll22").Execute().FetchAll();
       foreach (Row res in result)
-        Assert.IsNotNull(res[0]);
+        Assert.That(res[0], Is.Not.Null);
       count = session.SQL("select count(*) from coll22").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
     }
 
     [Test, Description("Verify ModifyCollection with level OFF and JSON schema")]
@@ -1422,9 +1422,9 @@ public void SchemaValidationDeleteRecords()
       collection.Add(@"{ ""name"": 52 }").Execute();
       var result = session.SQL("select * from collectiontest").Execute().FetchAll();
       foreach (Row res1 in result)
-        Assert.IsNotNull(res1[0]);
+        Assert.That(res1[0], Is.Not.Null);
       var count = session.SQL("select count(*) from collectiontest").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options1.Validation = new Validation { Level = ValidationLevel.STRICT, Schema = doc1 };
       session.SQL("delete from collectiontest").Execute();
@@ -1435,16 +1435,16 @@ public void SchemaValidationDeleteRecords()
       foreach (Row res2 in result2)
         Console.WriteLine(res2[0]);
       count = session.SQL("select count(*) from collectiontest").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options1.Validation = new Validation { Level = ValidationLevel.OFF, Schema = doc1 };
       collection = schema.ModifyCollection("collectiontest", options1);
       collection.Add(@"{ ""name"": 78 }").Execute();
       result = session.SQL("select * from collectiontest").Execute().FetchAll();
       foreach (Row res2 in result)
-        Assert.IsNotNull(res2[0]);
+        Assert.That(res2[0], Is.Not.Null);
       count = session.SQL("select count(*) from collectiontest").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options1.Validation = new Validation { Level = ValidationLevel.STRICT, Schema = doc3 };
       session.SQL("delete from collectiontest").Execute();
@@ -1452,9 +1452,9 @@ public void SchemaValidationDeleteRecords()
       collection.Add(@"{""latitude"": 253, ""longitude"": 525}").Execute();
       result = session.SQL("select * from collectiontest").Execute().FetchAll();
       foreach (Row res2 in result)
-        Assert.IsNotNull(res2[0]);
+        Assert.That(res2[0], Is.Not.Null);
       count = session.SQL("select count(*) from collectiontest").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
       options1.Validation = new Validation { Level = ValidationLevel.STRICT, Schema = doc4 };
       session.SQL("delete from collectiontest").Execute();
@@ -1463,9 +1463,9 @@ public void SchemaValidationDeleteRecords()
       collection.Add(@"{ ""name"": ""Johnny"" }").Execute();
       result = session.SQL("select * from collectiontest").Execute().FetchAll();
       foreach (Row res2 in result)
-        Assert.IsNotNull(res2[0]);
+        Assert.That(res2[0], Is.Not.Null);
       count = session.SQL("select count(*) from collectiontest").Execute().FetchOne()[0];
-      Assert.AreEqual(count, collection.Count());
+      Assert.That(collection.Count(), Is.EqualTo(count));
 
     }
 
@@ -1499,10 +1499,10 @@ public void RemoveBindStress()
       }
       Result r = coll.Add(jsonlist).Add(jsonlist1).Execute();
 
-      Assert.AreEqual(20, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(20), "Matching");
 
       r = coll.Remove("_id = :_id").Bind("_id", 1000).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1), "Matching");
     }
 
     [Test, Description("Test MySQLX plugin Get Collection as Table")]
@@ -1523,17 +1523,17 @@ public void GetCollectionAsTableStress()
         newDoc2 = null;
       }
       Result r = testCollection.Add(jsonlist).Execute();
-      Assert.AreEqual(1000, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1000), "Matching");
 
       Table test = testSchema.GetCollectionAsTable("test");
-      Assert.IsTrue(test.ExistsInDatabase());
+      Assert.That(test.ExistsInDatabase());
       var rows = test.Select("_id").Execute().FetchAll();
 
       for (int j = 0; j < rows.Count; j++)
       {
         var doc = testCollection.Find("_id like :param").Bind("param", (j + 1000)).Execute();
         var docs = doc.FetchAll().Count();
-        Assert.AreEqual(1, docs, "Matches");
+        Assert.That(docs, Is.EqualTo(1), "Matches");
       }
     }
 
@@ -1582,9 +1582,9 @@ public void GetDocumentIDSStress()
         newDoc2 = null;
       }
       Result r = coll.Add(jsonlist).Execute();
-      Assert.AreEqual(1000, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1000), "Matching");
       var documentIds = r.GeneratedIds;
-      Assert.False(documentIds != null && documentIds.Count > 0);
+      Assert.That(documentIds != null && documentIds.Count > 0, Is.False);
     }
 
     [Test, Description("Session Performance Test")]
@@ -1671,8 +1671,8 @@ public void SessionPerformanceTest()
       json = "CAST(" + query + " as SIGNED)= " + maxDepth;
       var docs = collection.Find(json).Fields("$._id as _id," + query + " as Arr").Execute();
       var res = docs.FetchAll();
-      Assert.AreEqual("1001", res[0]["_id"].ToString(), "Matching the id");
-      Assert.AreEqual("1002", res[1]["_id"].ToString(), "Matching the id");
+      Assert.That(res[0]["_id"].ToString(), Is.EqualTo("1001"), "Matching the id");
+      Assert.That(res[1]["_id"].ToString(), Is.EqualTo("1002"), "Matching the id");
 
       query = "$.DATAX" + (maxField - 1);
       for (i = 0; i < maxDepth; i++)
@@ -1682,8 +1682,8 @@ public void SessionPerformanceTest()
       json = "CAST(" + query + " as SIGNED)";
       docs = collection.Find(json + " =" + maxDepth).Fields("$._id as _id ").Execute();
       res = docs.FetchAll();
-      Assert.AreEqual("1001", res[0]["_id"].ToString(), "Matching the id");
-      Assert.AreEqual("1003", res[1]["_id"].ToString(), "Matching the id");
+      Assert.That(res[0]["_id"].ToString(), Is.EqualTo("1001"), "Matching the id");
+      Assert.That(res[1]["_id"].ToString(), Is.EqualTo("1003"), "Matching the id");
     }
 
     /// <summary>
@@ -1698,42 +1698,42 @@ public void EmptyStringInModifyMethods()
       coll.Add(_doc).Execute();
       var result = coll.Find("_id == 1").Execute().FetchOne();
 
-      Assert.NotNull(result);
-      Assert.AreEqual(1, result.Id);
+      Assert.That(result, Is.Not.Null);
+      Assert.That(result.Id, Is.EqualTo(1));
 
       // empty string
       var ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").Set("", new { title = "bar" }).Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
       ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").Unset("").Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
       ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").Change("", new { title = "bar" }).Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
       ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").ArrayInsert("", new { title = "bar" }).Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
       ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").ArrayAppend("", new { title = "bar" }).Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
 
       // white space
       ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").Set(" ", new { title = "bar" }).Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
       ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").Unset(" ").Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
       ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").Change(" ", new { title = "bar" }).Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
       ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").ArrayInsert(" ", new { title = "bar" }).Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
       ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").ArrayAppend(" ", new { title = "bar" }).Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
 
       // null
       ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").Set(null, new { title = "bar" }).Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
       ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").Change(null, new { title = "bar" }).Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
       ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").ArrayInsert(null, new { title = "bar" }).Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
       ex = Assert.Throws<ArgumentException>(() => coll.Modify("_id == 1").ArrayAppend(null, new { title = "bar" }).Execute());
-      StringAssert.AreEqualIgnoringCase(ResourcesX.DocPathNullOrEmpty, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty).IgnoreCase);
       var ex2 = Assert.Throws<MySqlException>(() => coll.Modify("_id == 1").Unset(null).Execute());
     }
   }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
index 16a94cfd2..8629fd5ac 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
@@ -59,13 +59,13 @@ public void ConnectionOptionIsValidUsingBuilder()
     {
       var builder = new MySqlXConnectionStringBuilder(ConnectionString);
       builder.Compression = CompressionType.Preferred;
-      StringAssert.Contains("compression=Preferred", builder.ToString());
+      Assert.That(builder.ToString(), Does.Contain("compression=Preferred"));
 
       builder.Compression = CompressionType.Required;
-      StringAssert.Contains("compression=Required", builder.ToString());
+      Assert.That(builder.ToString(), Does.Contain("compression=Required"));
 
       builder.Compression = CompressionType.Disabled;
-      StringAssert.Contains("compression=Disabled", builder.ToString());
+      Assert.That(builder.ToString(), Does.Contain("compression=Disabled"));
     }
 
     [Test]
@@ -73,32 +73,32 @@ public void ConnectionOptionIsValidUsingConnectionUri()
     {
       using (var session = MySQLX.GetSession($"{ConnectionStringUri}?compression=PreFerRed"))
       {
-        Assert.AreEqual(CompressionType.Preferred, session.Settings.Compression);
+        Assert.That(session.Settings.Compression, Is.EqualTo(CompressionType.Preferred));
         session.Close();
       }
 
       using (var session = MySQLX.GetSession($"{ConnectionStringUri}?compression=required"))
       {
-        Assert.AreEqual(CompressionType.Required, session.Settings.Compression);
+        Assert.That(session.Settings.Compression, Is.EqualTo(CompressionType.Required));
         session.Close();
       }
 
       using (var session = MySQLX.GetSession($"{ConnectionStringUri}?compression=DISABLED"))
       {
-        Assert.AreEqual(CompressionType.Disabled, session.Settings.Compression);
+        Assert.That(session.Settings.Compression, Is.EqualTo(CompressionType.Disabled));
         session.Close();
       }
 
       // Test whitespace
       using (var session = MySQLX.GetSession($"{ConnectionStringUri}?compression= DISABLED"))
       {
-        Assert.AreEqual(CompressionType.Disabled, session.Settings.Compression);
+        Assert.That(session.Settings.Compression, Is.EqualTo(CompressionType.Disabled));
         session.Close();
       }
 
       using (var session = MySQLX.GetSession($"{ConnectionStringUri}?compression= DISABLED  "))
       {
-        Assert.AreEqual(CompressionType.Disabled, session.Settings.Compression);
+        Assert.That(session.Settings.Compression, Is.EqualTo(CompressionType.Disabled));
         session.Close();
       }
     }
@@ -117,7 +117,7 @@ public void ConnectionOptionIsValidUsingAnonymousObject()
 
       using (var session = MySQLX.GetSession(connectionData))
       {
-        Assert.AreEqual(CompressionType.Required, session.Settings.Compression);
+        Assert.That(session.Settings.Compression, Is.EqualTo(CompressionType.Required));
         session.Close();
       }
     }
@@ -126,36 +126,36 @@ public void ConnectionOptionIsValidUsingAnonymousObject()
     public void ConnectionOptionIsValidUsingConnectionString()
     {
       var builder = new MySqlXConnectionStringBuilder($"server={Host};port={XPort};compression=PreFerRed");
-      Assert.AreEqual(CompressionType.Preferred, builder.Compression);
+      Assert.That(builder.Compression, Is.EqualTo(CompressionType.Preferred));
 
       builder = new MySqlXConnectionStringBuilder($"server={Host};port={XPort};compression=required");
-      Assert.AreEqual(CompressionType.Required, builder.Compression);
+      Assert.That(builder.Compression, Is.EqualTo(CompressionType.Required));
 
       builder = new MySqlXConnectionStringBuilder($"server={Host};port={XPort};compression=DISABLED");
-      Assert.AreEqual(CompressionType.Disabled, builder.Compression);
+      Assert.That(builder.Compression, Is.EqualTo(CompressionType.Disabled));
 
       // Test whitespace
       builder = new MySqlXConnectionStringBuilder($"server={Host};port={XPort};compression=  required");
-      Assert.AreEqual(CompressionType.Required, builder.Compression);
+      Assert.That(builder.Compression, Is.EqualTo(CompressionType.Required));
 
       builder = new MySqlXConnectionStringBuilder($"server={Host};port={XPort};compression=    required");
-      Assert.AreEqual(CompressionType.Required, builder.Compression);
+      Assert.That(builder.Compression, Is.EqualTo(CompressionType.Required));
 
       builder = new MySqlXConnectionStringBuilder($"server={Host};port={XPort};compression=  required  ");
-      Assert.AreEqual(CompressionType.Required, builder.Compression);
+      Assert.That(builder.Compression, Is.EqualTo(CompressionType.Required));
     }
 
     [Test]
     public void PreferredIsTheDefaultValue()
     {
       var builder = new MySqlXConnectionStringBuilder();
-      Assert.AreEqual(CompressionType.Preferred, builder.Compression);
+      Assert.That(builder.Compression, Is.EqualTo(CompressionType.Preferred));
 
       // Empty value is ignored.
       var updatedConnectionStringUri = ConnectionStringUri + "?compression=";
       using (var session = MySQLX.GetSession(updatedConnectionStringUri))
       {
-        Assert.AreEqual(CompressionType.Preferred, session.Settings.Compression);
+        Assert.That(session.Settings.Compression, Is.EqualTo(CompressionType.Preferred));
         session.Close();
       }
 
@@ -163,7 +163,7 @@ public void PreferredIsTheDefaultValue()
       updatedConnectionStringUri = ConnectionStringUri + "?compression= ";
       using (var session = MySQLX.GetSession(updatedConnectionStringUri))
       {
-        Assert.AreEqual(CompressionType.Preferred, session.Settings.Compression);
+        Assert.That(session.Settings.Compression, Is.EqualTo(CompressionType.Preferred));
         session.Close();
       }
     }
@@ -175,10 +175,10 @@ public void SettingAnInvalidCompressionTypeRaisesException()
       foreach (var invalidValue in invalidValues)
       {
         var exception = Assert.Throws<ArgumentException>(() => new MySqlXConnectionStringBuilder($"server={Host};port={XPort};compression={invalidValue}"));
-        Assert.AreEqual($"The connection property 'compression' acceptable values are: 'preferred', 'required' or 'disabled'. The value '{invalidValue}' is not acceptable.", exception.Message);
+        Assert.That(exception.Message, Is.EqualTo($"The connection property 'compression' acceptable values are: 'preferred', 'required' or 'disabled'. The value '{invalidValue}' is not acceptable."));
 
         exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server={Host};port={XPort};user=root;compression={invalidValue}"));
-        Assert.AreEqual($"The connection property 'compression' acceptable values are: 'preferred', 'required' or 'disabled'. The value '{invalidValue}' is not acceptable.", exception.Message);
+        Assert.That(exception.Message, Is.EqualTo($"The connection property 'compression' acceptable values are: 'preferred', 'required' or 'disabled'. The value '{invalidValue}' is not acceptable."));
       }
     }
 
@@ -187,14 +187,14 @@ public void SessionRetainsTheSpecifiedCompressionType()
     {
       using (var session = MySQLX.GetSession(ConnectionStringUri))
       {
-        Assert.AreEqual(CompressionType.Preferred, session.Settings.Compression);
+        Assert.That(session.Settings.Compression, Is.EqualTo(CompressionType.Preferred));
         session.Close();
       }
 
       var updatedConnectionStringUri = ConnectionStringUri + "?compression=Disabled";
       using (var session = MySQLX.GetSession(updatedConnectionStringUri))
       {
-        Assert.AreEqual(CompressionType.Disabled, session.Settings.Compression);
+        Assert.That(session.Settings.Compression, Is.EqualTo(CompressionType.Disabled));
         session.Close();
       }
     }
@@ -206,12 +206,12 @@ public void ValidateRequiredCompressionType()
       if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 19))
       {
         var exception = Assert.Throws<NotSupportedException>(() => MySQLX.GetSession($"{ConnectionStringUri}?compression=Required"));
-        Assert.AreEqual("Compression requested but the server does not support it.", exception.Message);
+        Assert.That(exception.Message, Is.EqualTo("Compression requested but the server does not support it."));
       }
       else
       {
         using var session = MySQLX.GetSession($"{ConnectionStringUri}?compression=Required");
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
     }
 
@@ -224,26 +224,26 @@ public void NegotiationSucceedsWithExpectedCompressionAlgorithm()
       using (var session = MySQLX.GetSession(ConnectionStringUri))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.zstd_stream.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.zstd_stream.ToString()));
         compressionAlgorithm = session.XSession.GetCompressionAlgorithm(false);
-        Assert.AreEqual(CompressionAlgorithms.zstd_stream.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.zstd_stream.ToString()));
       }
 
       using (var session = MySQLX.GetSession(ConnectionStringUri + "?compression-algorithms=lz4_message"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
         compressionAlgorithm = session.XSession.GetCompressionAlgorithm(false);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
 #if !NETFRAMEWORK 
       using (var session = MySQLX.GetSession(ConnectionStringUri + "?compression-algorithms=deflate_stream"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.deflate_stream.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.deflate_stream.ToString()));
         compressionAlgorithm = session.XSession.GetCompressionAlgorithm(false);
-        Assert.AreEqual(CompressionAlgorithms.deflate_stream.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.deflate_stream.ToString()));
       }
 #endif
     }
@@ -260,7 +260,7 @@ public void NegotiationWithSpecificCompressionAlgorithm()
         using (var session = MySQLX.GetSession(updatedConnectionStringUri))
         {
           var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-          Assert.AreEqual(CompressionAlgorithms.zstd_stream.ToString(), compressionAlgorithm);
+          Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.zstd_stream.ToString()));
         }
       }
 
@@ -268,18 +268,18 @@ public void NegotiationWithSpecificCompressionAlgorithm()
       using (var session = MySQLX.GetSession(updatedConnectionStringUri))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
       ExecuteSqlAsRoot($"SET GLOBAL mysqlx_compression_algorithms ={DEFLATE_STREAM}");
 #if NETFRAMEWORK
       var exception = Assert.Throws<NotSupportedException>(() => MySQLX.GetSession(updatedConnectionStringUri));
-      Assert.AreEqual("Compression requested but the compression algorithm negotiation failed.", exception.Message);
+      Assert.That(exception.Message, Is.EqualTo("Compression requested but the compression algorithm negotiation failed."));
 #else
       using (var session = MySQLX.GetSession(updatedConnectionStringUri))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.deflate_stream.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.deflate_stream.ToString()));
       }
 #endif
 
@@ -288,8 +288,8 @@ public void NegotiationWithSpecificCompressionAlgorithm()
       using (var session = MySQLX.GetSession(updatedConnectionStringUri))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.True(Enum.TryParse<CompressionAlgorithms>(compressionAlgorithm, out var algorithm));
-        Assert.True(algorithm == CompressionAlgorithms.lz4_message || algorithm == CompressionAlgorithms.zstd_stream);
+        Assert.That(Enum.TryParse<CompressionAlgorithms>(compressionAlgorithm, out var algorithm));
+        Assert.That(algorithm == CompressionAlgorithms.lz4_message || algorithm == CompressionAlgorithms.zstd_stream);
       }
     }
 
@@ -322,13 +322,13 @@ public void ConfigurableCompressionAlgorithms()
       using (var session = MySQLX.GetSession(ConnectionStringUri + "?compression-algorithms=lz4_message;"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
       using (var session = MySQLX.GetSession(ConnectionString + ";compression-algorithms=lz4_message;"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
 #if NETFRAMEWORK
@@ -336,13 +336,13 @@ public void ConfigurableCompressionAlgorithms()
       using (var session = MySQLX.GetSession(new { server = Host, port = XPort, uid = "test", password = "test", compressionalgorithms = "deflate_stream" }))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.IsNull(compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.Null);
       }
 #else
       using (var session = MySQLX.GetSession(new { server = Host, port = XPort, uid = "test", password = "test", compressionalgorithms = "deflate_stream" }))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        StringAssert.AreEqualIgnoringCase(CompressionAlgorithms.deflate_stream.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.deflate_stream.ToString()).IgnoreCase);
       }
 #endif
 
@@ -350,7 +350,7 @@ public void ConfigurableCompressionAlgorithms()
       using (var session = MySQLX.GetSession(sb.GetConnectionString(true)))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
       // FR1_2 Create session with option compression-algorithms and set the option with no value either by not including the property in the connection string 
@@ -358,13 +358,13 @@ public void ConfigurableCompressionAlgorithms()
       using (var session = MySQLX.GetSession($"server={Host};port={XPort};uid=test;password=test;"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.True(Enum.TryParse<CompressionAlgorithms>(compressionAlgorithm, out var result));
+        Assert.That(Enum.TryParse<CompressionAlgorithms>(compressionAlgorithm, out var result));
       }
 
       using (var session = MySQLX.GetSession(ConnectionString + ";compression-algorithms="))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.True(Enum.TryParse<CompressionAlgorithms>(compressionAlgorithm, out var result));
+        Assert.That(Enum.TryParse<CompressionAlgorithms>(compressionAlgorithm, out var result));
       }
 
       // FR2_1,FR2_2 Create session with option compression-algorithms and set the value with multiple compression algorithms for 
@@ -372,13 +372,13 @@ public void ConfigurableCompressionAlgorithms()
       using (var session = MySQLX.GetSession(ConnectionStringUri + "?compression-algorithms=lz4_message,zstd_stream,deflate_stream;"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
       using (var session = MySQLX.GetSession(ConnectionString + ";compression-algorithms=lz4_message,zstd_stream,deflate_stream;"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
 #if NETFRAMEWORK
@@ -386,13 +386,13 @@ public void ConfigurableCompressionAlgorithms()
       using (var session = MySQLX.GetSession(new { server = Host, port = XPort, uid = "test", password = "test", compressionalgorithms = "deflate_stream,lz4_message,zstd_stream" }))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 #else
       using (var session = MySQLX.GetSession(new { server = Host, port = XPort, uid = "test", password = "test", compressionalgorithms = "deflate_stream,lz4_message,zstd_stream" }))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        StringAssert.AreEqualIgnoringCase(CompressionAlgorithms.deflate_stream.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.deflate_stream.ToString()).IgnoreCase);
       }
 #endif
 
@@ -400,40 +400,40 @@ public void ConfigurableCompressionAlgorithms()
       using (var session = MySQLX.GetSession(sb.GetConnectionString(true)))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
       // FR3 Create session with option compression-algorithms and set the option with Algorithm aliases lz4, zstd, and deflate.
       using (var session = MySQLX.GetSession(ConnectionString + ";compression-algorithms=lz4,zstd,deflate;"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
       using (var session = MySQLX.GetSession(ConnectionStringUri + "?compression-algorithms=lz4,deflate_stream"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
       // FR4_1 Create session with option compression-algorithms.Set the option with unsupported and supported algorithms by client.
       using (var session = MySQLX.GetSession(ConnectionString + ";compression=required;compression-algorithms=NotSupported,lz4,SomethingElse;"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
       using (var session = MySQLX.GetSession(ConnectionStringUri + "?compression-algorithms=lz4,NotSupported"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
       sb = new MySqlXConnectionStringBuilder($"server={Host};port={XPort};uid=test;password=test;compression-algorithms=[NotValid,INVALID,NOTSUPPORTED,lz4]");
       using (var session = MySQLX.GetSession(sb.GetConnectionString(true)))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
       // FR4_2 Create session and set invalid values to the compression-algorithm option to check if the connection is uncompressed when 
@@ -441,26 +441,26 @@ public void ConfigurableCompressionAlgorithms()
       using (var session = MySQLX.GetSession(ConnectionString + ";compression-algorithms=NotSupported,SomethingElse;"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.IsNull(compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.Null);
       }
 
       using (var session = MySQLX.GetSession(ConnectionString + ";compression=disabled;compression-algorithms=lz4,NotSupported,SomethingElse;"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.IsNull(compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.Null);
       }
 
       using (var session = MySQLX.GetSession(ConnectionString + ";compression=preferred;compression-algorithms=[NotSupported,SomethingElse];"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.IsNull(compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.Null);
       }
 
       // FR4_3 Create session and set invalid values to the compression-algorithm option.
       // The connection should terminate with an error when compression option is set to required.
 
       Exception ex = Assert.Throws<System.NotSupportedException>(() => MySQLX.GetSession(ConnectionString + ";compression=required;compression-algorithms=NotSupported,SomethingElse;"));
-      Assert.AreEqual("Compression requested but the compression algorithm negotiation failed.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Compression requested but the compression algorithm negotiation failed."));
 
       // FR4_4 Start server with specific compression algorithm and create session with option 
       // compression-algorithms.Set the option with multiple compression algorithms.
@@ -468,7 +468,7 @@ public void ConfigurableCompressionAlgorithms()
       using (var session = MySQLX.GetSession(ConnectionString + ";compression=preferred;compression-algorithms=[lz4_message,deflate,zstd];"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
       // FR4_5 Start the server with a specific compression algorithm and use some other in the client and when compression option is either 
@@ -477,19 +477,19 @@ public void ConfigurableCompressionAlgorithms()
       using (var session = MySQLX.GetSession(ConnectionString + ";compression-algorithms=[lz4_message]"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.IsNull(compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.Null);
       }
 
       using (var session = MySQLX.GetSession(ConnectionString + ";compression=preferred;compression-algorithms=[lz4_message]"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.IsNull(compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.Null);
       }
 
       using (var session = MySQLX.GetSession(ConnectionString + ";compression=disabled;compression-algorithms=[lz4_message]"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.IsNull(compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.Null);
       }
 
       //FR4_6,FR_5 Start the server with a specific compression algorithm and use some other in the client and when compression option is set to required.Verify the behaviour
@@ -497,7 +497,7 @@ public void ConfigurableCompressionAlgorithms()
       using (var session = MySQLX.GetSession(ConnectionString + ";compression=required;"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
         var ele = new List<object>();
         for (int i = 0; i < 1000; i++)
         {
@@ -508,23 +508,23 @@ public void ConfigurableCompressionAlgorithms()
         var result = ExecuteAddStatement(coll.Add(ele.ToArray()));
         var result1 = session.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_uncompressed_frame' ").Execute().FetchOne()[1];
         var result2 = session.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.Greater(int.Parse(result1.ToString()), int.Parse(result2.ToString()));
+        Assert.That(int.Parse(result1.ToString()), Is.GreaterThan(int.Parse(result2.ToString())));
         var result3 = session.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_compressed_payload' ").Execute().FetchOne()[1];
         var result4 = session.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.Greater(int.Parse(result3.ToString()), int.Parse(result4.ToString()));
+        Assert.That(int.Parse(result3.ToString()), Is.GreaterThan(int.Parse(result4.ToString())));
       }
 
       using (var session = MySQLX.GetSession(ConnectionString + ";compression=required;compression-algorithms=[lz4_message]"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.AreEqual(CompressionAlgorithms.lz4_message.ToString(), compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.lz4_message.ToString()));
       }
 
       // Server algorithm not contain user defined algorithm, with compression preferred
       using (var session = MySQLX.GetSession(ConnectionStringUri + "?compression-algorithms=[zstd];"))
       {
         var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-        Assert.IsNull(compressionAlgorithm);
+        Assert.That(compressionAlgorithm, Is.Null);
 
         var ele = new List<object>();
         for (int i = 0; i < 1000; i++)
@@ -536,14 +536,14 @@ public void ConfigurableCompressionAlgorithms()
         var result = ExecuteAddStatement(coll.Add(ele.ToArray()));
         var result1 = session.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_uncompressed_frame' ").Execute().FetchOne()[1];
         var result2 = session.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.AreEqual(result1, result2);
+        Assert.That(result2, Is.EqualTo(result1));
         var result3 = session.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_compressed_payload' ").Execute().FetchOne()[1];
         var result4 = session.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.AreEqual(result3, result4);
+        Assert.That(result4, Is.EqualTo(result3));
       }
 
       Exception ex_args = Assert.Throws<System.ArgumentException>(() => MySQLX.GetSession(ConnectionString + ";compression=required;compression_algorithms=[lz4_message]"));
-      StringAssert.Contains("Option not supported", ex_args.Message);
+      Assert.That(ex_args.Message, Does.Contain("Option not supported"));
     }
 
     [Test]
@@ -558,24 +558,24 @@ public void CompressionAlgorithms_Bugs()
         using (var session = MySQLX.GetSession(ConnectionString + ";compression=required;compression-algorithms=[];"))
         {
           var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-          Assert.IsNotNull(compressionAlgorithm);
+          Assert.That(compressionAlgorithm, Is.Not.Null);
         }
         // With only deflate available,Exeption expected 
         ExecuteSqlAsRoot(@"SET GLOBAL mysqlx_compression_algorithms = ""DEFLATE_STREAM"" ");
         Exception ex_bug1 = Assert.Throws<System.NotSupportedException>(() => MySQLX.GetSession(ConnectionString + ";compression=required;compression-algorithms=[];"));
-        StringAssert.Contains("Compression requested but the compression algorithm negotiation failed", ex_bug1.Message);
+        Assert.That(ex_bug1.Message, Does.Contain("Compression requested but the compression algorithm negotiation failed"));
 #else
         using (var session = MySQLX.GetSession(ConnectionString + ";compression=required;compression-algorithms=[];"))
         {
           var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-          Assert.IsNotNull(compressionAlgorithm);
+          Assert.That(compressionAlgorithm, Is.Not.Null);
         }
         // With only deflate available,compression is expected 
         ExecuteSqlAsRoot(@"SET GLOBAL mysqlx_compression_algorithms = ""DEFLATE_STREAM"" ");
         using (var session = MySQLX.GetSession(ConnectionString + ";compression=required;compression-algorithms=[];"))
         {
           var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-          Assert.AreEqual(CompressionAlgorithms.deflate_stream.ToString(), compressionAlgorithm);
+          Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.deflate_stream.ToString()));
         }
 #endif
 
@@ -584,12 +584,12 @@ public void CompressionAlgorithms_Bugs()
 #if NETFRAMEWORK
         // Exeption expected due to compression=required
         Exception ex_bug2 = Assert.Throws<System.NotSupportedException>(() => MySQLX.GetSession(ConnectionString + ";compression=required;compression-algorithms=deflate_stream;"));
-        StringAssert.Contains("is not supported in .NET Framework", ex_bug2.Message);
+        Assert.That(ex_bug2.Message, Does.Contain("is not supported in .NET Framework"));
 #else
         using (var session = MySQLX.GetSession(ConnectionString + ";compression=required;compression-algorithms=deflate_stream;"))
         {
           var compressionAlgorithm = session.XSession.GetCompressionAlgorithm(true);
-          Assert.AreEqual(CompressionAlgorithms.deflate_stream.ToString(), compressionAlgorithm);
+          Assert.That(compressionAlgorithm, Is.EqualTo(CompressionAlgorithms.deflate_stream.ToString()));
         }
 #endif
       }
@@ -601,7 +601,7 @@ public void CompressionAlgorithms_Bugs()
       {
         // This line ensures that the list of supported compression algorithms is set to its default value.
         ExecuteSqlAsRoot(@"SET GLOBAL mysqlx_compression_algorithms = ""ZSTD_STREAM,LZ4_MESSAGE,DEFLATE_STREAM"" ");
-        Assert.True(success);
+        Assert.That(success);
       }
     }
 
@@ -630,17 +630,17 @@ public void ConnectionStringCombinations()
         {
           //ConnectionString
           session1 = MySQLX.GetSession(ConnectionStringUserWithSSLPEM + " ;Auth=AUTO;sslmode=" + modes[j] + ";compression=" + compressValue[i]);
-          Assert.AreEqual(SessionState.Open, session1.XSession.SessionState);
+          Assert.That(session1.XSession.SessionState, Is.EqualTo(SessionState.Open));
           session1.Close();
 
           //Uri
           session2 = MySQLX.GetSession(connSSLURI + "&sslmode=" + modes[j] + "&compression=" + compressValue[i]);
-          Assert.AreEqual(SessionState.Open, session2.XSession.SessionState);
+          Assert.That(session2.XSession.SessionState, Is.EqualTo(SessionState.Open));
           session2.Close();
 
           //Anonymous Object
           session3 = MySQLX.GetSession(new { server = sb.Server, user = sb.UserID, port = sb.Port, password = sb.Password, SslCa = sslCa, SslCert = sslCert, SslKey = sslKey, Auth = MySqlAuthenticationMode.AUTO, sslmode = modes[j], compression = compressValue[i] });
-          Assert.AreEqual(SessionState.Open, session3.XSession.SessionState);
+          Assert.That(session3.XSession.SessionState, Is.EqualTo(SessionState.Open));
           session3.Close();
 
           //MySqlXConnectionStringBuilder
@@ -648,7 +648,7 @@ public void ConnectionStringCombinations()
           sb.Auth = MySqlAuthenticationMode.AUTO;
           sb.Compression = compressValue[i];
           session4 = MySQLX.GetSession(sb.ConnectionString);
-          Assert.AreEqual(SessionState.Open, session4.XSession.SessionState);
+          Assert.That(session4.XSession.SessionState, Is.EqualTo(SessionState.Open));
           session4.Close();
         }
       }
@@ -657,20 +657,20 @@ public void ConnectionStringCombinations()
       for (int i = 0; i < 3; i++)
       {
         session1 = MySQLX.GetSession(ConnectionString + ";auth=AUTO;compression=" + compressValue[i]);
-        Assert.AreEqual(SessionState.Open, session1.XSession.SessionState);
+        Assert.That(session1.XSession.SessionState, Is.EqualTo(SessionState.Open));
         session1.Close();
 
         session2 = MySQLX.GetSession(ConnectionStringUri + "?compression=" + compressValue[i]);
-        Assert.AreEqual(SessionState.Open, session2.XSession.SessionState);
+        Assert.That(session2.XSession.SessionState, Is.EqualTo(SessionState.Open));
         session2.Close();
 
         session3 = MySQLX.GetSession(new { server = sb.Server, user = sb.UserID, port = sb.Port, password = sb.Password, compression = compressValue[i] });
-        Assert.AreEqual(SessionState.Open, session3.XSession.SessionState);
+        Assert.That(session3.XSession.SessionState, Is.EqualTo(SessionState.Open));
         session3.Close();
 
         sb.Compression = compressValue[i];
         session4 = MySQLX.GetSession(sb.ConnectionString);
-        Assert.AreEqual(SessionState.Open, session4.XSession.SessionState);
+        Assert.That(session4.XSession.SessionState, Is.EqualTo(SessionState.Open));
         session4.Close();
       }
     }
@@ -685,17 +685,17 @@ public void CompressionWithPolling()
         client = MySQLX.GetClient(ConnectionString + ";compression=" + compressValue[i], new { pooling = new { maxSize = 2, queueTimeout = 2000 } });
 
         session1 = client.GetSession();
-        Assert.AreEqual(SessionState.Open, session1.XSession.SessionState);
+        Assert.That(session1.XSession.SessionState, Is.EqualTo(SessionState.Open));
         session1.Close();
 
         session2 = client.GetSession();
-        Assert.AreEqual(SessionState.Open, session2.XSession.SessionState);
+        Assert.That(session2.XSession.SessionState, Is.EqualTo(SessionState.Open));
         session2.Close();
 
         session1 = client.GetSession();
-        Assert.AreEqual(SessionState.Open, session1.XSession.SessionState);
+        Assert.That(session1.XSession.SessionState, Is.EqualTo(SessionState.Open));
         session2 = client.GetSession();
-        Assert.AreEqual(SessionState.Open, session2.XSession.SessionState);
+        Assert.That(session2.XSession.SessionState, Is.EqualTo(SessionState.Open));
 
         Assert.Throws<TimeoutException>(() => client.GetSession());
         session1.Close();
@@ -731,17 +731,17 @@ public void VerifyDataSentCompression()
         schema.GetCollection("compressed");
         var reader = session2.SQL("Select count(*) from compressed").Execute().FetchOne()[0];
         var reader2 = session2.SQL("Select * from compressed").Execute().FetchAll();
-        Assert.AreEqual("1", reader.ToString());
+        Assert.That(reader.ToString(), Is.EqualTo("1"));
 
         // Results of compression when its value for session1 is: compressValue1[i] and for session2 is: compressValue2[i]
         var result1 = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result1);
+        Assert.That(result1, Is.Not.Null);
         var result2 = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result2);
+        Assert.That(result2, Is.Not.Null);
         var result3 = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result3);
+        Assert.That(result3, Is.Not.Null);
         var result4 = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result4);
+        Assert.That(result4, Is.Not.Null);
         if (Convert.ToInt32(result4) == 0 || Convert.ToInt32(result2) == 0)
         {
           Assert.Fail("Compression failed");
@@ -749,13 +749,13 @@ public void VerifyDataSentCompression()
 
         // Results of compression when its value for session2 is: compressValue1[i] and for session2 is: compressValue2[i]
         var result21 = session2.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result21);
+        Assert.That(result21, Is.Not.Null);
         var result22 = session2.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result22);
+        Assert.That(result22, Is.Not.Null);
         var result23 = session2.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result23);
+        Assert.That(result23, Is.Not.Null);
         var result24 = session2.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result24);
+        Assert.That(result24, Is.Not.Null);
         session1.Close();
         session2.Close();
       }
@@ -787,25 +787,25 @@ public void VerifyDataReadCompression()
         schema.GetCollection("compressed");
         var reader = session2.SQL("Select count(*) from compressed").Execute().FetchOne()[0];
         var reader2 = session2.SQL("Select * from compressed").Execute().FetchAll();
-        Assert.AreEqual("1", reader.ToString());
+        Assert.That(reader.ToString(), Is.EqualTo("1"));
 
         var result1 = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result1);
+        Assert.That(result1, Is.Not.Null);
         var result2 = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result2);
+        Assert.That(result2, Is.Not.Null);
         var result3 = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result3);
+        Assert.That(result3, Is.Not.Null);
         var result4 = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result4);
+        Assert.That(result4, Is.Not.Null);
 
         var result21 = session2.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result21);
+        Assert.That(result21, Is.Not.Null);
         var result22 = session2.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result22);
+        Assert.That(result22, Is.Not.Null);
         var result23 = session2.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result23);
+        Assert.That(result23, Is.Not.Null);
         var result24 = session2.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result24);
+        Assert.That(result24, Is.Not.Null);
         session1.Close();
         session2.Close();
       }
@@ -828,13 +828,13 @@ public void CompressionThreshold()
 
         collection.Add(doc1).Execute();
         var result1 = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result1);
+        Assert.That(result1, Is.Not.Null);
         var result2 = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result2);
+        Assert.That(result2, Is.Not.Null);
         var result3 = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result3);
+        Assert.That(result3, Is.Not.Null);
         var result4 = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result4);
+        Assert.That(result4, Is.Not.Null);
 
         if (!Platform.IsWindows())
           if (Convert.ToInt32(result2) != 0 || Convert.ToInt32(result4) != 0)
@@ -846,13 +846,13 @@ public void CompressionThreshold()
 
         collection2.Add(doc2).Execute();
         var result1b = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result1b);
+        Assert.That(result1b, Is.Not.Null);
         var result2b = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result2b);
+        Assert.That(result2b, Is.Not.Null);
         var result3b = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result3b);
+        Assert.That(result3b, Is.Not.Null);
         var result4b = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result4b);
+        Assert.That(result4b, Is.Not.Null);
 
         if (Convert.ToInt32(result4b) == 0 || Convert.ToInt32(result2b) == 0)
           Assert.Fail("Compression failed");
@@ -863,13 +863,13 @@ public void CompressionThreshold()
 
         collection3.Add(doc3).Execute();
         var result1c = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result1c);
+        Assert.That(result1c, Is.Not.Null);
         var result2c = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_uncompressed_frame' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result2c);
+        Assert.That(result2c, Is.Not.Null);
         var result3c = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_sent_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result3c);
+        Assert.That(result3c, Is.Not.Null);
         var result4c = session1.SQL("select * from performance_schema.session_status where variable_name='Mysqlx_bytes_received_compressed_payload' ").Execute().FetchOne()[1];
-        Assert.IsNotNull(result4c);
+        Assert.That(result4c, Is.Not.Null);
 
         if (Convert.ToInt32(result4c) == 0 || Convert.ToInt32(result2c) == 0)
           Assert.Fail("Compression failed");
@@ -912,7 +912,7 @@ public void NetworkLatency()
         watch2.Stop();
       }
 
-      Assert.True(watch1.ElapsedTicks != watch2.ElapsedTicks,
+      Assert.That(watch1.ElapsedTicks != watch2.ElapsedTicks,
         $"Watch1: {watch1.ElapsedMilliseconds}, Watch2: {watch2.ElapsedMilliseconds}");
     }
     #endregion
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs
index aa5bcd253..d21fe9c36 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs
@@ -51,8 +51,8 @@ public void InsertSingleDbDocWithId()
     {
       Collection coll = CreateCollection("test");
       Result r = ExecuteAddStatement(coll.Add(@"{ ""_id"": 1, ""foo"": 1 }"));
-      Assert.AreEqual(1, r.AffectedItemsCount);
-      Assert.AreEqual(1, coll.Count());
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(coll.Count(), Is.EqualTo(1));
     }
 
     [Test]
@@ -63,14 +63,14 @@ public void InsertSingleDbDocWithoutId()
       if (!session.Version.isAtLeast(8, 0, 5))
       {
         // Code 5115 Document is missing a required field
-        Assert.AreEqual(5115u, Assert.Throws<MySqlException>(() => ExecuteAddStatement(stmt)).Code);
+        Assert.That(Assert.Throws<MySqlException>(() => ExecuteAddStatement(stmt)).Code, Is.EqualTo(5115u));
         return;
       }
       Result r = ExecuteAddStatement(stmt);
-      Assert.AreEqual(1, r.AffectedItemsCount);
-      Assert.AreEqual(1, coll.Count());
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(coll.Count(), Is.EqualTo(1));
       Assert.That(r.GeneratedIds, Has.One.Items);
-      Assert.False(string.IsNullOrWhiteSpace(r.GeneratedIds[0]));
+      Assert.That(string.IsNullOrWhiteSpace(r.GeneratedIds[0]), Is.False);
     }
 
     [Test]
@@ -83,13 +83,13 @@ public void InsertMultipleDbDocWithoutId()
       if (!session.Version.isAtLeast(8, 0, 5))
       {
         // Code 5115 Document is missing a required field
-        Assert.AreEqual(5115u, Assert.Throws<MySqlException>(() => ExecuteAddStatement(stmt)).Code);
+        Assert.That(Assert.Throws<MySqlException>(() => ExecuteAddStatement(stmt)).Code, Is.EqualTo(5115u));
         return;
       }
       Result r = ExecuteAddStatement(stmt);
-      Assert.AreEqual(3, r.AffectedItemsCount);
-      Assert.AreEqual(3, coll.Count());
-      Assert.AreEqual(3, r.GeneratedIds.Count);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(3));
+      Assert.That(coll.Count(), Is.EqualTo(3));
+      Assert.That(r.GeneratedIds.Count, Is.EqualTo(3));
     }
 
     [Test]
@@ -99,9 +99,9 @@ public void InsertAnonymousObjectWithId()
 
       Collection coll = CreateCollection("test");
       Result r = ExecuteAddStatement(coll.Add(obj));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       //TODO:  pull object and verify data
-      Assert.AreEqual(1, coll.Count());
+      Assert.That(coll.Count(), Is.EqualTo(1));
     }
 
     [Test]
@@ -114,15 +114,15 @@ public void InsertAnonymousObjectWithNoId()
       if (!session.Version.isAtLeast(8, 0, 5))
       {
         // Code 5115 Document is missing a required field
-        Assert.AreEqual(5115u, Assert.Throws<MySqlException>(() => ExecuteAddStatement(stmt)).Code);
+        Assert.That(Assert.Throws<MySqlException>(() => ExecuteAddStatement(stmt)).Code, Is.EqualTo(5115u));
         return;
       }
       Result r = ExecuteAddStatement(stmt);
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       //TODO:  pull object and verify data
-      Assert.AreEqual(1, coll.Count());
+      Assert.That(coll.Count(), Is.EqualTo(1));
       Assert.That(r.GeneratedIds, Has.One.Items);
-      Assert.False(string.IsNullOrWhiteSpace(r.GeneratedIds[0]));
+      Assert.That(string.IsNullOrWhiteSpace(r.GeneratedIds[0]), Is.False);
     }
 
     [Test]
@@ -137,8 +137,8 @@ public void InsertMultipleAnonymousObjectsWithId()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
-      Assert.AreEqual(4, coll.Count());
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
+      Assert.That(coll.Count(), Is.EqualTo(4));
     }
 
     [Test]
@@ -149,15 +149,15 @@ public void ValidatesDocumentIds()
       if (!session.Version.isAtLeast(8, 0, 5))
       {
         // Code 5115 Document is missing a required field
-        Assert.AreEqual(5115u, Assert.Throws<MySqlException>(() => ExecuteAddStatement(stmt)).Code);
+        Assert.That(Assert.Throws<MySqlException>(() => ExecuteAddStatement(stmt)).Code, Is.EqualTo(5115u));
         return;
       }
       Result result = ExecuteAddStatement(stmt);
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
       result = ExecuteModifyStatement(coll.Modify($"_id = '{result.GeneratedIds[0]}'").Set("pages", "20"));
-      Assert.AreEqual(1, result.AffectedItemsCount);
-      CollectionAssert.IsEmpty(result.GeneratedIds);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(result.GeneratedIds, Is.Empty);
     }
 
     [Test]
@@ -177,8 +177,8 @@ public void ReuseStatement()
         stmt.Add(doc);
       }
       Result r = ExecuteAddStatement(stmt);
-      Assert.AreEqual((ulong)docs.Length + 1, r.AffectedItemsCount);
-      Assert.AreEqual(5, coll.Count());
+      Assert.That(r.AffectedItemsCount, Is.EqualTo((ulong)docs.Length + 1));
+      Assert.That(coll.Count(), Is.EqualTo(5));
     }
 
     [Test]
@@ -187,10 +187,10 @@ public void EmptyDocArray()
       Collection coll = CreateCollection("test");
 
       var insertResult = ExecuteAddStatement(coll.Add(new DbDoc[] { }));
-      Assert.AreEqual(0ul, insertResult.AffectedItemsCount);
+      Assert.That(insertResult.AffectedItemsCount, Is.EqualTo(0ul));
 
       var result = ExecuteFindStatement(coll.Find()).FetchAll();
-      CollectionAssert.IsEmpty(result);
+      Assert.That(result, Is.Empty);
     }
 
     [Test]
@@ -218,7 +218,7 @@ public void InsertingArray()
       ExecuteAddStatement(coll.Add(d2));
       var result = ExecuteFindStatement(coll.Find()).FetchAll();
       Assert.That(result, Has.One.Items);
-      Assert.AreEqual(d2.ToString(), result[0].ToString());
+      Assert.That(result[0].ToString(), Is.EqualTo(d2.ToString()));
     }
 
     [Test]
@@ -226,13 +226,13 @@ public void CompareGuids()
     {
       Guid guid1 = new Guid();
       Guid guid2 = new Guid();
-      Assert.AreEqual(0, Tools.CompareGuids(guid1, guid2));
-      Assert.AreEqual(0, Tools.CompareGuids(guid1.ToString(), guid2.ToString()));
+      Assert.That(Tools.CompareGuids(guid1, guid2), Is.EqualTo(0));
+      Assert.That(Tools.CompareGuids(guid1.ToString(), guid2.ToString()), Is.EqualTo(0));
 
       guid1 = Guid.NewGuid();
       guid2 = Guid.NewGuid();
-      Assert.True(Tools.CompareGuids(guid1, guid2) != 0);
-      Assert.True(Tools.CompareGuids(guid1.ToString(), guid2.ToString()) != 0);
+      Assert.That(Tools.CompareGuids(guid1, guid2) != 0);
+      Assert.That(Tools.CompareGuids(guid1.ToString(), guid2.ToString()) != 0);
     }
 
     [Test]
@@ -251,10 +251,10 @@ public void InsertNullValuesAsDbDoc()
 
       ExecuteAddStatement(collection.Add(docs));
       var result = ExecuteFindStatement(collection.Find()).FetchAll();
-      Assert.AreEqual(docs.Length, result.Count);
+      Assert.That(result.Count, Is.EqualTo(docs.Length));
 
       for (int i = 0; i < docs.Length; i++)
-        Assert.AreEqual(docs[i].ToString(), result[i].ToString());
+        Assert.That(result[i].ToString(), Is.EqualTo(docs[i].ToString()));
     }
 
     [Test]
@@ -271,13 +271,13 @@ public void InsertNullValuesAsJson()
       Collection collection = CreateCollection("test");
       ExecuteAddStatement(collection.Add(docs));
       var result = ExecuteFindStatement(collection.Find()).FetchAll();
-      Assert.AreEqual(docs.Length, result.Count);
+      Assert.That(result.Count, Is.EqualTo(docs.Length));
       for (int i = 0; i < docs.Length; i++)
       {
         var currentDoc = new DbDoc(docs[i]);
         var resultingDoc = new DbDoc(result[i]);
-        Assert.AreEqual(currentDoc.Id, resultingDoc.Id);
-        Assert.AreEqual(currentDoc["foo"], resultingDoc["foo"]);
+        Assert.That(resultingDoc.Id, Is.EqualTo(currentDoc.Id));
+        Assert.That(resultingDoc["foo"], Is.EqualTo(currentDoc["foo"]));
       }
     }
 
@@ -295,29 +295,29 @@ public void AddOrReplaceOne()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result result = ExecuteAddStatement(collection.Add(docs));
-      Assert.AreEqual(4, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(4));
 
       // Add a document.
-      Assert.AreEqual(1, collection.AddOrReplaceOne(5, new { _id = 5, title = "Book 5", pages = 60 }).AffectedItemsCount);
-      Assert.True(collection.GetOne(5) != null);
+      Assert.That(collection.AddOrReplaceOne(5, new { _id = 5, title = "Book 5", pages = 60 }).AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(collection.GetOne(5) != null);
 
-      Assert.AreEqual(1, collection.AddOrReplaceOne("6", new { title = "Book 6", pages = 70 }).AffectedItemsCount);
-      Assert.True(collection.GetOne(6) != null);
-      Assert.True(collection.GetOne("6") != null);
+      Assert.That(collection.AddOrReplaceOne("6", new { title = "Book 6", pages = 70 }).AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(collection.GetOne(6) != null);
+      Assert.That(collection.GetOne("6") != null);
 
       // Replace a document.
-      Assert.AreEqual(2, collection.AddOrReplaceOne(1, new { _id = 1, title = "Book X", pages = 10 }).AffectedItemsCount);
+      Assert.That(collection.AddOrReplaceOne(1, new { _id = 1, title = "Book X", pages = 10 }).AffectedItemsCount, Is.EqualTo(2));
       DbDoc document = collection.GetOne(1);
-      Assert.AreEqual(1, Convert.ToInt32(document.Id));
-      Assert.AreEqual("Book X", document["title"]);
-      Assert.AreEqual(10, Convert.ToInt32(document["pages"]));
+      Assert.That(Convert.ToInt32(document.Id), Is.EqualTo(1));
+      Assert.That(document["title"], Is.EqualTo("Book X"));
+      Assert.That(Convert.ToInt32(document["pages"]), Is.EqualTo(10));
 
-      Assert.AreEqual(2, collection.AddOrReplaceOne(1, new { title = "Book Y", pages = 9, other = "value" }).AffectedItemsCount);
+      Assert.That(collection.AddOrReplaceOne(1, new { title = "Book Y", pages = 9, other = "value" }).AffectedItemsCount, Is.EqualTo(2));
       document = collection.GetOne(1);
-      Assert.AreEqual(1, Convert.ToInt32(document.Id));
-      Assert.AreEqual("Book Y", document["title"]);
-      Assert.AreEqual(9, Convert.ToInt32(document["pages"]));
-      Assert.AreEqual("value", document["other"]);
+      Assert.That(Convert.ToInt32(document.Id), Is.EqualTo(1));
+      Assert.That(document["title"], Is.EqualTo("Book Y"));
+      Assert.That(Convert.ToInt32(document["pages"]), Is.EqualTo(9));
+      Assert.That(document["other"], Is.EqualTo("value"));
 
       // Expected exceptions.
       Assert.Throws<ArgumentNullException>(() => collection.AddOrReplaceOne(null, docs[1]));
@@ -346,13 +346,13 @@ public void CreateCollectionAndReuseObject()
         };
         Result result = col.Add(data).Execute();
         var data1 = col.Remove("_id = 1").Execute();
-        Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+        Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
         data1 = col.Remove("_id = 2").Execute();
-        Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+        Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
         data1 = col.Remove("_id = 3").Execute();
-        Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+        Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
         data1 = col.Remove("_id = 4").Execute();
-        Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+        Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
         sessionPlain.Close();
       }
     }
@@ -370,7 +370,7 @@ public void CreateCollectionWithoutReuseExistingObject()
       Schema db = session.GetSchema(schemaName);
       var col = CreateCollection("my_collection_123456789");
       col = db.GetCollection("my_collection_123456789", true);
-      Assert.IsNotNull(col);
+      Assert.That(col, Is.Not.Null);
       Assert.Throws<MySqlException>(() => db.CreateCollection("my_collection_123456789", false));
     }
 
@@ -388,15 +388,15 @@ public void CollectionAddObjectsFindCondition()
       };
       Result result = col.Add(docs).Execute();
 
-      Assert.AreEqual(4, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(4), "Matching the updated record count");
       var foundDocs = col.Find("pages > 20").Execute();
-      Assert.AreEqual(true, foundDocs.Next(), "Next Node Exist");
-      Assert.AreEqual("Book 2", foundDocs.Current["title"], "Matching the Node Value");
-      Assert.AreEqual(true, foundDocs.Next(), "Next Node Exist");
-      Assert.AreEqual("Book 3", foundDocs.Current["title"], "Matching the Node Value");
-      Assert.AreEqual(true, foundDocs.Next(), "Next Node Exist");
-      Assert.AreEqual("Book 4", foundDocs.Current["title"], "Matching the Node Value");
-      Assert.AreEqual(false, foundDocs.Next(), "Next Node doesnot Exist");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Next Node Exist");
+      Assert.That(foundDocs.Current["title"], Is.EqualTo("Book 2"), "Matching the Node Value");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Next Node Exist");
+      Assert.That(foundDocs.Current["title"], Is.EqualTo("Book 3"), "Matching the Node Value");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Next Node Exist");
+      Assert.That(foundDocs.Current["title"], Is.EqualTo("Book 4"), "Matching the Node Value");
+      Assert.That(foundDocs.Next(), Is.EqualTo(false), "Next Node doesnot Exist");
       db.DropCollection("my_collection_1");
     }
 
@@ -414,17 +414,17 @@ public void CollectionAddFindNoParams()
       };
 
       var result = col.Add(docs).Execute();
-      Assert.AreEqual(4, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(4), "Matching the updated record count");
       var foundDocs = col.Find().Execute();
-      Assert.AreEqual(true, foundDocs.Next(), "Next Node Exist");
-      Assert.AreEqual("Book 1", foundDocs.Current["title"], "Matching the Node Value");
-      Assert.AreEqual(true, foundDocs.Next(), "Next Node Exist");
-      Assert.AreEqual("Book 2", foundDocs.Current["title"], "Matching the Node Value");
-      Assert.AreEqual(true, foundDocs.Next(), "Next Node Exist");
-      Assert.AreEqual("Book 3", foundDocs.Current["title"], "Matching the Node Value");
-      Assert.AreEqual(true, foundDocs.Next(), "Next Node Exist");
-      Assert.AreEqual("Book 4", foundDocs.Current["title"], "Matching the Node Value");
-      Assert.AreEqual(false, foundDocs.Next(), "Next Node doesnot Exist");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Next Node Exist");
+      Assert.That(foundDocs.Current["title"], Is.EqualTo("Book 1"), "Matching the Node Value");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Next Node Exist");
+      Assert.That(foundDocs.Current["title"], Is.EqualTo("Book 2"), "Matching the Node Value");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Next Node Exist");
+      Assert.That(foundDocs.Current["title"], Is.EqualTo("Book 3"), "Matching the Node Value");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Next Node Exist");
+      Assert.That(foundDocs.Current["title"], Is.EqualTo("Book 4"), "Matching the Node Value");
+      Assert.That(foundDocs.Next(), Is.EqualTo(false), "Next Node doesnot Exist");
     }
 
     [Test, Description("Test MySQLX plugin Collection Scenarios - Add/Remove JSON Object with id")]
@@ -440,11 +440,11 @@ public void CollectionAddRemoveJSONObjectID()
         DbDocs.SetValue("title", "Book 0");
         DbDocs.SetValue("pages", "10");
         var result = col.Add(DbDocs).Execute();
-        Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the updated record count");
+        Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the updated record count");
         DbDoc jsonremovedoc = new DbDoc();
         jsonremovedoc.SetValue("_id", "0");
         var foundDocs = col.Remove("_id='0'").Execute();
-        Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+        Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
         db.DropCollection("my_collection_1");
         sessionPlain.Close();
       }
@@ -461,9 +461,9 @@ public void CollectionAddRemoveJSONObjectCondition()
       DbDocs.SetValue("title", "Book 0");
       DbDocs.SetValue("pages", "10");
       var result = col.Add(DbDocs).Execute();
-      Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the updated record count");
       var foundDocs = col.Remove("pages > 0").Execute();
-      Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       db.DropCollection("my_collection_1");
     }
 
@@ -482,19 +482,19 @@ public void CollectionAddRemoveObjectConditionLimit()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       var result = col.Add(docs).Execute();
-      Assert.AreEqual(5, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(5), "Matching the updated record count");
       var foundDocs = col.Remove("_id=1").Execute();
-      Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       docs = new[]
       {
         new {  _id = 1, title = "Book 1", pages = 20 },
       };
       result = col.Add(docs).Execute();
-      Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the updated record count");
       result = col.Remove("pages > 10").Limit(1).Execute();
-      Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the updated record count");
       result = col.Remove("pages > 10").Limit(3).Execute();
-      Assert.AreEqual(3, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(3), "Matching the updated record count");
       Assert.Throws<ArgumentOutOfRangeException>(() => col.Remove("pages > 10").Limit(0).Execute());
       db.DropCollection("my_collection_1");
     }
@@ -519,11 +519,11 @@ public void CollectionAddRemove200JSONRecords()
       }
       var res = col.Add(jsonlist).Execute();
 
-      Assert.AreEqual(jsonlist[0].ToString(), jsonlist[0].ToString(), "String Match being done");
+      Assert.That(jsonlist[0].ToString(), Is.EqualTo(jsonlist[0].ToString()), "String Match being done");
       for (int i = 0; i < numOfRecords; i++)
       {
         var data1 = col.Remove($"_id = '{i + 1000}'").Execute();
-        Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+        Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       }
     }
 
@@ -546,25 +546,25 @@ public void CollectionAddRemoveJSONRecordsLimitOrderBy()
         newDoc2 = null;
       }
       col.Add(jsonlist).Execute();
-      Assert.AreEqual(jsonlist[0].ToString(), jsonlist[0].ToString(), "String Match being done");
+      Assert.That(jsonlist[0].ToString(), Is.EqualTo(jsonlist[0].ToString()), "String Match being done");
 
       Result result = col.Remove("F3 > 305").Limit(1).Execute();
-      Assert.AreEqual(1, (int)result.AffectedItemsCount, "Match being done");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Match being done");
 
       result = col.Remove("F3 > 303").Sort("F3 DESC").Execute();
-      Assert.AreEqual(5, (int)result.AffectedItemsCount, "Match being done");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(5), "Match being done");
 
       result = col.Remove("F3 > 303").Sort("F3 DESC").Execute();
-      Assert.AreEqual(0, (int)result.AffectedItemsCount, "Match being done");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(0), "Match being done");
 
       result = col.Remove("F3 = 303").Sort("F2 DESC").Execute();
-      Assert.AreEqual(1, (int)result.AffectedItemsCount, "Match being done");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Match being done");
 
       result = col.Remove("F3 < 301").Sort("F2 DESC").Execute();
-      Assert.AreEqual(1, (int)result.AffectedItemsCount, "Match being done");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Match being done");
 
       result = col.Remove("F3 < 301").Sort("F2 DESC").Execute();
-      Assert.AreEqual(0, (int)result.AffectedItemsCount, "Match being done");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(0), "Match being done");
 
       db.DropCollection("my_collection_1");
 
@@ -580,23 +580,23 @@ public void CollectionAddRemoveDocsLimitOrderByBind()
       DbDocs.SetValue("title", "Book 0");
       DbDocs.SetValue("pages", 10);
       var result = col.Add(DbDocs).Execute();
-      Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the updated record count");
       var foundDocs = col.Remove("pages > 0").Execute();
-      Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
 
       var docs = new { _id = 100001, title = "Book 1", pages = 20 };
       result = col.Add(docs).Execute();
-      Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the updated record count");
 
       foundDocs = col.Remove("pages=20").Execute();
-      Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
 
       docs = new { _id = -100001, title = "Book 1", pages = 20 };
       result = col.Add(docs).Execute();
-      Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the updated record count");
 
       foundDocs = col.Remove("pages=20").Execute();
-      Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       var docs1 = new[]
       {
         new { _id = -100001, title = "Book 0", pages = 10 },
@@ -605,13 +605,13 @@ public void CollectionAddRemoveDocsLimitOrderByBind()
         new { _id = 10000001, title = "Book 3", pages = 40 }
       };
       result = col.Add(docs1).Execute();
-      Assert.AreEqual(4, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(4), "Matching the updated record count");
 
       foundDocs = col.Remove("pages > 10").Execute();
-      Assert.AreEqual(3, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(3), "Matching the deleted record count");
 
       foundDocs = col.Remove("pages=10").Execute();
-      Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       docs1 = new[]
       {
         new { _id = -100001, title = "Book 0", pages = 10 },
@@ -621,27 +621,27 @@ public void CollectionAddRemoveDocsLimitOrderByBind()
         new { _id = 10000009, title = "Book 4", pages = 50 }
       };
       result = col.Add(docs1).Execute();
-      Assert.AreEqual(5, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(5), "Matching the updated record count");
 
       foundDocs = col.Remove("pages = 40").Execute();
-      Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
 
       foundDocs = col.Remove("pages >= 10").Execute();
-      Assert.AreEqual(4, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(4), "Matching the deleted record count");
 
       result = col.Add(docs1).Execute();
-      Assert.AreEqual(5, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(5), "Matching the updated record count");
       foundDocs = col.Remove("pages = 40").Limit(1).Execute();
-      Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       foundDocs = col.Remove("pages <= 50").Execute();
-      Assert.AreEqual(4, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(4), "Matching the deleted record count");
 
       result = col.Add(docs1).Execute();
-      Assert.AreEqual(5, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(5), "Matching the updated record count");
       foundDocs = col.Remove("pages = 40").Limit(1).Sort("title").Execute();
-      Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       foundDocs = col.Remove("pages <= 50").Execute();
-      Assert.AreEqual(4, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(4), "Matching the deleted record count");
 
       docs1 = new[]
       {
@@ -652,9 +652,9 @@ public void CollectionAddRemoveDocsLimitOrderByBind()
       };
 
       result = col.Add(docs1).Execute();
-      Assert.AreEqual(4, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(4), "Matching the updated record count");
       foundDocs = col.Remove("pages = :Pages").Bind("pAges", 50).Execute();
-      Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
     }
 
     [Test, Description("Test MySQLX plugin Collection Scenarios - Add Single/Multiple Docs - Remove Condition/ID/Condition-Limit/Condition-Limit-OrderBy/Bind using invalid conditions")]
@@ -670,23 +670,23 @@ public void CollectionRemoveDocsLimitOrderByBindNegative()
       DbDocs.SetValue("pages", 10);
       var result = col.Add(DbDocs).Execute();
 
-      Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the updated record count");
       var foundDocs = col.Remove("pages > 10").Execute();
-      Assert.AreEqual(0, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(0), "Matching the deleted record count");
 
       var docs = new { _id = 100001, title = "Book 1", pages = 20 };
       result = col.Add(docs).Execute();
-      Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the updated record count");
 
       foundDocs = col.Remove("pages >= 10").Execute();
-      Assert.AreEqual(2, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(2), "Matching the deleted record count");
 
       docs = new { _id = -100001, title = "Book 1", pages = 20 };
       result = col.Add(docs).Execute();
-      Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the updated record count");
 
       foundDocs = col.Remove("pages > 10").Execute();
-      Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
 
 
       var docs1 = new[]
@@ -697,13 +697,13 @@ public void CollectionRemoveDocsLimitOrderByBindNegative()
         new { _id = 10000001, title = "Book 3", pages = 40 }
       };
       result = col.Add(docs1).Execute();
-      Assert.AreEqual(4, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(4), "Matching the updated record count");
 
       foundDocs = col.Remove("pages > 50").Execute();
-      Assert.AreEqual(0, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(0), "Matching the deleted record count");
 
       foundDocs = col.Remove("pages < 50").Execute();
-      Assert.AreEqual(4, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(4), "Matching the deleted record count");
 
       docs1 = new[]
       {
@@ -714,28 +714,28 @@ public void CollectionRemoveDocsLimitOrderByBindNegative()
         new { _id = 10000009, title = "Book 4", pages = 50 }
       };
       result = col.Add(docs1).Execute();
-      Assert.AreEqual(5, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(5), "Matching the updated record count");
 
       foundDocs = col.Remove("pages = 0").Execute();
-      Assert.AreEqual(0, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(0), "Matching the deleted record count");
 
       foundDocs = col.Remove("pages <= 50").Execute();
-      Assert.AreEqual(5, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(5), "Matching the deleted record count");
 
       result = col.Add(docs1).Execute();
-      Assert.AreEqual(5, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(5), "Matching the updated record count");
       foundDocs = col.Remove("pages = 60").Limit(1).Execute();
-      Assert.AreEqual(0, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(0), "Matching the deleted record count");
 
       foundDocs = col.Remove("pages <= 50").Execute();
-      Assert.AreEqual(5, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(5), "Matching the deleted record count");
 
       result = col.Add(docs1).Execute();
-      Assert.AreEqual(5, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(5), "Matching the updated record count");
       foundDocs = col.Remove("pages = 04").Limit(1).Sort("title").Execute();
-      Assert.AreEqual(0, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(0), "Matching the deleted record count");
       foundDocs = col.Remove("pages <= 50").Execute();
-      Assert.AreEqual(5, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(5), "Matching the deleted record count");
 
       docs1 = new[]
       {
@@ -746,13 +746,13 @@ public void CollectionRemoveDocsLimitOrderByBindNegative()
       };
 
       result = col.Add(docs1).Execute();
-      Assert.AreEqual(4, (int)result.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(4), "Matching the updated record count");
       foundDocs = col.Remove("pages1 = :Pages").Bind("pAges", 50).Execute();
-      Assert.AreEqual(0, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(0), "Matching the deleted record count");
       foundDocs = col.Remove("pages = :Pages").Bind("pAges", 51).Execute();
-      Assert.AreEqual(0, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(0), "Matching the deleted record count");
       foundDocs = col.Remove("pages = :Pages").Bind("pAges", 50).Execute();
-      Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       db.DropCollection("my_collection_1");
 
     }
@@ -775,18 +775,18 @@ public void AllowReuseStatementAfterExecutePositive1()
         new {  _id = 8, title = "Book 8", pages = 80 },
       };
       Result result = col.Add(data).Execute();
-      Assert.AreEqual(8, (int)result.AffectedItemsCount, "Matching the added record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(8), "Matching the added record count");
       var data1 = col.Remove("_id=1").Execute();
-      Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       data1 = col.Remove("pages = :Pages").Bind("pAges", 80).Execute();
-      Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       data1 = col.Remove("pages = :Pages").Bind("pAges", 70).Execute();
-      Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       var remData = col.Remove("_id = :param1 AND title = :param2");
       data1 = remData.Bind("param1", 5).Bind("param2", "Book 5").Execute();
-      Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       data1 = remData.Bind("param1", 6).Bind("param2", "Book 6").Execute();
-      Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       db.DropCollection("my_collection_123456789");
     }
 
@@ -806,20 +806,20 @@ public void AllowReuseStatementAfterExecutePositive2()
         new {  _id = 8, title = "Book 8", pages = 80 },
       };
       Result result = col.Add(data).Execute();
-      Assert.AreEqual(8, (int)result.AffectedItemsCount, "Matching the added record count");
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(8), "Matching the added record count");
       var data1 = col.Remove("_id=1").Execute();
-      Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       data1 = col.Remove("pages = :Pages").Bind("pAges", 80).Execute();
-      Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       data1 = col.Remove("pages = :Pages").Bind("pAges", 70).Execute();
-      Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       var remData = col.Remove("_id = :param1 AND title = :param2");
 
       data1 = remData.Bind("param1", 35).Bind("param2", "Book 33").Execute();
-      Assert.AreEqual(0, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(0), "Matching the deleted record count");
 
       data1 = remData.Bind("param1", 6).Bind("param2", "Book 6").Execute();
-      Assert.AreEqual(1, (int)data1.AffectedItemsCount, "Matching the deleted record count");
+      Assert.That((int)data1.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
       testSchema.DropCollection("my_collection_123456789");
     }
 
@@ -834,7 +834,7 @@ public void CollectionGetDocumentID()
       };
       Result result = coll.Add(docs).Execute();
       var documentIds = result.GeneratedIds;
-      Assert.False(documentIds != null && documentIds.Count > 0);
+      Assert.That(documentIds != null && documentIds.Count > 0, Is.False);
 
       coll = CreateCollection("test");
       var docs1 = new[]
@@ -849,7 +849,7 @@ public void CollectionGetDocumentID()
       {
         if (documentIds1 != null)
         {
-          Assert.AreEqual(documentIds1[i].ToString(), documentIds1[i].ToString(), "Matching the document ID with unique id");
+          Assert.That(documentIds1[i].ToString(), Is.EqualTo(documentIds1[i].ToString()), "Matching the document ID with unique id");
         }
         if (!firstset.Add(documentIds1[i]))
         {
@@ -868,7 +868,7 @@ public void CollectionGetDocumentID()
 
       var r1 = coll.Add(docs).Execute();
       documentIds = r1.GeneratedIds;
-      Assert.False(documentIds != null && documentIds.Count > 0);
+      Assert.That(documentIds != null && documentIds.Count > 0, Is.False);
 
       coll = CreateCollection("test");
       docs1 = new[]
@@ -887,7 +887,7 @@ public void CollectionGetDocumentID()
       {
         if (documentIds != null)
         {
-          Assert.AreEqual(documentIds1[i].ToString(), documentIds1[i].ToString(), "Matching the document ID with unique id");
+          Assert.That(documentIds1[i].ToString(), Is.EqualTo(documentIds1[i].ToString()), "Matching the document ID with unique id");
         }
 
         if (!firstset.Add(documentIds1[i]))
@@ -910,7 +910,7 @@ public void CheckDocUUIDScenario1()
       };
       Result result = col.Add(data).Execute();
       var documentIds = result.GeneratedIds;
-      Assert.False(documentIds != null && documentIds.Count > 0);
+      Assert.That(documentIds != null && documentIds.Count > 0, Is.False);
     }
 
     [Test, Description("Test MySQLX UUID Scenario-2(Check UUID generated when multiple JSON docs are added using collection.add().add()..without _id fields)")]
@@ -941,7 +941,7 @@ public void CheckDocUUIDScenario2()
       {
         if (documentIds != null)
         {
-          Assert.AreEqual(documentIds[i].ToString(), documentIds[i].ToString(), "Matching the document ID with unique id");
+          Assert.That(documentIds[i].ToString(), Is.EqualTo(documentIds[i].ToString()), "Matching the document ID with unique id");
         }
         if (!firstset.Add(documentIds[i]))
         {
@@ -959,19 +959,19 @@ public void CheckDocUUIDScenario3()
       var stmt = col.Add(@"{ ""foo"": 1 }", @"{""foo"": 2 }", @"{ ""foo"": 3 }", @"{ ""foo"": 4 }");
       Result r = col.Add(@"{ ""foo"": 1 }", @"{""foo"": 2 }", @"{ ""foo"": 3 }", @"{ ""foo"": 4 }").Execute();
       long count = col.Count();
-      Assert.AreEqual(count, 4, "Matching the Collection Count");
+      Assert.That(4, Is.EqualTo(count), "Matching the Collection Count");
       var documentIds = r.GeneratedIds;
       if (documentIds != null)
       {
-        Assert.AreEqual(documentIds[0].ToString(), documentIds[0].ToString(), "Matching the document ID without unique id");
-        Assert.AreEqual(documentIds[1].ToString(), documentIds[1].ToString(), "Matching the document ID without unique id");
-        Assert.AreEqual(documentIds[2].ToString(), documentIds[2].ToString(), "Matching the document ID without unique id");
-        Assert.AreEqual(documentIds[3].ToString(), documentIds[3].ToString(), "Matching the document ID without unique id");
+        Assert.That(documentIds[0].ToString(), Is.EqualTo(documentIds[0].ToString()), "Matching the document ID without unique id");
+        Assert.That(documentIds[1].ToString(), Is.EqualTo(documentIds[1].ToString()), "Matching the document ID without unique id");
+        Assert.That(documentIds[2].ToString(), Is.EqualTo(documentIds[2].ToString()), "Matching the document ID without unique id");
+        Assert.That(documentIds[3].ToString(), Is.EqualTo(documentIds[3].ToString()), "Matching the document ID without unique id");
       }
 
       var collectionName = col.Name;
-      Assert.AreEqual(collectionName, "my_collection_123456789", "Matching the collection Name");
-      Assert.AreEqual(schemaName, col.Schema.Name, "Matching the Schema Name");
+      Assert.That("my_collection_123456789", Is.EqualTo(collectionName), "Matching the collection Name");
+      Assert.That(col.Schema.Name, Is.EqualTo(schemaName), "Matching the Schema Name");
     }
 
     [Test, Description("Test MySQLX UUID Scenario-4(Check UUID generated when multiple JSON docs are added using some containing and some not containing _id fields)")]
@@ -999,13 +999,13 @@ public void CheckDocUUIDScenario4()
       Result result = stmt.Execute();
       var documentIdsCount = result.GeneratedIds.Count;
       var documentIds = result.GeneratedIds;
-      Assert.AreEqual(4, documentIdsCount, "Matching the document ID count");
+      Assert.That(documentIdsCount, Is.EqualTo(4), "Matching the document ID count");
       if (documentIds != null)
       {
-        Assert.AreEqual(documentIds[0].ToString(), documentIds[0].ToString(), "Matching the document ID with unique id");
-        Assert.AreEqual(documentIds[1].ToString(), documentIds[1].ToString(), "Matching the document ID with unique id");
-        Assert.AreEqual(documentIds[2].ToString(), documentIds[2].ToString(), "Matching the document ID with unique id");
-        Assert.AreEqual(documentIds[3].ToString(), documentIds[3].ToString(), "Matching the document ID without unique id");
+        Assert.That(documentIds[0].ToString(), Is.EqualTo(documentIds[0].ToString()), "Matching the document ID with unique id");
+        Assert.That(documentIds[1].ToString(), Is.EqualTo(documentIds[1].ToString()), "Matching the document ID with unique id");
+        Assert.That(documentIds[2].ToString(), Is.EqualTo(documentIds[2].ToString()), "Matching the document ID with unique id");
+        Assert.That(documentIds[3].ToString(), Is.EqualTo(documentIds[3].ToString()), "Matching the document ID without unique id");
       }
     }
 
@@ -1025,13 +1025,13 @@ public void CheckDocUUIDScenario5()
         newDoc2 = null;
       }
       Result r = testCollection.Add(jsonlist).Execute();
-      Assert.AreEqual(1000, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1000), "Matching");
       var documentIds = r.GeneratedIds;
-      Assert.False(documentIds != null && documentIds.Count > 0);
+      Assert.That(documentIds != null && documentIds.Count > 0, Is.False);
 
       Schema testSchema = session.GetSchema(schemaName);
       Table test = testSchema.GetCollectionAsTable("test");
-      Assert.AreEqual(true, test.ExistsInDatabase(), "Matching");
+      Assert.That(test.ExistsInDatabase(), Is.EqualTo(true), "Matching");
     }
 
     [Test, Description("Test MySQLX UUID Scenario-6(Check that no duplicate UUID is generated by adding multiple doc from the same collection in a session when there are no _id fields)")]
@@ -1053,16 +1053,16 @@ public void CheckDocUUIDScenario6()
       var r = testCollection.Add(jsonlist);
       var result = r.Execute();
       var countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(1000, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1000), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         var generatedIDs1 = result.GeneratedIds[i];
-        Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+        Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
       }
 
       Schema testSchema = session.GetSchema(schemaName);
       Table test = testSchema.GetCollectionAsTable("test");
-      Assert.AreEqual(true, test.ExistsInDatabase(), "Matching");
+      Assert.That(test.ExistsInDatabase(), Is.EqualTo(true), "Matching");
     }
 
     [Test, Description("Test MySQLX UUID Scenario-7(Check UUID generated when multiple JSON docs are added using collection.add(doc, doc, doc... ) when docs contains _id fields with negative numbers,big positive numbers)")]
@@ -1088,11 +1088,11 @@ public void CheckDocUUIDScenario7()
       var r = col.Add(data1).Add(data2);
       var result = r.Execute();
       var countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(4, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(4), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         var generatedIDs1 = result.GeneratedIds[i];
-        Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+        Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
       }
 
     }
@@ -1121,11 +1121,11 @@ public void CheckDocUUIDScenario8()
       var r = col.Add(data1).Add(data2);
       var result = r.Execute();
       var countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(4, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(4), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         var generatedIDs1 = result.GeneratedIds[i];
-        Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+        Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
       }
 
     }
@@ -1147,11 +1147,11 @@ public void CheckDocUUIDScenario9()
 
       Result result = testCollection.Add(jsonlist).Execute();
       //ID with blank could be added as per bug#27627861 as client will not do any validation and server will do"
-      Assert.IsNotNull(result);
+      Assert.That(result, Is.Not.Null);
 
       Schema testSchema = session.GetSchema("test");
       Table test = testSchema.GetCollectionAsTable("test");
-      Assert.AreEqual(true, test.ExistsInDatabase(), "Matching");
+      Assert.That(test.ExistsInDatabase(), Is.EqualTo(true), "Matching");
     }
 
     [Test, Description("Test MySQLX plugin Collection JSON Depth Scenarios")]
@@ -1170,7 +1170,7 @@ public void CollectionAddJSONDepth()
       }
 
       var result = col1.Add(d1).Execute();
-      Assert.Greater(result.AffectedItemsCount, 0);
+      Assert.That(result.AffectedItemsCount, Is.GreaterThan(0));
 
       var data1 = new DbDoc(@"{ ""_id"": 1, ""pages"": 20,
                   ""person"": { ""name"": ""Fred"", ""age"": 45 }
@@ -1188,12 +1188,12 @@ public void CollectionAddJSONDepth()
       d2.SetValue("taker2", data2);
 
       result = col.Add(d2).Execute();
-      Assert.Greater(result.AffectedItemsCount, 0);
+      Assert.That(result.AffectedItemsCount, Is.GreaterThan(0));
 
       var result1 = col1.Find().Execute().FetchAll();
-      Assert.AreEqual(1, result1.Count);
+      Assert.That(result1.Count, Is.EqualTo(1));
       var result2 = col.Find().Execute().FetchAll();
-      Assert.AreEqual(1, result2.Count);
+      Assert.That(result2.Count, Is.EqualTo(1));
     }
 
     [Test, Description("Test MySQLX plugin Collection Add function with null")]
@@ -1204,12 +1204,12 @@ public void CollectionAddNullFind()
       Collection col = CreateCollection("my_collection_1");
       var d1 = new DbDoc();
       d1.SetValue("id" + "_" + i.ToString(), "test");
-      Assert.AreEqual(1, col.Add(d1).Execute().AffectedItemsCount);
+      Assert.That(col.Add(d1).Execute().AffectedItemsCount, Is.EqualTo(1));
       var result1 = col.Find(null).Execute();
-      Assert.AreEqual(0, result1.AffectedItemsCount);
+      Assert.That(result1.AffectedItemsCount, Is.EqualTo(0));
       Assert.Throws<ArgumentNullException>(() => col.Add(null).Execute());
       var result2 = col.Add().Execute();
-      Assert.AreEqual(0, result2.AffectedItemsCount);
+      Assert.That(result2.AffectedItemsCount, Is.EqualTo(0));
     }
 
     [Test, Description("Test MySQLX plugin Invalid JSON String")]
@@ -1219,7 +1219,7 @@ public void InvalidJSONString()
       String json = "";
       json = "{'_id':'1004','F1': [] }";
       Exception ex = Assert.Throws<Exception>(() => col.Add(json).Execute());
-      StringAssert.Contains("The value provided is not a valid JSON document", ex.Message);
+      Assert.That(ex.Message, Does.Contain("The value provided is not a valid JSON document"));
     }
 
     [Test, Description("Test MySQLX plugin JSON String long expression")]
@@ -1246,7 +1246,7 @@ public void JSONStringLongExpression()
 
       var docs = col.Find().Fields(("{'X':" + query2 + "}")).Execute();
       var res = col.Modify("$.F1 = 1234").Set("F1", query2).Limit(1).Execute();
-      Assert.AreEqual(1, res.AffectedItemsCount);
+      Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
     }
 
     [Test, Description("Test MySQLX plugin Binary Expression")]
@@ -1260,18 +1260,18 @@ public void BinaryExpression()
 
       var docs1 = col.Find().Fields("$._id as _id", "1 << 4 as tmp").Execute();
       var res = docs1.FetchAll();
-      StringAssert.AreEqualIgnoringCase("1004", res[0].Id.ToString());
+      Assert.That(res[0].Id.ToString(), Is.EqualTo("1004").IgnoreCase);
 
       docs1 = col.Find().Fields("$._id as _id", "$.F2 ^ 1 as tmp").Execute();
       res = docs1.FetchAll();
-      StringAssert.AreEqualIgnoringCase("1004", res[0].Id.ToString());
+      Assert.That(res[0].Id.ToString(), Is.EqualTo("1004").IgnoreCase);
       col.Add("{\"_id\":\"100001\",\"x1\":\"31\", \"x2\":\"13\", \"x3\":\"8\", \"x4\":\"18446744073709551614\"}").Execute();
       docs1 = col.Find("CAST($.x1 as SIGNED) | pow(2,$.x1) = $.x1").Fields("$._id as _id, $.x1 as x1, $.x2 as x2, $.x3 as x3 , $.x2 | pow(2,$.x1) as tmp").Execute();
       res = docs1.FetchAll();
-      Assert.IsNotNull(res);
+      Assert.That(res, Is.Not.Null);
       docs1 = col.Find("~16 = ~CAST($.F2 as SIGNED)").Fields("$._id as _id,$.F2 as f2, ~1 as tmp").Execute();
       res = docs1.FetchAll();
-      Assert.IsNotNull(res);
+      Assert.That(res, Is.Not.Null);
       int maxrec = 100;
       DbDoc newDoc = new DbDoc();
       newDoc.SetValue("_id", maxrec + 1000);
@@ -1283,17 +1283,17 @@ public void BinaryExpression()
       json = "{'_id':'" + (maxrec + 1000 + 1) + "','F1':'Field-1-Data-" + (maxrec + 1) + "','F2':'Field-2-Data-" + (maxrec + 1) + "','F3':" + (300 + maxrec + 1) + "}";
       json = json.Replace("'", "\"");
       var res1 = col1.Add(json).Execute();
-      Assert.AreEqual(1, res1.AffectedItemsCount);
+      Assert.That(res1.AffectedItemsCount, Is.EqualTo(1));
       json = "{'F1': 'Field-1-Data-9999','F2': 'Field-2-Data-9999','F3': 'Field-3-Data-9999'}".Replace("'", "\"");
       col1.Add(json).Add(json.Replace("9", "8")).Execute();
-      Assert.AreEqual(1, res1.AffectedItemsCount);
+      Assert.That(res1.AffectedItemsCount, Is.EqualTo(1));
 
       var docs = col1.Find("$._id = 1100").Fields("$_id as _id,$.F1 as f1, $.F2 as f2, $.F3 as f3").Execute();
       var res2 = docs.FetchOne();
-      Assert.AreEqual("1100", res2["_id"].ToString());
-      Assert.AreEqual("Field-1-Data-100", res2["f1"].ToString());
-      Assert.AreEqual("Field-2-Data-100", res2["f2"].ToString());
-      Assert.AreEqual("400", res2["f3"].ToString());
+      Assert.That(res2["_id"].ToString(), Is.EqualTo("1100"));
+      Assert.That(res2["f1"].ToString(), Is.EqualTo("Field-1-Data-100"));
+      Assert.That(res2["f2"].ToString(), Is.EqualTo("Field-2-Data-100"));
+      Assert.That(res2["f3"].ToString(), Is.EqualTo("400"));
 
     }
 
@@ -1310,11 +1310,11 @@ public void JSONStringSpecialCharacters()
         col.Add("{\"" + splName[i] + "\":\"data" + i + "\",\"ID\":" + i + "}").Execute();
         var docs = col.Find("$.ID = " + i).Fields("$.`" + splName[i] + "` as col1,$.ID as Id").Execute();
         var res = docs.FetchOne();
-        Assert.AreEqual(i.ToString(), res["Id"].ToString(), "Matching the ID");
+        Assert.That(res["Id"].ToString(), Is.EqualTo(i.ToString()), "Matching the ID");
         if (i == 30)
-          Assert.AreEqual("data" + i, "data30", "Matching the String");
+          Assert.That("data30", Is.EqualTo("data" + i), "Matching the String");
         else
-          Assert.AreEqual("data" + i, res["col1"].ToString(), "Matching the String");
+          Assert.That(res["col1"].ToString(), Is.EqualTo("data" + i), "Matching the String");
       }
     }
 
@@ -1360,13 +1360,13 @@ public void CollectionsChainedInsert()
       }
 
       var tabRes = col.Add(newDoc).Add(newDoc1).Execute();
-      Assert.AreEqual(2, tabRes.AffectedItemsCount, "Matching the affected records");
+      Assert.That(tabRes.AffectedItemsCount, Is.EqualTo(2), "Matching the affected records");
 
       tabRes = col.Add(jsonlist).Add(newDoc2).Execute();
-      Assert.AreEqual(6, tabRes.AffectedItemsCount, "Matching the affected records");
+      Assert.That(tabRes.AffectedItemsCount, Is.EqualTo(6), "Matching the affected records");
 
       tabRes = col.Add(jsonlist1).Add(jsonlist2).Execute();
-      Assert.AreEqual(10, tabRes.AffectedItemsCount, "Matching the affected records");
+      Assert.That(tabRes.AffectedItemsCount, Is.EqualTo(10), "Matching the affected records");
     }
 
     [Test, Description("Test MySQLX plugin Collection Add Array")]
@@ -1393,7 +1393,7 @@ public void CollectionAddArray()
 
       jsonlist = null;
       var res = col.Find().Execute().FetchAll();
-      Assert.AreEqual(5, res.Count, "Matching the find count");
+      Assert.That(res.Count, Is.EqualTo(5), "Matching the find count");
     }
 
     [Test, Description("Test MySQLX plugin Collection JSON Scenarios")]
@@ -1406,9 +1406,9 @@ public void CollectionAddJSONDocs()
       string json = @"{ ""_id"": 0, ""title"": ""Book 0"" ,""pages"": 10,""name"": ""Jeoff Archer""}";
       Result r = col.Add(json).Execute();
 
-      Assert.AreEqual(1, (int)r.AffectedItemsCount, "Matching Affected Records Count");
+      Assert.That((int)r.AffectedItemsCount, Is.EqualTo(1), "Matching Affected Records Count");
       var foundDocs = col.Find("pages > 5").Execute();
-      Assert.AreEqual(1, foundDocs.Count(), "Matching Count");
+      Assert.That(foundDocs.Count(), Is.EqualTo(1), "Matching Count");
 
       json = @"{ ""_id"" : 99950, ""city"" : ""KETCHIKAN"", ""loc"" : ""[ -133.18479, 55.942471 ]"", ""pop"" : 422, ""state"" : ""AK"" }";
       r = col.Add(json).Execute();
@@ -1421,7 +1421,7 @@ public void CollectionAddJSONDocs()
       d2.SetValue("pages", 20);
       d2.SetValue("person", new { name = "Fred", age = 45 });
 
-      Assert.AreEqual(d.Equals(d2), true, "Matching");
+      Assert.That(true, Is.EqualTo(d.Equals(d2)), "Matching");
       col.Add(d).Execute();
 
       d = new DbDoc(@"{""id"":100,""FirstName"":""xyz"",""lastname"":""pqr"",
@@ -1453,14 +1453,14 @@ public void CollectionAddJSONDocs()
 
       var result = col.Find("$._id = 0").Fields("$._id as _id,$.name as name, $.pages as pages, $.title as title").Execute();
       var res1 = result.FetchOne();
-      Assert.AreEqual(0, res1["_id"]);
-      Assert.AreEqual("Jeoff Archer", res1["name"]);
-      Assert.AreEqual(10, res1["pages"]);
-      Assert.AreEqual("Book 0", res1["title"]);
+      Assert.That(res1["_id"], Is.EqualTo(0));
+      Assert.That(res1["name"], Is.EqualTo("Jeoff Archer"));
+      Assert.That(res1["pages"], Is.EqualTo(10));
+      Assert.That(res1["title"], Is.EqualTo("Book 0"));
 
       result = col.Find("$._id > 0").Fields().Execute();
       var res2 = result.FetchAll();
-      Assert.AreEqual(6, res2.Count());
+      Assert.That(res2.Count(), Is.EqualTo(6));
 
       DbDoc test = new DbDoc();
       test.SetValue("_id", 1);
@@ -1469,7 +1469,7 @@ public void CollectionAddJSONDocs()
       var res = coll.Add(test).Execute();
       foundDocs = coll.Find().Execute();
       var docs1 = foundDocs.FetchAll();
-      Assert.AreEqual(1, docs1.Count);
+      Assert.That(docs1.Count, Is.EqualTo(1));
     }
 
     [Test, Description("Verify that the field and column _id has a value when it's not given to a document-Scenario-1(single document add)")]
@@ -1486,10 +1486,10 @@ public void VerifyIDField()
       var stmt = col.Add(data);
       result = stmt.Execute();
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+      Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
       VerifyGeneratedID(generatedIDs1);
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1502,10 +1502,10 @@ public void VerifyIDField()
       stmt = col.Add(DbDocs);
       result = stmt.Execute();
       generatedIDs2 = result.GeneratedIds[0];
-      Assert.AreEqual(generatedIDs2, generatedIDs2, "ID generated by the server");
+      Assert.That(generatedIDs2, Is.EqualTo(generatedIDs2), "ID generated by the server");
       VerifyGeneratedID(generatedIDs2);
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1516,10 +1516,10 @@ public void VerifyIDField()
       stmt = col.Add(docs);
       result = stmt.Execute();
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+      Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
       VerifyGeneratedID(generatedIDs1);
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1529,10 +1529,10 @@ public void VerifyIDField()
       stmt = col.Add("{ \"foo\": 100 }");
       result = stmt.Execute();
       generatedIDs2 = result.GeneratedIds[0];
-      Assert.AreEqual(generatedIDs2, generatedIDs2, "ID generated by the server");
+      Assert.That(generatedIDs2, Is.EqualTo(generatedIDs2), "ID generated by the server");
       VerifyGeneratedID(generatedIDs2);
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1572,13 +1572,13 @@ public void VerifyIDFieldScenario3()
       var stmt = col.Add(data1);
       result = stmt.Execute();
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(4, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(4), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         generatedIDs1 = result.GeneratedIds[i];
-        Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+        Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
         VerifyGeneratedID(generatedIDs1);
-        Assert.False(!firstset.Add(generatedIDs1));
+        Assert.That(!firstset.Add(generatedIDs1), Is.False);
       }
 
       for (int i = 0; i < countgenerateIDs; i++)
@@ -1589,13 +1589,13 @@ public void VerifyIDFieldScenario3()
       stmt = col.Add(@"{ ""foo"": 1 }", @"{""foo"": 2 }", @"{ ""foo"": 3 }", @"{ ""foo"": 4 }");
       result = stmt.Execute();
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(4, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(4), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         generatedIDs1 = result.GeneratedIds[i];
-        Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+        Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
         VerifyGeneratedID(generatedIDs1);
-        Assert.False(!firstset.Add(generatedIDs1));
+        Assert.That(!firstset.Add(generatedIDs1), Is.False);
       }
 
       for (int i = 0; i < countgenerateIDs; i++)
@@ -1633,7 +1633,7 @@ public void VerifyIDFieldScenario4()
       result = col.Add(data).Execute();
       countgenerateIDs = result.GeneratedIds.Count;
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1644,10 +1644,10 @@ public void VerifyIDFieldScenario4()
       var stmt = col.Add(data);
       result = stmt.Execute();
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+      Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
       VerifyGeneratedID(generatedIDs1);
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1663,7 +1663,7 @@ public void VerifyIDFieldScenario4()
       result = col.Add(data).Execute();
       countgenerateIDs = result.GeneratedIds.Count;
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1676,10 +1676,10 @@ public void VerifyIDFieldScenario4()
       stmt = col.Add(DbDocs);
       result = stmt.Execute();
       generatedIDs2 = result.GeneratedIds[0];
-      Assert.AreEqual(generatedIDs2, generatedIDs2, "ID generated by the server");
+      Assert.That(generatedIDs2, Is.EqualTo(generatedIDs2), "ID generated by the server");
       VerifyGeneratedID(generatedIDs2);
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1695,7 +1695,7 @@ public void VerifyIDFieldScenario4()
       result = col.Add(data).Execute();
       countgenerateIDs = result.GeneratedIds.Count;
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1706,10 +1706,10 @@ public void VerifyIDFieldScenario4()
       stmt = col.Add(docs);
       result = stmt.Execute();
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+      Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
       VerifyGeneratedID(generatedIDs1);
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1725,7 +1725,7 @@ public void VerifyIDFieldScenario4()
       result = col.Add(data).Execute();
       countgenerateIDs = result.GeneratedIds.Count;
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1735,10 +1735,10 @@ public void VerifyIDFieldScenario4()
       stmt = col.Add("{ \"foo\": 100 }");
       result = stmt.Execute();
       generatedIDs2 = result.GeneratedIds[0];
-      Assert.AreEqual(generatedIDs2, generatedIDs2, "ID generated by the server");
+      Assert.That(generatedIDs2, Is.EqualTo(generatedIDs2), "ID generated by the server");
       VerifyGeneratedID(generatedIDs2);
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1775,7 +1775,7 @@ public void VerifyIDFieldScenario5()
       result = col.Add(data).Execute();
       countgenerateIDs = result.GeneratedIds.Count;
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1790,13 +1790,13 @@ public void VerifyIDFieldScenario5()
       var stmt = col.Add(data1).Add(data2);
       result = stmt.Execute();
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(2, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(2), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         generatedIDs1 = result.GeneratedIds[i];
-        Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+        Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
         VerifyGeneratedID(generatedIDs1);
-        Assert.False(!firstset.Add(generatedIDs1));
+        Assert.That(!firstset.Add(generatedIDs1), Is.False);
       }
       for (int i = 0; i < countgenerateIDs; i++)
       {
@@ -1812,7 +1812,7 @@ public void VerifyIDFieldScenario5()
       result = col.Add(data).Execute();
       countgenerateIDs = result.GeneratedIds.Count;
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1828,13 +1828,13 @@ public void VerifyIDFieldScenario5()
       stmt = col.Add(DbDocs1).Add(DbDocs2);
       result = stmt.Execute();
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(2, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(2), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         generatedIDs1 = result.GeneratedIds[i];
-        Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+        Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
         VerifyGeneratedID(generatedIDs1);
-        Assert.False(!firstset.Add(generatedIDs1));
+        Assert.That(!firstset.Add(generatedIDs1), Is.False);
       }
       for (int i = 0; i < countgenerateIDs; i++)
       {
@@ -1851,7 +1851,7 @@ public void VerifyIDFieldScenario5()
       result = col.Add(data).Execute();
       countgenerateIDs = result.GeneratedIds.Count;
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1864,13 +1864,13 @@ public void VerifyIDFieldScenario5()
 
       result = stmt.Execute();
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(2, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(2), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         generatedIDs1 = result.GeneratedIds[i];
-        Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+        Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
         VerifyGeneratedID(generatedIDs1);
-        Assert.False(!firstset.Add(generatedIDs1));
+        Assert.That(!firstset.Add(generatedIDs1), Is.False);
       }
       for (int i = 0; i < countgenerateIDs; i++)
       {
@@ -1886,7 +1886,7 @@ public void VerifyIDFieldScenario5()
       result = col.Add(data).Execute();
       countgenerateIDs = result.GeneratedIds.Count;
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1896,11 +1896,11 @@ public void VerifyIDFieldScenario5()
       stmt = col.Add("{ \"foo1\": 100 }").Add("{ \"foo2\": 200 }");
       result = stmt.Execute();
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(2, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(2), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         generatedIDs1 = result.GeneratedIds[i];
-        Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+        Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
         VerifyGeneratedID(generatedIDs1);
         if (!firstset.Add(generatedIDs1))
         {
@@ -1943,7 +1943,7 @@ public void VerifyIDFieldScenario6()
       result = col.Add(data).Execute();
       countgenerateIDs = result.GeneratedIds.Count;
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1962,13 +1962,13 @@ public void VerifyIDFieldScenario6()
       var stmt = col.Add(data1);
       result = stmt.Execute();
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(4, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(4), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         generatedIDs1 = result.GeneratedIds[i];
-        Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+        Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
         VerifyGeneratedID(generatedIDs1);
-        Assert.False(!firstset.Add(generatedIDs1));
+        Assert.That(!firstset.Add(generatedIDs1), Is.False);
       }
       for (int i = 0; i < countgenerateIDs; i++)
       {
@@ -1979,7 +1979,7 @@ public void VerifyIDFieldScenario6()
       result = col.Add(@"{ ""foo"": 0, ""_id"":0 }", @"{""foo"": 5 }").Execute();
       countgenerateIDs = result.GeneratedIds.Count;
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         idStringList.Add(result.GeneratedIds[i]);
@@ -1989,13 +1989,13 @@ public void VerifyIDFieldScenario6()
       stmt = col.Add(@"{ ""foo"": 1 }", @"{""foo"": 2 }", @"{ ""foo"": 3 }", @"{ ""foo"": 4 }");
       result = stmt.Execute();
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(4, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(4), "Count of the ID generated by the server");
       for (int i = 0; i < countgenerateIDs; i++)
       {
         generatedIDs1 = result.GeneratedIds[i];
-        Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+        Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
         VerifyGeneratedID(generatedIDs1);
-        Assert.False(!firstset.Add(generatedIDs1));
+        Assert.That(!firstset.Add(generatedIDs1), Is.False);
       }
       for (int i = 0; i < countgenerateIDs; i++)
       {
@@ -2024,20 +2024,20 @@ public void VerifyIDFieldScenario7()
       };
       Result result = col.Add(data).Execute();
       var generatedIDs = result.GeneratedIds;
-      Assert.AreEqual(0, generatedIDs.Count, "Matches");
+      Assert.That(generatedIDs.Count, Is.EqualTo(0), "Matches");
       var doc = col.Find("_id like :param").Bind("param", "1e9c92fda74ed311944e00059a3c7a00").Execute();
       var docs = doc.FetchAll().Count();
-      Assert.AreEqual(1, docs, "Matches");
+      Assert.That(docs, Is.EqualTo(1), "Matches");
 
       //Anonymous Object
       var data1 = new { _id = "1e9c92fda74ed311944e00059a3c7a01", title = "Book 0", pages = 10 };
       result = col.Add(data1).Execute();
 
       generatedIDs = result.GeneratedIds;
-      Assert.AreEqual(0, generatedIDs.Count, "Matches");
+      Assert.That(generatedIDs.Count, Is.EqualTo(0), "Matches");
       doc = col.Find("_id like :param").Bind("param", "1e9c92fda74ed311944e00059a3c7a01").Execute();
       docs = doc.FetchAll().Count();
-      Assert.AreEqual(1, docs, "Matches");
+      Assert.That(docs, Is.EqualTo(1), "Matches");
 
       // DbDoc
       DbDoc DbDocs = new DbDoc();
@@ -2047,18 +2047,18 @@ public void VerifyIDFieldScenario7()
       result = col.Add(DbDocs).Execute();
 
       generatedIDs = result.GeneratedIds;
-      Assert.AreEqual(0, generatedIDs.Count, "Matches");
+      Assert.That(generatedIDs.Count, Is.EqualTo(0), "Matches");
       doc = col.Find("_id like :param").Bind("param", "1e9c92fda74ed311944e00059a3c7a02").Execute();
       docs = doc.FetchAll().Count();
-      Assert.AreEqual(1, docs, "Matches");
+      Assert.That(docs, Is.EqualTo(1), "Matches");
 
       //JSON
       result = col.Add("{\"_id\":\"1e9c92fda74ed311944e00059a3c7a03\",\"title\": \"Book 0\",\"pages\": 10}").Execute();
       generatedIDs = result.GeneratedIds;
-      Assert.AreEqual(0, generatedIDs.Count, "Matches");
+      Assert.That(generatedIDs.Count, Is.EqualTo(0), "Matches");
       doc = col.Find("_id like :param").Bind("param", "1e9c92fda74ed311944e00059a3c7a03").Execute();
       docs = doc.FetchAll().Count();
-      Assert.AreEqual(1, docs, "Matches");
+      Assert.That(docs, Is.EqualTo(1), "Matches");
     }
 
     [Test, Description("Client provided _id shouldnt be discarded and generatedids() should give empty list for anonymous object array -multiple documents multiple add with negative number")]
@@ -2075,26 +2075,26 @@ public void VerifyIDFieldScenario8()
       };
       Result result = col.Add(data1).Add(data2).Execute();
       var generatedIDs = result.GeneratedIds;
-      Assert.AreEqual(0, generatedIDs.Count, "Matches");
+      Assert.That(generatedIDs.Count, Is.EqualTo(0), "Matches");
       var doc = col.Find("_id like :param").Bind("param", "1e9c92fda74ed311944e00059a3c7a00").Execute();
       var docs = doc.FetchAll().Count();
-      Assert.AreEqual(1, docs, "Matches");
+      Assert.That(docs, Is.EqualTo(1), "Matches");
       doc = col.Find("_id like :param").Bind("param", -1).Execute();
       docs = doc.FetchAll().Count();
-      Assert.AreEqual(1, docs, "Matches");
+      Assert.That(docs, Is.EqualTo(1), "Matches");
 
       // Anonymous Object
       var data3 = new { _id = "1e9c92fda74ed311944e00059a3c7a01", title = "Book 0", pages = 10 };
       var data4 = new { _id = -2, title = "Book 0", pages = 10 };
       result = col.Add(data3).Add(data4).Execute();
       generatedIDs = result.GeneratedIds;
-      Assert.AreEqual(0, generatedIDs.Count, "Matches");
+      Assert.That(generatedIDs.Count, Is.EqualTo(0), "Matches");
       doc = col.Find("_id like :param").Bind("param", "1e9c92fda74ed311944e00059a3c7a01").Execute();
       docs = doc.FetchAll().Count();
-      Assert.AreEqual(1, docs, "Matches");
+      Assert.That(docs, Is.EqualTo(1), "Matches");
       doc = col.Find("_id like :param").Bind("param", -2).Execute();
       docs = doc.FetchAll().Count();
-      Assert.AreEqual(1, docs, "Matches");
+      Assert.That(docs, Is.EqualTo(1), "Matches");
 
       //DbDoc
       DbDoc DbDocs1 = new DbDoc();
@@ -2107,26 +2107,26 @@ public void VerifyIDFieldScenario8()
       DbDocs2.SetValue("_id", -3);
       result = col.Add(DbDocs1).Add(DbDocs2).Execute();
       generatedIDs = result.GeneratedIds;
-      Assert.AreEqual(0, generatedIDs.Count, "Matches");
+      Assert.That(generatedIDs.Count, Is.EqualTo(0), "Matches");
       doc = col.Find("_id like :param").Bind("param", "1e9c92fda74ed311944e00059a3c7a02").Execute();
       docs = doc.FetchAll().Count();
-      Assert.AreEqual(1, docs, "Matches");
+      Assert.That(docs, Is.EqualTo(1), "Matches");
       doc = col.Find("_id like :param").Bind("param", -3).Execute();
       docs = doc.FetchAll().Count();
-      Assert.AreEqual(1, docs, "Matches");
+      Assert.That(docs, Is.EqualTo(1), "Matches");
 
       // JSON
       result = col.Add("{\"_id\":\"1e9c92fda74ed311944e00059a3c7a03\",\"title\": \"Book 0\",\"pages\": 10}").
           Add("{\"_id\":-4,\"title\": \"Book 0\",\"pages\": 10}").
           Execute();
       generatedIDs = result.GeneratedIds;
-      Assert.AreEqual(0, generatedIDs.Count, "Matches");
+      Assert.That(generatedIDs.Count, Is.EqualTo(0), "Matches");
       doc = col.Find("_id like :param").Bind("param", "1e9c92fda74ed311944e00059a3c7a03").Execute();
       docs = doc.FetchAll().Count();
-      Assert.AreEqual(1, docs, "Matches");
+      Assert.That(docs, Is.EqualTo(1), "Matches");
       doc = col.Find("_id like :param").Bind("param", -4).Execute();
       docs = doc.FetchAll().Count();
-      Assert.AreEqual(1, docs, "Matches");
+      Assert.That(docs, Is.EqualTo(1), "Matches");
     }
 
     [Test, Description("Client provided _id shouldnt be discarded and generatedids() should give empty list for anonymous object array -multiple documents single add with negative number,zero and big positive numbers")]
@@ -2145,12 +2145,12 @@ public void VerifyIDFieldScenario9()
       };
       Result result = col.Add(data1).Execute();
       var generatedIDs = result.GeneratedIds;
-      Assert.AreEqual(0, generatedIDs.Count, "Matches");
+      Assert.That(generatedIDs.Count, Is.EqualTo(0), "Matches");
       for (int i = 0; i < idList.Length; i++)
       {
         var doc = col.Find("_id like :param").Bind("param", idList[i]).Execute();
         var docs = doc.FetchAll().Count();
-        Assert.AreEqual(1, docs, "Matches the Document ID");
+        Assert.That(docs, Is.EqualTo(1), "Matches the Document ID");
       }
     }
 
@@ -2169,12 +2169,12 @@ public void CollectionAddBlankId()
               new { _id = idList[1], title = "Book 0", pages = 10 }
       };
       Result result1 = col.Add(data1).Execute();
-      Assert.AreEqual(1, result1.AffectedItemsCount);
+      Assert.That(result1.AffectedItemsCount, Is.EqualTo(1));
       result1 = null;
 
       col = CreateCollection("my_collection");
       result1 = col.Add(data2).Execute();
-      Assert.AreEqual(1, result1.AffectedItemsCount);
+      Assert.That(result1.AffectedItemsCount, Is.EqualTo(1));
       result1 = null;
 
       col = CreateCollection("my_collection");
@@ -2184,7 +2184,7 @@ public void CollectionAddBlankId()
       DbDocs1.SetValue("pages", 10);
       DbDocs1.SetValue("_id", "");
       result1 = col.Add(DbDocs1).Execute();
-      Assert.AreEqual(1, result1.AffectedItemsCount);
+      Assert.That(result1.AffectedItemsCount, Is.EqualTo(1));
       result1 = null;
 
       col = CreateCollection("my_collection");
@@ -2193,18 +2193,18 @@ public void CollectionAddBlankId()
       DbDocs2.SetValue("pages", 20);
       DbDocs2.SetValue("_id", " ");
       result1 = col.Add(DbDocs2).Execute();
-      Assert.AreEqual(1, result1.AffectedItemsCount);
+      Assert.That(result1.AffectedItemsCount, Is.EqualTo(1));
       result1 = null;
 
       // JSON
       col = CreateCollection("my_collection");
       result1 = col.Add("{\"_id\":\"\",\"title\": \"Book 0\",\"pages\": 10}").Execute();
-      Assert.AreEqual(1, result1.AffectedItemsCount);
+      Assert.That(result1.AffectedItemsCount, Is.EqualTo(1));
       result1 = null;
 
       col = CreateCollection("my_collection");
       result1 = col.Add("{\"_id\":\" \",\"title\": \"Book 0\",\"pages\": 10}").Execute();
-      Assert.AreEqual(1, result1.AffectedItemsCount);
+      Assert.That(result1.AffectedItemsCount, Is.EqualTo(1));
       result1 = null;
 
     }
@@ -2224,12 +2224,12 @@ public void CollectionAddMultipleDocsSameId()
       DbDocs2.SetValue("pages", 20);
       DbDocs2.SetValue("_id", 1);
       var ex = Assert.Throws<MySqlException>(() => col.Add(DbDocs1).Add(DbDocs2).Execute());
-      Assert.AreEqual(exception, ex.Message, "Checking the exception");
+      Assert.That(ex.Message, Is.EqualTo(exception), "Checking the exception");
 
       // JSON
       ex = Assert.Throws<MySqlException>(() => col.Add("{\"_id\":1,\"title\": \"Book 0\",\"pages\": 10}").
            Add("{\"_id\":1,\"title\": \"Book 1\",\"pages\": 20}").Execute());
-      Assert.AreEqual(exception, ex.Message, "Checking the exception");
+      Assert.That(ex.Message, Is.EqualTo(exception), "Checking the exception");
 
       // Anonymous Object Array
       object[] data1 = new object[]
@@ -2241,7 +2241,7 @@ public void CollectionAddMultipleDocsSameId()
         new { _id = 1, title = "Book 1", pages = 20 }
       };
       ex = Assert.Throws<MySqlException>(() => col.Add(data1).Add(data2).Execute());
-      Assert.AreEqual(exception, ex.Message, "Checking the exception");
+      Assert.That(ex.Message, Is.EqualTo(exception), "Checking the exception");
     }
 
     [Test, Description("Verify the behaviour if a sequence is incremented by the user and added as _id for the document")]
@@ -2259,10 +2259,10 @@ public void VerifySequenceAndIdAdded()
 
       result = stmt.Execute();
       generatedIDs1 = result.GeneratedIds[0];
-      Assert.AreEqual(generatedIDs1, generatedIDs1, "ID generated by the server");
+      Assert.That(generatedIDs1, Is.EqualTo(generatedIDs1), "ID generated by the server");
       VerifyGeneratedID(generatedIDs1);
       countgenerateIDs = result.GeneratedIds.Count;
-      Assert.AreEqual(1, countgenerateIDs, "Count of the ID generated by the server");
+      Assert.That(countgenerateIDs, Is.EqualTo(1), "Count of the ID generated by the server");
       generatedString = generatedIDs1;
       incrementedString = Increment(generatedIDs1, Mode.AlphaNumeric);
 
@@ -2270,17 +2270,17 @@ public void VerifySequenceAndIdAdded()
       stmt = col.Add(data);
       string exception = "Document contains a field value that is not unique but required to be";
       Exception ex = Assert.Throws<MySqlException>(() => stmt.Execute());
-      Assert.AreEqual(exception, ex.Message, "Matching the exception");
+      Assert.That(ex.Message, Is.EqualTo(exception), "Matching the exception");
 
       data = new object[] { new { title = "Book 3", pages = 50, _id = incrementedString } };
       stmt = col.Add(data);
       result = stmt.Execute();
-      Assert.IsNotNull(result);
+      Assert.That(result, Is.Not.Null);
 
       data = new object[] { new { title = "Book 4", pages = 60 } };
       stmt = col.Add(data);
       ex = Assert.Throws<MySqlException>(() => stmt.Execute());
-      Assert.AreEqual(exception, ex.Message, "Matching the exception");
+      Assert.That(ex.Message, Is.EqualTo(exception), "Matching the exception");
 
     }
 
@@ -2292,7 +2292,7 @@ public async Task CollectionConcurrentAdd()
       CreateCollection("my_collection");
       var r1 = await CollectionAddThread1();
       _ = await CollectionAddThread2();
-      Assert.AreEqual(1000, r1);
+      Assert.That(r1, Is.EqualTo(1000));
     }
     public Task<int> CollectionAddThread1()
     {
@@ -2309,7 +2309,7 @@ public Task<int> CollectionAddThread1()
         newDoc2 = null;
       }
       Result r = col.Add(jsonlist).Execute();
-      Assert.AreEqual(1000, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1000), "Matching");
       int countgenerateIDs = r.GeneratedIds.Count;
       for (int i = 0; i < countgenerateIDs; i++)
       {
@@ -2344,7 +2344,7 @@ public Task<int> CollectionAddThread2()
         newDoc2 = null;
       }
       Result r = col.Add(jsonlist).Execute();
-      Assert.AreEqual(1000, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1000), "Matching");
       int countgenerateIDs = r.GeneratedIds.Count;
       for (int i = 0; i < countgenerateIDs; i++)
       {
@@ -2381,7 +2381,7 @@ public void DbDocAsObjectConvertToBlank()
       d2.SetValue("pages", 20);
       d2.SetValue("taker1", data1);
       string expected = $"{{{newLine}  \"id\": 1, {newLine}  \"pages\": 20, {newLine}  \"taker1\": {{{newLine}    \"id\": 1, {newLine}    \"pages\": 20, {newLine}    \"person\": {{{newLine}      \"name\": \"Fred\", {newLine}      \"age\": 45{newLine}    }}{newLine}  }}{newLine}}}";
-      Assert.AreEqual(expected, d2.ToString());
+      Assert.That(d2.ToString(), Is.EqualTo(expected));
     }
 
     [Test, Description("ADDITION OF OBJ FAILS AFTER CREATE INDEX IN 5.7.12 SERVER(WORKS WITH 5.7.9)")]
@@ -2391,7 +2391,7 @@ public void AdditionOfObject()
       testColl.CreateIndex("testIndex", "{\"fields\": [ { \"field\":$.myId, \"type\":\"INT\" , \"required\":true} ] }");
       testColl.CreateIndex("testIndex1", "{\"fields\": [ { \"field\":$.myAge, \"type\":\"FLOAT\" , \"required\":true} ] }");
       var result = testColl.Add(new { myId = 1, myAge = 35.1, _id = 1 }).Execute();
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
     }
 
     [Test, Description("Test valid insert at Depth n for multiple arrays))")]
@@ -2420,7 +2420,7 @@ public void InsertAtNDepth()
       json = json + "}";
 
       var res = collection.Add(json).Execute();
-      Assert.AreEqual(1, res.AffectedItemsCount);
+      Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
     }
 
     #endregion WL14389
@@ -2430,32 +2430,32 @@ public void InsertAtNDepth()
     public void VerifyGeneratedID(string input)
     {
       byte[] array = Encoding.ASCII.GetBytes(input);
-      Assert.False(array.Length < 28);
+      Assert.That(array.Length < 28, Is.False);
 
       byte[] uniquePrefix = new byte[4];
       Array.Copy(array, 0, uniquePrefix, 0, 4);
 
-      Assert.AreEqual(System.Text.Encoding.UTF8.GetString(uniquePrefix), System.Text.Encoding.UTF8.GetString(uniquePrefix),
+      Assert.That(System.Text.Encoding.UTF8.GetString(uniquePrefix), Is.EqualTo(System.Text.Encoding.UTF8.GetString(uniquePrefix)),
           "Unique Prefix of the Generated ID");
 
       byte[] startTimeStamp = new byte[8];
       Array.Copy(array, 4, startTimeStamp, 0, 8);
-      Assert.AreEqual(System.Text.Encoding.UTF8.GetString(startTimeStamp), System.Text.Encoding.UTF8.GetString(startTimeStamp),
+      Assert.That(System.Text.Encoding.UTF8.GetString(startTimeStamp), Is.EqualTo(System.Text.Encoding.UTF8.GetString(startTimeStamp)),
           "StartTimeStamp of the Generated ID");
 
       byte[] serial = new byte[16];
       Array.Copy(array, 12, serial, 0, 16);
-      Assert.AreEqual(System.Text.Encoding.UTF8.GetString(serial), System.Text.Encoding.UTF8.GetString(serial),
+      Assert.That(System.Text.Encoding.UTF8.GetString(serial), Is.EqualTo(System.Text.Encoding.UTF8.GetString(serial)),
           "Serial Number of the Generated ID");
     }
 
     public bool VerifySequence(string input1, string input2)
     {
       byte[] array1 = Encoding.ASCII.GetBytes(input1);
-      Assert.False(array1.Length < 28);
+      Assert.That(array1.Length < 28, Is.False);
       byte[] array2 = Encoding.ASCII.GetBytes(input2);
-      Assert.False(array2.Length < 28);
-      Assert.AreNotEqual(input1, input2);
+      Assert.That(array2.Length < 28, Is.False);
+      Assert.That(input2, Is.Not.EqualTo(input1));
       string incrementedString = Increment(input1, Mode.AlphaNumeric);
       if (incrementedString.Equals(input2))
       {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
index d6dc7081e..e14e77037 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
@@ -47,21 +47,21 @@ public void RemoveSingleDocumentById()
         new { _id = 56, title = "Book 3", pages = 40 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(3, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(3));
 
       // Remove with condition.
       r = ExecuteRemoveStatement(coll.Remove("_id = 12"));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       // Remove by ID.
       r = coll.RemoveOne(34);
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       var ex = Assert.Throws<ArgumentNullException>(() => coll.Remove(""));
 #if !NETFRAMEWORK
-      Assert.AreEqual("Parameter can't be null or empty. (Parameter 'condition')", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Parameter can't be null or empty. (Parameter 'condition')"));
 #else
-      Assert.AreEqual("Parameter can't be null or empty.\r\nParameter name: condition", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Parameter can't be null or empty.\r\nParameter name: condition"));
 #endif
     }
 
@@ -77,10 +77,10 @@ public void RemoveMultipleDocuments()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       r = ExecuteRemoveStatement(coll.Remove("pages > 20"));
-      Assert.AreEqual(3, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(3));
     }
 
     [Test]
@@ -95,10 +95,10 @@ public void RemoveMultipleDocumentsWithLimit()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       r = ExecuteRemoveStatement(coll.Remove("pages > 20").Limit(1));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       // Limit out of range.
       Assert.Throws<ArgumentOutOfRangeException>(() => ExecuteRemoveStatement(coll.Remove("True").Limit(0)));
@@ -119,10 +119,10 @@ public void RemoveMultipleDocumentsWithLimitAndOrder()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       r = ExecuteRemoveStatement(coll.Remove("pages > 20").Limit(1));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
     }
 
     [Test]
@@ -145,18 +145,18 @@ public void RemoveBind()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       r = ExecuteRemoveStatement(coll.Remove("pages = :Pages").Bind("pAges", 50));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       var jsonParams = new { pages1 = 30, pages2 = 40 };
       var res = coll.Remove("pages = :Pages1 || pages = :Pages2").Bind(jsonParams).Execute();
-      Assert.AreEqual(2, res.AffectedItemsCount);
+      Assert.That(res.AffectedItemsCount, Is.EqualTo(2));
 
       DbDoc docParams = new DbDoc(new { pages1 = 10, pages2 = 20 });
       coll.Remove("pages = :Pages1 || pages = :Pages2").Bind(docParams).Execute();
-      Assert.True(res.AffectedItemsCount > 0);
+      Assert.That(res.AffectedItemsCount > 0);
     }
 
     [Test]
@@ -171,7 +171,7 @@ public void RemoveAll()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result result = ExecuteAddStatement(collection.Add(docs));
-      Assert.AreEqual(4, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(4));
 
       // Condition can't be null or empty.
       string errorMessage = string.Empty;
@@ -181,17 +181,17 @@ public void RemoveAll()
       errorMessage = "Parameter can't be null or empty.\r\nParameter name: condition";
 #endif
       Exception ex = Assert.Throws<ArgumentNullException>(() => ExecuteRemoveStatement(collection.Remove(string.Empty)));
-      Assert.AreEqual(errorMessage, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(errorMessage));
       ex = Assert.Throws<ArgumentNullException>(() => ExecuteRemoveStatement(collection.Remove("")));
-      Assert.AreEqual(errorMessage, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(errorMessage));
       ex = Assert.Throws<ArgumentNullException>(() => ExecuteRemoveStatement(collection.Remove(" ")));
-      Assert.AreEqual(errorMessage, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(errorMessage));
       ex = Assert.Throws<ArgumentNullException>(() => ExecuteRemoveStatement(collection.Remove("  ")));
-      Assert.AreEqual(errorMessage, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(errorMessage));
 
       // Sending an expression that evaluates to true applies changes on all documents.
       result = ExecuteRemoveStatement(collection.Remove("true"));
-      Assert.AreEqual(4, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(4));
     }
 
     [Test]
@@ -207,16 +207,16 @@ public void RemoveWithInOperator()
         new DbDoc("{ \"a\": 1, \"b\": \"foo3\", \"c\": { \"d\": true, \"e\": [1,4,3] }, \"f\": [ {\"x\":6}, {\"x\":9 } ] }"),
       };
       Result result = ExecuteAddStatement(collection.Add(docs));
-      Assert.AreEqual(3, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(3));
 
-      Assert.AreEqual(1, ExecuteRemoveStatement(collection.Remove("a IN (2,3)")).AffectedItemsCount);
-      Assert.AreEqual(2, ExecuteFindStatement(collection.Find()).FetchAll().Count);
+      Assert.That(ExecuteRemoveStatement(collection.Remove("a IN (2,3)")).AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(ExecuteFindStatement(collection.Find()).FetchAll().Count, Is.EqualTo(2));
 
-      Assert.AreEqual(0, ExecuteRemoveStatement(collection.Remove("a IN [3]")).AffectedItemsCount);
-      Assert.AreEqual(2, ExecuteFindStatement(collection.Find()).FetchAll().Count);
+      Assert.That(ExecuteRemoveStatement(collection.Remove("a IN [3]")).AffectedItemsCount, Is.EqualTo(0));
+      Assert.That(ExecuteFindStatement(collection.Find()).FetchAll().Count, Is.EqualTo(2));
 
-      Assert.AreEqual(2, ExecuteRemoveStatement(collection.Remove("1 IN c.e")).AffectedItemsCount);
-      CollectionAssert.IsEmpty(ExecuteFindStatement(collection.Find()).FetchAll());
+      Assert.That(ExecuteRemoveStatement(collection.Remove("1 IN c.e")).AffectedItemsCount, Is.EqualTo(2));
+      Assert.That(ExecuteFindStatement(collection.Find()).FetchAll(), Is.Empty);
     }
 
     [Test]
@@ -231,27 +231,27 @@ public void RemoveOne()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result result = ExecuteAddStatement(collection.Add(docs));
-      Assert.AreEqual(4, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(4));
 
       ExecuteAddStatement(collection.Add(new { _id = 5, title = "Book 5", pages = 60 }));
-      Assert.AreEqual(5, ExecuteFindStatement(collection.Find()).FetchAll().Count);
+      Assert.That(ExecuteFindStatement(collection.Find()).FetchAll().Count, Is.EqualTo(5));
 
       // Remove sending numeric parameter.
-      Assert.AreEqual(1, collection.RemoveOne(1).AffectedItemsCount);
-      Assert.AreEqual(4, ExecuteFindStatement(collection.Find()).FetchAll().Count);
+      Assert.That(collection.RemoveOne(1).AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(ExecuteFindStatement(collection.Find()).FetchAll().Count, Is.EqualTo(4));
 
       // Remove sending string parameter.
-      Assert.AreEqual(1, collection.RemoveOne("3").AffectedItemsCount);
-      Assert.AreEqual(3, ExecuteFindStatement(collection.Find()).FetchAll().Count);
+      Assert.That(collection.RemoveOne("3").AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(ExecuteFindStatement(collection.Find()).FetchAll().Count, Is.EqualTo(3));
 
       // Remove an auto-generated id.
       DbDoc document = ExecuteFindStatement(collection.Find("pages = 60")).FetchOne();
-      Assert.AreEqual(1, collection.RemoveOne(document.Id).AffectedItemsCount);
-      Assert.AreEqual(2, ExecuteFindStatement(collection.Find()).FetchAll().Count);
+      Assert.That(collection.RemoveOne(document.Id).AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(ExecuteFindStatement(collection.Find()).FetchAll().Count, Is.EqualTo(2));
 
       // Remove a non-existing document.
-      Assert.AreEqual(0, collection.RemoveOne(5).AffectedItemsCount);
-      Assert.AreEqual(2, ExecuteFindStatement(collection.Find()).FetchAll().Count);
+      Assert.That(collection.RemoveOne(5).AffectedItemsCount, Is.EqualTo(0));
+      Assert.That(ExecuteFindStatement(collection.Find()).FetchAll().Count, Is.EqualTo(2));
 
       // Expected exceptions.
       Assert.Throws<ArgumentNullException>(() => collection.RemoveOne(null));
@@ -273,16 +273,16 @@ public void ForbidRemoveWithNoCondition()
                     new {  _id = 4, title = "Book 4", pages = 50 },
                     };
       Result result = collection.Add(docs).Execute();
-      Assert.AreEqual(4, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(4));
 
       result = collection.Remove("_id = 1").Execute();
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
       result = collection.Remove("_id = 10").Execute();
-      Assert.AreEqual(0, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(0));
       result = collection.Remove("_id = 2").Execute();
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
       result = collection.Remove("_id = 10").Execute();
-      Assert.AreEqual(0, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(0));
       Assert.Throws<ArgumentNullException>(() => collection.Remove(""));
     }
 
@@ -330,35 +330,35 @@ public void CollectionUnsetMultiple()
 
       var res1 = col.Find().Fields("{\"_id\":\"1\",\"books\": \"test1\" }").Fields("{\"_id\":\"2\",\"books\": \"test2\" }").Fields("{\"_id\":\"3\",\"books\": \"test3\" }").Execute().FetchAll();
       res1 = col.Find().Fields(new string[] { "_id", "books", "count" }).Execute().FetchAll();
-      Assert.AreEqual(3, res1.Count, "Matching the find count");
-      Assert.AreEqual(d1.ToString(), res1[0].ToString(), "Matching the doc string 1");
-      Assert.AreEqual(d2.ToString(), res1[1].ToString(), "Matching the doc string 2");
-      Assert.AreEqual(d3.ToString(), res1[2].ToString(), "Matching the doc string 3");
+      Assert.That(res1.Count, Is.EqualTo(3), "Matching the find count");
+      Assert.That(res1[0].ToString(), Is.EqualTo(d1.ToString()), "Matching the doc string 1");
+      Assert.That(res1[1].ToString(), Is.EqualTo(d2.ToString()), "Matching the doc string 2");
+      Assert.That(res1[2].ToString(), Is.EqualTo(d3.ToString()), "Matching the doc string 3");
       final = col.Add(new DbDoc[] { d4, d5 }).Execute();
       var res2 = col.Find().Fields("$._id as _id,$.books as books, $.count as count").Execute().FetchAll();
-      Assert.AreEqual(5, res2.Count, "Matching the find count");
-      Assert.AreEqual(d1.ToString(), res2[0].ToString(), "Matching the doc string 1");
-      Assert.AreEqual(d2.ToString(), res2[1].ToString(), "Matching the doc string 2");
-      Assert.AreEqual(d3.ToString(), res2[2].ToString(), "Matching the doc string 3");
-      Assert.AreEqual(d4.ToString(), res2[3].ToString(), "Matching the doc string 4");
-      Assert.AreEqual(d5.ToString(), res2[4].ToString(), "Matching the doc string 5");
+      Assert.That(res2.Count, Is.EqualTo(5), "Matching the find count");
+      Assert.That(res2[0].ToString(), Is.EqualTo(d1.ToString()), "Matching the doc string 1");
+      Assert.That(res2[1].ToString(), Is.EqualTo(d2.ToString()), "Matching the doc string 2");
+      Assert.That(res2[2].ToString(), Is.EqualTo(d3.ToString()), "Matching the doc string 3");
+      Assert.That(res2[3].ToString(), Is.EqualTo(d4.ToString()), "Matching the doc string 4");
+      Assert.That(res2[4].ToString(), Is.EqualTo(d5.ToString()), "Matching the doc string 5");
       final = col.Add(d6, d7).Execute();
       var res3 = col.Find().Sort("count ASC").Execute().FetchAll();
-      Assert.AreEqual(d6.ToString(), res3[0].ToString(), "Matching the doc string 7");
-      Assert.AreEqual(d1.ToString(), res3[1].ToString(), "Matching the doc string 1");
-      Assert.AreEqual(d2.ToString(), res3[2].ToString(), "Matching the doc string 2");
-      Assert.AreEqual(d3.ToString(), res3[3].ToString(), "Matching the doc string 3");
-      Assert.AreEqual(d4.ToString(), res3[4].ToString(), "Matching the doc string 4");
-      Assert.AreEqual(d5.ToString(), res3[5].ToString(), "Matching the doc string 5");
-      Assert.AreEqual(d7.ToString(), res3[6].ToString(), "Matching the doc string 6");
+      Assert.That(res3[0].ToString(), Is.EqualTo(d6.ToString()), "Matching the doc string 7");
+      Assert.That(res3[1].ToString(), Is.EqualTo(d1.ToString()), "Matching the doc string 1");
+      Assert.That(res3[2].ToString(), Is.EqualTo(d2.ToString()), "Matching the doc string 2");
+      Assert.That(res3[3].ToString(), Is.EqualTo(d3.ToString()), "Matching the doc string 3");
+      Assert.That(res3[4].ToString(), Is.EqualTo(d4.ToString()), "Matching the doc string 4");
+      Assert.That(res3[5].ToString(), Is.EqualTo(d5.ToString()), "Matching the doc string 5");
+      Assert.That(res3[6].ToString(), Is.EqualTo(d7.ToString()), "Matching the doc string 6");
       var res4 = col.Find().Sort("count DESC").Execute().FetchAll();
-      Assert.AreEqual(d7.ToString(), res4[0].ToString(), "Matching the doc string 6");
-      Assert.AreEqual(d5.ToString(), res4[1].ToString(), "Matching the doc string 1");
-      Assert.AreEqual(d4.ToString(), res4[2].ToString(), "Matching the doc string 2");
-      Assert.AreEqual(d3.ToString(), res4[3].ToString(), "Matching the doc string 3");
-      Assert.AreEqual(d2.ToString(), res4[4].ToString(), "Matching the doc string 4");
-      Assert.AreEqual(d1.ToString(), res4[5].ToString(), "Matching the doc string 5");
-      Assert.AreEqual(d6.ToString(), res4[6].ToString(), "Matching the doc string 7");
+      Assert.That(res4[0].ToString(), Is.EqualTo(d7.ToString()), "Matching the doc string 6");
+      Assert.That(res4[1].ToString(), Is.EqualTo(d5.ToString()), "Matching the doc string 1");
+      Assert.That(res4[2].ToString(), Is.EqualTo(d4.ToString()), "Matching the doc string 2");
+      Assert.That(res4[3].ToString(), Is.EqualTo(d3.ToString()), "Matching the doc string 3");
+      Assert.That(res4[4].ToString(), Is.EqualTo(d2.ToString()), "Matching the doc string 4");
+      Assert.That(res4[5].ToString(), Is.EqualTo(d1.ToString()), "Matching the doc string 5");
+      Assert.That(res4[6].ToString(), Is.EqualTo(d6.ToString()), "Matching the doc string 7");
       //Unset with multiple variables not supported
       col.Modify("_id = 1").Unset(new string[] { "count", "books" }).Execute();
       col.Modify("_id = 1").Set("count", 10).Set("books", "test1").Execute();
@@ -371,9 +371,9 @@ public void RemovingItemUsingDbDoc()
       Collection coll = CreateCollection("test");
       DbDoc doc = new DbDoc(new { _id = 1, title = "Book 1", pages = 20 });
       Result r = coll.Add(doc).Execute();
-      Assert.AreEqual(1, (int)r.AffectedItemsCount, "Match being done");
+      Assert.That((int)r.AffectedItemsCount, Is.EqualTo(1), "Match being done");
       r = coll.Remove("_id=1").Execute();
-      Assert.AreEqual(1, (int)r.AffectedItemsCount, "Match being done");
+      Assert.That((int)r.AffectedItemsCount, Is.EqualTo(1), "Match being done");
     }
 
     #endregion WL14389
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs
index 5b181c9bb..96aa89cd5 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs
@@ -46,15 +46,15 @@ public void FetchAllNoReference()
       stmt.Add(@"{ ""_id"": 3, ""foo"": 3 }");
       stmt.Add(@"{ ""_id"": 4, ""foo"": 4 }");
       Result result = ExecuteAddStatement(stmt);
-      Assert.AreEqual(4, (int)result.AffectedItemsCount);
+      Assert.That((int)result.AffectedItemsCount, Is.EqualTo(4));
 
       var docResult = ExecuteFindStatement(testColl.Find());
       var docs = docResult.FetchAll();
       WeakReference wr = new WeakReference(docResult);
       docResult = null;
       GC.Collect();
-      Assert.False(wr.IsAlive);
-      Assert.AreEqual(4, docs.Count);
+      Assert.That(wr.IsAlive, Is.False);
+      Assert.That(docs.Count, Is.EqualTo(4));
     }
 #endif
   }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs
index 968fb8b8b..b9d5b74d9 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs
@@ -49,13 +49,13 @@ public void SmartBuffering()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result r = ExecuteAddStatement(test.Add(docs));
-      Assert.AreEqual(r.Warnings.Count, r.WarningsCount);
+      Assert.That(r.WarningsCount, Is.EqualTo(r.Warnings.Count));
 
       var docResult = ExecuteFindStatement(test.Find());
       foreach (var doc in docResult)
       {
         var result = ExecuteAddStatement(test2.Add(doc));
-        Assert.AreEqual(1, result.AffectedItemsCount);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
       }
     }
   }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
index b5abd79a6..19216f6a5 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
@@ -43,29 +43,29 @@ public void SetItemInSingleDocument()
     {
       Collection coll = CreateCollection("test");
       Result result = ExecuteAddStatement(coll.Add(new { _id = 1, name = "Book 1" }));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
       // Set integer value.
       result = ExecuteModifyStatement(coll.Modify("_id = 1").Set("pages", "20"));
-      Assert.AreEqual(1, result.AffectedItemsCount);
-      Assert.AreEqual("20", coll.GetOne(1)["pages"]);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(coll.GetOne(1)["pages"], Is.EqualTo("20"));
 
       // Set null value.
       result = ExecuteModifyStatement(coll.Modify("_id = 1").Set("pages", null));
-      Assert.AreEqual(1, result.AffectedItemsCount);
-      Assert.Null(coll.GetOne(1)["pages"]);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(coll.GetOne(1)["pages"], Is.Null);
 
       // Set existing field.
       result = ExecuteModifyStatement(coll.Modify("_id = 1").Set("name", "Book 2"));
-      Assert.AreEqual(1, result.AffectedItemsCount);
-      Assert.AreEqual("Book 2", coll.GetOne(1)["name"]);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(coll.GetOne(1)["name"], Is.EqualTo("Book 2"));
 
       // Set alphanumeric field.
       var document = new DbDoc();
       document.SetValue("_id", 2);
       document.SetValue("1a", "other");
       result = ExecuteAddStatement(coll.Add(document));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
       var insertedDocument = coll.GetOne(2);
 
       //result = coll.Modify("_id = 1").Set("1a", "other"));
@@ -76,10 +76,10 @@ public void ChangeItemInSingleDocument()
     {
       Collection coll = CreateCollection("test");
       Result result = ExecuteAddStatement(coll.Add(new { _id = 1, name = "Book 1", pages = 20 }));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
       result = ExecuteModifyStatement(coll.Modify("_id = 1").Change("name", "Book 2"));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
     }
 
     [Test]
@@ -91,42 +91,42 @@ public void RemoveItemInSingleDocumentUsingUnset()
                 .Add(new { _id = 2, name = "Book 2", pages = 30 })
                 .Add(new { _id = 3, name = "Book 3", pages = 40, author = "John", author2 = "Mary" })
                 );
-      Assert.AreEqual(3, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(3));
 
       // Unset 1 field.
       result = ExecuteModifyStatement(coll.Modify("_id = 1").Unset("pages"));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
       var document = ExecuteFindStatement(coll.Find("_id = 1")).FetchOne();
-      Assert.AreEqual(2, document.values.Count);
+      Assert.That(document.values.Count, Is.EqualTo(2));
 
       // Unset multiple fields.
       result = ExecuteModifyStatement(coll.Modify("_id = 2").Unset("name", "pages"));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
       document = ExecuteFindStatement(coll.Find("_id = 2")).FetchOne();
       Assert.That(document.values, Has.One.Items);
       result = ExecuteModifyStatement(coll.Modify("_id = 3").Unset(null, "author", "author2"));
       document = ExecuteFindStatement(coll.Find("_id = 3")).FetchOne();
-      Assert.AreEqual(3, document.values.Count);
+      Assert.That(document.values.Count, Is.EqualTo(3));
 
       // Unsetting nonexistent fields doesn't raise an error.
       result = ExecuteModifyStatement(coll.Modify("_id = 2").Unset("otherfield"));
-      Assert.AreEqual(0ul, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(0ul));
 
       // Unsetting null items combined with valid values are ignored.
       result = ExecuteModifyStatement(coll.Modify("_id = 3").Unset(null).Unset("name"));
-      Assert.AreEqual(1ul, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
       document = ExecuteFindStatement(coll.Find("_id = 3")).FetchOne();
-      Assert.AreEqual(2, document.values.Count);
+      Assert.That(document.values.Count, Is.EqualTo(2));
 
       // Unsetting single null items raises an error
       var ex = Assert.Throws<MySqlException>(() => ExecuteModifyStatement(coll.Modify("_id = 3").Unset(null)));
-      Assert.AreEqual("Invalid update expression list", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Invalid update expression list"));
 
       // Unsetting empty strings raises an error.
       var ex2 = Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(coll.Modify("_id = 2").Unset("")));
-      Assert.AreEqual(ResourcesX.DocPathNullOrEmpty, ex2.Message);
+      Assert.That(ex2.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty));
       ex2 = Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(coll.Modify("_id = 2").Unset(string.Empty)));
-      Assert.AreEqual(ResourcesX.DocPathNullOrEmpty, ex2.Message);
+      Assert.That(ex2.Message, Is.EqualTo(ResourcesX.DocPathNullOrEmpty));
 
       // Unset with special chars.
       Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(coll.Modify("_id = 3").Unset(null).Unset("@*%#�")));
@@ -139,16 +139,16 @@ public void SetItemAndBind()
       Collection coll = CreateCollection("test");
       Result result = ExecuteAddStatement(coll.Add(new { _id = 1, name = "Book 1" })
         .Add(new { _id = 2, name = "Book 2" }));
-      Assert.AreEqual(2, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(2));
 
       var stmt = coll.Modify("_id = :ID");
       result = ExecuteModifyStatement(stmt.Bind("Id", 2).Set("pages", "20"));
-      Assert.AreEqual(1, result.AffectedItemsCount);
-      result = ExecuteModifyStatement(stmt.Bind("Id", 1).Set("pages", 10)); Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
+      result = ExecuteModifyStatement(stmt.Bind("Id", 1).Set("pages", 10)); Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
       var docs = ExecuteFindStatement(coll.Find()).FetchAll();
-      Assert.AreEqual(new DbDoc("{ \"_id\": 1, \"name\": \"Book 1\", \"pages\": 10 }").ToString(), docs[0].ToString());
-      Assert.AreEqual(new DbDoc("{ \"_id\": 2, \"name\": \"Book 2\", \"pages\": \"20\" }").ToString(), docs[1].ToString());
+      Assert.That(docs[0].ToString(), Is.EqualTo(new DbDoc("{ \"_id\": 1, \"name\": \"Book 1\", \"pages\": 10 }").ToString()));
+      Assert.That(docs[1].ToString(), Is.EqualTo(new DbDoc("{ \"_id\": 2, \"name\": \"Book 2\", \"pages\": \"20\" }").ToString()));
     }
 
     [Test]
@@ -161,7 +161,7 @@ public void ModifyAll()
         new {  _id = 2, title = "Book 2", pages = 30 },
       };
       Result result = ExecuteAddStatement(collection.Add(docs));
-      Assert.AreEqual(2, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(2));
 
       // Condition can't be null or empty.
       string errorMessage = string.Empty;
@@ -171,19 +171,19 @@ public void ModifyAll()
       errorMessage = "Parameter can't be null or empty.\r\nParameter name: condition";
 #endif
       Exception ex = Assert.Throws<ArgumentNullException>(() => ExecuteModifyStatement(collection.Modify(string.Empty)));
-      Assert.AreEqual(ex.Message, errorMessage);
+      Assert.That(errorMessage, Is.EqualTo(ex.Message));
       ex = Assert.Throws<ArgumentNullException>(() => ExecuteModifyStatement(collection.Modify("")));
-      Assert.AreEqual(ex.Message, errorMessage);
+      Assert.That(errorMessage, Is.EqualTo(ex.Message));
       ex = Assert.Throws<ArgumentNullException>(() => ExecuteModifyStatement(collection.Modify(" ")));
-      Assert.AreEqual(ex.Message, errorMessage);
+      Assert.That(errorMessage, Is.EqualTo(ex.Message));
       ex = Assert.Throws<ArgumentNullException>(() => ExecuteModifyStatement(collection.Modify("   ")));
-      Assert.AreEqual(ex.Message, errorMessage);
+      Assert.That(errorMessage, Is.EqualTo(ex.Message));
       ex = Assert.Throws<ArgumentNullException>(() => ExecuteModifyStatement(collection.Modify(null)));
-      Assert.AreEqual(ex.Message, errorMessage);
+      Assert.That(errorMessage, Is.EqualTo(ex.Message));
 
       // Sending an expression that evaluates to true applies changes on all documents.
       result = ExecuteModifyStatement(collection.Modify("true").Set("pages", "10"));
-      Assert.AreEqual(2, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(2));
     }
 
     [Test]
@@ -196,7 +196,7 @@ public void ModifyWithLimit()
         new {  _id = 2, title = "Book 2", pages = 30 },
       };
       Result result = ExecuteAddStatement(collection.Add(docs));
-      Assert.AreEqual(2, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(2));
 
       ExecuteModifyStatement(collection.Modify("true").Set("title", "Book X").Limit(1));
       Assert.That(ExecuteFindStatement(collection.Find("title = \"Book X\"")).FetchAll(), Has.One.Items);
@@ -219,16 +219,16 @@ public void ModifyWithInOperator()
         new DbDoc("{ \"a\": 1, \"b\": \"foo3\", \"c\": { \"d\": true, \"e\": [1,4,3] }, \"f\": [ {\"x\":6}, {\"x\":9 } ] }"),
       };
       Result result = ExecuteAddStatement(collection.Add(docs));
-      Assert.AreEqual(3, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(3));
 
-      Assert.AreEqual(3, ExecuteModifyStatement(collection.Modify("a IN (1,2)").Set("a", 3)).AffectedItemsCount);
-      Assert.AreEqual(3, ExecuteFindStatement(collection.Find().Where("a = 3")).FetchAll().Count);
+      Assert.That(ExecuteModifyStatement(collection.Modify("a IN (1,2)").Set("a", 3)).AffectedItemsCount, Is.EqualTo(3));
+      Assert.That(ExecuteFindStatement(collection.Find().Where("a = 3")).FetchAll().Count, Is.EqualTo(3));
 
-      Assert.AreEqual(3, ExecuteModifyStatement(collection.Modify("a IN [3]").Set("a", 1)).AffectedItemsCount);
-      Assert.AreEqual(3, ExecuteFindStatement(collection.Find().Where("a = 1")).FetchAll().Count);
+      Assert.That(ExecuteModifyStatement(collection.Modify("a IN [3]").Set("a", 1)).AffectedItemsCount, Is.EqualTo(3));
+      Assert.That(ExecuteFindStatement(collection.Find().Where("a = 1")).FetchAll().Count, Is.EqualTo(3));
 
-      Assert.AreEqual(2, ExecuteModifyStatement(collection.Modify("1 IN c.e").Set("c.e", "newValue")).AffectedItemsCount);
-      Assert.AreEqual(2, ExecuteFindStatement(collection.Find().Where("c.e = \"newValue\"")).FetchAll().Count);
+      Assert.That(ExecuteModifyStatement(collection.Modify("1 IN c.e").Set("c.e", "newValue")).AffectedItemsCount, Is.EqualTo(2));
+      Assert.That(ExecuteFindStatement(collection.Find().Where("c.e = \"newValue\"")).FetchAll().Count, Is.EqualTo(2));
     }
 
     [Test]
@@ -243,7 +243,7 @@ public void ReplaceOne()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result result = ExecuteAddStatement(collection.Add(docs));
-      Assert.AreEqual(4, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(4));
 
       // Expected exceptions.
       Assert.Throws<ArgumentNullException>(() => collection.ReplaceOne(null, docs[1]));
@@ -257,22 +257,22 @@ public void ReplaceOne()
       var newDoc = new { _id = 1, title = "Book 11", pages = 311 };
 
       // Replace using a numeric identifier.
-      Assert.AreEqual(1, collection.ReplaceOne(1, newDoc).AffectedItemsCount);
+      Assert.That(collection.ReplaceOne(1, newDoc).AffectedItemsCount, Is.EqualTo(1));
       DbDoc document = collection.GetOne(1);
-      Assert.AreEqual(1, Convert.ToInt32(document.Id));
-      Assert.AreEqual("Book 11", document["title"]);
-      Assert.AreEqual(311, Convert.ToInt32(document["pages"]));
+      Assert.That(Convert.ToInt32(document.Id), Is.EqualTo(1));
+      Assert.That(document["title"], Is.EqualTo("Book 11"));
+      Assert.That(Convert.ToInt32(document["pages"]), Is.EqualTo(311));
 
       // Replace using a string identifier.
-      Assert.AreEqual(1, collection.ReplaceOne("2", new DbDoc("{ \"name\": \"John\", \"lastName\": \"Smith\" }")).AffectedItemsCount);
+      Assert.That(collection.ReplaceOne("2", new DbDoc("{ \"name\": \"John\", \"lastName\": \"Smith\" }")).AffectedItemsCount, Is.EqualTo(1));
       document = collection.GetOne(2);
-      Assert.AreEqual(2, Convert.ToInt32(document.Id));
-      Assert.AreEqual("John", document["name"]);
-      Assert.AreEqual("Smith", document["lastName"]);
+      Assert.That(Convert.ToInt32(document.Id), Is.EqualTo(2));
+      Assert.That(document["name"], Is.EqualTo("John"));
+      Assert.That(document["lastName"], Is.EqualTo("Smith"));
 
       // Replace a non-existing document.
-      Assert.AreEqual(0, collection.ReplaceOne(5, docs[1]).AffectedItemsCount);
-      Assert.True(collection.GetOne(5) == null);
+      Assert.That(collection.ReplaceOne(5, docs[1]).AffectedItemsCount, Is.EqualTo(0));
+      Assert.That(collection.GetOne(5) == null);
     }
 
     [Test]
@@ -286,17 +286,17 @@ public void ReplaceNestedDocument()
         new DbDoc(@"{ ""_id"": 3, ""pages"": 40,""title"" : ""Book 3"", ""person"": { ""name"": ""Andy"", ""age"": 25 } }"),
         new DbDoc(@"{ ""_id"": 4, ""pages"": 50,""title"" : ""Book 4"", ""person"": { ""name"": ""John"", ""age"": 34 } }")
       };
-      Assert.AreEqual(4, ExecuteAddStatement(collection.Add(docs)).AffectedItemsCount);
+      Assert.That(ExecuteAddStatement(collection.Add(docs)).AffectedItemsCount, Is.EqualTo(4));
 
       DbDoc d_new = new DbDoc(@"{ ""_id"": 1, ""pages"": 20,""title"" : ""Book 1"", ""person"": { ""name"": ""Fred"", ""age"": 45 ,""State"" : ""Ohio""} }");
-      Assert.AreEqual(1, collection.ReplaceOne(1, d_new).AffectedItemsCount);
+      Assert.That(collection.ReplaceOne(1, d_new).AffectedItemsCount, Is.EqualTo(1));
       DbDoc document = collection.GetOne(1);
-      Assert.AreEqual("Ohio", (document.values["person"] as Dictionary<string, object>)["State"]);
+      Assert.That((document.values["person"] as Dictionary<string, object>)["State"], Is.EqualTo("Ohio"));
 
       d_new = new DbDoc(@"{ ""_id"": 1, ""pages"": 20,""title"" : ""Book 1"", ""person"": { ""name"": ""Fred"", ""age"": 45 ,""State"" : ""Ohio"", ""newProp"": { ""a"":33 } } }");
-      Assert.AreEqual(1, collection.ReplaceOne(1, d_new).AffectedItemsCount);
+      Assert.That(collection.ReplaceOne(1, d_new).AffectedItemsCount, Is.EqualTo(1));
       document = collection.GetOne(1);
-      Assert.AreEqual(33, ((document.values["person"] as Dictionary<string, object>)["newProp"] as Dictionary<string, object>)["a"]);
+      Assert.That(((document.values["person"] as Dictionary<string, object>)["newProp"] as Dictionary<string, object>)["a"], Is.EqualTo(33));
     }
 
     [Test]
@@ -322,22 +322,22 @@ public void ArrayInsert()
       var document = result.FetchOne();
       var x = (object[])document.values["x"];
 
-      Assert.AreEqual(8, x.Length);
-      Assert.AreEqual(1, (int)x[0]);
-      Assert.AreEqual(43, (int)x[1]);
-      Assert.AreEqual(2, (int)x[2]);
-      Assert.AreEqual(44, (int)x[3]);
-      Assert.AreEqual(46, (int)x[4]);
-      Assert.AreEqual(50, (int)x[5]);
-      Assert.AreEqual("string", x[6]);
-      Assert.True(new DbDoc(x[7]) is DbDoc);
+      Assert.That(x.Length, Is.EqualTo(8));
+      Assert.That((int)x[0], Is.EqualTo(1));
+      Assert.That((int)x[1], Is.EqualTo(43));
+      Assert.That((int)x[2], Is.EqualTo(2));
+      Assert.That((int)x[3], Is.EqualTo(44));
+      Assert.That((int)x[4], Is.EqualTo(46));
+      Assert.That((int)x[5], Is.EqualTo(50));
+      Assert.That(x[6], Is.EqualTo("string"));
+      Assert.That(new DbDoc(x[7]) is DbDoc);
 
       // No value is inserted if the array doesn't exist.
       ExecuteModifyStatement(collection.Modify("true").ArrayInsert("y[0]", 1));
 
       result = ExecuteFindStatement(collection.Find());
       document = result.FetchOne();
-      Assert.False(document.values.ContainsKey("y"));
+      Assert.That(document.values.ContainsKey("y"), Is.False);
 
       ExecuteModifyStatement(collection.Modify("true").ArrayInsert("x[0]", null));
       ExecuteModifyStatement(collection.Modify("true").ArrayInsert("x[1]", " "));
@@ -345,18 +345,18 @@ public void ArrayInsert()
       result = ExecuteFindStatement(collection.Find());
       document = result.FetchOne();
       x = (object[])document.values["x"];
-      Assert.Null(x[0]);
-      Assert.AreEqual(" ", x[1]);
+      Assert.That(x[0], Is.Null);
+      Assert.That(x[1], Is.EqualTo(" "));
 
       // Insert an empty string fails.
       var ex = Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(collection.Modify("true").ArrayInsert("x[0]", "")));
-      StringAssert.Contains("String can't be empty.", ex.Message);
+      Assert.That(ex.Message, Does.Contain("String can't be empty."));
       ex = Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(collection.Modify("true").ArrayInsert("x[0]", string.Empty)));
-      StringAssert.Contains("String can't be empty.", ex.Message);
+      Assert.That(ex.Message, Does.Contain("String can't be empty."));
 
       // Not specifying an index raises an error.
       var ex2 = Assert.Throws<MySqlException>(() => ExecuteModifyStatement(collection.Modify("true").ArrayInsert("dates", "5/1/2018")));
-      Assert.AreEqual("A path expression is not a path to a cell in an array.", ex2.Message);
+      Assert.That(ex2.Message, Is.EqualTo("A path expression is not a path to a cell in an array."));
 
       var col = CreateCollection("my_collection");
       var t1 = "{\"_id\": \"1001\", \"ARR\":[1,2,3], \"ARR1\":[\"name1\",\"name2\", \"name3\"]}";
@@ -372,11 +372,11 @@ public void ArrayInsert()
       result = ExecuteFindStatement(col.Find());
       document = result.FetchOne();
       var x2 = (object[])document.values["ARR"];
-      Assert.AreEqual(8, x2.Length);
-      Assert.AreEqual(8, (int)x2[0]);
+      Assert.That(x2.Length, Is.EqualTo(8));
+      Assert.That((int)x2[0], Is.EqualTo(8));
       x2 = (object[])document.values["ARR1"];
-      Assert.AreEqual("****", x2[0]);
-      Assert.AreEqual("name3", x2[8]);
+      Assert.That(x2[0], Is.EqualTo("****"));
+      Assert.That(x2[8], Is.EqualTo("name3"));
     }
 
     [Test]
@@ -388,27 +388,27 @@ public void ArrayAppendWithMySqlExpression()
       ExecuteAddStatement(collection.Add("{ \"_id\":\"123\", \"name\":\"alice\", \"email\":[ \"alice@ora.com\" ], \"dates\":\"4/1/2017\" }"));
       ExecuteModifyStatement(collection.Modify("true").ArrayAppend("email", "UPPER($.name)"));
       var document = collection.GetOne("123");
-      Assert.AreEqual("UPPER($.name)", (document["email"] as object[])[1]);
+      Assert.That((document["email"] as object[])[1], Is.EqualTo("UPPER($.name)"));
 
       // Use MySqlExpression.
       ExecuteAddStatement(collection.Add("{ \"_id\":\"124\", \"name\":\"alice\", \"value\":[ \"alice@ora.com\" ], \"dates\":\"4/1/2017\" }"));
       ExecuteModifyStatement(collection.Modify("_id = \"124\"").ArrayAppend("value", new MySqlExpression("UPPER($.name)")));
       document = collection.GetOne("124");
-      Assert.AreEqual("ALICE", (document["value"] as object[])[1]);
+      Assert.That((document["value"] as object[])[1], Is.EqualTo("ALICE"));
 
       // Use embedded MySqlExpression.
       ExecuteAddStatement(collection.Add("{ \"_id\":\"125\", \"name\":\"alice\", \"value\":[ \"alice@ora.com\" ], \"dates\":\"4/1/2017\" }"));
       ExecuteModifyStatement(collection.Modify("_id = \"125\"").ArrayAppend("value", new { expression = new MySqlExpression("UPPER($.name)") }));
       document = collection.GetOne("125");
       var item = ((document["value"] as object[])[1] as Dictionary<string, object>);
-      Assert.AreEqual("ALICE", item["expression"]);
+      Assert.That(item["expression"], Is.EqualTo("ALICE"));
 
       ExecuteAddStatement(collection.Add("{ \"_id\":\"126\", \"name\":\"alice\", \"value\":[ \"alice@ora.com\" ], \"dates\":\"4/1/2017\" }"));
       ExecuteModifyStatement(collection.Modify("_id = \"126\"").ArrayAppend("value", new { expression = new MySqlExpression("UPPER($.name)"), literal = "UPPER($.name)" }));
       document = collection.GetOne("126");
       item = ((document["value"] as object[])[1] as Dictionary<string, object>);
-      Assert.AreEqual("ALICE", item["expression"]);
-      Assert.AreEqual("UPPER($.name)", item["literal"]);
+      Assert.That(item["expression"], Is.EqualTo("ALICE"));
+      Assert.That(item["literal"], Is.EqualTo("UPPER($.name)"));
     }
 
     [Test]
@@ -420,8 +420,8 @@ public void ArrayAppendUsesCorrectDataTypes()
       ExecuteModifyStatement(collection.Modify("true").ArrayAppend("dates", 1));
       var document = collection.GetOne("123");
       var dates = document["dates"] as object[];
-      Assert.True(dates[1] is string);
-      Assert.True(dates[2] is int);
+      Assert.That(dates[1] is string);
+      Assert.That(dates[2] is int);
     }
 
     [Test]
@@ -440,26 +440,26 @@ public void ArrayAppend()
       DbDoc document = result.FetchOne();
       var x = (object[])document.values["x"];
 
-      Assert.AreEqual(7, x.Length);
-      Assert.AreEqual(1, (int)x[0]);
-      Assert.AreEqual(2, (int)x[1]);
-      Assert.AreEqual(43, (int)x[2]);
-      Assert.AreEqual("string", x[3]);
-      Assert.AreEqual(true, x[4]);
-      Assert.Null(x[5]);
-      Assert.AreEqual(" ", x[6]);
+      Assert.That(x.Length, Is.EqualTo(7));
+      Assert.That((int)x[0], Is.EqualTo(1));
+      Assert.That((int)x[1], Is.EqualTo(2));
+      Assert.That((int)x[2], Is.EqualTo(43));
+      Assert.That(x[3], Is.EqualTo("string"));
+      Assert.That(x[4], Is.EqualTo(true));
+      Assert.That(x[5], Is.Null);
+      Assert.That(x[6], Is.EqualTo(" "));
 
       // No value is appended if the array doesn't exist.
       ExecuteModifyStatement(collection.Modify("true").ArrayAppend("y", 45));
 
       result = ExecuteFindStatement(collection.Find());
       document = result.FetchOne();
-      Assert.False(document.values.ContainsKey("y"));
+      Assert.That(document.values.ContainsKey("y"), Is.False);
 
       var ex = Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(collection.Modify("true").ArrayAppend("x", "")));
-      StringAssert.Contains("String can't be empty.", ex.Message);
+      Assert.That(ex.Message, Does.Contain("String can't be empty."));
       ex = Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(collection.Modify("true").ArrayAppend("x", string.Empty)));
-      StringAssert.Contains("String can't be empty.", ex.Message);
+      Assert.That(ex.Message, Does.Contain("String can't be empty."));
 
       var col = CreateCollection("my_collection");
       var t1 = "{\"_id\": \"1001\", \"ARR\":[1,2,3], \"ARR1\":[\"name1\",\"name2\", \"name3\"]}";
@@ -483,27 +483,27 @@ public void ArrayInsertWithMySqlExpression()
       ExecuteAddStatement(collection.Add("{ \"_id\":\"123\", \"name\":\"alice\", \"email\":[ \"alice@ora.com\" ], \"dates\":\"4/1/2017\" }"));
       ExecuteModifyStatement(collection.Modify("true").ArrayInsert("email[0]", "UPPER($.name)"));
       var document = collection.GetOne("123");
-      Assert.AreEqual("UPPER($.name)", (document["email"] as object[])[0]);
+      Assert.That((document["email"] as object[])[0], Is.EqualTo("UPPER($.name)"));
 
       // Use MySqlExpression.
       ExecuteAddStatement(collection.Add("{ \"_id\":\"124\", \"name\":\"alice\", \"email\":[ \"alice@ora.com\" ], \"dates\":\"4/1/2017\" }"));
       ExecuteModifyStatement(collection.Modify("_id = \"124\"").ArrayInsert("email[0]", new MySqlExpression("UPPER($.name)")));
       document = collection.GetOne("124");
-      Assert.AreEqual("ALICE", (document["email"] as object[])[0]);
+      Assert.That((document["email"] as object[])[0], Is.EqualTo("ALICE"));
 
       // Use embedded MySqlExpression.
       ExecuteAddStatement(collection.Add("{ \"_id\":\"125\", \"name\":\"alice\", \"email\":[ \"alice@ora.com\" ], \"dates\":\"4/1/2017\" }"));
       ExecuteModifyStatement(collection.Modify("_id = \"125\"").ArrayInsert("email[0]", new { other = new MySqlExpression("UPPER($.name)") }));
       document = collection.GetOne("125");
       var item = ((document["email"] as object[])[0] as Dictionary<string, object>);
-      Assert.AreEqual("ALICE", item["other"]);
+      Assert.That(item["other"], Is.EqualTo("ALICE"));
 
       ExecuteAddStatement(collection.Add("{ \"_id\":\"126\", \"name\":\"alice\", \"email\":[ \"alice@ora.com\" ], \"dates\":\"4/1/2017\" }"));
       ExecuteModifyStatement(collection.Modify("_id = \"126\"").ArrayInsert("email[0]", new { other = new MySqlExpression("UPPER($.name)"), literal = "UPPER($.name)" }));
       document = collection.GetOne("126");
       item = ((document["email"] as object[])[0] as Dictionary<string, object>);
-      Assert.AreEqual("ALICE", item["other"]);
-      Assert.AreEqual("UPPER($.name)", item["literal"]);
+      Assert.That(item["other"], Is.EqualTo("ALICE"));
+      Assert.That(item["literal"], Is.EqualTo("UPPER($.name)"));
     }
 
     [Test]
@@ -511,11 +511,11 @@ public void ArrayOperationsKeepDateValue()
     {
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add("{ \"_id\": \"123\", \"email\":[\"alice@ora.com\"], \"dates\": \"5/1/2018\" }"));
-      Assert.AreEqual(1ul, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1ul));
 
       // No items are affected since dates isn't an array.
       r = ExecuteModifyStatement(collection.Modify("true").ArrayInsert("dates[0]", "4/1/2018"));
-      Assert.AreEqual(0ul, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(0ul));
 
       // Converts a non array to an array by appending a value.
       ExecuteModifyStatement(collection.Modify("true").ArrayAppend("dates", "6/1/2018"));
@@ -525,10 +525,10 @@ public void ArrayOperationsKeepDateValue()
 
       DbDoc document = collection.GetOne("123");
       object[] dates = document["dates"] as object[];
-      Assert.AreEqual(3, dates.Length);
-      Assert.AreEqual("4/1/2018", dates[0]);
-      Assert.AreEqual("5/1/2018", dates[1]);
-      Assert.AreEqual("6/1/2018", dates[2]);
+      Assert.That(dates.Length, Is.EqualTo(3));
+      Assert.That(dates[0], Is.EqualTo("4/1/2018"));
+      Assert.That(dates[1], Is.EqualTo("5/1/2018"));
+      Assert.That(dates[2], Is.EqualTo("6/1/2018"));
     }
 
     [Test]
@@ -553,16 +553,16 @@ public void Alphanumeric()
       }
 
       var crudresult = collection.Find("pages=10").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count should be 1 before Unset of pages for _id=0.");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count should be 1 before Unset of pages for _id=0.");
       var result = collection.Modify("_id = 0").Unset("pages").Execute();
-      Assert.AreEqual(1, result.AffectedItemsCount, "Affected Items Count when modify unset is used");
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1), "Affected Items Count when modify unset is used");
       crudresult = collection.Find("pages=10").Execute().FetchAll();
-      Assert.AreEqual(0, crudresult.Count, "Count should be 0 after Unset of pages for _id=0");
+      Assert.That(crudresult.Count, Is.EqualTo(0), "Count should be 0 after Unset of pages for _id=0");
       crudresult = collection.Find("books='test0'").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count should be 0 after Unset of pages for _id=0");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count should be 0 after Unset of pages for _id=0");
 
       result = collection.Modify("_id = 21").Unset("1address").Execute();
-      Assert.AreEqual(1, result.AffectedItemsCount, "Affected Items Count when modify unset(multiple docs) is used");
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1), "Affected Items Count when modify unset(multiple docs) is used");
     }
 
     [Test]
@@ -574,22 +574,22 @@ public void UnsetVariations()
 
       // Whitespace is ignored.
       ExecuteModifyStatement(collection.Modify("_id = 1").Unset("pages "));
-      Assert.False(collection.GetOne(1).values.ContainsKey("pages"));
+      Assert.That(collection.GetOne(1).values.ContainsKey("pages"), Is.False);
       ExecuteModifyStatement(collection.Modify("_id = 1").Unset(" pages2 "));
-      Assert.False(collection.GetOne(1).values.ContainsKey("pages2"));
+      Assert.That(collection.GetOne(1).values.ContainsKey("pages2"), Is.False);
       ExecuteModifyStatement(collection.Modify("_id = 1").Unset(" pages3"));
-      Assert.False(collection.GetOne(1).values.ContainsKey("pages3"));
+      Assert.That(collection.GetOne(1).values.ContainsKey("pages3"), Is.False);
       ExecuteModifyStatement(collection.Modify("_id = 1").Unset("  pages4.internalPages  "));
-      Assert.True(collection.GetOne(1).values.ContainsKey("pages4"));
-      Assert.False(collection.GetOne(1).values.ContainsKey("pages4.internalPages"));
+      Assert.That(collection.GetOne(1).values.ContainsKey("pages4"));
+      Assert.That(collection.GetOne(1).values.ContainsKey("pages4.internalPages"), Is.False);
 
       // Error is raised with incorrect document path.
       var ex = Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(collection.Modify("_id = 1").Unset("pages*")));
-      Assert.AreEqual("Invalid document path.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Invalid document path."));
       ex = Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(collection.Modify("_id = 1").Unset("pages!")));
-      Assert.AreEqual("Invalid document path.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Invalid document path."));
       ex = Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(collection.Modify("_id = 1").Unset("pages*data")));
-      Assert.AreEqual("Invalid document path.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Invalid document path."));
     }
 
     #region WL14389
@@ -612,43 +612,43 @@ public void CollectionModifyUnset()
       }
 
       var crudresult = col.Find("pages=10").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count should be 1 before Unset of pages for _id=0.");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count should be 1 before Unset of pages for _id=0.");
       var result = col.Modify("_id = 0").Unset("pages").Execute();
-      Assert.AreEqual(1, result.AffectedItemsCount, "Affected Items Count when modify unset is used");
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1), "Affected Items Count when modify unset is used");
       crudresult = col.Find("pages=10").Execute().FetchAll();
-      Assert.AreEqual(0, crudresult.Count, "Count should be 0 after Unset of pages for _id=0");
+      Assert.That(crudresult.Count, Is.EqualTo(0), "Count should be 0 after Unset of pages for _id=0");
       crudresult = col.Find("books='test0'").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count should be 0 after Unset of pages for _id=0");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count should be 0 after Unset of pages for _id=0");
 
       crudresult = col.Find("pages=11").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count of pages=11 should be 1 before Unset of pages for _id=1.");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count of pages=11 should be 1 before Unset of pages for _id=1.");
       crudresult = col.Find("reviewers='reviewers1'").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count of reviewers1 should be 1 before Unset of pages for _id=1.");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count of reviewers1 should be 1 before Unset of pages for _id=1.");
       result = col.Modify("_id = 1").Unset("pages").Unset("reviewers").Execute();
-      Assert.AreEqual(1, result.AffectedItemsCount, "Affected Items Count when modify multiple unset is used");
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1), "Affected Items Count when modify multiple unset is used");
       crudresult = col.Find("pages=11").Execute().FetchAll();
-      Assert.AreEqual(0, crudresult.Count, "Count should be 0 after Unset of pages for _id=1");
+      Assert.That(crudresult.Count, Is.EqualTo(0), "Count should be 0 after Unset of pages for _id=1");
       crudresult = col.Find("reviewers='reviewers1'").Execute().FetchAll();
-      Assert.AreEqual(0, crudresult.Count, "Count should be 0 after Unset of pages for _id=1");
+      Assert.That(crudresult.Count, Is.EqualTo(0), "Count should be 0 after Unset of pages for _id=1");
 
       crudresult = col.Find("pages=21").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count of pages=21 should be 1 before Unset of pages for _id=11.");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count of pages=21 should be 1 before Unset of pages for _id=11.");
       crudresult = col.Find("reviewers='reviewers11'").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count of reviewers11 should be 1 before Unset of pages for _id=11.");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count of reviewers11 should be 1 before Unset of pages for _id=11.");
       result = col.Modify("_id = 11").Unset(new string[] { "pages", "reviewers" }).Execute();
-      Assert.AreEqual(1, result.AffectedItemsCount, "Affected Items Count when modify unset(multiple docs) is used");
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1), "Affected Items Count when modify unset(multiple docs) is used");
       crudresult = col.Find("pages=21").Execute().FetchAll();
-      Assert.AreEqual(0, crudresult.Count, "Count should be 0 after Unset of pages for _id=11");
+      Assert.That(crudresult.Count, Is.EqualTo(0), "Count should be 0 after Unset of pages for _id=11");
       crudresult = col.Find("reviewers='reviewers11'").Execute().FetchAll();
-      Assert.AreEqual(0, crudresult.Count, "Count should be 0 after Unset of pages for _id=11");
+      Assert.That(crudresult.Count, Is.EqualTo(0), "Count should be 0 after Unset of pages for _id=11");
 
       crudresult = col.Find("pages=31").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count of pages=31 should be 1 before Unset of pages for _id=21.");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count of pages=31 should be 1 before Unset of pages for _id=21.");
       crudresult = col.Find("reviewers='reviewers21'").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count of reviewers21 should be 1 before Unset of pages for _id=21.");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count of reviewers21 should be 1 before Unset of pages for _id=21.");
 
       result = col.Modify("_id = 21").Unset(" pages ").Execute();
-      Assert.AreEqual(1, result.AffectedItemsCount, "Affected Items Count when modify unset(multiple docs) is used");
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1), "Affected Items Count when modify unset(multiple docs) is used");
       //Should have failed when unset is used for fields with special characters
       Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(col.Modify("_id = 22").Unset("pages*")));
       //Should have failed when unset is used for non-existent fields
@@ -659,41 +659,41 @@ public void CollectionModifyUnset()
       Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(col.Modify("_id = 21").Unset("*******")));
 
       crudresult = col.Find("pages=31").Execute().FetchAll();
-      Assert.AreEqual(0, crudresult.Count, "Count should be 0 after Unset of pages for _id=21");
+      Assert.That(crudresult.Count, Is.EqualTo(0), "Count should be 0 after Unset of pages for _id=21");
 
       result = col.Modify("_id = 12").Unset(new string[] { " pages1", "reviewers1" }).Execute();
-      Assert.AreEqual(0, result.AffectedItemsCount, "Affected Items Count when modify unset(invalid docs) is used");
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(0), "Affected Items Count when modify unset(invalid docs) is used");
       crudresult = col.Find("pages=22").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count should be 1 after Unset with invalid  of pages for _id=12");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count should be 1 after Unset with invalid  of pages for _id=12");
       crudresult = col.Find("reviewers='reviewers12'").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count should be 1 after Unset with invalid of pages for _id=12");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count should be 1 after Unset with invalid of pages for _id=12");
       //Testcase should have failed when unset is used with null
       Assert.Throws<MySqlException>(() => ExecuteModifyStatement(col.Modify("_id = 12").Unset(null)));
 
       crudresult = col.Find("pages=22").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count should be 1 after Unset with null  of pages for _id=12");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count should be 1 after Unset with null  of pages for _id=12");
       crudresult = col.Find("reviewers='reviewers12'").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count should be 1 after Unset with null of pages for _id=12");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count should be 1 after Unset with null of pages for _id=12");
 
       Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(col.Modify("_id = 12").Unset("")));
 
       crudresult = col.Find("pages=22").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count should be 1 after Unset with blank  of pages for _id=12");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count should be 1 after Unset with blank  of pages for _id=12");
       crudresult = col.Find("reviewers='reviewers12'").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count should be 1 after Unset with blank of pages for _id=12");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count should be 1 after Unset with blank of pages for _id=12");
 
       crudresult = col.Find("pages=22").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count should be 1 after Unset with blank with space  of pages for _id=12");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count should be 1 after Unset with blank with space  of pages for _id=12");
       crudresult = col.Find("reviewers='reviewers12'").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count, "Count should be 1 after Unset with blank with space  of pages for _id=12");
+      Assert.That(crudresult.Count, Is.EqualTo(1), "Count should be 1 after Unset with blank with space  of pages for _id=12");
 
       //Testcase should have failed when unset is used with blank and space
       Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(col.Modify("_id = 12").Unset(new string[] { "", " ", "pages" })));
 
       crudresult = col.Find("pages=22").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count);
+      Assert.That(crudresult.Count, Is.EqualTo(1));
       crudresult = col.Find("reviewers='reviewers12'").Execute().FetchAll();
-      Assert.AreEqual(1, crudresult.Count);
+      Assert.That(crudresult.Count, Is.EqualTo(1));
     }
 
     [Test, Description("All Bug Fixes")]
@@ -703,40 +703,40 @@ public void ValidateValuesAfterAppendAndInserts()
       Collection collection = CreateCollection("test");
       Result r = collection.Add("{ \"_id\": \"123\", \"email\": [\"alice@ora.com\"], " +
           "\"dates\": \"4/1/2017\" }").Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       collection.Modify("true").ArrayAppend("dates", "5/1/2018").Execute();
       document = collection.GetOne("123");
       object[] dates = document["dates"] as object[];
-      Assert.AreEqual(2, dates.Length);
-      Assert.AreEqual("4/1/2017", dates[0], "Existing Date");
-      Assert.AreEqual("5/1/2018", dates[1], "Appended Date");
+      Assert.That(dates.Length, Is.EqualTo(2));
+      Assert.That(dates[0], Is.EqualTo("4/1/2017"), "Existing Date");
+      Assert.That(dates[1], Is.EqualTo("5/1/2018"), "Appended Date");
       collection.Modify("true").ArrayInsert("dates[0]", "5/1/2059").Execute();
       document = collection.GetOne("123");
       dates = document["dates"] as object[];
-      Assert.AreEqual("5/1/2059", dates[0], "Inserted  Date");
+      Assert.That(dates[0], Is.EqualTo("5/1/2059"), "Inserted  Date");
 
       collection = CreateCollection("test");
       r = collection.Add("{ \"_id\": \"123\", \"email\": [\"alice@ora.com\"], " +
          "\"dates\": [\"4/1/2017\"] }").Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       collection = CreateCollection("test");
       r = collection.Add("{ \"_id\": \"123\", \"email\": [\"alice@ora.com\"], " +
           "\"dates\": \"4/1/2017\" }").Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       collection.Modify("true").ArrayAppend("dates", "1").Execute();
       collection.Modify("true").ArrayAppend("dates", 1).Execute();
       collection.Modify("true").ArrayAppend("dates", "3.1").Execute();
       collection.Modify("true").ArrayAppend("dates", 3.1).Execute();
       document = collection.GetOne("123");
       dates = document["dates"] as object[];
-      Assert.AreEqual(5, dates.Length);
-      Assert.AreEqual("4/1/2017", dates[0], "Existing Date");
-      Assert.AreEqual("1", dates[1], "Appended Date");
-      Assert.AreEqual(1, dates[2], "Appended Date");
-      Assert.AreEqual("3.1", dates[3], "Appended Date");
-      Assert.AreEqual(3.1, dates[4], "Appended Date");
+      Assert.That(dates.Length, Is.EqualTo(5));
+      Assert.That(dates[0], Is.EqualTo("4/1/2017"), "Existing Date");
+      Assert.That(dates[1], Is.EqualTo("1"), "Appended Date");
+      Assert.That(dates[2], Is.EqualTo(1), "Appended Date");
+      Assert.That(dates[3], Is.EqualTo("3.1"), "Appended Date");
+      Assert.That(dates[4], Is.EqualTo(3.1), "Appended Date");
 
       collection.Modify("true").ArrayInsert("dates[0]", "10").Execute();
       collection.Modify("true").ArrayInsert("dates[0]", 1000).Execute();
@@ -744,10 +744,10 @@ public void ValidateValuesAfterAppendAndInserts()
       collection.Modify("true").ArrayInsert("dates[0]", 22.7).Execute();
       document = collection.GetOne("123");
       dates = document["dates"] as object[];
-      Assert.AreEqual("10", dates[3], "Inserted Date");
-      Assert.AreEqual(1000, dates[2], "Inserted Date");
-      Assert.AreEqual("3.1", dates[1], "Inserted Date");
-      Assert.AreEqual(22.7, dates[0], "Inserted Date");
+      Assert.That(dates[3], Is.EqualTo("10"), "Inserted Date");
+      Assert.That(dates[2], Is.EqualTo(1000), "Inserted Date");
+      Assert.That(dates[1], Is.EqualTo("3.1"), "Inserted Date");
+      Assert.That(dates[0], Is.EqualTo(22.7), "Inserted Date");
 
       var d1 = new DbDoc();
       for (int i = 0; i < 30; i++)
@@ -774,9 +774,9 @@ public void ValidateValuesAfterAppendAndInserts()
         new {  _id = 400, title = "Book 4", pages = 50 },
       };
       r = collection.Add(docs).Execute();
-      Assert.AreEqual(4, r.AffectedItemsCount, "Matching the records affected");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4), "Matching the records affected");
       var test1 = collection.Find("pages = :Pages").Bind("pAges", 90).Fields("{\"_id\":100,\"pages\": 20 }").Execute();
-      Assert.IsNotNull(test1);
+      Assert.That(test1, Is.Not.Null);
     }
 
     [Test, Description("Collection.modify(condition).arrayAppend(CollectionField, ExprOrLiteral)")]
@@ -788,7 +788,7 @@ public void CollectionModifyArrayAppend()
       string t1 = "{\"_id\": \"1\", \"name\": \"Alice\" }";
       var collection = CreateCollection("test");
       Result r = collection.Add(t1).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       object[] expressions1 = new object[] { "YEAR('2000-01-01')", "MONTH('2008-02-03')", "WEEK('2008-02-20')", "DAY('2008-02-20')", "HOUR('10:05:03')",
                 "MINUTE('2008-02-03 10:05:03')","SECOND('10:05:03')","MICROSECOND('12:00:00.123456')","QUARTER('2008-04-01')","TIME('2003-12-31 01:02:03')","DATE('2003-12-31 01:02:03')",
                 "Year(CURDATE())"};
@@ -817,7 +817,7 @@ public void CollectionModifyArrayAppend()
         actors = document["name"] as object[];
         actor0 = actors[l] as Dictionary<string, object>;
         test = actor0["dateAndTimeValue"];
-        Assert.AreEqual(compare_expressions1[k].ToString(), test.ToString());
+        Assert.That(test.ToString(), Is.EqualTo(compare_expressions1[k].ToString()));
         l++;
       }
       for (int k = 0; k < compare_expressions2.Length; k++)
@@ -827,14 +827,14 @@ public void CollectionModifyArrayAppend()
         actors = document["name"] as object[];
         actor0 = actors[l] as Dictionary<string, object>;
         test = actor0["dateAndTimeValue"];
-        Assert.AreEqual(compare_expressions2[k].ToString(), test.ToString());
+        Assert.That(test.ToString(), Is.EqualTo(compare_expressions2[k].ToString()));
         l++;
       }
 
       collection = CreateCollection("test");
       r = collection.Add("{ \"_id\": \"123\", \"email\": [\"alice@ora.com\"], " +
          "\"dates\": [\"4/1/2017\"] }").Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       var reg_expression = new
       {
         test1 = new MySqlExpression("UPPER($.email)"),
@@ -885,7 +885,7 @@ public void CollectionModifyArrayAppend()
         { }
         else
         {
-          Assert.AreEqual(actors[m], compare_expressions[n]);
+          Assert.That(compare_expressions[n], Is.EqualTo(actors[m]));
         }
 
         m++; n++;
@@ -914,11 +914,11 @@ public void CollectionModifyArrayAppend()
 
       collection.Add(json).Execute();
       r = collection.Modify("true").ArrayAppend("ARR10", 1).ArrayAppend("ARR20", 2).ArrayAppend("ARR30", 3).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Modify("true").ArrayAppend("ARR0", null).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Modify("true").ArrayAppend("ARR39", null).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
     }
 
@@ -935,7 +935,7 @@ public void ForbidModifyWithNoCondition_S1()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result result = collection.Add(docs).Execute();
-      Assert.AreEqual(4, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(4));
 
       // Condition can't be null or empty.
       Assert.Throws<ArgumentNullException>(() => ExecuteModifyStatement(collection.Modify(string.Empty)));
@@ -944,7 +944,7 @@ public void ForbidModifyWithNoCondition_S1()
 
       // Sending an expression that evaluates to true applies changes on all documents.
       result = collection.Modify("true").Set("pages", "10").Execute();
-      Assert.AreEqual(4, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(4));
 
     }
 
@@ -961,19 +961,19 @@ public void ForbidModifyWithNoCondition_S2()
         new {  _id = 4, title = "Book 4", pages = 50 },
       };
       Result result = collection.Add(docs).Execute();
-      Assert.AreEqual(4, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(4));
 
       // Sending an expression that evaluates to true applies changes on all documents.
       //Deprecated Modify().Where() in 8.0.17
       result = collection.Modify("true").Where("false").Set("pages", "10").Execute();
-      Assert.AreEqual(0, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(0));
 
       result = collection.Modify("true").Where("true").Set("pages", "10").Execute();
-      Assert.AreEqual(4, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(4));
       result = collection.Modify("false").Where("true").Set("pages", "40").Execute();
-      Assert.AreEqual(4, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(4));
       result = collection.Modify("false").Where("false").Set("pages", "40").Execute();
-      Assert.AreEqual(0, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(0));
 
       // Condition can't be null or empty.
       Assert.Throws<ArgumentNullException>(() => ExecuteModifyStatement(collection.Modify(" ")));
@@ -1006,7 +1006,7 @@ public void ModifyPatchNDepth()
 
       var r = collection.Modify("age = :age").Patch(json).
           Bind("age", "18").Execute();
-      Assert.IsNotNull(r);
+      Assert.That(r, Is.Not.Null);
     }
 
     [Test, Description("Test valid modify.patch with condition/limit/OrderBy")]
@@ -1022,25 +1022,25 @@ public void ModifyPatch()
         new {_id = 4, title = "Book 4", pages = 50,age = 15}
       };
       var r = collection.Add(docs).Execute();
-      Assert.AreEqual(4, (int)r.AffectedItemsCount, "Matching the updated record count");
+      Assert.That((int)r.AffectedItemsCount, Is.EqualTo(4), "Matching the updated record count");
 
       var jsonParams = new { title = "Book 100" };
       var foundDocs = collection.Modify("age==18").Patch(jsonParams).Execute();
-      Assert.AreEqual(1, (int)foundDocs.AffectedItemsCount, "Matching the record count");
+      Assert.That((int)foundDocs.AffectedItemsCount, Is.EqualTo(1), "Matching the record count");
 
       var document = collection.GetOne("2");
-      Assert.AreEqual("Book 100", document["title"]);
+      Assert.That(document["title"], Is.EqualTo("Book 100"));
 
       jsonParams = new { title = "Book 300" };
       r = collection.Modify("age<18").Patch(jsonParams).Limit(1).Execute();
-      Assert.AreEqual(1, (int)r.AffectedItemsCount, "Matching the record count");
+      Assert.That((int)r.AffectedItemsCount, Is.EqualTo(1), "Matching the record count");
 
       document = collection.GetOne(1);
-      Assert.AreEqual("Book 300", document["title"]);
+      Assert.That(document["title"], Is.EqualTo("Book 300"));
 
       var jsonParams1 = new { title = "Book 10", pages = 1000 };
       r = collection.Modify("age>30").Patch(jsonParams1).Sort("age ASC").Execute();
-      Assert.AreEqual(1, (int)r.AffectedItemsCount, "Matching the record count");
+      Assert.That((int)r.AffectedItemsCount, Is.EqualTo(1), "Matching the record count");
     }
 
     [Test, Description("Test valid modify.patch with set/unset")]
@@ -1056,25 +1056,25 @@ public void ModifyPatchWithSetUnset()
         new {_id = 4, title = "Book 4", pages = 50,age = "12"}
       };
       Result r = collection.Add(docs).Execute();
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       var jsonParams = new { title = "Book 500" };
       r = collection.Modify("age = :age").Patch(jsonParams).Bind("age", "18").
           Set("pages", "5000").Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       var document = collection.GetOne("2");
-      Assert.AreEqual("5000", document["pages"].ToString());
-      Assert.AreEqual("Book 500", document["title"].ToString());
+      Assert.That(document["pages"].ToString(), Is.EqualTo("5000"));
+      Assert.That(document["title"].ToString(), Is.EqualTo("Book 500"));
 
       var jsonParams1 = new { title = "Book 50000", pages = 5000 };
       r = collection.Modify("age = :age").Patch(jsonParams1).Bind("age", "18").
           Unset("pages").Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount, "Match being done");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1), "Match being done");
       document = collection.GetOne("2");
       DbDoc test = null;
       Assert.Throws<InvalidOperationException>(() => test = (DbDoc)document["pages"]);
-      Assert.AreEqual("Book 50000", document["title"]);
+      Assert.That(document["title"], Is.EqualTo("Book 50000"));
     }
 
     [Test, Description("Test invalid modify.patch to attempt to change _id using modify.patch")]
@@ -1090,29 +1090,29 @@ public void ModifyPatchChangeId()
         new {_id = 4, title = "Book 4", pages = 50,age = 12}
       };
       Result r = collection.Add(docs).Execute();
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
       var document = collection.GetOne("1");
       var jsonParams = new { _id = 123 };
 
       r = collection.Modify("age = :age").Patch(jsonParams).
           Bind("age", 18).Execute();
-      Assert.AreEqual(0, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(0));
 
       var jsonParams2 = new { _id = 123, title = "Book 4000" };
 
       r = collection.Modify("age = :age").Patch(jsonParams2).
           Bind("age", 18).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       string jsonParams1 = "{ \"_id\": \"123\"}";
       r = collection.Modify("age = :age").Patch(jsonParams1).
           Bind("age", 18).Execute();
-      Assert.AreEqual(0, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(0));
 
       jsonParams1 = "{ \"_id\": \"123\",\"title\": \"Book 400\"}";
       r = collection.Modify("age = :age").Patch(jsonParams1).
           Bind("age", 18).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
     }
 
     [Test, Description("Test modify.patch where the key to be modified has array, dbDoc and normal constant value and condition is matched for all.")]
@@ -1130,14 +1130,14 @@ public void ModifyPatchKeyWithArray()
 
       var docs3 = "{\"_id\": \"3\", \"age\": 12,\"name\":[\"Cynthia\"], \"ARR1\":[\"name1\",\"name2\", \"name3\"]}";
       Result r = collection.Add(docs1).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Add(docs2).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Add(docs3).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       var jsonParams = new { name = "Changed" };
       r = collection.Modify("age = :age").Patch(jsonParams).Bind("age", 12).Execute();
-      Assert.AreEqual(3, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(3));
     }
 
     [Test, Description("Test that documents not matching conditions are not modified.")]
@@ -1153,17 +1153,17 @@ public void ModifyPatchNotMatchingConditions()
         new {_id = 4, title = "Book 4", pages = 50,age = 12}
       };
       Result r = collection.Add(docs).Execute();
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
       var document = collection.GetOne("1");
       var jsonParams = new { title = "Book 100" };
       r = collection.Modify("age = :age").Patch(jsonParams).Bind("age", "19").Execute();
-      Assert.AreEqual(0, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(0));
       string jsonParams1 = "{ \"title\": \"Book 100\"}";
       r = collection.Modify("age = :age").Patch(jsonParams1).Bind("age", "28").Execute();
-      Assert.AreEqual(0, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(0));
       jsonParams1 = "{ \"unknownvalues\": null}";
       r = collection.Modify("age = :age").Patch(jsonParams1).Bind("age", "28").Execute();
-      Assert.AreEqual(0, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(0));
     }
 
     [Test, Description("Test modify.patch with different types of records(anonymous object,Json String,DbDoc) with same key and try to replace using a patch")]
@@ -1186,15 +1186,15 @@ public void ModifyPatchDifferentTypesSameKey()
                           ]
                       }");
       Result r = collection.Add(docs1).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Add(docs2).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Add(docs3).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       var jsonParams = new { name = "Changed" };
       r = collection.Modify("age = :age").Patch(jsonParams).
               Bind("age", 12).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);//docs2 age is the string
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));//docs2 age is the string
     }
 
     [Test, Description("GetOne with ExistingID and NewID with doc(Verify the Immutable feature also))")]
@@ -1210,7 +1210,7 @@ public void GetOneAndRemoveOne()
         new {_id = 4, title = "Book 4", pages = 50}
       };
       var r = coll.Add(docs).Execute();
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       // Expected exceptions.
       Assert.Throws<ArgumentNullException>(() => coll.GetOne(null));
@@ -1220,39 +1220,39 @@ public void GetOneAndRemoveOne()
 
       // Get document using numeric parameter.
       var document = coll.GetOne(1);
-      Assert.AreEqual(1, document.Id);
-      Assert.AreEqual("Book 1", document["title"]);
-      Assert.AreEqual(20, Convert.ToInt32(document["pages"]));
+      Assert.That(document.Id, Is.EqualTo(1));
+      Assert.That(document["title"], Is.EqualTo("Book 1"));
+      Assert.That(Convert.ToInt32(document["pages"]), Is.EqualTo(20));
 
       // Get document using string parameter.
       document = coll.GetOne("3");
-      Assert.AreEqual(3, document.Id);
-      Assert.AreEqual("Book 3", document["title"]);
-      Assert.AreEqual(40, Convert.ToInt32(document["pages"]));
+      Assert.That(document.Id, Is.EqualTo(3));
+      Assert.That(document["title"], Is.EqualTo("Book 3"));
+      Assert.That(Convert.ToInt32(document["pages"]), Is.EqualTo(40));
 
       // Get a non-existing document.
       document = coll.GetOne(5);
-      Assert.AreEqual(null, document);
+      Assert.That(document, Is.EqualTo(null));
 
       coll.Add(new { _id = 5, title = "Book 5", pages = 60 }).Execute();
-      Assert.AreEqual(5, coll.Find().Execute().FetchAll().Count);
+      Assert.That(coll.Find().Execute().FetchAll().Count, Is.EqualTo(5));
       // Remove sending numeric parameter.
       //WL11843-Core API v1 alignment Changes
-      Assert.AreEqual(1, coll.RemoveOne(1).AffectedItemsCount);
-      Assert.AreEqual(4, coll.Find().Execute().FetchAll().Count);
+      Assert.That(coll.RemoveOne(1).AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(coll.Find().Execute().FetchAll().Count, Is.EqualTo(4));
 
       // Remove sending string parameter.
-      Assert.AreEqual(1, coll.RemoveOne("3").AffectedItemsCount);
-      Assert.AreEqual(3, coll.Find().Execute().FetchAll().Count);
+      Assert.That(coll.RemoveOne("3").AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(coll.Find().Execute().FetchAll().Count, Is.EqualTo(3));
 
       // Remove an auto-generated id.
       document = coll.Find("pages = 60").Execute().FetchOne();
-      Assert.AreEqual(1, coll.RemoveOne(document.Id).AffectedItemsCount);
-      Assert.AreEqual(2, coll.Find().Execute().FetchAll().Count);
+      Assert.That(coll.RemoveOne(document.Id).AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(coll.Find().Execute().FetchAll().Count, Is.EqualTo(2));
 
       // Remove a non-existing document.
-      Assert.AreEqual(0, coll.RemoveOne(5).AffectedItemsCount);
-      Assert.AreEqual(2, coll.Find().Execute().FetchAll().Count);
+      Assert.That(coll.RemoveOne(5).AffectedItemsCount, Is.EqualTo(0));
+      Assert.That(coll.Find().Execute().FetchAll().Count, Is.EqualTo(2));
 
     }
 
@@ -1267,7 +1267,7 @@ public void AddReplaceOneUniqueId()
         new {_id = 2, name = "bar"}
       };
       var result = collection.Add(docs).Execute();
-      Assert.AreEqual(2, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(2));
 
       // Add unique index.
       session.SQL(
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CustomTypeTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CustomTypeTests.cs
index ba9a17c37..90cc1ee73 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CustomTypeTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CustomTypeTests.cs
@@ -86,7 +86,7 @@ private void InitCollection()
       Collection.Add(Data).Execute();
 
       var count = session.SQL("SELECT COUNT(*) FROM test.test").Execute().FetchOne()[0];
-      Assert.AreEqual(count, Collection.Count());
+      Assert.That(Collection.Count(), Is.EqualTo(count));
     }
 
     [Test]
@@ -95,9 +95,9 @@ public void Find()
       InitCollection();
 
       var result = Collection.Find("_id = :id").Bind("id", 1).Execute().FetchOne();
-      Assert.NotNull(result);
-      Assert.True(typeof(CustomType).Equals(result.GetType()));
-      Assert.AreEqual(result.DictData["DictData1_1"].Meta, Data[1].DictData["DictData1_1"].Meta);
+      Assert.That(result, Is.Not.Null);
+      Assert.That(typeof(CustomType).Equals(result.GetType()));
+      Assert.That(Data[1].DictData["DictData1_1"].Meta, Is.EqualTo(result.DictData["DictData1_1"].Meta));
     }
 
     [Test]
@@ -106,8 +106,8 @@ public void RemoveOne()
       InitCollection();
 
       var removeStmt = Collection.RemoveOne(1);
-      Assert.AreEqual(1, removeStmt.AffectedItemsCount);
-      Assert.AreEqual(19, Collection.Count());
+      Assert.That(removeStmt.AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(Collection.Count(), Is.EqualTo(19));
     }
 
     [TestCase("_id = :id","id",3)]
@@ -117,8 +117,8 @@ public void Remove(string condition, string bind,object value)
       InitCollection();
 
       var removeStmt = Collection.Remove(condition).Bind(bind,value).Execute();
-      Assert.AreEqual(1, removeStmt.AffectedItemsCount);
-      Assert.AreEqual(19, Collection.Count());
+      Assert.That(removeStmt.AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(Collection.Count(), Is.EqualTo(19));
     }
 
     [Test]
@@ -128,8 +128,8 @@ public void Modify()
 
       CustomType customTypeNew = new() { Date = DateTime.Now, Name = "NewDoc" };
       var modifyStmt = Collection.Modify("_id = :id").Bind("id", 7).Patch(customTypeNew).Execute();
-      Assert.AreEqual(1, modifyStmt.AffectedItemsCount);
-      Assert.AreEqual("NewDoc", Collection.GetOne(7).Name);
+      Assert.That(modifyStmt.AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(Collection.GetOne(7).Name, Is.EqualTo("NewDoc"));
     }
 
     [Test]
@@ -139,14 +139,14 @@ public void PrepareStatement()
 
       var findStmt = Collection.Find("_id = :id and Name = :name").Bind("id", 15).Bind("name", "Name_15");
       var doc = findStmt.Execute();
-      Assert.AreEqual("Name_15", doc.FetchOne().Name);
-      Assert.False(findStmt._isPrepared);
+      Assert.That(doc.FetchOne().Name, Is.EqualTo("Name_15"));
+      Assert.That(findStmt._isPrepared, Is.False);
 
       for (int i = 0; i < Data.Length; i++)
       {
         doc = findStmt.Bind("id", i).Bind("name", $"Name_{i}").Limit(1).Execute();
-        Assert.AreEqual($"Name_{i}", doc.FetchOne().Name);
-        Assert.True(findStmt._isPrepared || !findStmt.Session.SupportsPreparedStatements);
+        Assert.That(doc.FetchOne().Name, Is.EqualTo($"Name_{i}"));
+        Assert.That(findStmt._isPrepared || !findStmt.Session.SupportsPreparedStatements);
       }
     }
 
@@ -182,7 +182,7 @@ public void InsertAsync()
       Task.WaitAll(tasksList.ToArray(), TimeSpan.FromMinutes(1));
 
       var count = session.SQL("SELECT COUNT(*) FROM test.test").Execute().FetchOne()[0];
-      Assert.AreEqual(count, Collection.Count());
+      Assert.That(Collection.Count(), Is.EqualTo(count));
     }
   }
 }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs
index e2acbd9fa..27f54b1d7 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs
@@ -51,7 +51,7 @@ public void SimpleConverstionToJson()
   ""_id"": 1, 
   ""pages"": 20
 }";
-      StringAssert.AreEqualIgnoringCase(RemoveLineEndings(json), RemoveLineEndings(s));
+      Assert.That(RemoveLineEndings(s), Is.EqualTo(RemoveLineEndings(json)).IgnoreCase);
     }
 
     [Test]
@@ -61,7 +61,7 @@ public void SimpleParse()
       DbDoc d2 = new DbDoc();
       d2.SetValue("id", 1);
       d2.SetValue("pages", 20);
-      Assert.True(d.Equals(d2));
+      Assert.That(d.Equals(d2));
     }
 
     [Test]
@@ -74,7 +74,7 @@ public void NestedParse()
       d2.SetValue("id", 1);
       d2.SetValue("pages", 20);
       d2.SetValue("person", new { name = "Fred", age = 45 });
-      Assert.True(d.Equals(d2));
+      Assert.That(d.Equals(d2));
     }
 
     [Test]
@@ -112,8 +112,8 @@ public void ParseWithArray()
       d2.SetValue("id", 1);
       d2.SetValue("pages", 20);
       d2.SetValue("books", docs);
-      StringAssert.AreEqualIgnoringCase(d.ToString(), d2.ToString());
-      StringAssert.AreEqualIgnoringCase(RemoveLineEndings(json), RemoveLineEndings(d2.ToString()));
+      Assert.That(d2.ToString(), Is.EqualTo(d.ToString()).IgnoreCase);
+      Assert.That(RemoveLineEndings(d2.ToString()), Is.EqualTo(RemoveLineEndings(json)).IgnoreCase);
     }
 
     [Test]
@@ -123,7 +123,7 @@ public void ParseLongValues()
       DbDoc d2 = new DbDoc();
       d2.SetValue("id", 1);
       d2.SetValue("pages", (long)int.MaxValue + 1);
-      Assert.True(d.Equals(d2));
+      Assert.That(d.Equals(d2));
     }
 
     [Test]
@@ -133,7 +133,7 @@ public void ParseFloatValues()
       DbDoc d2 = new DbDoc();
       d2.SetValue("id", 1);
       d2.SetValue("pi", 3.14159);
-      Assert.True(d.Equals(d2));
+      Assert.That(d.Equals(d2));
     }
   }
 }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs
index 301471910..ff82ee248 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs
@@ -50,7 +50,7 @@ public void DnsSrvConnectionStringInvalidConfiguration(string connString, string
     {
       connString = connString.Replace("localhost", Host).Replace("33060", XPort);
       var exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connString));
-      Assert.AreEqual(exceptionMessage, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(exceptionMessage));
     }
 
     [TestCase("server=localhost;port=33060;dns-srv=false;uid=test;password=test;")]
@@ -62,7 +62,7 @@ public void DnsSrvConnectionStringValidConfiguration(string connString)
     {
       connString = connString.Replace("localhost", Host).Replace("33060", XPort);
       using (var session = MySQLX.GetSession(connString))
-        Assert.NotNull(session);
+        Assert.That(session, Is.Not.Null);
     }
 
     [Test]
@@ -73,35 +73,35 @@ public void DnsSrvConnectionAnonymousTypeInvalidConfiguration()
       sb.Port = UInt32.Parse(XPort);
       sb.Server = Host;
       var exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(sb.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.DnsSrvInvalidConnOptionPort, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.DnsSrvInvalidConnOptionPort));
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetClient(sb.ConnectionString, new { pooling = new { enabled = true } }));
-      Assert.AreEqual(MySql.Data.Resources.DnsSrvInvalidConnOptionPort, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.DnsSrvInvalidConnOptionPort));
 
       sb = new MySqlXConnectionStringBuilder();
       sb.DnsSrv = true;
       sb.Server = $"{Host}, 10.10.10.10";
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(sb.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.DnsSrvInvalidConnOptionMultihost, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.DnsSrvInvalidConnOptionMultihost));
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetClient(sb.ConnectionString, new { pooling = new { enabled = true } }));
-      Assert.AreEqual(MySql.Data.Resources.DnsSrvInvalidConnOptionMultihost, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.DnsSrvInvalidConnOptionMultihost));
 
       sb = new MySqlXConnectionStringBuilder();
       sb.DnsSrv = true;
       sb.Server = $"(address={Host},priority=100), (address=10.10.10.10,priority=90)";
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(sb.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.DnsSrvInvalidConnOptionMultihost, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.DnsSrvInvalidConnOptionMultihost));
 
       var connDataHost = new { server = $"(address={Host},priority=100), (address=10.10.10.10,priority=90)", dnssrv = true };
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetClient(connDataHost, new { pooling = new { enabled = true } }));
-      Assert.AreEqual(MySql.Data.Resources.DnsSrvInvalidConnOptionMultihost, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.DnsSrvInvalidConnOptionMultihost));
 
       var connDataPort = new { server = Host, port = XPort, dnssrv = true };
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetClient(connDataPort, new { pooling = new { enabled = true } }));
-      Assert.AreEqual(MySql.Data.Resources.DnsSrvInvalidConnOptionPort, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.DnsSrvInvalidConnOptionPort));
 
       var connDataUnix = new { server = Host, protocol = "unix", dnssrv = true };
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetClient(connDataUnix, new { pooling = new { enabled = true } }));
-      Assert.AreEqual(MySql.Data.Resources.DnsSrvInvalidConnOptionUnixSocket, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.DnsSrvInvalidConnOptionUnixSocket));
     }
 
     [TestCase("mysqlx+srv://test:test@localhost:33060", "Specifying a port number with DNS SRV lookup is not permitted.")]
@@ -114,10 +114,10 @@ public void DnsSrvConnectionStringUriInvalidConfiguration(string connStringUri,
     {
       connStringUri = connStringUri.Replace("localhost", Host).Replace("33060", XPort);
       var exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connStringUri));
-      Assert.AreEqual(exceptionMessage, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(exceptionMessage));
 
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetClient(connStringUri, new { pooling = new { enabled = true } }));
-      Assert.AreEqual(exceptionMessage, exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(exceptionMessage));
     }
 
     [TestCase("mysqlx+srv://test:test@localhost")]
@@ -129,7 +129,7 @@ public void DnsResolverNoHosts(string connString)
     {
       connString = connString.Replace("localhost", Host);
       var ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession(connString));
-      Assert.AreEqual(string.Format(MySql.Data.Resources.DnsSrvNoHostsAvailable, Host), ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(string.Format(MySql.Data.Resources.DnsSrvNoHostsAvailable, Host)));
     }
 
     [Test]
@@ -138,7 +138,7 @@ public void DnsResolverNoHostsPooling()
       using (var client = MySQLX.GetClient($"mysqlx+srv://test:test@{Host}?dns-srv=true;", new { pooling = new { enabled = true } }))
       {
         var ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.AreEqual(string.Format(MySql.Data.Resources.DnsSrvNoHostsAvailable, Host), ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(string.Format(MySql.Data.Resources.DnsSrvNoHostsAvailable, Host)));
       }
     }
   }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ExprParserTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ExprParserTests.cs
index 89426bba8..d31c6bfcc 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ExprParserTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ExprParserTests.cs
@@ -98,12 +98,12 @@ private void CheckParseRoundTrip(string input, string expected)
       }
       Expr expr = new ExprParser(input).Parse();
       string canonicalized = ExprUnparser.ExprToString(expr);
-      Assert.AreEqual(expected, canonicalized);
+      Assert.That(canonicalized, Is.EqualTo(expected));
 
       // System.err.println("Canonicalized: " + canonicalized);
       Expr expr2 = new ExprParser(canonicalized).Parse();
       string recanonicalized = ExprUnparser.ExprToString(expr2);
-      Assert.AreEqual(expected, recanonicalized);
+      Assert.That(recanonicalized, Is.EqualTo(expected));
     }
 
     /**
@@ -210,104 +210,104 @@ public void TestRoundTrips()
     public void TestExprTree()
     {
       Expr expr = new ExprParser("a like 'xyz' and $.count > 10 + 1").Parse();
-      Assert.AreEqual(Expr.Types.Type.Operator, expr.Type);
-      Assert.AreEqual("&&", expr.Operator.Name);
-      Assert.AreEqual(2, expr.Operator.Param.Count);
+      Assert.That(expr.Type, Is.EqualTo(Expr.Types.Type.Operator));
+      Assert.That(expr.Operator.Name, Is.EqualTo("&&"));
+      Assert.That(expr.Operator.Param.Count, Is.EqualTo(2));
 
       // check left side of AND: (a like 'xyz')
       Expr andLeft = expr.Operator.Param[0];
-      Assert.AreEqual(Expr.Types.Type.Operator, andLeft.Type);
-      Assert.AreEqual("like", andLeft.Operator.Name);
-      Assert.AreEqual(2, andLeft.Operator.Param.Count);
+      Assert.That(andLeft.Type, Is.EqualTo(Expr.Types.Type.Operator));
+      Assert.That(andLeft.Operator.Name, Is.EqualTo("like"));
+      Assert.That(andLeft.Operator.Param.Count, Is.EqualTo(2));
       Expr identA = andLeft.Operator.Param[0];
-      Assert.AreEqual(Expr.Types.Type.Ident, identA.Type);
-      Assert.AreEqual("a", identA.Identifier.Name);
+      Assert.That(identA.Type, Is.EqualTo(Expr.Types.Type.Ident));
+      Assert.That(identA.Identifier.Name, Is.EqualTo("a"));
       Expr literalXyz = andLeft.Operator.Param[1];
-      Assert.AreEqual(Expr.Types.Type.Literal, literalXyz.Type);
+      Assert.That(literalXyz.Type, Is.EqualTo(Expr.Types.Type.Literal));
       Scalar scalarXyz = literalXyz.Literal;
-      Assert.AreEqual(Scalar.Types.Type.VString, scalarXyz.Type);
-      Assert.AreEqual("xyz", scalarXyz.VString.Value.ToStringUtf8());
+      Assert.That(scalarXyz.Type, Is.EqualTo(Scalar.Types.Type.VString));
+      Assert.That(scalarXyz.VString.Value.ToStringUtf8(), Is.EqualTo("xyz"));
 
       // check right side of AND: ($.count > 10 + 1)
       Expr andRight = expr.Operator.Param[1];
-      Assert.AreEqual(Expr.Types.Type.Operator, andRight.Type);
-      Assert.AreEqual(">", andRight.Operator.Name);
-      Assert.AreEqual(2, andRight.Operator.Param.Count);
+      Assert.That(andRight.Type, Is.EqualTo(Expr.Types.Type.Operator));
+      Assert.That(andRight.Operator.Name, Is.EqualTo(">"));
+      Assert.That(andRight.Operator.Param.Count, Is.EqualTo(2));
       Expr countDocPath = andRight.Operator.Param[0];
-      Assert.AreEqual(Expr.Types.Type.Ident, countDocPath.Type);
+      Assert.That(countDocPath.Type, Is.EqualTo(Expr.Types.Type.Ident));
       ColumnIdentifier countId = countDocPath.Identifier;
-      Assert.AreEqual(string.Empty, countId.Name);
-      Assert.AreEqual(string.Empty, countId.TableName);
-      Assert.AreEqual(string.Empty, countId.SchemaName);
+      Assert.That(countId.Name, Is.EqualTo(string.Empty));
+      Assert.That(countId.TableName, Is.EqualTo(string.Empty));
+      Assert.That(countId.SchemaName, Is.EqualTo(string.Empty));
       Assert.That(countId.DocumentPath.Count==1);
-      Assert.AreEqual(DocumentPathItem.Types.Type.Member, countId.DocumentPath[0].Type);
-      Assert.AreEqual("count", countId.DocumentPath[0].Value);
+      Assert.That(countId.DocumentPath[0].Type, Is.EqualTo(DocumentPathItem.Types.Type.Member));
+      Assert.That(countId.DocumentPath[0].Value, Is.EqualTo("count"));
       Expr addition = andRight.Operator.Param[1];
       Scalar addLeftScalar = addition.Operator.Param[0].Literal;
       Scalar addRightScalar = addition.Operator.Param[1].Literal;
-      Assert.AreEqual(Expr.Types.Type.Operator, addition.Type);
-      Assert.AreEqual("+", addition.Operator.Name);
-      Assert.AreEqual(2, addition.Operator.Param.Count);
-      Assert.AreEqual(Expr.Types.Type.Literal, addition.Operator.Param[0].Type);
-      Assert.AreEqual(Expr.Types.Type.Literal, addition.Operator.Param[1].Type);
-      Assert.AreEqual(Scalar.Types.Type.VSint, addLeftScalar.Type);
-      Assert.AreEqual(Scalar.Types.Type.VSint, addRightScalar.Type);
-      Assert.AreEqual(10, addLeftScalar.VSignedInt);
-      Assert.AreEqual(1, addRightScalar.VSignedInt);
+      Assert.That(addition.Type, Is.EqualTo(Expr.Types.Type.Operator));
+      Assert.That(addition.Operator.Name, Is.EqualTo("+"));
+      Assert.That(addition.Operator.Param.Count, Is.EqualTo(2));
+      Assert.That(addition.Operator.Param[0].Type, Is.EqualTo(Expr.Types.Type.Literal));
+      Assert.That(addition.Operator.Param[1].Type, Is.EqualTo(Expr.Types.Type.Literal));
+      Assert.That(addLeftScalar.Type, Is.EqualTo(Scalar.Types.Type.VSint));
+      Assert.That(addRightScalar.Type, Is.EqualTo(Scalar.Types.Type.VSint));
+      Assert.That(addLeftScalar.VSignedInt, Is.EqualTo(10));
+      Assert.That(addRightScalar.VSignedInt, Is.EqualTo(1));
     }
 
     [Test]
     public void TestOrderByParserBasic()
     {
       List<Order> orderSpec = new ExprParser("a, b desc").ParseOrderSpec();
-      Assert.AreEqual(2, orderSpec.Count);
+      Assert.That(orderSpec.Count, Is.EqualTo(2));
       Order o1 = orderSpec[0];
-      Assert.False(o1.HasDirection);
-      Assert.AreEqual("a", ExprUnparser.ExprToString(o1.Expr));
+      Assert.That(o1.HasDirection, Is.False);
+      Assert.That(ExprUnparser.ExprToString(o1.Expr), Is.EqualTo("a"));
       Order o2 = orderSpec[1];
-      Assert.True(o2.HasDirection);
-      Assert.AreEqual(Order.Types.Direction.Desc, o2.Direction);
-      Assert.AreEqual("b", ExprUnparser.ExprToString(o2.Expr));
+      Assert.That(o2.HasDirection);
+      Assert.That(o2.Direction, Is.EqualTo(Order.Types.Direction.Desc));
+      Assert.That(ExprUnparser.ExprToString(o2.Expr), Is.EqualTo("b"));
     }
 
     [Test]
     public void TestOrderByParserComplexExpressions()
     {
       List<Order> orderSpec = new ExprParser("field not in ('a',func('b', 2.0),'c') desc, 1-a$**[0].*, now () + $.b + c > 2 asc").ParseOrderSpec();
-      Assert.AreEqual(3, orderSpec.Count);
+      Assert.That(orderSpec.Count, Is.EqualTo(3));
       Order o1 = orderSpec[0];
-      Assert.True(o1.HasDirection);
-      Assert.AreEqual(Order.Types.Direction.Desc, o1.Direction);
-      Assert.AreEqual("field not in(\"a\", func(\"b\", 2), \"c\")", ExprUnparser.ExprToString(o1.Expr));
+      Assert.That(o1.HasDirection);
+      Assert.That(o1.Direction, Is.EqualTo(Order.Types.Direction.Desc));
+      Assert.That(ExprUnparser.ExprToString(o1.Expr), Is.EqualTo("field not in(\"a\", func(\"b\", 2), \"c\")"));
       Order o2 = orderSpec[1];
-      Assert.False(o2.HasDirection);
-      Assert.AreEqual("(1 - a$**[0].*)", ExprUnparser.ExprToString(o2.Expr));
+      Assert.That(o2.HasDirection, Is.False);
+      Assert.That(ExprUnparser.ExprToString(o2.Expr), Is.EqualTo("(1 - a$**[0].*)"));
       Order o3 = orderSpec[2];
-      Assert.True(o3.HasDirection);
-      Assert.AreEqual(Order.Types.Direction.Asc, o3.Direction);
-      Assert.AreEqual("(((now() + $.b) + c) > 2)", ExprUnparser.ExprToString(o3.Expr));
+      Assert.That(o3.HasDirection);
+      Assert.That(o3.Direction, Is.EqualTo(Order.Types.Direction.Asc));
+      Assert.That(ExprUnparser.ExprToString(o3.Expr), Is.EqualTo("(((now() + $.b) + c) > 2)"));
     }
 
     [Test]
     public void TestNamedPlaceholders()
     {
       ExprParser parser = new ExprParser("a = :a and b = :b and (c = 'x' or d = :b)");
-      Assert.AreEqual("IDENT(a)", parser.tokens[0].ToString());
-      Assert.AreEqual("EQ", parser.tokens[1].ToString());
+      Assert.That(parser.tokens[0].ToString(), Is.EqualTo("IDENT(a)"));
+      Assert.That(parser.tokens[1].ToString(), Is.EqualTo("EQ"));
       Expr e = parser.Parse();
-      Assert.AreEqual(0, parser.placeholderNameToPosition["a"]);
-      Assert.AreEqual(1, parser.placeholderNameToPosition["b"]);
-      Assert.AreEqual(2, parser.positionalPlaceholderCount);
+      Assert.That(parser.placeholderNameToPosition["a"], Is.EqualTo(0));
+      Assert.That(parser.placeholderNameToPosition["b"], Is.EqualTo(1));
+      Assert.That(parser.positionalPlaceholderCount, Is.EqualTo(2));
 
       Expr aEqualsPlaceholder = e.Operator.Param[0].Operator.Param[0].Operator.Param[1];
-      Assert.AreEqual(Expr.Types.Type.Placeholder, aEqualsPlaceholder.Type);
-      Assert.AreEqual((uint)0, aEqualsPlaceholder.Position);
+      Assert.That(aEqualsPlaceholder.Type, Is.EqualTo(Expr.Types.Type.Placeholder));
+      Assert.That(aEqualsPlaceholder.Position, Is.EqualTo((uint)0));
       Expr bEqualsPlaceholder = e.Operator.Param[0].Operator.Param[1].Operator.Param[1];
-      Assert.AreEqual(Expr.Types.Type.Placeholder, bEqualsPlaceholder.Type);
-      Assert.AreEqual((uint)1, bEqualsPlaceholder.Position);
+      Assert.That(bEqualsPlaceholder.Type, Is.EqualTo(Expr.Types.Type.Placeholder));
+      Assert.That(bEqualsPlaceholder.Position, Is.EqualTo((uint)1));
       Expr dEqualsPlaceholder = e.Operator.Param[1].Operator.Param[1].Operator.Param[1];
-      Assert.AreEqual(Expr.Types.Type.Placeholder, dEqualsPlaceholder.Type);
-      Assert.AreEqual((uint)1, dEqualsPlaceholder.Position);
+      Assert.That(dEqualsPlaceholder.Type, Is.EqualTo(Expr.Types.Type.Placeholder));
+      Assert.That(dEqualsPlaceholder.Position, Is.EqualTo((uint)1));
     }
 
     [Test]
@@ -315,23 +315,23 @@ public void TestNumberedPlaceholders()
     {
       ExprParser parser = new ExprParser("a == :1 and b == :3 and (c == :2 or d == :2)");
       Expr e = parser.Parse();
-      Assert.AreEqual(0, parser.placeholderNameToPosition["1"]);
-      Assert.AreEqual(1, parser.placeholderNameToPosition["3"]);
-      Assert.AreEqual(2, parser.placeholderNameToPosition["2"]);
-      Assert.AreEqual(3, parser.positionalPlaceholderCount);
+      Assert.That(parser.placeholderNameToPosition["1"], Is.EqualTo(0));
+      Assert.That(parser.placeholderNameToPosition["3"], Is.EqualTo(1));
+      Assert.That(parser.placeholderNameToPosition["2"], Is.EqualTo(2));
+      Assert.That(parser.positionalPlaceholderCount, Is.EqualTo(3));
 
       Expr aEqualsPlaceholder = e.Operator.Param[0].Operator.Param[0].Operator.Param[1];
-      Assert.AreEqual(Expr.Types.Type.Placeholder, aEqualsPlaceholder.Type);
-      Assert.AreEqual((uint)0, aEqualsPlaceholder.Position);
+      Assert.That(aEqualsPlaceholder.Type, Is.EqualTo(Expr.Types.Type.Placeholder));
+      Assert.That(aEqualsPlaceholder.Position, Is.EqualTo((uint)0));
       Expr bEqualsPlaceholder = e.Operator.Param[0].Operator.Param[1].Operator.Param[1];
-      Assert.AreEqual(Expr.Types.Type.Placeholder, bEqualsPlaceholder.Type);
-      Assert.AreEqual((uint)1, bEqualsPlaceholder.Position);
+      Assert.That(bEqualsPlaceholder.Type, Is.EqualTo(Expr.Types.Type.Placeholder));
+      Assert.That(bEqualsPlaceholder.Position, Is.EqualTo((uint)1));
       Expr cEqualsPlaceholder = e.Operator.Param[1].Operator.Param[0].Operator.Param[1];
-      Assert.AreEqual(Expr.Types.Type.Placeholder, cEqualsPlaceholder.Type);
-      Assert.AreEqual((uint)2, cEqualsPlaceholder.Position);
+      Assert.That(cEqualsPlaceholder.Type, Is.EqualTo(Expr.Types.Type.Placeholder));
+      Assert.That(cEqualsPlaceholder.Position, Is.EqualTo((uint)2));
       Expr dEqualsPlaceholder = e.Operator.Param[1].Operator.Param[1].Operator.Param[1];
-      Assert.AreEqual(Expr.Types.Type.Placeholder, dEqualsPlaceholder.Type);
-      Assert.AreEqual((uint)2, dEqualsPlaceholder.Position);
+      Assert.That(dEqualsPlaceholder.Type, Is.EqualTo(Expr.Types.Type.Placeholder));
+      Assert.That(dEqualsPlaceholder.Position, Is.EqualTo((uint)2));
     }
 
     [Test]
@@ -339,20 +339,20 @@ public void TestUnnumberedPlaceholders()
     {
       ExprParser parser = new ExprParser("a = ? and b = ? and (c = 'x' or d = ?)");
       Expr e = parser.Parse();
-      Assert.AreEqual(0, parser.placeholderNameToPosition["0"]);
-      Assert.AreEqual(1, parser.placeholderNameToPosition["1"]);
-      Assert.AreEqual(2, parser.placeholderNameToPosition["2"]);
-      Assert.AreEqual(3, parser.positionalPlaceholderCount);
+      Assert.That(parser.placeholderNameToPosition["0"], Is.EqualTo(0));
+      Assert.That(parser.placeholderNameToPosition["1"], Is.EqualTo(1));
+      Assert.That(parser.placeholderNameToPosition["2"], Is.EqualTo(2));
+      Assert.That(parser.positionalPlaceholderCount, Is.EqualTo(3));
 
       Expr aEqualsPlaceholder = e.Operator.Param[0].Operator.Param[0].Operator.Param[1];
-      Assert.AreEqual(Expr.Types.Type.Placeholder, aEqualsPlaceholder.Type);
-      Assert.AreEqual((uint)0, aEqualsPlaceholder.Position);
+      Assert.That(aEqualsPlaceholder.Type, Is.EqualTo(Expr.Types.Type.Placeholder));
+      Assert.That(aEqualsPlaceholder.Position, Is.EqualTo((uint)0));
       Expr bEqualsPlaceholder = e.Operator.Param[0].Operator.Param[1].Operator.Param[1];
-      Assert.AreEqual(Expr.Types.Type.Placeholder, bEqualsPlaceholder.Type);
-      Assert.AreEqual((uint)1, bEqualsPlaceholder.Position);
+      Assert.That(bEqualsPlaceholder.Type, Is.EqualTo(Expr.Types.Type.Placeholder));
+      Assert.That(bEqualsPlaceholder.Position, Is.EqualTo((uint)1));
       Expr dEqualsPlaceholder = e.Operator.Param[1].Operator.Param[1].Operator.Param[1];
-      Assert.AreEqual(Expr.Types.Type.Placeholder, dEqualsPlaceholder.Type);
-      Assert.AreEqual((uint)2, dEqualsPlaceholder.Position);
+      Assert.That(dEqualsPlaceholder.Type, Is.EqualTo(Expr.Types.Type.Placeholder));
+      Assert.That(dEqualsPlaceholder.Position, Is.EqualTo((uint)2));
     }
 
     [Test]
@@ -360,24 +360,24 @@ public void TestJsonLiteral()
     {
       Expr e = new ExprParser("{'a':1, 'b':\"a string\"}").Parse();
 
-      Assert.AreEqual("{'a':1, 'b':\"a string\"}", ExprUnparser.ExprToString(e));
+      Assert.That(ExprUnparser.ExprToString(e), Is.EqualTo("{'a':1, 'b':\"a string\"}"));
 
-      Assert.AreEqual(Expr.Types.Type.Object, e.Type);
+      Assert.That(e.Type, Is.EqualTo(Expr.Types.Type.Object));
       Mysqlx.Expr.Object o = e.Object;
-      Assert.AreEqual(2, o.Fld.Count);
+      Assert.That(o.Fld.Count, Is.EqualTo(2));
       Mysqlx.Expr.Object.Types.ObjectField of;
 
       of = o.Fld[0];
-      Assert.AreEqual("a", of.Key);
+      Assert.That(of.Key, Is.EqualTo("a"));
       e = of.Value;
-      Assert.AreEqual(Expr.Types.Type.Literal, e.Type);
-      Assert.AreEqual(1, e.Literal.VSignedInt);
+      Assert.That(e.Type, Is.EqualTo(Expr.Types.Type.Literal));
+      Assert.That(e.Literal.VSignedInt, Is.EqualTo(1));
 
       of = o.Fld[1];
-      Assert.AreEqual("b", of.Key);
+      Assert.That(of.Key, Is.EqualTo("b"));
       e = of.Value;
-      Assert.AreEqual(Expr.Types.Type.Literal, e.Type);
-      Assert.AreEqual("a string", e.Literal.VString.Value.ToStringUtf8());
+      Assert.That(e.Type, Is.EqualTo(Expr.Types.Type.Literal));
+      Assert.That(e.Literal.VString.Value.ToStringUtf8(), Is.EqualTo("a string"));
     }
 
     [Test]
@@ -387,8 +387,8 @@ public void TestTrivialDocumentProjection()
 
       proj = new ExprParser("$.a as a").ParseDocumentProjection();
       Assert.That(proj, Has.One.Items);
-      Assert.AreNotEqual(string.Empty, proj[0].Alias);
-      Assert.AreEqual("a", proj[0].Alias);
+      Assert.That(proj[0].Alias, Is.Not.EqualTo(string.Empty));
+      Assert.That(proj[0].Alias, Is.EqualTo("a"));
 
       proj = new ExprParser("$.a as a, $.b as b, $.c as c").ParseDocumentProjection();
     }
@@ -398,26 +398,26 @@ public void TestExprAsPathDocumentProjection()
     {
       List<Projection> projList = new ExprParser("$.a as b, (1 + 1) * 100 as x, 2 as j42").ParseDocumentProjection();
 
-      Assert.AreEqual(3, projList.Count);
+      Assert.That(projList.Count, Is.EqualTo(3));
 
       // check $.a as b
       Projection proj = projList[0];
       IList<DocumentPathItem> paths = proj.Source.Identifier.DocumentPath;
-      Assert.AreEqual(1, paths.Count);
-      Assert.AreEqual(DocumentPathItem.Types.Type.Member, paths[0].Type);
-      Assert.AreEqual("a", paths[0].Value);
+      Assert.That(paths.Count, Is.EqualTo(1));
+      Assert.That(paths[0].Type, Is.EqualTo(DocumentPathItem.Types.Type.Member));
+      Assert.That(paths[0].Value, Is.EqualTo("a"));
 
-      Assert.AreEqual("b", proj.Alias);
+      Assert.That(proj.Alias, Is.EqualTo("b"));
 
       // check (1 + 1) * 100 as x
       proj = projList[1];
-      Assert.AreEqual("((1 + 1) * 100)", ExprUnparser.ExprToString(proj.Source));
-      Assert.AreEqual("x", proj.Alias);
+      Assert.That(ExprUnparser.ExprToString(proj.Source), Is.EqualTo("((1 + 1) * 100)"));
+      Assert.That(proj.Alias, Is.EqualTo("x"));
 
       // check 2 as j42
       proj = projList[2];
-      Assert.AreEqual("2", ExprUnparser.ExprToString(proj.Source));
-      Assert.AreEqual("j42", proj.Alias);
+      Assert.That(ExprUnparser.ExprToString(proj.Source), Is.EqualTo("2"));
+      Assert.That(proj.Alias, Is.EqualTo("j42"));
     }
 
     [Test]
@@ -427,7 +427,7 @@ public void TestJsonConstructorAsDocumentProjection()
       string projString = "{'a':'value for a', 'b':1+1, 'c'::bindvar, 'd':$.member[22], 'e':{'nested':'doc'}}";
       Projection proj = new Projection();
       proj.Source = new ExprParser(projString, false).Parse();
-      Assert.AreEqual(Expr.Types.Type.Object, proj.Source.Type);
+      Assert.That(proj.Source.Type, Is.EqualTo(Expr.Types.Type.Object));
 
       IEnumerator<Mysqlx.Expr.Object.Types.ObjectField> fields = proj.Source.Object.Fld.GetEnumerator();
       string[][] array = new string[][] {
@@ -440,10 +440,10 @@ public void TestJsonConstructorAsDocumentProjection()
       {
         fields.MoveNext();
         Mysqlx.Expr.Object.Types.ObjectField f = fields.Current;
-        Assert.AreEqual(pair[0], f.Key);
-        Assert.AreEqual(pair[1], ExprUnparser.ExprToString(f.Value));
+        Assert.That(f.Key, Is.EqualTo(pair[0]));
+        Assert.That(ExprUnparser.ExprToString(f.Value), Is.EqualTo(pair[1]));
       });
-      Assert.False(fields.MoveNext());
+      Assert.That(fields.MoveNext(), Is.False);
     }
 
     [Test]
@@ -452,7 +452,7 @@ public void TestJsonExprsInDocumentProjection()
       // this is not a single doc as the project but multiple docs as embedded fields
       string projString = "{'a':1} as a, {'b':2} as b";
       List<Projection> projList = new ExprParser(projString).ParseDocumentProjection();
-      Assert.AreEqual(2, projList.Count);
+      Assert.That(projList.Count, Is.EqualTo(2));
       // TODO: verification of remaining elements
     }
 
@@ -460,10 +460,10 @@ public void TestJsonExprsInDocumentProjection()
     public void TestTableInsertProjection()
     {
       Column col = new ExprParser("a").ParseTableInsertField();
-      Assert.AreEqual("a", col.Name);
+      Assert.That(col.Name, Is.EqualTo("a"));
 
       col = new ExprParser("`double weird `` string`").ParseTableInsertField();
-      Assert.AreEqual("double weird ` string", col.Name);
+      Assert.That(col.Name, Is.EqualTo("double weird ` string"));
     }
 
     [Test]
@@ -471,45 +471,45 @@ public void TestTableUpdateField()
     {
       ColumnIdentifier col;
       col = new ExprParser("a").ParseTableUpdateField();
-      Assert.AreEqual("a", col.Name);
+      Assert.That(col.Name, Is.EqualTo("a"));
 
       col = new ExprParser("b.c").ParseTableUpdateField();
-      Assert.AreEqual("b", col.TableName);
-      Assert.AreEqual("c", col.Name);
+      Assert.That(col.TableName, Is.EqualTo("b"));
+      Assert.That(col.Name, Is.EqualTo("c"));
 
       col = new ExprParser("d.e$.the_path[2]").ParseTableUpdateField();
-      Assert.AreEqual("d", col.TableName);
-      Assert.AreEqual("e", col.Name);
-      Assert.AreEqual(2, col.DocumentPath.Count);
-      Assert.AreEqual("the_path", col.DocumentPath[0].Value);
-      Assert.AreEqual((uint)2, col.DocumentPath[1].Index);
+      Assert.That(col.TableName, Is.EqualTo("d"));
+      Assert.That(col.Name, Is.EqualTo("e"));
+      Assert.That(col.DocumentPath.Count, Is.EqualTo(2));
+      Assert.That(col.DocumentPath[0].Value, Is.EqualTo("the_path"));
+      Assert.That(col.DocumentPath[1].Index, Is.EqualTo((uint)2));
 
       col = new ExprParser("`zzz\\``").ParseTableUpdateField();
-      Assert.AreEqual("zzz`", col.Name);
+      Assert.That(col.Name, Is.EqualTo("zzz`"));
     }
 
     [Test]
     public void TestTrivialTableSelectProjection()
     {
       List<Projection> proj = new ExprParser("a, b as c").ParseTableSelectProjection();
-      Assert.AreEqual(2, proj.Count);
-      Assert.AreEqual("a", ExprUnparser.ExprToString(proj[0].Source));
-      Assert.AreEqual(string.Empty, proj[0].Alias);
-      Assert.AreEqual("b", ExprUnparser.ExprToString(proj[1].Source));
-      Assert.AreNotEqual(string.Empty, proj[1].Alias);
-      Assert.AreEqual("c", proj[1].Alias);
+      Assert.That(proj.Count, Is.EqualTo(2));
+      Assert.That(ExprUnparser.ExprToString(proj[0].Source), Is.EqualTo("a"));
+      Assert.That(proj[0].Alias, Is.EqualTo(string.Empty));
+      Assert.That(ExprUnparser.ExprToString(proj[1].Source), Is.EqualTo("b"));
+      Assert.That(proj[1].Alias, Is.Not.EqualTo(string.Empty));
+      Assert.That(proj[1].Alias, Is.EqualTo("c"));
     }
 
     [Test]
     public void TestStarTableSelectProjection()
     {
       List<Projection> proj = new ExprParser("*, b as c").ParseTableSelectProjection();
-      Assert.AreEqual(2, proj.Count);
-      Assert.AreEqual("*", ExprUnparser.ExprToString(proj[0].Source));
-      Assert.AreEqual(string.Empty, proj[0].Alias);
-      Assert.AreEqual("b", ExprUnparser.ExprToString(proj[1].Source));
-      Assert.AreNotEqual(string.Empty, proj[1].Alias);
-      Assert.AreEqual("c", proj[1].Alias);
+      Assert.That(proj.Count, Is.EqualTo(2));
+      Assert.That(ExprUnparser.ExprToString(proj[0].Source), Is.EqualTo("*"));
+      Assert.That(proj[0].Alias, Is.EqualTo(string.Empty));
+      Assert.That(ExprUnparser.ExprToString(proj[1].Source), Is.EqualTo("b"));
+      Assert.That(proj[1].Alias, Is.Not.EqualTo(string.Empty));
+      Assert.That(proj[1].Alias, Is.EqualTo("c"));
     }
 
     [Test]
@@ -517,13 +517,13 @@ public void TestComplexTableSelectProjection()
     {
       string projectionString = "(1 + 1) * 100 as `one-o-two`, 'a is \\'a\\'' as `what is 'a'`";
       List<Projection> proj = new ExprParser(projectionString).ParseTableSelectProjection();
-      Assert.AreEqual(2, proj.Count);
+      Assert.That(proj.Count, Is.EqualTo(2));
 
-      Assert.AreEqual("((1 + 1) * 100)", ExprUnparser.ExprToString(proj[0].Source));
-      Assert.AreEqual("one-o-two", proj[0].Alias);
+      Assert.That(ExprUnparser.ExprToString(proj[0].Source), Is.EqualTo("((1 + 1) * 100)"));
+      Assert.That(proj[0].Alias, Is.EqualTo("one-o-two"));
 
-      Assert.AreEqual("a is 'a'", proj[1].Source.Literal.VString.Value.ToStringUtf8());
-      Assert.AreEqual("what is 'a'", proj[1].Alias);
+      Assert.That(proj[1].Source.Literal.VString.Value.ToStringUtf8(), Is.EqualTo("a is 'a'"));
+      Assert.That(proj[1].Alias, Is.EqualTo("what is 'a'"));
     }
 
     [Test]
@@ -540,13 +540,13 @@ public void TestRandom()
     public void UnqualifiedDocPaths()
     {
       Expr expr = new ExprParser("1 + b[0]", false).Parse();
-      Assert.AreEqual("(1 + $.b[0])", ExprUnparser.ExprToString(expr));
+      Assert.That(ExprUnparser.ExprToString(expr), Is.EqualTo("(1 + $.b[0])"));
       expr = new ExprParser("a.*", false).Parse();
-      Assert.AreEqual("$.a.*", ExprUnparser.ExprToString(expr));
+      Assert.That(ExprUnparser.ExprToString(expr), Is.EqualTo("$.a.*"));
       expr = new ExprParser("bL . vT .*", false).Parse();
-      Assert.AreEqual("$.bL.vT.*", ExprUnparser.ExprToString(expr));
+      Assert.That(ExprUnparser.ExprToString(expr), Is.EqualTo("$.bL.vT.*"));
       expr = new ExprParser("dd ** .X", false).Parse();
-      Assert.AreEqual("$.dd**.X", ExprUnparser.ExprToString(expr));
+      Assert.That(ExprUnparser.ExprToString(expr), Is.EqualTo("$.dd**.X"));
     }
 
     [TestCase("info$.additionalinfo.hobbies", "info$.additionalinfo.hobbies", true)]
@@ -560,13 +560,12 @@ public void JsonColumnPath(string exprString, string unparserString, bool isRela
     {
       if(unparserString == null)
       {
-        Assert.AreEqual($"Unable to parse query '{exprString}'", 
-          Assert.Throws<ArgumentException>(() => new ExprParser(exprString, isRelational).Parse()).Message);
+        Assert.That(Assert.Throws<ArgumentException>(() => new ExprParser(exprString, isRelational).Parse()).Message, Is.EqualTo($"Unable to parse query '{exprString}'"));
       }
       else
       {
         Expr expr = new ExprParser(exprString, isRelational).Parse();
-        Assert.AreEqual(unparserString, ExprUnparser.ExprToString(expr));
+        Assert.That(ExprUnparser.ExprToString(expr), Is.EqualTo(unparserString));
       }
     }
   }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/GlobalUsings.cs b/MySQL.Data/tests/MySqlX.Data.Tests/GlobalUsings.cs
deleted file mode 100644
index 575c7cfd0..000000000
--- a/MySQL.Data/tests/MySqlX.Data.Tests/GlobalUsings.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-global using Assert = NUnit.Framework.Legacy.ClassicAssert;
-global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
-global using StringAssert = NUnit.Framework.Legacy.StringAssert;
-global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
-global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/JsonParserTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/JsonParserTests.cs
index e12dee9f7..07fb51ff3 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/JsonParserTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/JsonParserTests.cs
@@ -44,21 +44,21 @@ public void ParseBooleanValue()
 
       DbDoc document = new DbDoc(@"{ ""_id"": 1, ""isDocument"": true }");
       Result result = ExecuteAddStatement(collection.Add(document));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
       document = collection.GetOne(1);
-      Assert.True(document.values.ContainsKey("isDocument"));
-      Assert.True((bool) document.values["isDocument"]);
+      Assert.That(document.values.ContainsKey("isDocument"));
+      Assert.That((bool) document.values["isDocument"]);
 
       document = new DbDoc(new { _id=2, isDocument=false });
       result = ExecuteAddStatement(collection.Add(document));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
       document = collection.GetOne(2);
-      Assert.True(document.values.ContainsKey("isDocument"));
-      Assert.False((bool) document.values["isDocument"]);
+      Assert.That(document.values.ContainsKey("isDocument"));
+      Assert.That((bool) document.values["isDocument"], Is.False);
 
-      Assert.True(ExecuteFindStatement(collection.Find("isDocument = false")).FetchAll().Count > 0);
+      Assert.That(ExecuteFindStatement(collection.Find("isDocument = false")).FetchAll().Count > 0);
     }
 
     [Test]
@@ -68,11 +68,11 @@ public void ParseNullValue()
 
       DbDoc document = new DbDoc(@"{ ""isDocument"": null }");
       Result result = ExecuteAddStatement(collection.Add(document));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
       document = ExecuteFindStatement(collection.Find()).FetchOne();
-      Assert.True(document.values.ContainsKey("isDocument"));
-      Assert.Null(document.values["isDocument"]);
+      Assert.That(document.values.ContainsKey("isDocument"));
+      Assert.That(document.values["isDocument"], Is.Null);
     }
 
     [Test]
@@ -82,11 +82,11 @@ public void ParseNumberArray()
 
       DbDoc document = new DbDoc(@"{ ""id"": 1, ""list"": [1,2,3] }");
       Result result = ExecuteAddStatement(collection.Add(document));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
       document = ExecuteFindStatement(collection.Find()).FetchOne();
-      Assert.True(document.values.ContainsKey("list"));
-      Assert.AreEqual(new object[] { 1, 2, 3 }, document.values["list"]);
+      Assert.That(document.values.ContainsKey("list"));
+      Assert.That(document.values["list"], Is.EqualTo(new object[] { 1, 2, 3 }));
     }
 
     [Test]
@@ -97,11 +97,11 @@ public void ParsObjectArray()
       DbDoc document = new DbDoc(@"{ ""id"": 1, ""list"": [1,""a""] }");
       //DbDoc document = new DbDoc(@"{ ""id"": 1, ""list"": [1,""a"",true,null] }");
       Result result = ExecuteAddStatement(collection.Add(document));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
       document = ExecuteFindStatement(collection.Find()).FetchOne();
-      Assert.True(document.values.ContainsKey("list"));
-      Assert.AreEqual(new object[] { 1, "a" }, document.values["list"]);
+      Assert.That(document.values.ContainsKey("list"));
+      Assert.That(document.values["list"], Is.EqualTo(new object[] { 1, "a" }));
       //Assert.AreEqual(new object[] { 1, "a", true, null }, document.values["list"]);
     }
 
@@ -112,13 +112,13 @@ public void ParseGroupsEmbededInArrays()
       //DbDoc document = new DbDoc(@"{ ""id"": 1, ""list"": [1,""a"",true,null] }");
       Collection collection = CreateCollection("test");
       Result result = ExecuteAddStatement(collection.Add(document));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
       document = ExecuteFindStatement(collection.Find()).FetchOne();
-      Assert.True(document.values.ContainsKey("list"));
+      Assert.That(document.values.ContainsKey("list"));
       var dictionary = new Dictionary<string,object>();
       dictionary.Add("b",1);
-      Assert.AreEqual(new object[] { 1, "a", dictionary }, document.values["list"]);
+      Assert.That(document.values["list"], Is.EqualTo(new object[] { 1, "a", dictionary }));
       //Assert.AreEqual(new object[] { 1, "a", true, null, dictionary }, document.values["list"]);
     }
 
@@ -140,19 +140,19 @@ public void ParseWithEscapedQuotes()
 
       var document = collection.GetOne("123");
       var innerEmail = ((document["email"] as object[])[1]) as Dictionary<string, object>;
-      Assert.AreEqual("[\\\"ALICE@ORA.COM\\\"]", innerEmail["email"]);
+      Assert.That(innerEmail["email"], Is.EqualTo("[\\\"ALICE@ORA.COM\\\"]"));
       innerEmail = ((document["email"] as object[])[2]) as Dictionary<string, object>;
-      Assert.AreEqual("ALICE@ORA.COM", innerEmail["email"]);
+      Assert.That(innerEmail["email"], Is.EqualTo("ALICE@ORA.COM"));
 
       ExecuteAddStatement(collection.Add("{ \"_id\": \"124\", \"email\": \"\\\"\"  }"));
       document = collection.GetOne("124");
-      Assert.AreEqual("\\\"", document["email"]);
+      Assert.That(document["email"], Is.EqualTo("\\\""));
 
       var ex = Assert.Throws<Exception>(() => ExecuteAddStatement(collection.Add("{ \"_id\": \"124\", \"email\": \"\"\"  }")));
-      Assert.AreEqual("The value provided is not a valid JSON document. Expected token ','", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The value provided is not a valid JSON document. Expected token ','"));
 
       ex = Assert.Throws<Exception>(() => ExecuteAddStatement(collection.Add("{ \"_id\": \"124\", \"email\": \"\\\"  }")));
-      Assert.AreEqual("The value provided is not a valid JSON document. Failed to find ending '\"' while reading stream.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("The value provided is not a valid JSON document. Failed to find ending '\"' while reading stream."));
     }
   }
 }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs b/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs
index c0097e85b..be931efa9 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs
@@ -138,21 +138,21 @@ public void SimplePatch()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add("{ \"_id\": \"123\", \"email\": \"alice@ora.com\", \"startDate\": \"4/1/2017\" }"));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = ExecuteAddStatement(collection.Add("{ \"_id\": \"124\", \"email\": \"jose@ora.com\", \"startDate\": \"4/1/2017\" }"));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       ExecuteModifyStatement(collection.Modify("email = \"alice@ora.com\"").Patch("{ \"_id\": \"123\", \"email\":\"bob@ora.com\", \"startDate\":null }"));
 
       DbDoc document = collection.GetOne("123");
-      Assert.AreEqual("123", document.Id);
-      Assert.AreEqual("bob@ora.com", document.values["email"]);
-      Assert.True(!document.values.ContainsKey("startDate"));
+      Assert.That(document.Id, Is.EqualTo("123"));
+      Assert.That(document.values["email"], Is.EqualTo("bob@ora.com"));
+      Assert.That(!document.values.ContainsKey("startDate"));
 
       document = collection.GetOne("124");
-      Assert.AreEqual("124", document.Id);
-      Assert.AreEqual("jose@ora.com", document.values["email"]);
-      Assert.True(document.values.ContainsKey("startDate"));
+      Assert.That(document.Id, Is.EqualTo("124"));
+      Assert.That(document.values["email"], Is.EqualTo("jose@ora.com"));
+      Assert.That(document.values.ContainsKey("startDate"));
     }
 
     [Test]
@@ -162,7 +162,7 @@ public void SimplePatchUsingMySqlExpressionClass()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add("{ \"_id\": \"123\", \"email\": \"alice@ora.com\", \"startDate\": \"4/1/2017\" }"));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       var patch = new
       {
@@ -171,7 +171,7 @@ public void SimplePatchUsingMySqlExpressionClass()
 
       ExecuteModifyStatement(collection.Modify("true").Patch(patch));
       DbDoc document = collection.GetOne("123");
-      Assert.AreEqual("ALICE@ORA.COM", document.values["email"]);
+      Assert.That(document.values["email"], Is.EqualTo("ALICE@ORA.COM"));
     }
 
     [Test]
@@ -181,59 +181,59 @@ public void CRUD()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsJsonStrings));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       // Add field.
       ExecuteModifyStatement(collection.Modify("language = :lang").Patch("{ \"translations\": [\"Spanish\"] }").Bind("lang", "English"));
       var document = ExecuteFindStatement(collection.Find("language = :lang").Bind("lang", "English")).FetchOne();
-      Assert.True(document.values.ContainsKey("translations"));
+      Assert.That(document.values.ContainsKey("translations"));
 
       // Update field.
       ExecuteModifyStatement(collection.Modify("language = :lang").Patch("{ \"translations\": [\"Spanish\", \"Italian\"] }").Bind("lang", "English"));
       document = ExecuteFindStatement(collection.Find("language = :lang").Bind("lang", "English")).FetchOne();
-      Assert.True(document.values.ContainsKey("translations"));
+      Assert.That(document.values.ContainsKey("translations"));
       var translations = (object[])document.values["translations"];
-      Assert.AreEqual("Spanish", (string)translations[0]);
-      Assert.AreEqual("Italian", (string)translations[1]);
+      Assert.That((string)translations[0], Is.EqualTo("Spanish"));
+      Assert.That((string)translations[1], Is.EqualTo("Italian"));
 
       // Remove field.
       ExecuteModifyStatement(collection.Modify("language = :lang").Patch("{ \"translations\": null }").Bind("lang", "English"));
       document = ExecuteFindStatement(collection.Find("language = :lang").Bind("lang", "English")).FetchOne();
-      Assert.False(document.values.ContainsKey("translations"));
+      Assert.That(document.values.ContainsKey("translations"), Is.False);
 
       // Add field.
-      Assert.False(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"));
+      Assert.That(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"), Is.False);
       ExecuteModifyStatement(collection.Modify("additionalinfo.director.name = :director").Patch("{ \"additionalinfo\": { \"musicby\": \"Sakila D\" } }").Bind("director", "Sharice Legaspi"));
       document = ExecuteFindStatement(collection.Find("language = :lang").Bind("lang", "English")).FetchOne();
-      Assert.True(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"));
+      Assert.That(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"));
 
       // Update field.
       ExecuteModifyStatement(collection.Modify("additionalinfo.director.name = :director").Patch("{ \"additionalinfo\": { \"musicby\": \"The Sakila\" } }").Bind("director", "Sharice Legaspi"));
       document = ExecuteFindStatement(collection.Find("language = :lang").Bind("lang", "English")).FetchOne();
-      Assert.True(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"));
-      Assert.AreEqual("The Sakila", ((Dictionary<string, object>)document.values["additionalinfo"])["musicby"]);
+      Assert.That(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"));
+      Assert.That(((Dictionary<string, object>)document.values["additionalinfo"])["musicby"], Is.EqualTo("The Sakila"));
 
       // Remove field.
       ExecuteModifyStatement(collection.Modify("additionalinfo.director.name = :director").Patch("{ \"additionalinfo\": { \"musicby\": null } }").Bind("director", "Sharice Legaspi"));
       document = ExecuteFindStatement(collection.Find("additionalinfo.director.name = :director").Bind("director", "Sharice Legaspi")).FetchOne();
-      Assert.False(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"));
+      Assert.That(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"), Is.False);
 
       // Add field.
-      Assert.False(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"));
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"), Is.False);
       ExecuteModifyStatement(collection.Modify("additionalinfo.director.name = :director").Patch("{ \"additionalinfo\": { \"director\": { \"country\": \"France\" } } }").Bind("director", "Sharice Legaspi"));
       document = ExecuteFindStatement(collection.Find("language = :lang").Bind("lang", "English")).FetchOne();
-      Assert.True(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"));
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"));
 
       // Update field.
       ExecuteModifyStatement(collection.Modify("additionalinfo.director.name = :director").Patch("{ \"additionalinfo\": { \"director\": { \"country\": \"Canada\" } } }").Bind("director", "Sharice Legaspi"));
       document = ExecuteFindStatement(collection.Find("language = :lang").Bind("lang", "English")).FetchOne();
-      Assert.True(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"));
-      Assert.AreEqual("Canada", ((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])["country"]);
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"));
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])["country"], Is.EqualTo("Canada"));
 
       // Remove field.
       ExecuteModifyStatement(collection.Modify("additionalinfo.director.name = :director").Patch("{ \"additionalinfo\": { \"director\": { \"country\": null } } }").Bind("director", "Sharice Legaspi"));
       document = ExecuteFindStatement(collection.Find("additionalinfo.director.name = :director").Bind("director", "Sharice Legaspi")).FetchOne();
-      Assert.False(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"));
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"), Is.False);
     }
 
     #endregion
@@ -247,30 +247,30 @@ public void ReplaceUpdateInDifferentNestingLevels()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       DbDoc document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("AFRICAN EGG", document["title"]);
+      Assert.That(document["title"], Is.EqualTo("AFRICAN EGG"));
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"title\": \"The African Egg\" }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("The African Egg", document["title"]);
+      Assert.That(document["title"], Is.EqualTo("The African Egg"));
 
-      Assert.AreEqual(57, ((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])["age"]);
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])["age"], Is.EqualTo(57));
       ExecuteModifyStatement(collection.Modify("additionalinfo.director.name = :director").Patch("{ \"additionalinfo\": { \"director\": { \"age\": 67 } } }").Bind("director", "Sharice Legaspi"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual(67, ((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])["age"]);
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])["age"], Is.EqualTo(67));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"additionalinfo\": { \"director\": { \"age\": 77 } } }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual(77, ((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])["age"]);
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])["age"], Is.EqualTo(77));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"title\": { \"movie\": \"The African Egg\"} }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("The African Egg", ((Dictionary<string, object>)document.values["title"])["movie"]);
+      Assert.That(((Dictionary<string, object>)document.values["title"])["movie"], Is.EqualTo("The African Egg"));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"additionalinfo\": \"No data available\" }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("No data available", document.values["additionalinfo"]);
+      Assert.That(document.values["additionalinfo"], Is.EqualTo("No data available"));
     }
 
     [Test]
@@ -280,32 +280,32 @@ public void AddRemoveFieldInDifferentNestingLevels()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       DbDoc document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.False(document.values.ContainsKey("translations"));
+      Assert.That(document.values.ContainsKey("translations"), Is.False);
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"translations\": [\"Spanish\"] }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.True(document.values.ContainsKey("translations"));
+      Assert.That(document.values.ContainsKey("translations"));
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"translations\": null }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.False(document.values.ContainsKey("translations"));
+      Assert.That(document.values.ContainsKey("translations"), Is.False);
 
-      Assert.False(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"));
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"), Is.False);
       ExecuteModifyStatement(collection.Modify("additionalinfo.director.name = :director").Patch("{ \"additionalinfo\": { \"director\": { \"country\": \"France\" } } }").Bind("director", "Sharice Legaspi"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.True(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"));
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"));
       ExecuteModifyStatement(collection.Modify("additionalinfo.director.name = :director").Patch("{ \"additionalinfo\": { \"director\": { \"country\": null } } }").Bind("director", "Sharice Legaspi"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.False(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"));
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]).ContainsKey("country"), Is.False);
 
-      Assert.False(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"));
+      Assert.That(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"), Is.False);
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"additionalinfo\": { \"musicby\": \"The Sakila\" } }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.True(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"));
+      Assert.That(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"));
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"additionalinfo\": { \"musicby\": null } }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.False(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"));
+      Assert.That(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("musicby"), Is.False);
     }
 
     #endregion
@@ -319,7 +319,7 @@ public void CRUDMultipleFields()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       DbDoc document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
 
@@ -327,34 +327,34 @@ public void CRUDMultipleFields()
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"field 1\": \"one\", \"field 2\": \"two\", \"field 3\": \"three\" }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       ExecuteModifyStatement(collection.Modify("additionalinfo.director.name = :director").Patch("{ \"additionalinfo\": { \"director\": { \"field 1\": \"one\", \"field 2\": \"two\", \"field 3\": \"three\" } } }").Bind("director", "Sharice Legaspi"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("one", document.values["field 1"]);
-      Assert.AreEqual("two", document.values["field 2"]);
-      Assert.AreEqual("three", document.values["field 3"]);
-      Assert.AreEqual("one", (((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]))["field 1"]);
-      Assert.AreEqual("two", (((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]))["field 2"]);
-      Assert.AreEqual("three", (((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]))["field 3"]);
+      Assert.That(document.values["field 1"], Is.EqualTo("one"));
+      Assert.That(document.values["field 2"], Is.EqualTo("two"));
+      Assert.That(document.values["field 3"], Is.EqualTo("three"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]))["field 1"], Is.EqualTo("one"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]))["field 2"], Is.EqualTo("two"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]))["field 3"], Is.EqualTo("three"));
 
       // Update/Replace fields.
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"field 1\": \"ONE\", \"field 2\": \"TWO\", \"field 3\": \"THREE\" }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       ExecuteModifyStatement(collection.Modify("additionalinfo.director.name = :director").Patch("{ \"additionalinfo\": { \"director\": { \"field 1\": \"ONE\", \"field 2\": \"TWO\", \"field 3\": \"THREE\" } } }").Bind("director", "Sharice Legaspi"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("ONE", document.values["field 1"]);
-      Assert.AreEqual("TWO", document.values["field 2"]);
-      Assert.AreEqual("THREE", document.values["field 3"]);
-      Assert.AreEqual("ONE", (((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]))["field 1"]);
-      Assert.AreEqual("TWO", (((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]))["field 2"]);
-      Assert.AreEqual("THREE", (((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]))["field 3"]);
+      Assert.That(document.values["field 1"], Is.EqualTo("ONE"));
+      Assert.That(document.values["field 2"], Is.EqualTo("TWO"));
+      Assert.That(document.values["field 3"], Is.EqualTo("THREE"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]))["field 1"], Is.EqualTo("ONE"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]))["field 2"], Is.EqualTo("TWO"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"]))["field 3"], Is.EqualTo("THREE"));
 
       // Remove fields.
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"field 1\": null, \"field 2\": null, \"field 3\": null }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       ExecuteModifyStatement(collection.Modify("additionalinfo.director.name = :director").Patch("{ \"additionalinfo\": { \"director\": { \"field 1\": null, \"field 2\": null, \"field 3\": null } } }").Bind("director", "Sharice Legaspi"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.False(document.values.ContainsKey("field 1"));
-      Assert.False(document.values.ContainsKey("field 2"));
-      Assert.False(document.values.ContainsKey("field 3"));
-      Assert.False((((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])).ContainsKey("field 1"));
-      Assert.False((((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])).ContainsKey("field 2"));
-      Assert.False((((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])).ContainsKey("field 3"));
+      Assert.That(document.values.ContainsKey("field 1"), Is.False);
+      Assert.That(document.values.ContainsKey("field 2"), Is.False);
+      Assert.That(document.values.ContainsKey("field 3"), Is.False);
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])).ContainsKey("field 1"), Is.False);
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])).ContainsKey("field 2"), Is.False);
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["director"])).ContainsKey("field 3"), Is.False);
     }
 
     #endregion
@@ -368,17 +368,17 @@ public void AddNewFieldUsingExpressions()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       DbDoc document = ExecuteFindStatement(collection.Find()).FetchOne();
-      Assert.False(((Dictionary<string, object>)((object[])document.values["actors"])[0]).ContainsKey("age"));
+      Assert.That(((Dictionary<string, object>)((object[])document.values["actors"])[0]).ContainsKey("age"), Is.False);
       Assert.Throws<Exception>(() => ExecuteModifyStatement(collection.Modify("true").Patch("{ \"actors\": { \"age\": Year(CURDATE()) - CAST(SUBSTRING_INDEX(actors.birthdate, ' ', - 1) AS DECIMAL)) } }")));
 
       document = ExecuteFindStatement(collection.Find()).FetchOne();
-      Assert.False(document.values.ContainsKey("audio"));
+      Assert.That(document.values.ContainsKey("audio"), Is.False);
       ExecuteModifyStatement(collection.Modify("true").Patch("{ \"audio\": CONCAT($.language, ', no subtitles') }"));
       document = ExecuteFindStatement(collection.Find()).FetchOne();
-      Assert.AreEqual("English, no subtitles", document.values["audio"]);
+      Assert.That(document.values["audio"], Is.EqualTo("English, no subtitles"));
     }
 
     [Test]
@@ -388,13 +388,13 @@ public void ReplaceUpdateUsingExpressions()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       DbDoc document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
 
-      Assert.False(document.values.ContainsKey("audio"));
+      Assert.That(document.values.ContainsKey("audio"), Is.False);
       ExecuteModifyStatement(collection.Modify("true").Patch("{ \"audio\": CONCAT(UPPER($.language), ', No Subtitles') }"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("ENGLISH, No Subtitles", document.values["audio"]);
+      Assert.That(document.values["audio"], Is.EqualTo("ENGLISH, No Subtitles"));
     }
 
     [Test]
@@ -404,12 +404,12 @@ public void ReplaceUpdateIdUsingExpressions()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       // Changes to the _id field are ignored.
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"_id\": replace(UUID(), '-', '') }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       DbDoc document = ExecuteFindStatement(collection.Find()).FetchOne();
-      Assert.AreEqual("a6f4b93e1a264a108393524f29546a8c", document.Id);
+      Assert.That(document.Id, Is.EqualTo("a6f4b93e1a264a108393524f29546a8c"));
     }
 
     [Test]
@@ -419,13 +419,13 @@ public void AddIdToNestedDocumentUsingExpressions()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       DbDoc document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.False(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("_id"));
+      Assert.That(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("_id"), Is.False);
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"additionalinfo\": { \"_id\": replace(UUID(), '-', '') } }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.True(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("_id"));
+      Assert.That(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("_id"));
     }
 
     [Test]
@@ -435,12 +435,12 @@ public void AddNullFieldUsingExpressions()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       DbDoc document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.False(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("releasedate"));
+      Assert.That(((Dictionary<string, object>)document.values["additionalinfo"]).ContainsKey("releasedate"), Is.False);
       Exception ex = Assert.Throws<MySqlException>(() => ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"releasedate\": DATE_ADD('2006-04-00',INTERVAL 1 DAY) }").Bind("id", "a6f4b93e1a264a108393524f29546a8c")));
-      Assert.AreEqual("Invalid data for update operation on document collection table", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Invalid data for update operation on document collection table"));
     }
 
     [Test]
@@ -450,13 +450,13 @@ public void ReplaceUpdateNullFieldReturnedFromExpression()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       DbDoc document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("AFRICAN EGG", document.values["title"]);
+      Assert.That(document.values["title"], Is.EqualTo("AFRICAN EGG"));
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"title\": concat('my ', NULL, ' title') }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.False(document.values.ContainsKey("title"));
+      Assert.That(document.values.ContainsKey("title"), Is.False);
     }
 
     [Test]
@@ -466,13 +466,13 @@ public void AddNewFieldReturnedFromExpression()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       DbDoc document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.False(document.values.ContainsKey("docfield"));
+      Assert.That(document.values.ContainsKey("docfield"), Is.False);
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"docfield\": JSON_OBJECT('field 1', 1, 'field 2', 'two') }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.True(document.values.ContainsKey("docfield"));
+      Assert.That(document.values.ContainsKey("docfield"));
     }
 
     [Test]
@@ -482,13 +482,13 @@ public void ReplaceUpdateFieldWithDocumentReturnedFromExpression()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       DbDoc document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("Science fiction", document.values["genre"]);
+      Assert.That(document.values["genre"], Is.EqualTo("Science fiction"));
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"genre\": JSON_OBJECT('name', 'Science Fiction') }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("Science Fiction", ((Dictionary<string, object>)document.values["genre"])["name"]);
+      Assert.That(((Dictionary<string, object>)document.values["genre"])["name"], Is.EqualTo("Science Fiction"));
     }
 
     #endregion
@@ -502,12 +502,12 @@ public void ReplaceUpdateId()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       // Changes to the _id field are ignored.
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"_id\": \"b5f4b93e1a264a108393524f29546a9d\" }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       DbDoc document = ExecuteFindStatement(collection.Find()).FetchOne();
-      Assert.AreEqual("a6f4b93e1a264a108393524f29546a8c", document.Id);
+      Assert.That(document.Id, Is.EqualTo("a6f4b93e1a264a108393524f29546a8c"));
     }
 
     [Test]
@@ -517,19 +517,19 @@ public void AddIdToNestedDocument()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       // Add id to nested document is allowed.
       DbDoc document = ExecuteFindStatement(collection.Find()).FetchOne();
       var field = (Dictionary<string, object>)document.values["additionalinfo"];
-      Assert.AreEqual(3, field.Count);
-      Assert.False(field.ContainsKey("_id"));
+      Assert.That(field.Count, Is.EqualTo(3));
+      Assert.That(field.ContainsKey("_id"), Is.False);
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"additionalinfo\": { \"_id\": \"b5f4b93e1a264a108393524f29546a9d\" } }").Bind("id", "a6f4b93e1a264a108393524f29546a8c"));
       document = ExecuteFindStatement(collection.Find()).FetchOne();
       field = (Dictionary<string, object>)document.values["additionalinfo"];
-      Assert.AreEqual(4, field.Count);
-      Assert.True(field.ContainsKey("_id"));
-      Assert.AreEqual("b5f4b93e1a264a108393524f29546a9d", field["_id"]);
+      Assert.That(field.Count, Is.EqualTo(4));
+      Assert.That(field.ContainsKey("_id"));
+      Assert.That(field["_id"], Is.EqualTo("b5f4b93e1a264a108393524f29546a9d"));
     }
 
     [Test]
@@ -539,11 +539,11 @@ public void SetNullToId()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsJsonStrings));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       // Changes to the _id field are ignored.
       ExecuteModifyStatement(collection.Modify("true").Patch("{ \"_id\": NULL }"));
-      Assert.AreEqual("a6f4b93e1a264a108393524f29546a8c", ExecuteFindStatement(collection.Find()).FetchOne().Id);
+      Assert.That(ExecuteFindStatement(collection.Find()).FetchOne().Id, Is.EqualTo("a6f4b93e1a264a108393524f29546a8c"));
     }
 
     [Test]
@@ -553,28 +553,28 @@ public void AddNullFields()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsJsonStrings));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       ExecuteModifyStatement(collection.Modify("true").Patch("{ \"nullfield\": NULL }"));
-      Assert.False(ExecuteFindStatement(collection.Find()).FetchOne().values.ContainsKey("nullfield"));
+      Assert.That(ExecuteFindStatement(collection.Find()).FetchOne().values.ContainsKey("nullfield"), Is.False);
 
       ExecuteModifyStatement(collection.Modify("true").Patch("{ \"nullfield\": [NULL, NULL] }"));
       DbDoc document = ExecuteFindStatement(collection.Find()).FetchOne();
-      Assert.True(document.values.ContainsKey("nullfield"));
+      Assert.That(document.values.ContainsKey("nullfield"));
       var nullArray = (object[])document.values["nullfield"];
-      Assert.Null(nullArray[0]);
-      Assert.Null(nullArray[1]);
+      Assert.That(nullArray[0], Is.Null);
+      Assert.That(nullArray[1], Is.Null);
 
       ExecuteModifyStatement(collection.Modify("true").Patch("{ \"nullfield\": { \"nested\": NULL } }"));
       document = ExecuteFindStatement(collection.Find()).FetchOne();
-      Assert.True(ExecuteFindStatement(collection.Find()).FetchOne().values.ContainsKey("nullfield"));
-      Assert.True(((Dictionary<string, object>)document.values["nullfield"]).Count == 0);
+      Assert.That(ExecuteFindStatement(collection.Find()).FetchOne().values.ContainsKey("nullfield"));
+      Assert.That(((Dictionary<string, object>)document.values["nullfield"]).Count == 0);
 
       ExecuteModifyStatement(collection.Modify("true").Patch("{ \"nullfield\": { \"nested\": [NULL, NULL] } }"));
       document = ExecuteFindStatement(collection.Find()).FetchOne();
       var nestedNullArray = (object[])((Dictionary<string, object>)document.values["nullfield"])["nested"];
-      Assert.Null(nestedNullArray[0]);
-      Assert.Null(nestedNullArray[1]);
+      Assert.That(nestedNullArray[0], Is.Null);
+      Assert.That(nestedNullArray[1], Is.Null);
     }
 
     [Test]
@@ -584,31 +584,31 @@ public void AddNestedNullFields()
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsJsonStrings));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       ExecuteModifyStatement(collection.Modify("true").Patch("{ \"additionalinfo\": { \"nullfield\": NULL } }"));
-      Assert.False(((Dictionary<string, object>)ExecuteFindStatement(collection.Find()).FetchOne().values["additionalinfo"]).ContainsKey("nullfield"));
+      Assert.That(((Dictionary<string, object>)ExecuteFindStatement(collection.Find()).FetchOne().values["additionalinfo"]).ContainsKey("nullfield"), Is.False);
 
       ExecuteModifyStatement(collection.Modify("true").Patch("{ \"additionalinfo\": { \"nullfield\": [NULL, NULL] } }"));
       DbDoc document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       var nestedNullArray = (object[])((Dictionary<string, object>)document.values["additionalinfo"])["nullfield"];
-      Assert.Null(nestedNullArray[0]);
-      Assert.Null(nestedNullArray[1]);
+      Assert.That(nestedNullArray[0], Is.Null);
+      Assert.That(nestedNullArray[1], Is.Null);
 
       ExecuteModifyStatement(collection.Modify("true").Patch("{ \"additionalinfo\": { \"nullfield\": { \"nested\": NULL } } }"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.False(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["nullfield"]).ContainsKey("nullfield"));
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["nullfield"]).ContainsKey("nullfield"), Is.False);
 
       ExecuteModifyStatement(collection.Modify("true").Patch("{ \"additionalinfo\": { \"nullfield\": { \"nested\": [NULL, NULL] } } }"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       nestedNullArray = (object[])((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["nullfield"])["nested"];
-      Assert.Null(nestedNullArray[0]);
-      Assert.Null(nestedNullArray[1]);
+      Assert.That(nestedNullArray[0], Is.Null);
+      Assert.That(nestedNullArray[1], Is.Null);
 
       ExecuteModifyStatement(collection.Modify("true").Patch("{ \"additionalinfo\": { \"nullfield\": { \"nested\": JSON_OBJECT('field', null) } } }"));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       var nestedObject = (Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)document.values["additionalinfo"])["nullfield"])["nested"];
-      CollectionAssert.IsEmpty(nestedObject);
+      Assert.That(nestedObject, Is.Empty);
     }
 
     #endregion
@@ -618,32 +618,32 @@ public void GetDocumentProperties()
     {
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       // Get root string properties.
       DbDoc document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("a6f4b93e1a264a108393524f29546a8c", document.Id);
-      Assert.AreEqual("AFRICAN EGG", document["title"]);
-      Assert.AreEqual("G", document["rating"]);
+      Assert.That(document.Id, Is.EqualTo("a6f4b93e1a264a108393524f29546a8c"));
+      Assert.That(document["title"], Is.EqualTo("AFRICAN EGG"));
+      Assert.That(document["rating"], Is.EqualTo("G"));
 
       // Get root numeric properties.
-      Assert.AreEqual(2006, document["releaseyear"]);
-      Assert.AreEqual(130, document["duration"]);
+      Assert.That(document["releaseyear"], Is.EqualTo(2006));
+      Assert.That(document["duration"], Is.EqualTo(130));
 
       // Get root array.
       object[] actors = document["actors"] as object[];
-      Assert.True(actors.Length == 3);
+      Assert.That(actors.Length == 3);
       Dictionary<string, object> actor1 = actors[1] as Dictionary<string, object>;
-      Assert.AreEqual("VAL BOLGER", actor1["name"]);
+      Assert.That(actor1["name"], Is.EqualTo("VAL BOLGER"));
 
       // Get nested string properies.
-      Assert.AreEqual("Sharice Legaspi", document["additionalinfo.director.name"]);
-      Assert.AreEqual(57, document["additionalinfo.director.age"]);
-      Assert.AreEqual("Italy", document["additionalinfo.director.birthplace.country"]);
+      Assert.That(document["additionalinfo.director.name"], Is.EqualTo("Sharice Legaspi"));
+      Assert.That(document["additionalinfo.director.age"], Is.EqualTo(57));
+      Assert.That(document["additionalinfo.director.birthplace.country"], Is.EqualTo("Italy"));
 
       // Get nested array.
       object[] awards = document["additionalinfo.director.awards"] as object[];
-      Assert.True(awards.Length == 2);
+      Assert.That(awards.Length == 2);
     }
 
     [Test]
@@ -652,51 +652,51 @@ public void PatchUsingDateAndTimeFunctions()
       string t1 = "{\"_id\": \"1\", \"name\": \"Alice\" }";
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(t1));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": YEAR('2000-01-01') }").Bind("id", "1"));
       DbDoc document = collection.GetOne("1");
-      Assert.AreEqual(2000, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(2000));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": MONTH('2008-02-03') }").Bind("id", "1"));
       document = collection.GetOne("1");
-      Assert.AreEqual(2, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(2));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": WEEK('2008-02-20') }").Bind("id", "1"));
       document = collection.GetOne("1");
-      Assert.AreEqual(7, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(7));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": DAY('2008-02-20') }").Bind("id", "1"));
       document = collection.GetOne("1");
-      Assert.AreEqual(20, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(20));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": HOUR('10:05:03') }").Bind("id", "1"));
       document = collection.GetOne("1");
-      Assert.AreEqual(10, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(10));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": MINUTE('2008-02-03 10:05:03') }").Bind("id", "1"));
       document = collection.GetOne("1");
-      Assert.AreEqual(5, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(5));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": SECOND('10:05:03') }").Bind("id", "1"));
       document = collection.GetOne("1");
-      Assert.AreEqual(3, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(3));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": MICROSECOND('12:00:00.123456') }").Bind("id", "1"));
       document = collection.GetOne("1");
-      Assert.AreEqual(123456, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(123456));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": QUARTER('2008-04-01') }").Bind("id", "1"));
       document = collection.GetOne("1");
-      Assert.AreEqual(2, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(2));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": TIME('2003-12-31 01:02:03') }").Bind("id", "1"));
       document = collection.GetOne("1");
-      Assert.AreEqual("01:02:03.000000", document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo("01:02:03.000000"));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": DATE('2003-12-31 01:02:03') }").Bind("id", "1"));
       document = collection.GetOne("1");
-      Assert.AreEqual("2003-12-31", document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo("2003-12-31"));
     }
 
     [Test]
@@ -705,19 +705,19 @@ public void PatchUsingOtherKnownFunctions()
       string t1 = "{\"_id\": \"1\", \"name\": \"Alice\" }";
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(t1));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"otherValue\": CHAR(77, 121, 83, 81, '76') }").Bind("id", "1"));
       DbDoc document = collection.GetOne("1");
-      Assert.AreEqual("base64:type15:TXlTUUw=", document["otherValue"]);
+      Assert.That(document["otherValue"], Is.EqualTo("base64:type15:TXlTUUw="));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"otherValue\": HEX('abc') }").Bind("id", "1"));
       document = collection.GetOne("1");
-      Assert.AreEqual("616263", document["otherValue"]);
+      Assert.That(document["otherValue"], Is.EqualTo("616263"));
 
       ExecuteModifyStatement(collection.Modify("_id = :id").Patch("{ \"otherValue\": BIN(12) }").Bind("id", "1"));
       document = collection.GetOne("1");
-      Assert.AreEqual("1100", document["otherValue"]);
+      Assert.That(document["otherValue"], Is.EqualTo("1100"));
     }
 
     #region WL14389
@@ -736,61 +736,61 @@ public void ModifyPatchMultipleRecords_S1()
         new {_id = 4, title = "Book 4", pages = 50,age = "12"}
       };
       Result r = collection.Add(docs).Execute();
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
       var document = collection.GetOne("1");
       var jsonParams = new { title = "Book 100" };
       r = collection.Modify("age = :age").Patch(jsonParams).
           Bind("age", "12").Execute();//Multiple Records
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
       string jsonParams1 = "{ \"title\": \"Book 400\"}";
       r = collection.Modify("age = :age").Patch(jsonParams1).
           Bind("age", "18").Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       document = collection.GetOne("1");
-      Assert.AreEqual("Book 100", document["title"]);
+      Assert.That(document["title"], Is.EqualTo("Book 100"));
       document = collection.GetOne("4");
-      Assert.AreEqual("Book 100", document["title"]);
+      Assert.That(document["title"], Is.EqualTo("Book 100"));
       document = collection.GetOne("2");
-      Assert.AreEqual("Book 400", document["title"]);
+      Assert.That(document["title"], Is.EqualTo("Book 400"));
 
       string splName = "A*b";
       jsonParams1 = "{\"data1\":\"" + splName + "\"}";
       r = collection.Modify("age = :age").Patch(jsonParams1).
           Bind("age", "18").Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       document = collection.GetOne("2");
-      Assert.AreEqual(splName, document["data1"]);
+      Assert.That(document["data1"], Is.EqualTo(splName));
 
       splName = "A/b";
       jsonParams1 = "{\"data1\":\"" + splName + "\"}";
       r = collection.Modify("age = :age").Patch(jsonParams1).
           Bind("age", "18").Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       document = collection.GetOne("2");
-      Assert.AreEqual(splName, document["data1"]);
+      Assert.That(document["data1"], Is.EqualTo(splName));
 
       splName = "A&b!c@d#e$f%g^h&i(j)k-l+m=0_p~q`r}s{t][.,?/><";
       jsonParams1 = "{\"data1\":\"" + splName + "\"}";
       r = collection.Modify("age = :age").Patch(jsonParams1).
           Bind("age", "18").Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       document = collection.GetOne("2");
-      Assert.AreEqual(splName, document["data1"]);
+      Assert.That(document["data1"], Is.EqualTo(splName));
 
       //Large Key Length
       string myString = new string('*', 65535);
       jsonParams1 = "{\"data1\":\"" + myString + "\"}";
       r = collection.Modify("age = :age").Patch(jsonParams1).
           Bind("age", "18").Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       document = collection.GetOne("2");
-      Assert.AreEqual(myString, document["data1"]);
+      Assert.That(document["data1"], Is.EqualTo(myString));
 
       collection = CreateCollection("test");
       r = collection.Add(documentsAsJsonStrings).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Add(documentAsJsonString2).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       collection.Modify("_id = :id").Patch("{ \"field 1\": \"one\", \"field 2\": \"two\", \"field 3\": \"three\" }").
@@ -807,26 +807,20 @@ public void ModifyPatchMultipleRecords_S1()
                 "\"one\", \"field2 12\": \"two\", \"field3 13\": \"three\" } } }").
          Bind("director", "Steven Spielberg").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("one", document["field 1"]);
-      Assert.AreEqual("two", document["field 2"]);
-      Assert.AreEqual("three", document["field 3"]);
-      Assert.AreEqual("one",
-          (((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["field1 11"]);
-      Assert.AreEqual("two",
-          (((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["field2 12"]);
-      Assert.AreEqual("three",
-          (((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["field3 13"]);
+      Assert.That(document["field 1"], Is.EqualTo("one"));
+      Assert.That(document["field 2"], Is.EqualTo("two"));
+      Assert.That(document["field 3"], Is.EqualTo("three"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["field1 11"], Is.EqualTo("one"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["field2 12"], Is.EqualTo("two"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["field3 13"], Is.EqualTo("three"));
 
       document = collection.GetOne("123456789asdferdfghhghjh12334");
-      Assert.AreEqual("one", document["field 1"]);
-      Assert.AreEqual("two", document["field 2"]);
-      Assert.AreEqual("three", document["field 3"]);
-      Assert.AreEqual("one",
-          (((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["field1 11"]);
-      Assert.AreEqual("two",
-          (((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["field2 12"]);
-      Assert.AreEqual("three",
-          (((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["field3 13"]);
+      Assert.That(document["field 1"], Is.EqualTo("one"));
+      Assert.That(document["field 2"], Is.EqualTo("two"));
+      Assert.That(document["field 3"], Is.EqualTo("three"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["field1 11"], Is.EqualTo("one"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["field2 12"], Is.EqualTo("two"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["field3 13"], Is.EqualTo("three"));
 
       collection.Modify("language = :language").
           Patch("{ \"additionalinfo\": { \"director\": { \"test1\": " +
@@ -837,25 +831,19 @@ public void ModifyPatchMultipleRecords_S1()
           Bind("language", "English").Execute();
       //Multiple Records
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("check1", document["field 1"]);
-      Assert.AreEqual("check2", document["field 2"]);
-      Assert.AreEqual("check3", document["field 3"]);
-      Assert.AreEqual("one",
-          (((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["test1"]);
-      Assert.AreEqual("two",
-          (((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["test2"]);
-      Assert.AreEqual("three",
-          (((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["test3"]);
+      Assert.That(document["field 1"], Is.EqualTo("check1"));
+      Assert.That(document["field 2"], Is.EqualTo("check2"));
+      Assert.That(document["field 3"], Is.EqualTo("check3"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["test1"], Is.EqualTo("one"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["test2"], Is.EqualTo("two"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["test3"], Is.EqualTo("three"));
       document = collection.GetOne("123456789asdferdfghhghjh12334");
-      Assert.AreEqual("check1", document["field 1"]);
-      Assert.AreEqual("check2", document["field 2"]);
-      Assert.AreEqual("check3", document["field 3"]);
-      Assert.AreEqual("one",
-          (((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["test1"]);
-      Assert.AreEqual("two",
-          (((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["test2"]);
-      Assert.AreEqual("three",
-          (((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["test3"]);
+      Assert.That(document["field 1"], Is.EqualTo("check1"));
+      Assert.That(document["field 2"], Is.EqualTo("check2"));
+      Assert.That(document["field 3"], Is.EqualTo("check3"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["test1"], Is.EqualTo("one"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["test2"], Is.EqualTo("two"));
+      Assert.That((((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"]))["test3"], Is.EqualTo("three"));
 
       collection = CreateCollection("test");
       var data2 = new DbDoc(@"{ ""_id"": -1, ""pages"": 20,
@@ -865,13 +853,13 @@ public void ModifyPatchMultipleRecords_S1()
                           ]
                       }");
       r = collection.Add(data2).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       document = collection.GetOne("-1");
-      Assert.AreEqual("20", document["pages"].ToString());
+      Assert.That(document["pages"].ToString(), Is.EqualTo("20"));
       collection.Modify("_id = :id").Patch("{ \"pages\": \"200\" }").
           Bind("id", -1).Execute();
       document = collection.GetOne("-1");
-      Assert.AreEqual("200", document["pages"]);
+      Assert.That(document["pages"], Is.EqualTo("200"));
       data2 = new DbDoc(@"{ ""_id"": 1, ""pages"": 20,
                           ""books"": [
                             {""_id"" : 10, ""title"" : ""Book 10""},
@@ -884,10 +872,10 @@ public void ModifyPatchMultipleRecords_S1()
           Bind("id", "1").Execute();
       document = collection.GetOne("1");
       object[] books = document["books"] as object[];
-      Assert.AreEqual(1, books.Length);
+      Assert.That(books.Length, Is.EqualTo(1));
       Dictionary<string, object> book1 = books[0] as Dictionary<string, object>;
-      Assert.AreEqual("11", book1["_id"]);
-      Assert.AreEqual("Ganges", book1["title"]);
+      Assert.That(book1["_id"], Is.EqualTo("11"));
+      Assert.That(book1["title"], Is.EqualTo("Ganges"));
       var t1 =
           "{\"_id\": \"1\", \"name\": \"Alice\", \"address\": [{\"zip\": \"12345\", \"city\": \"Los Angeles\", \"street\": \"32 Main str\"}]}";
       var t2 =
@@ -898,65 +886,65 @@ public void ModifyPatchMultipleRecords_S1()
 
       collection = CreateCollection("test");
       r = collection.Add(t1).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Add(t2).Execute();
       //update the name and zip code of match
       collection.Modify("_id = :id").Patch("{\"name\": \"Joe\", \"address\": [{\"zip\":\"91234\"}]}").Bind("id", "1").Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual("Joe", document["name"]);
+      Assert.That(document["name"], Is.EqualTo("Joe"));
       object[] address = document["address"] as object[];
-      Assert.AreEqual(1, address.Length);
+      Assert.That(address.Length, Is.EqualTo(1));
       Dictionary<string, object> address1 = address[0] as Dictionary<string, object>;
-      Assert.AreEqual("91234", address1["zip"]);
+      Assert.That(address1["zip"], Is.EqualTo("91234"));
 
       collection = CreateCollection("test");
       r = collection.Add(t1).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Add(t2).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Add(t3).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       collection.Modify("_id = :id").Patch("{\"name\": \"Joe\", \"address\": [{\"zip1\":\"91234\"},{\"zip2\":\"10000\"}]}").
           Bind("id", "3").Execute();
       document = collection.GetOne("3");
-      Assert.AreEqual("Joe", document["name"]);
+      Assert.That(document["name"], Is.EqualTo("Joe"));
       address = document["address"] as object[];
-      Assert.AreEqual(2, address.Length);
+      Assert.That(address.Length, Is.EqualTo(2));
       address1 = address[0] as Dictionary<string, object>;
-      Assert.AreEqual("91234", address1["zip1"]);
+      Assert.That(address1["zip1"], Is.EqualTo("91234"));
       address1 = address[1] as Dictionary<string, object>;
-      Assert.AreEqual("10000", address1["zip2"]);
+      Assert.That(address1["zip2"], Is.EqualTo("10000"));
 
       collection = CreateCollection("test");
       var t = "{\"_id\": \"id1004\", \"age\": 1, \"misc\": 1.2, \"name\": { \"last\": \"ABCDEF3\", \"first\": \"ABCDEF1\", \"middle\": { \"middle1\": \"ABCDEF21\", \"middle2\": \"ABCDEF22\"}}}";
       r = collection.Add(t).Execute();
       collection.Modify("_id = :id").Patch("{\"name\":{\"middle\":{\"middle1\": {\"middle11\" : \"ABCDEF211\", \"middle12\" : \"ABCDEF212\", \"middle13\" : \"ABCDEF213\"}}}}").Bind("id", "id1004").Execute();
       document = collection.GetOne("id1004");
-      Assert.AreEqual("ABCDEF211", document["name.middle.middle1.middle11"]);
-      Assert.AreEqual("ABCDEF212", document["name.middle.middle1.middle12"]);
-      Assert.AreEqual("ABCDEF213", document["name.middle.middle1.middle13"]);
+      Assert.That(document["name.middle.middle1.middle11"], Is.EqualTo("ABCDEF211"));
+      Assert.That(document["name.middle.middle1.middle12"], Is.EqualTo("ABCDEF212"));
+      Assert.That(document["name.middle.middle1.middle13"], Is.EqualTo("ABCDEF213"));
 
       t1 = "{\"_id\": \"1001\", \"ARR\":[1,2,3], \"ARR1\":[\"name1\",\"name2\", \"name3\"]}";
       t2 = "{\"_id\": \"1002\", \"ARR\":[1,1,2], \"ARR1\":[\"name1\",\"name2\", \"name3\"]}";
       t3 = "{\"_id\": \"1003\", \"ARR\":[1,4,5], \"ARR1\":[\"name1\",\"name2\", \"name3\"]}";
       collection = CreateCollection("test");
       r = collection.Add(t1).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Add(t2).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Add(t3).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       collection.Modify("_id = :_id").
           Patch("{\"ARR\":[6,8,3],\"ARR1\":[\"changed name1\",\"changed name2\", \"changed name3\"]}").
           Bind("_id", "1001").Execute();
       document = collection.GetOne("1001");
 
       object[] arr = document["ARR1"] as object[];
-      Assert.AreEqual(3, arr.Length);
+      Assert.That(arr.Length, Is.EqualTo(3));
       int j = 1;
       for (int i = 0; i < arr.Length; i++)
       {
-        Assert.AreEqual("changed name" + j, arr[i]);
+        Assert.That(arr[i], Is.EqualTo("changed name" + j));
         j++;
       }
 
@@ -970,34 +958,34 @@ public void ModifyPatchMultipleRecords_S1()
 
       collection = CreateCollection("test");
       r = collection.Add(t1).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Add(t2).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       r = collection.Add(t3).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       collection.Modify("_id = :id").
           Patch("{\"address\": null, \"zip\": $.address.zip, \"street\": $.address.street, \"city\": upper($.address.city)}").Bind("id", "1").
           Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual("Alice", document["name"]);
-      Assert.AreEqual("32 Main str", document["street"]);
-      Assert.AreEqual("LOS ANGELES", document["city"]);
-      Assert.AreEqual("12345", document["zip"]);
+      Assert.That(document["name"], Is.EqualTo("Alice"));
+      Assert.That(document["street"], Is.EqualTo("32 Main str"));
+      Assert.That(document["city"], Is.EqualTo("LOS ANGELES"));
+      Assert.That(document["zip"], Is.EqualTo("12345"));
 
       t1 =
           "{\"_id\": \"1\", \"name\": \"Alice\", \"address\": {\"test\":{\"zip\": \"12345\", " +
           "\"city\": \"Los Angeles\", \"street\": \"32 Main str\"}}}";
       collection = CreateCollection("test");
       r = collection.Add(t1).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       collection.Modify("_id = :id").
           Patch("{\"address\":{\"test\": null,\"zip\":$.address.test.zip,\"city\": lower($.address.test.city)}}").Bind("id", "1").
           Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual("Alice", document["name"]);
-      Assert.AreEqual("los angeles", document["address.city"]);
-      Assert.AreEqual("12345", document["address.zip"]);
+      Assert.That(document["name"], Is.EqualTo("Alice"));
+      Assert.That(document["address.city"], Is.EqualTo("los angeles"));
+      Assert.That(document["address.zip"], Is.EqualTo("12345"));
 
     }
 
@@ -1088,7 +1076,7 @@ public void ModifyInNestedObjects()
         var document1 = collection.GetOne("1002");
         var test = "ARR" + i;
         object[] arr1 = document1[test] as object[];
-        Assert.AreEqual(3, arr1.Length);
+        Assert.That(arr1.Length, Is.EqualTo(3));
         i = 0;
         j = 0;
         for (i = 0; i < arr1.Length; i++)
@@ -1097,65 +1085,65 @@ public void ModifyInNestedObjects()
           if (i == 1)
           {
             object[] arr2 = arr1[1] as object[];
-            Assert.AreEqual(3, arr2.Length);
+            Assert.That(arr2.Length, Is.EqualTo(3));
             for (j = 0; j < arr2.Length; j++)
             {
 
               if (j == 1)
               {
                 object[] arr3 = arr2[1] as object[];
-                Assert.AreEqual(3, arr3.Length);
+                Assert.That(arr3.Length, Is.EqualTo(3));
                 for (k = 0; k < arr3.Length; k++)
                 {
 
                   if (k == 1)
                   {
                     object[] arr4 = arr3[1] as object[];
-                    Assert.AreEqual(3, arr4.Length);
+                    Assert.That(arr4.Length, Is.EqualTo(3));
                     for (l = 0; l < arr4.Length; l++)
                     {
 
                       if (l == 1)
                       {
                         object[] arr5 = arr4[1] as object[];
-                        Assert.AreEqual(3, arr5.Length);
+                        Assert.That(arr5.Length, Is.EqualTo(3));
                         for (m = 0; m < arr5.Length; m++)
                         {
 
                           if (m == 1)
                           {
                             object[] arr6 = arr5[1] as object[];
-                            Assert.AreEqual(1, arr6.Length);
+                            Assert.That(arr6.Length, Is.EqualTo(1));
                             if (arr6.Length == 1)
-                              Assert.AreEqual(4, arr6[0]);
+                              Assert.That(arr6[0], Is.EqualTo(4));
                           }
                           else
-                            Assert.AreEqual(5, arr5[m]);
+                            Assert.That(arr5[m], Is.EqualTo(5));
                           if (m == 2)
                             break;
                         }
                       }
                       else
-                        Assert.AreEqual(6, arr4[l]);
+                        Assert.That(arr4[l], Is.EqualTo(6));
                       if (l == 2)
                         break;
 
                     }
                   }
                   else
-                    Assert.AreEqual(7, arr3[k]);
+                    Assert.That(arr3[k], Is.EqualTo(7));
                   if (k == 2)
                     break;
                 }
               }
               if (j == 0 || j == 2)
-                Assert.AreEqual(8, arr2[j]);
+                Assert.That(arr2[j], Is.EqualTo(8));
               if (j == 2)
                 break;
             }
           }
           else
-            Assert.AreEqual(9, arr1[i]);
+            Assert.That(arr1[i], Is.EqualTo(9));
           if (i == 2)
             break;
         }
@@ -1180,7 +1168,7 @@ public void ModifyInNestedObjects()
       {
         var test = "ARR" + i;
         object[] arr1 = document[test] as object[];
-        Assert.AreEqual(3, arr1.Length);
+        Assert.That(arr1.Length, Is.EqualTo(3));
         i = 0;
         j = 0;
         for (i = 0; i < arr1.Length; i++)
@@ -1189,65 +1177,65 @@ public void ModifyInNestedObjects()
           if (i == 1)
           {
             object[] arr2 = arr1[1] as object[];
-            Assert.AreEqual(3, arr2.Length);
+            Assert.That(arr2.Length, Is.EqualTo(3));
             for (j = 0; j < arr2.Length; j++)
             {
 
               if (j == 1)
               {
                 object[] arr3 = arr2[1] as object[];
-                Assert.AreEqual(3, arr3.Length);
+                Assert.That(arr3.Length, Is.EqualTo(3));
                 for (k = 0; k < arr3.Length; k++)
                 {
 
                   if (k == 1)
                   {
                     object[] arr4 = arr3[1] as object[];
-                    Assert.AreEqual(3, arr4.Length);
+                    Assert.That(arr4.Length, Is.EqualTo(3));
                     for (l = 0; l < arr4.Length; l++)
                     {
 
                       if (l == 1)
                       {
                         object[] arr5 = arr4[1] as object[];
-                        Assert.AreEqual(3, arr5.Length);
+                        Assert.That(arr5.Length, Is.EqualTo(3));
                         for (m = 0; m < arr5.Length; m++)
                         {
 
                           if (m == 1)
                           {
                             object[] arr6 = arr5[1] as object[];
-                            Assert.AreEqual(1, arr6.Length);
+                            Assert.That(arr6.Length, Is.EqualTo(1));
                             if (arr6.Length == 1)
-                              Assert.AreEqual(4, arr6[0]);
+                              Assert.That(arr6[0], Is.EqualTo(4));
                           }
                           else
-                            Assert.AreEqual(5, arr5[m]);
+                            Assert.That(arr5[m], Is.EqualTo(5));
                           if (m == 2)
                             break;
                         }
                       }
                       else
-                        Assert.AreEqual(6, arr4[l]);
+                        Assert.That(arr4[l], Is.EqualTo(6));
                       if (l == 2)
                         break;
 
                     }
                   }
                   else
-                    Assert.AreEqual(7, arr3[k]);
+                    Assert.That(arr3[k], Is.EqualTo(7));
                   if (k == 2)
                     break;
                 }
               }
               if (j == 0 || j == 2)
-                Assert.AreEqual(8, arr2[j]);
+                Assert.That(arr2[j], Is.EqualTo(8));
               if (j == 2)
                 break;
             }
           }
           else
-            Assert.AreEqual(9, arr1[i]);
+            Assert.That(arr1[i], Is.EqualTo(9));
           if (i == 2)
             break;
         }
@@ -1259,71 +1247,71 @@ public void ModifyInNestedObjects()
       listDocs.Add(new DbDoc(documentAsJsonString2));
       collection = CreateCollection("test");
       Result r = collection.Add(listDocs.ToArray()).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
 
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("AFRICAN EGG", document["title"]);
+      Assert.That(document["title"], Is.EqualTo("AFRICAN EGG"));
       // Modify Using ID and Patch Title
       collection.Modify("_id = :id").Patch("{ \"title\": \"The African Egg\" }").
           Bind("id", "a6f4b93e1a264a108393524f29546a8c").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("The African Egg", document["title"]);
+      Assert.That(document["title"], Is.EqualTo("The African Egg"));
 
-      Assert.AreEqual(57, ((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"])["age"]);
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"])["age"], Is.EqualTo(57));
       // Modify Using additionalinfo.director.name = :director and Patch Age 67
       collection.Modify("additionalinfo.director.name = :director").
           Patch("{ \"additionalinfo\": { \"director\": { \"age\": 67 } } }").
           Bind("director", "Sharice Legaspi").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual(67, ((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"])["age"]);
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"])["age"], Is.EqualTo(67));
 
       // Modify Using _id=:id and Patch Age 77
       collection.Modify("_id = :id").
           Patch("{ \"additionalinfo\": { \"director\": { \"age\": 77 } } }").
           Bind("id", "a6f4b93e1a264a108393524f29546a8c").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual(77, ((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"])["age"]);
+      Assert.That(((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["director"])["age"], Is.EqualTo(77));
 
       // Modify Using _id=:id and Patch contains movie title
       collection.Modify("_id = :id").
           Patch("{ \"title\": { \"movie\": \"The African Egg\"} }").
           Bind("id", "a6f4b93e1a264a108393524f29546a8c").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("The African Egg", ((Dictionary<string, object>)document["title"])["movie"]);
+      Assert.That(((Dictionary<string, object>)document["title"])["movie"], Is.EqualTo("The African Egg"));
 
       // Modify Using _id=:id and Patch additionalinfo Birthplace director country countryActual
       collection.Modify("_id = :id").
           Patch("{ \"additionalinfo\": { \"director\": { \"birthplace\": { \"country\": { \"countryActual\": \"India\" } } } } }").
           Bind("id", "123456789asdferdfghhghjh12334").Execute();
       document = collection.GetOne("123456789asdferdfghhghjh12334");
-      Assert.AreEqual("India", document["additionalinfo.director.birthplace.country.countryActual"]);
+      Assert.That(document["additionalinfo.director.birthplace.country.countryActual"], Is.EqualTo("India"));
 
       // Modify Using _id=:id and Patch additionalinfo Birthplace director country countryActual"
       collection.Modify("_id = :id").
           Patch("{ \"additionalinfo\": { \"director\": { \"birthplace\": { \"country\": { \"city\": \"NewDelhi\",\"countryActual\": \"India\" } } } } }").
           Bind("id", "123456789asdferdfghhghjh12334").Execute();
       document = collection.GetOne("123456789asdferdfghhghjh12334");
-      Assert.AreEqual("India", document["additionalinfo.director.birthplace.country.countryActual"]);
-      Assert.AreEqual("NewDelhi", document["additionalinfo.director.birthplace.country.city"]);
+      Assert.That(document["additionalinfo.director.birthplace.country.countryActual"], Is.EqualTo("India"));
+      Assert.That(document["additionalinfo.director.birthplace.country.city"], Is.EqualTo("NewDelhi"));
 
       // Modify Using _id=:id and Patch additionalinfo Birthplace director country to replace an array
       collection.Modify("_id = :id").
           Patch("{ \"additionalinfo\": { \"director\": { \"birthplace\": { \"country\": \"India\" } } } }").
           Bind("id", "123456789asdferdfghhghjh12334").Execute();
       document = collection.GetOne("123456789asdferdfghhghjh12334");
-      Assert.AreEqual("India", document["additionalinfo.director.birthplace.country"]);
+      Assert.That(document["additionalinfo.director.birthplace.country"], Is.EqualTo("India"));
 
       // Modify Using _id=:id and Patch additionalinfo writers to replace an array
       collection.Modify("_id = :id").
           Patch("{ \"additionalinfo\": { \"writers\": \"Jeoff Archer\" } }").
           Bind("id", "123456789asdferdfghhghjh12334").Execute();
       document = collection.GetOne("123456789asdferdfghhghjh12334");
-      Assert.AreEqual("Jeoff Archer", document["additionalinfo.writers"]);
+      Assert.That(document["additionalinfo.writers"], Is.EqualTo("Jeoff Archer"));
 
       //Reset the docs
       collection = CreateCollection("test");
       r = collection.Add(listDocs.ToArray()).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
 
       // Modify Using _id=:id and Patch contains blank
       collection.Modify("_id = :id").Patch("{ \"additionalinfo\": \"\" }").
@@ -1342,7 +1330,7 @@ public void ModifyPatchAtDepthMultipleArrays_S1()
       listDocs.Add(documentsAsDbDocs[0]);
       listDocs.Add(new DbDoc(documentAsJsonString2));
       Result r = collection.Add(listDocs.ToArray()).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
       object[] path = null;
       DbDoc document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       Assert.Throws<InvalidOperationException>(() => path = document["translations"] as object[]);
@@ -1352,7 +1340,7 @@ public void ModifyPatchAtDepthMultipleArrays_S1()
           Bind("id", "a6f4b93e1a264a108393524f29546a8c").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       path = document["translations"] as object[];
-      Assert.AreEqual("Spanish", path[0],
+      Assert.That(path[0], Is.EqualTo("Spanish"),
           "Verify transalations field is present or not");
       collection.Modify("_id = :id").
           Patch("{ \"translations\": null }").
@@ -1365,7 +1353,7 @@ public void ModifyPatchAtDepthMultipleArrays_S1()
           Patch("{ \"additionalinfo\": { \"director\": { \"mobile\": \"9876543210\" } } }").
           Bind("age", 57).Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("9876543210", document["additionalinfo.director.mobile"],
+      Assert.That(document["additionalinfo.director.mobile"], Is.EqualTo("9876543210"),
           "Verify mobile field is present or not");
       collection.Modify("additionalinfo.director.name = :director").
           Patch("{ \"additionalinfo\": { \"director\": { \"mobile\": null } } }").
@@ -1378,7 +1366,7 @@ public void ModifyPatchAtDepthMultipleArrays_S1()
           Patch("{ \"additionalinfo\": { \"musicby\": \"The Sakila\" } }").
           Bind("id", "a6f4b93e1a264a108393524f29546a8c").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("The Sakila", document["additionalinfo.musicby"],
+      Assert.That(document["additionalinfo.musicby"], Is.EqualTo("The Sakila"),
        "Verify musicby field is present or not");
       collection.Modify("_id = :id").Patch("{ \"additionalinfo\": { \"musicby\": null } }").
           Bind("id", "a6f4b93e1a264a108393524f29546a8c").Execute();
@@ -1390,7 +1378,7 @@ public void ModifyPatchAtDepthMultipleArrays_S1()
           Patch("{\"additionalinfo\": { \"director\": { \"awards\": { \"genre\": \"Action\" } } } }").
           Bind("id", "a6f4b93e1a264a108393524f29546a8c").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("Action", document["additionalinfo.director.awards.genre"],
+      Assert.That(document["additionalinfo.director.awards.genre"], Is.EqualTo("Action"),
        "Verify musicby field is present or not");
       collection.Modify("_id = :id").
           Patch("{\"additionalinfo\": { \"director\": { \"awards\": { \"genre\": null } } } }").
@@ -1408,7 +1396,7 @@ public void ModifyPatchAtDepthMultipleArrays_S2()
       Collection collection = CreateCollection("test");
       Result r = collection.Add("{ \"_id\": \"123\", \"email\": \"alice@ora.com\", " +
           "\"startDate\": \"4/1/2017\" }").Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       var patch1 = new
       {
         email = new MySqlExpression("UPPER($.email)")
@@ -1460,16 +1448,16 @@ public void ModifyPatchAtDepthMultipleArrays_S2()
 
       collection.Modify("true").Patch(patch1).Execute();
       document = collection.GetOne("123");
-      Assert.AreEqual("ALICE@ORA.COM", document["email"]);
+      Assert.That(document["email"], Is.EqualTo("ALICE@ORA.COM"));
       collection.Modify("true").Patch(patch2).Execute();
       document = collection.GetOne("123");
-      Assert.AreEqual("alice@ora.com", document["email"]);
+      Assert.That(document["email"], Is.EqualTo("alice@ora.com"));
       collection.Modify("true").Patch(patch3).Execute();
       document = collection.GetOne("123");
-      Assert.AreEqual("NoSQL", document["email"]);
+      Assert.That(document["email"], Is.EqualTo("NoSQL"));
       collection.Modify("true").Patch(patch4).Execute();
       document = collection.GetOne("123");
-      Assert.AreEqual("base64:type15:TXlTUUw=", document["email"]);
+      Assert.That(document["email"], Is.EqualTo("base64:type15:TXlTUUw="));
       collection.Modify("true").Patch(patch5).Execute();
       document = collection.GetOne("123");
       DbDoc test = null;
@@ -1480,84 +1468,84 @@ public void ModifyPatchAtDepthMultipleArrays_S2()
           "\"startDate\": \"4/1/2017\" }").Execute();
       collection.Modify("true").Patch(patch6).Execute();
       document = collection.GetOne("123");
-      Assert.AreEqual("foo", document["email"]);
+      Assert.That(document["email"], Is.EqualTo("foo"));
       collection.Modify("true").Patch(patch7).Execute();
       document = collection.GetOne("123");
-      Assert.AreEqual("MySQLMySQLMySQL", document["email"]);
+      Assert.That(document["email"], Is.EqualTo("MySQLMySQLMySQL"));
       collection.Modify("true").Patch(patch8).Execute();
       document = collection.GetOne("123");
-      Assert.AreEqual("cba", document["email"]);
+      Assert.That(document["email"], Is.EqualTo("cba"));
       collection.Modify("true").Patch(patch9).Execute();
       document = collection.GetOne("123");
-      Assert.AreEqual("rbar", document["email"]);
+      Assert.That(document["email"], Is.EqualTo("rbar"));
       collection.Modify("true").Patch(patch10).Execute();
       document = collection.GetOne("123");
-      Assert.AreEqual("WwWwWw.mysql.com", document["email"]);
+      Assert.That(document["email"], Is.EqualTo("WwWwWw.mysql.com"));
       collection.Modify("true").Patch(patch11).Execute();
       document = collection.GetOne("123");
-      Assert.AreEqual("616263", document["email"]);
+      Assert.That(document["email"], Is.EqualTo("616263"));
       collection.Modify("true").Patch(patch12).Execute();
       document = collection.GetOne("123");
-      Assert.AreEqual("1100", document["email"]);
+      Assert.That(document["email"], Is.EqualTo("1100"));
 
       string t1 = "{\"_id\": \"1\", \"name\": \"Alice\" }";
       collection = CreateCollection("test");
       r = collection.Add(t1).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": YEAR('2000-01-01') }").Bind("id", "1").Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual(2000, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(2000));
 
       collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": MONTH('2008-02-03') }").Bind("id", "1").Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual(2, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(2));
 
       collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": WEEK('2008-02-20') }").Bind("id", "1").Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual(7, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(7));
 
       collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": DAY('2008-02-20') }").Bind("id", "1").Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual(20, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(20));
 
       collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": HOUR('10:05:03') }").Bind("id", "1").Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual(10, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(10));
 
       collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": MINUTE('2008-02-03 10:05:03') }").Bind("id", "1").Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual(5, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(5));
 
       collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": SECOND('10:05:03') }").Bind("id", "1").Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual(3, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(3));
 
       collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": MICROSECOND('12:00:00.123456') }").Bind("id", "1").Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual(123456, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(123456));
 
       collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": QUARTER('2008-04-01') }").Bind("id", "1").Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual(2, document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo(2));
 
       collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": TIME('2003-12-31 01:02:03') }").Bind("id", "1").Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual("01:02:03.000000", document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo("01:02:03.000000"));
 
       collection.Modify("_id = :id").Patch("{ \"dateAndTimeValue\": DATE('2003-12-31 01:02:03') }").Bind("id", "1").Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual("2003-12-31", document["dateAndTimeValue"]);
+      Assert.That(document["dateAndTimeValue"], Is.EqualTo("2003-12-31"));
 
       List<DbDoc> listDocs = new List<DbDoc>();
       listDocs.Add(documentsAsDbDocs[0]);
       listDocs.Add(new DbDoc(documentAsJsonString2));
       r = collection.Add(listDocs.ToArray()).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
 
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       object[] actors = document["actors"] as object[];
-      Assert.AreEqual(3, actors.Length);
+      Assert.That(actors.Length, Is.EqualTo(3));
       Dictionary<string, object> actor0 = actors[0] as Dictionary<string, object>;
 
       Assert.Throws<KeyNotFoundException>(() => test = (DbDoc)actor0["age"]);
@@ -1567,52 +1555,52 @@ public void ModifyPatchAtDepthMultipleArrays_S2()
      "\"DOB\": \"19 Mar 1982\", \"citizen\": \"USA\"}}}";
       collection = CreateCollection("test");
       r = collection.Add(t1).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       collection.Modify("_id = :id").
           Patch("{\"details\":{\"personal\": null,\"mobile\":$.details.personal.mobile,\"yearofbirth\":" +
           "CAST(SUBSTRING_INDEX($.details.personal.DOB, ' ', -1) AS DECIMAL)}}").Bind("id", "1").
          Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual("Alice", document["name"]);
-      Assert.AreEqual("9876543210", document["details.mobile"]);
-      Assert.AreEqual("1982", document["details.yearofbirth"].ToString());
+      Assert.That(document["name"], Is.EqualTo("Alice"));
+      Assert.That(document["details.mobile"], Is.EqualTo("9876543210"));
+      Assert.That(document["details.yearofbirth"].ToString(), Is.EqualTo("1982"));
       collection = CreateCollection("test");
       r = collection.Add(t1).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       collection.Modify("_id = :id").
           Patch("{\"details\":{\"personal\": null,\"mobile\":$.details.personal.mobile,\"currentyear\":" +
           "CURDATE()}}").Bind("id", "1").
          Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual("Alice", document["name"]);
-      Assert.AreEqual("9876543210", document["details.mobile"]);
-      Assert.AreEqual(document["details.currentyear"].ToString(), document["details.currentyear"].ToString(), "Matching the current date");
+      Assert.That(document["name"], Is.EqualTo("Alice"));
+      Assert.That(document["details.mobile"], Is.EqualTo("9876543210"));
+      Assert.That(document["details.currentyear"].ToString(), Is.EqualTo(document["details.currentyear"].ToString()), "Matching the current date");
       collection = CreateCollection("test");
       r = collection.Add(t1).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       collection.Modify("_id = :id").
           Patch("{\"details\":{\"personal\": null,\"mobile\":$.details.personal.mobile,\"currentyear\":" +
           "Year(CURDATE())}}").Bind("id", "1").
          Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual("Alice", document["name"]);
-      Assert.AreEqual("9876543210", document["details.mobile"]);
-      Assert.AreEqual(document["details.currentyear"].ToString(), document["details.currentyear"].ToString());
+      Assert.That(document["name"], Is.EqualTo("Alice"));
+      Assert.That(document["details.mobile"], Is.EqualTo("9876543210"));
+      Assert.That(document["details.currentyear"].ToString(), Is.EqualTo(document["details.currentyear"].ToString()));
       collection = CreateCollection("test");
       r = collection.Add(t1).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
       collection.Modify("_id = :id").
           Patch("{\"details\":{\"personal\": null,\"mobile\":$.details.personal.mobile,\"currentage\":" +
           "Year(CURDATE()) - CAST(SUBSTRING_INDEX($.details.personal.DOB, ' ', -1) AS DECIMAL)}}").Bind("id", "1").
          Execute();
       document = collection.GetOne("1");
-      Assert.AreEqual("Alice", document["name"]);
-      Assert.AreEqual("9876543210", document["details.mobile"]);
-      Assert.AreEqual(document["details.currentage"].ToString(), document["details.currentage"].ToString());
+      Assert.That(document["name"], Is.EqualTo("Alice"));
+      Assert.That(document["details.mobile"], Is.EqualTo("9876543210"));
+      Assert.That(document["details.currentage"].ToString(), Is.EqualTo(document["details.currentage"].ToString()));
 
       collection = CreateCollection("test");
       r = collection.Add(listDocs.ToArray()).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       // Get root array.
       Assert.Throws<InvalidOperationException>(() => test = (DbDoc)document["audio"]);
@@ -1620,41 +1608,41 @@ public void ModifyPatchAtDepthMultipleArrays_S2()
       collection.Modify("true").
           Patch("{ \"audio\": CONCAT($.language, ', no subtitles') }").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("English, no subtitles", document["audio"]);
+      Assert.That(document["audio"], Is.EqualTo("English, no subtitles"));
 
       collection = CreateCollection("test");
       r = collection.Add(listDocs.ToArray()).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       Assert.Throws<InvalidOperationException>(() => test = (DbDoc)document["audio"]);
 
       collection.Modify("true").Patch("{ \"audio\": CONCAT(UPPER($.language), ', No Subtitles') }").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("ENGLISH, No Subtitles", document["audio"]);
+      Assert.That(document["audio"], Is.EqualTo("ENGLISH, No Subtitles"));
 
       collection = CreateCollection("test");
       r = collection.Add(listDocs.ToArray()).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
 
       collection.Modify("_id = :id").Patch("{ \"_id\": replace(UUID(), '-', '') }").
           Bind("id", "a6f4b93e1a264a108393524f29546a8c").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("a6f4b93e1a264a108393524f29546a8c", document.Id);
+      Assert.That(document.Id, Is.EqualTo("a6f4b93e1a264a108393524f29546a8c"));
 
       collection = CreateCollection("test");
       r = collection.Add(listDocs.ToArray()).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
       Assert.Throws<InvalidOperationException>(() => test = (DbDoc)document["additionalinfo._id"]);
 
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       collection.Modify("_id = :id").Patch("{ \"additionalinfo\": { \"_id\": replace(UUID(), '-', '') } }").
           Bind("id", "a6f4b93e1a264a108393524f29546a8c").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.True(((Dictionary<string, object>)document["additionalinfo"])["_id"] != null);
+      Assert.That(((Dictionary<string, object>)document["additionalinfo"])["_id"] != null);
 
       collection = CreateCollection("test");
       r = collection.Add(listDocs.ToArray()).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
 
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       Assert.Throws<InvalidOperationException>(() => test = (DbDoc)document["additionalinfo.releasedate"]);
@@ -1667,15 +1655,15 @@ public void ModifyPatchAtDepthMultipleArrays_S2()
       }
       catch (MySqlException ex)
       {
-        Assert.AreEqual("Invalid data for update operation on document collection table", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Invalid data for update operation on document collection table"));
       }
 
       collection = CreateCollection("test");
       r = collection.Add(listDocs.ToArray()).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
 
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("AFRICAN EGG", document["title"]);
+      Assert.That(document["title"], Is.EqualTo("AFRICAN EGG"));
       collection.Modify("_id = :id").Patch("{ \"title\": concat('my ', NULL, ' title') }").
           Bind("id", "a6f4b93e1a264a108393524f29546a8c").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
@@ -1683,7 +1671,7 @@ public void ModifyPatchAtDepthMultipleArrays_S2()
 
       collection = CreateCollection("test");
       r = collection.Add(listDocs.ToArray()).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
 
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       Assert.Throws<InvalidOperationException>(() => test = (DbDoc)document["docfield"]);
@@ -1693,19 +1681,19 @@ public void ModifyPatchAtDepthMultipleArrays_S2()
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       object docField = document["docfield"] as object;
 
-      Assert.True(docField != null);
+      Assert.That(docField != null);
 
       collection = CreateCollection("test");
       r = collection.Add(listDocs.ToArray()).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
 
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("Science fiction", document["genre"]);
+      Assert.That(document["genre"], Is.EqualTo("Science fiction"));
 
       collection.Modify("_id = :id").Patch("{ \"genre\": JSON_OBJECT('name', 'Science Fiction') }").
           Bind("id", "a6f4b93e1a264a108393524f29546a8c").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
-      Assert.AreEqual("Science Fiction", ((Dictionary<string, object>)document["genre"])["name"]);
+      Assert.That(((Dictionary<string, object>)document["genre"])["name"], Is.EqualTo("Science Fiction"));
 
     }
 
@@ -1722,7 +1710,7 @@ public void ModifyPatchInvalidString()
         new {_id = 4, title = "Book 4", pages = 50,age = 12}
       };
       Result r = collection.Add(docs).Execute();
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
       var document = collection.GetOne("1");
       var jsonParams = "invalidJsonString";
       Assert.Throws<Exception>(() => ExecuteModifyStatement(collection.Modify("age = :age").Patch(jsonParams).Bind("age", "12")));
@@ -1743,14 +1731,14 @@ public void ModifyPatchInvalidString()
 
 
       r = collection.Add(documentsAsJsonStrings).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       collection.Modify("true").Patch("{ \"_id\": NULL }").Execute();
-      Assert.AreEqual("1", collection.Find().Execute().FetchOne().Id.ToString());
+      Assert.That(collection.Find().Execute().FetchOne().Id.ToString(), Is.EqualTo("1"));
 
       collection = CreateCollection("test");
       r = collection.Add(documentsAsJsonStrings).Execute();
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       collection.Modify("true").Patch("{ \"nullfield\": NULL }").Execute();
       DbDoc test = null;
@@ -1759,18 +1747,18 @@ public void ModifyPatchInvalidString()
       collection.Modify("true").Patch("{ \"nullfield\": [NULL, NULL] }").Execute();
       document = collection.Find().Execute().FetchOne();
       var nullArray = (object[])document["nullfield"];
-      Assert.AreEqual(null, nullArray[0]);
-      Assert.AreEqual(null, nullArray[1]);
+      Assert.That(nullArray[0], Is.EqualTo(null));
+      Assert.That(nullArray[1], Is.EqualTo(null));
 
       collection.Modify("true").Patch("{ \"nullfield\": { \"nested\": NULL } }").Execute();
       document = collection.Find().Execute().FetchOne();
-      Assert.AreEqual(true, ((Dictionary<string, object>)document["nullfield"]).Count == 0);
+      Assert.That(((Dictionary<string, object>)document["nullfield"]).Count == 0, Is.EqualTo(true));
 
       collection.Modify("true").Patch("{ \"nullfield\": { \"nested\": [NULL, NULL] } }").Execute();
       document = collection.Find().Execute().FetchOne();
       var nestedNullArray = (object[])((Dictionary<string, object>)document["nullfield"])["nested"];
-      Assert.AreEqual(null, nestedNullArray[0]);
-      Assert.AreEqual(null, nestedNullArray[1]);
+      Assert.That(nestedNullArray[0], Is.EqualTo(null));
+      Assert.That(nestedNullArray[1], Is.EqualTo(null));
 
       collection.Modify("true").Patch("{ \"additionalinfo\": { \"nullfield\": NULL } }").Execute();
       Dictionary<string, object> test2 = null;
@@ -1779,20 +1767,20 @@ public void ModifyPatchInvalidString()
       collection.Modify("true").Patch("{ \"additionalinfo\": { \"nullfield\": [NULL, NULL] } }").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       nestedNullArray = (object[])((Dictionary<string, object>)document["additionalinfo"])["nullfield"];
-      Assert.AreEqual(null, nestedNullArray[0]);
-      Assert.AreEqual(null, nestedNullArray[1]);
+      Assert.That(nestedNullArray[0], Is.EqualTo(null));
+      Assert.That(nestedNullArray[1], Is.EqualTo(null));
 
       collection.Modify("true").Patch("{ \"additionalinfo\": { \"nullfield\": { \"nested\": [NULL, NULL] } } }").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
 
       nestedNullArray = (object[])((((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo"])["nullfield"]))["nested"]);
-      Assert.AreEqual(null, nestedNullArray[0]);
-      Assert.AreEqual(null, nestedNullArray[1]);
+      Assert.That(nestedNullArray[0], Is.EqualTo(null));
+      Assert.That(nestedNullArray[1], Is.EqualTo(null));
 
       collection.Modify("true").Patch("{ \"additionalinfo\": { \"nullfield\": { \"nested\": JSON_OBJECT('field', null) } } }").Execute();
       document = collection.GetOne("a6f4b93e1a264a108393524f29546a8c");
       var nestedObject = (Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)document["additionalinfo.nullfield.nested"]));
-      Assert.AreEqual(0, nestedObject.Count);
+      Assert.That(nestedObject.Count, Is.EqualTo(0));
     }
 
     #endregion WL14389
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
index e2af9b591..daf2f5f30 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
@@ -66,7 +66,7 @@ private void InitCollection()
     {
       Collection coll = CreateCollection(_collectionName);
       Result r = ExecuteAddStatement(coll.Add(_docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
     }
 
     public void InitTable()
@@ -101,11 +101,11 @@ private void ValidatePreparedStatements(int count, ulong executions, string sqlT
         $"WHERE {condition}";
       var preparedStatements = ExecuteSQL(sql).FetchAll();
 
-      Assert.AreEqual(count, preparedStatements.Count);
+      Assert.That(preparedStatements.Count, Is.EqualTo(count));
       if (count > 0)
       {
-        StringAssert.AreEqualIgnoringCase(sqlText, preparedStatements[0]["SQL_TEXT"].ToString());
-        Assert.AreEqual(executions, preparedStatements[0]["COUNT_EXECUTE"]);
+        Assert.That(preparedStatements[0]["SQL_TEXT"].ToString(), Is.EqualTo(sqlText).IgnoreCase);
+        Assert.That(preparedStatements[0]["COUNT_EXECUTE"], Is.EqualTo(executions));
       }
     }
 
@@ -124,15 +124,15 @@ public void Find()
       Collection coll = GetCollection();
       var findStmt = coll.Find("_id = :id and pages = :pages").Bind("id", 1).Bind("pages", 20);
       var doc = ExecuteFindStatement(findStmt);
-      Assert.AreEqual("Book 1", doc.FetchAll()[0]["title"].ToString());
-      Assert.False(findStmt._isPrepared);
+      Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo("Book 1"));
+      Assert.That(findStmt._isPrepared, Is.False);
       ValidatePreparedStatements(0, 0, null);
 
       for (int i = 1; i <= _docs.Length; i++)
       {
         doc = ExecuteFindStatement(findStmt.Bind("id", i).Bind("pages", i * 10 + 10).Limit(1));
-        Assert.AreEqual($"Book {i}", doc.FetchAll()[0]["title"].ToString());
-        Assert.True(findStmt._isPrepared || !findStmt.Session.SupportsPreparedStatements);
+        Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo($"Book {i}"));
+        Assert.That(findStmt._isPrepared || !findStmt.Session.SupportsPreparedStatements);
       }
 
       ValidatePreparedStatements(1, 4,
@@ -147,13 +147,13 @@ public void FindWithChanges()
       var findStmt = coll.Find("_id = 1");
 
       var foundDoc = ExecuteFindStatement(findStmt);
-      Assert.AreEqual("Book 1", foundDoc.FetchAll()[0]["title"].ToString());
-      Assert.False(findStmt._isPrepared);
+      Assert.That(foundDoc.FetchAll()[0]["title"].ToString(), Is.EqualTo("Book 1"));
+      Assert.That(findStmt._isPrepared, Is.False);
       ValidatePreparedStatements(0, 0, null);
 
       foundDoc = ExecuteFindStatement(findStmt.Limit(1));
-      Assert.AreEqual("Book 1", foundDoc.FetchAll()[0]["title"].ToString());
-      Assert.True(findStmt._isPrepared || !findStmt.Session.SupportsPreparedStatements);
+      Assert.That(foundDoc.FetchAll()[0]["title"].ToString(), Is.EqualTo("Book 1"));
+      Assert.That(findStmt._isPrepared || !findStmt.Session.SupportsPreparedStatements);
 
       ValidatePreparedStatements(1, 1,
         $"SELECT doc FROM `{schemaName}`.`{_collectionName}` WHERE (JSON_UNQUOTE(JSON_EXTRACT(doc,'$._id')) = 1) LIMIT ?, ?");
@@ -161,8 +161,8 @@ public void FindWithChanges()
       for (int i = 1; i <= _docs.Length; i++)
       {
         var foundDoc2 = ExecuteFindStatement(findStmt.Where($"_id = {i}"));
-        Assert.AreEqual($"Book {i}", foundDoc2.FetchAll()[0]["title"].ToString());
-        Assert.False(findStmt._isPrepared);
+        Assert.That(foundDoc2.FetchAll()[0]["title"].ToString(), Is.EqualTo($"Book {i}"));
+        Assert.That(findStmt._isPrepared, Is.False);
       }
 
       ValidatePreparedStatements(0, 0, null);
@@ -182,13 +182,13 @@ public void DeallocatePreparedStatmentsWhenClosingSession()
         var findStmt = coll.Find($"_id = 1");
 
         var foundDoc = ExecuteFindStatement(findStmt);
-        Assert.AreEqual("Book 1", foundDoc.FetchAll()[0]["title"].ToString());
-        Assert.False(findStmt._isPrepared);
+        Assert.That(foundDoc.FetchAll()[0]["title"].ToString(), Is.EqualTo("Book 1"));
+        Assert.That(findStmt._isPrepared, Is.False);
         ValidatePreparedStatements(0, 0, null, threadId);
 
         foundDoc = ExecuteFindStatement(findStmt.Limit(1));
-        Assert.AreEqual("Book 1", foundDoc.FetchAll()[0]["title"].ToString());
-        Assert.True(findStmt._isPrepared || !findStmt.Session.SupportsPreparedStatements);
+        Assert.That(foundDoc.FetchAll()[0]["title"].ToString(), Is.EqualTo("Book 1"));
+        Assert.That(findStmt._isPrepared || !findStmt.Session.SupportsPreparedStatements);
 
         if (findStmt.Session.SupportsPreparedStatements)
         {
@@ -208,15 +208,15 @@ public void Select()
       Table table = GetTable();
       var selectStmt = table.Select().Where("id = :id").Bind("id", 1);
       RowResult row = ExecuteSelectStatement(selectStmt);
-      Assert.AreEqual(_allRows[0][1], row.FetchAll()[0]["name"].ToString());
-      Assert.False(selectStmt._isPrepared);
+      Assert.That(row.FetchAll()[0]["name"].ToString(), Is.EqualTo(_allRows[0][1]));
+      Assert.That(selectStmt._isPrepared, Is.False);
       ValidatePreparedStatements(0, 0, null);
 
       for (int i = 0; i < _allRows.Length; i++)
       {
         row = ExecuteSelectStatement(selectStmt.Bind("id", i + 1).Limit(1));
-        Assert.AreEqual(_allRows[i][1], row.FetchAll()[0]["name"].ToString());
-        Assert.True(selectStmt._isPrepared || !selectStmt.Session.SupportsPreparedStatements);
+        Assert.That(row.FetchAll()[0]["name"].ToString(), Is.EqualTo(_allRows[i][1]));
+        Assert.That(selectStmt._isPrepared || !selectStmt.Session.SupportsPreparedStatements);
       }
 
       ValidatePreparedStatements(1, 3,
@@ -231,13 +231,13 @@ public void SelectWithChanges()
       var selectStmt = table.Select().Where("id = 1");
 
       RowResult row = ExecuteSelectStatement(selectStmt);
-      Assert.AreEqual(_allRows[0][1], row.FetchAll()[0]["name"].ToString());
-      Assert.False(selectStmt._isPrepared);
+      Assert.That(row.FetchAll()[0]["name"].ToString(), Is.EqualTo(_allRows[0][1]));
+      Assert.That(selectStmt._isPrepared, Is.False);
       ValidatePreparedStatements(0, 0, null);
 
       row = ExecuteSelectStatement(selectStmt.Limit(1));
-      Assert.AreEqual(_allRows[0][1], row.FetchAll()[0]["name"].ToString());
-      Assert.True(selectStmt._isPrepared || !selectStmt.Session.SupportsPreparedStatements);
+      Assert.That(row.FetchAll()[0]["name"].ToString(), Is.EqualTo(_allRows[0][1]));
+      Assert.That(selectStmt._isPrepared || !selectStmt.Session.SupportsPreparedStatements);
 
       ValidatePreparedStatements(1, 1,
         $"SELECT * FROM `{schemaName}`.`{_tableName}` WHERE (`id` = 1) LIMIT ?, ?");
@@ -245,8 +245,8 @@ public void SelectWithChanges()
       for (int i = 2; i <= _allRows.Length; i++)
       {
         row = ExecuteSelectStatement(selectStmt.Where($"id = {i}"));
-        Assert.AreEqual(_allRows[i - 1][1], row.FetchAll()[0]["name"].ToString());
-        Assert.False(selectStmt._isPrepared);
+        Assert.That(row.FetchAll()[0]["name"].ToString(), Is.EqualTo(_allRows[i - 1][1]));
+        Assert.That(selectStmt._isPrepared, Is.False);
       }
 
       ValidatePreparedStatements(0, 0, null);
@@ -259,15 +259,15 @@ public void Modify()
       Collection coll = GetCollection();
       var modifyStmt = coll.Modify("_id = :id").Set("title", "Magazine 1").Bind("id", 1);
       Result result = ExecuteModifyStatement(modifyStmt);
-      Assert.AreEqual(1ul, result.AffectedItemsCount);
-      Assert.False(modifyStmt._isPrepared);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+      Assert.That(modifyStmt._isPrepared, Is.False);
       ValidatePreparedStatements(0, 0, null);
 
       for (int i = 2; i <= _docs.Length; i++)
       {
         result = ExecuteModifyStatement(modifyStmt.Bind("id", i).Limit(1));
-        Assert.AreEqual(1ul, result.AffectedItemsCount);
-        Assert.True(modifyStmt._isPrepared || !modifyStmt.Session.SupportsPreparedStatements);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+        Assert.That(modifyStmt._isPrepared || !modifyStmt.Session.SupportsPreparedStatements);
       }
 
       ValidatePreparedStatements(1, 3,
@@ -281,21 +281,21 @@ public void ModifyWithChanges()
       Collection coll = GetCollection();
       var modifyStmt = coll.Modify("_id = :id").Set("title", "CONCAT('Magazine ', id)").Bind("id", 1);
       Result result = ExecuteModifyStatement(modifyStmt);
-      Assert.AreEqual(1ul, result.AffectedItemsCount);
-      Assert.False(modifyStmt._isPrepared);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+      Assert.That(modifyStmt._isPrepared, Is.False);
       ValidatePreparedStatements(0, 0, null);
 
       result = ExecuteModifyStatement(modifyStmt.Bind("id", 2).Limit(1));
-      Assert.AreEqual(1ul, result.AffectedItemsCount);
-      Assert.True(modifyStmt._isPrepared || !modifyStmt.Session.SupportsPreparedStatements);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+      Assert.That(modifyStmt._isPrepared || !modifyStmt.Session.SupportsPreparedStatements);
       ValidatePreparedStatements(1, 1,
         $"UPDATE `{schemaName}`.`{_collectionName}` SET doc=JSON_SET(JSON_SET(doc,'$.title','CONCAT(\\'Magazine \\', id)'),'$._id',JSON_EXTRACT(`doc`,'$._id')) WHERE (JSON_EXTRACT(doc,'$._id') = ?) LIMIT ?");
 
       for (int i = 3; i <= _docs.Length; i++)
       {
         result = ExecuteModifyStatement(modifyStmt.Set("title", $"Magazine {i}").Bind("id", i));
-        Assert.AreEqual(1ul, result.AffectedItemsCount);
-        Assert.False(modifyStmt._isPrepared);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+        Assert.That(modifyStmt._isPrepared, Is.False);
       }
 
       ValidatePreparedStatements(0, 0, null);
@@ -308,15 +308,15 @@ public void Update()
       Table table = GetTable();
       var updateStmt = table.Update().Where("id = :id").Set("name", "Magazine").Bind("id", 1);
       Result result = ExecuteUpdateStatement(updateStmt);
-      Assert.AreEqual(1ul, result.AffectedItemsCount);
-      Assert.False(updateStmt._isPrepared);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+      Assert.That(updateStmt._isPrepared, Is.False);
       ValidatePreparedStatements(0, 0, null);
 
       for (int i = 2; i <= _allRows.Length; i++)
       {
         result = ExecuteUpdateStatement(updateStmt.Bind("id", i).Limit(1));
-        Assert.AreEqual(1ul, result.AffectedItemsCount);
-        Assert.True(updateStmt._isPrepared || !updateStmt.Session.SupportsPreparedStatements);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+        Assert.That(updateStmt._isPrepared || !updateStmt.Session.SupportsPreparedStatements);
       }
 
       ValidatePreparedStatements(1, 2,
@@ -330,21 +330,21 @@ public void UpdateWithChanges()
       Table table = GetTable();
       var updateStmt = table.Update().Where("id = :id").Set("name", "CONCAT('Magazine ', id)").Bind("id", 1);
       Result result = ExecuteUpdateStatement(updateStmt);
-      Assert.AreEqual(1ul, result.AffectedItemsCount);
-      Assert.False(updateStmt._isPrepared);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+      Assert.That(updateStmt._isPrepared, Is.False);
       ValidatePreparedStatements(0, 0, null);
 
       result = ExecuteUpdateStatement(updateStmt.Bind("id", 2).Limit(1));
-      Assert.AreEqual(1ul, result.AffectedItemsCount);
-      Assert.True(updateStmt._isPrepared || !updateStmt.Session.SupportsPreparedStatements);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+      Assert.That(updateStmt._isPrepared || !updateStmt.Session.SupportsPreparedStatements);
       ValidatePreparedStatements(1, 1,
         $"UPDATE `{schemaName}`.`{_tableName}` SET `name`=CONCAT('Magazine ',`id`) WHERE (`id` = ?) LIMIT ?");
 
       for (int i = 3; i <= _allRows.Length; i++)
       {
         result = ExecuteUpdateStatement(updateStmt.Set("name", $"Magazine {i}").Bind("id", i));
-        Assert.AreEqual(1ul, result.AffectedItemsCount);
-        Assert.False(updateStmt._isPrepared);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+        Assert.That(updateStmt._isPrepared, Is.False);
       }
 
       ValidatePreparedStatements(0, 0, null);
@@ -357,15 +357,15 @@ public void Remove()
       Collection coll = GetCollection();
       var removeStmt = coll.Remove("_id = :id").Bind("id", 1);
       Result result = ExecuteRemoveStatement(removeStmt);
-      Assert.AreEqual(1ul, result.AffectedItemsCount);
-      Assert.False(removeStmt._isPrepared);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+      Assert.That(removeStmt._isPrepared, Is.False);
       ValidatePreparedStatements(0, 0, null);
 
       for (int i = 2; i <= _docs.Length; i++)
       {
         result = ExecuteRemoveStatement(removeStmt.Bind("id", i).Limit(1));
-        Assert.AreEqual(1ul, result.AffectedItemsCount);
-        Assert.True(removeStmt._isPrepared || !removeStmt.Session.SupportsPreparedStatements);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+        Assert.That(removeStmt._isPrepared || !removeStmt.Session.SupportsPreparedStatements);
       }
 
       ValidatePreparedStatements(1, 3,
@@ -379,21 +379,21 @@ public void RemoveWithChanges()
       Collection coll = GetCollection();
       var removeStmt = coll.Remove("_id = :id").Bind("id", 1);
       Result result = ExecuteRemoveStatement(removeStmt);
-      Assert.AreEqual(1ul, result.AffectedItemsCount);
-      Assert.False(removeStmt._isPrepared);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+      Assert.That(removeStmt._isPrepared, Is.False);
       ValidatePreparedStatements(0, 0, null);
 
       result = ExecuteRemoveStatement(removeStmt.Bind("id", 2).Limit(1));
-      Assert.AreEqual(1ul, result.AffectedItemsCount);
-      Assert.True(removeStmt._isPrepared || !removeStmt.Session.SupportsPreparedStatements);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+      Assert.That(removeStmt._isPrepared || !removeStmt.Session.SupportsPreparedStatements);
       ValidatePreparedStatements(1, 1,
         $"DELETE FROM `{schemaName}`.`{_collectionName}` WHERE (JSON_EXTRACT(doc,'$._id') = ?) LIMIT ?");
 
       for (int i = 3; i <= _docs.Length; i++)
       {
         result = ExecuteRemoveStatement(removeStmt.Where($"_id = {i}"));
-        Assert.AreEqual(1ul, result.AffectedItemsCount);
-        Assert.False(removeStmt._isPrepared);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+        Assert.That(removeStmt._isPrepared, Is.False);
       }
 
       ValidatePreparedStatements(0, 0, null);
@@ -406,15 +406,15 @@ public void Delete()
       Table table = GetTable();
       var deleteStmt = table.Delete().Where("id = :id").Bind("id", 1);
       Result result = ExecuteDeleteStatement(deleteStmt);
-      Assert.AreEqual(1ul, result.AffectedItemsCount);
-      Assert.False(deleteStmt._isPrepared);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+      Assert.That(deleteStmt._isPrepared, Is.False);
       ValidatePreparedStatements(0, 0, null);
 
       for (int i = 2; i <= _allRows.Length; i++)
       {
         result = ExecuteDeleteStatement(deleteStmt.Bind("id", i).Limit(1));
-        Assert.AreEqual(1ul, result.AffectedItemsCount);
-        Assert.True(deleteStmt._isPrepared || !deleteStmt.Session.SupportsPreparedStatements);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+        Assert.That(deleteStmt._isPrepared || !deleteStmt.Session.SupportsPreparedStatements);
       }
 
       ValidatePreparedStatements(1, 2,
@@ -428,21 +428,21 @@ public void DeleteWithChanges()
       Table table = GetTable();
       var deleteStmt = table.Delete().Where("id = :id").Bind("id", 1);
       Result result = ExecuteDeleteStatement(deleteStmt);
-      Assert.AreEqual(1ul, result.AffectedItemsCount);
-      Assert.False(deleteStmt._isPrepared);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+      Assert.That(deleteStmt._isPrepared, Is.False);
       ValidatePreparedStatements(0, 0, null);
 
       result = ExecuteDeleteStatement(deleteStmt.Bind("id", 2).Limit(1));
-      Assert.AreEqual(1ul, result.AffectedItemsCount);
-      Assert.True(deleteStmt._isPrepared || !deleteStmt.Session.SupportsPreparedStatements);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+      Assert.That(deleteStmt._isPrepared || !deleteStmt.Session.SupportsPreparedStatements);
       ValidatePreparedStatements(1, 1,
         $"DELETE FROM `{schemaName}`.`{_tableName}` WHERE (`id` = ?) LIMIT ?");
 
       for (int i = 3; i <= _allRows.Length; i++)
       {
         result = ExecuteDeleteStatement(deleteStmt.Where($"id = {i}"));
-        Assert.AreEqual(1ul, result.AffectedItemsCount);
-        Assert.False(deleteStmt._isPrepared);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
+        Assert.That(deleteStmt._isPrepared, Is.False);
       }
 
       ValidatePreparedStatements(0, 0, null);
@@ -458,20 +458,20 @@ public void MaxPreparedStmtCount()
         ((Session)coll.Session).SQL("SET GLOBAL max_prepared_stmt_count=0").Execute();
         var findStmt = coll.Find("_id = :id and pages = :pages").Bind("id", 1).Bind("pages", 20);
         var doc = ExecuteFindStatement(findStmt);
-        Assert.AreEqual("Book 1", doc.FetchAll()[0]["title"].ToString());
-        Assert.False(findStmt._isPrepared);
-        Assert.True(findStmt.Session.SupportsPreparedStatements);
+        Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo("Book 1"));
+        Assert.That(findStmt._isPrepared, Is.False);
+        Assert.That(findStmt.Session.SupportsPreparedStatements);
         ValidatePreparedStatements(0, 0, null);
 
         doc = ExecuteFindStatement(findStmt.Bind("id", 2).Bind("pages", 30).Limit(1));
-        Assert.AreEqual($"Book 2", doc.FetchAll()[0]["title"].ToString());
-        Assert.False(findStmt._isPrepared);
-        Assert.False(findStmt.Session.SupportsPreparedStatements);
+        Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo($"Book 2"));
+        Assert.That(findStmt._isPrepared, Is.False);
+        Assert.That(findStmt.Session.SupportsPreparedStatements, Is.False);
 
         doc = ExecuteFindStatement(findStmt.Bind("id", 3).Bind("pages", 40).Limit(1));
-        Assert.AreEqual($"Book 3", doc.FetchAll()[0]["title"].ToString());
-        Assert.False(findStmt._isPrepared);
-        Assert.False(findStmt.Session.SupportsPreparedStatements);
+        Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo($"Book 3"));
+        Assert.That(findStmt._isPrepared, Is.False);
+        Assert.That(findStmt.Session.SupportsPreparedStatements, Is.False);
       }
       finally
       {
@@ -489,34 +489,34 @@ public void LimitAndOffset()
       var findStmt = coll.Find("pages >= :lower AND pages <= :upper").Bind("lower", 20).Bind("upper", 20);
       var result = ExecuteFindStatement(findStmt).FetchAll();
       Assert.That(result, Has.One.Items);
-      Assert.AreEqual("Book 1", result[0]["title"].ToString());
-      Assert.False(findStmt._isPrepared);
+      Assert.That(result[0]["title"].ToString(), Is.EqualTo("Book 1"));
+      Assert.That(findStmt._isPrepared, Is.False);
 
       ValidatePreparedStatements(0, 0, null);
 
       // second execution adding limit (prepared statement)
       result = ExecuteFindStatement(findStmt.Bind("lower", 0).Bind("upper", 100).Limit(1)).FetchAll();
       Assert.That(result, Has.One.Items);
-      Assert.AreEqual($"Book 1", result[0]["title"].ToString());
-      Assert.True(findStmt._isPrepared);
+      Assert.That(result[0]["title"].ToString(), Is.EqualTo($"Book 1"));
+      Assert.That(findStmt._isPrepared);
 
       ValidatePreparedStatements(1, 1,
         $"SELECT doc FROM `{schemaName}`.`{_collectionName}` WHERE ((JSON_EXTRACT(doc,'$.pages') >= ?) AND (JSON_EXTRACT(doc,'$.pages') <= ?)) LIMIT ?, ?");
 
       // new execution using a different limit and offset (prepared statement)
       result = ExecuteFindStatement(findStmt.Bind("lower", 0).Bind("upper", 100).Limit(2).Offset(1)).FetchAll();
-      Assert.AreEqual(2, result.Count);
-      Assert.AreEqual($"Book 2", result[0]["title"].ToString());
-      Assert.AreEqual($"Book 3", result[1]["title"].ToString());
-      Assert.True(findStmt._isPrepared || !findStmt.Session.SupportsPreparedStatements);
+      Assert.That(result.Count, Is.EqualTo(2));
+      Assert.That(result[0]["title"].ToString(), Is.EqualTo($"Book 2"));
+      Assert.That(result[1]["title"].ToString(), Is.EqualTo($"Book 3"));
+      Assert.That(findStmt._isPrepared || !findStmt.Session.SupportsPreparedStatements);
 
       ValidatePreparedStatements(1, 2,
         $"SELECT doc FROM `{schemaName}`.`{_collectionName}` WHERE ((JSON_EXTRACT(doc,'$.pages') >= ?) AND (JSON_EXTRACT(doc,'$.pages') <= ?)) LIMIT ?, ?");
 
       // execution without limit and offset but persisting previous values (prepared statement)
       result = ExecuteFindStatement(findStmt.Bind("lower", 0).Bind("upper", 100)).FetchAll();
-      Assert.AreEqual(2, result.Count);
-      Assert.True(findStmt._isPrepared);
+      Assert.That(result.Count, Is.EqualTo(2));
+      Assert.That(findStmt._isPrepared);
 
       ValidatePreparedStatements(1, 3,
         $"SELECT doc FROM `{schemaName}`.`{_collectionName}` WHERE ((JSON_EXTRACT(doc,'$.pages') >= ?) AND (JSON_EXTRACT(doc,'$.pages') <= ?)) LIMIT ?, ?");
@@ -544,16 +544,16 @@ public void ConnectionPoolingTest()
         {
           var row = res0.FetchOne();
           connectionID1 = row[0].ToString();
-          Assert.IsNotEmpty(connectionID1);
+          Assert.That(connectionID1, Is.Not.Empty);
         }
         var findStmt = col.Find("_id = :id and pages = :pages").Bind("id", 1).Bind("pages", 20);
         var doc = ExecuteFindStatement(findStmt);
-        Assert.AreEqual("Book 1", doc.FetchAll()[0]["title"].ToString());
+        Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo("Book 1"));
         ValidatePreparedStatements(0, 0, null);
         for (int i = 1; i < _docs.Length; i++)
         {
           doc = ExecuteFindStatement(findStmt.Bind("id", i).Bind("pages", i * 10 + 10).Limit(1));
-          Assert.AreEqual($"Book {i}", doc.FetchAll()[0]["title"].ToString());
+          Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo($"Book {i}"));
         }
         ValidatePreparedStatements(1, 3,
           $"SELECT doc FROM `{schemaName}`.`{_collectionName}` WHERE ((JSON_UNQUOTE(JSON_EXTRACT(doc,'$._id')) = ?) AND (JSON_EXTRACT(doc,'$.pages') = ?)) LIMIT ?, ?");
@@ -565,18 +565,18 @@ public void ConnectionPoolingTest()
         {
           var row = res0.FetchOne();
           connectionID1 = row[0].ToString();
-          Assert.IsNotEmpty(connectionID1);
+          Assert.That(connectionID1, Is.Not.Empty);
         }
         s = session2.GetSchema(schemaName);
         col = s.GetCollection(_collectionName);
         findStmt = col.Find("_id = :id and pages = :pages").Bind("id", 1).Bind("pages", 20);
         doc = ExecuteFindStatement(findStmt);
-        Assert.AreEqual("Book 1", doc.FetchAll()[0]["title"].ToString());
+        Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo("Book 1"));
         ValidatePreparedStatements(0, 0, null, connectionID1);
         for (int i = 1; i < _docs.Length; i++)
         {
           doc = ExecuteFindStatement(findStmt.Bind("id", i).Bind("pages", i * 10 + 10).Limit(1));
-          Assert.AreEqual($"Book {i}", doc.FetchAll()[0]["title"].ToString());
+          Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo($"Book {i}"));
         }
         ValidatePreparedStatements(1, 3,
           $"SELECT doc FROM `{schemaName}`.`{_collectionName}` WHERE ((JSON_UNQUOTE(JSON_EXTRACT(doc,'$._id')) = ?) AND (JSON_EXTRACT(doc,'$.pages') = ?)) LIMIT ?, ?");
@@ -588,18 +588,18 @@ public void ConnectionPoolingTest()
         {
           var row = res0.FetchOne();
           connectionID1 = row[0].ToString();
-          Assert.IsNotEmpty(connectionID1);
+          Assert.That(connectionID1, Is.Not.Empty);
         }
         s = session2.GetSchema(schemaName);
         col = s.GetCollection(_collectionName);
         findStmt = col.Find("_id = :id and pages = :pages").Bind("id", 1).Bind("pages", 20);
         doc = ExecuteFindStatement(findStmt);
-        Assert.AreEqual("Book 1", doc.FetchAll()[0]["title"].ToString());
+        Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo("Book 1"));
         ValidatePreparedStatements(0, 0, null, connectionID1);
         for (int i = 1; i < _docs.Length; i++)
         {
           doc = ExecuteFindStatement(findStmt.Bind("id", i).Bind("pages", i * 10 + 10).Limit(1));
-          Assert.AreEqual($"Book {i}", doc.FetchAll()[0]["title"].ToString());
+          Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo($"Book {i}"));
         }
         ValidatePreparedStatements(1, 3,
           $"SELECT doc FROM `{schemaName}`.`{_collectionName}` WHERE ((JSON_UNQUOTE(JSON_EXTRACT(doc,'$._id')) = ?) AND (JSON_EXTRACT(doc,'$.pages') = ?)) LIMIT ?, ?");
@@ -625,13 +625,13 @@ public void DeallocatePreparedStatmentsWhenClosingSessionLoad()
           Collection coll = mySession.GetSchema(schemaName).GetCollection(_collectionName);
           var findStmt = coll.Find("_id = :id and pages = :pages").Bind("id", 1).Bind("pages", 20);
           var doc = ExecuteFindStatement(findStmt);
-          Assert.AreEqual("Book 1", doc.FetchAll()[0]["title"].ToString());
+          Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo("Book 1"));
           ValidatePreparedStatements(0, 0, null, threadId);
 
           for (int i = 1; i <= _docs.Length; i++)
           {
             doc = ExecuteFindStatement(findStmt.Bind("id", i).Bind("pages", i * 10 + 10).Limit(1));
-            Assert.AreEqual($"Book {i}", doc.FetchAll()[0]["title"].ToString());
+            Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo($"Book {i}"));
           }
           ValidatePreparedStatements(1, 4,
             $"SELECT doc FROM `{schemaName}`.`{_collectionName}` WHERE ((JSON_UNQUOTE(JSON_EXTRACT(doc,'$._id')) = ?) AND (JSON_EXTRACT(doc,'$.pages') = ?)) LIMIT ?, ?", threadId);
@@ -659,23 +659,23 @@ public void DeallocatePreparedStatmentsWhenClosingSessionParallel()
       var findStmt1 = coll1.Find("_id = :id and pages = :pages").Bind("id", 1).Bind("pages", 20);
       var findStmt2 = coll2.Find("_id = :id and pages = :pages").Bind("id", 1).Bind("pages", 20);
       var doc1 = ExecuteFindStatement(findStmt1);
-      Assert.AreEqual("Book 1", doc1.FetchAll()[0]["title"].ToString());
+      Assert.That(doc1.FetchAll()[0]["title"].ToString(), Is.EqualTo("Book 1"));
       ValidatePreparedStatements(0, 0, null, threadId1);
 
       var doc2 = ExecuteFindStatement(findStmt2);
-      Assert.AreEqual("Book 1", doc2.FetchAll()[0]["title"].ToString());
+      Assert.That(doc2.FetchAll()[0]["title"].ToString(), Is.EqualTo("Book 1"));
       ValidatePreparedStatements(0, 0, null, threadId2);
 
       for (int i = 1; i <= _docs.Length; i++)
       {
         doc1 = ExecuteFindStatement(findStmt1.Bind("id", i).Bind("pages", i * 10 + 10).Limit(1));
-        Assert.AreEqual($"Book {i}", doc1.FetchAll()[0]["title"].ToString());
+        Assert.That(doc1.FetchAll()[0]["title"].ToString(), Is.EqualTo($"Book {i}"));
       }
 
       for (int i = 1; i <= _docs.Length; i++)
       {
         doc2 = ExecuteFindStatement(findStmt2.Bind("id", i).Bind("pages", i * 10 + 10).Limit(1));
-        Assert.AreEqual($"Book {i}", doc2.FetchAll()[0]["title"].ToString());
+        Assert.That(doc2.FetchAll()[0]["title"].ToString(), Is.EqualTo($"Book {i}"));
       }
 
       ValidatePreparedStatements(1, 4,
@@ -694,21 +694,21 @@ public void MaxPreparedStmtCountAsOne()
     {
       Collection coll = CreateCollection("testGlobal");
       Result r = ExecuteAddStatement(coll.Add(_docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       try
       {
         ((Session)coll.Session).SQL("SET GLOBAL max_prepared_stmt_count=1").Execute();
         var findStmt = coll.Find("_id = :id and pages = :pages").Bind("id", 1).Bind("pages", 20);
         var doc = ExecuteFindStatement(findStmt);
-        Assert.AreEqual("Book 1", doc.FetchAll()[0]["title"].ToString());
+        Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo("Book 1"));
 
         ValidatePreparedStatements(0, 0, null);
 
         for (int i = 1; i <= _docs.Length; i++)
         {
           doc = ExecuteFindStatement(findStmt.Bind("id", i).Bind("pages", i * 10 + 10).Limit(1));
-          Assert.AreEqual($"Book {i}", doc.FetchAll()[0]["title"].ToString());
+          Assert.That(doc.FetchAll()[0]["title"].ToString(), Is.EqualTo($"Book {i}"));
         }
         ValidatePreparedStatements(1, 4,
             $"SELECT doc FROM `{schemaName}`.`testGlobal` WHERE ((JSON_EXTRACT(doc,'$._id') = ?) AND (JSON_EXTRACT(doc,'$.pages') = ?)) LIMIT ?, ?");
@@ -747,13 +747,13 @@ public void PSMultipleFindAsync()
       var findStmt = coll.Find("age = 1");
       tasksList.Add(findStmt.ExecuteAsync().ContinueWith((findResult) =>
       {
-        Assert.AreEqual(1, findResult.Result.FetchAll()[0]["age"]);
+        Assert.That(findResult.Result.FetchAll()[0]["age"], Is.EqualTo(1));
       }));
       tasksList.Add(findStmt.ExecuteAsync().ContinueWith((findResult) =>
       {
-        Assert.AreEqual(1, findResult.Result.FetchAll()[0]["age"]);
+        Assert.That(findResult.Result.FetchAll()[0]["age"], Is.EqualTo(1));
       }));
-      Assert.AreEqual(true, Task.WaitAll(tasksList.ToArray(), TimeSpan.FromMinutes(2)), "WaitAll timeout");
+      Assert.That(Task.WaitAll(tasksList.ToArray(), TimeSpan.FromMinutes(2)), Is.EqualTo(true), "WaitAll timeout");
       ValidatePreparedStatements(1, 1, $"SELECT doc FROM `test`.`test` WHERE (JSON_EXTRACT(doc,'$.age') = 1)");
 
     }
@@ -766,7 +766,7 @@ public void FindRemoveWithString()
     {
       InitCollection();
       Collection coll = GetCollection();
-      Assert.AreEqual(4, coll.Count());
+      Assert.That(coll.Count(), Is.EqualTo(4));
       var findStmt = coll.Find("_id = :id and pages = :pages").Bind("id", "1").Bind("pages", 20);
       var doc = ExecuteFindStatement(findStmt);
       findStmt = coll.Find("_id = :id and pages = :pages").Bind("id", "2").Bind("pages", 30);
@@ -778,11 +778,11 @@ public void FindRemoveWithString()
       }
       findStmt = coll.Find("_id = :id").Bind("id", "4");
       var docCount = ExecuteFindStatement(findStmt).FetchAll();
-      Assert.AreEqual(1, docCount.Count, "There should be a record");
-      Assert.AreEqual("Book 4", docCount[0]["title"].ToString());
+      Assert.That(docCount.Count, Is.EqualTo(1), "There should be a record");
+      Assert.That(docCount[0]["title"].ToString(), Is.EqualTo("Book 4"));
       findStmt = coll.Find("_id = :id").Bind("id", "1");
       docCount = ExecuteFindStatement(findStmt).FetchAll();
-      Assert.AreEqual(0, docCount.Count, "There should not be any records");
+      Assert.That(docCount.Count, Is.EqualTo(0), "There should not be any records");
     }
 
     /// <summary>
@@ -806,7 +806,7 @@ public void StatementWithOffset()
         new { _id = 8, name = "tommy h", age =31,profit = 3000}
       };
       var r = coll.Add(docs1).Execute();
-      Assert.AreEqual((ulong)8, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo((ulong)8));
       var findStmt = coll.Find().Fields("_id as ID", "name as Name",
           "age as Age", "profit as Profit").GroupBy("age").
           GroupBy("profit").Sort("profit ASC").Limit(3);
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ColumnMetadataTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ColumnMetadataTests.cs
index fa37af35e..5d4a7b5eb 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ColumnMetadataTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ColumnMetadataTests.cs
@@ -46,46 +46,46 @@ public void ColumnMetadata()
 
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema(schemaName).GetTable("test").Select("1 + 1 as a", "b", "c"));
       var rows = r.FetchAll();
-      Assert.AreEqual(3, r.Columns.Count);
-      Assert.AreEqual("def", r.Columns[0].DatabaseName);
-      Assert.Null(r.Columns[0].SchemaName);
-      Assert.Null(r.Columns[0].TableName);
-      Assert.Null(r.Columns[0].TableLabel);
-      Assert.Null(r.Columns[0].ColumnName);
-      Assert.AreEqual("a", r.Columns[0].ColumnLabel);
-      Assert.AreEqual(ColumnType.Tinyint, r.Columns[0].Type);
-      Assert.AreEqual(3u, r.Columns[0].Length);
-      Assert.AreEqual(0u, r.Columns[0].FractionalDigits);
-      Assert.True(r.Columns[0].IsNumberSigned);
-      Assert.Null(r.Columns[0].CharacterSetName);
-      Assert.Null(r.Columns[0].CollationName);
-      Assert.False(r.Columns[0].IsPadded);
+      Assert.That(r.Columns.Count, Is.EqualTo(3));
+      Assert.That(r.Columns[0].DatabaseName, Is.EqualTo("def"));
+      Assert.That(r.Columns[0].SchemaName, Is.Null);
+      Assert.That(r.Columns[0].TableName, Is.Null);
+      Assert.That(r.Columns[0].TableLabel, Is.Null);
+      Assert.That(r.Columns[0].ColumnName, Is.Null);
+      Assert.That(r.Columns[0].ColumnLabel, Is.EqualTo("a"));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Tinyint));
+      Assert.That(r.Columns[0].Length, Is.EqualTo(3u));
+      Assert.That(r.Columns[0].FractionalDigits, Is.EqualTo(0u));
+      Assert.That(r.Columns[0].IsNumberSigned);
+      Assert.That(r.Columns[0].CharacterSetName, Is.Null);
+      Assert.That(r.Columns[0].CollationName, Is.Null);
+      Assert.That(r.Columns[0].IsPadded, Is.False);
 
-      Assert.AreEqual(schemaName, r.Columns[1].SchemaName);
-      Assert.AreEqual("test", r.Columns[1].TableName);
-      Assert.AreEqual("test", r.Columns[1].TableLabel);
-      Assert.AreEqual("b", r.Columns[1].ColumnName);
-      Assert.AreEqual("b", r.Columns[1].ColumnLabel);
-      Assert.AreEqual(ColumnType.String, r.Columns[1].Type);
-      Assert.AreEqual(255u, r.Columns[1].Length);
-      Assert.AreEqual(0u, r.Columns[1].FractionalDigits);
-      Assert.False(r.Columns[1].IsNumberSigned);
-      Assert.AreEqual("utf8mb4", r.Columns[1].CharacterSetName);
-      Assert.AreEqual("utf8mb4_0900_ai_ci", r.Columns[1].CollationName);
-      Assert.False(r.Columns[1].IsPadded);
+      Assert.That(r.Columns[1].SchemaName, Is.EqualTo(schemaName));
+      Assert.That(r.Columns[1].TableName, Is.EqualTo("test"));
+      Assert.That(r.Columns[1].TableLabel, Is.EqualTo("test"));
+      Assert.That(r.Columns[1].ColumnName, Is.EqualTo("b"));
+      Assert.That(r.Columns[1].ColumnLabel, Is.EqualTo("b"));
+      Assert.That(r.Columns[1].Type, Is.EqualTo(ColumnType.String));
+      Assert.That(r.Columns[1].Length, Is.EqualTo(255u));
+      Assert.That(r.Columns[1].FractionalDigits, Is.EqualTo(0u));
+      Assert.That(r.Columns[1].IsNumberSigned, Is.False);
+      Assert.That(r.Columns[1].CharacterSetName, Is.EqualTo("utf8mb4"));
+      Assert.That(r.Columns[1].CollationName, Is.EqualTo("utf8mb4_0900_ai_ci"));
+      Assert.That(r.Columns[1].IsPadded, Is.False);
 
-      Assert.AreEqual(schemaName, r.Columns[2].SchemaName);
-      Assert.AreEqual("test", r.Columns[2].TableName);
-      Assert.AreEqual("test", r.Columns[2].TableLabel);
-      Assert.AreEqual("c", r.Columns[2].ColumnName);
-      Assert.AreEqual("c", r.Columns[2].ColumnLabel);
-      Assert.AreEqual(ColumnType.String, r.Columns[2].Type);
-      Assert.AreEqual(20u, r.Columns[2].Length);
-      Assert.AreEqual(0u, r.Columns[2].FractionalDigits);
-      Assert.False(r.Columns[2].IsNumberSigned);
-      Assert.AreEqual("utf8mb4", r.Columns[2].CharacterSetName);
-      Assert.AreEqual("utf8mb4_0900_ai_ci", r.Columns[2].CollationName);
-      Assert.False(r.Columns[2].IsPadded);
+      Assert.That(r.Columns[2].SchemaName, Is.EqualTo(schemaName));
+      Assert.That(r.Columns[2].TableName, Is.EqualTo("test"));
+      Assert.That(r.Columns[2].TableLabel, Is.EqualTo("test"));
+      Assert.That(r.Columns[2].ColumnName, Is.EqualTo("c"));
+      Assert.That(r.Columns[2].ColumnLabel, Is.EqualTo("c"));
+      Assert.That(r.Columns[2].Type, Is.EqualTo(ColumnType.String));
+      Assert.That(r.Columns[2].Length, Is.EqualTo(20u));
+      Assert.That(r.Columns[2].FractionalDigits, Is.EqualTo(0u));
+      Assert.That(r.Columns[2].IsNumberSigned, Is.False);
+      Assert.That(r.Columns[2].CharacterSetName, Is.EqualTo("utf8mb4"));
+      Assert.That(r.Columns[2].CollationName, Is.EqualTo("utf8mb4_0900_ai_ci"));
+      Assert.That(r.Columns[2].IsPadded, Is.False);
       //Assert.AreEqual("Δ", rows[0][2]);
     }
 
@@ -101,26 +101,26 @@ public void SchemaDefaultCharset()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema(schemaName).GetTable("test").Select("b"));
       var rows = r.FetchAll();
 
-      Assert.AreEqual(schemaName, r.Columns[0].SchemaName);
-      Assert.AreEqual("test", r.Columns[0].TableName);
-      Assert.AreEqual("test", r.Columns[0].TableLabel);
-      Assert.AreEqual("b", r.Columns[0].ColumnName);
-      Assert.AreEqual("b", r.Columns[0].ColumnLabel);
-      Assert.AreEqual(ColumnType.String, r.Columns[0].Type);
-      Assert.AreEqual(0u, r.Columns[0].FractionalDigits);
-      Assert.AreEqual(false, r.Columns[0].IsNumberSigned);
-      Assert.AreEqual(defaultValues[0][0], r.Columns[0].CharacterSetName);
-      Assert.AreEqual(defaultValues[0][1], r.Columns[0].CollationName);
-      Assert.AreEqual(false, r.Columns[0].IsPadded);
-      Assert.AreEqual("CAR", rows[0][0]);
+      Assert.That(r.Columns[0].SchemaName, Is.EqualTo(schemaName));
+      Assert.That(r.Columns[0].TableName, Is.EqualTo("test"));
+      Assert.That(r.Columns[0].TableLabel, Is.EqualTo("test"));
+      Assert.That(r.Columns[0].ColumnName, Is.EqualTo("b"));
+      Assert.That(r.Columns[0].ColumnLabel, Is.EqualTo("b"));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.String));
+      Assert.That(r.Columns[0].FractionalDigits, Is.EqualTo(0u));
+      Assert.That(r.Columns[0].IsNumberSigned, Is.EqualTo(false));
+      Assert.That(r.Columns[0].CharacterSetName, Is.EqualTo(defaultValues[0][0]));
+      Assert.That(r.Columns[0].CollationName, Is.EqualTo(defaultValues[0][1]));
+      Assert.That(r.Columns[0].IsPadded, Is.EqualTo(false));
+      Assert.That(rows[0][0], Is.EqualTo("CAR"));
 
       using (var connection = new MySqlConnection(ConnectionStringRoot))
       {
         connection.Open();
         if (connection.driver.Version.isAtLeast(8, 0, 1))
-          Assert.AreEqual(1020u, r.Columns[0].Length);
+          Assert.That(r.Columns[0].Length, Is.EqualTo(1020u));
         else
-          Assert.AreEqual(255u, r.Columns[0].Length);
+          Assert.That(r.Columns[0].Length, Is.EqualTo(255u));
       }
     }
 
@@ -130,11 +130,11 @@ public void ColumnNames()
       ExecuteSQL("CREATE TABLE test(columnA VARCHAR(255), columnB INT, columnX BIT)");
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema(schemaName).GetTable("test").Select());
 
-      Assert.AreEqual(3, r.ColumnCount);
-      Assert.AreEqual(r.Columns.Count, r.ColumnCount);
-      Assert.AreEqual("columnA", r.ColumnNames[0]);
-      Assert.AreEqual("columnB", r.ColumnNames[1]);
-      Assert.AreEqual("columnX", r.ColumnNames[2]);
+      Assert.That(r.ColumnCount, Is.EqualTo(3));
+      Assert.That(r.ColumnCount, Is.EqualTo(r.Columns.Count));
+      Assert.That(r.ColumnNames[0], Is.EqualTo("columnA"));
+      Assert.That(r.ColumnNames[1], Is.EqualTo("columnB"));
+      Assert.That(r.ColumnNames[2], Is.EqualTo("columnX"));
     }
 
     [Test]
@@ -147,19 +147,19 @@ public void TableDefaultCharset()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema(schemaName).GetTable("test").Select("b"));
       var rows = r.FetchAll();
 
-      Assert.AreEqual(schemaName, r.Columns[0].SchemaName);
-      Assert.AreEqual("test", r.Columns[0].TableName);
-      Assert.AreEqual("test", r.Columns[0].TableLabel);
-      Assert.AreEqual("b", r.Columns[0].ColumnName);
-      Assert.AreEqual("b", r.Columns[0].ColumnLabel);
-      Assert.AreEqual(ColumnType.String, r.Columns[0].Type);
-      Assert.AreEqual(255u, r.Columns[0].Length);
-      Assert.AreEqual(0u, r.Columns[0].FractionalDigits);
-      Assert.False(r.Columns[0].IsNumberSigned);
-      Assert.AreEqual("utf8mb4", r.Columns[0].CharacterSetName);
-      Assert.AreEqual("utf8mb4_0900_ai_ci", r.Columns[0].CollationName);
-      Assert.False(r.Columns[0].IsPadded);
-      Assert.AreEqual("Δ", rows[0][0]);
+      Assert.That(r.Columns[0].SchemaName, Is.EqualTo(schemaName));
+      Assert.That(r.Columns[0].TableName, Is.EqualTo("test"));
+      Assert.That(r.Columns[0].TableLabel, Is.EqualTo("test"));
+      Assert.That(r.Columns[0].ColumnName, Is.EqualTo("b"));
+      Assert.That(r.Columns[0].ColumnLabel, Is.EqualTo("b"));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.String));
+      Assert.That(r.Columns[0].Length, Is.EqualTo(255u));
+      Assert.That(r.Columns[0].FractionalDigits, Is.EqualTo(0u));
+      Assert.That(r.Columns[0].IsNumberSigned, Is.False);
+      Assert.That(r.Columns[0].CharacterSetName, Is.EqualTo("utf8mb4"));
+      Assert.That(r.Columns[0].CollationName, Is.EqualTo("utf8mb4_0900_ai_ci"));
+      Assert.That(r.Columns[0].IsPadded, Is.False);
+      Assert.That(rows[0][0], Is.EqualTo("Δ"));
     }
   }
 }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DataTypeTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DataTypeTests.cs
index 4e76036a7..81806cf7e 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DataTypeTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DataTypeTests.cs
@@ -49,14 +49,14 @@ public void Float()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select("rvalue"));
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(float), r.Columns[0].ClrType);
-      Assert.AreEqual(14, (int)r.Columns[0].Length);
-      Assert.AreEqual(8, (int)r.Columns[0].FractionalDigits);
-      Assert.AreEqual(ColumnType.Float, r.Columns[0].Type);
-      Assert.AreEqual(3, rows.Count);
-      Assert.AreEqual(23.4f, (float)rows[0][0]);
-      Assert.AreEqual(14.8f, rows[1][0]);
-      Assert.AreEqual(11.9f, rows[2][0]);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(float)));
+      Assert.That((int)r.Columns[0].Length, Is.EqualTo(14));
+      Assert.That((int)r.Columns[0].FractionalDigits, Is.EqualTo(8));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Float));
+      Assert.That(rows.Count, Is.EqualTo(3));
+      Assert.That((float)rows[0][0], Is.EqualTo(23.4f));
+      Assert.That(rows[1][0], Is.EqualTo(14.8f));
+      Assert.That(rows[2][0], Is.EqualTo(11.9f));
     }
 
     [Test]
@@ -68,14 +68,14 @@ public void Double()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select("rvalue"));
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(double), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.Double, r.Columns[0].Type);
-      Assert.AreEqual(12, (int)r.Columns[0].Length);
-      Assert.AreEqual(4, (int)r.Columns[0].FractionalDigits);
-      Assert.AreEqual(3, rows.Count);
-      Assert.AreEqual(23.4, rows[0][0]);
-      Assert.AreEqual(14.8, rows[1][0]);
-      Assert.AreEqual(11.9, rows[2][0]);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(double)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Double));
+      Assert.That((int)r.Columns[0].Length, Is.EqualTo(12));
+      Assert.That((int)r.Columns[0].FractionalDigits, Is.EqualTo(4));
+      Assert.That(rows.Count, Is.EqualTo(3));
+      Assert.That(rows[0][0], Is.EqualTo(23.4));
+      Assert.That(rows[1][0], Is.EqualTo(14.8));
+      Assert.That(rows[2][0], Is.EqualTo(11.9));
     }
 
     [Test]
@@ -87,12 +87,12 @@ public void Set()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select("rvalue"));
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(string), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.Set, r.Columns[0].Type);
-      Assert.AreEqual(3, rows.Count);
-      Assert.AreEqual("A", rows[0][0]);
-      Assert.AreEqual("A,B", rows[1][0]);
-      Assert.AreEqual("B", rows[2][0]);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(string)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Set));
+      Assert.That(rows.Count, Is.EqualTo(3));
+      Assert.That(rows[0][0], Is.EqualTo("A"));
+      Assert.That(rows[1][0], Is.EqualTo("A,B"));
+      Assert.That(rows[2][0], Is.EqualTo("B"));
     }
 
     [Test]
@@ -104,12 +104,12 @@ public void Enum()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select("rvalue"));
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(string), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.Enum, r.Columns[0].Type);
-      Assert.AreEqual(3, rows.Count);
-      Assert.AreEqual("Alpha", rows[0][0]);
-      Assert.AreEqual("Beta", rows[1][0]);
-      Assert.AreEqual("C", rows[2][0]);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(string)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Enum));
+      Assert.That(rows.Count, Is.EqualTo(3));
+      Assert.That(rows[0][0], Is.EqualTo("Alpha"));
+      Assert.That(rows[1][0], Is.EqualTo("Beta"));
+      Assert.That(rows[2][0], Is.EqualTo("C"));
     }
 
     [Test]
@@ -121,27 +121,27 @@ public void SignedIntegers()
 
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select());
       var rows = r.FetchAll();
-      Assert.AreEqual(5, r.Columns.Count);
-      Assert.AreEqual(typeof(sbyte), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.Tinyint, r.Columns[0].Type);
-      Assert.AreEqual((sbyte)127, rows[0][0]);
-      Assert.AreEqual((sbyte)-128, rows[1][0]);
-      Assert.AreEqual(typeof(Int16), r.Columns[1].ClrType);
-      Assert.AreEqual(ColumnType.Smallint, r.Columns[1].Type);
-      Assert.AreEqual((short)32767, rows[0][1]);
-      Assert.AreEqual((short)-32768, rows[1][1]);
-      Assert.AreEqual(typeof(Int32), r.Columns[2].ClrType);
-      Assert.AreEqual(ColumnType.Mediumint, r.Columns[2].Type);
-      Assert.AreEqual(8388607, rows[0][2]);
-      Assert.AreEqual(-8388608, rows[1][2]);
-      Assert.AreEqual(typeof(Int32), r.Columns[3].ClrType);
-      Assert.AreEqual(ColumnType.Int, r.Columns[3].Type);
-      Assert.AreEqual(2147483647, rows[0][3]);
-      Assert.AreEqual(-2147483648, rows[1][3]);
-      Assert.AreEqual(typeof(Int64), r.Columns[4].ClrType);
-      Assert.AreEqual(ColumnType.Bigint, r.Columns[4].Type);
-      Assert.AreEqual((long)9223372036854775807, rows[0][4]);
-      Assert.AreEqual((long)-9223372036854775808, rows[1][4]);
+      Assert.That(r.Columns.Count, Is.EqualTo(5));
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(sbyte)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Tinyint));
+      Assert.That(rows[0][0], Is.EqualTo((sbyte)127));
+      Assert.That(rows[1][0], Is.EqualTo((sbyte)-128));
+      Assert.That(r.Columns[1].ClrType, Is.EqualTo(typeof(Int16)));
+      Assert.That(r.Columns[1].Type, Is.EqualTo(ColumnType.Smallint));
+      Assert.That(rows[0][1], Is.EqualTo((short)32767));
+      Assert.That(rows[1][1], Is.EqualTo((short)-32768));
+      Assert.That(r.Columns[2].ClrType, Is.EqualTo(typeof(Int32)));
+      Assert.That(r.Columns[2].Type, Is.EqualTo(ColumnType.Mediumint));
+      Assert.That(rows[0][2], Is.EqualTo(8388607));
+      Assert.That(rows[1][2], Is.EqualTo(-8388608));
+      Assert.That(r.Columns[3].ClrType, Is.EqualTo(typeof(Int32)));
+      Assert.That(r.Columns[3].Type, Is.EqualTo(ColumnType.Int));
+      Assert.That(rows[0][3], Is.EqualTo(2147483647));
+      Assert.That(rows[1][3], Is.EqualTo(-2147483648));
+      Assert.That(r.Columns[4].ClrType, Is.EqualTo(typeof(Int64)));
+      Assert.That(r.Columns[4].Type, Is.EqualTo(ColumnType.Bigint));
+      Assert.That(rows[0][4], Is.EqualTo((long)9223372036854775807));
+      Assert.That(rows[1][4], Is.EqualTo((long)-9223372036854775808));
     }
 
     [Test]
@@ -152,22 +152,22 @@ public void UnsignedIntegers()
 
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select());
       var rows = r.FetchAll();
-      Assert.AreEqual(5, r.Columns.Count);
-      Assert.AreEqual(typeof(byte), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.Tinyint, r.Columns[0].Type);
-      Assert.AreEqual((byte)255, rows[0][0]);
-      Assert.AreEqual(typeof(UInt16), r.Columns[1].ClrType);
-      Assert.AreEqual(ColumnType.Smallint, r.Columns[1].Type);
-      Assert.AreEqual((ushort)65535, rows[0][1]);
-      Assert.AreEqual(typeof(UInt32), r.Columns[2].ClrType);
-      Assert.AreEqual(ColumnType.Mediumint, r.Columns[2].Type);
-      Assert.AreEqual((uint)16777215, rows[0][2]);
-      Assert.AreEqual(typeof(UInt32), r.Columns[3].ClrType);
-      Assert.AreEqual(ColumnType.Int, r.Columns[3].Type);
-      Assert.AreEqual((uint)4294967295, rows[0][3]);
-      Assert.AreEqual(typeof(UInt64), r.Columns[4].ClrType);
-      Assert.AreEqual(ColumnType.Bigint, r.Columns[4].Type);
-      Assert.AreEqual((ulong)18446744073709551615, rows[0][4]);
+      Assert.That(r.Columns.Count, Is.EqualTo(5));
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(byte)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Tinyint));
+      Assert.That(rows[0][0], Is.EqualTo((byte)255));
+      Assert.That(r.Columns[1].ClrType, Is.EqualTo(typeof(UInt16)));
+      Assert.That(r.Columns[1].Type, Is.EqualTo(ColumnType.Smallint));
+      Assert.That(rows[0][1], Is.EqualTo((ushort)65535));
+      Assert.That(r.Columns[2].ClrType, Is.EqualTo(typeof(UInt32)));
+      Assert.That(r.Columns[2].Type, Is.EqualTo(ColumnType.Mediumint));
+      Assert.That(rows[0][2], Is.EqualTo((uint)16777215));
+      Assert.That(r.Columns[3].ClrType, Is.EqualTo(typeof(UInt32)));
+      Assert.That(r.Columns[3].Type, Is.EqualTo(ColumnType.Int));
+      Assert.That(rows[0][3], Is.EqualTo((uint)4294967295));
+      Assert.That(r.Columns[4].ClrType, Is.EqualTo(typeof(UInt64)));
+      Assert.That(r.Columns[4].Type, Is.EqualTo(ColumnType.Bigint));
+      Assert.That(rows[0][4], Is.EqualTo((ulong)18446744073709551615));
     }
 
     [Test]
@@ -179,9 +179,9 @@ public void Bit()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select());
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(UInt64), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.Bit, r.Columns[0].Type);
-      Assert.AreEqual((ulong)127, rows[0][0]);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(UInt64)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Bit));
+      Assert.That(rows[0][0], Is.EqualTo((ulong)127));
     }
 
     [Test]
@@ -194,14 +194,14 @@ public void Decimal()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select());
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(decimal), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.Decimal, r.Columns[0].Type);
-      Assert.AreEqual(-1.23m, rows[0][0]);
-      Assert.AreEqual(-12.345m, rows[1][0]);
-      Assert.AreEqual(5m, rows[2][0]);
-      Assert.AreEqual(43m, rows[3][0]);
-      Assert.AreEqual(14523.2887238m, rows[4][0]);
-      Assert.AreEqual(-8947.8923784m, rows[5][0]);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(decimal)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Decimal));
+      Assert.That(rows[0][0], Is.EqualTo(-1.23m));
+      Assert.That(rows[1][0], Is.EqualTo(-12.345m));
+      Assert.That(rows[2][0], Is.EqualTo(5m));
+      Assert.That(rows[3][0], Is.EqualTo(43m));
+      Assert.That(rows[4][0], Is.EqualTo(14523.2887238m));
+      Assert.That(rows[5][0], Is.EqualTo(-8947.8923784m));
     }
 
     [Test]
@@ -214,10 +214,10 @@ public void Json()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select());
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(string), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.Json, r.Columns[0].Type);
-      Assert.AreEqual("{\"id\": 1, \"name\": \"John\"}", rows[0][0]);
-      Assert.AreEqual("[\"a\", 1, \"b\", 2]", rows[1][0]);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(string)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Json));
+      Assert.That(rows[0][0], Is.EqualTo("{\"id\": 1, \"name\": \"John\"}"));
+      Assert.That(rows[1][0], Is.EqualTo("[\"a\", 1, \"b\", 2]"));
     }
 
     [Test]
@@ -229,9 +229,9 @@ public void Strings()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select());
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(string), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.String, r.Columns[0].Type);
-      Assert.AreEqual("表", rows[0][0]);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(string)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.String));
+      Assert.That(rows[0][0], Is.EqualTo("表"));
     }
 
     [Test]
@@ -244,11 +244,11 @@ public void UnsingedZeroFill()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select());
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(UInt32), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.Int, r.Columns[0].Type);
-      Assert.False(r.Columns[0].IsNumberSigned);
-      Assert.True(r.Columns[0].IsPadded);
-      Assert.AreEqual("0000000100", rows[0][0].ToString());
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(UInt32)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Int));
+      Assert.That(r.Columns[0].IsNumberSigned, Is.False);
+      Assert.That(r.Columns[0].IsPadded);
+      Assert.That(rows[0][0].ToString(), Is.EqualTo("0000000100"));
     }
 
     [Test]
@@ -260,9 +260,9 @@ public void Bytes()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select());
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(string), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.String, r.Columns[0].Type);
-      Assert.AreEqual("John", rows[0][0]);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(string)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.String));
+      Assert.That(rows[0][0], Is.EqualTo("John"));
     }
 
     [Test]
@@ -274,9 +274,9 @@ public void BytesUsingCollation()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select());
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(string), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.String, r.Columns[0].Type);
-      Assert.AreEqual("Mark", rows[0][0]);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(string)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.String));
+      Assert.That(rows[0][0], Is.EqualTo("Mark"));
     }
 
     [Test]
@@ -288,10 +288,9 @@ public void Geometry()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select());
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(byte[]), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.Geometry, r.Columns[0].Type);
-      Assert.AreEqual("0000000001020000000400000000000000000000000000000000000000000000000000244000000000000024400000000000003440000000000000394000000000000049400000000000004E40",
-        BitConverter.ToString((byte[])rows[0][0]).Replace("-", ""));
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(byte[])));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Geometry));
+      Assert.That(BitConverter.ToString((byte[])rows[0][0]).Replace("-", ""), Is.EqualTo("0000000001020000000400000000000000000000000000000000000000000000000000244000000000000024400000000000003440000000000000394000000000000049400000000000004E40"));
     }
 
     [Test]
@@ -302,13 +301,13 @@ public void BlobTypes()
 
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema(schemaName).GetTable("test").Select());
       var rows = r.FetchAll();
-      Assert.AreEqual(2, r.Columns.Count);
-      Assert.AreEqual(typeof(byte[]), r.Columns[0].ClrType);
-      Assert.AreEqual(typeof(string), r.Columns[1].ClrType);
-      Assert.AreEqual(ColumnType.Bytes, r.Columns[0].Type);
-      Assert.AreEqual(ColumnType.String, r.Columns[1].Type);
-      Assert.AreEqual(CharSetMap.GetEncoding(r.Columns[0].CharacterSetName).GetBytes("Car"), rows[0][0]);
-      Assert.AreEqual("Plane", rows[0][1]);
+      Assert.That(r.Columns.Count, Is.EqualTo(2));
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(byte[])));
+      Assert.That(r.Columns[1].ClrType, Is.EqualTo(typeof(string)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Bytes));
+      Assert.That(r.Columns[1].Type, Is.EqualTo(ColumnType.String));
+      Assert.That(rows[0][0], Is.EqualTo(CharSetMap.GetEncoding(r.Columns[0].CharacterSetName).GetBytes("Car")));
+      Assert.That(rows[0][1], Is.EqualTo("Plane"));
     }
   }
 }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DateTimeTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DateTimeTests.cs
index 8ae4ee483..cfaefd5f7 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DateTimeTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DateTimeTests.cs
@@ -47,12 +47,12 @@ public void DateTime()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select("dt"));
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(DateTime), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.DateTime, r.Columns[0].Type);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(DateTime)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.DateTime));
       Assert.That(rows, Has.One.Items);
       DateTime dt = (DateTime)rows[0]["dt"];
       DateTime test = new DateTime(2001, 2, 3, 4, 5, 6);
-      Assert.AreEqual(test, dt);
+      Assert.That(dt, Is.EqualTo(test));
     }
 
     [Test]
@@ -64,12 +64,12 @@ public void Date()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select("dt"));
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(DateTime), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.Date, r.Columns[0].Type);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(DateTime)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Date));
       Assert.That(rows, Has.One.Items);
       DateTime dt = (DateTime)rows[0]["dt"];
       DateTime test = new DateTime(2001, 2, 3);
-      Assert.AreEqual(test, dt);
+      Assert.That(dt, Is.EqualTo(test));
     }
 
     [Test]
@@ -81,13 +81,13 @@ public void Timestamp()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select("dt"));
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(DateTime), r.Columns[0].ClrType);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(DateTime)));
       //TODO:  this should support timestamp
-      Assert.AreEqual(ColumnType.Timestamp, r.Columns[0].Type);
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Timestamp));
       Assert.That(rows, Has.One.Items);
       DateTime dt = (DateTime)rows[0]["dt"];
       DateTime test = new DateTime(2001, 2, 3);
-      Assert.AreEqual(test, dt);
+      Assert.That(dt, Is.EqualTo(test));
     }
 
     [Test]
@@ -99,12 +99,12 @@ public void Time()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select("dt"));
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(TimeSpan), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.Time, r.Columns[0].Type);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(TimeSpan)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Time));
       Assert.That(rows, Has.One.Items);
       TimeSpan t = (TimeSpan)rows[0]["dt"];
       TimeSpan test = new TimeSpan(1, 2, 3);
-      Assert.AreEqual(test, t);
+      Assert.That(t, Is.EqualTo(test));
     }
 
     [Test]
@@ -116,12 +116,12 @@ public void NegativeTime()
       RowResult r = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("test").Select("dt"));
       var rows = r.FetchAll();
       Assert.That(r.Columns, Has.One.Items);
-      Assert.AreEqual(typeof(TimeSpan), r.Columns[0].ClrType);
-      Assert.AreEqual(ColumnType.Time, r.Columns[0].Type);
+      Assert.That(r.Columns[0].ClrType, Is.EqualTo(typeof(TimeSpan)));
+      Assert.That(r.Columns[0].Type, Is.EqualTo(ColumnType.Time));
       Assert.That(rows, Has.One.Items);
       TimeSpan t = (TimeSpan)rows[0]["dt"];
       TimeSpan test = new TimeSpan(-1, 2, 3);
-      Assert.AreEqual(test, t);
+      Assert.That(t, Is.EqualTo(test));
     }
   }
 }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RelationalGCTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RelationalGCTests.cs
index 34d1aaa12..f5e731796 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RelationalGCTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RelationalGCTests.cs
@@ -48,10 +48,10 @@ public void FetchAllNoReference()
       WeakReference wr = new WeakReference(result);
       result = null;
       GC.Collect();
-      Assert.False(wr.IsAlive);
-      Assert.AreEqual(2, rows.Count);
-      Assert.AreEqual(22, rows[0]["age"]);
-      Assert.AreEqual("Patric", rows[1]["name"]);
+      Assert.That(wr.IsAlive, Is.False);
+      Assert.That(rows.Count, Is.EqualTo(2));
+      Assert.That(rows[0]["age"], Is.EqualTo(22));
+      Assert.That(rows[1]["name"], Is.EqualTo("Patric"));
     }
 #endif
   }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RowBufferingTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RowBufferingTests.cs
index 3809bb29b..7724b265b 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RowBufferingTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RowBufferingTests.cs
@@ -43,15 +43,15 @@ public void SmartBuffering()
       ExecuteSQL("INSERT INTO test2 VALUES (1,0)");
 
       var rowResult = ExecuteSelectStatement(testSchema.GetTable("test1").Select("id"));
-      Assert.AreEqual(0, rowResult.IndexOf("id"));
+      Assert.That(rowResult.IndexOf("id"), Is.EqualTo(0));
       foreach (var row in rowResult)
       {
         var result = ExecuteUpdateStatement(testSchema.GetTable("test2").Update().Where("id=1").Set("val", row["id"]));
-        Assert.AreEqual(1, result.AffectedItemsCount);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
       }
 
       Row valRow = ExecuteSelectStatement(testSchema.GetTable("test2").Select("val")).FetchOne();
-      Assert.AreEqual(4, valRow[0]);
+      Assert.That(valRow[0], Is.EqualTo(4));
     }
   }
 }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs
index 4ffb01a71..d5c906c3c 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs
@@ -54,9 +54,9 @@ public void ReturnSimpleScalar()
       using (var ss = MySQLX.GetSession(ConnectionString))
       {
         SqlResult r = ss.SQL("SELECT * FROM test.test").Execute();
-        Assert.True(r.Next());
-        Assert.AreEqual(1, r[0]);
-        Assert.False(r.NextResult());
+        Assert.That(r.Next());
+        Assert.That(r[0], Is.EqualTo(1));
+        Assert.That(r.NextResult(), Is.False);
       }
 
     }
@@ -68,13 +68,13 @@ public void ExecuteStoredProcedure()
 
       Session session = GetSession(true);
       var result = ExecuteSQLStatement(session.SQL("CALL my_proc()"));
-      Assert.True(result.HasData);
+      Assert.That(result.HasData);
       var row = result.FetchOne();
-      Assert.NotNull(row);
-      Assert.AreEqual((sbyte)5, row[0]);
-      Assert.False(result.Next());
-      Assert.Null(result.FetchOne());
-      Assert.False(result.NextResult());
+      Assert.That(row, Is.Not.Null);
+      Assert.That(row[0], Is.EqualTo((sbyte)5));
+      Assert.That(result.Next(), Is.False);
+      Assert.That(result.FetchOne(), Is.Null);
+      Assert.That(result.NextResult(), Is.False);
     }
 
     [Test]
@@ -85,28 +85,28 @@ public void ExecuteStoredProcedureMultipleResults()
 
       Session session = GetSession(true);
       var result = ExecuteSQLStatement(session.SQL("CALL my_proc()"));
-      Assert.True(result.HasData);
+      Assert.That(result.HasData);
       var row = result.FetchOne();
-      Assert.NotNull(row);
-      Assert.AreEqual((sbyte)5, row[0]);
-      Assert.False(result.Next());
-      Assert.Null(result.FetchOne());
+      Assert.That(row, Is.Not.Null);
+      Assert.That(row[0], Is.EqualTo((sbyte)5));
+      Assert.That(result.Next(), Is.False);
+      Assert.That(result.FetchOne(), Is.Null);
 
-      Assert.True(result.NextResult());
+      Assert.That(result.NextResult());
       row = result.FetchOne();
-      Assert.NotNull(row);
-      Assert.AreEqual("A", row[0]);
-      Assert.False(result.Next());
-      Assert.Null(result.FetchOne());
+      Assert.That(row, Is.Not.Null);
+      Assert.That(row[0], Is.EqualTo("A"));
+      Assert.That(result.Next(), Is.False);
+      Assert.That(result.FetchOne(), Is.Null);
 
-      Assert.True(result.NextResult());
+      Assert.That(result.NextResult());
       row = result.FetchOne();
-      Assert.NotNull(row);
-      Assert.AreEqual((sbyte)10, row[0]);
-      Assert.False(result.Next());
-      Assert.Null(result.FetchOne());
+      Assert.That(row, Is.Not.Null);
+      Assert.That(row[0], Is.EqualTo((sbyte)10));
+      Assert.That(result.Next(), Is.False);
+      Assert.That(result.FetchOne(), Is.Null);
 
-      Assert.False(result.NextResult());
+      Assert.That(result.NextResult(), Is.False);
     }
 
     [Test]
@@ -120,10 +120,10 @@ public void Bind()
           .Bind(++i, ((char)('@' + i)).ToString()));
 
       SqlResult result = ExecuteSQLStatement(GetSession(true).SQL("select * from test.test where id=?").Bind(5));
-      Assert.True(result.Next());
+      Assert.That(result.Next());
       Assert.That(result.Rows, Has.One.Items);
-      Assert.AreEqual(5, result[0]);
-      Assert.AreEqual("E", result[1]);
+      Assert.That(result[0], Is.EqualTo(5));
+      Assert.That(result[1], Is.EqualTo("E"));
     }
 
     [Test]
@@ -134,12 +134,12 @@ public void BindNull()
 
       var session = GetSession(true);
       var result = ExecuteSQLStatement(session.SQL("INSERT INTO test.test VALUES(1, ?), (2, 'B');").Bind(null));
-      Assert.AreEqual(2ul, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(2ul));
 
       var sqlResult = ExecuteSQLStatement(session.SQL("SELECT * FROM test.test WHERE letter is ?").Bind(null)).FetchAll();
       Assert.That(sqlResult, Has.One.Items);
-      Assert.AreEqual(1, sqlResult[0][0]);
-      Assert.Null(sqlResult[0][1]);
+      Assert.That(sqlResult[0][0], Is.EqualTo(1));
+      Assert.That(sqlResult[0][1], Is.Null);
     }
 
     [Test]
@@ -148,7 +148,7 @@ public void Alias()
       var session = GetSession(true);
       var stmt = ExecuteSQLStatement(session.SQL("SELECT 1 AS UNO"));
       var result = stmt.FetchAll();
-      Assert.AreEqual("UNO", stmt.Columns[0].ColumnLabel);
+      Assert.That(stmt.Columns[0].ColumnLabel, Is.EqualTo("UNO"));
     }
 
     #region WL14389
@@ -163,7 +163,7 @@ public void ProcedureWithNoTable()
 
       var sqlRes = session.SQL("call newproc(?, ?)").Bind(10).Bind("X").Execute();
       var ex = Assert.Throws<MySqlException>(() => session.SQL("drop procedure if exists newproc ").Execute());
-      StringAssert.AreEqualIgnoringCase("Table 'test.notab' doesn't exist", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Table 'test.notab' doesn't exist").IgnoreCase);
     }
 
     [Test, Description("Stored Procedure Table Positive using Session")]
@@ -199,13 +199,13 @@ public void TablePositiveSession()
             do
             {
               if (row[0] != null)
-                Assert.IsNotNull(row[0].ToString());
+                Assert.That(row[0].ToString(), Is.Not.Null);
 
               if (row[1] != null)
-                Assert.IsNotNull(row[1].ToString());
+                Assert.That(row[1].ToString(), Is.Not.Null);
 
               if (row[2] != null)
-                Assert.IsNotNull(row[2].ToString());
+                Assert.That(row[2].ToString(), Is.Not.Null);
 
             } while (res.Next()); while (res.NextResult()) ;
           }
@@ -293,13 +293,13 @@ public void StoredProcTablePositiveStringBuilderSession()
             do
             {
               if (row[0] != null)
-                Assert.IsNotNull(row[0].ToString());
+                Assert.That(row[0].ToString(), Is.Not.Null);
 
               if (row[1] != null)
-                Assert.IsNotNull(row[1].ToString());
+                Assert.That(row[1].ToString(), Is.Not.Null);
 
               if (row[2] != null)
-                Assert.IsNotNull(row[2].ToString());
+                Assert.That(row[2].ToString(), Is.Not.Null);
 
             } while (res.Next()); while (res.NextResult()) ;
           }
@@ -382,7 +382,7 @@ public void StoredProcReturnsNull()
         if (res.HasData)
         {
           var row = res.FetchOne();
-          Assert.IsNull(row);
+          Assert.That(row, Is.Null);
         }
         res.Next();
         res.NextResult();
@@ -417,7 +417,7 @@ public void BindSupportSessionSQLNumericDatatypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -440,7 +440,7 @@ public void BindSupportSessionSQLNumericDatatypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -462,7 +462,7 @@ public void BindSupportSessionSQLNumericDatatypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -484,7 +484,7 @@ public void BindSupportSessionSQLNumericDatatypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -506,7 +506,7 @@ public void BindSupportSessionSQLNumericDatatypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -528,7 +528,7 @@ public void BindSupportSessionSQLNumericDatatypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -550,7 +550,7 @@ public void BindSupportSessionSQLNumericDatatypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -572,7 +572,7 @@ public void BindSupportSessionSQLNumericDatatypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
     }
@@ -605,7 +605,7 @@ public void BindSupportSessionSQLDateTimetypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -627,7 +627,7 @@ public void BindSupportSessionSQLDateTimetypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -649,7 +649,7 @@ public void BindSupportSessionSQLDateTimetypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -671,7 +671,7 @@ public void BindSupportSessionSQLDateTimetypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -693,7 +693,7 @@ public void BindSupportSessionSQLDateTimetypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
     }
@@ -726,7 +726,7 @@ public void BindSupportSessionSQLStringtypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -748,7 +748,7 @@ public void BindSupportSessionSQLStringtypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -770,7 +770,7 @@ public void BindSupportSessionSQLStringtypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -792,7 +792,7 @@ public void BindSupportSessionSQLStringtypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -814,7 +814,7 @@ public void BindSupportSessionSQLStringtypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -836,7 +836,7 @@ public void BindSupportSessionSQLStringtypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
 
@@ -858,7 +858,7 @@ public void BindSupportSessionSQLStringtypes()
         myResult = sessionTest.SQL("SELECT @my_var").Execute();
         // Gets the row and prints the first column
         row = myResult.FetchOne();
-        Assert.IsNotNull(row[0].ToString());
+        Assert.That(row[0].ToString(), Is.Not.Null);
         sessionTest.SQL("DROP DATABASE DBName").Execute();
       }
     }
@@ -941,15 +941,15 @@ public void MixedChainedCommands()
 
       RowResult r = session.GetSchema("test").GetTable("test").Select("c1").Execute();
       var rows = r.FetchAll();
-      Assert.AreEqual(1, r.Columns.Count, "Matching");
-      Assert.AreEqual(typeof(float).ToString(), r.Columns[0].ClrType.ToString(), "Matching");
-      Assert.AreEqual(MySqlDbType.Float.ToString(), r.Columns[0].Type.ToString(), "Matching");
-      Assert.AreEqual(14, (int)r.Columns[0].Length, "Matching");
-      Assert.AreEqual(8, (int)r.Columns[0].FractionalDigits, "Matching");
-      Assert.AreEqual(3, rows.Count, "Matching");
-      Assert.AreEqual(22.7f, (float)rows[0][0], "Matching");
-      Assert.AreEqual(-100000.38984f, (float)rows[1][0], "Matching");
-      Assert.AreEqual(0f, (float)rows[2][0], "Matching");
+      Assert.That(r.Columns.Count, Is.EqualTo(1), "Matching");
+      Assert.That(r.Columns[0].ClrType.ToString(), Is.EqualTo(typeof(float).ToString()), "Matching");
+      Assert.That(r.Columns[0].Type.ToString(), Is.EqualTo(MySqlDbType.Float.ToString()), "Matching");
+      Assert.That((int)r.Columns[0].Length, Is.EqualTo(14), "Matching");
+      Assert.That((int)r.Columns[0].FractionalDigits, Is.EqualTo(8), "Matching");
+      Assert.That(rows.Count, Is.EqualTo(3), "Matching");
+      Assert.That((float)rows[0][0], Is.EqualTo(22.7f), "Matching");
+      Assert.That((float)rows[1][0], Is.EqualTo(-100000.38984f), "Matching");
+      Assert.That((float)rows[2][0], Is.EqualTo(0f), "Matching");
     }
 
     [Test, Description("Test MySQLX plugin MySQL Date Time Bug")]
@@ -961,7 +961,7 @@ public void DateTimeCheck()
 
       RowResult r = session.GetSchema("test").GetTable("test1212").Select("dt").Execute();
       var rows = r.FetchAll();
-      Assert.AreEqual(1, r.Columns.Count, "Matching Coulumn Count");
+      Assert.That(r.Columns.Count, Is.EqualTo(1), "Matching Coulumn Count");
 
     }
 
@@ -974,7 +974,7 @@ public void DateTimeJSON()
       ExecuteSQL(@"INSERT INTO test.test VALUES(100000,' { ""name"" : ""bob"",""Date"": ""2015-10-09"",""Time"": ""12:18:29.000000"",""DateTimeOfRegistration"": ""2015-10-09 12:18:29.000000"",""age"":12} ')");
       RowResult r = session.GetSchema("test").GetTable("test").Select("jsoncolumn").Execute();
       var rows = r.FetchAll();
-      Assert.AreEqual(1, r.Columns.Count, "Matching");
+      Assert.That(r.Columns.Count, Is.EqualTo(1), "Matching");
     }
 
     [Test, Description("Test MySQLX plugin JSON Variant")]
@@ -988,7 +988,7 @@ public void JSONVariant()
       ExecuteSQL(@"INSERT INTO test VALUES (2, '[""a"", {""b"": [true, false]}, [10, 20]]')");
       ExecuteSQL(@"INSERT INTO test VALUES (3, '{""id"":1,""name"":""test""}')");
       var r = ExecuteSQL(@"SELECT JSON_EXTRACT('{""id"": 1, ""name"": ""test""}','$.name')").FetchOne();
-      Assert.AreEqual("\"test\"", r[0]);
+      Assert.That(r[0], Is.EqualTo("\"test\""));
     }
 
     [Test, Description("Test MySQLX plugin big int as PK")]
@@ -1000,9 +1000,9 @@ public void BigIntasPK()
       ExecuteSQL("DROP TABLE IF EXISTS Test");
       ExecuteSQL("CREATE TABLE test (Id bigint NOT NULL PRIMARY KEY, jsoncolumn JSON)");
       var res = ExecuteSQL("INSERT INTO test VALUES (934157136952, '[1]')");
-      Assert.AreEqual(1, res.AffectedItemsCount);
+      Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
       res = ExecuteSQL(@"INSERT INTO test VALUES (9223372036854775807, '[""a"", {""b"": [true, false]}, [10, 20]]')");
-      Assert.AreEqual(1, res.AffectedItemsCount);
+      Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
       Assert.Throws<MySqlException>(() => ExecuteSQL("INSERT INTO test VALUES ('str1', '[1]')"));
     }
 
@@ -1017,9 +1017,9 @@ public void TinyIntasPK()
         ss.SQL("DROP TABLE IF EXISTS test.test").Execute();
         ss.SQL("CREATE TABLE test.test (Id tinyint NOT NULL PRIMARY KEY, jsoncolumn JSON)").Execute();
         var res = ss.SQL("INSERT INTO test.test VALUES (1, '[1]')").Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
         res = ss.SQL(@"INSERT INTO test.test VALUES (2, '[""a"", {""b"": [true, false]}, [10, 20]]')").Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
         Assert.Throws<MySqlException>(() => ss.SQL("INSERT INTO test.test VALUES ('str1', '[1]')").Execute());
       }
     }
@@ -1035,9 +1035,9 @@ public void SmallIntasPK()
         ss.SQL("DROP TABLE IF EXISTS test.test").Execute();
         ss.SQL("CREATE TABLE test.test (Id smallint NOT NULL PRIMARY KEY, jsoncolumn JSON)").Execute();
         var res = ss.SQL("INSERT INTO test.test VALUES (99, '[1]')").Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
         res = ss.SQL(@"INSERT INTO test.test VALUES (1, '[""a"", {""b"": [true, false]}, [10, 20]]')").Execute();
-        Assert.AreEqual(1, res.AffectedItemsCount);
+        Assert.That(res.AffectedItemsCount, Is.EqualTo(1));
         Assert.Throws<MySqlException>(() => ss.SQL("INSERT INTO test.test VALUES ('str1', '[1]')").Execute());
         ss.SQL("DROP TABLE IF EXISTS test.test");
       }
@@ -1057,7 +1057,7 @@ public void DataValidation()
         while (result.Next())
         {
           Assert.That(result.Rows, Has.Exactly(3).Items);
-          Assert.True(expecteddataValue.Contains(result[0].ToString()));
+          Assert.That(expecteddataValue.Contains(result[0].ToString()));
         }
       }
     }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableAsyncTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableAsyncTests.cs
index c071fecbb..7cfcd16d1 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableAsyncTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableAsyncTests.cs
@@ -58,8 +58,8 @@ public void MultipleTableInsertAsync()
         tasksList.Add(table.Insert().Values(i, i % 250).ExecuteAsync());
       }
 
-      Assert.True(Task.WaitAll(tasksList.ToArray(), TimeSpan.FromMinutes(2)), "WaitAll timeout");
-      Assert.AreEqual(200, table.Count());
+      Assert.That(Task.WaitAll(tasksList.ToArray(), TimeSpan.FromMinutes(2)), "WaitAll timeout");
+      Assert.That(table.Count(), Is.EqualTo(200));
     }
 
     [Test]
@@ -83,16 +83,16 @@ public void MultipleTableSelectAsync()
         tasksList.Add(table.Select().Where("age = :age").Bind("aGe", i).ExecuteAsync());
       }
 
-      Assert.True(Task.WaitAll(tasksList.ToArray(), TimeSpan.FromMinutes(2)), "WaitAll timeout");
+      Assert.That(Task.WaitAll(tasksList.ToArray(), TimeSpan.FromMinutes(2)), "WaitAll timeout");
       foreach (Task<RowResult> task in tasksList)
       {
-        Assert.AreEqual(2, task.Result.Columns.Count);
+        Assert.That(task.Result.Columns.Count, Is.EqualTo(2));
         Assert.That(task.Result.Rows, Has.One.Items);
         int value = (int)task.Result.Rows[0][1];
-        Assert.False(validator.Contains(value), value + " value exists");
+        Assert.That(validator.Contains(value), Is.False, value + " value exists");
         validator.Add(value);
       }
-      Assert.AreEqual(rows, validator.Count);
+      Assert.That(validator.Count, Is.EqualTo(rows));
     }
     #region WL14389
     [Test, Description("Table.Select() with shared lock and Table.Update() ")]
@@ -116,7 +116,7 @@ private Task<int> SubProcess1()
         }
         catch (MySqlException ex)
         {
-          Assert.True(ex.Message.Contains("Duplicate"));
+          Assert.That(ex.Message.Contains("Duplicate"));
         }
 
         var table2 = session2.GetSchema("test").GetTable("test");
@@ -124,7 +124,7 @@ private Task<int> SubProcess1()
         for (var i = 0; i < 1000; i++)
         {
           var result = table2.Update().Where("id = 1").Set("age", 2).Execute();
-          Assert.IsNotNull(result);
+          Assert.That(result, Is.Not.Null);
         }
       }
 
@@ -149,7 +149,7 @@ private Task<int> SubProcess2()
         }
         catch (MySqlException ex)
         {
-          Assert.True(ex.Message.Contains("Duplicate"));
+          Assert.That(ex.Message.Contains("Duplicate"));
         }
 
         var table2 = session2.GetSchema("test").GetTable("test");
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableDeleteTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableDeleteTests.cs
index 508eefec0..a423a0723 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableDeleteTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableDeleteTests.cs
@@ -51,7 +51,7 @@ public void SetUp()
         insertStatement.Values(i, i);
       }
       ExecuteInsertStatement(insertStatement);
-      Assert.AreEqual(rowsToInsert, CountRows());
+      Assert.That(CountRows(), Is.EqualTo(rowsToInsert));
     }
 
     private long CountRows()
@@ -62,7 +62,7 @@ private long CountRows()
     private void ExecuteDelete(TableDeleteStatement statement, int expectedRowsCount)
     {
       Result result = ExecuteDeleteStatement(statement);
-      Assert.AreEqual(expectedRowsCount, CountRows());
+      Assert.That(CountRows(), Is.EqualTo(expectedRowsCount));
     }
 
     [Test]
@@ -101,17 +101,17 @@ public void DeleteBindTest()
     public void DeleteWithInOperator()
     {
       Table table = testSchema.GetTable("test");
-      Assert.AreEqual(10, CountRows());
+      Assert.That(CountRows(), Is.EqualTo(10));
 
-      Assert.AreEqual(2, ExecuteDeleteStatement(table.Delete().Where("id IN (1,2)")).AffectedItemsCount);
-      Assert.AreEqual(8, CountRows());
+      Assert.That(ExecuteDeleteStatement(table.Delete().Where("id IN (1,2)")).AffectedItemsCount, Is.EqualTo(2));
+      Assert.That(CountRows(), Is.EqualTo(8));
 
       Assert.Throws<MySqlException>(() => ExecuteDeleteStatement(table.Delete().Where("a IN [3]")));
       Assert.Throws<MySqlException>(() => ExecuteDeleteStatement(table.Delete().Where("3 IN a")));
       Assert.Throws<MySqlException>(() => ExecuteDeleteStatement(table.Delete().Where("age IN [3]")));
 
-      Assert.AreEqual(1, ExecuteDeleteStatement(table.Delete().Where("age IN (3)")).AffectedItemsCount);
-      Assert.AreEqual(7, CountRows());
+      Assert.That(ExecuteDeleteStatement(table.Delete().Where("age IN (3)")).AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(CountRows(), Is.EqualTo(7));
     }
   }
 }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableInsertTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableInsertTests.cs
index d831154fd..206563e21 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableInsertTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableInsertTests.cs
@@ -52,17 +52,17 @@ public void InsertMultipleValues()
         .Values("Henry", "22")
         .Values("Patric", 30)
         );
-      Assert.AreEqual(2, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(2));
 
       var selectResult = ExecuteSelectStatement(table.Select());
       while (selectResult.Next()) ;
-      Assert.AreEqual(2, selectResult.Rows.Count);
-      Assert.AreEqual("Henry", selectResult.Rows.ToArray()[0][0]);
-      Assert.AreEqual(22, selectResult.Rows.ToArray()[0][1]);
-      Assert.AreEqual("Patric", selectResult.Rows.ToArray()[1][0]);
-      Assert.AreEqual(30, selectResult.Rows.ToArray()[1][1]);
+      Assert.That(selectResult.Rows.Count, Is.EqualTo(2));
+      Assert.That(selectResult.Rows.ToArray()[0][0], Is.EqualTo("Henry"));
+      Assert.That(selectResult.Rows.ToArray()[0][1], Is.EqualTo(22));
+      Assert.That(selectResult.Rows.ToArray()[1][0], Is.EqualTo("Patric"));
+      Assert.That(selectResult.Rows.ToArray()[1][1], Is.EqualTo(30));
 
-      Assert.AreEqual(2, table.Count());
+      Assert.That(table.Count(), Is.EqualTo(2));
     }
 
     [Test]
@@ -72,13 +72,13 @@ public void InsertExpressions()
       Table table = testSchema.GetTable("test");
 
       var result = ExecuteInsertStatement(table.Insert("name", "age").Values("MARK", "34"));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
       var selectResult = ExecuteSelectStatement(table.Select());
       while (selectResult.Next()) ;
       Assert.That(selectResult.Rows, Has.One.Items);
-      Assert.AreEqual("MARK", selectResult.Rows.ToArray()[0][0]);
-      Assert.AreEqual(34, selectResult.Rows.ToArray()[0][1]);
+      Assert.That(selectResult.Rows.ToArray()[0][0], Is.EqualTo("MARK"));
+      Assert.That(selectResult.Rows.ToArray()[0][1], Is.EqualTo(34));
     }
 
     [Test]
@@ -89,10 +89,10 @@ public void ReuseStatement()
 
       var stmt = table.Insert("name", "age");
       var result = ExecuteInsertStatement(stmt.Values("MARK", "34"));
-      Assert.AreEqual(1, result.AffectedItemsCount);
+      Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
       // error 5014 - Wrong number of fields in row being inserted
-      Assert.AreEqual(5014u, Assert.Throws<MySqlException>(() => result = ExecuteInsertStatement(stmt.Values("George", 34, 1))).Code);
-      Assert.AreEqual(5014u, Assert.Throws<MySqlException>(() => ExecuteInsertStatement(stmt.Values("George", 34))).Code);
+      Assert.That(Assert.Throws<MySqlException>(() => result = ExecuteInsertStatement(stmt.Values("George", 34, 1))).Code, Is.EqualTo(5014u));
+      Assert.That(Assert.Throws<MySqlException>(() => ExecuteInsertStatement(stmt.Values("George", 34))).Code, Is.EqualTo(5014u));
       Assert.That(ExecuteSelectStatement(table.Select()).FetchAll(), Has.One.Items);
     }
 
@@ -117,10 +117,10 @@ public void InsertWithExpressionsAlikeValues(string specialChar)
       var selectResult = ExecuteSelectStatement(table.Select());
       while (selectResult.Next()) ;
 
-      Assert.AreEqual(1, insertResult.AffectedItemsCount);
+      Assert.That(insertResult.AffectedItemsCount, Is.EqualTo(1));
       Assert.That(selectResult.Rows, Has.One.Items);
-      StringAssert.AreEqualIgnoringCase("1", selectResult.Rows.ToArray()[0][0].ToString());
-      StringAssert.AreEqualIgnoringCase(value, selectResult.Rows.ToArray()[0][1].ToString());
+      Assert.That(selectResult.Rows.ToArray()[0][0].ToString(), Is.EqualTo("1").IgnoreCase);
+      Assert.That(selectResult.Rows.ToArray()[0][1].ToString(), Is.EqualTo(value).IgnoreCase);
     }
   }
 }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
index 693435fc1..78ef32930 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
@@ -69,7 +69,7 @@ public void TearDown()
     public void FetchOne()
     {
       Table t = testSchema.GetTable("test");
-      Assert.AreEqual(38, ExecuteSelectStatement(t.Select("age")).FetchOne()["age"]);
+      Assert.That(ExecuteSelectStatement(t.Select("age")).FetchOne()["age"], Is.EqualTo(38));
     }
 
     private void MultiTableSelectTest(TableSelectStatement statement, object[][] expectedValues)
@@ -77,13 +77,13 @@ private void MultiTableSelectTest(TableSelectStatement statement, object[][] exp
       RowResult result = ExecuteSelectStatement(statement);
       int rowCount = result.FetchAll().Count;
 
-      Assert.AreEqual(expectedValues.Length, rowCount);
-      Assert.AreEqual(expectedValues.Length, result.Rows.Count);
+      Assert.That(rowCount, Is.EqualTo(expectedValues.Length));
+      Assert.That(result.Rows.Count, Is.EqualTo(expectedValues.Length));
       for (int i = 0; i < expectedValues.Length; i++)
       {
         for (int j = 0; j < expectedValues[i].Length; j++)
         {
-          Assert.AreEqual(expectedValues[i][j], result.Rows.ToArray()[i][j]);
+          Assert.That(result.Rows.ToArray()[i][j], Is.EqualTo(expectedValues[i][j]));
         }
       }
     }
@@ -124,14 +124,14 @@ public void AllColumns()
       var table = testSchema.GetTable("test");
       var select = ExecuteSelectStatement(table.Select("*, 42 as a_number, '43' as a_string"));
       var rows = select.FetchAll();
-      Assert.AreEqual(6, select.Columns.Count);
-      Assert.AreEqual(allRows.Length, rows.Count);
-      Assert.AreEqual(allRows[0][0], rows[0]["id"]);
-      Assert.AreEqual(allRows[0][1], rows[0]["name"]);
-      Assert.AreEqual(allRows[0][2], rows[0]["age"]);
-      Assert.AreEqual(allRows[0][3], rows[0]["additionalinfo"]);
-      Assert.AreEqual((sbyte)42, rows[0]["a_number"]);
-      Assert.AreEqual("43", rows[0]["a_string"]);
+      Assert.That(select.Columns.Count, Is.EqualTo(6));
+      Assert.That(rows.Count, Is.EqualTo(allRows.Length));
+      Assert.That(rows[0]["id"], Is.EqualTo(allRows[0][0]));
+      Assert.That(rows[0]["name"], Is.EqualTo(allRows[0][1]));
+      Assert.That(rows[0]["age"], Is.EqualTo(allRows[0][2]));
+      Assert.That(rows[0]["additionalinfo"], Is.EqualTo(allRows[0][3]));
+      Assert.That(rows[0]["a_number"], Is.EqualTo((sbyte)42));
+      Assert.That(rows[0]["a_string"], Is.EqualTo("43"));
     }
 
     [Test]
@@ -142,7 +142,7 @@ public void CountAllColumns()
       var rows = select.FetchAll();
       Assert.That(select.Columns, Has.One.Items);
       Assert.That(rows, Has.One.Items);
-      Assert.AreEqual(allRows.Length + 10, (long)rows[0][0]);
+      Assert.That((long)rows[0][0], Is.EqualTo(allRows.Length + 10));
     }
 
     [Test]
@@ -153,8 +153,8 @@ public void MultipleBind()
       var select = ExecuteSelectStatement(table.Select().Where("Name = :nAme && Age = :aGe").Bind("agE", validationRow[2]).Bind("naMe", validationRow[1]));
       var rows = select.FetchAll();
       Assert.That(rows, Has.One.Items);
-      Assert.AreEqual(validationRow[1], rows[0]["namE"]);
-      Assert.AreEqual(validationRow[2], rows[0]["AGe"]);
+      Assert.That(rows[0]["namE"], Is.EqualTo(validationRow[1]));
+      Assert.That(rows[0]["AGe"], Is.EqualTo(validationRow[2]));
     }
 
     [Test]
@@ -164,9 +164,9 @@ public void DatetimeAndMicroseconds()
       ExecuteSQL("INSERT INTO test.testDate VALUES(1, 'JOHN', '1985-10-21 16:34:22.123456')");
       ExecuteSQL("INSERT INTO test.testDate VALUES(1, 'BILL', '1985-10-21 10:00:45.987')");
       var rows = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("testDate").Select()).FetchAll();
-      Assert.AreEqual(2, rows.Count);
-      Assert.AreEqual(new DateTime(1985, 10, 21, 16, 34, 22).AddTicks(1234560), (DateTime)rows[0]["birthday"]);
-      Assert.AreEqual(new DateTime(1985, 10, 21, 10, 0, 45).AddTicks(9870000), (DateTime)rows[1]["birthday"]);
+      Assert.That(rows.Count, Is.EqualTo(2));
+      Assert.That((DateTime)rows[0]["birthday"], Is.EqualTo(new DateTime(1985, 10, 21, 16, 34, 22).AddTicks(1234560)));
+      Assert.That((DateTime)rows[1]["birthday"], Is.EqualTo(new DateTime(1985, 10, 21, 10, 0, 45).AddTicks(9870000)));
     }
 
     [Test]
@@ -176,9 +176,9 @@ public void DatetimeAndMilliseconds()
       ExecuteSQL("INSERT INTO test.testDate2 VALUES(1, 'JOHN', '1985-10-21 16:34:22.123456')");
       ExecuteSQL("INSERT INTO test.testDate2 VALUES(1, 'BILL', '1985-10-21 10:00:45.098')");
       var rows = ExecuteSelectStatement(GetSession().GetSchema("test").GetTable("testDate2").Select()).FetchAll();
-      Assert.AreEqual(2, rows.Count);
-      Assert.AreEqual(new DateTime(1985, 10, 21, 16, 34, 22).AddTicks(1230000), (DateTime)rows[0]["birthday"]);
-      Assert.AreEqual(new DateTime(1985, 10, 21, 10, 0, 45).AddTicks(980000), (DateTime)rows[1]["birthday"]);
+      Assert.That(rows.Count, Is.EqualTo(2));
+      Assert.That((DateTime)rows[0]["birthday"], Is.EqualTo(new DateTime(1985, 10, 21, 16, 34, 22).AddTicks(1230000)));
+      Assert.That((DateTime)rows[1]["birthday"], Is.EqualTo(new DateTime(1985, 10, 21, 10, 0, 45).AddTicks(980000)));
     }
 
     [Test]
@@ -189,10 +189,10 @@ public void RowLockingNotSupportedInOlderVersions()
       Table table = session.Schema.GetTable("test");
 
       Exception ex = Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table.Select().LockShared()));
-      Assert.AreEqual("This functionality is only supported from server version 8.0.3 onwards.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("This functionality is only supported from server version 8.0.3 onwards."));
 
       ex = Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table.Select().LockExclusive()));
-      Assert.AreEqual("This functionality is only supported from server version 8.0.3 onwards.", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("This functionality is only supported from server version 8.0.3 onwards."));
     }
 
     [Test]
@@ -248,7 +248,7 @@ public void SimpleExclusiveLock()
         // Session2 blocks due to to LockExclusive() not allowing to read locked rows.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         Exception ex = Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table2.Select().Where("id = 1").LockExclusive()));
-        Assert.AreEqual("Lock wait timeout exceeded; try restarting transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Lock wait timeout exceeded; try restarting transaction"));
 
         ExecuteSQLStatement(session.SQL("ROLLBACK"));
         ExecuteSQLStatement(session2.SQL("ROLLBACK"));
@@ -278,11 +278,11 @@ public void SharedLockForbidsToModifyDocuments()
 
         // Modify() is allowed for non-locked rows.
         Result result = ExecuteUpdateStatement(table2.Update().Where("id = 2").Set("age", 2));
-        Assert.AreEqual(1, result.AffectedItemsCount);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
         // Session1 blocks, Modify() is not allowed for locked rows.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         Exception ex = Assert.Throws<MySqlException>(() => ExecuteUpdateStatement(table2.Update().Where("id = 1").Set("age", 2)));
-        Assert.AreEqual("Lock wait timeout exceeded; try restarting transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Lock wait timeout exceeded; try restarting transaction"));
 
         ExecuteSQLStatement(session.SQL("ROLLBACK"));
         // Modify() is allowed since row isn't locked anymore.
@@ -311,11 +311,11 @@ public void ExclusiveLockForbidsToModifyDocuments()
 
         // Modify() is allowed for non-locked rows.
         Result result = ExecuteUpdateStatement(table2.Update().Where("id = 2").Set("age", 2));
-        Assert.AreEqual(1, result.AffectedItemsCount);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
         // Session1 blocks, Modify() is not allowed for locked rows.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         Exception ex = Assert.Throws<MySqlException>(() => ExecuteUpdateStatement(table2.Update().Where("id = 1").Set("age", 2)));
-        Assert.AreEqual("Lock wait timeout exceeded; try restarting transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Lock wait timeout exceeded; try restarting transaction"));
 
         ExecuteSQLStatement(session.SQL("ROLLBACK"));
         // Modify() is allowed since row isn't locked anymore.
@@ -348,7 +348,7 @@ public void SharedLockAfterExclusiveLock()
         // Session2 blocks due to LockExclusive() not allowing to read locked rows.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         Exception ex = Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table2.Select().Where("id = 1").LockShared()));
-        Assert.AreEqual("Lock wait timeout exceeded; try restarting transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Lock wait timeout exceeded; try restarting transaction"));
 
         // Session unlocks rows.
         ExecuteSQLStatement(session.SQL("ROLLBACK"));
@@ -374,7 +374,7 @@ public void ExclusiveLockAfterSharedLock()
 
         ExecuteSQLStatement(session.SQL("START TRANSACTION"));
         RowResult rowResult = ExecuteSelectStatement(table.Select().Where("id in (1, 3)").LockShared());
-        Assert.AreEqual(2, rowResult.FetchAll().Count);
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(2));
 
         ExecuteSQLStatement(session2.SQL("START TRANSACTION"));
         // Should return immediately since row isn't locked.
@@ -385,7 +385,7 @@ public void ExclusiveLockAfterSharedLock()
         // Session2 blocks due to to LockExclusive() not allowing to read locked rows.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         Exception ex = Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table2.Select().Where("id = 1").LockExclusive()));
-        Assert.AreEqual("Lock wait timeout exceeded; try restarting transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Lock wait timeout exceeded; try restarting transaction"));
 
         // Session unlocks rows.
         ExecuteSQLStatement(session.SQL("ROLLBACK"));
@@ -399,15 +399,15 @@ public void ExclusiveLockAfterSharedLock()
     public void SelectWithInOperator()
     {
       Table table = testSchema.GetTable("test");
-      Assert.AreEqual(3, ExecuteSelectStatement(table.Select()).FetchAll().Count);
+      Assert.That(ExecuteSelectStatement(table.Select()).FetchAll().Count, Is.EqualTo(3));
 
-      Assert.AreEqual(2, ExecuteSelectStatement(table.Select().Where("name IN (\"jonh doe\", \"milton green\")")).FetchAll().Count);
+      Assert.That(ExecuteSelectStatement(table.Select().Where("name IN (\"jonh doe\", \"milton green\")")).FetchAll().Count, Is.EqualTo(2));
       Assert.That(ExecuteSelectStatement(table.Select().Where("name NOT IN (\"jonh doe\", \"milton green\")")).FetchAll(), Has.One.Items);
-      CollectionAssert.IsEmpty(ExecuteSelectStatement(table.Select().Where("name IN (\"\", \"\")")).FetchAll());
-      CollectionAssert.IsEmpty(ExecuteSelectStatement(table.Select().Where("\"\" IN (1,2,3)")).FetchAll());
-      CollectionAssert.IsEmpty(ExecuteSelectStatement(table.Select().Where("name IN ('', '')")).FetchAll());
-      CollectionAssert.IsEmpty(ExecuteSelectStatement(table.Select().Where("'' IN (1,2,3)")).FetchAll());
-      Assert.AreEqual(3, ExecuteSelectStatement(table.Select().Where("'' IN ('')")).FetchAll().Count);
+      Assert.That(ExecuteSelectStatement(table.Select().Where("name IN (\"\", \"\")")).FetchAll(), Is.Empty);
+      Assert.That(ExecuteSelectStatement(table.Select().Where("\"\" IN (1,2,3)")).FetchAll(), Is.Empty);
+      Assert.That(ExecuteSelectStatement(table.Select().Where("name IN ('', '')")).FetchAll(), Is.Empty);
+      Assert.That(ExecuteSelectStatement(table.Select().Where("'' IN (1,2,3)")).FetchAll(), Is.Empty);
+      Assert.That(ExecuteSelectStatement(table.Select().Where("'' IN ('')")).FetchAll().Count, Is.EqualTo(3));
 
       Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table.Select().Where("name NOT IN [\"jonh doe\", \"milton green\"]")).FetchAll());
       Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table.Select().Where("a IN [3]")).FetchAll());
@@ -433,55 +433,55 @@ public void Grouping()
         statement = statement.Values(user);
       }
 
-      Assert.AreEqual(4, ExecuteInsertStatement(statement).AffectedItemsCount);
+      Assert.That(ExecuteInsertStatement(statement).AffectedItemsCount, Is.EqualTo(4));
 
       // GroupBy returns 5 rows since age 45 and 24 is repeated.
       var result = ExecuteSelectStatement(table.Select().GroupBy("age"));
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       // GroupBy with null.
       result = ExecuteSelectStatement(table.Select("id as ID", "name as Name", "age as Age").GroupBy(null));
-      Assert.AreEqual(7, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(7));
       result = ExecuteSelectStatement(table.Select("id as ID", "name as Name", "age as Age").GroupBy(null, null));
-      Assert.AreEqual(7, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(7));
       result = ExecuteSelectStatement(table.Select("id as ID", "name as Name", "age as Age").GroupBy(null, "age"));
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       // Having operation.
       // Having reduces the original 5 rows to 3 since 2 rows have a cnt=2, due to the repeated names.
       result = ExecuteSelectStatement(table.Select("id", "count(name) as cnt", "age").GroupBy("age").Having("cnt = 1"));
-      Assert.AreEqual(3, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(3));
 
       // Having with null.
       result = ExecuteSelectStatement(table.Select("id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having(null));
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       // GroupBy with invalid field name.
       var ex = Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table.Select("id as ID", "name as Name", "age as Age").GroupBy("none")));
-      Assert.AreEqual("Unknown column 'none' in 'group statement'", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Unknown column 'none' in 'group statement'"));
 
       // GroupBy with empty strings.
       var ex2 = Assert.Throws<ArgumentException>(() => ExecuteSelectStatement(table.Select("id as ID", "name as Name", "age as Age").GroupBy("")));
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex2.Message);
+      Assert.That(ex2.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
       ex2 = Assert.Throws<ArgumentException>(() => ExecuteSelectStatement(table.Select("id as ID", "name as Name", "age as Age").GroupBy(" ")));
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex2.Message);
+      Assert.That(ex2.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
       ex2 = Assert.Throws<ArgumentException>(() => ExecuteSelectStatement(table.Select("id as ID", "name as Name", "age as Age").GroupBy(string.Empty)));
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex2.Message);
+      Assert.That(ex2.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
 
       // Having with invalid field name.
       ex = Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table.Select("id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having("none = 1")));
-      Assert.AreEqual("Unknown column 'none' in 'having clause'", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Unknown column 'none' in 'having clause'"));
 
       // Having with empty strings.
       ex2 = Assert.Throws<ArgumentException>(() => ExecuteSelectStatement(table.Select("id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having("")));
-      Assert.AreEqual("Unable to parse query ''", ex2.Message);
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex2.InnerException.Message);
+      Assert.That(ex2.Message, Is.EqualTo("Unable to parse query ''"));
+      Assert.That(ex2.InnerException.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
       ex2 = Assert.Throws<ArgumentException>(() => ExecuteSelectStatement(table.Select("id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having(" ")));
-      Assert.AreEqual("Unable to parse query ' '", ex2.Message);
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex2.InnerException.Message);
+      Assert.That(ex2.Message, Is.EqualTo("Unable to parse query ' '"));
+      Assert.That(ex2.InnerException.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
       ex2 = Assert.Throws<ArgumentException>(() => ExecuteSelectStatement(table.Select("id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having(string.Empty)));
-      Assert.AreEqual("Unable to parse query ''", ex2.Message);
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex2.InnerException.Message);
+      Assert.That(ex2.Message, Is.EqualTo("Unable to parse query ''"));
+      Assert.That(ex2.InnerException.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
     }
 
     /// <summary>
@@ -524,11 +524,11 @@ public void SelectWithInBlanksAndBrackets()
 
       // Test using parenthesis should return result
       count = table.Select().Where("name IN (\"john doe\", \"milton green\")").Execute().FetchAll().Count;
-      Assert.True(count > 0);
+      Assert.That(count > 0);
 
       // Using parenthesis should return empty resultset for empty parameters
       count = table.Select().Where("name IN ('', ' ')").Execute().FetchAll().Count;
-      Assert.True(count == 0);
+      Assert.That(count == 0);
     }
 
     [TestCase(":hobbies IN additionalinfo->$.hobbies", "hobbies", "painting", 3)]
@@ -538,15 +538,15 @@ public void SelectWithInBlanksAndBrackets()
     public void InOperatorBindingJson(string condition, string bind, string value, int id)
     {
       Table table = testSchema.GetTable("test");
-      Assert.AreEqual(3, ExecuteSelectStatement(table.Select()).FetchAll().Count);
+      Assert.That(ExecuteSelectStatement(table.Select()).FetchAll().Count, Is.EqualTo(3));
 
       var stmt = table.Select().Where(condition);
       if (bind != null) stmt.Bind(bind, value);
       var result = ExecuteSelectStatement(stmt).FetchAll();
-      Assert.AreEqual(id == 0 ? 0 : 1, result.Count);
+      Assert.That(result.Count, Is.EqualTo(id == 0 ? 0 : 1));
       if (id > 0)
       {
-        Assert.AreEqual(id, result[0]["id"]);
+        Assert.That(result[0]["id"], Is.EqualTo(id));
       }
     }
 
@@ -571,28 +571,28 @@ public void ExclusiveLockAfterSharedLockDefaultWaiting()
 
         ExecuteSQLStatement(session.SQL("START TRANSACTION"));
         var rowResult = ExecuteSelectStatement(table.Select().Where("id = 1").LockShared());
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         ExecuteSQLStatement(session2.SQL("START TRANSACTION"));
 
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockExclusive(LockContention.Default).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks as LockExclusive trying to access locked document
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         Exception ex = Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table2.Select().Where("id = 1").LockExclusive(LockContention.Default)));
-        Assert.AreEqual("Lock wait timeout exceeded; try restarting transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Lock wait timeout exceeded; try restarting transaction"));
 
         // Session2 blocks due to to LockShared() not allowing to modify locked documents.
         Result result1;
         ex = Assert.Throws<MySqlException>(() => result1 = table2.Update().Where("id = 1").Set("a", 2).Execute());
-        Assert.AreEqual("Lock wait timeout exceeded; try restarting transaction", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Lock wait timeout exceeded; try restarting transaction"));
 
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("a", 2).Execute();
-        Assert.AreEqual(1, result.AffectedItemsCount);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
         ExecuteSQLStatement(session.SQL("ROLLBACK"));
         ExecuteSQLStatement(session2.SQL("ROLLBACK"));
@@ -618,12 +618,12 @@ public void SharedLockAfterExclusiveLockWithNoWait()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockShared(LockContention.NoWait).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
@@ -635,7 +635,7 @@ public void SharedLockAfterExclusiveLockWithNoWait()
 
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("a", 2).Execute();
-        Assert.AreEqual(1, result.AffectedItemsCount);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
 
         ExecuteSQLStatement(session.SQL("ROLLBACK"));
         ExecuteSQLStatement(session2.SQL("ROLLBACK"));
@@ -660,12 +660,12 @@ public void NonAsciiCharsForUtf8mb4()
       tabNew.Insert().Values("abcNew£¢€©§°√", "{ \"name\": \"abcNew£¢€©§°√\", \"age\": 2 , \"misc\": 1.2}").Execute();
       RowResult result = tabNew.Select("c1", "c2").Where("c1 ='\u201C\u2199\u2197\u2196\u2198\u201D'").Execute();
       var r1 = result.FetchOne();
-      Assert.AreEqual(name1, r1[0].ToString());//"“↙↗↖↘”"
-      Assert.AreNotEqual(name2, r1[1].ToString());//"{\"age\": 1, \"misc\": 1.2, \"name\": \"??????????????????\"}"
+      Assert.That(r1[0].ToString(), Is.EqualTo(name1));//"“↙↗↖↘”"
+      Assert.That(r1[1].ToString(), Is.Not.EqualTo(name2));//"{\"age\": 1, \"misc\": 1.2, \"name\": \"??????????????????\"}"
       var t = session.SQL("SELECT c1, CONVERT(c2 USING utf8mb4) FROM newTable WHERE c1 = '\u201C\u2199\u2197\u2196\u2198\u201D'").Execute();
       r1 = t.FetchOne();
-      Assert.AreEqual(name1, r1[0].ToString());//"“↙↗↖↘”"
-      Assert.AreEqual(name2, r1[1].ToString());//"{\"age\": 1, \"misc\": 1.2, \"name\": \"??????????????????\"}"
+      Assert.That(r1[0].ToString(), Is.EqualTo(name1));//"“↙↗↖↘”"
+      Assert.That(r1[1].ToString(), Is.EqualTo(name2));//"{\"age\": 1, \"misc\": 1.2, \"name\": \"??????????????????\"}"
 
       Collection coll = CreateCollection("test");
 
@@ -691,7 +691,7 @@ record = record + "\"}";
           Add("{ \"name\": \"xyz£¢€©§°√\", \"age\": 6 , \"misc\": 10}").Execute();
       var docs = coll.Find("name = '\u201C\u2199\u2197\u2196\u2198\u201D' and age>= 4 and age <= 6").Execute();
       DbDoc doc = docs.FetchOne();
-      Assert.AreEqual(name1, doc["name"]);
+      Assert.That(doc["name"], Is.EqualTo(name1));
       session.SQL("drop table if exists test").Execute();
       session.SQL("drop table if exists newTable").Execute();
     }
@@ -706,7 +706,7 @@ public void DatatypesOnCreateTable()
       session.SQL("insert into test1(c1) values(1000)").Execute();
       RowResult r = session.GetSchema(schemaName).GetTable("test1").Select("c1").Execute();
       r.FetchAll();
-      Assert.AreEqual("1000", r.Rows[0][0].ToString(), "Matching the values");
+      Assert.That(r.Rows[0][0].ToString(), Is.EqualTo("1000"), "Matching the values");
       session.SQL("drop table if exists test1").Execute();
     }
 
@@ -728,25 +728,25 @@ public void TableExpressionWhereBindGroupBy()
           .Execute();
         if (i == 28)
           match = name;
-        Assert.AreEqual((ulong)j, result.AffectedItemsCount, "Matching the values");
+        Assert.That(result.AffectedItemsCount, Is.EqualTo((ulong)j), "Matching the values");
         j = j + 1;
       }
 
       var whereResult = table.Select("name", "age").Where("age == 28").Execute();
       int rowCount = whereResult.FetchAll().Count;
-      Assert.AreEqual(1, rowCount, "Matching the row count");
-      Assert.AreEqual(match, whereResult.Rows.ToArray()[0][0].ToString(), "Matching the name");
+      Assert.That(rowCount, Is.EqualTo(1), "Matching the row count");
+      Assert.That(whereResult.Rows.ToArray()[0][0].ToString(), Is.EqualTo(match), "Matching the name");
 
       whereResult = table.Select("name", "age").Where("age == 100").Execute();
       rowCount = whereResult.FetchAll().Count;
-      Assert.AreEqual(0, rowCount, "Matching that there is no such value ");
+      Assert.That(rowCount, Is.EqualTo(0), "Matching that there is no such value ");
 
       whereResult = table.Select().Where("name like :name").Bind("nAme", "%ABCDEFGHIJ%").Execute();
       rowCount = whereResult.FetchAll().Count;
       for (int i = 0; i < whereResult.Rows.Count; i++)
       {
         var res = whereResult.Rows.ToArray()[i][0];
-        StringAssert.Contains("ABCDEFGHIJ", res.ToString());
+        Assert.That(res.ToString(), Does.Contain("ABCDEFGHIJ"));
       }
 
       whereResult = table.Select().Where("name like :name").Bind("nAme", "%ABCD%").Execute();
@@ -754,7 +754,7 @@ public void TableExpressionWhereBindGroupBy()
       for (int j = 0; j < whereResult.Rows.Count; j++)
       {
         var res = whereResult.Rows.ToArray()[j][0];
-        StringAssert.Contains("ABCD", res.ToString());
+        Assert.That(res.ToString(), Does.Contain("ABCD"));
       }
     }
 
@@ -768,36 +768,36 @@ public void TableSelectFetchValuesInOrder()
         .Values("MARK", 34)
         .Execute();
 
-      Assert.AreEqual((ulong)1, result.AffectedItemsCount, "Matching the values");
+      Assert.That(result.AffectedItemsCount, Is.EqualTo((ulong)1), "Matching the values");
       result = table.Insert("name", "age")
       .Values("richie", 16)
       .Execute();
-      Assert.AreEqual((ulong)1, result.AffectedItemsCount, "Matching the values");
+      Assert.That(result.AffectedItemsCount, Is.EqualTo((ulong)1), "Matching the values");
       var selectResult = table.Select().Execute();
 
       while (selectResult.Next()) ;
-      Assert.AreEqual(2, selectResult.Rows.Count, "Matching the row count");
-      Assert.AreEqual("MARK", selectResult.Rows.ToArray()[0][0].ToString(), "Matching the value MARK");
-      Assert.AreEqual(34, (int)selectResult.Rows.ToArray()[0][1], "Matching the age 34");
-      Assert.AreEqual("richie", selectResult.Rows.ToArray()[1][0].ToString(), "Matching the value richie");
-      Assert.AreEqual(16, (int)selectResult.Rows.ToArray()[1][1], "Matching the age 16");
+      Assert.That(selectResult.Rows.Count, Is.EqualTo(2), "Matching the row count");
+      Assert.That(selectResult.Rows.ToArray()[0][0].ToString(), Is.EqualTo("MARK"), "Matching the value MARK");
+      Assert.That((int)selectResult.Rows.ToArray()[0][1], Is.EqualTo(34), "Matching the age 34");
+      Assert.That(selectResult.Rows.ToArray()[1][0].ToString(), Is.EqualTo("richie"), "Matching the value richie");
+      Assert.That((int)selectResult.Rows.ToArray()[1][1], Is.EqualTo(16), "Matching the age 16");
 
       var result1 = testSchema.GetTable("test").Select().OrderBy("age desc").Execute();
       int rowCount = result1.FetchAll().Count;
       for (int i = 0; i < rowCount; i++)
       {
-        Assert.AreEqual("45", result1.Rows[0][2].ToString(), "Matching the values");
-        Assert.AreEqual("38", result1.Rows[1][2].ToString(), "Matching the values");
-        Assert.AreEqual("24", result1.Rows[2][2].ToString(), "Matching the values");
+        Assert.That(result1.Rows[0][2].ToString(), Is.EqualTo("45"), "Matching the values");
+        Assert.That(result1.Rows[1][2].ToString(), Is.EqualTo("38"), "Matching the values");
+        Assert.That(result1.Rows[2][2].ToString(), Is.EqualTo("24"), "Matching the values");
       }
 
       result1 = testSchema.GetTable("test").Select().OrderBy("age asc").Execute();
       rowCount = result1.FetchAll().Count;
       for (int i = 0; i < rowCount; i++)
       {
-        Assert.AreEqual("24", result1.Rows[0][2].ToString(), "Matching the values");
-        Assert.AreEqual("38", result1.Rows[1][2].ToString(), "Matching the values");
-        Assert.AreEqual("45", result1.Rows[2][2].ToString(), "Matching the values");
+        Assert.That(result1.Rows[0][2].ToString(), Is.EqualTo("24"), "Matching the values");
+        Assert.That(result1.Rows[1][2].ToString(), Is.EqualTo("38"), "Matching the values");
+        Assert.That(result1.Rows[2][2].ToString(), Is.EqualTo("45"), "Matching the values");
       }
     }
 
@@ -820,12 +820,12 @@ public void DoubleExclusiveLockWithNoWait()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockExclusive(LockContention.NoWait).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
@@ -838,7 +838,7 @@ public void DoubleExclusiveLockWithNoWait()
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("a", 2).Execute();
-        Assert.AreEqual(1, result.AffectedItemsCount);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
       }
@@ -862,17 +862,17 @@ public void DoubleSharedLockWithNoWait()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockShared(LockContention.NoWait).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 doesnt block as LockShare trying to read locked(Lock_shared) document
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
         rowResult = table2.Select().Where("id = 1").LockShared(LockContention.NoWait).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks due to to LockShared() not allowing to modify locked documents.
         Result result1;
@@ -881,7 +881,7 @@ public void DoubleSharedLockWithNoWait()
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("a", 2).Execute();
-        Assert.AreEqual(1, result.AffectedItemsCount);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
       }
@@ -905,12 +905,12 @@ public void ExclusiveLockAfterSharedLockWithNoWait()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockExclusive(LockContention.NoWait).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks as LockExclusive() trying to access locked(LockShared) documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
@@ -923,7 +923,7 @@ public void ExclusiveLockAfterSharedLockWithNoWait()
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("a", 2).Execute();
-        Assert.AreEqual(1, result.AffectedItemsCount);
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1));
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
       }
@@ -947,17 +947,17 @@ public void SharedLockAfterExclusiveWithSkiplock()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockShared(LockContention.NoWait).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         rowResult = table2.Select().Where("id = 1").LockShared(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(0, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(0), "Matching the document ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to modify locked documents.
         Result result1;
@@ -966,7 +966,7 @@ public void SharedLockAfterExclusiveWithSkiplock()
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("a", 2).Execute();
-        Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the record count");
+        Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the record count");
 
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
@@ -991,17 +991,17 @@ public void DoubleExclusiveLockWithSkiplock()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockExclusive(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 doesn't block as SKIPLOCK used
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         rowResult = table2.Select().Where("id = 1").LockExclusive(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(0, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(0), "Matching the document ID");
         // Session2 blocks due to to LockExclusive() not allowing to modify locked documents.
         Result result1;
         Assert.Throws<MySqlException>(() => result1 = table2.Update().Where("id = 1").Set("a", 2).Execute());
@@ -1009,7 +1009,7 @@ public void DoubleExclusiveLockWithSkiplock()
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("a", 2).Execute();
-        Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the record count");
+        Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the record count");
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
       }
@@ -1032,17 +1032,17 @@ public void DoubleSharedLockWithSkiplock()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockShared(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 doesn't block as SKIPLOCK being used
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         rowResult = table2.Select().Where("id = 1").LockShared(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks due to to LockShared() not allowing to modify locked documents.
         Result result1;
@@ -1051,7 +1051,7 @@ public void DoubleSharedLockWithSkiplock()
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("a", 2).Execute();
-        Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the record count");
+        Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the record count");
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
       }
@@ -1075,17 +1075,17 @@ public void ExclusiveLockAfterSharedLockWithSkiplock()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockExclusive(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 doesn't block as SKIPLOCK being used
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         rowResult = table2.Select().Where("id = 1").LockExclusive(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(0, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(0), "Matching the document ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to modify locked documents.
         Result result1;
@@ -1094,7 +1094,7 @@ public void ExclusiveLockAfterSharedLockWithSkiplock()
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("a", 2).Execute();
-        Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the record count");
+        Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the record count");
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
       }
@@ -1118,12 +1118,12 @@ public void ExclusiveLockBeforeSharedLockWithoutAwaiting()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
@@ -1136,7 +1136,7 @@ public void ExclusiveLockBeforeSharedLockWithoutAwaiting()
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("a", 2).Execute();
-        Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the record count");
+        Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the record count");
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
       }
@@ -1155,12 +1155,12 @@ public void DoubleExclusiveLockWithoutWaiting()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
@@ -1173,7 +1173,7 @@ public void DoubleExclusiveLockWithoutWaiting()
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("age", 2).Execute();
-        Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the record count");
+        Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the record count");
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
       }
@@ -1196,16 +1196,16 @@ public void DoubleSharedLockWithoutWaiting()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         rowResult = table2.Select().Where("id = 1").LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to modify locked documents.
         Result result1;
@@ -1214,7 +1214,7 @@ public void DoubleSharedLockWithoutWaiting()
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("a", 2).Execute();
-        Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the record count");
+        Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the record count");
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
       }
@@ -1238,12 +1238,12 @@ public void SharedLockBeforeExclusiveLockWithoutWaiting()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks as LockExclusive() is trying to read locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
@@ -1256,7 +1256,7 @@ public void SharedLockBeforeExclusiveLockWithoutWaiting()
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("a", 2).Execute();
-        Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the record count");
+        Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the record count");
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
       }
@@ -1284,7 +1284,7 @@ public void SingleLockExclusiveWithNoWaitAndSkip()
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         var rowResult1 = table2.Select().Where("id = 2").LockExclusive(LockContention.NoWait).Execute();
-        Assert.AreEqual(1, rowResult1.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult1.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
@@ -1292,10 +1292,10 @@ public void SingleLockExclusiveWithNoWaitAndSkip()
         Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table2.Select().Where("id = 1").LockShared(LockContention.NoWait)));
 
         var rowResult = table2.Select().Where("id = 1").LockShared(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(0, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(0), "Matching the document ID");
 
         rowResult = table2.Select().Where("id = 1").LockExclusive(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(0, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(0), "Matching the document ID");
 
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
@@ -1320,7 +1320,7 @@ public void ChainedExclusiveLocks()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
@@ -1331,10 +1331,10 @@ public void ChainedExclusiveLocks()
                                                     .LockExclusive(LockContention.NoWait)));
 
         rowResult = table2.Select().Where("id = 1").LockExclusive(LockContention.SkipLocked).LockShared(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         rowResult = table2.Select().Where("id = 1").LockShared(LockContention.SkipLocked).LockExclusive(LockContention.SkipLocked).Execute();
-        Assert.AreEqual(0, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(0), "Matching the document ID");
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
       }
@@ -1355,13 +1355,13 @@ public void TableGetAutoIncrementValue()
          .Execute();
 
       var docId = result.AutoIncrementValue;
-      Assert.AreEqual("100", docId.ToString(), "Matching the value if already it is inserted");
+      Assert.That(docId.ToString(), Is.EqualTo("100"), "Matching the value if already it is inserted");
 
       result = table.Insert("address_number2")
          .Values("Test the document id by 2nd insert without id in address table")
          .Execute();
       docId = result.AutoIncrementValue;
-      Assert.AreEqual("101", docId.ToString(), "Matching the value if already it is inserted");
+      Assert.That(docId.ToString(), Is.EqualTo("101"), "Matching the value if already it is inserted");
 
       session.SQL("CREATE TABLE address2" +
                   "(address_number3  INT NOT NULL AUTO_INCREMENT, " +
@@ -1373,7 +1373,7 @@ public void TableGetAutoIncrementValue()
          .Execute();
 
       docId = result.AutoIncrementValue;
-      Assert.AreEqual("1", docId.ToString(), "Matching the auto increment value");
+      Assert.That(docId.ToString(), Is.EqualTo("1"), "Matching the auto increment value");
 
       session.SQL("CREATE TABLE address3" +
       "(address_number5  MEDIUMINT NOT NULL AUTO_INCREMENT, " +
@@ -1387,7 +1387,7 @@ public void TableGetAutoIncrementValue()
          .Execute();
 
       docId = result.AutoIncrementValue;
-      Assert.AreEqual("300", docId.ToString(), "Matching the value if more than one documents inserted");
+      Assert.That(docId.ToString(), Is.EqualTo("300"), "Matching the value if more than one documents inserted");
 
       result = table.Insert("address_number6")
         .Values("Test multiple document ids in address table - 4th document without ID")
@@ -1396,7 +1396,7 @@ public void TableGetAutoIncrementValue()
         .Execute();
 
       docId = result.AutoIncrementValue;
-      Assert.AreEqual("301", docId.ToString(), "Matching the value if more than one documents inserted");
+      Assert.That(docId.ToString(), Is.EqualTo("301"), "Matching the value if more than one documents inserted");
 
       session.SQL("CREATE TABLE address4" +
                   "(address_number7  INT NOT NULL AUTO_INCREMENT, " +
@@ -1410,7 +1410,7 @@ public void TableGetAutoIncrementValue()
          .Execute();
 
       docId = result.AutoIncrementValue;
-      Assert.AreEqual("1", docId.ToString(), "Matching the auto increment value");
+      Assert.That(docId.ToString(), Is.EqualTo("1"), "Matching the auto increment value");
 
       result = table.Insert("address_number8")
        .Values("Test the document ids in address table without unique id - 4th document")
@@ -1419,7 +1419,7 @@ public void TableGetAutoIncrementValue()
        .Execute();
 
       docId = result.AutoIncrementValue;
-      Assert.AreEqual("4", docId.ToString(), "Matching the auto increment value");
+      Assert.That(docId.ToString(), Is.EqualTo("4"), "Matching the auto increment value");
 
       session.SQL("CREATE TABLE address5" +
                "(address_number9  INT, " +
@@ -1435,7 +1435,7 @@ public void TableGetAutoIncrementValue()
          .Execute();
 
       docId = result.AutoIncrementValue;
-      Assert.AreEqual("1", docId.ToString(), "Matching the auto increment value");
+      Assert.That(docId.ToString(), Is.EqualTo("1"), "Matching the auto increment value");
       session.SQL("drop table if exists address1").Execute();
       session.SQL("drop table if exists address2").Execute();
       session.SQL("drop table if exists address3").Execute();
@@ -1455,14 +1455,14 @@ public void FetchoneReturnsNullNoRows()
       {
         var result = testSchema.GetTable("test2").Update().Where("id=1").Set("val", row["id"]).Execute();
         //WL11843-Core API v1 alignment Changes
-        Assert.AreEqual(1, result.AffectedItemsCount, "Matching");
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1), "Matching");
       }
 
       Row valRow = testSchema.GetTable("test2").Select("val").Execute().FetchOne();
-      Assert.AreEqual("4", valRow[0].ToString(), "Matching");
+      Assert.That(valRow[0].ToString(), Is.EqualTo("4"), "Matching");
       ExecuteSQL("DELETE FROM test2 WHERE id=1");
       valRow = testSchema.GetTable("test2").Select("val").Execute().FetchOne();
-      Assert.IsNull(valRow);
+      Assert.That(valRow, Is.Null);
       ExecuteSQL("DROP TABLE if exists test1");
       ExecuteSQL("DROP TABLE if exists test2");
     }
@@ -1479,11 +1479,11 @@ public void FetchoneReturnsNullNoTable()
       {
         var result = testSchema.GetTable("test222").Update().Where("id=1").Set("val", row["id"]).Execute();
         //WL11843-Core API v1 alignment Changes
-        Assert.AreEqual(1, result.AffectedItemsCount, "Matching");
+        Assert.That(result.AffectedItemsCount, Is.EqualTo(1), "Matching");
       }
 
       Row valRow = testSchema.GetTable("test222").Select("val").Execute().FetchOne();
-      Assert.AreEqual("4", valRow[0].ToString(), "Matching");
+      Assert.That(valRow[0].ToString(), Is.EqualTo("4"), "Matching");
       ExecuteSQL("DROP TABLE test222");
       Assert.Throws<MySqlException>(() => valRow = testSchema.GetTable("test222").Select("val").Execute().FetchOne());
       ExecuteSQL("DROP TABLE IF EXISTS test111");
@@ -1504,12 +1504,12 @@ public void DoubleChainedLocksWithTwoSessions_S1()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
@@ -1531,12 +1531,12 @@ public void DoubleChainedLocksWithTwoSessions_S1()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockShared().LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockShared().LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
@@ -1566,17 +1566,17 @@ public void DoubleChainedLocksWithTwoSessions_S2()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 1").Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         ExecuteSQLStatement(session2.SQL("SET SESSION innodb_lock_wait_timeout=1"));
         var result = table2.Update().Where("id = 2").Set("age", 30).Execute();
-        Assert.AreEqual(1, (int)result.AffectedItemsCount, "Match being done");
+        Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Match being done");
         Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table2.Select().Where("id = 1").LockExclusive()));
 
         // Session2 blocks due to to LockExclusive() not allowing to modify locked documents.
@@ -1596,17 +1596,17 @@ public void DoubleChainedLocksWithTwoSessions_S2()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockExclusive().LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 1").Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
         var result = table2.Update().Where("id = 2").Set("age", 30).Execute();
-        Assert.AreEqual(1, (int)result.AffectedItemsCount, "Match being done");
+        Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Match being done");
         Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table2.Select().Where("id = 1").LockShared().LockExclusive()));
 
         // Session2 blocks due to to LockExclusive() not allowing to modify locked documents.
@@ -1633,12 +1633,12 @@ public void SingleExclusiveLock()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
@@ -1664,16 +1664,16 @@ public void SingleTransactionWithLocks()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id in (1,3)").LockShared().Execute();
-        Assert.AreEqual(2, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(2), "Matching the record ID");
 
         rowResult = table2.Select().Where("id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
         rowResult = table2.Select().Where("id = 2").LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         session.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
         table2.Select().Where("id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
         Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table2.Select().Where("id = 1").LockExclusive()));
 
@@ -1683,10 +1683,10 @@ public void SingleTransactionWithLocks()
 
         session.SQL("ROLLBACK").Execute();
         rowResult = table2.Select().Where("id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         session2.SQL("ROLLBACK").Execute();
         rowResult = table.Select().Where("id = 2").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
       }
     }
 
@@ -1710,12 +1710,12 @@ public void IteratedExclusiveLocks()
 
           session.SQL("START TRANSACTION").Execute();
           var rowResult = table.Select().Where("id = 1").LockExclusive().Execute();
-          Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+          Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
 
           session2.SQL("START TRANSACTION").Execute();
           // Should return immediately since document isn't locked.
           rowResult = table2.Select().Where("id = 2").LockExclusive().Execute();
-          Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the record ID");
+          Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the record ID");
 
           // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
           session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs
index 5ea8882b3..da0dcdd62 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs
@@ -57,7 +57,7 @@ public void SetUp()
         insertStatement.Values(i, i, i);
       }
       ExecuteInsertStatement(insertStatement);
-      Assert.AreEqual(rowsToInsert, CountRows());
+      Assert.That(CountRows(), Is.EqualTo(rowsToInsert));
     }
 
     private int CountRows()
@@ -90,7 +90,7 @@ private void ValidateUpdate(TableUpdateStatement statement)
       {
         foreach (var set in statement.updates)
         {
-          Assert.AreEqual(set.Value.ToString(), row.GetString(set.Path));
+          Assert.That(row.GetString(set.Path), Is.EqualTo(set.Value.ToString()));
         }
       }
     }
@@ -146,17 +146,17 @@ public void UpdateBind()
     public void UpdateWithInOperator()
     {
       Table table = testSchema.GetTable("test");
-      Assert.AreEqual(10, CountRows());
+      Assert.That(CountRows(), Is.EqualTo(10));
 
-      Assert.AreEqual(2, ExecuteUpdateStatement(table.Update().Where("id IN (1,2)").Set("id", 0)).AffectedItemsCount);
-      Assert.AreEqual(2, ExecuteSelectStatement(table.Select().Where("id = 0")).FetchAll().Count);
+      Assert.That(ExecuteUpdateStatement(table.Update().Where("id IN (1,2)").Set("id", 0)).AffectedItemsCount, Is.EqualTo(2));
+      Assert.That(ExecuteSelectStatement(table.Select().Where("id = 0")).FetchAll().Count, Is.EqualTo(2));
 
       Assert.Throws<MySqlException>(() => ExecuteDeleteStatement(table.Delete().Where("a IN [3]")));
       Assert.Throws<MySqlException>(() => ExecuteDeleteStatement(table.Delete().Where("3 IN a")));
       Assert.Throws<MySqlException>(() => ExecuteUpdateStatement(table.Update().Where("age IN [3]").Set("id", 0)));
 
-      Assert.AreEqual(1, ExecuteUpdateStatement(table.Update().Where("age IN (3)").Set("id", 0)).AffectedItemsCount);
-      Assert.AreEqual(3, ExecuteSelectStatement(table.Select().Where("id = 0")).FetchAll().Count);
+      Assert.That(ExecuteUpdateStatement(table.Update().Where("age IN (3)").Set("id", 0)).AffectedItemsCount, Is.EqualTo(1));
+      Assert.That(ExecuteSelectStatement(table.Select().Where("id = 0")).FetchAll().Count, Is.EqualTo(3));
     }
 
     #region WL14389
@@ -196,46 +196,46 @@ public void TableSelectGroupBy()
       t = table.Select().Limit(2).Offset(1000000).Execute();
 
       result = table.Select().GroupBy("age").Execute();
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       // GroupBy with null.
       result = table.Select("id as ID", "name as Name", "age as Age").GroupBy(null).Execute();
-      Assert.AreEqual(7, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(7));
 
       result = table.Select("id as ID", "name as Name", "age as Age").GroupBy(null, null).Execute();
-      Assert.AreEqual(7, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(7));
 
       result = table.Select("id as ID", "name as Name", "age as Age").GroupBy(null, "age").Execute();
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       // Having operation.
       // Having reduces the original 5 rows to 3 since 2 rows have a cnt=2, due to the repeated names.
       result = table.Select("id", "count(name) as cnt", "age").GroupBy("age").Having("cnt = 1").Execute();
-      Assert.AreEqual(3, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(3));
 
       // Having with null.
       result = table.Select("id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having(null).Execute();
-      Assert.AreEqual(5, result.FetchAll().Count);
+      Assert.That(result.FetchAll().Count, Is.EqualTo(5));
 
       // GroupBy with invalid field name.
       Exception ex = Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table.Select("id as ID", "name as Name", "age as Age").GroupBy("Required")));
-      Assert.AreEqual("Unknown column 'Required' in 'group statement'", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Unknown column 'Required' in 'group statement'"));
 
       ex = Assert.Throws<ArgumentException>(() => ExecuteSelectStatement(table.Select("id as ID", "name as Name", "age as Age").GroupBy("")));
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
 
       ex = Assert.Throws<ArgumentException>(() => ExecuteSelectStatement(table.Select("id as ID", "name as Name", "age as Age").GroupBy(" ")));
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
 
       ex = Assert.Throws<ArgumentException>(() => ExecuteSelectStatement(table.Select("id as ID", "name as Name", "age as Age").GroupBy(string.Empty)));
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
 
       ex = Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table.Select("id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having("Required = 1")));
-      Assert.AreEqual("Unknown column 'Required' in 'having clause'", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Unknown column 'Required' in 'having clause'"));
 
       ex = Assert.Throws<ArgumentException>(() => ExecuteSelectStatement(table.Select("id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having("")));
-      Assert.AreEqual("Unable to parse query ''", ex.Message);
-      Assert.AreEqual("No more tokens when expecting one at token pos 0", ex.InnerException.Message);
+      Assert.That(ex.Message, Is.EqualTo("Unable to parse query ''"));
+      Assert.That(ex.InnerException.Message, Is.EqualTo("No more tokens when expecting one at token pos 0"));
 
       Assert.Throws<ArgumentException>(() => ExecuteSelectStatement(table.Select("id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having(" ")));
       Assert.Throws<ArgumentException>(() => ExecuteSelectStatement(table.Select("id as ID", "count(name) as cnt", "age as Age").GroupBy("age").Having(string.Empty)));
@@ -258,12 +258,12 @@ public void ExclusiveLockBeforeSharedLockDefaultWaiting()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockShared(LockContention.Default).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
@@ -276,7 +276,7 @@ public void ExclusiveLockBeforeSharedLockDefaultWaiting()
         // Session2 returns immediately as session is committed.
         session.Commit();
         var result = table2.Update().Where("id = 1").Set("a", 2).Execute();
-        Assert.AreEqual(1, (int)result.AffectedItemsCount, "Matching the deleted record count");
+        Assert.That((int)result.AffectedItemsCount, Is.EqualTo(1), "Matching the deleted record count");
 
         session.SQL("ROLLBACK").Execute();
         session2.SQL("ROLLBACK").Execute();
@@ -299,16 +299,16 @@ public void SharedLockDefaultWaiting()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockShared().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockShared(LockContention.Default).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
         rowResult = table2.Select().Where("id = 1").LockShared(LockContention.Default).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
         // Session2 blocks due to to LockShared() not allowing to modify locked documents.
         Result result1;
         Assert.Throws<MySqlException>(() => result1 = table2.Update().Where("id = 1").Set("a", 2).Execute());
@@ -339,12 +339,12 @@ public void OnlyExclusiveLocksWithDefaultWaiting()
 
         session.SQL("START TRANSACTION").Execute();
         var rowResult = table.Select().Where("id = 1").LockExclusive().Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         session2.SQL("START TRANSACTION").Execute();
         // Should return immediately since document isn't locked.
         rowResult = table2.Select().Where("id = 2").LockExclusive(LockContention.Default).Execute();
-        Assert.AreEqual(1, rowResult.FetchAll().Count, "Matching the document ID");
+        Assert.That(rowResult.FetchAll().Count, Is.EqualTo(1), "Matching the document ID");
 
         // Session2 blocks due to to LockExclusive() not allowing to read locked documents.
         session2.SQL("SET SESSION innodb_lock_wait_timeout=1").Execute();
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ViewTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ViewTests.cs
index 3d046bc76..9548fdd96 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ViewTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ViewTests.cs
@@ -54,12 +54,12 @@ public void TryUpdatingView()
       ExecuteSQL("CREATE VIEW view2 AS select *, 1 from test");
 
       List<Table> tables = testSchema.GetTables();
-      Assert.AreEqual(2, tables.Count);
+      Assert.That(tables.Count, Is.EqualTo(2));
 
       Table view = tables.First(i => i.IsView);
-      Assert.AreEqual("view2", view.Name);
+      Assert.That(view.Name, Is.EqualTo("view2"));
       MySqlException ex = Assert.Throws<MySqlException>(() => ExecuteInsertStatement(view.Insert().Values(1)));
-      Assert.AreEqual("Column '1' is not updatable", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Column '1' is not updatable"));
     }
 
     [Test]
@@ -70,8 +70,8 @@ public void GetView()
 
       Table table = testSchema.GetTable("test");
       Table view = testSchema.GetTable("view1");
-      Assert.True(view.IsView);
-      Assert.False(table.IsView);
+      Assert.That(view.IsView);
+      Assert.That(table.IsView, Is.False);
 
       ExecuteSQL("DROP VIEW view1");
     }
@@ -100,13 +100,13 @@ public void CreateJoinAndGetTableValidation()
       ExecuteSQL("CREATE VIEW view2 AS select * from test.test2");
 
       var tables = testSchema.GetTables();
-      Assert.AreEqual(true, tables.Count == 4, "Match being done");
-      Assert.AreEqual(2, tables.Count(i => !i.IsView), "Match being done when isview not true");
-      Assert.AreEqual(2, tables.Count(i => i.IsView), "Match being done when isview true");
+      Assert.That(tables.Count == 4, Is.EqualTo(true), "Match being done");
+      Assert.That(tables.Count(i => !i.IsView), Is.EqualTo(2), "Match being done when isview not true");
+      Assert.That(tables.Count(i => i.IsView), Is.EqualTo(2), "Match being done when isview true");
       List<Collection> colls = testSchema.GetCollections();
-      Assert.AreEqual(1, colls.Count, "Match being done");
+      Assert.That(colls.Count, Is.EqualTo(1), "Match being done");
       var view1 = testSchema.GetTable("view1");
-      Assert.True(view1.IsView);
+      Assert.That(view1.IsView);
 
       //Valid Scenario-1
       view1.Select().Execute();
@@ -125,7 +125,7 @@ public void CreateJoinAndGetTableValidation()
           "CREATE VIEW myView AS SELECT a.ID1 as a_tID,b.ID2 as b_tID, a.firstname as a_firstname, " +
           "b.lastname as b_lastname FROM test1 a JOIN test2 b ON a.ID1=b.ID2;");
       var joinedview = testSchema.GetTable("myView");
-      Assert.True(joinedview.IsView);
+      Assert.That(joinedview.IsView);
 
       joinedview.Select().Execute();
       result = joinedview.Update().Set("a_firstname", "Peter").Where("a_tID=1").Execute();
@@ -137,7 +137,7 @@ public void CreateJoinAndGetTableValidation()
 
       //Valid View - Invalid Select/Insert/Update Statements-Scenario-3
       var view2 = testSchema.GetTable("view2");
-      Assert.True(view2.IsView);
+      Assert.That(view2.IsView);
 
       Assert.Throws<MySqlException>(() => view2.Select("id2", "age").Execute());
 
@@ -148,7 +148,7 @@ public void CreateJoinAndGetTableValidation()
 
       view2.Select().Execute();
       var res = view2.Delete().Where("id2=100").Execute();
-      Assert.AreEqual(0, res.AffectedItemsCount, "View2-Not Possible to remove an invalid record");
+      Assert.That(res.AffectedItemsCount, Is.EqualTo(0), "View2-Not Possible to remove an invalid record");
 
       //View Doesn't Exist-Scenario-4
       var view3 = testSchema.GetTable("view3");
@@ -160,7 +160,7 @@ public void CreateJoinAndGetTableValidation()
 
       //View Passed as Null-Scenario-6
       var view4 = testSchema.GetTable("test1");
-      Assert.IsFalse(view4.IsView);
+      Assert.That(view4.IsView, Is.False);
 
       //Change the query processing env-Scenario-7
       ExecuteSQL("SET sql_mode = '';");
@@ -187,14 +187,14 @@ public void ViewsGetTables()
       ExecuteSQL("CREATE VIEW view2 AS select * from test.test2");
       ExecuteSQL("SELECT * FROM view2");
       var tables = testSchema.GetTables();
-      Assert.True(tables.Count >= 4, "Match being done");
-      Assert.AreEqual(2, tables.Count(i => !i.IsView), "Match being done when isview not true");
-      Assert.AreEqual(2, tables.Count(i => i.IsView), "Match being done when isview true");
+      Assert.That(tables.Count >= 4, "Match being done");
+      Assert.That(tables.Count(i => !i.IsView), Is.EqualTo(2), "Match being done when isview not true");
+      Assert.That(tables.Count(i => i.IsView), Is.EqualTo(2), "Match being done when isview true");
       List<Collection> colls = testSchema.GetCollections();
-      Assert.AreEqual(1, colls.Count, "Match being done");
+      Assert.That(colls.Count, Is.EqualTo(1), "Match being done");
 
       var view1 = tables[2];
-      Assert.True(view1.IsView);
+      Assert.That(view1.IsView);
       //Valid Scenario-1
       view1.Select().Execute();
 
@@ -213,7 +213,7 @@ public void ViewsGetTables()
           "CREATE VIEW myView AS SELECT a.ID1 as a_tID,b.ID2 as b_tID, a.firstname as a_firstname, " +
           "b.lastname as b_lastname FROM test1 a JOIN test2 b ON a.ID1=b.ID2;");
       var joinedview = testSchema.GetTables();
-      Assert.True(joinedview[0].IsView);
+      Assert.That(joinedview[0].IsView);
       joinedview[0].Select().Execute();
       result = joinedview[0].Update().Set("a_firstname", "Peter").Where("a_tID=1").Execute();
       result = joinedview[0].Update().Set("a_firstname", "Rob").Where("a_tID=1").Execute();
@@ -225,7 +225,7 @@ public void ViewsGetTables()
       ExecuteSQL("DROP VIEW " + joinedview[0].Name);
       //Valid View - Invalid Select/Insert/Update Statements-Scenario-3
       var view2 = testSchema.GetTables();
-      Assert.True(view2[3].IsView);
+      Assert.That(view2[3].IsView);
 
       Assert.Throws<MySqlException>(() => view2[3].Select("id2", "age").Execute());
 
@@ -238,7 +238,7 @@ public void ViewsGetTables()
       view2[3].Select().Execute();
       var res = view2[3].Delete().Where("id2=100").Execute();
       //WL11843-Core API v1 alignment Changes
-      Assert.AreEqual(0, res.AffectedItemsCount);
+      Assert.That(res.AffectedItemsCount, Is.EqualTo(0));
 
       //Change the query processing env-Scenario-5
       ExecuteSQL("SET sql_mode = '';");
@@ -250,7 +250,7 @@ public void ViewsGetTables()
       ExecuteSQL("DROP VIEW view2");
       //GetTables when there no tables/views -Scenario-4
       var view3 = testSchema.GetTables();
-      Assert.AreEqual(0, view3.Count());
+      Assert.That(view3.Count(), Is.EqualTo(0));
     }
     #endregion WL14389
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs
index 95e68b92d..9f66e0459 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs
@@ -48,12 +48,12 @@ public void GetSchemas()
       Session session = GetSession();
       List<Schema> schemas = session.GetSchemas();
 
-      Assert.True(schemas.Exists(s => s.Name == base.testSchema.Name));
+      Assert.That(schemas.Exists(s => s.Name == base.testSchema.Name));
 
       Schema schema = session.GetSchema(schemaName);
-      Assert.AreEqual(schemaName, schema.Name);
+      Assert.That(schema.Name, Is.EqualTo(schemaName));
       schema = session.GetSchema(null);
-      Assert.IsNull(schema.Name);
+      Assert.That(schema.Name, Is.Null);
     }
 
     [Test]
@@ -61,7 +61,7 @@ public void GetInvalidSchema()
     {
       Session s = GetSession();
       Schema schema = s.GetSchema("test-schema");
-      Assert.False(SchemaExistsInDatabase(schema));
+      Assert.That(SchemaExistsInDatabase(schema), Is.False);
     }
 
     [Test]
@@ -71,7 +71,7 @@ public void GetAllTables()
       ExecuteSQL("CREATE TABLE test(id int)");
 
       List<Table> tables = testSchema.GetTables();
-      Assert.True(tables.Count == 1);
+      Assert.That(tables.Count == 1);
     }
 
     [Test]
@@ -85,9 +85,9 @@ public void GetAllViews()
       ExecuteSQL("CREATE VIEW view2 AS select * from test");
 
       List<Table> tables = testSchema.GetTables();
-      Assert.AreEqual(3, tables.Count);
-      Assert.AreEqual(1, tables.Count(i => !i.IsView));
-      Assert.AreEqual(2, tables.Count(i => i.IsView));
+      Assert.That(tables.Count, Is.EqualTo(3));
+      Assert.That(tables.Count(i => !i.IsView), Is.EqualTo(1));
+      Assert.That(tables.Count(i => i.IsView), Is.EqualTo(2));
 
       List<Collection> colls = testSchema.GetCollections();
       Assert.That(colls, Has.One.Items);
@@ -100,14 +100,14 @@ public void GetCollectionAsTable()
       Collection testCollection = CreateCollection("test");
 
       Result r = ExecuteAddStatement(testCollection.Add(@"{ ""_id"": 1, ""foo"": 1 }"));
-      Assert.AreEqual(1, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
 
       Table test = testSchema.GetCollectionAsTable("test");
-      Assert.True(TableExistsInDatabase(test));
+      Assert.That(TableExistsInDatabase(test));
 
       RowResult result = ExecuteSelectStatement(test.Select("_id"));
-      Assert.True(result.Next());
-      Assert.AreEqual("1", result[0]);
+      Assert.That(result.Next());
+      Assert.That(result[0], Is.EqualTo("1"));
     }
 
     [Test]
@@ -117,15 +117,15 @@ public void DropSchema()
       Session session = GetSession();
       session.CreateSchema(schemaName);
       Schema schema = session.GetSchema(schemaName);
-      Assert.True(SchemaExistsInDatabase(schema));
+      Assert.That(SchemaExistsInDatabase(schema));
 
       // Drop existing schema.
       session.DropSchema(schemaName);
-      Assert.False(SchemaExistsInDatabase(schema));
+      Assert.That(SchemaExistsInDatabase(schema), Is.False);
 
       // Drop non-existing schema.
       session.DropSchema(schemaName);
-      Assert.False(SchemaExistsInDatabase(schema));
+      Assert.That(SchemaExistsInDatabase(schema), Is.False);
 
       // Empty, whitespace and null schema name.
       Assert.Throws<ArgumentNullException>(() => session.DropSchema(string.Empty));
@@ -203,7 +203,7 @@ public void CreateValidSchema()
         db = session.CreateSchema("test_123456789");
       }
       else { db = session.CreateSchema("test_123456789"); }
-      Assert.True(db.ExistsInDatabase());
+      Assert.That(db.ExistsInDatabase());
       Assert.Throws<MySqlException>(() => session.CreateSchema("test_123456789"));
       session.DropSchema("test_123456789");
       Assert.Throws<MySqlException>(() => session.CreateSchema("test_123456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789"));
@@ -217,10 +217,10 @@ public void SessionSetSchema()
       if (!session.GetSchema("test1").ExistsInDatabase())
         session.CreateSchema("test1");
       Assert.DoesNotThrow(() => session.SetCurrentSchema("test1"));
-      Assert.AreEqual("test1", session.Schema.Name);
+      Assert.That(session.Schema.Name, Is.EqualTo("test1"));
       // Retry the same schema
       Assert.DoesNotThrow(() => session.SetCurrentSchema("test1"));
-      Assert.AreEqual("test1", session.Schema.Name);
+      Assert.That(session.Schema.Name, Is.EqualTo("test1"));
       session.Schema.CreateCollection("my_collection_123456789");
       session.Schema.DropCollection("my_collection_123456789");
       //Exceptions
@@ -231,7 +231,7 @@ public void SessionSetSchema()
       //No Active Schema
       using (Session sessionPlain = MySQLX.GetSession(ConnectionString))
       {
-        Assert.IsNull(sessionPlain.GetCurrentSchema());
+        Assert.That(sessionPlain.GetCurrentSchema(), Is.Null);
       }
     }
 
@@ -257,7 +257,7 @@ public void SessionChangeCurrentSchema()
         session.SQL("DROP DATABASE IF EXISTS dbname1").Execute();
         session.SQL("CREATE DATABASE dbname1").Execute();
         session.SQL("USE dbname1").Execute();
-        StringAssert.AreEqualIgnoringCase("dbname1", session.GetCurrentSchema().Name);
+        Assert.That(session.GetCurrentSchema().Name, Is.EqualTo("dbname1").IgnoreCase);
         session.SQL("CREATE TABLE address1" +
                     "(address_number  INT NOT NULL AUTO_INCREMENT, " +
                     "building_name  VARCHAR(100) NOT NULL, " +
@@ -270,7 +270,7 @@ public void SessionChangeCurrentSchema()
         session.SQL("DROP DATABASE IF EXISTS dbname2").Execute();
         session.SQL("CREATE DATABASE dbname2").Execute();
         session.SQL("USE dbname2").Execute();
-        StringAssert.AreEqualIgnoringCase("dbname2", session.GetCurrentSchema().Name);
+        Assert.That(session.GetCurrentSchema().Name, Is.EqualTo("dbname2").IgnoreCase);
         session.SQL("CREATE TABLE address2" +
                     "(address_number  INT NOT NULL AUTO_INCREMENT, " +
                     "building_name  VARCHAR(100) NOT NULL, " +
@@ -280,11 +280,11 @@ public void SessionChangeCurrentSchema()
                     " VALUES " +
                     "(2,'MySQL2','BGL2');").Execute();
         session.SetCurrentSchema("dbname1");
-        Assert.AreEqual("dbname1", session.Schema.Name);
+        Assert.That(session.Schema.Name, Is.EqualTo("dbname1"));
         session.SQL("SELECT * FROM address1").Execute();
         session.SQL("DROP TABLE address1").Execute();
         session.SetCurrentSchema("dbname2");
-        StringAssert.AreEqualIgnoringCase("dbName2", session.Schema.Name);
+        Assert.That(session.Schema.Name, Is.EqualTo("dbName2").IgnoreCase);
         session.SQL("SELECT * FROM address2").Execute();
         session.SQL("DROP TABLE address2").Execute();
         session.SQL("DROP DATABASE dbname1").Execute();
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
index 13f0ff70c..78aedaa65 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
@@ -50,9 +50,9 @@ public class SessionTests : BaseTest
     public void CanCloseSession()
     {
       Session s = MySQLX.GetSession(ConnectionString);
-      Assert.True(s.InternalSession.SessionState == SessionState.Open);
+      Assert.That(s.InternalSession.SessionState == SessionState.Open);
       s.Close();
-      Assert.AreEqual(s.InternalSession.SessionState, SessionState.Closed);
+      Assert.That(SessionState.Closed, Is.EqualTo(s.InternalSession.SessionState));
     }
 
     [Test]
@@ -60,9 +60,9 @@ public void CanCloseSession()
     public void NoPassword()
     {
       Session session = MySQLX.GetSession(ConnectionStringNoPassword);
-      Assert.True(session.InternalSession.SessionState == SessionState.Open);
+      Assert.That(session.InternalSession.SessionState == SessionState.Open);
       session.Close();
-      Assert.AreEqual(session.InternalSession.SessionState, SessionState.Closed);
+      Assert.That(SessionState.Closed, Is.EqualTo(session.InternalSession.SessionState));
     }
 
     [Test]
@@ -70,9 +70,9 @@ public void NoPassword()
     public void SessionClose()
     {
       Session session = MySQLX.GetSession(ConnectionString);
-      Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+      Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       session.Close();
-      Assert.AreEqual(SessionState.Closed, session.InternalSession.SessionState);
+      Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Closed));
     }
 
     [Test]
@@ -89,15 +89,15 @@ public void CountClosedSession()
         for (int i = 0; i < 20; i++)
         {
           Session session = MySQLX.GetSession(ConnectionString);
-          Assert.True(session.InternalSession.SessionState == SessionState.Open);
+          Assert.That(session.InternalSession.SessionState == SessionState.Open);
           session.Close();
-          Assert.AreEqual(session.InternalSession.SessionState, SessionState.Closed);
+          Assert.That(SessionState.Closed, Is.EqualTo(session.InternalSession.SessionState));
         }
 
         newSessions = ExecuteSQLStatement(nodeSession.SQL("show processlist")).FetchAll().Count;
       }
 
-      Assert.AreEqual(sessions, newSessions);
+      Assert.That(newSessions, Is.EqualTo(sessions));
     }
 
     [Test]
@@ -114,7 +114,7 @@ public void ConnectionStringAsAnonymousType()
 
       using (var testSession = MySQLX.GetSession(connstring))
       {
-        Assert.AreEqual(SessionState.Open, testSession.InternalSession.SessionState);
+        Assert.That(testSession.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
     }
 
@@ -124,12 +124,12 @@ public void SessionGetSetCurrentSchema()
     {
       using (Session testSession = MySQLX.GetSession(ConnectionString))
       {
-        Assert.AreEqual(SessionState.Open, testSession.InternalSession.SessionState);
-        Assert.Null(testSession.GetCurrentSchema());
+        Assert.That(testSession.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(testSession.GetCurrentSchema(), Is.Null);
         Assert.Throws<MySqlException>(() => testSession.SetCurrentSchema(""));
         testSession.SetCurrentSchema(schemaName);
-        Assert.AreEqual(schemaName, testSession.Schema.Name);
-        Assert.AreEqual(schemaName, testSession.GetCurrentSchema().Name);
+        Assert.That(testSession.Schema.Name, Is.EqualTo(schemaName));
+        Assert.That(testSession.GetCurrentSchema().Name, Is.EqualTo(schemaName));
       }
     }
 
@@ -139,10 +139,10 @@ public void SessionUsingSchema()
     {
       using (Session mySession = MySQLX.GetSession(ConnectionString + $";database={schemaName};"))
       {
-        Assert.AreEqual(SessionState.Open, mySession.InternalSession.SessionState);
-        Assert.AreEqual(schemaName, mySession.Schema.Name);
-        Assert.AreEqual(schemaName, mySession.GetCurrentSchema().Name);
-        Assert.True(SchemaExistsInDatabase(mySession.Schema));
+        Assert.That(mySession.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(mySession.Schema.Name, Is.EqualTo(schemaName));
+        Assert.That(mySession.GetCurrentSchema().Name, Is.EqualTo(schemaName));
+        Assert.That(SchemaExistsInDatabase(mySession.Schema));
       }
     }
 
@@ -152,19 +152,19 @@ public void SessionUsingDefaultSchema()
     {
       using (Session mySession = MySQLX.GetSession(ConnectionString + $";database={schemaName};"))
       {
-        Assert.AreEqual(SessionState.Open, mySession.InternalSession.SessionState);
-        Assert.AreEqual(schemaName, mySession.DefaultSchema.Name);
-        Assert.AreEqual(schemaName, mySession.GetCurrentSchema().Name);
-        Assert.True(mySession.Schema.ExistsInDatabase());
+        Assert.That(mySession.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(mySession.DefaultSchema.Name, Is.EqualTo(schemaName));
+        Assert.That(mySession.GetCurrentSchema().Name, Is.EqualTo(schemaName));
+        Assert.That(mySession.Schema.ExistsInDatabase());
         mySession.SetCurrentSchema("mysql");
-        Assert.AreNotEqual(mySession.DefaultSchema.Name, mySession.Schema.Name);
+        Assert.That(mySession.Schema.Name, Is.Not.EqualTo(mySession.DefaultSchema.Name));
       }
 
       // DefaultSchema is null because no database was provided in the connection string/URI.
       using (Session mySession = MySQLX.GetSession(ConnectionString))
       {
-        Assert.AreEqual(SessionState.Open, mySession.InternalSession.SessionState);
-        Assert.Null(mySession.DefaultSchema);
+        Assert.That(mySession.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(mySession.DefaultSchema, Is.Null);
       }
     }
 
@@ -184,7 +184,7 @@ public void SessionUsingDefaultSchemaWithAnonymousObject()
         database = "mysql"
       }))
       {
-        Assert.AreEqual("mysql", internalSession.DefaultSchema.Name);
+        Assert.That(internalSession.DefaultSchema.Name, Is.EqualTo("mysql"));
       }
 
       // DefaultSchema is null when no database is provided.
@@ -197,7 +197,7 @@ public void SessionUsingDefaultSchemaWithAnonymousObject()
         sslmode = MySqlSslMode.Required,
       }))
       {
-        Assert.Null(internalSession.DefaultSchema);
+        Assert.That(internalSession.DefaultSchema, Is.Null);
       }
 
       // Access denied error is raised when database does not exist for servers 8.0.12 and below.
@@ -216,9 +216,9 @@ public void SessionUsingDefaultSchemaWithAnonymousObject()
       ));
 
       if (session.InternalSession.GetServerVersion().isAtLeast(8, 0, 13))
-        StringAssert.StartsWith(string.Format("Unknown database 'test1'"), exception.Message);
+        Assert.That(exception.Message, Does.StartWith(string.Format("Unknown database 'test1'")));
       else
-        StringAssert.StartsWith(string.Format("Access denied"), exception.Message);
+        Assert.That(exception.Message, Does.StartWith(string.Format("Access denied")));
     }
 
     [Test]
@@ -227,7 +227,7 @@ public void SessionUsingDefaultSchemaWithConnectionURI()
     {
       using (var session = MySQLX.GetSession(ConnectionStringUri + "?database=mysql"))
       {
-        Assert.AreEqual("mysql", session.DefaultSchema.Name);
+        Assert.That(session.DefaultSchema.Name, Is.EqualTo("mysql"));
       }
     }
 
@@ -284,7 +284,7 @@ public void ConnectionUsingUri()
     {
       using (var session = MySQLX.GetSession(ConnectionStringUri))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
     }
 
@@ -307,7 +307,7 @@ public void IPv6()
 
       using (var session = MySQLX.GetSession(csBuilder.ToString()))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
     }
 
@@ -322,7 +322,7 @@ public void IPv6AsUrl()
       string connString = $"mysqlx://{csBuilder.UserID}:{csBuilder.Password}@[{ipv6}]:{XPort}";
       using (Session session = MySQLX.GetSession(connString))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
     }
 
@@ -336,7 +336,7 @@ public void IPv6AsAnonymous()
 
       using (Session session = MySQLX.GetSession(new { server = ipv6, user = csBuilder.UserID, password = csBuilder.Password, port = XPort }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
     }
 
@@ -349,89 +349,89 @@ public void CreateSessionWithUnsupportedOptions()
 
       // Use a connection URI.
       var ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "pipe=MYSQL"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "compress=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "allow batch=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "logging=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "sharedmemoryname=MYSQL"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "defaultcommandtimeout=30"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "usedefaultcommandtimeoutforef=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "persistsecurityinfo=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "encrypt=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "integratedsecurity=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "allowpublickeyretrieval=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "autoenlist=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "includesecurityasserts=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "allowzerodatetime=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "convert zero datetime=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "useusageadvisor=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "procedurecachesize=50"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "useperformancemonitor=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "respectbinaryflags=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "treat tiny as boolean=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "allowuservariables=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "interactive=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "functionsreturnstring=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "useaffectedrows=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "oldguids=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "sqlservermode=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "tablecaching=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "defaulttablecacheage=60"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "checkparameters=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "replication=replication_group"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "exceptioninterceptors=none"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "commandinterceptors=none"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "connectionlifetime=100"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "pooling=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "minpoolsize=0"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "maxpoolsize=20"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "connectionreset=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionUri + "cacheserverproperties=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
 
       // Use a connection string.
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession("treatblobsasutf8=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession("blobasutf8includepattern=pattern"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession("blobasutf8excludepattern=pattern"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
     }
 
     [Test]
@@ -440,15 +440,15 @@ public void CreateBuilderWithUnsupportedOptions()
     {
       var errorMessage = "Option not supported.";
       var ex = Assert.Throws<ArgumentException>(() => new MySqlXConnectionStringBuilder("pipe=MYSQL"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => new MySqlXConnectionStringBuilder("allow batch=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => new MySqlXConnectionStringBuilder("respectbinaryflags=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => new MySqlXConnectionStringBuilder("pooling=false"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => new MySqlXConnectionStringBuilder("cacheserverproperties=true"));
-      StringAssert.StartsWith(errorMessage, ex.Message);
+      Assert.That(ex.Message, Does.StartWith(errorMessage));
     }
 
     [Test]
@@ -466,11 +466,11 @@ public void GetUri()
 
           try
           {
-            Assert.AreEqual(session.Settings[connectionOption.Key], internalSession.Settings[connectionOption.Key]);
+            Assert.That(internalSession.Settings[connectionOption.Key], Is.EqualTo(session.Settings[connectionOption.Key]));
           }
           catch (ArgumentException ex)
           {
-            StringAssert.StartsWith("Option not supported.", ex.Message);
+            Assert.That(ex.Message, Does.StartWith("Option not supported."));
           }
         }
       }
@@ -489,15 +489,15 @@ public void ConnectTimeout()
       // ConnectionString.
       using (Session session = MySQLX.GetSession(ConnectionString + ";connect-timeout=5000;"))
       {
-        Assert.True(session.Settings.ConnectTimeout == 5000);
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.Settings.ConnectTimeout == 5000);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // ConnectionURI.
       using (Session session = MySQLX.GetSession(ConnectionStringUri + "?connecttimeout=6500"))
       {
-        Assert.True(session.Settings.ConnectTimeout == 6500);
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.Settings.ConnectTimeout == 6500);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // Anonymous Object using default value, 10000ms.
@@ -512,8 +512,8 @@ public void ConnectTimeout()
 
       using (var testSession = MySQLX.GetSession(connstring))
       {
-        Assert.True(session.Settings.ConnectTimeout == 10000);
-        Assert.AreEqual(SessionState.Open, testSession.InternalSession.SessionState);
+        Assert.That(session.Settings.ConnectTimeout == 10000);
+        Assert.That(testSession.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // Create a session using the fail over functionality passing two diferrent Server address(one of them is fake host). Must succeed after 2000ms
@@ -537,46 +537,46 @@ public void ConnectTimeout()
       DateTime start = DateTime.Now;
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(conn));
       TimeSpan diff = DateTime.Now.Subtract(start);
-      Assert.True(diff.TotalSeconds > 19 && diff.TotalSeconds < 21, String.Format("Timeout exceeded ({0}). Actual time: {1}", "Fail over failure", diff));
+      Assert.That(diff.TotalSeconds > 19 && diff.TotalSeconds < 21, String.Format("Timeout exceeded ({0}). Actual time: {1}", "Fail over failure", diff));
 
       // Valid session no time out
       start = DateTime.Now;
       using (Session session = MySQLX.GetSession(ConnectionStringUri + "?connecttimeout=2000"))
         session.SQL("SELECT SLEEP(10)").Execute();
       diff = DateTime.Now.Subtract(start);
-      Assert.True(diff.TotalSeconds > 10);
+      Assert.That(diff.TotalSeconds > 10);
 
       //Invalid Values for Connection Timeout parameter
       var ex = Assert.Throws<FormatException>(() => MySQLX.GetSession(ConnectionString + ";connect-timeout=-1;"));
-      Assert.AreEqual(ResourcesX.InvalidConnectionTimeoutValue, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidConnectionTimeoutValue));
 
       ex = Assert.Throws<FormatException>(() => MySQLX.GetSession(ConnectionString + ";connect-timeout=foo;"));
-      Assert.AreEqual(ResourcesX.InvalidConnectionTimeoutValue, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidConnectionTimeoutValue));
 
       ex = Assert.Throws<FormatException>(() => MySQLX.GetSession(ConnectionString + ";connect-timeout='';"));
-      Assert.AreEqual(ResourcesX.InvalidConnectionTimeoutValue, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidConnectionTimeoutValue));
 
       ex = Assert.Throws<FormatException>(() => MySQLX.GetSession(ConnectionString + ";connect-timeout=10.5;"));
-      Assert.AreEqual(ResourcesX.InvalidConnectionTimeoutValue, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidConnectionTimeoutValue));
 
       ex = Assert.Throws<FormatException>(() => MySQLX.GetSession(ConnectionString + ";connect-timeout=" + Int32.MaxValue + 1));
-      Assert.AreEqual(ResourcesX.InvalidConnectionTimeoutValue, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidConnectionTimeoutValue));
 
       ex = Assert.Throws<FormatException>(() => MySQLX.GetSession(ConnectionString + ";connect-timeout=10.5;"));
-      Assert.AreEqual(ResourcesX.InvalidConnectionTimeoutValue, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidConnectionTimeoutValue));
 
       ex = Assert.Throws<FormatException>(() => MySQLX.GetSession(ConnectionString + ";connect-timeout=;"));
-      Assert.AreEqual(ResourcesX.InvalidConnectionTimeoutValue, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidConnectionTimeoutValue));
 
       ex = Assert.Throws<FormatException>(() => MySQLX.GetSession(ConnectionStringUri + "?connect-timeout= "));
-      Assert.AreEqual(ResourcesX.InvalidConnectionTimeoutValue, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidConnectionTimeoutValue));
 
       ex = Assert.Throws<FormatException>(() => MySQLX.GetSession(ConnectionStringUri + "?connecttimeout="));
-      Assert.AreEqual(ResourcesX.InvalidConnectionTimeoutValue, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidConnectionTimeoutValue));
 
       // Valid value for ConnectionTimeout, invalid credentials
       var exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession($"server={Host};user=test;password=noPass;port={XPort};connect-timeout=2000;"));
-      Assert.NotNull(exception);
+      Assert.That(exception, Is.Not.Null);
     }
 
     private void TestConnectTimeoutFailureTimeout(String connString, int minTime, int maxTime, string test)
@@ -584,7 +584,7 @@ private void TestConnectTimeoutFailureTimeout(String connString, int minTime, in
       DateTime start = DateTime.Now;
       Assert.Throws<TimeoutException>(() => MySQLX.GetSession(connString));
       TimeSpan diff = DateTime.Now.Subtract(start);
-      Assert.True(diff.TotalSeconds > minTime && diff.TotalSeconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, diff));
+      Assert.That(diff.TotalSeconds > minTime && diff.TotalSeconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, diff));
     }
 
     private void TestConnectTimeoutSuccessTimeout(String connString, int minTime, int maxTime, string test)
@@ -592,7 +592,7 @@ private void TestConnectTimeoutSuccessTimeout(String connString, int minTime, in
       DateTime start = DateTime.Now;
       MySQLX.GetSession(connString);
       TimeSpan diff = DateTime.Now.Subtract(start);
-      Assert.True(diff.TotalSeconds > minTime && diff.TotalSeconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, diff));
+      Assert.That(diff.TotalSeconds > minTime && diff.TotalSeconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, diff));
     }
 
     [Test]
@@ -608,11 +608,11 @@ public void MaxConnections()
           Session newSession = MySQLX.GetSession(ConnectionString);
           sessions.Add(newSession);
         }
-        Assert.False(true, "MySqlException should be thrown");
+        Assert.That(true, Is.False, "MySqlException should be thrown");
       }
       catch (MySqlException ex)
       {
-        Assert.AreEqual(ResourcesX.UnableToOpenSession, ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(ResourcesX.UnableToOpenSession));
       }
       finally
       {
@@ -624,18 +624,18 @@ protected void CheckConnectionData(string connectionData, string user, string pa
     {
       string result = this.session.ParseConnectionData(connectionData);
       var csbuilder = new MySqlXConnectionStringBuilder(result);
-      Assert.True(user == csbuilder.UserID, string.Format("Expected:{0} Current:{1} in {2}", user, csbuilder.UserID, connectionData));
-      Assert.True(password == csbuilder.Password, string.Format("Expected:{0} Current:{1} in {2}", password, csbuilder.Password, connectionData));
-      Assert.True(server == csbuilder.Server, string.Format("Expected:{0} Current:{1} in {2}", server, csbuilder.Server, connectionData));
-      Assert.True(port == csbuilder.Port, string.Format("Expected:{0} Current:{1} in {2}", port, csbuilder.Port, connectionData));
+      Assert.That(user == csbuilder.UserID, string.Format("Expected:{0} Current:{1} in {2}", user, csbuilder.UserID, connectionData));
+      Assert.That(password == csbuilder.Password, string.Format("Expected:{0} Current:{1} in {2}", password, csbuilder.Password, connectionData));
+      Assert.That(server == csbuilder.Server, string.Format("Expected:{0} Current:{1} in {2}", server, csbuilder.Server, connectionData));
+      Assert.That(port == csbuilder.Port, string.Format("Expected:{0} Current:{1} in {2}", port, csbuilder.Port, connectionData));
       if (parameters != null)
       {
         if (parameters.Length % 2 != 0)
           throw new ArgumentOutOfRangeException();
         for (int i = 0; i < parameters.Length; i += 2)
         {
-          Assert.True(csbuilder.ContainsKey(parameters[i]));
-          Assert.AreEqual(parameters[i + 1], csbuilder[parameters[i]].ToString());
+          Assert.That(csbuilder.ContainsKey(parameters[i]));
+          Assert.That(csbuilder[parameters[i]].ToString(), Is.EqualTo(parameters[i + 1]));
         }
       }
     }
@@ -676,18 +676,18 @@ public void ConnectionAttributes()
 
       // Errors
       var ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";connection-attributes=[_key=value]"));
-      Assert.AreEqual(ResourcesX.InvalidUserDefinedAttribute, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidUserDefinedAttribute));
 
       ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";connection-attributes=123"));
-      Assert.AreEqual(ResourcesX.InvalidConnectionAttributes, ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(ResourcesX.InvalidConnectionAttributes));
 
       ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";connection-attributes=[key=value,key=value2]"));
-      Assert.AreEqual(string.Format(ResourcesX.DuplicateUserDefinedAttribute, "key"), ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(string.Format(ResourcesX.DuplicateUserDefinedAttribute, "key")));
 
       ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession(new { server = Host, port = XPort, user = RootUser, connectionattributes = "=" }));
 
       ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";connectionattributes=[=bar]"));
-      Assert.AreEqual(string.Format(ResourcesX.EmptyKeyConnectionAttribute), ex.Message);
+      Assert.That(ex.Message, Is.EqualTo(string.Format(ResourcesX.EmptyKeyConnectionAttribute)));
     }
 
     private void TestConnectionAttributes(string connString, Dictionary<string, object> userAttrs = null)
@@ -696,31 +696,31 @@ private void TestConnectionAttributes(string connString, Dictionary<string, obje
 
       using (Session session = MySQLX.GetSession(connString))
       {
-        Assert.AreEqual(SessionState.Open, session.XSession.SessionState);
+        Assert.That(session.XSession.SessionState, Is.EqualTo(SessionState.Open));
         var result = session.SQL(sql).Execute().FetchAll();
 
         if (session.Settings.ConnectionAttributes == "false")
-          CollectionAssert.IsEmpty(result);
+          Assert.That(result, Is.Empty);
         else
         {
-          CollectionAssert.IsNotEmpty(result);
+          Assert.That(result, Is.Not.Empty);
           MySqlConnectAttrs clientAttrs = new MySqlConnectAttrs();
 
           if (userAttrs == null)
           {
-            Assert.AreEqual(8, result.Count);
+            Assert.That(result.Count, Is.EqualTo(8));
 
             foreach (Row row in result)
-              StringAssert.StartsWith("_", row[1].ToString());
+              Assert.That(row[1].ToString(), Does.StartWith("_"));
           }
           else
           {
-            Assert.AreEqual(11, result.Count);
+            Assert.That(result.Count, Is.EqualTo(11));
 
             for (int i = 0; i < userAttrs.Count; i++)
             {
-              Assert.True(userAttrs.ContainsKey(result.ElementAt(i)[1].ToString()));
-              Assert.True(userAttrs.ContainsValue(result.ElementAt(i)[2]));
+              Assert.That(userAttrs.ContainsKey(result.ElementAt(i)[1].ToString()));
+              Assert.That(userAttrs.ContainsValue(result.ElementAt(i)[2]));
             }
           }
         }
@@ -742,17 +742,17 @@ public void ConnectionTest(string serverName)
 
       using (var sessionTest = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, sessionTest.InternalSession.SessionState);
+        Assert.That(sessionTest.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       using (var sessionTest = MySQLX.GetSession("mysqlx://" + sb.UserID + ":" + sb.Password + "@" + serverName + ":" + XPort))
       {
-        Assert.AreEqual(SessionState.Open, sessionTest.InternalSession.SessionState);
+        Assert.That(sessionTest.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       using (var sessionTest = MySQLX.GetSession(new { server = serverName, port = XPort, user = sb.UserID, password = sb.Password }))
       {
-        Assert.AreEqual(SessionState.Open, sessionTest.InternalSession.SessionState);
+        Assert.That(sessionTest.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
       //wrong port
       connStr = "server=" + sb.Server + ";user=" + sb.UserID + ";port=" + 33090 + ";password=" + sb.Password + ";" + "sslmode=" + MySqlSslMode.Required;
@@ -799,7 +799,7 @@ public void SessionUriAndDefaultSchemaTest()
 
       using (var session1 = MySQLX.GetSession(ConnectionString))
       {
-        Assert.IsNotNull(session1.Uri);
+        Assert.That(session1.Uri, Is.Not.Null);
       }
 
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
@@ -807,7 +807,7 @@ public void SessionUriAndDefaultSchemaTest()
           + sb.Database + ";characterset=utf8mb4;sslmode=Required;connect-timeout=10;keepalive=10;auth=PLAIN";
       using (var session1 = MySQLX.GetSession(connectionString))
       {
-        Assert.IsNotNull(session1.Uri);
+        Assert.That(session1.Uri, Is.Not.Null);
       }
 
       using (var session1 = MySQLX.GetSession(new
@@ -819,7 +819,7 @@ public void SessionUriAndDefaultSchemaTest()
         sslmode = MySqlSslMode.Required
       }))
       {
-        Assert.IsNotNull(session1.Uri);
+        Assert.That(session1.Uri, Is.Not.Null);
       }
 
       var conn = new MySqlConnectionStringBuilder();
@@ -837,12 +837,12 @@ public void SessionUriAndDefaultSchemaTest()
 
       using (var session1 = MySQLX.GetSession(conn.ConnectionString))
       {
-        Assert.IsNotNull(session1.Uri);
+        Assert.That(session1.Uri, Is.Not.Null);
       }
 
       using (var session1 = MySQLX.GetSession(ConnectionStringUri + "/?ssl-mode=Required;"))
       {
-        Assert.IsNotNull(session1.Uri);
+        Assert.That(session1.Uri, Is.Not.Null);
       }
 
       conn = new MySqlConnectionStringBuilder();
@@ -860,8 +860,8 @@ public void SessionUriAndDefaultSchemaTest()
       connectionString = conn.ConnectionString;
       using (var session1 = MySQLX.GetSession(connectionString))
       {
-        Assert.AreEqual(schemaName, session1.DefaultSchema.Name);
-        Assert.IsNotNull(session1.Uri);
+        Assert.That(session1.DefaultSchema.Name, Is.EqualTo(schemaName));
+        Assert.That(session1.Uri, Is.Not.Null);
       }
 
       conn = new MySqlConnectionStringBuilder();
@@ -879,8 +879,8 @@ public void SessionUriAndDefaultSchemaTest()
       connectionString = conn.ConnectionString;
       using (var session1 = MySQLX.GetSession(connectionString))
       {
-        Assert.AreEqual(schemaName, session1.DefaultSchema.Name);
-        Assert.IsNotNull(session1.Uri);
+        Assert.That(session1.DefaultSchema.Name, Is.EqualTo(schemaName));
+        Assert.That(session1.Uri, Is.Not.Null);
       }
 
       conn = new MySqlConnectionStringBuilder();
@@ -895,20 +895,20 @@ public void SessionUriAndDefaultSchemaTest()
       connectionString = conn.ConnectionString;
       using (var session1 = MySQLX.GetSession(connectionString))
       {
-        Assert.AreEqual(schemaName, session1.DefaultSchema.Name);
-        Assert.IsNotNull(session1.Uri);
+        Assert.That(session1.DefaultSchema.Name, Is.EqualTo(schemaName));
+        Assert.That(session1.Uri, Is.Not.Null);
         session1.DropSchema("㭋玤䂜蚌");
         session1.CreateSchema("㭋玤䂜蚌");
         session1.SQL("USE 㭋玤䂜蚌").Execute();
-        Assert.AreEqual(schemaName, session1.DefaultSchema.Name);
+        Assert.That(session1.DefaultSchema.Name, Is.EqualTo(schemaName));
       }
 
       conn.Database = "㭋玤䂜蚌";
       connectionString = conn.ConnectionString;
       using (var session1 = MySQLX.GetSession(connectionString))
       {
-        Assert.AreEqual("㭋玤䂜蚌", session1.DefaultSchema.Name);
-        Assert.IsNotNull(session1.Uri);
+        Assert.That(session1.DefaultSchema.Name, Is.EqualTo("㭋玤䂜蚌"));
+        Assert.That(session1.Uri, Is.Not.Null);
       }
 
       conn.Server = sb.Server;
@@ -925,8 +925,8 @@ public void SessionUriAndDefaultSchemaTest()
       connectionString = conn.ConnectionString;
       using (var session1 = MySQLX.GetSession(connectionString))
       {
-        Assert.AreEqual("㭋玤䂜蚌", session1.DefaultSchema.Name);
-        Assert.IsNotNull(session1.Uri);
+        Assert.That(session1.DefaultSchema.Name, Is.EqualTo("㭋玤䂜蚌"));
+        Assert.That(session1.Uri, Is.Not.Null);
         session1.DropSchema("㭋玤䂜蚌");
       }
 
@@ -970,14 +970,14 @@ public void SessionDefaultSchema()
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
       sb.Database = null;
       var session1 = MySQLX.GetSession(sb.ConnectionString);
-      Assert.AreEqual(null, session1.DefaultSchema);
+      Assert.That(session1.DefaultSchema, Is.EqualTo(null));
       string connectionString = ConnectionString + ";protocol=Socket;database=" + schemaName + ";characterset=utf8mb4;sslmode=VerifyCA;ssl-ca=" +
       sslCa + ";certificatepassword=" + sslCertificatePassword + ";connect-timeout=10;keepalive=10;auth=PLAIN";
       session1 = MySQLX.GetSession(connectionString);
-      Assert.AreEqual(schemaName, session1.DefaultSchema.Name);
+      Assert.That(session1.DefaultSchema.Name, Is.EqualTo(schemaName));
 
       session1 = MySQLX.GetSession(ConnectionStringUri + "/" + schemaName + "?" + "auth=PLAIN&characterset=utf8mb4");
-      Assert.AreEqual(schemaName, session1.DefaultSchema.Name);
+      Assert.That(session1.DefaultSchema.Name, Is.EqualTo(schemaName));
 
       session1 = MySQLX.GetSession(new
       {
@@ -988,16 +988,16 @@ public void SessionDefaultSchema()
         sslmode = MySqlSslMode.Required,
         database = schemaName
       });
-      Assert.AreEqual(schemaName, session1.DefaultSchema.Name);
+      Assert.That(session1.DefaultSchema.Name, Is.EqualTo(schemaName));
       session1.DefaultSchema.CreateCollection("tester");
       session1.DefaultSchema.DropCollection("tester");
-      Assert.AreEqual(schemaName, session1.DefaultSchema.Session.DefaultSchema.Name);
+      Assert.That(session1.DefaultSchema.Session.DefaultSchema.Name, Is.EqualTo(schemaName));
 
       var conn = new MySqlConnectionStringBuilder();
       session1.DropSchema("㭋玤䂜蚌");
       session1.CreateSchema("㭋玤䂜蚌");
       session1.SQL("USE 㭋玤䂜蚌").Execute();
-      Assert.AreEqual(schemaName, session1.DefaultSchema.Name);
+      Assert.That(session1.DefaultSchema.Name, Is.EqualTo(schemaName));
       session1.Dispose();
       conn.Server = sb.Server;
       conn.UserID = sb.UserID;
@@ -1012,8 +1012,8 @@ public void SessionDefaultSchema()
       conn.Keepalive = 10;
       connectionString = conn.ConnectionString;
       session1 = MySQLX.GetSession(connectionString);
-      Assert.AreEqual("㭋玤䂜蚌", session1.DefaultSchema.Name);
-      StringAssert.Contains("㭋玤䂜蚌", session1.Uri);
+      Assert.That(session1.DefaultSchema.Name, Is.EqualTo("㭋玤䂜蚌"));
+      Assert.That(session1.Uri, Does.Contain("㭋玤䂜蚌"));
 
       conn.Server = sb.Server;
       conn.UserID = sb.UserID;
@@ -1028,11 +1028,11 @@ public void SessionDefaultSchema()
       conn.Keepalive = 10;
       connectionString = conn.ConnectionString;
       session1 = MySQLX.GetSession(connectionString);
-      Assert.AreEqual("㭋玤䂜蚌", session1.DefaultSchema.Name);
-      StringAssert.Contains("㭋玤䂜蚌", session1.Uri);
+      Assert.That(session1.DefaultSchema.Name, Is.EqualTo("㭋玤䂜蚌"));
+      Assert.That(session1.Uri, Does.Contain("㭋玤䂜蚌"));
       session1.DefaultSchema.CreateCollection("tester");
       session1.DefaultSchema.DropCollection("tester");
-      Assert.AreEqual("㭋玤䂜蚌", session1.DefaultSchema.Session.DefaultSchema.Name);
+      Assert.That(session1.DefaultSchema.Session.DefaultSchema.Name, Is.EqualTo("㭋玤䂜蚌"));
     }
 
     [Test, Description("Session BaseString/MySQLXConnectionString Builder")]
@@ -1054,7 +1054,7 @@ public void ConnectionStringBuilderXpluginTests()
 
       using (var xpluginconn = MySQLX.GetSession(mysqlx0.ConnectionString))
       {
-        Assert.AreEqual(SessionState.Open, xpluginconn.InternalSession.SessionState);
+        Assert.That(xpluginconn.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       mysqlx0 = new MySqlXConnectionStringBuilder(ConnectionString);
@@ -1072,7 +1072,7 @@ public void ConnectionStringBuilderXpluginTests()
 
       using (var xpluginconn = MySQLX.GetSession(mysqlx0.ConnectionString))
       {
-        Assert.AreEqual(SessionState.Open, xpluginconn.InternalSession.SessionState);
+        Assert.That(xpluginconn.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       mysqlx0 = new MySqlXConnectionStringBuilder(ConnectionString);
@@ -1089,7 +1089,7 @@ public void ConnectionStringBuilderXpluginTests()
 
       using (var xpluginconn = MySQLX.GetSession(mysqlx0.ConnectionString))
       {
-        Assert.AreEqual(SessionState.Open, xpluginconn.InternalSession.SessionState);
+        Assert.That(xpluginconn.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       mysqlx0 = new MySqlXConnectionStringBuilder(ConnectionString);
@@ -1102,14 +1102,14 @@ public void ConnectionStringBuilderXpluginTests()
 
       using (var xpluginconn = MySQLX.GetSession(mysqlx0.ConnectionString))
       {
-        Assert.AreEqual(SessionState.Open, xpluginconn.InternalSession.SessionState);
+        Assert.That(xpluginconn.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       //Scenario-2
       string valid = "server=" + mysqlx0.Server + ";user id=" + mysqlx0.UserID + ";password=" + mysqlx0.Password + ";port=" + XPort + ";protocol=Socket;database=" + schemaName + ";characterset=utf8mb4;sslmode=Required;certificatefile=" + sslCa + ";certificatepassword=" + sslCertificatePassword + ";connect-timeout=10;keepalive=10;certificatestorelocation=LocalMachine;certificatethumbprint=;";
       using (var xpluginconn = MySQLX.GetSession(valid))
       {
-        Assert.AreEqual(SessionState.Open, xpluginconn.InternalSession.SessionState);
+        Assert.That(xpluginconn.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       //Scenario-3
@@ -1128,7 +1128,7 @@ public void ConnectionStringBuilderXpluginTests()
       mysqlx0.SslCa = sslCa;
       using (var xpluginconn = MySQLX.GetSession(mysqlx0.ConnectionString))
       {
-        Assert.AreEqual(SessionState.Open, xpluginconn.InternalSession.SessionState);
+        Assert.That(xpluginconn.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       //Basic Scenarios
@@ -1140,7 +1140,7 @@ public void ConnectionStringBuilderXpluginTests()
           + ";certificatestorelocation=LocalMachine;certificatethumbprint=";
       using (var xpluginconn = MySQLX.GetSession(connectionstr))
       {
-        Assert.AreEqual(SessionState.Open, xpluginconn.InternalSession.SessionState);
+        Assert.That(xpluginconn.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       connectionstr = "mysqlx://" + mysqlx0.Server + ":" + XPort + "/" +
@@ -1150,7 +1150,7 @@ public void ConnectionStringBuilderXpluginTests()
 
       using (var xpluginconn = MySQLX.GetSession(connectionstr))
       {
-        Assert.AreEqual(SessionState.Open, xpluginconn.InternalSession.SessionState);
+        Assert.That(xpluginconn.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       using (var xpluginconn = MySQLX.GetSession(new
@@ -1161,7 +1161,7 @@ public void ConnectionStringBuilderXpluginTests()
         password = mysqlx0.Password
       }))
       {
-        Assert.AreEqual(SessionState.Open, xpluginconn.InternalSession.SessionState);
+        Assert.That(xpluginconn.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
     }
@@ -1236,7 +1236,7 @@ public void ParseConnectionStringBenchmark_S1()
         conTime = (elapsedTime / NANO_TO_MILLI) - (queryRunTime / NANO_TO_MILLI);
         var t = CalculateTPS(conTime, transactions);
         var log = ("Connected to MySQL using URI with iterations " + iterations + " with TPS:" + t);
-        Assert.IsNotNull(t);
+        Assert.That(t, Is.Not.Empty);
 
         transactions = 0;
         startTime = 0;
@@ -1258,7 +1258,7 @@ public void ParseConnectionStringBenchmark_S1()
         t = CalculateTPS(conTime, transactions);
         log = ("Connected to MySQL using connection string with iterations " + iterations + " with TPS:" + t);
         Console.WriteLine(log);
-        Assert.IsNotNull(t);
+        Assert.That(t, Is.Not.Empty);
 
         transactions = 0;
         startTime = 0;
@@ -1355,7 +1355,7 @@ public void GetSessionUriPositiveTests()
       {
         using (Session c = MySQLX.GetSession(connStr))
         {
-          Assert.AreEqual(SessionState.Open, c.InternalSession.SessionState);
+          Assert.That(c.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
       }
     }
@@ -1693,7 +1693,7 @@ public void TimeoutIncreasingUntilConnect()
         mysqlx0 = new MySqlXConnectionStringBuilder(connStr);
         using (var conn = MySQLX.GetSession(mysqlx0.ConnectionString))
         {
-          Assert.IsNotNull(conn.Uri);
+          Assert.That(conn.Uri, Is.Not.Null);
         }
         break;
       }
@@ -1718,7 +1718,7 @@ public void TimeoutIncreasingUntilConnect()
 
         using (var conn = MySQLX.GetSession(mysqlx0.ConnectionString))
         {
-          Assert.IsNotNull(conn.Uri);
+          Assert.That(conn.Uri, Is.Not.Null);
         }
         break;
       }
@@ -1733,7 +1733,7 @@ public void ValidateDefaultTimeoutParameter()
       {
         using (var conn = MySQLX.GetSession(connStr))
         {
-          Assert.AreEqual(conn.Settings.ConnectTimeout, defaultTimeout);
+          Assert.That(defaultTimeout, Is.EqualTo(conn.Settings.ConnectTimeout));
         }
       }
       connStr = "mysqlx://" + session.Settings.UserID + ":" + session.Settings.Password + "@" + session.Settings.Server + ":" + XPort + "?connect-timeout=" + defaultTimeout;
@@ -1741,7 +1741,7 @@ public void ValidateDefaultTimeoutParameter()
       {
         using (var conn = MySQLX.GetSession(connStr))
         {
-          Assert.AreEqual(conn.Settings.ConnectTimeout, defaultTimeout);
+          Assert.That(defaultTimeout, Is.EqualTo(conn.Settings.ConnectTimeout));
         }
       }
       var connObj1 = new { server = session.Settings.Server, port = XPort, user = session.Settings.UserID, password = session.Settings.Password, connecttimeout = defaultTimeout };
@@ -1749,7 +1749,7 @@ public void ValidateDefaultTimeoutParameter()
       {
         using (var conn = MySQLX.GetSession(connObj1))
         {
-          Assert.AreEqual(conn.Settings.ConnectTimeout, defaultTimeout);
+          Assert.That(defaultTimeout, Is.EqualTo(conn.Settings.ConnectTimeout));
         }
       }
     }
@@ -1768,7 +1768,7 @@ public void ValidateDefaultTimeoutParameterWithStringBuilder()
       {
         using (var conn = MySQLX.GetSession(connStrBuilder.ConnectionString))
         {
-          Assert.AreEqual(conn.Settings.ConnectTimeout, defaultTimeout);
+          Assert.That(defaultTimeout, Is.EqualTo(conn.Settings.ConnectTimeout));
         }
       }
       string connStr = ConnectionString + ";" + "connect-timeout=" + defaultTimeout;
@@ -1777,7 +1777,7 @@ public void ValidateDefaultTimeoutParameterWithStringBuilder()
       {
         using (var conn = MySQLX.GetSession(connStrBuilder.ConnectionString))
         {
-          Assert.AreEqual(conn.Settings.ConnectTimeout, defaultTimeout);
+          Assert.That(defaultTimeout, Is.EqualTo(conn.Settings.ConnectTimeout));
         }
       }
     }
@@ -1873,17 +1873,17 @@ public void ConnectTimeoutSeveralAddreses()
                                              session.Settings.UserID + ";password=" + session.Settings.Password + ";connect-timeout=" +
                                              connectionTimeout + ";ssl-mode=required"))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var schema = session1.GetSchema("test");
-        Assert.IsNotNull(schema);
+        Assert.That(schema, Is.Not.Null);
       }
 
       var connStr = "mysqlx://" + session.Settings.UserID + ":" + session.Settings.Password + "@[" + hostList + "]/?connect-timeout=" + connectionTimeout;
       using (var session1 = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var schema = session1.GetSchema("test");
-        Assert.IsNotNull(schema);
+        Assert.That(schema, Is.Not.Null);
       }
 
       using (var session1 = MySQLX.GetSession(new
@@ -1895,9 +1895,9 @@ public void ConnectTimeoutSeveralAddreses()
         sslmode = MySqlSslMode.Required
       }))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var schema = session1.GetSchema("test");
-        Assert.IsNotNull(schema);
+        Assert.That(schema, Is.Not.Null);
       }
 
       var strList = "(address=143.24.20.36,priority=0),(address=10.172.165.157,priority=1)";
@@ -1909,14 +1909,14 @@ public void ConnectTimeoutSeveralAddreses()
       sw.Start();
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(connString));
       sw.Stop();
-      Assert.True(sw.Elapsed.Seconds > 0 && sw.Elapsed.Seconds < 21);
+      Assert.That(sw.Elapsed.Seconds > 0 && sw.Elapsed.Seconds < 21);
 
       connStr = "mysqlx://" + session.Settings.UserID + ":" + session.Settings.Password + "@[" + strList + "]" + "/?connect-timeout=" + connectionTimeout;
       sw = new Stopwatch();
       sw.Start();
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(connString));
       sw.Stop();
-      Assert.True(sw.Elapsed.Seconds > 0 && sw.Elapsed.Seconds < 21);
+      Assert.That(sw.Elapsed.Seconds > 0 && sw.Elapsed.Seconds < 21);
 
       var connObj1 = new
       {
@@ -1930,7 +1930,7 @@ public void ConnectTimeoutSeveralAddreses()
       sw.Start();
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(connString));
       sw.Stop();
-      Assert.True(sw.Elapsed.Seconds > 0 && sw.Elapsed.Seconds < 21);
+      Assert.That(sw.Elapsed.Seconds > 0 && sw.Elapsed.Seconds < 21);
     }
 
     [Test, Description("(connectionString,connectionUri,Anonymous Object.Test that the timeout will be reset for each connection attempt in a failover scenario")]
@@ -1946,14 +1946,14 @@ public void ConnectTimeoutWithFailoverAndNotValidHost()
       sw.Start();
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(connString));
       sw.Stop();
-      Assert.True(sw.Elapsed.Seconds > 0 && sw.Elapsed.Seconds < 10);
+      Assert.That(sw.Elapsed.Seconds > 0 && sw.Elapsed.Seconds < 10);
       // URI
       var connStr = "mysqlx://" + session.Settings.UserID + ":" + session.Settings.Password + "@[" + hostList + "]" + "/?connect-timeout=" + connectionTimeout;
       sw = new Stopwatch();
       sw.Start();
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(connString));
       sw.Stop();
-      Assert.True(sw.Elapsed.Seconds > 0 && sw.Elapsed.Seconds < 10);
+      Assert.That(sw.Elapsed.Seconds > 0 && sw.Elapsed.Seconds < 10);
 
       // Object
       var connObj = new
@@ -1968,7 +1968,7 @@ public void ConnectTimeoutWithFailoverAndNotValidHost()
       sw.Start();
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(connString));
       sw.Stop();
-      Assert.True(sw.Elapsed.Seconds > 0 && sw.Elapsed.Seconds < 10);
+      Assert.That(sw.Elapsed.Seconds > 0 && sw.Elapsed.Seconds < 10);
     }
 
     [Test, Description("Confirm that the timeout is only applied to the connection process, not to any subsequent operation after the connection is established")]
@@ -1982,7 +1982,7 @@ public void ValidateConnectTimeoutScope()
       {
         conn.SQL("SELECT SLEEP(10)").Execute();
         var res = conn.SQL("select @@port").Execute().FirstOrDefault();
-        Assert.IsNotNull(res);
+        Assert.That(res, Is.Not.Null);
       }
 
       connStr = "mysqlx://" + session.Settings.UserID + ":" + session.Settings.Password + "@" + session.Settings.Server + ":" + XPort + "?connect-timeout=10000;";
@@ -1990,7 +1990,7 @@ public void ValidateConnectTimeoutScope()
       {
         conn.SQL("SELECT SLEEP(10)").Execute();
         var res = conn.SQL("select @@port").Execute().FirstOrDefault();
-        Assert.IsNotNull(res);
+        Assert.That(res, Is.Not.Null);
       }
 
       var connObj = new
@@ -2005,7 +2005,7 @@ public void ValidateConnectTimeoutScope()
       {
         conn.SQL("SELECT SLEEP(10)").Execute();
         var res = conn.SQL("select @@port").Execute().FirstOrDefault();
-        Assert.IsNotNull(res);
+        Assert.That(res, Is.Not.Null);
       }
 
       var connStrBuilder = new MySqlXConnectionStringBuilder();
@@ -2018,7 +2018,7 @@ public void ValidateConnectTimeoutScope()
       {
         conn.SQL("SELECT SLEEP(10)").Execute();
         var res = conn.SQL("select @@port").Execute().FirstOrDefault();
-        Assert.IsNotNull(res);
+        Assert.That(res, Is.Not.Null);
       }
 
       connStr = "server=" + session.Settings.Server + ";user=" + session.Settings.UserID + ";port=" + XPort + ";password="
@@ -2028,7 +2028,7 @@ public void ValidateConnectTimeoutScope()
       {
         conn.SQL("SELECT SLEEP(10)").Execute();
         var res = conn.SQL("select @@port").Execute().FirstOrDefault();
-        Assert.IsNotNull(res);
+        Assert.That(res, Is.Not.Null);
       }
 
       connStr = ConnectionString + ";protocol=Socket;" +
@@ -2041,7 +2041,7 @@ public void ValidateConnectTimeoutScope()
       {
         conn.SQL("SELECT SLEEP(10)").Execute();
         var res = conn.SQL("select @@port").Execute().FirstOrDefault();
-        Assert.IsNotNull(res);
+        Assert.That(res, Is.Not.Null);
       }
 
       mysqlx0 = new MySqlXConnectionStringBuilder();
@@ -2065,7 +2065,7 @@ public void ValidateConnectTimeoutScope()
       {
         conn.SQL("SELECT SLEEP(10)").Execute();
         var res = conn.SQL("select @@port").Execute().FirstOrDefault();
-        Assert.IsNotNull(res);
+        Assert.That(res, Is.Not.Null);
       }
     }
 
@@ -2180,7 +2180,7 @@ public void SessionStressTest()
       {
         using (Session session1 = MySQLX.GetSession(ConnectionString))
         {
-          Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+          Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           session1.Close();
         }
       }
@@ -2206,13 +2206,13 @@ public void SessionAuditPluginTest()
     {
       using (var mysqlx = MySQLX.GetSession(ConnectionString))
       {
-        Assert.AreEqual(SessionState.Open, mysqlx.InternalSession.SessionState);
+        Assert.That(mysqlx.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         mysqlx.Close();
       }
       using (var mysql = new MySqlConnection($"server={Host};user={session.Settings.UserID};port={Port};password={session.Settings.Password}"))
       {
         mysql.Open();
-        Assert.AreEqual(ConnectionState.Open, mysql.connectionState);
+        Assert.That(mysql.connectionState, Is.EqualTo(ConnectionState.Open));
         mysql.Close();
       }
       Assert.Throws<MySqlException>(() => MySQLX.GetSession($"server={Host};user={session.Settings.UserID};port={XPort};password=wrong"));
@@ -2228,7 +2228,7 @@ public void ClassicClientXProtocol()
       using (var session1 = new MySqlConnection(connectionString))
       {
         Exception ex = Assert.Throws<MySqlException>(() => session1.Open());
-        Assert.AreEqual("Unsupported protocol version.", ex.Message);
+        Assert.That(ex.Message, Is.EqualTo("Unsupported protocol version."));
       }
     }
 
@@ -2240,7 +2240,7 @@ public void TestConnectObjectTimeoutSuccessTimeout(object connString, int minTim
       sw.Start();
       var conn = MySQLX.GetSession(connString);
       sw.Stop();
-      Assert.True(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds <= maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
+      Assert.That(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds <= maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
     }
 
     public void TestConnectStringTimeoutSuccessTimeout(String connString, int minTime, int maxTime, string test)
@@ -2249,7 +2249,7 @@ public void TestConnectStringTimeoutSuccessTimeout(String connString, int minTim
       sw.Start();
       var conn = MySQLX.GetSession(connString);
       sw.Stop();
-      Assert.True(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds <= maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
+      Assert.That(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds <= maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
     }
 
     public void TestConnectObjTimeoutFailureTimeout(object connString, int minTime, int maxTime, string test)
@@ -2258,7 +2258,7 @@ public void TestConnectObjTimeoutFailureTimeout(object connString, int minTime,
       sw.Start();
       Assert.Catch(() => MySQLX.GetSession(connString));
       sw.Stop();
-      Assert.True(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
+      Assert.That(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
     }
 
     public void TestConnectStringTimeoutFailureTimeout(String connString, int minTime, int maxTime, string test)
@@ -2267,7 +2267,7 @@ public void TestConnectStringTimeoutFailureTimeout(String connString, int minTim
       sw.Start();
       Assert.Catch(() => MySQLX.GetSession(connString));
       sw.Stop();
-      Assert.True(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
+      Assert.That(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
     }
 
     public void TestClientQueueTimeout(Client client, int minTime, int maxTime, string test)
@@ -2276,7 +2276,7 @@ public void TestClientQueueTimeout(Client client, int minTime, int maxTime, stri
       sw.Start();
       Assert.Throws<TimeoutException>(() => client.GetSession());
       sw.Stop();
-      Assert.True(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime,
+      Assert.That(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime,
           String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
     }
 
@@ -2288,7 +2288,7 @@ public void TestClientSuccessTimeout(int minTime, int maxTime, string test, stri
         sw.Start();
         client.GetSession();
         sw.Stop();
-        Assert.True(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
+        Assert.That(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
       }
     }
 
@@ -2300,7 +2300,7 @@ public void TestClientSuccessTimeout(int minTime, int maxTime, string test, obje
         sw.Start();
         client.GetSession();
         sw.Stop();
-        Assert.True(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
+        Assert.That(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
       }
     }
     public void TestFailureTimeout(Client client, int minTime, int maxTime, string test)
@@ -2308,7 +2308,7 @@ public void TestFailureTimeout(Client client, int minTime, int maxTime, string t
       DateTime start = DateTime.Now;
       Assert.Catch(() => client.GetSession());
       TimeSpan diff = DateTime.Now.Subtract(start);
-      Assert.True(diff.TotalSeconds >= minTime && diff.TotalSeconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, diff));
+      Assert.That(diff.TotalSeconds >= minTime && diff.TotalSeconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, diff));
     }
 
     private void MeasureConnectionString(string connStr, int maxTime, string test, int iteration)
@@ -2322,7 +2322,7 @@ private void MeasureConnectionString(string connStr, int maxTime, string test, i
       }
 
       sw.Stop();
-      Assert.True(sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
+      Assert.That(sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
     }
 
     private void MeasureConnectionObject(object connStr, int maxTime, string test, int iteration)
@@ -2336,7 +2336,7 @@ private void MeasureConnectionObject(object connStr, int maxTime, string test, i
       }
 
       sw.Stop();
-      Assert.True(sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
+      Assert.That(sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
     }
 
     public long NanoTime()
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
index 6e399c635..a91d11915 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
@@ -45,9 +45,9 @@ public void SslSession()
     {
       using (var s3 = MySQLX.GetSession(ConnectionStringUri))
       {
-        Assert.AreEqual(SessionState.Open, s3.InternalSession.SessionState);
+        Assert.That(s3.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var result = ExecuteSQLStatement(s3.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';")).FetchAll();
-        StringAssert.StartsWith("TLSv1", result[0][1].ToString());
+        Assert.That(result[0][1].ToString(), Does.StartWith("TLSv1"));
       }
     }
 
@@ -58,9 +58,9 @@ public void SslEmptyCertificate()
       // if certificate is empty, it connects without a certificate
       using (var s1 = MySQLX.GetSession(connstring))
       {
-        Assert.AreEqual(SessionState.Open, s1.InternalSession.SessionState);
+        Assert.That(s1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var result = ExecuteSQLStatement(s1.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';")).FetchAll();
-        StringAssert.StartsWith("TLSv1", result[0][1].ToString());
+        Assert.That(result[0][1].ToString(), Does.StartWith("TLSv1"));
       }
     }
 
@@ -71,12 +71,12 @@ public void SslOptions()
       // sslmode is valid.
       using (var connection = MySQLX.GetSession(connectionUri + "?sslmode=required"))
       {
-        Assert.AreEqual(SessionState.Open, connection.InternalSession.SessionState);
+        Assert.That(connection.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       using (var connection = MySQLX.GetSession(connectionUri + "?ssl-mode=required"))
       {
-        Assert.AreEqual(SessionState.Open, connection.InternalSession.SessionState);
+        Assert.That(connection.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
 
       // sslenable is invalid.
@@ -86,17 +86,17 @@ public void SslOptions()
       // sslmode=Required is default value.
       using (var connection = MySQLX.GetSession(connectionUri))
       {
-        Assert.AreEqual(connection.Settings.SslMode, MySqlSslMode.Required);
+        Assert.That(MySqlSslMode.Required, Is.EqualTo(connection.Settings.SslMode));
       }
 
       // sslmode case insensitive.
       using (var connection = MySQLX.GetSession(connectionUri + "?SsL-mOdE=required"))
       {
-        Assert.AreEqual(SessionState.Open, connection.InternalSession.SessionState);
+        Assert.That(connection.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
       using (var connection = MySQLX.GetSession(connectionUri + "?SsL-mOdE=VeRiFyca&ssl-ca=../../../../MySql.Data.Tests/client.pfx&ssl-ca-pwd=pass"))
       {
-        Assert.AreEqual(SessionState.Open, connection.InternalSession.SessionState);
+        Assert.That(connection.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var uri = connection.Uri;
       }
 
@@ -115,7 +115,7 @@ public void SslRequiredByDefault()
     {
       using (var connection = MySQLX.GetSession(ConnectionStringUri))
       {
-        Assert.AreEqual(MySqlSslMode.Required, connection.Settings.SslMode);
+        Assert.That(connection.Settings.SslMode, Is.EqualTo(MySqlSslMode.Required));
       }
     }
 
@@ -130,9 +130,9 @@ public void SslPreferredIsInvalid()
 
       // In connection string.
       var exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionStringUri + "?ssl-mode=Preferred"));
-      Assert.AreEqual(string.Format(expectedErrorMessage, "Preferred"), exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(string.Format(expectedErrorMessage, "Preferred")));
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionStringUri + "?ssl-mode=Prefered"));
-      Assert.AreEqual(string.Format(expectedErrorMessage, "Prefered"), exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(string.Format(expectedErrorMessage, "Prefered")));
 
       // In anonymous object.
       var builder = new MySqlXConnectionStringBuilder(ConnectionString);
@@ -145,18 +145,18 @@ public void SslPreferredIsInvalid()
         sslmode = MySqlSslMode.Prefered
       };
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionObject));
-      Assert.AreEqual(string.Format(expectedErrorMessage, prefered), exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(string.Format(expectedErrorMessage, prefered)));
 
       // In MySqlXConnectionStringBuilder.
       builder = new MySqlXConnectionStringBuilder(ConnectionString);
       builder.SslMode = MySqlSslMode.Prefered;
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionObject));
-      Assert.AreEqual(string.Format(expectedErrorMessage, prefered), exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(string.Format(expectedErrorMessage, prefered)));
 
       builder = new MySqlXConnectionStringBuilder(ConnectionString);
       builder.SslMode = MySqlSslMode.Preferred;
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionObject));
-      Assert.AreEqual(string.Format(expectedErrorMessage, prefered), exception.Message);
+      Assert.That(exception.Message, Is.EqualTo(string.Format(expectedErrorMessage, prefered)));
     }
 
     [Test]
@@ -200,9 +200,9 @@ public void GetUriWithSSLParameters()
 
           // Authentication mode AUTO/DEFAULT is internally assigned, hence it is expected to be different in this scenario. 
           if (connectionOption == "auth")
-            Assert.AreEqual(MySqlAuthenticationMode.PLAIN, internalSession.Settings[connectionOption]);
+            Assert.That(internalSession.Settings[connectionOption], Is.EqualTo(MySqlAuthenticationMode.PLAIN));
           else
-            Assert.AreEqual(builder[connectionOption], internalSession.Settings[connectionOption]);
+            Assert.That(internalSession.Settings[connectionOption], Is.EqualTo(builder[connectionOption]));
         }
       }
     }
@@ -238,17 +238,17 @@ public void GetUriKeepsSSLMode()
 
       using (var internalSession = MySQLX.GetSession(uri))
       {
-        Assert.AreEqual(builder.Server, internalSession.Settings.Server);
-        Assert.AreEqual(builder.UserID, internalSession.Settings.UserID);
-        Assert.AreEqual(builder.Password, internalSession.Settings.Password);
-        Assert.AreEqual(builder.Port, internalSession.Settings.Port);
-        Assert.AreEqual(builder.Database, internalSession.Settings.Database);
-        Assert.AreEqual(builder.CharacterSet, internalSession.Settings.CharacterSet);
-        Assert.AreEqual(builder.SslMode, internalSession.Settings.SslMode);
-        Assert.AreEqual(builder.SslCa, internalSession.Settings.SslCa);
-        Assert.AreEqual(builder.CertificatePassword, internalSession.Settings.CertificatePassword);
-        Assert.AreEqual(builder.ConnectTimeout, internalSession.Settings.ConnectTimeout);
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, internalSession.Settings.Auth);
+        Assert.That(internalSession.Settings.Server, Is.EqualTo(builder.Server));
+        Assert.That(internalSession.Settings.UserID, Is.EqualTo(builder.UserID));
+        Assert.That(internalSession.Settings.Password, Is.EqualTo(builder.Password));
+        Assert.That(internalSession.Settings.Port, Is.EqualTo(builder.Port));
+        Assert.That(internalSession.Settings.Database, Is.EqualTo(builder.Database));
+        Assert.That(internalSession.Settings.CharacterSet, Is.EqualTo(builder.CharacterSet));
+        Assert.That(internalSession.Settings.SslMode, Is.EqualTo(builder.SslMode));
+        Assert.That(internalSession.Settings.SslCa, Is.EqualTo(builder.SslCa));
+        Assert.That(internalSession.Settings.CertificatePassword, Is.EqualTo(builder.CertificatePassword));
+        Assert.That(internalSession.Settings.ConnectTimeout, Is.EqualTo(builder.ConnectTimeout));
+        Assert.That(internalSession.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
       }
     }
 
@@ -292,15 +292,15 @@ public void TlsVersionTest(string tlsVersion, int error)
       {
         case 1:
           ex = Assert.Throws<ArgumentException>(SetTlsVersion).Message;
-          StringAssert.AreEqualIgnoringCase(MySql.Data.Resources.TlsVersionsEmpty, ex);
+          Assert.That(ex, Is.EqualTo(MySql.Data.Resources.TlsVersionsEmpty).IgnoreCase);
           break;
         case 2:
           ex = Assert.Throws<ArgumentException>(SetTlsVersion).Message;
-          StringAssert.AreEqualIgnoringCase(MySql.Data.Resources.TlsUnsupportedVersions, ex);
+          Assert.That(ex, Is.EqualTo(MySql.Data.Resources.TlsUnsupportedVersions).IgnoreCase);
           break;
         case 3:
           ex = Assert.Throws<ArgumentException>(SetTlsVersion).Message;
-          StringAssert.AreEqualIgnoringCase(MySql.Data.Resources.TlsNonValidProtocols, ex);
+          Assert.That(ex, Is.EqualTo(MySql.Data.Resources.TlsNonValidProtocols).IgnoreCase);
           break;
         case 4:
           SetTlsVersion();
@@ -313,13 +313,13 @@ public void TlsVersionTest(string tlsVersion, int error)
           using (var internalSession = MySQLX.GetSession(builder.ConnectionString))
           {
             uri = internalSession.Uri;
-            Assert.AreEqual(SessionState.Open, internalSession.InternalSession.SessionState);
-            StringAssert.StartsWith(tls, internalSession.SQL("SHOW SESSION STATUS LIKE 'mysqlx_ssl_version'").Execute().FetchAll()[0][1].ToString());
+            Assert.That(internalSession.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+            Assert.That(internalSession.SQL("SHOW SESSION STATUS LIKE 'mysqlx_ssl_version'").Execute().FetchAll()[0][1].ToString(), Does.StartWith(tls));
           }
           using (var internalSession = MySQLX.GetSession(uri))
           {
-            Assert.AreEqual(SessionState.Open, internalSession.InternalSession.SessionState);
-            StringAssert.StartsWith(tls, internalSession.SQL("SHOW SESSION STATUS LIKE 'mysqlx_ssl_version'").Execute().FetchAll()[0][1].ToString());
+            Assert.That(internalSession.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+            Assert.That(internalSession.SQL("SHOW SESSION STATUS LIKE 'mysqlx_ssl_version'").Execute().FetchAll()[0][1].ToString(), Does.StartWith(tls));
           }
 
           break;
@@ -350,13 +350,13 @@ public void TlsVersionNoSslTest(string tlsVersion)
       using (var internalSession = MySQLX.GetSession(builder.ConnectionString))
       {
         uri = internalSession.Uri;
-        Assert.AreEqual(SessionState.Open, internalSession.InternalSession.SessionState);
-        Assert.IsEmpty(internalSession.SQL("SHOW SESSION STATUS LIKE 'mysqlx_ssl_version'").Execute().FetchAll()[0][1].ToString());
+        Assert.That(internalSession.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(internalSession.SQL("SHOW SESSION STATUS LIKE 'mysqlx_ssl_version'").Execute().FetchAll()[0][1].ToString(), Is.Empty);
       }
       using (var internalSession = MySQLX.GetSession(uri))
       {
-        Assert.AreEqual(SessionState.Open, internalSession.InternalSession.SessionState);
-        Assert.IsEmpty(internalSession.SQL("SHOW SESSION STATUS LIKE 'mysqlx_ssl_version'").Execute().FetchAll()[0][1].ToString());
+        Assert.That(internalSession.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(internalSession.SQL("SHOW SESSION STATUS LIKE 'mysqlx_ssl_version'").Execute().FetchAll()[0][1].ToString(), Is.Empty);
       }
     }
 
@@ -371,9 +371,9 @@ public void SslCertificate()
       string connstring = ConnectionStringUri + $"/?ssl-ca={path}client.pfx&ssl-ca-pwd=pass";
       using (var s3 = MySQLX.GetSession(connstring))
       {
-        Assert.AreEqual(SessionState.Open, s3.InternalSession.SessionState);
+        Assert.That(s3.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var result = ExecuteSQLStatement(s3.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';")).FetchAll();
-        StringAssert.StartsWith("TLSv1", result[0][1].ToString());
+        Assert.That(result[0][1].ToString(), Does.StartWith("TLSv1"));
       }
     }
 
@@ -391,21 +391,21 @@ public void SslCertificatePathKeepsCase()
       // Connection string in basic format.
       string connString = ConnectionString + ";ssl-ca=" + certificatePath + ";ssl-ca-pwd=pass;";
       var stringBuilder = new MySqlXConnectionStringBuilder(connString);
-      Assert.AreEqual(certificatePath, stringBuilder.CertificateFile);
-      Assert.AreEqual(certificatePath, stringBuilder.SslCa);
-      Assert.True(stringBuilder.ConnectionString.Contains(certificatePath));
+      Assert.That(stringBuilder.CertificateFile, Is.EqualTo(certificatePath));
+      Assert.That(stringBuilder.SslCa, Is.EqualTo(certificatePath));
+      Assert.That(stringBuilder.ConnectionString.Contains(certificatePath));
       connString = stringBuilder.ToString();
-      Assert.True(connString.Contains(certificatePath));
+      Assert.That(connString.Contains(certificatePath));
 
       // Connection string in uri format.
       string connStringUri = ConnectionStringUri + "/?ssl-ca=" + certificatePath + "& ssl-ca-pwd=pass;";
       using (var session = MySQLX.GetSession(connStringUri))
       {
-        Assert.AreEqual(certificatePath, session.Settings.CertificateFile);
-        Assert.AreEqual(certificatePath, session.Settings.SslCa);
-        Assert.True(session.Settings.ConnectionString.Contains(certificatePath));
+        Assert.That(session.Settings.CertificateFile, Is.EqualTo(certificatePath));
+        Assert.That(session.Settings.SslCa, Is.EqualTo(certificatePath));
+        Assert.That(session.Settings.ConnectionString.Contains(certificatePath));
         connString = session.Settings.ToString();
-        Assert.True(connString.Contains(certificatePath));
+        Assert.That(connString.Contains(certificatePath));
       }
     }
 
@@ -420,7 +420,7 @@ public void SslCertificatePathVariations(string certificatePath)
 
       using (var session = MySQLX.GetSession(connStringUri))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
       }
     }
 
@@ -435,20 +435,20 @@ public void SslCertificateConnectionOptionsExistAndDefaultToNull()
       var builder = new MySqlXConnectionStringBuilder();
 
       // Options exist.
-      Assert.True(builder.values.ContainsKey("sslca"));
-      Assert.True(builder.values.ContainsKey("sslcert"));
-      Assert.True(builder.values.ContainsKey("sslkey"));
+      Assert.That(builder.values.ContainsKey("sslca"));
+      Assert.That(builder.values.ContainsKey("sslcert"));
+      Assert.That(builder.values.ContainsKey("sslkey"));
 
       // Options default to null.
-      Assert.Null(builder["sslca"]);
-      Assert.Null(builder["sslcert"]);
-      Assert.Null(builder["sslkey"]);
-      Assert.Null(builder["ssl-ca"]);
-      Assert.Null(builder["ssl-cert"]);
-      Assert.Null(builder["ssl-key"]);
-      Assert.Null(builder.SslCa);
-      Assert.Null(builder.SslCert);
-      Assert.Null(builder.SslKey);
+      Assert.That(builder["sslca"], Is.Null);
+      Assert.That(builder["sslcert"], Is.Null);
+      Assert.That(builder["sslkey"], Is.Null);
+      Assert.That(builder["ssl-ca"], Is.Null);
+      Assert.That(builder["ssl-cert"], Is.Null);
+      Assert.That(builder["ssl-key"], Is.Null);
+      Assert.That(builder.SslCa, Is.Null);
+      Assert.That(builder.SslCert, Is.Null);
+      Assert.That(builder.SslKey, Is.Null);
 
       // Null or whitespace options are ignored.
       builder = new MySqlXConnectionStringBuilder(ConnectionString);
@@ -457,18 +457,18 @@ public void SslCertificateConnectionOptionsExistAndDefaultToNull()
       builder.SslKey = "  ";
       using (var session = MySQLX.GetSession(builder.ConnectionString))
       {
-        Assert.Null(session.Settings.SslCa);
-        Assert.Null(session.Settings.SslCert);
-        Assert.AreEqual("  ", session.Settings.SslKey);
+        Assert.That(session.Settings.SslCa, Is.Null);
+        Assert.That(session.Settings.SslCert, Is.Null);
+        Assert.That(session.Settings.SslKey, Is.EqualTo("  "));
         session.Close();
       }
 
       // Failing to provide a value defaults to null.
       using (var session = MySQLX.GetSession($"{ConnectionString};sslca=;sslcert=;sslkey="))
       {
-        Assert.Null(session.Settings.SslCa);
-        Assert.Null(session.Settings.SslCert);
-        Assert.Null(session.Settings.SslKey);
+        Assert.That(session.Settings.SslCa, Is.Null);
+        Assert.That(session.Settings.SslCert, Is.Null);
+        Assert.That(session.Settings.SslKey, Is.Null);
         session.Close();
       }
     }
@@ -480,13 +480,13 @@ public void MissingSslCaConnectionOption()
       var builder = new MySqlXConnectionStringBuilder(ConnectionString);
       builder.SslMode = MySqlSslMode.VerifyCA;
       var exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(string.Format(MySql.Data.Resources.FilePathNotSet, nameof(builder.SslCa)), exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(string.Format(MySql.Data.Resources.FilePathNotSet, nameof(builder.SslCa))));
 
       builder.SslMode = MySqlSslMode.VerifyFull;
       exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(string.Format(MySql.Data.Resources.FilePathNotSet, nameof(builder.SslCa)), exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(string.Format(MySql.Data.Resources.FilePathNotSet, nameof(builder.SslCa))));
     }
 
     [Test]
@@ -498,8 +498,8 @@ public void MissingSslCertConnectionOption()
       builder.SslCert = string.Empty;
       builder.SslMode = MySqlSslMode.VerifyFull;
       var exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(string.Format(MySql.Data.Resources.FilePathNotSet, nameof(builder.SslCert)), exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(string.Format(MySql.Data.Resources.FilePathNotSet, nameof(builder.SslCert))));
     }
 
     [Test]
@@ -512,8 +512,8 @@ public void MissingSslKeyConnectionOption()
       builder.SslKey = " ";
       builder.SslMode = MySqlSslMode.VerifyFull;
       var exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(string.Format(MySql.Data.Resources.FilePathNotSet, nameof(builder.SslKey)), exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(string.Format(MySql.Data.Resources.FilePathNotSet, nameof(builder.SslKey))));
     }
 
     [Test]
@@ -524,8 +524,8 @@ public void InvalidFileNameForSslCaConnectionOption()
       builder.SslCa = "C:\\certs\\ca.pema";
       builder.SslMode = MySqlSslMode.VerifyCA;
       var exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(MySql.Data.Resources.FileNotFound, exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(MySql.Data.Resources.FileNotFound));
     }
 
     [Test]
@@ -537,8 +537,8 @@ public void InvalidFileNameForSslCertConnectionOption()
       builder.SslCert = "C:\\certs\\client-cert";
       builder.SslMode = MySqlSslMode.VerifyFull;
       var exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(MySql.Data.Resources.FileNotFound, exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(MySql.Data.Resources.FileNotFound));
     }
 
     [Test]
@@ -551,8 +551,8 @@ public void InvalidFileNameForSslKeyConnectionOption()
       builder.SslKey = "file";
       builder.SslMode = MySqlSslMode.VerifyFull;
       var exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(MySql.Data.Resources.FileNotFound, exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(MySql.Data.Resources.FileNotFound));
     }
 
     [Test]
@@ -626,23 +626,23 @@ public void AttemptConnectionWithDummyPemCertificates()
       builder.SslCa = sslCa.Replace("ca.pem", "ca_dummy.pem");
       builder.SslMode = MySqlSslMode.VerifyCA;
       var exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(MySql.Data.Resources.FileIsNotACertificate, exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(MySql.Data.Resources.FileIsNotACertificate));
 
       builder.SslCa = sslCa;
       builder.SslCert = sslCert.Replace("client-cert.pem", "client-cert_dummy.pem");
       builder.SslMode = MySqlSslMode.VerifyFull;
       exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(MySql.Data.Resources.FileIsNotACertificate, exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(MySql.Data.Resources.FileIsNotACertificate));
 
       builder.SslCa = sslCa;
       builder.SslCert = sslCert;
       builder.SslKey = sslKey.Replace("client-key.pem", "client-key_dummy.pem");
       builder.SslMode = MySqlSslMode.VerifyFull;
       exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(MySql.Data.Resources.FileIsNotAKey, exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(MySql.Data.Resources.FileIsNotAKey));
     }
 
     [Test]
@@ -653,28 +653,28 @@ public void AttemptConnectionWitSwitchedPemCertificates()
       builder.SslCa = sslCert;
       builder.SslMode = MySqlSslMode.VerifyCA;
       var exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(MySql.Data.Resources.SslCertificateIsNotCA, exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(MySql.Data.Resources.SslCertificateIsNotCA));
 
       builder.SslCa = sslKey;
       builder.SslMode = MySqlSslMode.VerifyCA;
       exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(MySql.Data.Resources.FileIsNotACertificate, exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(MySql.Data.Resources.FileIsNotACertificate));
 
       builder.SslCa = sslCa;
       builder.SslCert = sslCa;
       builder.SslMode = MySqlSslMode.VerifyFull;
       exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(MySql.Data.Resources.InvalidSslCertificate, exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(MySql.Data.Resources.InvalidSslCertificate));
 
       builder.SslCert = sslCert;
       builder.SslKey = sslCa;
       builder.SslMode = MySqlSslMode.VerifyFull;
       exception = Assert.Throws<MySqlException>(() => MySQLX.GetSession(builder.ConnectionString));
-      Assert.AreEqual(MySql.Data.Resources.SslConnectionError, exception.Message);
-      Assert.AreEqual(MySql.Data.Resources.FileIsNotAKey, exception.InnerException.Message);
+      Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.SslConnectionError));
+      Assert.That(exception.InnerException.Message, Is.EqualTo(MySql.Data.Resources.FileIsNotAKey));
     }
 
     #endregion
@@ -693,9 +693,9 @@ public void PfxCertificateWithUri()
       connStr = ConnectionStringUri + $"?ssl-mode=Required&ssl-ca={clientPfx}&ssl-ca-pwd={sslCertificatePassword}";
       using (var c = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, c.InternalSession.SessionState);
+        Assert.That(c.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var res = ExecuteSQLStatement(c.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';")).FetchAll();
-        StringAssert.StartsWith("TLSv1", res[0][1].ToString());
+        Assert.That(res[0][1].ToString(), Does.StartWith("TLSv1"));
       }
     }
 
@@ -707,9 +707,9 @@ public void PfxCertificateWithConnectionString()
       var connStr = ConnectionString + $";ssl-mode=Required;ssl-ca={clientPfx};ssl-ca-pwd={sslCertificatePassword};";
       using (Session c = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, c.InternalSession.SessionState);
+        Assert.That(c.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var res = ExecuteSQLStatement(c.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';")).FetchAll();
-        StringAssert.StartsWith("TLSv1", res[0][1].ToString());
+        Assert.That(res[0][1].ToString(), Does.StartWith("TLSv1"));
       }
 
       //wrong certificate
@@ -733,13 +733,13 @@ public void ConnectUsingCertificateFileAndTlsVersionXplugin()
       using (var session1 = MySQLX.GetSession(builder.ConnectionString))
       {
         var result = session1.SQL("show variables like '%tls_version%'").Execute().FetchOne();
-        StringAssert.Contains("TLSv1", result[1].ToString());
+        Assert.That(result[1].ToString(), Does.Contain("TLSv1"));
 
         result = session1.SQL("show status like 'Mysqlx_ssl_cipher'").Execute().FetchOne();
-        Assert.True(result[1].ToString().Trim().Length > 0);
+        Assert.That(result[1].ToString().Trim().Length > 0);
 
         result = session1.SQL("show status like 'Mysqlx_ssl_version'").Execute().FetchOne();
-        StringAssert.AreEqualIgnoringCase("TLSv1.2", result[1].ToString());
+        Assert.That(result[1].ToString(), Is.EqualTo("TLSv1.2").IgnoreCase);
       }
     }
 
@@ -752,9 +752,9 @@ public void TlsVersionInConnectionStringXplugin(string tlsVersion)
       var connStr = ConnectionString + $";sslmode=Required;tls-version={tlsVersion}";
       using (var c = MySQLX.GetSession(connStr))
       {
-        Assert.AreEqual(SessionState.Open, c.InternalSession.SessionState);
+        Assert.That(c.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var res = c.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';").Execute().FetchAll();
-        StringAssert.AreEqualIgnoringCase(tlsVersion, res[0][1].ToString());
+        Assert.That(res[0][1].ToString(), Is.EqualTo(tlsVersion).IgnoreCase);
       }
     }
 
@@ -779,7 +779,7 @@ public void PemCertDifferentSSLmodes()
         {
           using (var session1 = MySQLX.GetSession(connStr))
           {
-            Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+            Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
         }
         else
@@ -798,9 +798,9 @@ public void PemCertDifferentSSLmodes()
             using (var session1 = MySQLX.GetSession(connStr))
             {
               var result = session1.SQL(CommandText1).Execute().FetchAll();
-              Assert.AreEqual(result[0][1].ToString(), result[0][1].ToString(), "Matching the Cipher");
+              Assert.That(result[0][1].ToString(), Is.EqualTo(result[0][1].ToString()), "Matching the Cipher");
               result = session1.SQL(CommandText2).Execute().FetchAll();
-              Assert.AreEqual(tls, result[0][1].ToString(), "Matching the TLS version");
+              Assert.That(result[0][1].ToString(), Is.EqualTo(tls), "Matching the TLS version");
             }
           }
         }
@@ -811,7 +811,7 @@ public void PemCertDifferentSSLmodes()
         {
           using (var session1 = MySQLX.GetSession(connStr))
           {
-            Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+            Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
         }
         else
@@ -830,9 +830,9 @@ public void PemCertDifferentSSLmodes()
             using (var session1 = MySQLX.GetSession(connStr))
             {
               var result = session1.SQL(CommandText1).Execute().FetchAll();
-              Assert.AreEqual(result[0][1].ToString(), result[0][1].ToString(), "Matching the Cipher");
+              Assert.That(result[0][1].ToString(), Is.EqualTo(result[0][1].ToString()), "Matching the Cipher");
               result = session1.SQL(CommandText2).Execute().FetchAll();
-              Assert.AreEqual(tls, result[0][1].ToString(), "Matching the TLS version");
+              Assert.That(result[0][1].ToString(), Is.EqualTo(tls), "Matching the TLS version");
             }
           }
         }
@@ -855,7 +855,7 @@ public void PemCertDifferentSSLmodes()
         {
           using (var session1 = MySQLX.GetSession(connStr))
           {
-            Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
+            Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
           }
         }
         else
@@ -874,9 +874,9 @@ public void PemCertDifferentSSLmodes()
             using (var session1 = MySQLX.GetSession(connObject))
             {
               var result = session1.SQL(CommandText1).Execute().FetchAll();
-              Assert.AreEqual(result[0][1].ToString(), result[0][1].ToString(), "Matching the Cipher");
+              Assert.That(result[0][1].ToString(), Is.EqualTo(result[0][1].ToString()), "Matching the Cipher");
               result = session1.SQL(CommandText2).Execute().FetchAll();
-              Assert.AreEqual(tls, result[0][1].ToString(), "Matching the TLS version");
+              Assert.That(result[0][1].ToString(), Is.EqualTo(tls), "Matching the TLS version");
             }
           }
         }
@@ -902,9 +902,9 @@ public void PemCertDifferentSSLmodes()
           using (var session1 = MySQLX.GetSession(conn.ConnectionString))
           {
             var result = session1.SQL(CommandText1).Execute().FetchAll();
-            Assert.AreEqual(result[0][1].ToString(), result[0][1].ToString(), "Matching the Cipher");
+            Assert.That(result[0][1].ToString(), Is.EqualTo(result[0][1].ToString()), "Matching the Cipher");
             result = session1.SQL(CommandText2).Execute().FetchAll();
-            Assert.AreEqual(tls, result[0][1].ToString(), "Matching the TLS version");
+            Assert.That(result[0][1].ToString(), Is.EqualTo(tls), "Matching the TLS version");
           }
         }
       }
@@ -1387,7 +1387,7 @@ public void SecurityTlsCheck()
         using (Session session1 = MySQLX.GetSession(conStrX + $";ssl-mode={mode};tls-version=TLSv1.2"))
         {
           var sess = session1.SQL("select variable_value from performance_schema.session_status where variable_name='mysqlx_ssl_version'").Execute().FetchOne()[0];
-          Assert.AreEqual("TLSv1.2", sess);
+          Assert.That(sess, Is.EqualTo("TLSv1.2"));
         }
 
         version = new string[] { "[TLSv1.1,TLSv1.2]", "[TLSv1,TLSv1.2]" };
@@ -1397,7 +1397,7 @@ public void SecurityTlsCheck()
           using (Session session1 = MySQLX.GetSession(conStrX + ";ssl-mode=" + mode + ";tls-version=" + version[i]))
           {
             var sess = session1.SQL("select variable_value from performance_schema.session_status where variable_name='mysqlx_ssl_version'").Execute().FetchOne()[0];
-            Assert.AreEqual(ver1Tls[i], sess);
+            Assert.That(sess, Is.EqualTo(ver1Tls[i]));
           }
         }
       }
@@ -1413,19 +1413,19 @@ public void Tlsv13Bug()
       using (session1 = MySQLX.GetSession(conStr + ";tls-version=TLSv1.3"))
       {
         var sess1 = session1.SQL("select variable_value from performance_schema.session_status where variable_name='mysqlx_ssl_version'").Execute().FetchOne()[0];
-        Assert.AreEqual("TLSv1.3", sess1);
+        Assert.That(sess1, Is.EqualTo("TLSv1.3"));
       }
 
       using (session1 = MySQLX.GetSession(conStr + ";tls-version=TLSv1.2"))
       {
         var sess1 = session1.SQL("select variable_value from performance_schema.session_status where variable_name='mysqlx_ssl_version'").Execute().FetchOne()[0];
-        Assert.AreEqual("TLSv1.2", sess1);
+        Assert.That(sess1, Is.EqualTo("TLSv1.2"));
       }
 
       using (session1 = MySQLX.GetSession(conStr + ";tls-version=TLSv1.2,TLSv1.3"))
       {
         var sess1 = session1.SQL("select variable_value from performance_schema.session_status where variable_name='mysqlx_ssl_version'").Execute().FetchOne()[0];
-        Assert.AreEqual("TLSv1.3", sess1);
+        Assert.That(sess1, Is.EqualTo("TLSv1.3"));
       }
     }
 
@@ -1443,7 +1443,7 @@ public void Tlsv13Linux()
 
         foreach (string tlsVersion in version)
         {
-          Assert.AreEqual(SessionState.Open, MySQLX.GetSession(conStr + ";ssl-mode=" + mode + ";tls-version=" + tlsVersion).InternalSession.SessionState);
+          Assert.That(MySQLX.GetSession(conStr + ";ssl-mode=" + mode + ";tls-version=" + tlsVersion).InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         }
 
         version = new string[] { "[TLSv1,TLSv1.3]", "[TLSv1.1,TLSv1.3]", "[TLSv1,TLSv1.2,TLSv1.3]", "[TLSv1.2,TLSv1.3]", "[TLSv1,TLSv1.1,TLSv1.2,TLSv1.3]" };
@@ -1453,7 +1453,7 @@ public void Tlsv13Linux()
           using (var session1 = MySQLX.GetSession(conStr + ";ssl-mode=" + mode + ";tls-version=" + version[i]))
           {
             var sess = session1.SQL("select variable_value from performance_schema.session_status where variable_name='mysqlx_ssl_version'").Execute().FetchOne()[0];
-            Assert.True(sess.ToString().Contains("TLSv1"));
+            Assert.That(sess.ToString().Contains("TLSv1"));
           }
         }
       }
@@ -1468,9 +1468,9 @@ private void AssertTlsConnection(string inputString)
       using (var session1 = MySQLX.GetSession(inputString))
       {
         var result = session1.SQL(CommandText1).Execute().FetchAll();
-        Assert.AreEqual(cipher, result[0][1].ToString(), "Matching the Cipher");
+        Assert.That(result[0][1].ToString(), Is.EqualTo(cipher), "Matching the Cipher");
         result = session1.SQL(CommandText2).Execute().FetchAll();
-        Assert.AreEqual(tls, result[0][1].ToString(), "Matching the TLS version");
+        Assert.That(result[0][1].ToString(), Is.EqualTo(tls), "Matching the TLS version");
       }
     }
 
@@ -1483,9 +1483,9 @@ private void AssertTlsConnection(object inputObject)
       using (var session1 = MySQLX.GetSession(inputObject))
       {
         var result = session1.SQL(CommandText1).Execute().FetchAll();
-        Assert.AreEqual(cipher, result[0][1].ToString(), "Matching the Cipher");
+        Assert.That(result[0][1].ToString(), Is.EqualTo(cipher), "Matching the Cipher");
         result = session1.SQL(CommandText2).Execute().FetchAll();
-        Assert.AreEqual(tls, result[0][1].ToString(), "Matching the TLS version");
+        Assert.That(result[0][1].ToString(), Is.EqualTo(tls), "Matching the TLS version");
       }
     }
 
@@ -1506,8 +1506,8 @@ public void SslOptionsCombinedWhenDisabled(MySqlSslMode sslMode, string sslOptio
       using var session = MySQLX.GetSession(connStr);
       var encryption = session.SQL("SHOW SESSION STATUS LIKE 'mysqlx_ssl_cipher'").Execute().FetchAll()[0][1].ToString();
 
-      Assert.IsEmpty(encryption);
-      Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+      Assert.That(encryption, Is.Empty);
+      Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
 
       // ConnectionString Uri
       var connStrUri = ConnectionStringUri + $"?ssl-mode={sslMode}&{sslOption}";
@@ -1515,8 +1515,8 @@ public void SslOptionsCombinedWhenDisabled(MySqlSslMode sslMode, string sslOptio
       using var sessionUri = MySQLX.GetSession(connStrUri);
       encryption = sessionUri.SQL("SHOW SESSION STATUS LIKE 'mysqlx_ssl_cipher'").Execute().FetchAll()[0][1].ToString();
 
-      Assert.IsEmpty(encryption);
-      Assert.AreEqual(SessionState.Open, sessionUri.InternalSession.SessionState);
+      Assert.That(encryption, Is.Empty);
+      Assert.That(sessionUri.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
     }
 
     [Test]
@@ -1527,16 +1527,16 @@ public void SslRequiredAndDisabled()
       using var sessionUriDisabled = MySQLX.GetSession(connStrUri);
       var encryption = sessionUriDisabled.SQL("SHOW SESSION STATUS LIKE 'mysqlx_ssl_cipher'").Execute().FetchAll()[0][1].ToString();
 
-      Assert.IsEmpty(encryption);
-      Assert.AreEqual(SessionState.Open, sessionUriDisabled.InternalSession.SessionState);
+      Assert.That(encryption, Is.Empty);
+      Assert.That(sessionUriDisabled.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
 
       connStrUri = ConnectionStringUri + $"?ssl-mode={MySqlSslMode.Disabled}&ssl-mode={MySqlSslMode.Required}";
 
       using var sessionUriRequired = MySQLX.GetSession(connStrUri);
       encryption = sessionUriRequired.SQL("SHOW SESSION STATUS LIKE 'mysqlx_ssl_cipher'").Execute().FetchAll()[0][1].ToString();
 
-      Assert.IsNotEmpty(encryption);
-      Assert.AreEqual(SessionState.Open, sessionUriRequired.InternalSession.SessionState);
+      Assert.That(encryption, Is.Not.Empty);
+      Assert.That(sessionUriRequired.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
     }
   }
 }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs
index 092aa057e..6045bd692 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs
@@ -61,17 +61,17 @@ public void Commit()
       coll.Session.StartTransaction();
 
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       // now roll it back
       coll.Session.Commit();
 
       var foundDocs = ExecuteFindStatement(coll.Find());
-      Assert.True(foundDocs.Next());
-      Assert.True(foundDocs.Next());
-      Assert.True(foundDocs.Next());
-      Assert.True(foundDocs.Next());
-      Assert.False(foundDocs.Next());
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Next());
+      Assert.That(foundDocs.Next(), Is.False);
     }
 
     [Test]
@@ -90,13 +90,13 @@ public void Rollback()
       coll.Session.StartTransaction();
 
       Result r = ExecuteAddStatement(coll.Add(docs));
-      Assert.AreEqual(4, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(4));
 
       // now roll it back
       coll.Session.Rollback();
 
       var foundDocs = ExecuteFindStatement(coll.Find());
-      Assert.False(foundDocs.Next());
+      Assert.That(foundDocs.Next(), Is.False);
     }
 
     #region Savepoints
@@ -109,7 +109,7 @@ public void CreateUnnamedSavepoint()
         session.StartTransaction();
 
         string spName = session.SetSavepoint();
-        Assert.False(string.IsNullOrWhiteSpace(spName));
+        Assert.That(string.IsNullOrWhiteSpace(spName), Is.False);
 
         session.Rollback();
       }
@@ -129,7 +129,7 @@ public void RollbackToSavepoint()
         ExecuteAddStatement(coll.Add("{ \"test\": \"test\" }"));
         var sp = session.SetSavepoint();
         ExecuteAddStatement(coll.Add("{ \"test\": \"test\" }"));
-        Assert.AreEqual(2, ExecuteFindStatement(coll.Find()).FetchAll().Count);
+        Assert.That(ExecuteFindStatement(coll.Find()).FetchAll().Count, Is.EqualTo(2));
         session.RollbackTo(sp);
         Assert.That(ExecuteFindStatement(coll.Find()).FetchAll(), Has.One.Items);
 
@@ -147,9 +147,9 @@ public void ReleaseSavepoint()
         ExecuteAddStatement(coll.Add("{ \"test\": \"test\" }"));
         var sp = sessionTest.SetSavepoint();
         ExecuteAddStatement(coll.Add("{ \"test2\": \"test2\" }"));
-        Assert.AreEqual(2, ExecuteFindStatement(coll.Find()).FetchAll().Count);
+        Assert.That(ExecuteFindStatement(coll.Find()).FetchAll().Count, Is.EqualTo(2));
         sessionTest.ReleaseSavepoint(sp);
-        Assert.AreEqual(2, ExecuteFindStatement(coll.Find()).FetchAll().Count);
+        Assert.That(ExecuteFindStatement(coll.Find()).FetchAll().Count, Is.EqualTo(2));
         sessionTest.Rollback();
       }
     }
@@ -162,7 +162,7 @@ public void CreateNamedSavepoint()
         session.StartTransaction();
 
         string spName = session.SetSavepoint("mySavedPoint");
-        Assert.False(string.IsNullOrWhiteSpace(spName));
+        Assert.That(string.IsNullOrWhiteSpace(spName), Is.False);
 
         session.Rollback();
       }
@@ -180,7 +180,7 @@ public void RollbackToNamedSavepoint()
         ExecuteAddStatement(coll.Add("{ \"test\": \"test\" }"));
         var sp = session.SetSavepoint("mySavedPoint");
         ExecuteAddStatement(coll.Add("{ \"test2\": \"test2\" }"));
-        Assert.AreEqual(2, ExecuteFindStatement(coll.Find()).FetchAll().Count);
+        Assert.That(ExecuteFindStatement(coll.Find()).FetchAll().Count, Is.EqualTo(2));
         session.RollbackTo(sp);
         Assert.That(ExecuteFindStatement(coll.Find()).FetchAll(), Has.One.Items);
         session.Rollback();
@@ -199,9 +199,9 @@ public void ReleaseNamedSavepoint()
         ExecuteAddStatement(coll.Add("{ \"test\": \"test\" }"));
         var sp = session.SetSavepoint("mySavedPoint");
         ExecuteAddStatement(coll.Add("{ \"test2\": \"test2\" }"));
-        Assert.AreEqual(2, ExecuteFindStatement(coll.Find()).FetchAll().Count);
+        Assert.That(ExecuteFindStatement(coll.Find()).FetchAll().Count, Is.EqualTo(2));
         session.ReleaseSavepoint(sp);
-        Assert.AreEqual(2, ExecuteFindStatement(coll.Find()).FetchAll().Count);
+        Assert.That(ExecuteFindStatement(coll.Find()).FetchAll().Count, Is.EqualTo(2));
         session.Rollback();
       }
     }
@@ -214,10 +214,10 @@ public void NonExistentSavepoint()
         session.StartTransaction();
 
         Exception exception = Assert.Throws<MySqlException>(() => session.RollbackTo("nonExistentSavePoint"));
-        Assert.AreEqual("SAVEPOINT nonExistentSavePoint does not exist", exception.Message);
+        Assert.That(exception.Message, Is.EqualTo("SAVEPOINT nonExistentSavePoint does not exist"));
 
         exception = Assert.Throws<MySqlException>(() => session.ReleaseSavepoint("nonExistentSavePoint"));
-        Assert.AreEqual("SAVEPOINT nonExistentSavePoint does not exist", exception.Message);
+        Assert.That(exception.Message, Is.EqualTo("SAVEPOINT nonExistentSavePoint does not exist"));
 
         session.Rollback();
       }
@@ -232,17 +232,17 @@ public void CreateSavepointWithWeirdNames()
         session.StartTransaction();
 
         Exception ex = Assert.Throws<MySqlException>(() => session.SetSavepoint(""));
-        StringAssert.StartsWith(errorMessage, ex.Message);
+        Assert.That(ex.Message, Does.StartWith(errorMessage));
         ex = Assert.Throws<MySqlException>(() => session.SetSavepoint(" "));
-        StringAssert.StartsWith(errorMessage, ex.Message);
+        Assert.That(ex.Message, Does.StartWith(errorMessage));
         ex = Assert.Throws<MySqlException>(() => session.SetSavepoint(null));
-        StringAssert.StartsWith(errorMessage, ex.Message);
+        Assert.That(ex.Message, Does.StartWith(errorMessage));
         ex = Assert.Throws<MySqlException>(() => session.SetSavepoint("-"));
-        StringAssert.StartsWith(errorMessage, ex.Message);
+        Assert.That(ex.Message, Does.StartWith(errorMessage));
         ex = Assert.Throws<MySqlException>(() => session.SetSavepoint("mysp+"));
-        StringAssert.StartsWith(errorMessage, ex.Message);
+        Assert.That(ex.Message, Does.StartWith(errorMessage));
         ex = Assert.Throws<MySqlException>(() => session.SetSavepoint("3306"));
-        StringAssert.StartsWith(errorMessage, ex.Message);
+        Assert.That(ex.Message, Does.StartWith(errorMessage));
 
         var sp = session.SetSavepoint("_");
         session.RollbackTo(sp);
@@ -272,7 +272,7 @@ public void OverwriteSavepoint()
         ExecuteAddStatement(coll.Add("{ \"test4\": \"test4\" }"));
         sp = session.SetSavepoint("mySP");
         session.RollbackTo(sp);
-        Assert.AreEqual(4, ExecuteFindStatement(coll.Find()).FetchAll().Count);
+        Assert.That(ExecuteFindStatement(coll.Find()).FetchAll().Count, Is.EqualTo(4));
 
         session.Rollback();
       }
@@ -288,7 +288,7 @@ public void MultipleReleasesForSavepoint()
         var sp = session.SetSavepoint("mySP");
         session.ReleaseSavepoint(sp);
         Exception exception = Assert.Throws<MySqlException>(() => session.ReleaseSavepoint(sp));
-        Assert.AreEqual(string.Format("SAVEPOINT {0} does not exist", sp), exception.Message);
+        Assert.That(exception.Message, Is.EqualTo(string.Format("SAVEPOINT {0} does not exist", sp)));
 
         session.Rollback();
       }
@@ -305,9 +305,9 @@ public void RollbackAndReleaseAfterTransactionCommit()
         ExecuteAddStatement(coll.Add("{ \"test\": \"test\" }"));
         sessionTest.Commit();
         Exception exception = Assert.Throws<MySqlException>(() => sessionTest.RollbackTo(sp));
-        Assert.AreEqual(string.Format("SAVEPOINT {0} does not exist", sp), exception.Message);
+        Assert.That(exception.Message, Is.EqualTo(string.Format("SAVEPOINT {0} does not exist", sp)));
         exception = Assert.Throws<MySqlException>(() => sessionTest.ReleaseSavepoint(sp));
-        Assert.AreEqual(string.Format("SAVEPOINT {0} does not exist", sp), exception.Message);
+        Assert.That(exception.Message, Is.EqualTo(string.Format("SAVEPOINT {0} does not exist", sp)));
       }
     }
 
@@ -325,10 +325,10 @@ public void RollbackAndReleaseAfterTransactionRollback()
         sessionTest.Rollback();
 
         Exception exception = Assert.Throws<MySqlException>(() => sessionTest.RollbackTo(sp));
-        Assert.AreEqual(string.Format("SAVEPOINT {0} does not exist", sp), exception.Message);
+        Assert.That(exception.Message, Is.EqualTo(string.Format("SAVEPOINT {0} does not exist", sp)));
 
         exception = Assert.Throws<MySqlException>(() => sessionTest.ReleaseSavepoint(sp));
-        Assert.AreEqual(string.Format("SAVEPOINT {0} does not exist", sp), exception.Message);
+        Assert.That(exception.Message, Is.EqualTo(string.Format("SAVEPOINT {0} does not exist", sp)));
       }
     }
 
@@ -369,7 +369,7 @@ public void CommitValidWarning()
         sessionPlain.StartTransaction();
         table.Insert().Values(5).Execute();
         sessionPlain.Commit();
-        Assert.AreEqual(1, table.Count());
+        Assert.That(table.Count(), Is.EqualTo(1));
       }
     }
 
@@ -388,9 +388,9 @@ public void CommitInvalidWarning()
         sessionPlain.StartTransaction();
         Assert.Throws<MySqlException>(() => sessionPlain.GetSchema("test").GetTable("temp").Insert().Values("abcdef").Execute());
         sessionPlain.Commit();
-        Assert.AreEqual(0, table.Count());
+        Assert.That(table.Count(), Is.EqualTo(0));
         var warnings = sessionPlain.SQL("DROP TABLE IF EXISTS temp1").Execute().Warnings;
-        Assert.IsTrue(warnings.Count > 0);
+        Assert.That(warnings.Count > 0);
         sessionPlain.Commit();
       }
     }
@@ -409,8 +409,8 @@ public void RollbackValidWarning()
         sessionPlain.StartTransaction();
         var res = table.Insert().Values(5).Execute();
         sessionPlain.Rollback();
-        Assert.AreEqual(0, table.Count());
-        Assert.AreEqual(0, res.Warnings.Count);
+        Assert.That(table.Count(), Is.EqualTo(0));
+        Assert.That(res.Warnings.Count, Is.EqualTo(0));
       }
     }
 
@@ -430,9 +430,9 @@ public void RollbackInvalidWarning()
         sessionPlain.StartTransaction();
         Assert.Throws<MySqlException>(() => sessionPlain.GetSchema("test").GetTable("temp").Insert().Values("abcdef").Execute());
         sessionPlain.Rollback();
-        Assert.AreEqual(0, table.Count());
+        Assert.That(table.Count(), Is.EqualTo(0));
         var res = sessionPlain.SQL("DROP TABLE IF EXISTS temp1").Execute();
-        Assert.IsTrue(res.Warnings.Count > 0);
+        Assert.That(res.Warnings.Count > 0);
       }
     }
 
@@ -467,21 +467,21 @@ public void CommitRollbackInvalidWarning()
       coll.Session.StartTransaction();
 
       Result r = coll.Add(docs1).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
 
       r = coll.Add(docs2).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount);
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2));
 
       r = coll.Add(docs3).Execute();
       Assert.Throws<MySqlException>(() => coll.Add(docs3).Execute());
       coll.Session.Commit();
-      Assert.AreEqual(6, coll.Count());
+      Assert.That(coll.Count(), Is.EqualTo(6));
       // now Rollback
       coll.Session.Rollback();
-      Assert.AreEqual(6, coll.Count());
+      Assert.That(coll.Count(), Is.EqualTo(6));
 
       var foundDocs = coll.Find().Execute();
-      Assert.IsNotNull(foundDocs);
+      Assert.That(foundDocs, Is.Not.Null);
     }
 
     [Test, Description("MySQLX plugin Warnings")]
@@ -494,12 +494,12 @@ public void Warnings()
         Collection coll = CreateCollection("test");
 
         Result r = coll.Add("{ \"foo\": 1 }").Execute();
-        Assert.AreEqual(1, r.AffectedItemsCount);
-        Assert.AreEqual(1, coll.Count());
+        Assert.That(r.AffectedItemsCount, Is.EqualTo(1));
+        Assert.That(coll.Count(), Is.EqualTo(1));
         r = coll.Add("{ \"fool\": 2 }").Execute();
-        Assert.AreEqual(0, r.Warnings.Count);
+        Assert.That(r.Warnings.Count, Is.EqualTo(0));
         r = coll.Add("{ \"fool\": 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 }").Execute();
-        Assert.AreEqual(0, r.Warnings.Count);
+        Assert.That(r.Warnings.Count, Is.EqualTo(0));
 
         sessionTest.SQL("use test").Execute();
         sessionTest.SQL("CREATE TABLE nontrac(id INT primary key) ENGINE=MyISAM;").Execute();
@@ -511,19 +511,19 @@ public void Warnings()
         sessionTest.StartTransaction();
 
         var res = sessionTest.SQL("drop table if exists t1, t2").Execute();
-        Assert.AreEqual(2, res.Warnings.Count);
-        Assert.AreEqual(1051, res.Warnings[0].Code);
+        Assert.That(res.Warnings.Count, Is.EqualTo(2));
+        Assert.That(res.Warnings[0].Code, Is.EqualTo(1051));
 
-        Assert.AreEqual(1051, res.Warnings[1].Code);
+        Assert.That(res.Warnings[1].Code, Is.EqualTo(1051));
 
         res = sessionTest.SQL("create table t1 (a int) engine=innodb").Execute();
-        Assert.AreEqual(0, res.Warnings.Count);
+        Assert.That(res.Warnings.Count, Is.EqualTo(0));
         res = sessionTest.SQL("create table t2 (a int) engine=myisam").Execute();
-        Assert.AreEqual(0, res.Warnings.Count);
+        Assert.That(res.Warnings.Count, Is.EqualTo(0));
         res = sessionTest.SQL("insert into t1 values(1)").Execute();
-        Assert.AreEqual(0, res.Warnings.Count);
+        Assert.That(res.Warnings.Count, Is.EqualTo(0));
         res = sessionTest.SQL("insert into t2 select * from t1").Execute();
-        Assert.AreEqual(1, res.Warnings.Count);
+        Assert.That(res.Warnings.Count, Is.EqualTo(1));
         sessionTest.Commit();
 
       }
@@ -562,7 +562,7 @@ public void RollbackToSameSavepoint()
       session.RollbackTo(sp);
       var doc = col.Find().Execute();
       var docs = doc.FetchAll().Count();
-      Assert.AreEqual(2, docs);
+      Assert.That(docs, Is.EqualTo(2));
     }
 
 
@@ -624,7 +624,7 @@ public void MultipleSavepointsAndRollback(string savePoint1, string savePoint2)
       session.RollbackTo(sp);
       var doc = col.Find().Execute();
       var docs = doc.FetchAll().Count();
-      Assert.AreEqual(2, docs);
+      Assert.That(docs, Is.EqualTo(2));
     }
 
     [Test, Description("Test creating a savepoint without starting a transaction")]
@@ -676,7 +676,7 @@ public void ValidateSavepointsReleased()
 
       var doc = col.Find().Execute();
       var docs = doc.FetchAll().Count();
-      Assert.AreEqual(4, docs);
+      Assert.That(docs, Is.EqualTo(4));
 
     }
 
@@ -706,7 +706,7 @@ public void NestedTransactions()
       session.Rollback();
       var doc = col.Find().Execute();
       var docs = doc.FetchAll().Count();
-      Assert.AreEqual(2, docs);
+      Assert.That(docs, Is.EqualTo(2));
     }
 
     [Test, Description("Test the behaviour of Savepoints created immediately after one another")]
@@ -726,7 +726,7 @@ public void SavepointsCreatedImmediately()
       session.RollbackTo(sp);
       var doc = col.Find().Execute();
       var docs = doc.FetchAll().Count();
-      Assert.AreEqual(2, docs);
+      Assert.That(docs, Is.EqualTo(2));
     }
 
     [Test, Description("Test MySQLX plugin Commit After Commit")]
@@ -762,33 +762,33 @@ public void CommitAfterCommit()
       coll.Session.StartTransaction();
 
       Result r = coll.Add(docs1).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       r = coll.Add(docs2).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       r = coll.Add(docs3).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       // now Commit
       coll.Session.Commit();
       // start the transaction
       coll.Session.StartTransaction();
       r = coll.Add(docs4).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
       // now Commit Again
       coll.Session.Commit();
 
       var foundDocs = coll.Find().Execute();
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(false, foundDocs.Next(), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(false), "Matching");
 
     }
 
@@ -819,19 +819,19 @@ public void RollBackMultiple()
       coll.Session.StartTransaction();
 
       Result r = coll.Add(docs1).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       r = coll.Add(docs2).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       r = coll.Add(docs3).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       // now Rollback
       coll.Session.Rollback();
 
       var foundDocs = coll.Find().Execute();
-      Assert.AreEqual(false, foundDocs.Next(), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(false), "Matching");
 
     }
 
@@ -869,13 +869,13 @@ public void RollBackAfterRollBack()
 
       Result r = coll.Add(docs1).Execute();
       //WL11843-Core API v1 alignment Changes
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       r = coll.Add(docs2).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       r = coll.Add(docs3).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       // now Rollback
       coll.Session.Rollback();
@@ -884,13 +884,13 @@ public void RollBackAfterRollBack()
       coll.Session.StartTransaction();
 
       r = coll.Add(docs4).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       // now Rollback Again
       coll.Session.Rollback();
 
       var foundDocs = coll.Find().Execute();
-      Assert.AreEqual(false, foundDocs.Next(), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(false), "Matching");
 
     }
 
@@ -922,13 +922,13 @@ public void CommitRollBack()
 
       Result r = coll.Add(docs1).Execute();
       //WL11843-Core API v1 alignment Changes
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       r = coll.Add(docs2).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       r = coll.Add(docs3).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       //now Commit
       coll.Session.Commit();
@@ -936,13 +936,13 @@ public void CommitRollBack()
       coll.Session.Rollback();
 
       var foundDocs = coll.Find().Execute();
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(false, foundDocs.Next(), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(false), "Matching");
 
     }
 
@@ -972,22 +972,22 @@ public void RollBackCommit()
       // start the transaction
       coll.Session.StartTransaction();
       Result r = coll.Add(docs1).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
 
       // now Rollback
       coll.Session.Rollback();
       r = coll.Add(docs2).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
       r = coll.Add(docs3).Execute();
-      Assert.AreEqual(2, r.AffectedItemsCount, "Matching");
+      Assert.That(r.AffectedItemsCount, Is.EqualTo(2), "Matching");
       //now Commit
       coll.Session.Commit();
       var foundDocs = coll.Find().Execute();
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(true, foundDocs.Next(), "Matching");
-      Assert.AreEqual(false, foundDocs.Next(), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(true), "Matching");
+      Assert.That(foundDocs.Next(), Is.EqualTo(false), "Matching");
 
     }
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs
index 680642278..17c083be1 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs
@@ -52,14 +52,14 @@ public void ConnectionWithUriConnectionString()
 
       using (var session = MySQLX.GetSession("mysqlx://root:@" + defaultUnixSocket + "?protocol=unix&sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession("mysqlx://root:@" + defaultUnixSocket.Replace("/", "%2F") + "?protocol=unix&sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
     }
 
@@ -71,8 +71,8 @@ public void ConnectionWithUriConnectionStringIncludingSchema()
 
       using (var session = MySQLX.GetSession($"mysqlx://root:@({defaultUnixSocket})/mysql?protocol=unix&sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
     }
 
@@ -84,14 +84,14 @@ public void ConnectionWithParenthesisEnclosedSockets()
 
       using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@({defaultUnixSocket})?protocol=unix&sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession($"server=({defaultUnixSocket});uid={RootUser};protocol=unix;sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession(new
@@ -102,8 +102,8 @@ public void ConnectionWithParenthesisEnclosedSockets()
         sslmode = MySqlSslMode.Disabled
       }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
     }
 
@@ -115,8 +115,8 @@ public void ConnectionWithBasicConnectionString()
 
       using (var session = MySQLX.GetSession($"server={defaultUnixSocket};uid={RootUser};protocol=unixsocket;sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
     }
 
@@ -134,8 +134,8 @@ public void ConnectionWithAnonymousObject()
         sslmode = MySqlSslMode.Disabled
       }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
     }
 
@@ -156,50 +156,50 @@ public void Failover()
 
       using (var session = MySQLX.GetSession($"server=/tmp/mysql.sock1, (/tmp/mysql.sock2) ,(%2Ftmp%2Fmysql.sock3) ,{defaultUnixSocket};uid={RootUser};protocol=unix;sslmode=none;"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession($"server=(address=/tmp/mysql.sock1, priority=100),(address=(/tmp/mysql.sock2),priority=99),(address=(%2tmp%2mysql.sock3),priority=98),(address={defaultUnixSocket},priority=97);uid={RootUser};protocol=unix;sslmode=none;"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession($"server=(address={defaultUnixSocket},priority=100);uid={RootUser};protocol=unix;sslmode=none;"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession($"server=(address=({defaultUnixSocket}),priority=100);uid={RootUser};protocol=unix;sslmode=none;"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@[./tmp/mysql.sock, (../tmp/mysql.sock) ,(%2Ftmpsocket%2Fmysql.sock) , {defaultUnixSocket}]?protocol=unix&sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@[(address=./tmp/mysql.sock,priority=100),(address=(../tmp/mysql.sock),priority=99),(address=(%2tmpsocket%2mysql.sock),priority=98),(address={defaultUnixSocket},priority=97)]?protocol=unix&sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@[(address={defaultUnixSocket},priority=100)]?protocol=unix&sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@[(address=({defaultUnixSocket}),priority=100)]?protocol=unix&sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession(new
@@ -210,8 +210,8 @@ public void Failover()
         sslmode = MySqlSslMode.Disabled
       }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession(new
@@ -222,8 +222,8 @@ public void Failover()
         sslmode = MySqlSslMode.Disabled
       }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession(new
@@ -234,8 +234,8 @@ public void Failover()
         sslmode = MySqlSslMode.Disabled
       }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
       using (var session = MySQLX.GetSession(new
@@ -246,8 +246,8 @@ public void Failover()
         sslmode = MySqlSslMode.Disabled
       }))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(defaultUnixSocket, session.Settings.Server);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
     }
   }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs b/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
index 4cd927b21..24ae47b85 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
@@ -57,18 +57,18 @@ public void DefaultAuthNullPlugin()
       connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password}";
       using (var session1 = MySQLX.GetSession(connectionString))
       {
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
         var result = session1.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';").Execute().FetchAll();
-        Assert.True(result[0][1].ToString().Contains("TLSv1"));
+        Assert.That(result[0][1].ToString().Contains("TLSv1"));
       }
 
       connectionString = connectionString + ";sslmode=none;";
       using (var session1 = MySQLX.GetSession(connectionString))
-        Assert.AreEqual(defaultAuthPlugin == "mysql_native_password" ? MySqlAuthenticationMode.MYSQL41 : MySqlAuthenticationMode.SHA256_MEMORY, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(defaultAuthPlugin == "mysql_native_password" ? MySqlAuthenticationMode.MYSQL41 : MySqlAuthenticationMode.SHA256_MEMORY));
 
       connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password};ssl-mode=VerifyCA;ssl-ca={sslCa};ssl-ca-pwd=pass;";
       using (var session1 = MySQLX.GetSession(connectionString))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       //invalid values
       connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password};ssl-mode=required;auth=shaa256memory";
@@ -79,21 +79,21 @@ public void DefaultAuthNullPlugin()
           builder.Server + ":" + XPort;
       using (var session1 = MySQLX.GetSession(connectionStringUri))
       {
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
         var result = session1.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';").Execute().FetchAll();
-        Assert.True(result[0][1].ToString().Contains("TLSv1"));
+        Assert.That(result[0][1].ToString().Contains("TLSv1"));
       }
 
       connectionStringUri = connectionStringUri + "?sslmode=none";
       using (var session1 = MySQLX.GetSession(connectionStringUri))
-        Assert.AreEqual(defaultAuthPlugin == "mysql_native_password" ? MySqlAuthenticationMode.MYSQL41 : MySqlAuthenticationMode.SHA256_MEMORY, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(defaultAuthPlugin == "mysql_native_password" ? MySqlAuthenticationMode.MYSQL41 : MySqlAuthenticationMode.SHA256_MEMORY));
 
       //Anonymous Object
       using (var session1 = MySQLX.GetSession(new { server = builder.Server, port = XPort, user = builder.UserID, password = builder.Password }))
       {
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
         var result = session1.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';").Execute().FetchAll();
-        Assert.True(result[0][1].ToString().Contains("TLSv1"));
+        Assert.That(result[0][1].ToString().Contains("TLSv1"));
       }
 
       using (var session1 = MySQLX.GetSession(
@@ -105,32 +105,32 @@ public void DefaultAuthNullPlugin()
         sslmode = MySqlSslMode.Disabled,
         password = builder.Password
       }))
-        Assert.AreEqual(defaultAuthPlugin == "mysql_native_password" ? MySqlAuthenticationMode.MYSQL41 : MySqlAuthenticationMode.SHA256_MEMORY, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(defaultAuthPlugin == "mysql_native_password" ? MySqlAuthenticationMode.MYSQL41 : MySqlAuthenticationMode.SHA256_MEMORY));
 
       ExecuteSQL("flush privileges");
       connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password};ssl-mode=none";
       if (defaultAuthPlugin == "mysql_native_password")
-        Assert.NotNull(MySQLX.GetSession(connectionString));
+        Assert.That(MySQLX.GetSession(connectionString), Is.Not.Null);
       else
         Assert.Throws<MySqlException>(() => MySQLX.GetSession(connectionString));
 
       //URI
       connectionStringUri = $"mysqlx://{builder.UserID}:{builder.Password}@{builder.Server}:{XPort}?sslmode=none";
       if (defaultAuthPlugin == "mysql_native_password")
-        Assert.NotNull(MySQLX.GetSession(connectionStringUri));
+        Assert.That(MySQLX.GetSession(connectionStringUri), Is.Not.Null);
       else
         Assert.Throws<MySqlException>(() => MySQLX.GetSession(connectionStringUri));
 
       //Anonymous Object
       if (defaultAuthPlugin == "mysql_native_password")
-        Assert.NotNull(MySQLX.GetSession(new
+        Assert.That(MySQLX.GetSession(new
         {
           server = Host,
           port = XPort,
           user = builder.UserID,
           sslmode = MySqlSslMode.Disabled,
           password = builder.Password
-        }));
+        }), Is.Not.Null);
       else
         Assert.Throws<MySqlException>(() => MySQLX.GetSession(new
         {
@@ -211,29 +211,29 @@ public void MySqlNativePlugin()
       //Connection String
       connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password}";
       using (var session1 = MySQLX.GetSession(connectionString))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       connectionString += ";ssl-mode=VerifyCA;ssl-ca=" + sslCa + ";ssl-ca-pwd=pass;";
       using (var session1 = MySQLX.GetSession(connectionString))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password};ssl-mode=none";
       using (var session1 = MySQLX.GetSession(connectionString))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password};ssl-mode=Required;ssl-ca={sslCa};ssl-ca-pwd=pass;";
       using (var session1 = MySQLX.GetSession(connectionString))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       //URI
       ExecuteSQL("flush privileges");
       connectionStringUri = $"mysqlx://{builder.UserID}:{builder.Password}@{builder.Server}:{XPort}";
       using (var session1 = MySQLX.GetSession(connectionStringUri))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       connectionStringUri = connectionStringUri + "?ssl-mode=none";
       using (var session1 = MySQLX.GetSession(connectionStringUri))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       //Anonymous Object
       ExecuteSQL("flush privileges");
@@ -244,7 +244,7 @@ public void MySqlNativePlugin()
         user = builder.UserID,
         password = builder.Password
       }))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       using (var session1 = MySQLX.GetSession(new
       {
@@ -254,7 +254,7 @@ public void MySqlNativePlugin()
         sslmode = MySqlSslMode.Disabled,
         password = builder.Password
       }))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
     }
 
     [Test]
@@ -274,14 +274,14 @@ public void ConnectUsingMySQL41Auth()
 
       using (var session = MySQLX.GetSession(connectionStringUri + "?auth=MySQL41"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session.Settings.Auth);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
       }
 
       using (var session = MySQLX.GetSession(connectionStringUri + "?auth=mysql41&sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session.Settings.Auth);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
       }
     }
 
@@ -300,17 +300,17 @@ public void DefaultAuth()
       // Default to PLAIN when TLS is enabled.
       using (var session = MySQLX.GetSession(connString))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session.Settings.Auth);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
         var result = ExecuteSQLStatement(session.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';")).FetchAll();
-        StringAssert.StartsWith("TLSv1", result[0][1].ToString());
+        Assert.That(result[0][1].ToString(), Does.StartWith("TLSv1"));
       }
 
       // Default to SHA256_MEMORY when TLS is not enabled.
       using (var session = MySQLX.GetSession(connString + "?sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(MySqlAuthenticationMode.SHA256_MEMORY, session.Settings.Auth);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.SHA256_MEMORY));
       }
     }
 
@@ -322,16 +322,16 @@ public void ConnectUsingSha256Memory()
 
       using (var session = MySQLX.GetSession(ConnectionStringUri + "?auth=SHA256_MEMORY"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(MySqlAuthenticationMode.SHA256_MEMORY, session.Settings.Auth);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.SHA256_MEMORY));
         var result = session.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';").Execute().FetchAll();
-        Assert.True(result[0][1].ToString().Contains("TLSv1"));
+        Assert.That(result[0][1].ToString().Contains("TLSv1"));
       }
 
       using (var session = MySQLX.GetSession(ConnectionStringUri + "?auth=SHA256_MEMORY&sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(MySqlAuthenticationMode.SHA256_MEMORY, session.Settings.Auth);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.SHA256_MEMORY));
       }
 
       using (var session1 = MySQLX.GetSession(
@@ -345,8 +345,8 @@ public void ConnectUsingSha256Memory()
           auth = MySqlAuthenticationMode.SHA256_MEMORY
         }))
       {
-        Assert.AreEqual(SessionState.Open, session1.InternalSession.SessionState);
-        Assert.AreEqual(MySqlAuthenticationMode.SHA256_MEMORY, session1.Settings.Auth);
+        Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.SHA256_MEMORY));
       }
 
       //Exceptions
@@ -433,31 +433,31 @@ public void NativeAuthValidAndInvalidConnection()
       var cs = $"server={Host};user={user};port={XPort};password={pwd}";
       //Connection String
       using (var session1 = MySQLX.GetSession(ConnectionString))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       using (var session1 = MySQLX.GetSession(cs + ";auth=mysql41"))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(cs + ";auth=mysql41;ssl-mode=none"))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(cs + ";auth=mysql41;ssl-mode=Required"))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(ConnectionString + ";auth=PLAIN"))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       using (var session1 = MySQLX.GetSession(ConnectionString + ";auth=plain;ssl-mode=Required"))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       using (var session1 = MySQLX.GetSession(cs + ";ssl-mode=none"))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(ConnectionString + ";ssl-mode=Required"))
       {
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
         var result = session.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';").Execute().FetchAll();
-        Assert.True(result[0][1].ToString().Contains("TLSv1"));
+        Assert.That(result[0][1].ToString().Contains("TLSv1"));
       }
 
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";auth=PLAIN;ssl-mode=none"));
@@ -469,33 +469,33 @@ public void NativeAuthValidAndInvalidConnection()
       Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionString + ";auth=INVALID;ssl-mode=Required"));
       //Uri
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?auth=MySQL41"))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?auth=MySQL41&ssl-mode=none"))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?auth=MySQL41&ssl-mode=Required"))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?auth=PLAIN"))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUriNative + "?auth=PLAIN&ssl-mode=none"));
 
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?auth=PLAIN&ssl-mode=Required"))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?ssl-mode=none"))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?ssl-mode=Required"))
       {
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
         var result = session.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';").Execute().FetchAll();
-        Assert.True(result[0][1].ToString().Contains("TLSv1"));
+        Assert.That(result[0][1].ToString().Contains("TLSv1"));
       }
 
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUriNative + "?auth=EXTERNAL"));
@@ -512,7 +512,7 @@ public void NativeAuthValidAndInvalidConnection()
         user = user,
         password = pwd
       }))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       using (var session1 = MySQLX.GetSession(new
       {
@@ -522,7 +522,7 @@ public void NativeAuthValidAndInvalidConnection()
         password = pwd,
         auth = MySqlAuthenticationMode.MYSQL41
       }))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(new
       {
@@ -533,7 +533,7 @@ public void NativeAuthValidAndInvalidConnection()
         auth = MySqlAuthenticationMode.MYSQL41,
         sslmode = MySqlSslMode.Disabled
       }))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(new
       {
@@ -544,7 +544,7 @@ public void NativeAuthValidAndInvalidConnection()
         auth = MySqlAuthenticationMode.MYSQL41,
         sslmode = MySqlSslMode.Required
       }))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(new
       {
@@ -554,7 +554,7 @@ public void NativeAuthValidAndInvalidConnection()
         password = pwd,
         auth = MySqlAuthenticationMode.PLAIN
       }))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(new
       {
@@ -575,7 +575,7 @@ public void NativeAuthValidAndInvalidConnection()
         auth = MySqlAuthenticationMode.PLAIN,
         sslmode = MySqlSslMode.Required
       }))
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
       using (var session1 = MySQLX.GetSession(new
       {
@@ -585,7 +585,7 @@ public void NativeAuthValidAndInvalidConnection()
         password = pwd,
         sslmode = MySqlSslMode.Disabled
       }))
-        Assert.AreEqual(MySqlAuthenticationMode.MYSQL41, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(new
       {
@@ -596,9 +596,9 @@ public void NativeAuthValidAndInvalidConnection()
         sslmode = MySqlSslMode.Required
       }))
       {
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session1.Settings.Auth);
+        Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
         var result = session1.SQL("SHOW SESSION STATUS LIKE 'Mysqlx_ssl_version';").Execute().FetchAll();
-        Assert.True(result[0][1].ToString().Contains("TLSv1"));
+        Assert.That(result[0][1].ToString().Contains("TLSv1"));
       }
 
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(new
@@ -618,10 +618,10 @@ public void ConnectUsingExternalAuth()
     {
       // Should fail since EXTERNAL is currently not supported by X Plugin.
       Exception ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";auth=EXTERNAL"));
-      Assert.AreEqual("Invalid authentication method EXTERNAL", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Invalid authentication method EXTERNAL"));
 
       ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUri + "?auth=EXTERNAL"));
-      Assert.AreEqual("Invalid authentication method EXTERNAL", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Invalid authentication method EXTERNAL"));
     }
 
     [Test]
@@ -630,14 +630,14 @@ public void ConnectUsingPlainAuth()
     {
       using (var session = MySQLX.GetSession(ConnectionString + ";auth=pLaIn"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session.Settings.Auth);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
       }
 
       using (var session = MySQLX.GetSession(ConnectionStringUri + "?auth=pLaIn"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(MySqlAuthenticationMode.PLAIN, session.Settings.Auth);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
       }
 
       // Should fail since PLAIN requires TLS to be enabled.
@@ -660,29 +660,29 @@ public void ConnectUsingSha256PasswordPlugin()
       // User with password over TLS connection.
       using (var session = MySQLX.GetSession(connectionStringUri))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var result = ExecuteSQLStatement(session.SQL(string.Format("SELECT `User`, `plugin` FROM `mysql`.`user` WHERE `User` = '{0}';", userName))).FetchAll();
-        Assert.AreEqual(userName, session.Settings.UserID);
-        Assert.AreEqual(session.Settings.UserID, result[0][0].ToString());
-        Assert.AreEqual(pluginName, result[0][1].ToString());
+        Assert.That(session.Settings.UserID, Is.EqualTo(userName));
+        Assert.That(result[0][0].ToString(), Is.EqualTo(session.Settings.UserID));
+        Assert.That(result[0][1].ToString(), Is.EqualTo(pluginName));
       }
 
       // Connect over non-TLS connection.
       using (var session = MySQLX.GetSession(connectionStringUri + "?sslmode=none"))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
-        Assert.AreEqual(MySqlAuthenticationMode.SHA256_MEMORY, session.Settings.Auth);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
+        Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.SHA256_MEMORY));
       }
 
       // User without password over TLS connection.
       ExecuteSQL($"ALTER USER {userName}@'%' IDENTIFIED BY ''");
       using (var session = MySQLX.GetSession(ConnectionStringUri.Replace("test:test", string.Format("{0}:{1}", userName, ""))))
       {
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var result = ExecuteSQLStatement(session.SQL(string.Format("SELECT `User`, `plugin` FROM `mysql`.`user` WHERE `User` = '{0}';", userName))).FetchAll();
-        Assert.AreEqual(userName, session.Settings.UserID);
-        Assert.AreEqual(session.Settings.UserID, result[0][0].ToString());
-        Assert.AreEqual(pluginName, result[0][1].ToString());
+        Assert.That(session.Settings.UserID, Is.EqualTo(userName));
+        Assert.That(result[0][0].ToString(), Is.EqualTo(session.Settings.UserID));
+        Assert.That(result[0][1].ToString(), Is.EqualTo(pluginName));
       }
     }
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
index 2df0497af..78154a965 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
@@ -57,7 +57,7 @@ static XConnectionStringBuilderTests()
     public void SessionCanBeOpened()
     {
       using (var session = MySQLX.GetSession(_xConnectionURI))
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
     }
 
     [Test]
@@ -66,16 +66,16 @@ public void ConnectionAfterSessionCanBeOpened()
       if (!Platform.IsWindows()) Assert.Ignore("Check for Linux OS");
 
       using (var session = MySQLX.GetSession(_xConnectionURI))
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
 
       using (var connection = new MySqlConnection(_connectionStringWithSslMode))
       {
         connection.Open();
-        Assert.AreEqual(ConnectionState.Open, connection.State);
+        Assert.That(connection.State, Is.EqualTo(ConnectionState.Open));
       }
 
       using (var session = MySQLX.GetSession(_xConnectionURI + "?sslca=client.pfx&certificatepassword=pass"))
-        Assert.AreEqual(SessionState.Open, session.InternalSession.SessionState);
+        Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
     }
 
 #if !NET452
@@ -87,7 +87,7 @@ public void ConnectionAfterSessionCanBeOpened()
     public void ValidateTlsVersionOptionAsString(string options, string result)
     {
       MySqlXConnectionStringBuilder builder = new MySqlXConnectionStringBuilder(_connectionString + options);
-      Assert.AreEqual(result, builder.TlsVersion);
+      Assert.That(builder.TlsVersion, Is.EqualTo(result));
     }
 
 #if !NET452
@@ -101,7 +101,7 @@ public void ValidateTlsVersionOptionAsProperty(string options, string result)
       MySqlXConnectionStringBuilder builder = new MySqlXConnectionStringBuilder(_connectionString);
 
       builder.TlsVersion = options;
-      Assert.AreEqual(result, builder.TlsVersion);
+      Assert.That(builder.TlsVersion, Is.EqualTo(result));
     }
 
 #if !NET452
@@ -122,7 +122,7 @@ public void ValidateTlsVersionOptionAndSslMode(MySqlSslMode? sslMode1, string op
       if (result != null)
       {
         builder.TlsVersion = options;
-        StringAssert.AreEqualIgnoringCase(result, builder.TlsVersion);
+        Assert.That(builder.TlsVersion, Is.EqualTo(result).IgnoreCase);
       }
       else
         Assert.Throws<ArgumentException>(() => { builder.TlsVersion = options; });
@@ -142,7 +142,7 @@ public void CaseInsensitiveAuthOption()
         for (int j = 0; j < values.GetLength(1); j++)
         {
           var builder = new MySqlXConnectionStringBuilder(String.Format("server=localhost;auth={0}", values[i, j]));
-          Assert.AreEqual((MySqlAuthenticationMode)(i + 1), builder.Auth);
+          Assert.That(builder.Auth, Is.EqualTo((MySqlAuthenticationMode)(i + 1)));
         }
       }
     }
@@ -154,7 +154,7 @@ public void IncorrectAuthOptionThrowsArgumentException()
       foreach (var value in values)
       {
         Exception ex = Assert.Throws<ArgumentException>(() => new MySqlXConnectionStringBuilder(String.Format("server=localhost;aUth={0}", value)));
-        Assert.AreEqual(String.Format("Value '{0}' is not of the correct type.", value), ex.Message);
+        Assert.That(ex.Message, Is.EqualTo(String.Format("Value '{0}' is not of the correct type.", value)));
       }
     }
 
@@ -171,21 +171,21 @@ public void TryGetValue()
         CompressionAlgorithm = "deflate, lz4",
       };
 
-      Assert.IsTrue(connStringBuilder.ContainsKey("dnssrv"));
-      Assert.IsTrue(connStringBuilder.TryGetValue("dns-srv", out var dnssrv));
-      Assert.AreEqual(connStringBuilder.DnsSrv, (bool)dnssrv);
+      Assert.That(connStringBuilder.ContainsKey("dnssrv"));
+      Assert.That(connStringBuilder.TryGetValue("dns-srv", out var dnssrv));
+      Assert.That((bool)dnssrv, Is.EqualTo(connStringBuilder.DnsSrv));
 
-      Assert.IsTrue(connStringBuilder.ContainsKey("compressionAlgorithms"));
-      Assert.IsTrue(connStringBuilder.TryGetValue("Compression-Algorithms", out var compressionAlgorithm));
-      StringAssert.AreEqualIgnoringCase(connStringBuilder.CompressionAlgorithm, (string)compressionAlgorithm);
+      Assert.That(connStringBuilder.ContainsKey("compressionAlgorithms"));
+      Assert.That(connStringBuilder.TryGetValue("Compression-Algorithms", out var compressionAlgorithm));
+      Assert.That((string)compressionAlgorithm, Is.EqualTo(connStringBuilder.CompressionAlgorithm).IgnoreCase);
 
       // Default value
-      Assert.IsTrue(connStringBuilder.TryGetValue("connection-attributes", out var connectionattributes));
-      Assert.AreEqual(connStringBuilder.GetOption("connection-attributes").DefaultValue, connectionattributes);
+      Assert.That(connStringBuilder.TryGetValue("connection-attributes", out var connectionattributes));
+      Assert.That(connectionattributes, Is.EqualTo(connStringBuilder.GetOption("connection-attributes").DefaultValue));
 
       // Non existing option
-      Assert.IsFalse(connStringBuilder.TryGetValue("foo", out var nonexistingoption));
-      Assert.IsNull(nonexistingoption);
+      Assert.That(connStringBuilder.TryGetValue("foo", out var nonexistingoption), Is.False);
+      Assert.That(nonexistingoption, Is.Null);
     }
   }
 }
diff --git a/MySql.Web/tests/GlobalUsings.cs b/MySql.Web/tests/GlobalUsings.cs
deleted file mode 100644
index 575c7cfd0..000000000
--- a/MySql.Web/tests/GlobalUsings.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-global using Assert = NUnit.Framework.Legacy.ClassicAssert;
-global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
-global using StringAssert = NUnit.Framework.Legacy.StringAssert;
-global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
-global using FileAssert = NUnit.Framework.Legacy.FileAssert;
diff --git a/MySql.Web/tests/PersonalizationTests.cs b/MySql.Web/tests/PersonalizationTests.cs
index 23ef47655..d90553ce9 100644
--- a/MySql.Web/tests/PersonalizationTests.cs
+++ b/MySql.Web/tests/PersonalizationTests.cs
@@ -144,7 +144,7 @@ public void CanFindState()
       psq.PathToMatch = "~/default.aspx";
       psq.UserInactiveSinceDate = DateTime.UtcNow.AddMinutes(1);
       var collection = p.FindState(PersonalizationScope.User, psq, 1, 1, out totalRecords);
-      Assert.AreEqual(1, totalRecords);
+      Assert.That(totalRecords, Is.EqualTo(1));
     }
 
     [Test]
@@ -159,7 +159,7 @@ public void CanGetCountofStateForUser()
       psq.UserInactiveSinceDate = DateTime.UtcNow.AddMinutes(1);
       //System.Threading.Thread.Sleep(1000);
       totalRecords = p.GetCountOfState(PersonalizationScope.User, psq);
-      Assert.AreEqual(1, totalRecords);
+      Assert.That(totalRecords, Is.EqualTo(1));
     }
 
     [Test]
@@ -172,7 +172,7 @@ public void CanGetCountofStateForAllUsers()
       psq.PathToMatch = "~/default.aspx";
       psq.UserInactiveSinceDate = DateTime.UtcNow;
       totalRecords = p.GetCountOfState(PersonalizationScope.Shared, psq);
-      Assert.AreEqual(1, totalRecords);
+      Assert.That(totalRecords, Is.EqualTo(1));
     }
 
     [Test]
@@ -188,7 +188,7 @@ public void CanResetStateForUser()
       users[0] = @"GabPC\Gab";
 
       totalRecords = p.ResetState(PersonalizationScope.User, paths, users);
-      Assert.AreEqual(1, totalRecords);
+      Assert.That(totalRecords, Is.EqualTo(1));
     }
 
     [Test]
@@ -205,7 +205,7 @@ public void CanResetStateForAllUsers()
 
       int totalRecords;
       totalRecords = p.ResetState(PersonalizationScope.Shared, paths, users);
-      Assert.AreEqual(1, totalRecords);
+      Assert.That(totalRecords, Is.EqualTo(1));
     }
 
     [Test]
@@ -216,7 +216,7 @@ public void CanResetAllState()
 
       int totalRecords;
       totalRecords = p.ResetState(PersonalizationScope.Shared, null, null);
-      Assert.AreEqual(1, totalRecords);
+      Assert.That(totalRecords, Is.EqualTo(1));
     }
 
 
@@ -228,7 +228,7 @@ public void CanResetUsertState()
       int totalRecords;
 
       totalRecords = p.ResetUserState("~/default.aspx", Convert.ToDateTime("2038-01-19 03:14:07.999999")); // TimeStamp MaxValue
-      Assert.AreEqual(1, totalRecords);
+      Assert.That(totalRecords, Is.EqualTo(1));
     }
 
   }
diff --git a/MySql.Web/tests/ProfileTests.cs b/MySql.Web/tests/ProfileTests.cs
index f1ac081ba..2de577133 100644
--- a/MySql.Web/tests/ProfileTests.cs
+++ b/MySql.Web/tests/ProfileTests.cs
@@ -79,26 +79,26 @@ public void SettingValuesCreatesAnAppAndUserId()
       provider.SetPropertyValues(ctx, values);
 
       DataTable dt = FillTable("SELECT * FROM my_aspnet_applications");
-      Assert.True(1 == dt.Rows.Count, "Rows count on table my_aspnet_applications is not 1");
+      Assert.That(1 == dt.Rows.Count, "Rows count on table my_aspnet_applications is not 1");
 
       dt = FillTable("SELECT * FROM my_aspnet_users");
-      Assert.True(1 == dt.Rows.Count, "Rows count on table my_aspnet_users is not 1");
+      Assert.That(1 == dt.Rows.Count, "Rows count on table my_aspnet_users is not 1");
 
 
       dt = FillTable("SELECT * FROM my_aspnet_profiles");
-      Assert.True(1 == dt.Rows.Count, "Rows count on table my_aspnet_profiles is not 1");
+      Assert.That(1 == dt.Rows.Count, "Rows count on table my_aspnet_profiles is not 1");
 
       values["color"].PropertyValue = "green";
       provider.SetPropertyValues(ctx, values);
 
       dt = FillTable("SELECT * FROM my_aspnet_applications");
-      Assert.True(1 == dt.Rows.Count, "Rows count on table my_aspnet_applications is not 1 after setting property");
+      Assert.That(1 == dt.Rows.Count, "Rows count on table my_aspnet_applications is not 1 after setting property");
 
       dt = FillTable("SELECT * FROM my_aspnet_users");
-      Assert.True(1 == dt.Rows.Count, "Rows count on table my_aspnet_users is not 1 after setting property");
+      Assert.That(1 == dt.Rows.Count, "Rows count on table my_aspnet_users is not 1 after setting property");
 
       dt = FillTable("SELECT * FROM my_aspnet_profiles");
-      Assert.True(1 == dt.Rows.Count, "Rows count on table my_aspnet_profiles is not 1 after setting property");
+      Assert.That(1 == dt.Rows.Count, "Rows count on table my_aspnet_profiles is not 1 after setting property");
     }
 
     [Test]
@@ -120,13 +120,13 @@ public void AnonymousUserSettingNonAnonymousProperties()
       provider.SetPropertyValues(ctx, values);
 
       DataTable dt = FillTable("SELECT * FROM my_aspnet_applications");
-      Assert.True(0 == dt.Rows.Count, "Table my_aspnet_applications Rows is not 0");
+      Assert.That(0 == dt.Rows.Count, "Table my_aspnet_applications Rows is not 0");
 
       dt = FillTable("SELECT * FROM my_aspnet_users");
-      Assert.True(0 == dt.Rows.Count, "Table my_aspnet_users Rows is not 0");
+      Assert.That(0 == dt.Rows.Count, "Table my_aspnet_users Rows is not 0");
 
       dt = FillTable("SELECT * FROM my_aspnet_profiles");
-      Assert.True(0 == dt.Rows.Count, "Table my_aspnet_profiles Rows is not 0");
+      Assert.That(0 == dt.Rows.Count, "Table my_aspnet_profiles Rows is not 0");
 
     }
 
@@ -143,11 +143,11 @@ public void StringCollectionAsProperty()
       profile.Save();
 
       DataTable dt = FillTable("SELECT * FROM my_aspnet_applications");
-      Assert.AreEqual(1, dt.Rows.Count);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
       dt = FillTable("SELECT * FROM my_aspnet_users");
-      Assert.AreEqual(1, dt.Rows.Count);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
       dt = FillTable("SELECT * FROM my_aspnet_profiles");
-      Assert.AreEqual(1, dt.Rows.Count);
+      Assert.That(dt.Rows.Count, Is.EqualTo(1));
 
       // now retrieve them
       SettingsPropertyCollection getProps = new SettingsPropertyCollection();
@@ -161,13 +161,13 @@ public void StringCollectionAsProperty()
       ctx.Add("IsAuthenticated", true);
       ctx.Add("UserName", "foo");
       SettingsPropertyValueCollection getValues = provider.GetPropertyValues(ctx, getProps);
-      Assert.AreEqual(1, getValues.Count);
+      Assert.That(getValues.Count, Is.EqualTo(1));
       SettingsPropertyValue getValue1 = getValues["FavoriteColors"];
       StringCollection outValue = (StringCollection)getValue1.PropertyValue;
-      Assert.AreEqual(3, outValue.Count);
-      Assert.AreEqual("red", outValue[0]);
-      Assert.AreEqual("green", outValue[1]);
-      Assert.AreEqual("blue", outValue[2]);
+      Assert.That(outValue.Count, Is.EqualTo(3));
+      Assert.That(outValue[0], Is.EqualTo("red"));
+      Assert.That(outValue[1], Is.EqualTo("green"));
+      Assert.That(outValue[2], Is.EqualTo("blue"));
     }
 
     [Test]
@@ -191,9 +191,9 @@ public void AuthenticatedDateTime()
       ctx.Add("UserName", "foo");
 
       SettingsPropertyValueCollection getValues = provider.GetPropertyValues(ctx, getProps);
-      Assert.AreEqual(1, getValues.Count);
+      Assert.That(getValues.Count, Is.EqualTo(1));
       SettingsPropertyValue getValue1 = getValues["BirthDate"];
-      Assert.AreEqual(date, getValue1.PropertyValue);
+      Assert.That(getValue1.PropertyValue, Is.EqualTo(date));
     }
 
     /// <summary>
@@ -235,9 +235,9 @@ public void AuthenticatedStringProperty()
       ctx.Add("UserName", "foo");
 
       SettingsPropertyValueCollection getValues = provider.GetPropertyValues(ctx, getProps);
-      Assert.AreEqual(1, getValues.Count);
+      Assert.That(getValues.Count, Is.EqualTo(1));
       SettingsPropertyValue getValue1 = getValues["Name"];
-      Assert.AreEqual("Fred Flintstone", getValue1.PropertyValue);
+      Assert.That(getValue1.PropertyValue, Is.EqualTo("Fred Flintstone"));
     }
 
     /// <summary>
@@ -264,7 +264,7 @@ public void GetAllProfiles()
       int total;
       ProfileInfoCollection profiles = provider.GetAllProfiles(
           ProfileAuthenticationOption.All, 0, 10, out total);
-      Assert.AreEqual(1, total);
+      Assert.That(total, Is.EqualTo(1));
     }
 
     /// <summary>
@@ -277,11 +277,11 @@ public void DeleteProfiles()
       profile.SetPropertyValue("Name", "this is my name");
       profile.Save();
       profile = ProfileBase.Create("foo", true); // refresh profile from database
-      Assert.AreEqual("this is my name", profile.GetPropertyValue("Name"));
+      Assert.That(profile.GetPropertyValue("Name"), Is.EqualTo("this is my name"));
 
-      Assert.AreEqual(1, ProfileManager.DeleteProfiles(new string[] { "foo" }));
+      Assert.That(ProfileManager.DeleteProfiles(new string[] { "foo" }), Is.EqualTo(1));
       profile = ProfileBase.Create("foo", true); // refresh profile from database
-      Assert.AreEqual(string.Empty, profile.GetPropertyValue("Name"));
+      Assert.That(profile.GetPropertyValue("Name"), Is.Empty);
     }
 
   }
diff --git a/MySql.Web/tests/RoleManagement.cs b/MySql.Web/tests/RoleManagement.cs
index 764b43da1..225919241 100644
--- a/MySql.Web/tests/RoleManagement.cs
+++ b/MySql.Web/tests/RoleManagement.cs
@@ -57,7 +57,7 @@ private void AddUser(string username, string password)
       MembershipCreateStatus status;
       membershipProvider.CreateUser(username, password, "foo@bar.com", null,
         null, true, null, out status);
-      Assert.False(status != MembershipCreateStatus.Success, "User creation failed");
+      Assert.That(status == MembershipCreateStatus.Success, "User creation failed");
     }
 
     private void AttemptToAddUserToRole(string username, string role)
@@ -79,8 +79,8 @@ public void CreateAndDeleteRoles()
       // Add the role
       roleProvider.CreateRole("Administrator");
       string[] roles = roleProvider.GetAllRoles();
-      Assert.AreEqual(1, roles.Length);
-      Assert.AreEqual("Administrator", roles[0]);
+      Assert.That(roles.Length, Is.EqualTo(1));
+      Assert.That(roles[0], Is.EqualTo("Administrator"));
       roleProvider.DeleteRole("Administrator", false);
     }
 
@@ -92,13 +92,13 @@ public void AddUserToRole()
 
       roleProvider.AddUsersToRoles(new string[] { "eve" },
         new string[] { "Administrator" });
-      Assert.True(roleProvider.IsUserInRole("eve", "Administrator"));
+      Assert.That(roleProvider.IsUserInRole("eve", "Administrator"));
 
       roleProvider.RemoveUsersFromRoles(new string[] { "eve" }, new string[] { "Administrator" });
-      Assert.False(roleProvider.IsUserInRole("eve", "Administrator"));
+      Assert.That(!roleProvider.IsUserInRole("eve", "Administrator"));
 
       roleProvider.DeleteRole("Administrator", false);
-      Assert.AreEqual(0, roleProvider.GetAllRoles().Length);
+      Assert.That(roleProvider.GetAllRoles().Length, Is.EqualTo(0));
 
       //clean up
       membershipProvider.DeleteUser("eve", true);
@@ -114,7 +114,7 @@ public void AddNonExistingUserToRole()
       roleProvider.CreateRole("Administrator");
       roleProvider.AddUsersToRoles(new string[] { "eve" },
         new string[] { "Administrator" });
-      Assert.True(roleProvider.IsUserInRole("eve", "Administrator"));
+      Assert.That(roleProvider.IsUserInRole("eve", "Administrator"));
 
       //Cleanup
       roleProvider.RemoveUsersFromRoles(new string[] { "eve" }, new string[] { "Administrator" });
@@ -144,10 +144,10 @@ public void AddUserToRoleWithRoleClass()
       MembershipCreateStatus status;
       membershipProvider.CreateUser("eve", "eve1@eve", "eve@boo.com",
         "question", "answer", true, null, out status);
-      Assert.AreEqual(MembershipCreateStatus.Success, status);
+      Assert.That(status, Is.EqualTo(MembershipCreateStatus.Success));
 
       roleProvider.AddUsersToRoles(new string[] { "eve" }, new string[] { "Administrator" });
-      Assert.True(roleProvider.IsUserInRole("eve", "Administrator"));
+      Assert.That(roleProvider.IsUserInRole("eve", "Administrator"));
 
       //Cleanup
       membershipProvider.DeleteUser("eve", true);
@@ -191,10 +191,10 @@ public void IsUserInRoleCrossDomain()
       roleProvider.CreateRole("Administrator");
       roleProvider.AddUsersToRoles(new string[] { "foo" },
         new string[] { "Administrator" });
-      Assert.False(r2.IsUserInRole("foo", "Administrator"));
+      Assert.That(!r2.IsUserInRole("foo", "Administrator"));
 
       roleProvider.DeleteRole("Administrator", false);
-      Assert.AreEqual(0, roleProvider.GetAllRoles().Length);
+      Assert.That(roleProvider.GetAllRoles().Length, Is.EqualTo(0));
 
       //Cleanup
       provider.DeleteUser("foo", true);
@@ -218,12 +218,12 @@ public void TestUserRemoveFindFromRole()
       roleProvider.CreateRole("Administrator");
       roleProvider.AddUsersToRoles(new string[] { "eve" },
         new string[] { "Administrator" });
-      Assert.True(roleProvider.IsUserInRole("eve", "Administrator"));
+      Assert.That(roleProvider.IsUserInRole("eve", "Administrator"));
       string[] users = roleProvider.FindUsersInRole("Administrator", "eve");
-      Assert.AreEqual(1, users.Length);
-      Assert.AreEqual("eve", users[0]);
+      Assert.That(users.Length, Is.EqualTo(1));
+      Assert.That(users[0], Is.EqualTo("eve"));
       roleProvider.RemoveUsersFromRoles(new string[] { "eve" }, new string[] { "Administrator" });
-      Assert.False(roleProvider.IsUserInRole("eve", "Administrator"));
+      Assert.That(!roleProvider.IsUserInRole("eve", "Administrator"));
 
       //Cleanup
       membershipProvider.DeleteUser("eve", true);
diff --git a/MySql.Web/tests/SchemaManagerTests.cs b/MySql.Web/tests/SchemaManagerTests.cs
index a8304eb16..86dd3790d 100644
--- a/MySql.Web/tests/SchemaManagerTests.cs
+++ b/MySql.Web/tests/SchemaManagerTests.cs
@@ -76,12 +76,12 @@ public void SchemaCheck()
         {
           provider.Initialize(null, config);
           if (i < SchemaManager.Version)
-            Assert.False(false, "Should have failed");
+            Assert.That(false, Is.False, "Should have failed");
         }
         catch (ProviderException)
         {
           if (i == SchemaManager.Version)
-            Assert.False(false, "This should not have failed");
+            Assert.That(false, Is.False, "This should not have failed");
         }
       }
     }
@@ -98,14 +98,14 @@ public void CurrentSchema()
 
       MySqlCommand cmd = new MySqlCommand("SELECT * FROM my_aspnet_schemaversion", Connection);
       object ver = cmd.ExecuteScalar();
-      Assert.AreEqual(4, ver);
+      Assert.That(ver, Is.EqualTo(4));
 
       cmd.CommandText = "SHOW CREATE TABLE my_aspnet_membership";
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
         string createSql = reader.GetString(1);
-        Assert.True(createSql.IndexOf("CHARSET=utf8") != -1);
+        Assert.That(createSql.IndexOf("CHARSET=utf8") != -1);
       }
     }
 
@@ -142,7 +142,7 @@ Password varchar(128) NOT NULL,
         reader.Read();
         string createTable = reader.GetString(1);
         int index = createTable.IndexOf("COMMENT='1'");
-        Assert.AreNotEqual(-1, index);
+        Assert.That(index, Is.Not.EqualTo(-1));
       }
 
       execSQL(@" ALTER TABLE mysql_Membership 
@@ -153,7 +153,7 @@ Password varchar(128) NOT NULL,
         reader.Read();
         string createTable = reader.GetString(1);
         int index = createTable.IndexOf("COMMENT='2'");
-        Assert.AreNotEqual(-1, index);
+        Assert.That(index, Is.Not.EqualTo(-1));
       }
     }
 
@@ -178,84 +178,84 @@ private void LoadData()
       execSQL(@"INSERT INTO mysql_UsersInRoles VALUES ('user1', 'role1', 'app2')");
       execSQL(@"INSERT INTO mysql_UsersInRoles VALUES ('user2', 'role2', 'app2')");
       LoadSchema(3);
-      Assert.False(TableExists("mysql_membership"));
-      Assert.False(TableExists("mysql_roles"));
-      Assert.False(TableExists("mysql_usersinroles"));
+      Assert.That(!TableExists("mysql_membership"));
+      Assert.That(!TableExists("mysql_roles"));
+      Assert.That(!TableExists("mysql_usersinroles"));
     }
 
     [Test]
     public void CheckAppsUpgrade()
     {
       DataTable apps = FillTable("SELECT * FROM my_aspnet_applications");
-      Assert.AreEqual(2, apps.Rows.Count);
-      Assert.AreEqual(1, apps.Rows[0]["id"]);
-      Assert.AreEqual("app1", apps.Rows[0]["name"]);
-      Assert.AreEqual(2, apps.Rows[1]["id"]);
-      Assert.AreEqual("app2", apps.Rows[1]["name"]);
+      Assert.That(apps.Rows.Count, Is.EqualTo(2));
+      Assert.That(apps.Rows[0]["id"], Is.EqualTo(1));
+      Assert.That(apps.Rows[0]["name"], Is.EqualTo("app1"));
+      Assert.That(apps.Rows[1]["id"], Is.EqualTo(2));
+      Assert.That(apps.Rows[1]["name"], Is.EqualTo("app2"));
     }
 
     [Test]
     public void CheckUsersUpgrade()
     {
       DataTable dt = FillTable("SELECT * FROM my_aspnet_users");
-      Assert.AreEqual(4, dt.Rows.Count);
-      Assert.AreEqual(1, dt.Rows[0]["id"]);
-      Assert.AreEqual(1, dt.Rows[0]["applicationId"]);
-      Assert.AreEqual("user1", dt.Rows[0]["name"]);
-      Assert.AreEqual(2, dt.Rows[1]["id"]);
-      Assert.AreEqual(1, dt.Rows[1]["applicationId"]);
-      Assert.AreEqual("user2", dt.Rows[1]["name"]);
-      Assert.AreEqual(3, dt.Rows[2]["id"]);
-      Assert.AreEqual(2, dt.Rows[2]["applicationId"]);
-      Assert.AreEqual("user1", dt.Rows[2]["name"]);
-      Assert.AreEqual(4, dt.Rows[3]["id"]);
-      Assert.AreEqual(2, dt.Rows[3]["applicationId"]);
-      Assert.AreEqual("user2", dt.Rows[3]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(4));
+      Assert.That(dt.Rows[0]["id"], Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["applicationId"], Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("user1"));
+      Assert.That(dt.Rows[1]["id"], Is.EqualTo(2));
+      Assert.That(dt.Rows[1]["applicationId"], Is.EqualTo(1));
+      Assert.That(dt.Rows[1]["name"], Is.EqualTo("user2"));
+      Assert.That(dt.Rows[2]["id"], Is.EqualTo(3));
+      Assert.That(dt.Rows[2]["applicationId"], Is.EqualTo(2));
+      Assert.That(dt.Rows[2]["name"], Is.EqualTo("user1"));
+      Assert.That(dt.Rows[3]["id"], Is.EqualTo(4));
+      Assert.That(dt.Rows[3]["applicationId"], Is.EqualTo(2));
+      Assert.That(dt.Rows[3]["name"], Is.EqualTo("user2"));
     }
 
     [Test]
     public void CheckRolesUpgrade()
     {
       DataTable dt = FillTable("SELECT * FROM my_aspnet_roles");
-      Assert.AreEqual(4, dt.Rows.Count);
-      Assert.AreEqual(1, dt.Rows[0]["id"]);
-      Assert.AreEqual(1, dt.Rows[0]["applicationId"]);
-      Assert.AreEqual("role1", dt.Rows[0]["name"]);
-      Assert.AreEqual(2, dt.Rows[1]["id"]);
-      Assert.AreEqual(1, dt.Rows[1]["applicationId"]);
-      Assert.AreEqual("role2", dt.Rows[1]["name"]);
-      Assert.AreEqual(3, dt.Rows[2]["id"]);
-      Assert.AreEqual(2, dt.Rows[2]["applicationId"]);
-      Assert.AreEqual("role1", dt.Rows[2]["name"]);
-      Assert.AreEqual(4, dt.Rows[3]["id"]);
-      Assert.AreEqual(2, dt.Rows[3]["applicationId"]);
-      Assert.AreEqual("role2", dt.Rows[3]["name"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(4));
+      Assert.That(dt.Rows[0]["id"], Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["applicationId"], Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["name"], Is.EqualTo("role1"));
+      Assert.That(dt.Rows[1]["id"], Is.EqualTo(2));
+      Assert.That(dt.Rows[1]["applicationId"], Is.EqualTo(1));
+      Assert.That(dt.Rows[1]["name"], Is.EqualTo("role2"));
+      Assert.That(dt.Rows[2]["id"], Is.EqualTo(3));
+      Assert.That(dt.Rows[2]["applicationId"], Is.EqualTo(2));
+      Assert.That(dt.Rows[2]["name"], Is.EqualTo("role1"));
+      Assert.That(dt.Rows[3]["id"], Is.EqualTo(4));
+      Assert.That(dt.Rows[3]["applicationId"], Is.EqualTo(2));
+      Assert.That(dt.Rows[3]["name"], Is.EqualTo("role2"));
     }
 
     [Test]
     public void CheckMembershipUpgrade()
     {
       DataTable dt = FillTable("SELECT * FROM my_aspnet_membership");
-      Assert.AreEqual(4, dt.Rows.Count);
-      Assert.AreEqual(1, dt.Rows[0]["userid"]);
-      Assert.AreEqual(2, dt.Rows[1]["userid"]);
-      Assert.AreEqual(3, dt.Rows[2]["userid"]);
-      Assert.AreEqual(4, dt.Rows[3]["userid"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(4));
+      Assert.That(dt.Rows[0]["userid"], Is.EqualTo(1));
+      Assert.That(dt.Rows[1]["userid"], Is.EqualTo(2));
+      Assert.That(dt.Rows[2]["userid"], Is.EqualTo(3));
+      Assert.That(dt.Rows[3]["userid"], Is.EqualTo(4));
     }
 
     [Test]
     public void CheckUsersInRolesUpgrade()
     {
       DataTable dt = FillTable("SELECT * FROM my_aspnet_usersinroles");
-      Assert.AreEqual(4, dt.Rows.Count);
-      Assert.AreEqual(1, dt.Rows[0]["userid"]);
-      Assert.AreEqual(1, dt.Rows[0]["roleid"]);
-      Assert.AreEqual(2, dt.Rows[1]["userid"]);
-      Assert.AreEqual(2, dt.Rows[1]["roleid"]);
-      Assert.AreEqual(3, dt.Rows[2]["userid"]);
-      Assert.AreEqual(3, dt.Rows[2]["roleid"]);
-      Assert.AreEqual(4, dt.Rows[3]["userid"]);
-      Assert.AreEqual(4, dt.Rows[3]["roleid"]);
+      Assert.That(dt.Rows.Count, Is.EqualTo(4));
+      Assert.That(dt.Rows[0]["userid"], Is.EqualTo(1));
+      Assert.That(dt.Rows[0]["roleid"], Is.EqualTo(1));
+      Assert.That(dt.Rows[1]["userid"], Is.EqualTo(2));
+      Assert.That(dt.Rows[1]["roleid"], Is.EqualTo(2));
+      Assert.That(dt.Rows[2]["userid"], Is.EqualTo(3));
+      Assert.That(dt.Rows[2]["roleid"], Is.EqualTo(3));
+      Assert.That(dt.Rows[3]["userid"], Is.EqualTo(4));
+      Assert.That(dt.Rows[3]["roleid"], Is.EqualTo(4));
     }
 
     /// <summary>
@@ -300,7 +300,7 @@ public void SchemaTablesUseSameEngine()
             lastEngine = currentEngine;
           }
 
-          Assert.AreEqual(lastEngine, currentEngine);
+          Assert.That(currentEngine, Is.EqualTo(lastEngine));
         }
       }
     }
@@ -314,7 +314,7 @@ public void InitializeInvalidConnStringThrowsArgumentException()
       config.Add("connectionString", badConnectionString);
 
       Exception ex = Assert.Throws<ArgumentException>(() => provider.Initialize(null, config));
-      Assert.AreEqual("Option not supported.\r\nParameter name: fookey", ex.Message);
+      Assert.That(ex.Message, Is.EqualTo("Option not supported.\r\nParameter name: fookey"));
     }
   }
 }
diff --git a/MySql.Web/tests/SchemaTests.cs b/MySql.Web/tests/SchemaTests.cs
index 71f8bf050..f1217ae8f 100644
--- a/MySql.Web/tests/SchemaTests.cs
+++ b/MySql.Web/tests/SchemaTests.cs
@@ -73,12 +73,12 @@ public void SchemaCheck()
         {
           provider.Initialize(null, config);
           if (i < SchemaManager.Version)
-            Assert.False(false, "Should have failed");
+            Assert.That(false, Is.False, "Should have failed");
         }
         catch (ProviderException)
         {
           if (i == SchemaManager.Version)
-            Assert.False(false, "This should not have failed");
+            Assert.That(false, Is.False, "This should not have failed");
         }
       }
     }
@@ -95,14 +95,14 @@ public void CurrentSchema()
 
       MySqlCommand cmd = new MySqlCommand("SELECT * FROM my_aspnet_schemaversion", Connection);
       object ver = cmd.ExecuteScalar();
-      Assert.AreEqual(4, ver);
+      Assert.That(ver, Is.EqualTo(4));
 
       cmd.CommandText = "SHOW CREATE TABLE my_aspnet_membership";
       using (MySqlDataReader reader = cmd.ExecuteReader())
       {
         reader.Read();
         string createSql = reader.GetString(1);
-        Assert.True(createSql.IndexOf("CHARSET=utf8") != -1);
+        Assert.That(createSql.IndexOf("CHARSET=utf8") != -1);
       }
     }
 
@@ -139,7 +139,7 @@ Password varchar(128) NOT NULL,
         reader.Read();
         string createTable = reader.GetString(1);
         int index = createTable.IndexOf("COMMENT='1'");
-        Assert.AreNotEqual(-1, index);
+        Assert.That(index, Is.Not.EqualTo(-1));
       }
 
       execSQL(@" ALTER TABLE mysql_Membership 
@@ -150,7 +150,7 @@ Password varchar(128) NOT NULL,
         reader.Read();
         string createTable = reader.GetString(1);
         int index = createTable.IndexOf("COMMENT='2'");
-        Assert.AreNotEqual(-1, index);
+        Assert.That(index, Is.Not.EqualTo(-1));
       }
     }
 
@@ -175,20 +175,20 @@ private void LoadData()
       execSQL(@"INSERT INTO mysql_UsersInRoles VALUES ('user1', 'role1', 'app2')");
       execSQL(@"INSERT INTO mysql_UsersInRoles VALUES ('user2', 'role2', 'app2')");
       LoadSchema(3);
-      Assert.False(TableExists("mysql_membership"));
-      Assert.False(TableExists("mysql_roles"));
-      Assert.False(TableExists("mysql_usersinroles"));
+      Assert.That(!TableExists("mysql_membership"));
+      Assert.That(!TableExists("mysql_roles"));
+      Assert.That(!TableExists("mysql_usersinroles"));
     }
 
     [Test]
     public void CheckAppsUpgrade()
     {
       DataTable apps = FillTable("SELECT * FROM my_aspnet_applications");
-      Assert.AreEqual(2, apps.Rows.Count);
-      Assert.AreEqual(1, apps.Rows[0]["id"]);
-      Assert.AreEqual("app1", apps.Rows[0]["name"]);
-      Assert.AreEqual(2, apps.Rows[1]["id"]);
-      Assert.AreEqual("app2", apps.Rows[1]["name"]);
+      Assert.That(apps.Rows.Count, Is.EqualTo(2));
+      Assert.That(apps.Rows[0]["id"], Is.EqualTo(1));
+      Assert.That(apps.Rows[0]["name"], Is.EqualTo("app1"));
+      Assert.That(apps.Rows[1]["id"], Is.EqualTo(2));
+      Assert.That(apps.Rows[1]["name"], Is.EqualTo("app2"));
     }
 
     //[Test]
diff --git a/MySql.Web/tests/SessionTests.cs b/MySql.Web/tests/SessionTests.cs
index 51418899c..8ee91b96b 100644
--- a/MySql.Web/tests/SessionTests.cs
+++ b/MySql.Web/tests/SessionTests.cs
@@ -147,7 +147,7 @@ public void SessionItemWithExpireCallback()
       SetSessionItemExpiredCallback(true);
       _evt.WaitOne();
 
-      Assert.AreEqual(strSessionID, calledId);
+      Assert.That(calledId, Is.EqualTo(strSessionID));
 
       int i = 0;
       while (((long)CountSessions() != 0) && (i < 10))
@@ -156,7 +156,7 @@ public void SessionItemWithExpireCallback()
         i++;
       }
 
-      Assert.AreEqual(0, CountSessions());
+      Assert.That(CountSessions(), Is.EqualTo(0));
     }
 
 
@@ -166,7 +166,7 @@ public void SessionItemWithoutExpireCallback()
       execSQL(@"delete from my_aspnet_sessions;
                 delete from my_aspnet_sessioncleanup;");
       SetSessionItemExpiredCallback(false);
-      Assert.AreNotEqual(strSessionID, calledId);
+      Assert.That(calledId, Is.Not.EqualTo(strSessionID));
 
       int i = 0;
       while (((long)MySqlHelper.ExecuteScalar(Connection, "SELECT Count(*) FROM my_aspnet_sessions;") != 0) && (i < 10))
@@ -175,7 +175,7 @@ public void SessionItemWithoutExpireCallback()
         i++;
       }
 
-      Assert.AreEqual(0, CountSessions());
+      Assert.That(CountSessions(), Is.EqualTo(0));
     }
 
     [Test]
@@ -202,7 +202,7 @@ public void DeleteSessionAppSpecific()
       }
 
       session.Dispose();
-      Assert.AreEqual(1, CountSessions());
+      Assert.That(CountSessions(), Is.EqualTo(1));
       session.Dispose();
     }
 
@@ -340,7 +340,7 @@ public void SessionLocking()
         // OK if wait is less than session timeout
         Debug.WriteLine(string.Empty);
         Debug.WriteLine(totalMillisecs);
-        Assert.True(totalMillisecs < 30000);
+        Assert.That(totalMillisecs < 30000);
       }
       finally
       {
diff --git a/MySql.Web/tests/SimpleMembership.cs b/MySql.Web/tests/SimpleMembership.cs
index d76ba9cfe..cb13ccc79 100644
--- a/MySql.Web/tests/SimpleMembership.cs
+++ b/MySql.Web/tests/SimpleMembership.cs
@@ -74,7 +74,7 @@ public void Cleanup()
     public void CheckIfRoleNotExists()
     {
       var roleExists = _simpleRoleProvider.RoleExists("roleName");
-      Assert.False(roleExists);
+      Assert.That(!roleExists);
     }
 
     [Test]
@@ -84,7 +84,7 @@ public void CheckIfRoleExists()
       {
         _simpleRoleProvider.CreateRole("Administrator");
         var roleExists = _simpleRoleProvider.RoleExists("Administrator");
-        Assert.True(roleExists);
+        Assert.That(roleExists);
       }
     }
 
@@ -92,12 +92,12 @@ public void CheckIfRoleExists()
     public void CreateUserAndAccountTest()
     {
       MySqlWebSecurity.CreateUserAndAccount(_userName, _pass);
-      Assert.True(MySqlWebSecurity.UserExists(_userName));
+      Assert.That(MySqlWebSecurity.UserExists(_userName));
       var user = MySqlHelper.ExecuteDataRow(ConnectionString, string.Format("select * from {0} where {1} = '{2}'", _userTable, _userNameColumn, _userName));
-      Assert.IsNotNull(user);
-      Assert.AreEqual(_userName, user[_userNameColumn]);
+      Assert.That(user, Is.Not.Null);
+      Assert.That(user[_userNameColumn], Is.EqualTo(_userName));
 
-      Assert.True(_simpleProvider.ValidateUser(_userName, _pass));
+      Assert.That(_simpleProvider.ValidateUser(_userName, _pass));
       //We need to mock the login because in that method there is a call to "FormsAuthentication.SetAuthCookie" which causes an "Object reference not set to an instance of an object" exception, because the test doesn't run on web application context
       //Assert.True(MySqlWebSecurity.Login(_userName, _pass));
     }
@@ -108,16 +108,16 @@ public void ChangePasswordTest()
     {
       string newPass = "newpassword";
       MySqlWebSecurity.CreateUserAndAccount(_userName, _pass);
-      Assert.True(MySqlWebSecurity.UserExists(_userName));
+      Assert.That(MySqlWebSecurity.UserExists(_userName));
 
       //We need to mock the login because in that method there is a call to "FormsAuthentication.SetAuthCookie" which causes an "Object reference not set to an instance of an object" exception, because the test doesn't run on web application context
 
-      Assert.True(_simpleProvider.ValidateUser(_userName, _pass));
+      Assert.That(_simpleProvider.ValidateUser(_userName, _pass));
       //Assert.True(MySqlWebSecurity.Login(_userName, _pass));
 
-      Assert.True(MySqlWebSecurity.ChangePassword(_userName, _pass, newPass));
+      Assert.That(MySqlWebSecurity.ChangePassword(_userName, _pass, newPass));
 
-      Assert.True(_simpleProvider.ValidateUser(_userName, newPass));
+      Assert.That(_simpleProvider.ValidateUser(_userName, newPass));
       //Assert.True(MySqlWebSecurity.Login(_userName, newPass));
     }
 
@@ -125,16 +125,16 @@ public void ChangePasswordTest()
     public void ConfirmAccountWithTokenTest()
     {
       var token = MySqlWebSecurity.CreateUserAndAccount(_userName, _pass, null, true);
-      Assert.True(MySqlWebSecurity.UserExists(_userName));
-      Assert.True(MySqlWebSecurity.ConfirmAccount(token));
+      Assert.That(MySqlWebSecurity.UserExists(_userName));
+      Assert.That(MySqlWebSecurity.ConfirmAccount(token));
     }
 
     [Test]
     public void ConfirmAccountWithUserAndTokenTest()
     {
       var token = MySqlWebSecurity.CreateUserAndAccount(_userName, _pass, null, true);
-      Assert.True(MySqlWebSecurity.UserExists(_userName));
-      Assert.True(MySqlWebSecurity.ConfirmAccount(_userName, token));
+      Assert.That(MySqlWebSecurity.UserExists(_userName));
+      Assert.That(MySqlWebSecurity.ConfirmAccount(_userName, token));
     }
 
     [Test]
@@ -142,8 +142,8 @@ public void ConfirmAccountWithoutTokenTest()
     {
       var token = "falsetoken";
       MySqlWebSecurity.CreateUserAndAccount(_userName, _pass);
-      Assert.True(MySqlWebSecurity.UserExists(_userName));
-      Assert.False(MySqlWebSecurity.ConfirmAccount(token));
+      Assert.That(MySqlWebSecurity.UserExists(_userName));
+      Assert.That(!MySqlWebSecurity.ConfirmAccount(token));
     }
 
     [Test]
@@ -152,39 +152,39 @@ public void CreatedDateTest()
       execSQL(@"delete from userprofile;
                 delete from webpages_membership;");
       MySqlWebSecurity.CreateUserAndAccount(_userName, _pass);
-      Assert.AreNotEqual(DateTime.MinValue, MySqlWebSecurity.GetCreateDate(_userName));
+      Assert.That(MySqlWebSecurity.GetCreateDate(_userName), Is.Not.EqualTo(DateTime.MinValue));
     }
 
     [Test]
     public void DeleteTest()
     {
       _simpleProvider.CreateUserAndAccount(_userName, _pass, false, null);
-      Assert.True(_simpleProvider.DeleteAccount(_userName));
+      Assert.That(_simpleProvider.DeleteAccount(_userName));
       _simpleProvider.CreateAccount(_userName, _pass, false);
-      Assert.True(_simpleProvider.DeleteUser(_userName, true));
+      Assert.That(_simpleProvider.DeleteUser(_userName, true));
     }
 
     [Test]
     public void UserIsConfirmedTest()
     {
       MySqlWebSecurity.CreateUserAndAccount(_userName, _pass, null, true);
-      Assert.False(MySqlWebSecurity.IsConfirmed(_userName));
+      Assert.That(!MySqlWebSecurity.IsConfirmed(_userName));
     }
 
     [Test]
     public void UserIsLockedOutTest()
     {
       MySqlWebSecurity.CreateUserAndAccount(_userName, _pass, null, true);
-      Assert.False(MySqlWebSecurity.IsAccountLockedOut(_userName, 5, 60));
+      Assert.That(!MySqlWebSecurity.IsAccountLockedOut(_userName, 5, 60));
     }
 
     [Test]
     public void PasswordTest()
     {
       MySqlWebSecurity.CreateUserAndAccount(_userName, _pass);
-      Assert.AreEqual(DateTime.MinValue, MySqlWebSecurity.GetLastPasswordFailureDate(_userName));
-      Assert.AreNotEqual(DateTime.MinValue, MySqlWebSecurity.GetPasswordChangedDate(_userName));
-      Assert.AreEqual(0, MySqlWebSecurity.GetPasswordFailuresSinceLastSuccess(_userName));
+      Assert.That(MySqlWebSecurity.GetLastPasswordFailureDate(_userName), Is.EqualTo(DateTime.MinValue));
+      Assert.That(MySqlWebSecurity.GetPasswordChangedDate(_userName), Is.Not.EqualTo(DateTime.MinValue));
+      Assert.That(MySqlWebSecurity.GetPasswordFailuresSinceLastSuccess(_userName), Is.EqualTo(0));
     }
 
     //Password reset token must be assigned to the user but that field is not added in any part of the code, so maybe that field must be handled manually by the user
@@ -194,10 +194,10 @@ public void PasswordResetTokenTest()
     {
       var token = MySqlWebSecurity.CreateUserAndAccount(_userName, _pass, null, true);
       int userID = MySqlWebSecurity.GetUserId(_userName);
-      Assert.True(MySqlWebSecurity.ConfirmAccount(token));
+      Assert.That(MySqlWebSecurity.ConfirmAccount(token));
       var newToken = MySqlWebSecurity.GeneratePasswordResetToken(_userName, 1440);
-      Assert.AreNotEqual(null, newToken);
-      Assert.AreEqual(MySqlWebSecurity.GetUserIdFromPasswordResetToken(newToken), userID);
+      Assert.That(newToken, Is.Not.EqualTo(null));
+      Assert.That(userID, Is.EqualTo(MySqlWebSecurity.GetUserIdFromPasswordResetToken(newToken)));
     }
 
     #region WL14389 
@@ -218,10 +218,10 @@ public void CreateUserAccountWithAttributes(int id, string userN, bool? token)
           break;
       }
 
-      Assert.True(MySqlWebSecurity.UserExists(userN));
+      Assert.That(MySqlWebSecurity.UserExists(userN));
       var user = MySqlHelper.ExecuteDataRow(ConnectionString, string.Format("select * from {0} where {1} = '{2}'", _userTable, _userNameColumn, userN));
-      Assert.IsNotNull(user);
-      Assert.AreEqual(userN, user[_userNameColumn]);
+      Assert.That(user, Is.Not.Null);
+      Assert.That(user[_userNameColumn], Is.EqualTo(userN));
     }
     #endregion
 
diff --git a/MySql.Web/tests/SiteMapTests.cs b/MySql.Web/tests/SiteMapTests.cs
index 1e66800c6..18e9d94a0 100644
--- a/MySql.Web/tests/SiteMapTests.cs
+++ b/MySql.Web/tests/SiteMapTests.cs
@@ -80,39 +80,39 @@ public void TestBuildSiteMap()
       SimpleWorkerRequest req = new SimpleWorkerRequest("/dummy", Environment.CurrentDirectory, "default.aspx", null, new StringWriter());
       HttpContext.Current = new HttpContext(req);
 
-      Assert.AreEqual(node.Title, "Evan's Gambit");
+      Assert.That("Evan's Gambit", Is.EqualTo(node.Title));
       SiteMapNode nodep = prov.GetParentNode(node);
-      Assert.AreEqual(node.Description, "The Funny Italian Game");
-      Assert.False(node.HasChildNodes);
+      Assert.That("The Funny Italian Game", Is.EqualTo(node.Description));
+      Assert.That(!node.HasChildNodes);
       SiteMapNode node2 = node.NextSibling;
-      Assert.IsNotNull(node2);
-      Assert.AreEqual(node2.Title, "Sicilian Defense");
-      Assert.AreEqual(node2.Description, "Sharp Double Edge Defense");
+      Assert.That(node2, Is.Not.Null);
+      Assert.That("Sicilian Defense", Is.EqualTo(node2.Title));
+      Assert.That("Sharp Double Edge Defense", Is.EqualTo(node2.Description));
 
       node = node.PreviousSibling;
-      Assert.IsNotNull(node);
-      Assert.AreEqual(node.Title, "Ruy Lopez");
-      Assert.AreEqual(node.Description, "The spanish opening");
-      Assert.False(node.HasChildNodes);
-      Assert.IsNotNull(node.NextSibling);
+      Assert.That(node, Is.Not.Null);
+      Assert.That("Ruy Lopez", Is.EqualTo(node.Title));
+      Assert.That("The spanish opening", Is.EqualTo(node.Description));
+      Assert.That(!node.HasChildNodes);
+      Assert.That(node.NextSibling, Is.Not.Null);
 
       node = node.ParentNode;
-      Assert.AreEqual(node.Title, "Chess Openings");
+      Assert.That("Chess Openings", Is.EqualTo(node.Title));
 
       node = node.ParentNode;
-      Assert.AreEqual(node.Title, "Index");
+      Assert.That("Index", Is.EqualTo(node.Title));
 
       node = node.ParentNode;
-      Assert.IsNull(node);
+      Assert.That(node, Is.Null);
 
       node = prov.RootNode;
-      Assert.AreEqual(node.Title, "Index");
+      Assert.That("Index", Is.EqualTo(node.Title));
       string[] childData = new string[] { "Chess Openings", "Middle Game", "Endings" };
 
       for (int i = 0; i < node.ChildNodes.Count; i++)
       {
         SiteMapNode child = node.ChildNodes[i];
-        Assert.AreEqual(child.Title, childData[i]);
+        Assert.That(childData[i], Is.EqualTo(child.Title));
       }
     }
   }
diff --git a/MySql.Web/tests/UserManagement.cs b/MySql.Web/tests/UserManagement.cs
index 0c312bbbf..a022e2045 100644
--- a/MySql.Web/tests/UserManagement.cs
+++ b/MySql.Web/tests/UserManagement.cs
@@ -55,16 +55,16 @@ private void CreateUserWithFormat(MembershipPasswordFormat format)
       // create the user
       MembershipCreateStatus status;
       provider.CreateUser("foo", "barbar!", "foo@bar.com", null, null, true, null, out status);
-      Assert.AreEqual(MembershipCreateStatus.Success, status);
+      Assert.That(status, Is.EqualTo(MembershipCreateStatus.Success));
 
       // verify that the password format is hashed.
       DataTable table = FillTable("SELECT * FROM my_aspnet_membership");
       MembershipPasswordFormat rowFormat =
         (MembershipPasswordFormat)Convert.ToInt32(table.Rows[0]["PasswordFormat"]);
-      Assert.AreEqual(format, rowFormat);
+      Assert.That(rowFormat, Is.EqualTo(format));
 
       //  then attempt to verify the user
-      Assert.True(provider.ValidateUser("foo", "barbar!"));
+      Assert.That(provider.ValidateUser("foo", "barbar!"));
 
     }
 
@@ -108,19 +108,19 @@ public void ChangePassword()
       CreateUserWithFormat(MembershipPasswordFormat.Hashed);
       ArgumentException ex = Assert.Throws<ArgumentException>(() => provider.ChangePassword("foo", "barbar!", "bar2"));
 
-      Assert.AreEqual("newPassword", ex.ParamName);
-      Assert.True(ex.Message.Contains("length of parameter"));
+      Assert.That(ex.ParamName, Is.EqualTo("newPassword"));
+      Assert.That(ex.Message.Contains("length of parameter"));
       ArgumentException ex1 = Assert.Throws<ArgumentException>(() => provider.ChangePassword("foo", "barbar!", "barbar2"));
-      Assert.AreEqual("newPassword", ex1.ParamName);
-      Assert.True(ex1.Message.Contains("alpha numeric"));
+      Assert.That(ex1.ParamName, Is.EqualTo("newPassword"));
+      Assert.That(ex1.Message.Contains("alpha numeric"));
 
       // now test regex strength testing
       bool result = provider.ChangePassword("foo", "barbar!", "zzzxxx!");
-      Assert.False(result);
+      Assert.That(!result);
 
       // now do one that should work
       result = provider.ChangePassword("foo", "barbar!", "barfoo!");
-      Assert.True(result);
+      Assert.That(result);
 
       provider.ValidateUser("foo", "barfoo!");
 
@@ -146,26 +146,26 @@ public void CreateUserWithErrors()
       MembershipCreateStatus status;
       MembershipUser user = provider.CreateUser("foo", "xyz",
         "foo@bar.com", null, null, true, null, out status);
-      Assert.IsNull(user);
-      Assert.AreEqual(MembershipCreateStatus.InvalidPassword, status);
+      Assert.That(user, Is.Null);
+      Assert.That(status, Is.EqualTo(MembershipCreateStatus.InvalidPassword));
 
       // now with not enough non-alphas
       user = provider.CreateUser("foo", "xyz1234",
         "foo@bar.com", null, null, true, null, out status);
-      Assert.IsNull(user);
-      Assert.AreEqual(MembershipCreateStatus.InvalidPassword, status);
+      Assert.That(user, Is.Null);
+      Assert.That(status, Is.EqualTo(MembershipCreateStatus.InvalidPassword));
 
       // now one that doesn't pass the regex test
       user = provider.CreateUser("foo", "xyzxyz!",
         "foo@bar.com", null, null, true, null, out status);
-      Assert.IsNull(user);
-      Assert.AreEqual(MembershipCreateStatus.InvalidPassword, status);
+      Assert.That(user, Is.Null);
+      Assert.That(status, Is.EqualTo(MembershipCreateStatus.InvalidPassword));
 
       // now one that works
       user = provider.CreateUser("foo", "barbar!",
         "foo@bar.com", null, null, true, null, out status);
-      Assert.IsNotNull(user);
-      Assert.AreEqual(MembershipCreateStatus.Success, status);
+      Assert.That(user, Is.Not.Null);
+      Assert.That(status, Is.EqualTo(MembershipCreateStatus.Success));
 
       //Cleanup
       provider.DeleteUser("foo", true);
@@ -178,11 +178,11 @@ public void DeleteUser()
       execSQL(@"delete from my_aspnet_membership;
                 delete from my_aspnet_users;");
       CreateUserWithFormat(MembershipPasswordFormat.Hashed);
-      Assert.True(provider.DeleteUser("foo", true));
+      Assert.That(provider.DeleteUser("foo", true));
       DataTable table = FillTable("SELECT * FROM my_aspnet_membership");
-      Assert.AreEqual(0, table.Rows.Count);
+      Assert.That(table.Rows.Count, Is.EqualTo(0));
       table = FillTable("SELECT * FROM my_aspnet_users");
-      Assert.AreEqual(0, table.Rows.Count);
+      Assert.That(table.Rows.Count, Is.EqualTo(0));
 
       CreateUserWithFormat(MembershipPasswordFormat.Hashed);
       provider = new MySQLMembershipProvider();
@@ -190,11 +190,11 @@ public void DeleteUser()
       config.Add("connectionStringName", "LocalMySqlServer");
       config.Add("applicationName", "/");
       provider.Initialize(null, config);
-      Assert.True(Membership.DeleteUser("foo", false));
+      Assert.That(Membership.DeleteUser("foo", false));
       table = FillTable("SELECT * FROM my_aspnet_membership");
-      Assert.AreEqual(0, table.Rows.Count);
+      Assert.That(table.Rows.Count, Is.EqualTo(0));
       table = FillTable("SELECT * FROM my_aspnet_users");
-      Assert.AreEqual(1, table.Rows.Count);
+      Assert.That(table.Rows.Count, Is.EqualTo(1));
     }
 
     [Test]
@@ -203,8 +203,8 @@ public void FindUsersByName()
       CreateUserWithFormat(MembershipPasswordFormat.Hashed);
       int records;
       MembershipUserCollection users = provider.FindUsersByName("F%", 0, 10, out records);
-      Assert.AreEqual(1, records);
-      Assert.AreEqual("foo", users["foo"].UserName);
+      Assert.That(records, Is.EqualTo(1));
+      Assert.That(users["foo"].UserName, Is.EqualTo("foo"));
 
       //Cleanup
       provider.DeleteUser("foo", true);
@@ -217,8 +217,8 @@ public void FindUsersByEmail()
 
       int records;
       MembershipUserCollection users = provider.FindUsersByEmail("foo@bar.com", 0, 10, out records);
-      Assert.AreEqual(1, records);
-      Assert.AreEqual("foo", users["foo"].UserName);
+      Assert.That(records, Is.EqualTo(1));
+      Assert.That(users["foo"].UserName, Is.EqualTo("foo"));
 
       //Cleanup
       provider.DeleteUser("foo", true);
@@ -233,18 +233,18 @@ public void TestCreateUserOverrides()
         Membership.CreateUser("foo", "barbar!", null, "question", "answer", true, out status);
         int records;
         MembershipUserCollection users = Membership.FindUsersByName("F%", 0, 10, out records);
-        Assert.AreEqual(1, records);
-        Assert.AreEqual("foo", users["foo"].UserName);
+        Assert.That(records, Is.EqualTo(1));
+        Assert.That(users["foo"].UserName, Is.EqualTo("foo"));
 
         Membership.CreateUser("test", "barbar!", "myemail@host.com",
           "question", "answer", true, out status);
         users = Membership.FindUsersByName("T%", 0, 10, out records);
-        Assert.AreEqual(1, records);
-        Assert.AreEqual("test", users["test"].UserName);
+        Assert.That(records, Is.EqualTo(1));
+        Assert.That(users["test"].UserName, Is.EqualTo("test"));
       }
       catch (Exception ex)
       {
-        Assert.True(ex.Message != String.Empty, ex.Message);
+        Assert.That(ex.Message != String.Empty, ex.Message);
       }
 
       //Cleanup
@@ -256,14 +256,14 @@ public void TestCreateUserOverrides()
     public void NumberOfUsersOnline()
     {
       int numOnline = Membership.GetNumberOfUsersOnline();
-      Assert.AreEqual(0, numOnline);
+      Assert.That(numOnline, Is.EqualTo(0));
 
       MembershipCreateStatus status;
       Membership.CreateUser("foo", "barbar!", null, "question", "answer", true, out status);
       Membership.CreateUser("foo2", "barbar!", null, "question", "answer", true, out status);
 
       numOnline = Membership.GetNumberOfUsersOnline();
-      Assert.AreEqual(2, numOnline);
+      Assert.That(numOnline, Is.EqualTo(2));
 
       //Cleanup
       Membership.DeleteUser("foo");
@@ -275,23 +275,23 @@ public void UnlockUser()
     {
       MembershipCreateStatus status;
       Membership.CreateUser("foo", "barbar!", null, "question", "answer", true, out status);
-      Assert.False(Membership.ValidateUser("foo", "bar2"));
-      Assert.False(Membership.ValidateUser("foo", "bar3"));
-      Assert.False(Membership.ValidateUser("foo", "bar3"));
-      Assert.False(Membership.ValidateUser("foo", "bar3"));
-      Assert.False(Membership.ValidateUser("foo", "bar3"));
+      Assert.That(!Membership.ValidateUser("foo", "bar2"));
+      Assert.That(!Membership.ValidateUser("foo", "bar3"));
+      Assert.That(!Membership.ValidateUser("foo", "bar3"));
+      Assert.That(!Membership.ValidateUser("foo", "bar3"));
+      Assert.That(!Membership.ValidateUser("foo", "bar3"));
 
       // the user should be locked now so the right password should fail
-      Assert.False(Membership.ValidateUser("foo", "barbar!"));
+      Assert.That(!Membership.ValidateUser("foo", "barbar!"));
 
       MembershipUser user = Membership.GetUser("foo");
-      Assert.True(user.IsLockedOut);
+      Assert.That(user.IsLockedOut);
 
-      Assert.True(user.UnlockUser());
+      Assert.That(user.UnlockUser());
       user = Membership.GetUser("foo");
-      Assert.False(user.IsLockedOut);
+      Assert.That(!user.IsLockedOut);
 
-      Assert.True(Membership.ValidateUser("foo", "barbar!"));
+      Assert.That(Membership.ValidateUser("foo", "barbar!"));
 
       //Cleanup
       Membership.DeleteUser("foo");
@@ -303,13 +303,13 @@ public void GetUsernameByEmail()
       MembershipCreateStatus status;
       Membership.CreateUser("foo", "barbar!", "foo@bar.com", "question", "answer", true, out status);
       string username = Membership.GetUserNameByEmail("foo@bar.com");
-      Assert.AreEqual("foo", username);
+      Assert.That(username, Is.EqualTo("foo"));
 
       username = Membership.GetUserNameByEmail("foo@b.com");
-      Assert.IsNull(username);
+      Assert.That(username, Is.Null);
 
       username = Membership.GetUserNameByEmail("  foo@bar.com   ");
-      Assert.AreEqual("foo", username);
+      Assert.That(username, Is.EqualTo("foo"));
 
       //Cleanup
       Membership.DeleteUser("foo");
@@ -320,7 +320,7 @@ public void UpdateUser()
     {
       MembershipCreateStatus status;
       Membership.CreateUser("foo", "barbar!", "foo@bar.com", "color", "blue", true, out status);
-      Assert.AreEqual(MembershipCreateStatus.Success, status);
+      Assert.That(status, Is.EqualTo(MembershipCreateStatus.Success));
 
       MembershipUser user = Membership.GetUser("foo");
 
@@ -332,11 +332,11 @@ public void UpdateUser()
       Membership.UpdateUser(user);
 
       MembershipUser newUser = Membership.GetUser("foo");
-      Assert.AreEqual(user.Comment, newUser.Comment);
-      Assert.AreEqual(user.Email, newUser.Email);
-      Assert.AreEqual(user.IsApproved, newUser.IsApproved);
-      Assert.AreEqual(user.LastActivityDate, newUser.LastActivityDate);
-      Assert.AreEqual(user.LastLoginDate, newUser.LastLoginDate);
+      Assert.That(newUser.Comment, Is.EqualTo(user.Comment));
+      Assert.That(newUser.Email, Is.EqualTo(user.Email));
+      Assert.That(newUser.IsApproved, Is.EqualTo(user.IsApproved));
+      Assert.That(newUser.LastActivityDate, Is.EqualTo(user.LastActivityDate));
+      Assert.That(newUser.LastLoginDate, Is.EqualTo(user.LastLoginDate));
 
       //Cleanup
       Membership.DeleteUser("foo");
@@ -350,11 +350,11 @@ private void ChangePasswordQAHelper(MembershipUser user, string pw, string newQ,
       }
       catch (ArgumentNullException ane)
       {
-        Assert.AreEqual("password", ane.ParamName);
+        Assert.That(ane.ParamName, Is.EqualTo("password"));
       }
       catch (ArgumentException)
       {
-        Assert.IsNotNull(pw);
+        Assert.That(pw, Is.Not.Null);
       }
     }
 
@@ -363,7 +363,7 @@ public void ChangePasswordQuestionAndAnswer()
     {
       MembershipCreateStatus status;
       Membership.CreateUser("foo", "barbar!", "foo@bar.com", "color", "blue", true, out status);
-      Assert.AreEqual(MembershipCreateStatus.Success, status);
+      Assert.That(status, Is.EqualTo(MembershipCreateStatus.Success));
 
       MembershipUser user = Membership.GetUser("foo");
       ChangePasswordQAHelper(user, "", "newQ", "newA");
@@ -372,10 +372,10 @@ public void ChangePasswordQuestionAndAnswer()
       ChangePasswordQAHelper(user, null, "newQ", "newA");
 
       bool result = user.ChangePasswordQuestionAndAnswer("barbar!", "newQ", "newA");
-      Assert.True(result);
+      Assert.That(result);
 
       user = Membership.GetUser("foo");
-      Assert.AreEqual("newQ", user.PasswordQuestion);
+      Assert.That(user.PasswordQuestion, Is.EqualTo("newQ"));
 
       //Cleanup
       Membership.DeleteUser("foo");
@@ -392,18 +392,18 @@ public void GetAllUsers()
           "question", "answer", true, out status);
 
       MembershipUserCollection users = Membership.GetAllUsers();
-      Assert.AreEqual(100, users.Count);
+      Assert.That(users.Count, Is.EqualTo(100));
       int index = 0;
       foreach (MembershipUser user in users)
-        Assert.AreEqual(String.Format("foo{0}", index++), user.UserName);
+        Assert.That(user.UserName, Is.EqualTo(String.Format("foo{0}", index++)));
 
       int total;
       users = Membership.GetAllUsers(2, 10, out total);
-      Assert.AreEqual(10, users.Count);
-      Assert.AreEqual(100, total);
+      Assert.That(users.Count, Is.EqualTo(10));
+      Assert.That(total, Is.EqualTo(100));
       index = 0;
       foreach (MembershipUser user in users)
-        Assert.AreEqual(String.Format("foo2{0}", index++), user.UserName);
+        Assert.That(user.UserName, Is.EqualTo(String.Format("foo2{0}", index++)));
 
       //Cleanup
       MySqlHelper.ExecuteScalar(Connection, "DELETE FROM my_aspnet_users");
@@ -435,7 +435,7 @@ private void GetPasswordHelper(bool requireQA, bool enablePasswordRetrieval, str
         else
         {
           Exception ex = Assert.Throws<ProviderException>(() => provider.GetPassword("foo", answer));
-          Assert.AreEqual(ex.Message, "Password Retrieval Not Enabled.");
+          Assert.That("Password Retrieval Not Enabled.", Is.EqualTo(ex.Message));
         }
       }
       else
@@ -452,7 +452,7 @@ private void GetPasswordHelper(bool requireQA, bool enablePasswordRetrieval, str
         else
         {
           password = provider.GetPassword("foo", answer);
-          Assert.AreEqual("barbar!", password);
+          Assert.That(password, Is.EqualTo("barbar!"));
         }
       }
 
@@ -509,7 +509,7 @@ public void GetUser()
       MembershipCreateStatus status;
       Membership.CreateUser("foo", "barbar!", null, "question", "answer", true, out status);
       MembershipUser user = Membership.GetUser(1);
-      Assert.AreEqual("foo", user.UserName);
+      Assert.That(user.UserName, Is.EqualTo("foo"));
 
       // now move the activity date back outside the login
       // window
@@ -517,10 +517,10 @@ public void GetUser()
       Membership.UpdateUser(user);
 
       user = Membership.GetUser("foo");
-      Assert.False(user.IsOnline);
+      Assert.That(!user.IsOnline);
 
       user = Membership.GetUser("foo", true);
-      Assert.True(user.IsOnline);
+      Assert.That(user.IsOnline);
 
       // now move the activity date back outside the login
       // window again
@@ -528,10 +528,10 @@ public void GetUser()
       Membership.UpdateUser(user);
 
       user = Membership.GetUser(1);
-      Assert.False(user.IsOnline);
+      Assert.That(!user.IsOnline);
 
       user = Membership.GetUser(1, true);
-      Assert.True(user.IsOnline);
+      Assert.That(user.IsOnline);
 
       //Cleanup
       Membership.DeleteUser("foo");
@@ -553,15 +553,15 @@ public void FindUsers()
 
 
       MembershipUserCollection users = Membership.FindUsersByName("fo%");
-      Assert.AreEqual(100, users.Count);
+      Assert.That(users.Count, Is.EqualTo(100));
 
       int total;
       users = Membership.FindUsersByName("fo%", 2, 10, out total);
-      Assert.AreEqual(10, users.Count);
-      Assert.AreEqual(100, total);
+      Assert.That(users.Count, Is.EqualTo(10));
+      Assert.That(total, Is.EqualTo(100));
       int index = 0;
       foreach (MembershipUser user in users)
-        Assert.AreEqual(String.Format("foo2{0}", index++), user.UserName);
+        Assert.That(user.UserName, Is.EqualTo(String.Format("foo2{0}", index++)));
 
       //Cleanup
       MySqlHelper.ExecuteScalar(Connection, "DELETE FROM my_aspnet_users");
@@ -582,10 +582,10 @@ public void CreateUserWithNoQA()
       provider.Initialize(null, config);
 
       Exception ex = Assert.Throws<ArgumentException>(() => provider.CreateUser("foo", "barbar!", "foo@bar.com", "color", null, true, null, out status));
-      Assert.True(ex.Message.StartsWith("Password answer supplied is invalid", StringComparison.OrdinalIgnoreCase));
+      Assert.That(ex.Message.StartsWith("Password answer supplied is invalid", StringComparison.OrdinalIgnoreCase));
 
       ex = Assert.Throws<ArgumentException>(() => provider.CreateUser("foo", "barbar!", "foo@bar.com", "", "blue", true, null, out status));
-      Assert.True(ex.Message.StartsWith("Password question supplied is invalid", StringComparison.OrdinalIgnoreCase));
+      Assert.That(ex.Message.StartsWith("Password question supplied is invalid", StringComparison.OrdinalIgnoreCase));
 
     }
 
@@ -601,10 +601,10 @@ public void MinRequiredAlpha()
 
       MembershipCreateStatus status;
       MembershipUser user = provider.CreateUser("foo", "pw!pass", "email", null, null, true, null, out status);
-      Assert.IsNull(user);
+      Assert.That(user, Is.Null);
 
       user = provider.CreateUser("foo", "pw!pa!!", "email", null, null, true, null, out status);
-      Assert.IsNotNull(user);
+      Assert.That(user, Is.Not.Null);
 
       //Cleanup
       Membership.DeleteUser("foo");
@@ -628,10 +628,10 @@ public void GetPasswordWithNullValues()
       provider.Initialize(null, config);
 
       MembershipUser user = provider.CreateUser("foo", "barbar!", "foo@bar.com", null, null, true, null, out status);
-      Assert.IsNotNull(user);
+      Assert.That(user, Is.Not.Null);
 
       string pw = provider.GetPassword("foo", null);
-      Assert.AreEqual("barbar!", pw);
+      Assert.That(pw, Is.EqualTo("barbar!"));
 
       //Cleanup
       Membership.DeleteUser("foo");
@@ -654,10 +654,10 @@ public void GetEncryptedPassword()
       provider.Initialize(null, config);
 
       MembershipUser user = provider.CreateUser("foo", "barbar!", "foo@bar.com", null, null, true, null, out status);
-      Assert.IsNotNull(user);
+      Assert.That(user, Is.Not.Null);
 
       string pw = provider.GetPassword("foo", null);
-      Assert.AreEqual("barbar!", pw);
+      Assert.That(pw, Is.EqualTo("barbar!"));
 
       //Cleanup
       provider.DeleteUser("foo", true);
@@ -688,7 +688,7 @@ public void CrossAppLogin()
       provider2.Initialize(null, config2);
 
       bool worked = provider2.ValidateUser("foo", "bar!bar");
-      Assert.AreEqual(false, worked);
+      Assert.That(worked, Is.EqualTo(false));
 
       //Cleanup
       provider.DeleteUser("foo", true);
@@ -734,7 +734,7 @@ public void ChangeAppName()
       provider.Initialize(null, config);
       MembershipCreateStatus status;
       provider.CreateUser("foo", "bar!bar", null, null, null, true, null, out status);
-      Assert.True(status == MembershipCreateStatus.Success);
+      Assert.That(status == MembershipCreateStatus.Success);
 
       MySQLMembershipProvider provider2 = new MySQLMembershipProvider();
       NameValueCollection config2 = new NameValueCollection();
@@ -744,11 +744,11 @@ public void ChangeAppName()
       config2.Add("passwordFormat", "Clear");
       provider2.Initialize(null, config2);
       provider2.CreateUser("foo2", "foo!foo", null, null, null, true, null, out status);
-      Assert.True(status == MembershipCreateStatus.Success);
+      Assert.That(status == MembershipCreateStatus.Success);
 
       provider.ApplicationName = "/myapp";
-      Assert.False(provider.ValidateUser("foo", "bar!bar"));
-      Assert.True(provider.ValidateUser("foo2", "foo!foo"));
+      Assert.That(!provider.ValidateUser("foo", "bar!bar"));
+      Assert.That(provider.ValidateUser("foo2", "foo!foo"));
 
       //Cleanup
       //provider.DeleteUser("foo2", true);
@@ -767,10 +767,10 @@ public void GetUserLooksForExactUsername()
       Membership.CreateUser("code", "thecode!", null, "question", "answer", true, out status);
 
       MembershipUser user = Membership.GetUser("code");
-      Assert.AreEqual("code", user.UserName);
+      Assert.That(user.UserName, Is.EqualTo("code"));
 
       user = Membership.GetUser("co_e");
-      Assert.IsNull(user);
+      Assert.That(user, Is.Null);
 
       //Cleanup
       Membership.DeleteUser("code");
@@ -783,10 +783,10 @@ public void GetUserNameByEmailLooksForExactEmail()
       Membership.CreateUser("code", "thecode!", "code@mysql.com", "question", "answer", true, out status);
 
       string username = Membership.GetUserNameByEmail("code@mysql.com");
-      Assert.AreEqual("code", username);
+      Assert.That(username, Is.EqualTo("code"));
 
       username = Membership.GetUserNameByEmail("co_e@mysql.com");
-      Assert.IsNull(username);
+      Assert.That(username, Is.Null);
 
       //Cleanup
       Membership.DeleteUser("code");
@@ -807,20 +807,20 @@ public void CreateUserWithLeadingAndTrailingSpaces()
 
       MembershipCreateStatus status;
       MembershipUser muser1 = provider.CreateUser(" with trailing space ", "dummypassword1!", "w@w1.w", "yes", "yes", true, null, out status);
-      Assert.AreNotEqual(null, muser1);
+      Assert.That(muser1, Is.Not.EqualTo(null));
       MembershipUser muser2 = provider.GetUser("with trailing space", false);
-      Assert.AreNotEqual(null, muser1);
+      Assert.That(muser1, Is.Not.EqualTo(null));
 
       Roles.CreateRole("SomeRole");
-      Assert.True(Roles.GetAllRoles().Length > 0);
+      Assert.That(Roles.GetAllRoles().Length > 0);
 
       bool isInRole = Roles.IsUserInRole(muser2.UserName, "SomeRole");
-      Assert.False(isInRole);
+      Assert.That(!isInRole);
 
       Roles.AddUserToRole(muser2.UserName, "SomeRole");
 
       isInRole = Roles.IsUserInRole(muser2.UserName, "SomeRole");
-      Assert.True(isInRole);
+      Assert.That(isInRole);
     }
   }
 }

From 339317f1a6806d38d7b23908933737817a6faf2c Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 26 May 2024 17:37:37 -0600
Subject: [PATCH 22/99] WL#16402 [Use Assumptions instead of Assert.Ignore in
 testsuite]

Change-Id: Ie9128d5fa19b59265fa0773b8003360ace751f2c
---
 CHANGES                                       |  1 +
 .../FluentAPITests.cs                         | 30 ++-------
 .../LoadingRelatedDataTests.cs                | 15 +----
 .../MySQLTypeMapperTests.cs                   |  5 +-
 .../MySQLDatabaseModelFactoryTest.cs          |  5 +-
 .../DatesTypesTests.cs                        |  5 +-
 .../tests/MySql.Data.Tests/AttributeTests.cs  | 16 ++---
 .../tests/MySql.Data.Tests/AuthTests.cs       | 12 ++--
 .../tests/MySql.Data.Tests/CharSetTests.cs    |  5 +-
 .../MySql.Data.Tests/CharSetUTF8Tests.cs      |  2 +-
 .../ClientSideFailoverTests.cs                |  4 +-
 .../ConnectionStringBuilderTests.cs           |  6 +-
 .../tests/MySql.Data.Tests/ConnectionTests.cs | 25 ++++----
 .../tests/MySql.Data.Tests/DataTypeTests.cs   | 15 ++---
 .../netstandard2_0/GetSchemaTests.cs          | 19 +++---
 .../netstandard2_0/MySQLHelperTests.cs        |  2 +-
 .../netstandard2_0/MySqlDataAdapterTests.cs   |  2 +-
 .../tests/MySql.Data.Tests/PoolingTests.cs    |  2 +-
 MySQL.Data/tests/MySql.Data.Tests/SslTests.cs | 31 +++++-----
 .../tests/MySql.Data.Tests/StoredProcedure.cs |  7 +--
 MySQL.Data/tests/MySql.Data.Tests/Syntax.cs   |  2 +-
 .../tests/MySql.Data.Tests/Transactions.cs    |  4 +-
 .../tests/MySql.Data.Tests/UnixSockets.cs     |  6 +-
 .../tests/MySqlX.Data.Tests/BasicFindTests.cs | 62 +++++++++----------
 .../CharsetAndCollationTests.cs               | 22 +++----
 .../ClientSideFailoverTests.cs                | 12 ++--
 .../tests/MySqlX.Data.Tests/ClientTests.cs    | 50 +++++++--------
 .../MySqlX.Data.Tests/CloseConnectionTests.cs | 14 ++---
 .../MySqlX.Data.Tests/CollectionIndexTests.cs | 44 ++++++-------
 .../MySqlX.Data.Tests/CollectionTests.cs      | 24 +++----
 .../MySqlX.Data.Tests/CompressionTests.cs     | 14 ++---
 .../MySqlX.Data.Tests/CrudInsertTests.cs      | 62 +++++++++----------
 .../MySqlX.Data.Tests/CrudRemoveTests.cs      |  2 +-
 .../MySqlX.Data.Tests/CrudUpdateTests.cs      | 20 +++---
 .../tests/MySqlX.Data.Tests/MergePatch.cs     | 48 +++++++-------
 .../PreparedStatementsTests.cs                |  4 +-
 .../RelationalTests/SqlTests.cs               | 36 +++++------
 .../RelationalTests/TableSelectTests.cs       | 60 +++++++++---------
 .../RelationalTests/TableUpdateTests.cs       |  6 +-
 .../tests/MySqlX.Data.Tests/SchemaTests.cs    |  6 +-
 .../tests/MySqlX.Data.Tests/SessionTests.cs   | 20 +++---
 .../tests/MySqlX.Data.Tests/SslTests.cs       | 44 ++++++-------
 .../MySqlX.Data.Tests/TransactionTests.cs     | 36 +++++------
 MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs   | 32 ++++------
 .../XConnectionStringBuilderTests.cs          |  2 +-
 45 files changed, 393 insertions(+), 448 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6467ea3be..8d2032816 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
 9.1.0
 - Updated test suite to use constraint-based assertions (WL16397).
+- Changed testsuite to use assummptions instead of Assert.Ignore (WL16402).
 
 
 9.0.0
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs
index 8a81ddb6f..4a4c79982 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs
@@ -57,10 +57,7 @@ public void OneTimeTearDown()
     [Test]
     public void EnsureRelationalPatterns()
     {
-      if (!TestUtils.IsAtLeast(5, 7, 0))
-      {
-        Assert.Ignore();
-      }
+      Assume.That(TestUtils.IsAtLeast(5, 7, 0));
 
       var serviceCollection = new ServiceCollection();
       serviceCollection.AddEntityFrameworkMySQL()
@@ -227,10 +224,7 @@ public void CanUseConcurrency()
     [Test]
     public void CanUseConcurrencyToken()
     {
-      if (!TestUtils.IsAtLeast(5, 7, 0))
-      {
-        Assert.Ignore();
-      }
+      Assume.That(TestUtils.IsAtLeast(5, 7, 0));
 
       var serviceCollection = new ServiceCollection();
       serviceCollection.AddEntityFrameworkMySQL()
@@ -256,10 +250,7 @@ public void CanUseConcurrencyToken()
     [Test]
     public void CanUseContainsInQuery()
     {
-      if (!TestUtils.IsAtLeast(5, 7, 0))
-      {
-        Assert.Ignore();
-      }
+      Assume.That(TestUtils.IsAtLeast(5, 7, 0));
 
       var serviceCollection = new ServiceCollection();
       serviceCollection.AddEntityFrameworkMySQL()
@@ -283,10 +274,7 @@ public void CanUseContainsInQuery()
     [Test]
     public void CanUseContainsVarInQuery()
     {
-      if (!TestUtils.IsAtLeast(5, 7, 0))
-      {
-        Assert.Ignore();
-      }
+      Assume.That(TestUtils.IsAtLeast(5, 7, 0));
 
       var serviceCollection = new ServiceCollection();
       serviceCollection.AddEntityFrameworkMySQL()
@@ -311,10 +299,7 @@ public void CanUseContainsVarInQuery()
     [Test]
     public void CanUseContainsWithInvalidValue()
     {
-      if (!TestUtils.IsAtLeast(5, 7, 0))
-      {
-        Assert.Ignore();
-      }
+      Assume.That(TestUtils.IsAtLeast(5, 7, 0));
 
       var serviceCollection = new ServiceCollection();
       serviceCollection.AddEntityFrameworkMySQL()
@@ -340,10 +325,7 @@ public void CanUseContainsWithInvalidValue()
     [Test]
     public void CanUseContainsWithVariableInQuery()
     {
-      if (!TestUtils.IsAtLeast(5, 7, 0))
-      {
-        Assert.Ignore();
-      }
+      Assume.That(TestUtils.IsAtLeast(5, 7, 0));
 
       var serviceCollection = new ServiceCollection();
       serviceCollection.AddEntityFrameworkMySQL()
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs
index 4378672b3..c0c67bf8b 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs
@@ -169,10 +169,7 @@ public void DbSetFind()
     [Test]
     public void JsonDataTest()
     {
-      if (!TestUtils.IsAtLeast(5, 7, 0))
-      {
-        Assert.Ignore();
-      }
+      Assume.That(TestUtils.IsAtLeast(5, 7, 0));
 
       using (JsonContext context = new JsonContext())
       {
@@ -219,10 +216,7 @@ public void JsonDataTest()
     [Test]
     public void JsonInvalidData()
     {
-      if (!TestUtils.IsAtLeast(5, 7, 0))
-      {
-        Assert.Ignore();
-      }
+      Assume.That(TestUtils.IsAtLeast(5, 7, 0));
 
       using (JsonContext context = new JsonContext())
       {
@@ -242,10 +236,7 @@ public void JsonInvalidData()
     [Test]
     public void ComputedColumns()
     {
-      if (!TestUtils.IsAtLeast(5, 7, 0))
-      {
-        Assert.Ignore();
-      }
+      Assume.That(TestUtils.IsAtLeast(5, 7, 0));
 
       using (FiguresContext context = new FiguresContext())
       {
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
index 8e7173496..e94c583c5 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
@@ -55,10 +55,7 @@ public void OneTimeTearDown()
     [Test]
     public void InsertAllDataTypes()
     {
-      if (!TestUtils.IsAtLeast(5, 7, 0))
-      {
-        Assert.Ignore();
-      }
+      Assume.That(TestUtils.IsAtLeast(5, 7, 0));
 
       DateTime now = new DateTime(DateTime.Today.AddSeconds(1).AddMilliseconds(1).AddTicks(10).Ticks);
 
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs
index a520b0c2c..a5032f43a 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs
@@ -265,10 +265,7 @@ private void Test(string createSql, IEnumerable<string> tables, IEnumerable<stri
     [Test]
     public void CanCreateModelForSakila()
     {
-      if (!TestUtils.IsAtLeast(5, 6, 0))
-      {
-        Assert.Ignore();
-      }
+      Assume.That(TestUtils.IsAtLeast(5, 6, 0));
 
       Assembly executingAssembly = typeof(MySQLDatabaseModelFixture).GetTypeInfo().Assembly;
       Stream stream = executingAssembly.GetManifestResourceStream("MySql.EntityFrameworkCore.Design.Tests.Properties.sakiladb-schema.sql")!;
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DatesTypesTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DatesTypesTests.cs
index edefa6f75..f9b72046e 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DatesTypesTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DatesTypesTests.cs
@@ -74,10 +74,7 @@ public class DatesTypesTests : DefaultFixture
     [Test]
     public void CanCreateDBScriptWithDateTimePrecision()
     {
-      if (!Environment.OSVersion.Platform.ToString().StartsWith("Win")) 
-        Assert.Ignore("Fix for Ubuntu. schema.Rows[3] -> System.IndexOutOfRangeException: There is no row at position 3.");
-      if (Version < new Version(5, 6, 5)) 
-        Assert.Ignore("MySQL Server version no compatible");
+      Assume.That(Version >= new Version(5, 6, 5));
 
       using (var ctx = new TestContext(ConnectionString))
       {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs
index 2dbeba0e0..3ec9b1aff 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs
@@ -48,7 +48,7 @@ public void SetUp()
     [TestCase(false)]
     public void SetAttributesWithoutParams(bool prepare)
     {
-      if (!Connection.driver.SupportsQueryAttributes) Assert.Ignore("MySQL Server version does not support query attributes.");
+      Assume.That(Connection.driver.SupportsQueryAttributes, "MySQL Server version does not support query attributes.");
 
       using MySqlCommand cmd = new MySqlCommand();
       cmd.Connection = Connection;
@@ -86,7 +86,7 @@ public void SetAttributesWithoutParams(bool prepare)
     [TestCase("DoubleType", 1234.567)]
     public void ValueTypes(string name, object value)
     {
-      if (!Connection.driver.SupportsQueryAttributes) Assert.Ignore("MySQL Server version does not support query attributes.");
+      Assume.That(Connection.driver.SupportsQueryAttributes, "MySQL Server version does not support query attributes.");
 
       using MySqlCommand cmd = new MySqlCommand();
       cmd.Connection = Connection;
@@ -99,7 +99,7 @@ public void ValueTypes(string name, object value)
     [Test]
     public void TimeSpanValueType()
     {
-      if (!Connection.driver.SupportsQueryAttributes) Assert.Ignore("MySQL Server version does not support query attributes.");
+      Assume.That(Connection.driver.SupportsQueryAttributes, "MySQL Server version does not support query attributes.");
 
       TimeSpan time = new TimeSpan(01, 19, 25);
 
@@ -114,7 +114,7 @@ public void TimeSpanValueType()
     [Test]
     public void DateTimeValueType()
     {
-      if (!Connection.driver.SupportsQueryAttributes) Assert.Ignore("MySQL Server version does not support query attributes.");
+      Assume.That(Connection.driver.SupportsQueryAttributes, "MySQL Server version does not support query attributes.");
 
       DateTime dateTime = DateTime.Now;
 
@@ -143,7 +143,7 @@ public void ClearAttributes()
     [Test]
     public void SameNameAttribute()
     {
-      if (!Connection.driver.SupportsQueryAttributes) Assert.Ignore("MySQL Server version does not support query attributes.");
+      Assume.That(Connection.driver.SupportsQueryAttributes, "MySQL Server version does not support query attributes.");
 
       using MySqlCommand cmd = new MySqlCommand();
       cmd.Connection = Connection;
@@ -160,7 +160,7 @@ public void SameNameAttribute()
     [TestCase(false)]
     public void QueryAttributesNotSupported(bool prepare)
     {
-      if (Connection.driver.SupportsQueryAttributes) Assert.Ignore("Query attributes supported.");
+      Assume.That(!Connection.driver.SupportsQueryAttributes,"Query attributes supported.");
 
       MySqlTrace.Listeners.Clear();
       MySqlTrace.Switch.Level = System.Diagnostics.SourceLevels.Warning;
@@ -185,7 +185,7 @@ public void QueryAttributesNotSupported(bool prepare)
     [TestCase(false)]
     public void AttributesAndParameters(bool prepare)
     {
-      if (!Connection.driver.SupportsQueryAttributes) Assert.Ignore("MySQL Server version does not support query attributes.");
+      Assume.That(Connection.driver.SupportsQueryAttributes, "MySQL Server version does not support query attributes.");
 
       using MySqlCommand cmd = new MySqlCommand();
       cmd.Connection = Connection;
@@ -222,7 +222,7 @@ public void InvalidValues()
     [TestCase(false)]
     public void ParameterOverridesAttributeValue(bool prepare)
     {
-      if (!Connection.driver.SupportsQueryAttributes) Assert.Ignore("MySQL Server version does not support query attributes.");
+      Assume.That(Connection.driver.SupportsQueryAttributes, "MySQL Server version does not support query attributes.");
 
       using var cmd = new MySqlCommand("select mysql_query_attribute_string('name') as attribute, mysql_query_attribute_string('name2') as attribute2, @name as parameter, @name2 as parameter2, mysql_query_attribute_string('attr') as attribute3", Connection);
       cmd.Attributes.SetAttribute("name", "attribute");
diff --git a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
index 29fe191f8..0a3a3df2d 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
@@ -358,8 +358,7 @@ private void TestIntegratedSecurityWithUser(string user, bool pooling)
     [Property("Category", "Security")]
     public void ConnectUsingMySqlNativePasswordPlugin()
     {
-      if (!Check_Plugin_Enabled("mysql_native_password"))
-        Assert.Ignore("mysql_native_password plugin must be enabled on the server to run this test");
+      Assume.That(Check_Plugin_Enabled("mysql_native_password"), "mysql_native_password plugin must be enabled on the server to run this test");
 
       string userName = "testNtvPass";
       string password = "mysql";
@@ -1835,12 +1834,9 @@ public void AuthPlainAndMySql41()
                   "with secure connections(classic connection).Server started with mysql native password plugin")]
     public void Sha256AndNativeWithCertificates()
     {
-      if (Version < new Version("8.0.4"))
-        Assert.Ignore("This test is for MySql 8.0.4 or higher");
-      if (!Check_Plugin_Enabled("mysql_native_password"))
-        Assert.Ignore("mysql_native_password plugin must be enabled on the server to run this test");
-      if (!Check_Plugin_Enabled("caching_sha2_password"))
-        Assert.Ignore("This test needs plugin caching_sha2_password");
+      Assume.That(Version >= new Version("8.0.4"), "This test is for MySql 8.0.4 or higher");
+      Assume.That(Check_Plugin_Enabled("mysql_native_password"), "mysql_native_password plugin must be enabled on the server to run this test");
+      Assume.That(Check_Plugin_Enabled("caching_sha2_password"), "This test needs plugin caching_sha2_password");
 
       // Test connection for VALID user in LDAP server with different SSLMode values, expected result pass
       string assemblyPath = Assembly.GetExecutingAssembly().Location.Replace(String.Format("{0}.dll",
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs b/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs
index 698c274ca..d3021e26d 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs
@@ -503,8 +503,7 @@ public void CharacterVariablesByDefault()
     [Test]
     public void DatabaseCaseSentitive()
     {
-      if (Version >= new Version(8, 0, 0) || !Platform.IsWindows()) Assert.Ignore("This test is only for Windows OS and MySql higher than 8.0.");
-
+      Assume.That(Version >= new Version(8, 0, 0) && Platform.IsWindows(), "This test is only for Windows OS and MySql higher than 8.0.");
       ExecuteSQL("DROP PROCEDURE IF EXISTS spTest");
       ExecuteSQL(@"CREATE PROCEDURE spTest () BEGIN SELECT ""test""; END");
 
@@ -528,7 +527,7 @@ public void DatabaseCaseSentitive()
     [Test]
     public void PoundSymbolInJsonColumn()
     {
-      if (Version < new Version(5, 7, 0)) Assert.Ignore("JSON data type not available in MySQL Server v5.6");
+      Assume.That(Version >= new Version(5, 7, 0), "JSON data type not available in MySQL Server v5.6");
 
       ExecuteSQL("CREATE TABLE `PoundTable`(`TextColumn` VARCHAR(20) NULL, `JsonColumn` JSON);");
       ExecuteSQL("INSERT INTO `PoundTable`(`TextColumn`, `JsonColumn`) VALUES('£', JSON_OBJECT('Value', '£'));");
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs b/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs
index 33bb95c5f..7202be6cf 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs
@@ -78,7 +78,7 @@ public void UTF8BlogsTruncating()
     public void GetSchemaOnUTF8()
     {
 #if !NETFRAMEWORK
-      if (!Platform.IsWindows()) Assert.Ignore();
+      Assume.That(Platform.IsWindows());
 #endif
       ExecuteSQL("CREATE TABLE Test(name VARCHAR(40) NOT NULL, name2 VARCHAR(20)) " +
         "CHARACTER SET utf8");
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
index 829fae591..313f4c353 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
@@ -55,7 +55,7 @@ public void RandomMethod(string server, bool shouldPass = true)
       if (Settings.Server.Contains("::1"))
       {
         ipv6 = GetMySqlServerIp(true);
-        if (string.IsNullOrEmpty(ipv6)) Assert.Ignore("No IPv6 available.");
+        Assume.That(!string.IsNullOrEmpty(ipv6), "No IPv6 available.");
         Settings.Server = server.Replace("::1", ipv6);
       }
 
@@ -83,7 +83,7 @@ private static ConnectionState TryConnection(string connString)
     public void PriorityMethod()
     {
 #if !NETFRAMEWORK
-      if (!System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows)) Assert.Ignore();
+      Assume.That(System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows));
 #endif
       // Multiple hosts and validate proper order assigned to hosts.
       Settings.Pooling = false;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
index 5f04d2c1b..bf4bd2450 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
@@ -196,7 +196,7 @@ public void DotnetCoreNotCurrentlySupported()
     [Test]
     public void NonWindowsOSNotCurrentlySupported()
     {
-      if (Platform.IsWindows()) Assert.Ignore("This test is for non Windows OS only.");
+      Assume.That(!Platform.IsWindows(), "This test is for non Windows OS only.");
 
       List<string> options = new List<string>(new string[]
       {
@@ -282,7 +282,7 @@ public void UsingPwdAliases(string alias)
     [Test, Description("Session BaseString/MySQLConnectionString Builder")]
     public void ConnectionStringBuilderClassicTests()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only.");
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
 
       MySqlConnectionStringBuilder mysql = new MySqlConnectionStringBuilder(Settings.ConnectionString);
 
@@ -442,7 +442,7 @@ public void TryGetValue()
     [Test]
     public void KerberosAuthModeTest()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only.");
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
 
       string connString;
       MySqlConnection conn;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
index c2fef3dab..0b53cf79a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
@@ -763,12 +763,12 @@ public void TestNonSupportedOptions()
     [Test]
     public void IPv6Connection()
     {
-      if (Version < new Version(5, 6, 0)) return;
+      Assume.That(Version >= new Version(5, 6, 0));
 
       MySqlConnectionStringBuilder sb = new MySqlConnectionStringBuilder(Connection.ConnectionString);
       sb.Server = GetMySqlServerIp(true);
 
-      if (sb.Server == string.Empty) Assert.Ignore("No IPv6 available.");
+      Assume.That(sb.Server != string.Empty, "No IPv6 available.");
 
       using (MySqlConnection conn = new MySqlConnection(sb.ToString()))
       {
@@ -855,7 +855,7 @@ public void ExpiredPwdWithOldPassword()
     [Ignore("To be able to connect using Named Pipes, it requires to start the server supporting the protocol")]
     public void ConnectUsingNamedPipes()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("Shared Memory is only supported on Windows.");
+      Assume.That(Platform.IsWindows(), "Named Pipes is only supported on Windows.");
 
       var sb = new MySqlConnectionStringBuilder()
       {
@@ -881,7 +881,7 @@ public void ConnectUsingNamedPipes()
     [Ignore("To be able to connect using Named Pipes, it requires to start the server supporting the protocol")]
     public void NamedPipesMultithreadConnection()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("Named Pipes is only supported on Windows.");
+      Assume.That(Platform.IsWindows(), "Named Pipes is only supported on Windows.");
 
       var sb = new MySqlConnectionStringBuilder()
       {
@@ -925,9 +925,10 @@ public void NamedPipesMultithreadConnection()
     /// </summary>
     [Test]
     [Property("Category", "Security")]
+    [Ignore("To be able to connect using Shared Memory, it requires to start the server supporting the protocol")]
     public void ConnectUsingSharedMemory()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("Shared Memory is only supported on Windows.");
+      Assume.That(Platform.IsWindows(), "Shared Memory is only supported on Windows.");
 
       var sb = new MySqlConnectionStringBuilder()
       {
@@ -962,7 +963,7 @@ public void ConnectUsingSharedMemory()
     [Ignore("To be able to connect using Shared Memory, it requires to start the server supporting the protocol")]
     public void SharedMemoryMultithreadConnection()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("Shared Memory is only supported on Windows.");
+      Assume.That(Platform.IsWindows(), "Shared Memory is only supported on Windows.");
 
       var sb = new MySqlConnectionStringBuilder()
       {
@@ -1208,7 +1209,7 @@ public void MediumTextMalformedPkg()
     [Test, Description("Verify Compression in classic protocol where default connection string is used without any option")]
     public void CompressionUnit()
     {
-      if (Version < new Version(8, 0, 0)) Assert.Ignore("This test is for MySql 8.0 or higher.");
+      Assume.That(Version >= new Version(8, 0, 0), "This test is for MySql 8.0 or higher.");
       using (var dbConn = new MySqlConnection(Connection.ConnectionString + ";UseCompression=True"))
       {
         var cmd = new MySqlCommand();
@@ -1296,7 +1297,7 @@ public void CompressionUnit()
     [Test, Description("Verify Compression in classic protocol where default connection string is used without any option")]
     public void CompressionValidationInClassicProtocol()
     {
-      if (Version < new Version(8, 0, 0)) Assert.Ignore("This test is for MySql 8.0 or higher.");
+      Assume.That(Version >= new Version(8, 0, 0), "This test is for MySql 8.0 or higher.");
       string[] compressionAlgorithms = new string[] { "zlib", "zstd", "uncompressed", "uncompressed,zlib", "uncompressed,zstd", "zstd,zlib", "zstd,zlib,uncompressed" };
       for (int k = 0; k < compressionAlgorithms.Length; k++)
       {
@@ -1438,7 +1439,7 @@ public void CompressionValidationInClassicProtocol()
     [Test, Description("Test MySql Password Expiration with blank password")]
     public void ExpiredBlankPassword()
     {
-      if (Version < new Version(8, 0, 0)) Assert.Ignore("This test is for MySql 8.0 or higher.");
+      Assume.That(Version >= new Version(8, 0, 0), "This test is for MySql 8.0 or higher.");
 
       string host = Host == "localhost" ? Host : "%";
       MySqlConnectionStringBuilder sb = new MySqlConnectionStringBuilder(Connection.ConnectionString);
@@ -1473,7 +1474,7 @@ public void ExpiredBlankPassword()
     [Test, Description("Test MySql Password Expiration with query variables")]
     public void ExpiredPasswordBug2()
     {
-      if (Version < new Version(8, 0, 0)) Assert.Ignore("This test is for MySql 8.0 or higher.");
+      Assume.That(Version >= new Version(8, 0, 0), "This test is for MySql 8.0 or higher.");
       var _expiredPwd = "expiredPwd";
       SetupExpiredPasswordUser(_expiredPwd);
 
@@ -1498,7 +1499,7 @@ public void ExpiredPasswordBug2()
     [Test, Description("Test MySql Password Expiration with IsPasswordExpired validation")]
     public void ExpiredPasswordBug3()
     {
-      if (Version < new Version(8, 0, 0)) Assert.Ignore("This test is for MySql 8.0 or higher.");
+      Assume.That(Version >= new Version(8, 0, 0), "This test is for MySql 8.0 or higher.");
       string host = Host == "localhost" ? Host : "%";
 
       var _expiredPwd = "expiredPwd";
@@ -1541,7 +1542,7 @@ public void ExpiredPasswordBug3()
     [Test, Description("Test MySql Password Expiration and set password")]
     public void ExpiredPasswordBug4()
     {
-      if (Version < new Version(8, 0, 0)) Assert.Ignore("This test is for MySql 8.0 or higher.");
+      Assume.That(Version >= new Version(8, 0, 0), "This test is for MySql 8.0 or higher.");
       string host = Host == "localhost" ? Host : "%";
 
       var _expiredPwd = "expiredPwd";
diff --git a/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
index acb1cea84..784409462 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
@@ -1240,7 +1240,7 @@ public void Timediff()
     [Test]
     public void CanReadJsonValue()
     {
-      if (Version < new Version(5, 7)) Assert.Ignore("This test is for MySql 5.7 or higher"); ;
+      Assume.That(Version >= new Version(5, 7, 0), "This test is for MySql 5.7 or higher.");
       ExecuteSQL("CREATE TABLE Test(Id int NOT NULL PRIMARY KEY, jsoncolumn JSON)");
       MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (@id, '[1]')", Connection);
       cmd.Parameters.AddWithValue("@id", 1);
@@ -1503,7 +1503,7 @@ public void UnexpectedColumnSize()
     [Test, Description("Test Can Read long JSON Values")]
     public void ReadJSONLongValues()
     {
-      if (Version < new Version(5, 7)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(Version >= new Version(5, 7, 0), "This test is for MySql 5.7 or higher.");
       var sb = new StringBuilder("0");
       for (int x = 1; x <= 575; x++)
       {
@@ -1547,7 +1547,7 @@ public void ReadJSONLongValues()
     [Test, Description("Test Can Read JSON Value Stress")]
     public void ReadJSONValueStress()
     {
-      if (Version < new Version(5, 7)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(Version >= new Version(5, 7, 0), "This test is for MySql 5.7 or higher.");
       ExecuteSQL("CREATE TABLE Test (Id int NOT NULL PRIMARY KEY, jsoncolumn JSON)");
       string jsonTest = null;
       for (var i = 0; i < 1000; i++)
@@ -1664,8 +1664,7 @@ public void GetIntForTinyInt(bool treatAsBool, bool isPrepared)
     [Test]
     public void BadVectorDataThrowsException()
     {
-      if (Version < new Version(9, 0, 0))
-        Assert.Ignore();
+      Assume.That(Version >= new Version(9, 0, 0), "This test is for MySql 9.0 or higher.");
 
       ExecuteSQL(@"CREATE TABLE Test (vector1 VECTOR)");
       using var cmd = new MySqlCommand();
@@ -1682,8 +1681,7 @@ public void BadVectorDataThrowsException()
     [TestCase(true)]
     public void InsertAndSelectVector(bool prepared)
     {
-      if (Version < new Version(9, 0, 0))
-        Assert.Ignore();
+      Assume.That(Version >= new Version(9, 0, 0), "This test is for MySql 9.0 or higher.");
 
       ExecuteSQL(@"CREATE TABLE Test (vector1 VECTOR)");
       using var cmd = new MySqlCommand();
@@ -1724,8 +1722,7 @@ public void InsertAndSelectVector(bool prepared)
     [TestCase(true)]
     public void VectorReturnedFromSproc(bool prepared)
     {
-      if (Version < new Version(9, 0, 0))
-        Assert.Ignore();
+      Assume.That(Version >= new Version(9, 0, 0), "This test is for MySql 9.0 or higher.");
 
       ExecuteSQL("DROP PROCEDURE IF EXISTS spTest");
       ExecuteSQL(@"CREATE PROCEDURE spTest (OUT v1 VECTOR) BEGIN 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
index 115f2b263..c36c31488 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
@@ -76,8 +76,7 @@ public void Collections()
     [Test]
     public void DataTypes()
     {
-      if (Version < new Version(9, 0, 0))
-        Assert.Ignore();
+      Assume.That(Version >= new Version(9, 0, 0), "This test is for MySql 9.0 or higher.");
 
       DataTable dt = Connection.GetSchema("DataTypes", new string[] { });
 
@@ -250,8 +249,8 @@ col3 varchar(50) character set utf8, col4 tinyint unsigned,
     [Test]
     public void CanGetSchemaInformationGeneratedColumns()
     {
-      if (!System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows)) Assert.Ignore();
-      if (Version < new Version(5, 7, 6)) Assert.Ignore();
+      Assume.That(System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows));
+      Assume.That(Version >= new Version(5, 7, 6));
 
       ExecuteSQL("CREATE TABLE `Test` (`ID` int NOT NULL AUTO_INCREMENT PRIMARY KEY, `Name` char(35) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL)");
 
@@ -490,7 +489,7 @@ public void SingleForeignKey()
     [Test]
     public void ForeignKeys()
     {
-      if (!System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows)) Assert.Ignore();
+      Assume.That(System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows));
 
       ExecuteSQL("DROP TABLE IF EXISTS product_order");
       ExecuteSQL("DROP TABLE IF EXISTS customer");
@@ -681,8 +680,8 @@ public void ColumnSizeWithOldGuids()
     [Test]
     public void IsLongProperty()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only.");
-      if (Version < new Version(5, 7, 6)) Assert.Ignore("This test is for MySql 5.7.6 or higher");
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
+      Assume.That(Version >= new Version(5, 7, 6), "This test is for MySql 5.7.6 or higher");
       ExecuteSQL("Drop table if exists datatypes1");
       ExecuteSQL("create table datatypes1(`longtext` longtext,`longblob` longblob)");
       ExecuteSQL("insert into datatypes1 values('test', _binary'test')");
@@ -706,8 +705,8 @@ public void IsLongProperty()
     [Test]
     public void NumericPrecisionProperty()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only.");
-      if (Version < new Version(5, 7, 6)) Assert.Ignore();
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
+      Assume.That(Version >= new Version(5, 7, 6), "This test is for MySql 5.7.6 or higher");
       ExecuteSQL("Drop table if exists datatypes2");
       ExecuteSQL("create table datatypes2(decimal0 decimal(8, 0))");
       using (var cmd = Connection.CreateCommand())
@@ -744,7 +743,7 @@ public void GetSchemaReturnColumnsByOrdinalPosition()
     [Test, Description("Test to verify different variations in Generated Coloumns")]
     public void GeneratedColumnsVariations()
     {
-      if (Version < new Version(5, 7)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(Version >= new Version(5, 7, 0), "This test is for MySql 5.7 or higher");
 
       using (var conn = new MySqlConnection(Settings.ConnectionString))
       {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
index c16d037f8..02ead71d3 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
@@ -48,7 +48,7 @@ protected override void Cleanup()
     [Test]
     public void EscapeStringMethodCanEscapeQuotationMark()
     {
-      if (!System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows)) Assert.Ignore();
+      Assume.That(System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows));
 
       ExecuteSQL("CREATE TABLE Test (id int NOT NULL, name VARCHAR(100))");
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
index 0df4429a5..fa7802e05 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
@@ -564,7 +564,7 @@ public void SkippingRowsLargerThan1024()
     [Test]
     public void TestBatchingInserts()
     {
-      if (!System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows)) Assert.Ignore();
+      Assume.That(System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows));
 
       ExecuteSQL("CREATE TABLE Test (id INT, name VARCHAR(20), PRIMARY KEY(id))");
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
index 5e502aed6..bc638723a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
@@ -659,7 +659,7 @@ public void MultipleConnectionWithPooling()
     [Test, Description("Verify the connection is not in CLOSE_WAIT state after failed connection due to Connection Limit")]
     public void CloseWaitScenario1()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is only for Windows OS");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS");
       var poolSize = 5;
       var connectionString = $"server={Host};user={Settings.UserID};database={Settings.Database};port={Port};password={Settings.Password};Pooling=true;Max Pool Size={poolSize};SSL Mode=None;ConnectionTimeout=5";
       List<MySqlConnection> connectionList = new();
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
index 713fb3a99..4ff7c7a36 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
@@ -214,8 +214,7 @@ public void SslOverrided()
     [Property("Category", "Security")]
     public void TlsVersionTest(string tlsVersion, int error)
     {
-      if (error == 4 && Platform.IsMacOSX())
-        Assert.Ignore();
+      Assume.That(error != 4 || !Platform.IsMacOSX());
 
       var builder = new MySqlConnectionStringBuilder(Connection.ConnectionString);
       void SetTlsVersion() { builder.TlsVersion = tlsVersion; }
@@ -364,7 +363,7 @@ public void ConnectUsingPFXCertificates()
     public void InvalidCertificateThumbprint()
     {
 #if !NETFRAMEWORK
-      if (!System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows)) Assert.Ignore();
+      Assume.That(System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows));
 #endif
 
       // Create a mock of certificate store
@@ -767,7 +766,7 @@ public void ShowVariablesRemoved()
     [Test]
     public void ConnectUsingCertificateFileAndTlsVersion()
     {
-      if (Version <= new Version(8, 0, 16)) Assert.Ignore("This test for MySql server 8.0.16 or higher");
+      Assume.That(Version >= new Version(8, 0, 16), "This test for MySql server 8.0.16 or higher");
       var builder = new MySqlConnectionStringBuilder(Settings.ConnectionString);
       builder.SslMode = MySqlSslMode.Required;
       builder.CertificateFile = "client.pfx";
@@ -802,8 +801,8 @@ public void ConnectUsingCertificateFileAndTlsVersion()
     [Test, Description("Classic-Scenario(correct ssl-ca,wrong ssl-key/ssl-cert,ssl-mode required and default)")]
     public void CorrectSslcaWrongSslkeySslcertRequiredMode()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is only for Windows OS");
-      if (Version <= new Version(8, 0, 16)) Assert.Ignore("This test for MySql server 8.0.16 or higher");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS");
+      Assume.That(Version >= new Version(8, 0, 16), "This test for MySql server 8.0.16 or higher");
       string[] sslcertlist = new string[] { "", " ", null, "file", "file.pem" };
       string[] sslkeylist = new string[] { "", " ", null, "file", "file.pem" };
       for (int i = 0; i < sslcertlist.Length; i++)
@@ -887,8 +886,8 @@ public void CorrectSslcaWrongSslkeySslcertRequiredMode()
     [Test, Description("Clasic-Scenario(correct ssl-ca,no ssl-key/ssl-cert,ssl-mode required and default)")]
     public void CorrectSslcaNoSslkeyorCertRequiredMode()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is only for Windows OS");
-      if (Version <= new Version(8, 0, 16)) Assert.Ignore("This test for MySql server 8.0.16 or higher");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS");
+      Assume.That(Version >= new Version(8, 0, 16), "This test for MySql server 8.0.16 or higher");
       var connClassic = new MySqlConnectionStringBuilder();
       connClassic.Server = Host;
       connClassic.Port = Convert.ToUInt32(Port);
@@ -969,9 +968,9 @@ public void CorrectSslcaNoSslkeyorCertRequiredMode()
     [Test, Description("checking different versions of TLS versions")]
     public void SecurityTlsCheck()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is only for Windows OS");
-      if (Version <= new Version(8, 0, 16)) Assert.Ignore("This test for MySql server 8.0.16 or higher");
-      if (!ServerHaveSsl()) Assert.Ignore("Server doesn't have Ssl support");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS");
+      Assume.That(Version >= new Version(8, 0, 16), "This test for MySql server 8.0.16 or higher");
+      Assume.That(ServerHaveSsl(), "Server doesn't have Ssl support");
 
       MySqlSslMode[] modes = { MySqlSslMode.Required, MySqlSslMode.VerifyCA, MySqlSslMode.VerifyFull };
       String[] version;
@@ -1010,8 +1009,8 @@ public void SecurityTlsCheck()
     [Test, Description("checking errors when invalid values are used ")]
     public void InvalidTlsversionValues()
     {
-      if (Version <= new Version(8, 0, 16)) Assert.Ignore("This test for MySql server 8.0.16 or higher");
-      if (!ServerHaveSsl()) Assert.Ignore("Server doesn't have Ssl support");
+      Assume.That(Version >= new Version(8, 0, 16), "This test for MySql server 8.0.16 or higher");
+      Assume.That(ServerHaveSsl(), "Server doesn't have Ssl support");
 
       string[] version = new string[] { "null", "v1", "[ ]", "[TLSv1.9]", "[TLSv1.1,TLSv1.7]", "ui9" };//blank space is considered as default value
       var conStr = $"server={Host};port={Port};userid={Settings.UserID};password={Settings.Password};SslCa={_sslCa};SslCert={_sslCert};SslKey={_sslKey};ssl-ca-pwd=pass";
@@ -1032,7 +1031,7 @@ public void InvalidTlsversionValues()
     [Test, Description("Default SSL user with SSL but without SSL Parameters")]
     public void SslUserWithoutSslParams()
     {
-      if (!ServerHaveSsl()) Assert.Ignore("Server doesn't have Ssl support");
+      Assume.That(ServerHaveSsl(), "Server doesn't have Ssl support");
       MySqlCommand cmd = new MySqlCommand();
       string connstr = $"server={Host};user={Settings.UserID};port={Port};password={Settings.Password};sslmode={MySqlSslMode.Disabled}";
       using (var c = new MySqlConnection(connstr))
@@ -1056,8 +1055,8 @@ public void SslUserWithoutSslParams()
     [Test]
     public void PositiveSslConnectionWithCertificates()
     {
-      if (Version < new Version(5, 7, 0)) Assert.Ignore("This test is for MySql Server 5.7 or higher");
-      if (!ServerHaveSsl()) Assert.Ignore("Server doesn't have Ssl support");
+      Assume.That(Version >= new Version(5, 7, 0), "This test for MySql server 5.7 or higher");
+      Assume.That(ServerHaveSsl(), "Server doesn't have Ssl support");
       MySqlCommand cmd = new MySqlCommand();
 
       var connStr = $"server={Host};port={Port};user={Settings.UserID};password={Settings.Password};CertificateFile={_sslCa};CertificatePassword=pass;SSL Mode=Required;";
diff --git a/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs b/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs
index 8a96eafd1..bb02fef1a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs
@@ -746,7 +746,6 @@ public void DeriveParameters()
     [Test]
     public void ProcedureCacheMiss()
     {
-      if (Version.Major == new Version(5, 7, 43).Major && Version.Minor == new Version(5, 7, 43).Minor) Assert.Ignore("Test temporaly deactivated for MySQL Server version 5.7.x due to a possible bug");
 
       ExecuteSQL("CREATE PROCEDURE spTest(id INT) BEGIN SELECT 1; END");
 
@@ -932,7 +931,7 @@ public void VerifyParametersType()
     [Test]
     public void PassJsonParameter()
     {
-      if (Version < new Version(5, 7, 8)) Assert.Ignore("JSON data type was included in MySQL Server from v5.7.8");
+      Assume.That(Version >= new Version(5, 7, 8), "JSON data type was included in MySQL Server from v5.7.8");
 
       ExecuteSQL("CREATE TABLE Test(jsonValue json NOT NULL)");
       ExecuteSQL("CREATE PROCEDURE spTest(IN p_jsonValue JSON) BEGIN INSERT INTO Test VALUES(p_jsonValue); END");
@@ -1045,7 +1044,7 @@ public void PassEnumParameter()
     [Test]
     public void EventsStatementsHistory()
     {
-      if (Version < new Version(8, 0, 0)) Assert.Ignore("This test is for MySql 8.0 or higher");
+      Assume.That(Version >= new Version(8, 0, 0), "This test is for MySql 8.0 or higher");
       bool testResult = false;
       var spName = "spGetCount";
       var cmd = new MySqlCommand(" show variables like 'general_log'", Connection);
@@ -1053,7 +1052,7 @@ public void EventsStatementsHistory()
       {
         while (rdr.Read())
         {
-          if (rdr.GetString(1) != "ON") Assert.Ignore("general_log is disabled");
+          Assume.That(rdr.GetString(1) == "ON", "general_log is disabled");
         }
       }
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs b/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs
index 9b27c98ff..282317497 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs
@@ -534,7 +534,7 @@ public void QueryNormalizerCrash2()
     public void TokenizerBatching()
     {
 #if !NETFRAMEWORK
-      if (!System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows)) Assert.Ignore();
+      Assume.That(System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows));
 #endif
 
       ExecuteSQL("CREATE TABLE Test (id INT, expr INT,name VARCHAR(20), PRIMARY KEY(id))");
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs b/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
index 585875433..0ac8a5152 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
@@ -253,7 +253,7 @@ public void EnlistTransactionWNestedTrxTest()
     public void ManualEnlistment()
     {
 #if !NETFRAMEWORK
-      if (!System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows)) Assert.Ignore();
+      Assume.That(System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows));
 #endif
       ExecuteSQL("DROP TABLE IF EXISTS Test");
       ExecuteSQL("CREATE TABLE Test (key2 VARCHAR(1), name VARCHAR(100), name2 VARCHAR(100))");
@@ -567,7 +567,7 @@ public void ReusingSameConnectionTest()
     public void ScopeTimeoutWithMySqlHelper()
     {
 #if !NETFRAMEWORK
-      if (!System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows)) Assert.Ignore();
+      Assume.That(System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows));
 #endif
       ExecuteSQL("DROP TABLE IF EXISTS Test");
       ExecuteSQL("CREATE TABLE Test (id int)");
diff --git a/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs b/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs
index 3499e1f32..7d70267cd 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs
@@ -42,11 +42,7 @@ public void ConnectionTest()
     {
       string unixConnectionString = $"server={UnixSocket};user={Settings.UserID};password={Settings.Password};protocol=unix;";
 
-      if (Platform.IsWindows())
-      {
-        Console.Error.WriteLine($"{nameof(ConnectionTest)} ignored because it's a Windows system.");
-        Assert.Ignore();
-      }
+      Assume.That(!Platform.IsWindows());
 
       using (MySqlConnection conn = new MySqlConnection(unixConnectionString))
       {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
index d04d0e200..df3f15a85 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
@@ -207,7 +207,7 @@ public void BindJsonAsString()
     [Test]
     public void RowLockingNotSupportedInOlderVersions()
     {
-      if (session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql lower than 8.0.3.");
+      Assume.That(!session.Version.isAtLeast(8, 0, 3), "This test is for MySql lower than 8.0.3.");
       Collection coll = CreateCollection("test");
 
       Exception ex = Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll.Find().LockShared()));
@@ -220,7 +220,7 @@ public void RowLockingNotSupportedInOlderVersions()
     [Test]
     public void SimpleSharedLock()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -256,7 +256,7 @@ public void SimpleSharedLock()
     [Test]
     public void SharedLockForbidsToModifyDocuments()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -299,7 +299,7 @@ public void SharedLockForbidsToModifyDocuments()
     [Test]
     public void ExclusiveLockForbidsToModifyDocuments()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -341,7 +341,7 @@ public void ExclusiveLockForbidsToModifyDocuments()
     [Test]
     public void SharedLockAfterExclusiveLock()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -383,7 +383,7 @@ public void SharedLockAfterExclusiveLock()
     [Test]
     public void ExclusiveLockAfterSharedLock()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -426,7 +426,7 @@ public void ExclusiveLockAfterSharedLock()
     [Test]
     public void ExclusiveLockAfterExclusiveLock()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -467,7 +467,7 @@ public void ExclusiveLockAfterExclusiveLock()
     [Test]
     public void InOperatorWithListOfValues()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       // Validates the IN operator allows expressions of the type
       // ( compExpr ["NOT"] "IN" "(" argsList ")" ) | ( compExpr ["NOT"] "IN" "[" argsList "]" )
@@ -523,7 +523,7 @@ public void InOperatorWithListOfValues()
     [Test]
     public void InOperatorWithCompExpr()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       // Validates the IN operator allows expressions of the type: compExpr ["NOT"] "IN" compExpr
       Collection coll = CreateCollection("test");
@@ -561,7 +561,7 @@ public void InOperatorWithCompExpr()
     [Test]
     public void InOperatorWithJsonArrays()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection coll = CreateCollection("test");
       var docString = "{ \"_id\": \"1001\", \"ARR\":[1,2,3], \"ARR1\":[\"name\", \"name2\", \"name3\"]}";
@@ -620,7 +620,7 @@ public enum LockMode { Exclusive, Shared }
     [TestCase(LockContention.SkipLocked, LockMode.Shared)]
     public void LockExclusiveAndSharedWithWaitingOptions(LockContention lockOption, LockMode lockMode)
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       string collectionName = "test";
       var coll = CreateCollection(collectionName);
@@ -1301,7 +1301,7 @@ public void FindWithManyConditions()
     [Test, Description("Reading exclusively locked anonymous object array using LockShared without waiting option. ")]
     public void ExclusiveLocksAndCommit(int scenario)
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -1371,7 +1371,7 @@ public void ExclusiveLocksAndCommit(int scenario)
     [Test, Description("Reading a document which was locked using lock_shared without waiting option")]
     public void SharedLockAndCommit(LockMode? lockMode)
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
       {
@@ -1431,7 +1431,7 @@ public void SharedLockAndCommit(LockMode? lockMode)
     [Test, Description("Reading a document using lock_shared using SKIPLOCK and NOWAIT options with CRUD operations happening parallely.")]
     public void SharedAndExclusiveLockWithSkipAndNoWait(LockMode lockMode)
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
       {
@@ -1478,7 +1478,7 @@ public void SharedAndExclusiveLockWithSkipAndNoWait(LockMode lockMode)
     [Test, Description("Multiple lock calls using NOWAIT and SKIPLOCK waiting option. ")]
     public void MultipleLocksWithNowaitAndSkiplock()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
       {
@@ -1521,7 +1521,7 @@ public void MultipleLocksWithNowaitAndSkiplock()
     [Test, Description("Reading multiple rows in a locked document(lock_shared) using SKIPLOCK and NOWAIT ")]
     public void LockSharedMultipleReads()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
       {
@@ -1562,7 +1562,7 @@ public void LockSharedMultipleReads()
     [Test, Description("Reading multiple rows in an exclusively locked document using SKIPLOCK and NOWAIT ")]
     public void LockExclusiveMultipleReads()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
       {
@@ -1600,7 +1600,7 @@ public void LockExclusiveMultipleReads()
     [Test, Description("Collection.Find() with shared lock and Collection.Modify() normal from two sessions. ")]
     public void LockSharedAndModify()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       ExecuteSQLStatement(session.SQL("SET autocommit = 0"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
       {
@@ -1640,7 +1640,7 @@ public void LockSharedAndModify()
     [Test, Description("Collection.Find() with shared lock from two sessions. ")]
     public void LockSharedTwoSessions()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       ExecuteSQLStatement(session.SQL("SET autocommit = 0"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
       {
@@ -1677,7 +1677,7 @@ public void LockSharedTwoSessions()
     [Test, Description("Collection.Find() with exclusive lock and Collection.Find() with shared lock from two sessions. ")]
     public void LockExclusiveFindAndLockSharedFind()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       ExecuteSQLStatement(session.SQL("SET autocommit = 0"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
       {
@@ -1719,7 +1719,7 @@ public void LockExclusiveFindAndLockSharedFind()
     [Test, Description("Collection.Find() with shared lock and Collection.Find() with exclusive lock from two sessions. ")]
     public void LockSharedFindAndExclusiveLocks()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       ExecuteSQLStatement(session.SQL("SET autocommit = 0"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
       {
@@ -1766,7 +1766,7 @@ public void LockSharedFindAndExclusiveLocks()
     [Test, Description("Collection.Find() with exclusive lock and Collection.Find() with exclusive lock from two sessions. ")]
     public void LockExclusiveWithRollback()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       ExecuteSQLStatement(session.SQL("SET autocommit = 0"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
       {
@@ -1810,7 +1810,7 @@ public void LockExclusiveWithRollback()
     [Test, Description("Collection.Find() with exclusive lock and Collection.Find() with exclusive lock from two sessions--Select multiple records ")]
     public void LockExclusiveWithINSelection()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
       {
@@ -1853,7 +1853,7 @@ public void LockExclusiveWithINSelection()
     [Test, Description("Collection.Find() with shared lock twice ")]
     public void LockSharedReadTwice()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       ExecuteSQLStatement(session.SQL("SET autocommit = 0"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
       {
@@ -1893,8 +1893,8 @@ public void LockSharedReadTwice()
     [Test, Description("Test MySQLX plugin Collection Array or Object contains operator Scenarios-1")]
     public void FindInJsonObjects()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       var col = CreateCollection("my_collection_1");
       string json = @"{ ""_id"": 0, ""title"": ""Book 0"" ,""pages"": 10,""name"": ""Jeoff Archer""}";
@@ -2004,7 +2004,7 @@ public void FindInJsonObjects()
     [Test, Description("Test MySQLX plugin Collection Array or Object contains operator Scenarios-3")]
     public void FindAndCountJsonValues()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       var col = CreateCollection("my_collection_1");
       Result add;
@@ -2039,7 +2039,7 @@ public void FindAndCountJsonValues()
     [Test, Description("Test MySQLX plugin Collection Array or Object contains operator Scenarios-4")]
     public void CheckCountAfterSort()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var coll = CreateCollection("test");
       coll.Add("{ \"name\": \"abcdefghijk\", \"age\": 1 , \"misc\": 1.2}")
           .Add("{ \"name\": \"xyz\", \"age\": 6 , \"misc\": 19.59}").Execute();
@@ -2056,7 +2056,7 @@ public void CheckCountAfterSort()
     [Test, Description("Test MySQLX plugin Find with overlap Bugs")]
     public void FindUsingOverLapsBug()
     {
-      if (!session.Version.isAtLeast(8, 0, 17)) Assert.Ignore("This test is for MySql 8.0.17 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 17), "This test is for MySql 8.0.17 or higher");
       String json = "";
       String[] splName = { "+", "*", "/", "a+b", "#1", "%", "&", "@1", "!1", "~", "^",
                           "(", ")", "{", "}", "[", "]", "|", "JSON", "ADD", "JSON_EXTRACT", "JSON_OBJECT",
@@ -2133,7 +2133,7 @@ public void FindUsingOverLapsBug()
     [Test, Description("Test MySQLX plugin Find with overlap and Many conditions")]
     public void FindUsingOverLapsManyConditions()
     {
-      if (!session.Version.isAtLeast(8, 0, 17)) Assert.Ignore("This test is for MySql 8.0.17 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 17), "This test is for MySql 8.0.17 or higher");
       int Condition = 45;
       int i, j = 0;
       String query = "";
@@ -2255,7 +2255,7 @@ public void CollectionFindFieldMatchingCount()
     [Test, Description("GetName,Schema and Count")]
     public void CollectionGetNameSchemaCount()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       var col = CreateCollection("my_collection_123456789");
 
       Result r = col.Add(@"{ ""_id"": 1, ""foo"": 1 }").Execute();
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
index be95bf4c2..3bb644245 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
@@ -227,7 +227,7 @@ public void NamesAreReturnedAsStrings()
     [Test, Description("Column Default Datatypes")]
     public void ColumnDefaultDatatypes()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       session.SQL($"USE {schemaName}").Execute();
       session.SQL("Drop table if exists address").Execute();
       session.SQL("CREATE TABLE address" +
@@ -327,7 +327,7 @@ public void ColumnDefaultDatatypes()
     [Test, Description("Column Custom Datatypes(Unsigned,Padded,CharacterSet,Collation)")]
     public void ColumnCustomDatatypes()
     {
-      if (!session.Version.isAtLeast(8, 0, 14)) Assert.Ignore("This test is for MySql 8.0.14 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 14), "This test is for MySql 8.0.14 or higher");
       var defaultCharset = "utf8mb4";
       session.SQL($"USE {schemaName}").Execute();
       session.SQL("CREATE TABLE IF NOT EXISTS address" +
@@ -426,7 +426,7 @@ public void ColumnCustomDatatypes()
     [Test, Description("Column Join Two tables")]
     public void ColumnJoin()
     {
-      if (!session.Version.isAtLeast(8, 0, 14)) Assert.Ignore("This test is for MySql 8.0.14 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 14), "This test is for MySql 8.0.14 or higher");
       var defaultCharset = "utf8mb4";
       session.SQL($"USE {schemaName}").Execute();
       session.SQL("CREATE TABLE address1" +
@@ -718,7 +718,7 @@ public void ColumnCharacterDefaultDatatype()
     [Test, Description("Column Character Custom Datatype")]
     public void ColumnCharacterCustomDatatype()
     {
-      if (!session.Version.isAtLeast(8, 0, 14)) Assert.Ignore("This test is for MySql 8.0.14 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 14), "This test is for MySql 8.0.14 or higher");
       var defaultCharset = "utf8mb4";
       session.SQL($"USE {schemaName}").Execute();
       session.SQL("Drop table if exists address").Execute();
@@ -781,7 +781,7 @@ public void ColumnCharacterCustomDatatype()
     [Test, Description("Column Geometric Datatypes")]
     public void ColumnCharacterGeometricDatatype()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       session.SQL($"USE {schemaName}").Execute();
       session.SQL($"drop table if exists geotest").Execute();
       session.SQL("CREATE TABLE geotest (g GEOMETRY,p POINT,l LINESTRING,po POLYGON,mp MULTIPOINT,ml MULTILINESTRING,mpo MULTIPOLYGON,gc GEOMETRYCOLLECTION);").Execute();
@@ -819,7 +819,7 @@ public void ColumnCharacterGeometricDatatype()
     [Test, Description("Column Blob Datatype")]
     public void ColumnCharacterBlobDatatype()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       session.SQL($"USE {schemaName}").Execute();
       session.SQL($"drop table if exists geotest").Execute();
@@ -862,7 +862,7 @@ public void ColumnCharacterBlobDatatype()
     [Test, Description("Verify that different language specific collations are availabe for charset utf8mb4 when server version is 8.0 or greater")]
     public void LanguageSpecificCollations()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var charset = "utf8mb4";
       string[] collationname =
       {
@@ -908,7 +908,7 @@ public void LanguageSpecificCollations()
     [Test]
     public void VerifyRenamedCollations()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       var charset = "utf8mb3";
       var collation = session.Version.isAtLeast(8, 0, 30) ? "utf8mb3" : "utf8";
@@ -957,7 +957,7 @@ public void VerifyRenamedCollations()
     [Test, Description("Verify default charset and collation")]
     public void VerifyLatinCharsetAndCollation()
     {
-      if (!session.Version.isAtLeast(8, 0, 14)) Assert.Ignore("This test is for MySql 8.0.14 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 14), "This test is for MySql 8.0.14 or higher");
       var database_name = "collation_test";
       var charset = "latin1";
       var collationname = "latin1_danish_ci";
@@ -981,8 +981,8 @@ public void VerifyLatinCharsetAndCollation()
     [Test, Description("Create table/db with collation utf8mb4_0900_bin and insert non ascii characters and fetch data")]
     public void Utf8mb4BinaryNopadCollationTable()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only.");
-      if (!_serverVersion.isAtLeast(8, 0, 17)) Assert.Ignore("This test is for MySql 8.0.17 or higher");
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
+      Assume.That(session.Version.isAtLeast(8, 0, 17), "This test is for MySql 8.0.17 or higher");
       char t_char;
       var charset = "utf8mb4";
       var collation = "utf8mb4_0900_ai_ci";
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
index d3c8d0ceb..34834ca26 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
@@ -454,7 +454,7 @@ public void PriorityMethodWithAnonymousTypes()
     [Test, Description("Test MySQLX Client Side Failover(Implicit Failover -Not supported)")]
     public void ImplicitFailover()
     {
-      if (!session.Version.isAtLeast(8, 0, 8)) Assert.Ignore("This test is for MySql 8.0.8 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 8), "This test is for MySql 8.0.8 or higher");
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
       string ipV6Address = GetIPV6Address();
       string connectionString = $"mysqlx://test:test@[{sb.Server},{Host},{ipV6Address}:{sb.Port}]?implicit-failover";
@@ -464,7 +464,7 @@ public void ImplicitFailover()
     [Test, Description("Provide 101 hosts to connection without priority where 1st 100 hosts are invalid ones(Internal priority is set from 100...0) and the last host is valid")]
     public void ManyInvalidHost()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
 
       var connectionTimeout = 1;
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
@@ -540,7 +540,7 @@ public void ManyInvalidHost()
     [Test, Description("Provide two hosts to connection with priority where both are valid")]
     public void TwoValidHost()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
 
       var connStr = $"mysqlx://test:test@[ (address={Host}:{XPort}, priority=0,address={Host}:{XPort}, priority=100)]?ssl-mode=Required";
@@ -575,7 +575,7 @@ public void TwoValidHost()
     [Test, Description("Provide two hosts to connection with priority where both are valid-with default port")]
     public void TwoValidHostWithDefaultPort()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
 
       var connStr = "mysqlx://test:test" +
@@ -609,7 +609,7 @@ public void TwoValidHostWithDefaultPort()
     [Test, Description("Provide a single host to connection with priority and disconnect and connect again(iterate priority from 0 - 100) ")]
     public void IteratedPriority()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       var connectionTimeout = 900;
 
       // Automatically set priority if no priority is given.
@@ -662,7 +662,7 @@ public void IteratedPriority()
     [Test, Description("Provide a single host to connection with priority with SSL")]
     public void PriorityWithSsl()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       var certificatePassword = "pass";
       var certificatewrongPassword = "wrongpass";
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
index 895fc3c1c..f56f03b76 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
@@ -264,7 +264,7 @@ public void PoolingTest(PoolingTestData poolingTestData)
     [Property("Category", "Security")]
     public void QueueTimeoutTest()
     {
-      if (Platform.IsWindows()) Assert.Ignore("Fix this for Windows OS");
+      Assume.That(!Platform.IsWindows(), "Fix this for Windows OS");
       int timeout = 3000;
       using (Client client = MySQLX.GetClient(ConnectionString, new { pooling = new { maxSize = 1, queueTimeout = timeout } }))
       {
@@ -427,7 +427,7 @@ private void ResetTestAfterClose(Session session, int threadId, int id)
     [Property("Category", "Security")]
     public void ConnectionAttributes()
     {
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
 
       // Validate that MySQLX.GetSession() supports a new 'connection-attributes' query parameter
       // with default values and all the client attributes starts with a '_'.
@@ -817,7 +817,7 @@ public void maxIdleTimeOptionTests(string inputType)
     [Test, Description("Test queueTimeout with different values")]
     public void QueueTimeoutOptionTests(string inputType)
     {
-      if (Platform.IsWindows()) Assert.Ignore("Fix this for Windows OS");
+      Assume.That(!Platform.IsWindows(), "Fix this for Windows OS");
 
       int timeoutMS = 3000;
       string[] connectionpooling = { "{ \"pooling\": { \"maxSize\": 2,\"queueTimeout\": " + timeoutMS + " } }", "{ \"pooling\": { \"queueTimeout\": true} }", "{ \"pooling\": { \"queueTimeout\": 'true'} }", "{ \"pooling\": { \"queueTimeout\": -1} }", "{ \"pooling\": { \"queueTimeout\": 84584759345 } }", "{ \"pooling\": { \"queueTimeout\": } }" };
@@ -1424,7 +1424,7 @@ public void SessionResetConnectionState()
     [Test, Description("MAX LENGTH OF KEY VALUE PAIR OF USER DEFINED CONNECTION ATTRIBUTES")]
     public void ConnectionAttributesLongValue()
     {
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
 
       var serverSupportedSize = Convert.ToInt32(session.SQL("select @@Global.performance_schema_session_connect_attrs_size;").Execute().First()[0]);
       var connectAttributesLost = Convert.ToInt32(session.SQL("SHOW STATUS LIKE 'Performance_schema_session_connect_attrs_lost'").Execute().FirstOrDefault()[1]);
@@ -1473,7 +1473,7 @@ public void ConnectionAttributesLongValue()
     [Test, Description("GETSESSION THROWS EXCEPTION WHEN EQUAL IS USED AS PARAM FOR CONN ATTRIBUTE IN CONN ANONYMOUS OBJECT-WL#12514")]
     public void GetSessionExceptionWithConnetionAttribute()
     {
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
       using (Client client = MySQLX.GetClient(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = "=" }
       , "{ \"pooling\": { \"enabled\": true } }"))
@@ -1486,8 +1486,8 @@ public void GetSessionExceptionWithConnetionAttribute()
     [Test, Description("Connection Attributes with arrays")]
     public void ConnectionAttributesWithArrays()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
 
       object[] arrayCases = new object[] { "[var1 = 1, 2, 3]", "[var1 = { 1, 2, 3}]" };
       for (int i = 0; i < arrayCases.Length; i++)
@@ -1576,7 +1576,7 @@ public void ConnectionAttributesWithArrays()
     [Test]
     public void NormalConnectionWithUri()
     {
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       //Normal connection with URI
       using (Client client = MySQLX.GetClient(ConnectionStringUri, "{ \"pooling\": { \"enabled\": true } }"))
       {
@@ -1591,7 +1591,7 @@ public void NormalConnectionWithUri()
     [Ignore("Bug #33234243 need to fix Uri scenario")]
     public void ConnectionAttributesRepeated()
     {
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       //Connection String
       Assert.Catch(() => MySQLX.GetClient(ConnectionString + ";connection-attributes=true;connection-attributes=true;", "{ \"pooling\": { \"enabled\": true } }"));
       Assert.Catch(() => MySQLX.GetSession(ConnectionString + ";connection-attributes=true;connection-attributes=true;"));
@@ -1603,7 +1603,7 @@ public void ConnectionAttributesRepeated()
     [Test, Description("Connection Attributes with key Repeated - Extending scenarios in ConnectionAttributes()")]
     public void ConnectionAttributesKeyRepeatedChars()
     {
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       var expectedMsg = string.Format(ResourcesX.DuplicateUserDefinedAttribute, "quua");
       //Connection String
       using (Client client = MySQLX.GetClient(ConnectionString + ";connection-attributes=[quua=bar,quua=qux,key]", "{ \"pooling\": { \"enabled\": true } }"))
@@ -1674,7 +1674,7 @@ public void ConnectionAttributesKeyRepeatedChars()
     [Test, Description("Connection Attributes with key 33 characters - Extending scenarios in ConnectionAttributes()")]
     public void ConnectionAttributesWithKey33Chars()
     {
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       var errorMsg = "Key name beginning with 'foo32foo32foo32foo32foo32foo3232'... is too long, currently limited to 32";
       using (Client client = MySQLX.GetClient(ConnectionString + ";connection-attributes=[foo32foo32foo32foo32foo32foo32323=bar,quua=qux,key]", "{ \"pooling\": { \"enabled\": true } }"))
       {
@@ -1741,7 +1741,7 @@ public void ConnectionAttributesWithKey33Chars()
     [Test, Description("Connection Attributes with invalid combinations - Extending scenarios in ConnectionAttributes()")]
     public void ConnectionAttributesInvalidCombinations()
     {
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       object[] invalid = new object[] { "var1", "1", "2", "(var1)", "{var1}", "[_testValue = test123, emptyValue]" };
       var errorMsgs = new string[] { @"The value of ""connection-attributes"" must be either a boolean or a list of key-value pairs.", @"Key names in ""connection-attributes"" cannot start with ""_""." };
       for (int i = 0; i < invalid.Length; i++)
@@ -1817,8 +1817,8 @@ public void ConnectionAttributesInvalidCombinations()
     [Test, Description("Connection Attributes with valid combinations - Extending scenarios in ConnectionAttributes()")]
     public void ConnectionAttributesValidCombinations()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
 
       object[] invalid = new object[] { "[var1 = 1]" };
       for (int i = 0; i < invalid.Length; i++)
@@ -1905,9 +1905,9 @@ public void ConnectionAttributesValidCombinations()
     [Test, Description("Connection Attributes with key special characters - Extending scenarios in ConnectionAttributes()")]
     public void ConnectionAttributesKeySpecialChars()
     {
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
       using (Client client = MySQLX.GetClient(ConnectionString + ";connection-attributes=[@#$%^&*        %^()=bar,quua=*(&^&#$%,key]", "{ \"pooling\": { \"enabled\": true } }"))
       {
         using (Session session = client.GetSession())
@@ -1989,8 +1989,8 @@ public void ConnectionAttributesKeySpecialChars()
     [Test, Description("Connection Attributes with key with underline characters - Extending scenarios in ConnectionAttributes()")]
     public void ConnectionAttributesKeyWithUnderLineChars()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
       var expectedMsg = @"Key names in ""connection-attributes"" cannot start with ""_"".";
       //Connection string
@@ -2058,8 +2058,8 @@ public void ConnectionAttributesKeyWithUnderLineChars()
     [Test, Description("Connection Attributes with key blank characters - Extending scenarios in ConnectionAttributes()")]
     public void ConnectionAttributesKeyBlankChars()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
       var expectedMsg = "Key name in connection attribute cannot be an empty string.";
       //Connection String
@@ -2130,8 +2130,8 @@ public void ConnectionAttributesKeyBlankChars()
     [Test, Description("Connection Attributes with value 1025characters - Extending scenarios in ConnectionAttributes()")]
     public void ConnectionAttributesValue1025Chars()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
       var expectedMsg = "Value is too long for 'foo' attribute, currently limited to 1024";
       var strValue = "[foo=12345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781,quua=qux,key=]";
@@ -2201,7 +2201,7 @@ public void ConnectionAttributesValue1025Chars()
     public void SessionRestore()
     {
       // This feature was implemented since MySQL Server 8.0.16
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       int size = 2;
       using (Client client = MySQLX.GetClient(ConnectionString + ";database=test;", new { pooling = new { enabled = true, maxSize = size, queueTimeout = 1000, maxIdleTime = 1000 } }))
       {
@@ -2226,7 +2226,7 @@ public void SessionRestore()
     public void SessionAuthentication()
     {
       // This feature was implemented since MySQL Server 8.0.16
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       int size = 1;
       using (Client client = MySQLX.GetClient(ConnectionString + ";database=test;", new { pooling = new { enabled = true, maxSize = size, queueTimeout = 1000, maxIdleTime = 1000 } }))
       {
@@ -2248,7 +2248,7 @@ public void SessionAuthentication()
     public void MultiSessionAuthentication()
     {
       // This feature was implemented since MySQL Server 8.0.16
-      if (!(session.Version.isAtLeast(8, 0, 16))) Assert.Ignore("This test is for MySql 8.0.16 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       int size = 2;
       using (Client client = MySQLX.GetClient(ConnectionString + ";database=test;", new { pooling = new { enabled = true, maxSize = size, queueTimeout = 1000, maxIdleTime = 1000 } }))
       {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs
index 98f85067e..c98ac4f0e 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs
@@ -51,7 +51,7 @@ public class CloseConnectionTests : BaseTest
     [Test]
     public void NotificationKill()
     {
-      if (!(session.InternalSession.GetServerVersion().isAtLeast(8, 0, 23))) Assert.Ignore();
+      Assume.That(session.Version.isAtLeast(8, 0, 23), "This test is for MySql 8.0.23 or higher");
       using (Session session1 = MySQLX.GetSession(ConnectionString))
       {
         Schema test = session1.GetSchema("test");
@@ -73,7 +73,7 @@ public void NotificationKill()
     [Test]
     public void NotificationIdle()
     {
-      if (!(session.InternalSession.GetServerVersion().isAtLeast(8, 0, 23))) Assert.Ignore();
+      Assume.That(session.Version.isAtLeast(8, 0, 23), "This test is for MySql 8.0.23 or higher");
 
       ExecuteSqlAsRoot("SET GLOBAL mysqlx_read_timeout = 5");
       ExecuteSqlAsRoot("SET GLOBAL mysqlx_wait_timeout = 5");
@@ -109,7 +109,7 @@ public void NotificationIdle()
     [Theory]
     public void CloseWarningsWithCollections(CloseData closeData)
     {
-      if (!(session.InternalSession.GetServerVersion().isAtLeast(8, 0, 23))) Assert.Ignore();
+      Assume.That(session.Version.isAtLeast(8, 0, 23), "This test is for MySql 8.0.23 or higher");
       Session sessionCol = null;
       sessionCol = MySQLX.GetSession(ConnectionString);
 
@@ -131,7 +131,7 @@ public void CloseWarningsWithCollections(CloseData closeData)
     [Ignore("This test is marked as Ignore because it shutdown the local MySQL Server, comment this line to run this test manually")]
     public void NotificationShutdown()
     {
-      if (!(session.InternalSession.GetServerVersion().isAtLeast(8, 0, 23))) Assert.Ignore();
+      Assume.That(session.Version.isAtLeast(8, 0, 23), "This test is for MySql 8.0.23 or higher");
 
       using (Session localsession = MySQLX.GetSession(BaseTest.ConnectionString))
       {
@@ -155,7 +155,7 @@ public void NotificationShutdown()
     [Test]
     public void PoolTestCloseOneConnection()
     {
-      if (!(session.InternalSession.GetServerVersion().isAtLeast(8, 0, 23))) Assert.Ignore();
+      Assume.That(session.Version.isAtLeast(8, 0, 23), "This test is for MySql 8.0.23 or higher");
       int size = 3;
       int timeout = 3000;
       using (Client client = MySQLX.GetClient(ConnectionString + ";database=test;", new { pooling = new { maxSize = size, queueTimeout = timeout } }))
@@ -202,7 +202,7 @@ public void PoolTestCloseOneConnection()
     [Ignore("This test is marked as Ignore because it shutdown the local MySQL Server, comment this line to run this test manually")]
     public void PoolTestShutdown()
     {
-      if (!(session.InternalSession.GetServerVersion().isAtLeast(8, 0, 23))) Assert.Ignore();
+      Assume.That(session.Version.isAtLeast(8, 0, 23), "This test is for MySql 8.0.23 or higher");
       int size = 3;
       using (Client client = MySQLX.GetClient(ConnectionString + ";database=test;", new { pooling = new { maxSize = size } }))
       {
@@ -230,7 +230,7 @@ public void PoolTestShutdown()
     [Test]
     public void PoolWithIdleConnections()
     {
-      if (!(session.InternalSession.GetServerVersion().isAtLeast(8, 0, 23))) Assert.Ignore();
+      Assume.That(session.Version.isAtLeast(8, 0, 23), "This test is for MySql 8.0.23 or higher");
       int size = 2;
       ExecuteSqlAsRoot("SET GLOBAL mysqlx_read_timeout = 5");
       ExecuteSqlAsRoot("SET GLOBAL mysqlx_wait_timeout = 5");
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
index 3da6ab3cb..ed80e6497 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
@@ -62,7 +62,7 @@ public void IncorrectlyFormatedIndexDefinition()
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"TEXT\", \"unexpectedField\" : false } ] }"));
       Assert.That(ex.Message, Is.EqualTo("Field name 'unexpectedField' is not allowed."));
 
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       collection = CreateCollection("test");
 
       ex = Assert.Throws<MySqlException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"INT\" } ], \"type\":\"indexa\" }"));
@@ -350,7 +350,7 @@ public void ValidIndexNames()
     public void CreateIndexWithArrayOption()
     {
       var collection = CreateCollection("test");
-      if (!session.Version.isAtLeast(8, 0, 17)) Assert.Ignore("This test is for MySql 8.0.17 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 17), "This test is for MySql 8.0.17 or higher");
 
       // Supported types
       var doc = new[] { new { _id = 1, name = "Char", myField = new[] { "foo@mail.com", "bar@mail.com", "qux@mail.com" } } };
@@ -393,7 +393,7 @@ public void CreateIndexWithArrayOption()
     [Test, Description("Add Collection index")]
     public void AddIndexAndInsertRecords()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       Collection testColl = CreateCollection("test1");
       Assert.That(testColl.ExistsInDatabase());
       testColl.CreateIndex("testIndex", "{\"fields\": [ { \"field\":$.myId, \"type\":\"INTEGER UNSIGNED\" , \"required\":true} ] }");
@@ -409,7 +409,7 @@ public void AddIndexAndInsertRecords()
     [Test, Description("Create valid index on a single key with all options")]
     public void InsertWithValidIndexAndNoIndex()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var col = CreateCollection("my_collection");
       Result result = col.Add(new { name = "Sakila", age = 15 }).Execute();
       col.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.name, \"type\":\"TEXT(64)\" , \"required\":true} ] }");
@@ -422,7 +422,7 @@ public void InsertWithValidIndexAndNoIndex()
     [Test, Description("Create a valid index on a single key of all DATATYPES.Datatypes supported: INT [UNSIGNED] TINYINT [UNSIGNED] SMALLINT [UNSIGNED] MEDIUMINT [UNSIGNED] INTEGER [UNSIGNED] BIGINT [UNSIGNED] REAL [UNSIGNED] FLOAT [UNSIGNED] DOUBLE [UNSIGNED] DECIMAL [UNSIGNED] NUMERIC [UNSIGNED] DATE TIME TIMESTAMP DATETIME TEXT[(length)]")]
     public void IndexOfAllDatatypes()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var col = CreateCollection("my_collection");
 
       Result result = col.Add(new { name = "Sakila", age = 15, date_time = "2010-01-01 00:00:00", time_stamp = "2015-01-01 00:11:02", date_check = "2117-12-17", time_check = "12:14:07", real_check = 12E+4, decimal_check = 122.134, float_check = 11.223, double_check = 23.32343425, numeric_check = 1122.3434, tiny_int = 112, medium_int = 12345, big_int = 1234567, int_check = 174734 }).Execute();
@@ -477,7 +477,7 @@ public void IndexOfAllDatatypes()
     [Test, Description("Create an index with mismatched data types")]
     public void IndexWithMismatchedDatatypes()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var col = CreateCollection("my_collection");
       Result result = col.Add(new { name = "Sakila", age = 15 }).Execute();
       Thread.Sleep(2000);
@@ -488,7 +488,7 @@ public void IndexWithMismatchedDatatypes()
     [Test, Description("Create an index specifiying SPATIAL as the index type for a non spatial data type and vice versa")]
     public void IndexSpatialForNonSpatialDatatype()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var col = CreateCollection("my_collection");
       Result result = col.Add(new { name = "Sakila", age = 15 }).Execute();
       Assert.Throws<MySqlException>(() => col.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.name, \"type\":\"TEXT\"} ] , \"type\":\"SPATIAL\" }"));
@@ -502,7 +502,7 @@ public void IndexSpatialForNonSpatialDatatype()
     [Test, Description("Create valid index with index definition given as DbDoc")]
     public void CreateIndexGivenDbDoc()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var col = CreateCollection("my_collection");
       Result result = col.Add(new { name = "Sakila", age = 15 }).Execute();
 
@@ -518,7 +518,7 @@ public void CreateIndexGivenDbDoc()
     [Test, Description("Create valid index on member of Array type as key")]
     public void IndexOnArrayMember()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       var col = CreateCollection("my_collection");
 
@@ -559,7 +559,7 @@ public void IndexOnArrayMember()
     [Test, Description("Create valid index on member of DbDoc type as key")]
     public void IndexOnDbDocMember()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var col = CreateCollection("my_collection");
       DbDoc data2 = new DbDoc();
       data2.SetValue("name", "Sakila");
@@ -575,7 +575,7 @@ public void IndexOnDbDocMember()
     [Test, Description("Create valid index perform CRUD operations")]
     public void CountRecordsInsertedWithValidIndex()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var col = CreateCollection("my_collection");
       Result result = col.Add(new { name = "Sakila", age = 15 }).Execute();
       Assert.Throws<MySqlException>(() => col.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.name, \"type\":\"TEXT\" , \"required\":true} ] }"));
@@ -589,7 +589,7 @@ public void CountRecordsInsertedWithValidIndex()
     [Test, Description("Create invalid index with non-existent key")]
     public void InvalidIndexNonExistentKey()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var col = CreateCollection("my_collection");
       Result result = col.Add(new { age = 15 }).Execute();
       Assert.Throws<MySqlException>(() => col.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.name, \"type\":\"TEXT\" , \"required\":\"true\"} ]}"));
@@ -598,7 +598,7 @@ public void InvalidIndexNonExistentKey()
     [Test, Description("Create a valid index in async way")]
     public async Task CreateIndexInAsync()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var col = CreateCollection("my_collection");
       await col.Add(new { name = "Sakila", age = 15 }).ExecuteAsync();
       col.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.name, \"type\":\"TEXT(64)\" , \"required\":true} ] }");
@@ -610,7 +610,7 @@ public async Task CreateIndexInAsync()
     [Test, Description("Create valid index using a document field type of array and setting array to true with single key on all possible datatypes-data inserted and then index created")]
     public void IndexWithArrayOptionSingleKeyAfterInsertData()
     {
-      if (!session.Version.isAtLeast(8, 0, 17)) Assert.Ignore("This test is for MySql 8.0.17 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 17), "This test is for MySql 8.0.17 or higher");
       var collection = CreateCollection("test");
 
       // Supported types
@@ -826,7 +826,7 @@ public void IndexWithArrayOptionSingleKeyAfterInsertData()
                "inserted and then index created")]
     public void IndexWithArrayOptionSingleKeyBeforeInsertData()
     {
-      if (!session.Version.isAtLeast(8, 0, 17)) Assert.Ignore("This test is for MySql 8.0.17 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 17), "This test is for MySql 8.0.17 or higher");
 
       var collection = CreateCollection("test");
 
@@ -981,7 +981,7 @@ public void IndexWithArrayOptionSingleKeyBeforeInsertData()
     [Test, Description("Create index with array set as null,NULL,multile  vel arrays,blank arrays,empty arrays.Also test in multikey scenarios")]
     public void IndexArrayCombinations()
     {
-      if (!session.Version.isAtLeast(8, 0, 17)) Assert.Ignore("This test is for MySql 8.0.17 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 17), "This test is for MySql 8.0.17 or higher");
       var expectedException = "Index field 'array' member must be boolean.";
       var coll = CreateCollection("test");
 
@@ -1236,7 +1236,7 @@ public void IndexArrayCombinations()
     [Test, Description("Index Array Date bug with workaround")]
     public void IndexArrayBugWorkAround()
     {
-      if (!session.Version.isAtLeast(8, 0, 17)) Assert.Ignore("This test is for MySql 8.0.17 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 17), "This test is for MySql 8.0.17 or higher");
       var coll = CreateCollection("test");
       var doc = new[] { new { _id = 1, name = "Time", myField = "9:00:00" } };//Bug29692534
       var doc22 = new[] { new { _id = 2, name = "Time", myField = new[] { "01:01:01.001", "23:59:59.15", "12:00:00", "1" } } };//Bug29692534
@@ -1402,7 +1402,7 @@ public void IndexArrayBugWorkAround()
     [Test, Description("Index Array Date bug with workaround")]
     public void IndexArrayWorkAroundOverlaps()
     {
-      if (!session.Version.isAtLeast(8, 0, 17)) Assert.Ignore("This test is for MySql 8.0.17 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 17), "This test is for MySql 8.0.17 or higher");
       var coll = CreateCollection("test");
       var doc = new[] { new { _id = 1, name = "Time", myField = "9:00:00" } };
       var doc22 = new[] { new { _id = 2, name = "Time", myField = new[] { "01:01:01.001", "23:59:59.15", "12:00:00", "1" } } };
@@ -1623,7 +1623,7 @@ public void IndexArrayWorkAroundOverlaps()
     public void IndexArrayWithOverlaps()
     {
       var coll = CreateCollection("test");
-      if (!session.Version.isAtLeast(8, 0, 17)) Assert.Ignore("This test is for MySql 8.0.17 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 17), "This test is for MySql 8.0.17 or higher");
 
       var doc = new[] { new { _id = 1, name = "Time", myField1 = "9:00:00" } };
       var doc22 = new[] { new { _id = 2, name = "Time", myField2 = new[] { "01:01:01.001", "23:59:59.15", "12:00:00", "1" }, myField4 = new[] { "01:01:01.001", "23:59:59.15", "12:00:00", "1" } } };
@@ -1669,7 +1669,7 @@ public void IndexArrayWithOverlaps()
     public void IndexArrayMultiKey()
     {
       var coll = CreateCollection("test");
-      if (!session.Version.isAtLeast(8, 0, 17)) Assert.Ignore("This test is for MySql 8.0.17 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 17), "This test is for MySql 8.0.17 or higher");
 
       coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"CHAR(255)\", \"array\": false}]}");
 
@@ -1731,7 +1731,7 @@ public void IndexArrayMultiKey()
     [Test, Description("Test MySQLX plugin Create Collection Multiple Index Type")]
     public void CreateCollectionMultipleIndexDataType()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Collection testColl = CreateCollection("test");
       Assert.That(testColl.ExistsInDatabase(), Is.EqualTo(true), "ExistsInDatabase failed");
 
@@ -1756,7 +1756,7 @@ public void CreateCollectionMultipleIndexDataType()
     [Test, Description("Test MySQLX plugin Create Collection Multiple Index Stress")]
     public void CreateCollectionMultipleIndexStress()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Collection testColl = CreateCollection("test");
       Assert.That(testColl.ExistsInDatabase(), Is.EqualTo(true), "ExistsInDatabase failed");
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
index e2e1ac3a0..7b9471364 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
@@ -594,7 +594,7 @@ public void AdditionalCountTests()
     [Test, Description("Verify Expected exceptions in Count")]
     public void ExceptionsInCount()
     {
-      if (!session.Version.isAtLeast(8, 0, 0)) Assert.Ignore("This test is for MySql 8.0 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 0), "This test is for MySql 8.0 or higher");
       var coll = CreateCollection("testCount");
       var docs = new[]
       {
@@ -767,7 +767,7 @@ private Task<int> SubProcessB()
     [Test, Description("Verify the behaviour of the dropX method for dropCollection under stressed conditions")]
     public void DropUnderStressedConditions()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Schema schema = session.GetSchema(schemaName);
 
       for (var i = 0; i < 10; i++)
@@ -781,7 +781,7 @@ public void DropUnderStressedConditions()
     [Test, Description("Verify that dropX method for dropSchema, dropIndex succeeds in stress conditions")]
     public void DropObjectsUnderStress()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var schema = session.GetSchema(schemaName);
       var testColl = CreateCollection("test123");
       for (var i = 0; i < 150; i++)
@@ -804,7 +804,7 @@ public void DropObjectsUnderStress()
     [Test, Description("Verify that dropX method for dropIndex succeeds when deleted and created again with various combinations")]
     public void DropDocuments()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var schema = session.GetSchema(schemaName);
       schema.DropCollection("test123");
       var testColl = schema.CreateCollection("test123");
@@ -828,7 +828,7 @@ public void DropDocuments()
     [Test, Description("Verify ModifyCollection with level OFF and JSON schema")]
     public void SchemaValidation_S1()
     {
-      if (!session.Version.isAtLeast(8, 0, 19)) Assert.Ignore("This test is for MySql 8.0.19 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 19), "This test is for MySql 8.0.19 or higher");
       var schema = session.GetSchema(schemaName);
       var options = new CreateCollectionOptions();
       var options1 = new ModifyCollectionOptions();
@@ -951,7 +951,7 @@ public void SchemaValidation_S1()
     [Test, Description("Checking the createcollection() and ModifyCollection() with either the level or the schema")]
     public void SchemaValidation_S2()
     {
-      if (!session.Version.isAtLeast(8, 0, 19)) Assert.Ignore("This test is for MySql 8.0.19 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 19), "This test is for MySql 8.0.19 or higher");
       var schema = session.GetSchema(schemaName);
       session.SQL($"use {schemaName}").Execute();
       var options = new CreateCollectionOptions();
@@ -1132,7 +1132,7 @@ public void SchemaValidation_S2()
     [Test, Description("Checking the error messages with different level")]
     public void SchemaValidation_S3()
     {
-      if (!session.Version.isAtLeast(8, 0, 19)) Assert.Ignore("This test is for MySql 8.0.19 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 19), "This test is for MySql 8.0.19 or higher");
       session.SQL($"use {schemaName}").Execute();
       var options = new CreateCollectionOptions();
       var options1 = new ModifyCollectionOptions();
@@ -1256,7 +1256,7 @@ public void SchemaValidation_S3()
     [Test, Description("Verify ModifyCollection with level OFF and JSON schema with Json schema")]
     public void ModifyCollectionSchemaValidation()
     {
-      if (!session.Version.isAtLeast(8, 0, 19)) Assert.Ignore("This test is for MySql 8.0.19 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 19), "This test is for MySql 8.0.19 or higher");
       session.SQL($"use {schemaName}").Execute();
       var schema = session.GetSchema(schemaName);
       var options = new CreateCollectionOptions();
@@ -1357,7 +1357,7 @@ public void ModifyCollectionSchemaValidation()
     public void SchemaValidationDeleteRecords()
     {
       // Bug30748283
-      if (!session.Version.isAtLeast(8, 0, 19)) Assert.Ignore("This test is for MySql 8.0.19 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 19), "This test is for MySql 8.0.19 or higher");
       string doc5 = "{\"id\": \"http://json-schema.org/geo\","
            + "\"$schema\": \"http://json-schema.org/draft-06/schema#\","
            + "\"description\": \"A Person example\","
@@ -1472,7 +1472,7 @@ public void SchemaValidationDeleteRecords()
     [Test, Description("Test MySQLX plugin Remove Bind Stress")]
     public void RemoveBindStress()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Collection coll = CreateCollection("test");
       DbDoc[] jsonlist = new DbDoc[10];
       DbDoc[] jsonlist1 = new DbDoc[10];
@@ -1508,7 +1508,7 @@ public void RemoveBindStress()
     [Test, Description("Test MySQLX plugin Get Collection as Table")]
     public void GetCollectionAsTableStress()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Collection testCollection = CreateCollection("test");
 
       DbDoc[] jsonlist = new DbDoc[1000];
@@ -1540,7 +1540,7 @@ public void GetCollectionAsTableStress()
     [Test, Description("Test MySQLX plugin GetCollection Exception Scenario")]
     public void GetCollectionException()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       using (Session sessionPlain = MySQLX.GetSession(ConnectionString))
       {
         Schema db = sessionPlain.GetSchema(schemaName);
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
index 8629fd5ac..d6e7b8a5d 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
@@ -218,7 +218,7 @@ public void ValidateRequiredCompressionType()
     [Test]
     public void NegotiationSucceedsWithExpectedCompressionAlgorithm()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 19)) Assert.Ignore("Feature only available since v8.0.19");
+      Assume.That(session.Version.isAtLeast(8, 0, 19), "This test is for MySql 8.0.19 or higher");
 
       // Validate zstd_stream is the default.
       using (var session = MySQLX.GetSession(ConnectionStringUri))
@@ -618,7 +618,7 @@ public void CompressionAlgorithms_Bugs()
     [Test, Description("Connection Compression tests to verify the values of compress option with connection string, uri, anonymous object, string builder")]
     public void ConnectionStringCombinations()
     {
-      if (!session.Version.isAtLeast(8, 0, 19)) Assert.Ignore("This test is for MySql Server 8.0.19 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 19), "This test is for MySql 8.0.19 or higher");
 
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
       sb.SslCa = sslCa;
@@ -679,7 +679,7 @@ public void ConnectionStringCombinations()
     [Test, Description("Verifying the connection pooling with compression option")]
     public void CompressionWithPolling()
     {
-      if (!session.Version.isAtLeast(8, 0, 19)) Assert.Ignore("This test is for MySql 8.0.19 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 19), "This test is for MySql 8.0.19 or higher");
       for (int i = 0; i < 3; i++)
       {
         client = MySQLX.GetClient(ConnectionString + ";compression=" + compressValue[i], new { pooling = new { maxSize = 2, queueTimeout = 2000 } });
@@ -706,7 +706,7 @@ public void CompressionWithPolling()
     [Test, Description("Verify if data sent is compressed")]
     public void VerifyDataSentCompression()
     {
-      if (!session.Version.isAtLeast(8, 0, 19)) Assert.Ignore("This test is for MySql 8.0.19 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 19), "This test is for MySql 8.0.19 or higher");
       int BYTESIZE = 20000;
       string[] compressValue1 = new string[] { "preferred", "required", "required" };
       string[] compressValue2 = new string[] { "disabled", "disabled", "preferred" };
@@ -764,7 +764,7 @@ public void VerifyDataSentCompression()
     [Test, Description("Verify if data read is compressed")]
     public void VerifyDataReadCompression()
     {
-      if (!session.Version.isAtLeast(8, 0, 19)) Assert.Ignore("This test is for MySql 8.0.19 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 19), "This test is for MySql 8.0.19 or higher");
       const int BYTESIZE = 20000;
       string[] compressValue1 = new string[] { "preferred", "required" };
       for (int i = 0; i < 2; i++)
@@ -815,7 +815,7 @@ public void VerifyDataReadCompression()
     [Test, Description("Verifying the threshold for compression")]
     public void CompressionThreshold()
     {
-      if (!session.Version.isAtLeast(8, 0, 19)) Assert.Ignore("This test is for MySql 8.0.19 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 19), "This test is for MySql 8.0.19 or higher");
       using (session1 = MySQLX.GetSession(ConnectionString + ";compression=required"))
       {
         session1.SQL("DROP database if exists compression").Execute();
@@ -879,7 +879,7 @@ public void CompressionThreshold()
     [Test, Description("Checking the network latency")]
     public void NetworkLatency()
     {
-      if (!session.Version.isAtLeast(8, 0, 19)) Assert.Ignore("This test is for MySql 8.0.19 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 19), "This test is for MySql 8.0.19 or higher");
       const int BYTESIZE = 20000;
       Stopwatch watch1 = new Stopwatch();
       Stopwatch watch2 = new Stopwatch();
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs
index d21fe9c36..b849e0bb6 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs
@@ -403,7 +403,7 @@ public void CollectionAddObjectsFindCondition()
     [Test, Description("Test MySQLX plugin Collection Scenarios - Add Objects,Find without parameters")]
     public void CollectionAddFindNoParams()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Collection col = CreateCollection("my_collection_1");
       var docs = new[]
       {
@@ -430,7 +430,7 @@ public void CollectionAddFindNoParams()
     [Test, Description("Test MySQLX plugin Collection Scenarios - Add/Remove JSON Object with id")]
     public void CollectionAddRemoveJSONObjectID()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       using (var sessionPlain = MySQLX.GetSession(ConnectionString + ";sslmode=" + MySqlSslMode.Required))
       {
         Schema db = sessionPlain.GetSchema(schemaName);
@@ -453,7 +453,7 @@ public void CollectionAddRemoveJSONObjectID()
     [Test, Description("Test MySQLX plugin Collection Scenarios - Add/Remove with condition")]
     public void CollectionAddRemoveJSONObjectCondition()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Schema db = session.GetSchema(schemaName);
       Collection col = CreateCollection("my_collection_1");
       DbDoc DbDocs = new DbDoc();
@@ -470,7 +470,7 @@ public void CollectionAddRemoveJSONObjectCondition()
     [Test, Description("Test MySQLX plugin Collection Scenarios - Add,Remove with condition limit")]
     public void CollectionAddRemoveObjectConditionLimit()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Schema db = session.GetSchema(schemaName);
       Collection col = CreateCollection("my_collection_1");
       var docs = new[]
@@ -502,7 +502,7 @@ public void CollectionAddRemoveObjectConditionLimit()
     [Test, Description("Test MySQLX plugin Collection Scenarios - Add/Remove 200 JSON records ")]
     public void CollectionAddRemove200JSONRecords()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Collection col = CreateCollection("my_collection_1");
       var numOfRecords = 200;
 
@@ -530,7 +530,7 @@ public void CollectionAddRemove200JSONRecords()
     [Test, Description("Test MySQLX plugin Collection Scenarios - Add/Remove documents with limit and orderby ")]
     public void CollectionAddRemoveJSONRecordsLimitOrderBy()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Schema db = session.GetSchema(schemaName);
       Collection col = CreateCollection("my_collection_1");
 
@@ -573,7 +573,7 @@ public void CollectionAddRemoveJSONRecordsLimitOrderBy()
     [Test, Description("Test MySQLX plugin Collection Scenarios - Add Single/Multiple Docs - Remove Condition/ID/Condition-Limit/Condition-Limit-OrderBy/Bind")]
     public void CollectionAddRemoveDocsLimitOrderByBind()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Collection col = CreateCollection("my_collection_1");
       DbDoc DbDocs = new DbDoc();
       DbDocs.SetValue("_id", 100000);
@@ -660,7 +660,7 @@ public void CollectionAddRemoveDocsLimitOrderByBind()
     [Test, Description("Test MySQLX plugin Collection Scenarios - Add Single/Multiple Docs - Remove Condition/ID/Condition-Limit/Condition-Limit-OrderBy/Bind using invalid conditions")]
     public void CollectionRemoveDocsLimitOrderByBindNegative()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Schema db = session.GetSchema(schemaName);
       var col = db.CreateCollection("my_collection_1", true);
 
@@ -760,7 +760,7 @@ public void CollectionRemoveDocsLimitOrderByBindNegative()
     [Test, Description("Test MySQLX plugin - MYSQLCNET_680 Allow Reuse Statement after execute Positive1(after a succesful execute)")]
     public void AllowReuseStatementAfterExecutePositive1()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Schema db = session.GetSchema(schemaName);
       var col = db.CreateCollection("my_collection_123456789");
       object[] data = new object[]
@@ -826,7 +826,7 @@ public void AllowReuseStatementAfterExecutePositive2()
     [Test, Description("Test MySQLX plugin - MYSQLCNET 755 Collection GetDocumentID")]
     public void CollectionGetDocumentID()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       Collection coll = CreateCollection("test");
       var docs = new[]
       {
@@ -916,7 +916,7 @@ public void CheckDocUUIDScenario1()
     [Test, Description("Test MySQLX UUID Scenario-2(Check UUID generated when multiple JSON docs are added using collection.add().add()..without _id fields)")]
     public void CheckDocUUIDScenario2()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var col = CreateCollection("my_collection_123456789");
       object[] data1 = new object[]
       {
@@ -954,7 +954,7 @@ public void CheckDocUUIDScenario2()
     [Test, Description("Test MySQLX UUID Scenario-2(Check UUID generated when multiple JSON docs are added using collection.add(doc, doc, doc... ) without _id fields)")]
     public void CheckDocUUIDScenario3()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var col = CreateCollection("my_collection_123456789");
       var stmt = col.Add(@"{ ""foo"": 1 }", @"{""foo"": 2 }", @"{ ""foo"": 3 }", @"{ ""foo"": 4 }");
       Result r = col.Add(@"{ ""foo"": 1 }", @"{""foo"": 2 }", @"{ ""foo"": 3 }", @"{ ""foo"": 4 }").Execute();
@@ -977,7 +977,7 @@ public void CheckDocUUIDScenario3()
     [Test, Description("Test MySQLX UUID Scenario-4(Check UUID generated when multiple JSON docs are added using some containing and some not containing _id fields)")]
     public void CheckDocUUIDScenario4()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var col = CreateCollection("my_collection_123456789");
       object[] data1 = new object[]
       {
@@ -1037,7 +1037,7 @@ public void CheckDocUUIDScenario5()
     [Test, Description("Test MySQLX UUID Scenario-6(Check that no duplicate UUID is generated by adding multiple doc from the same collection in a session when there are no _id fields)")]
     public void CheckDocUUIDScenario6()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       Collection testCollection = CreateCollection("test");
       DbDoc[] jsonlist = new DbDoc[1000];
       for (int i = 0; i < 1000; i++)
@@ -1100,7 +1100,7 @@ public void CheckDocUUIDScenario7()
     [Test, Description("Test MySQLX UUID Scenario-8(Check UUID generated when multiple JSON docs are added using collection.add(doc, doc, doc... ) when docs contains _id fields with zero,strings)")]
     public void CheckDocUUIDScenario8()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       var col = CreateCollection("my_collection_123456789");
       object[] data1 = new object[]
       {
@@ -1157,7 +1157,7 @@ public void CheckDocUUIDScenario9()
     [Test, Description("Test MySQLX plugin Collection JSON Depth Scenarios")]
     public void CollectionAddJSONDepth()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       int i, maxArrayelement = 100;
       Collection col = CreateCollection("my_collection_1");
       Collection col1 = CreateCollection("my_collection_2");
@@ -1199,7 +1199,7 @@ public void CollectionAddJSONDepth()
     [Test, Description("Test MySQLX plugin Collection Add function with null")]
     public void CollectionAddNullFind()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       int i = 1;
       Collection col = CreateCollection("my_collection_1");
       var d1 = new DbDoc();
@@ -1225,7 +1225,7 @@ public void InvalidJSONString()
     [Test, Description("Test MySQLX plugin JSON String long expression")]
     public void JSONStringLongExpression()
     {
-      if (Platform.IsMacOSX()) Assert.Ignore("Check failure on MacOS: stack overflow");// TO DO
+      Assume.That(!Platform.IsMacOSX(), "Check failure on MacOs: stack overflow");//TO DO
 
       Collection col = CreateCollection("my_collection_1");
       String json = "",
@@ -1300,7 +1300,7 @@ public void BinaryExpression()
     [Test, Description("Test MySQLX plugin Invalid JSON String long expression")]
     public void JSONStringSpecialCharacters()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       Collection col = CreateCollection("my_collection_1");
       String[] splName = {"+", "*", "/", "a+b", "#1", "%", "&", "@1", "!1", "~", "^",
                           "(", ")", "{", "}", "[", "]", "|", "JSON", "ADD", "JSON_EXTRACT", "JSON_OBJECT",
@@ -1321,7 +1321,7 @@ public void JSONStringSpecialCharacters()
     [Test, Description("Test MySQLX plugin Collections Chained Insert")]
     public void CollectionsChainedInsert()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       Collection col = CreateCollection("my_collection_1");
       DbDoc newDoc = new DbDoc();
       newDoc.SetValue("F1", 1);
@@ -1372,8 +1372,8 @@ public void CollectionsChainedInsert()
     [Test, Description("Test MySQLX plugin Collection Add Array")]
     public void CollectionAddArray()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only.");
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5, 7, 0 or higher.");
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       int maxrec = 5;
       var col = CreateCollection("my_collection_1");
       DbDoc[] jsonlist = new DbDoc[maxrec];
@@ -1399,8 +1399,8 @@ public void CollectionAddArray()
     [Test, Description("Test MySQLX plugin Collection JSON Scenarios")]
     public void CollectionAddJSONDocs()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only.");
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       Collection col = CreateCollection("my_collection_1");
       string json = @"{ ""_id"": 0, ""title"": ""Book 0"" ,""pages"": 10,""name"": ""Jeoff Archer""}";
@@ -1475,7 +1475,7 @@ public void CollectionAddJSONDocs()
     [Test, Description("Verify that the field and column _id has a value when it's not given to a document-Scenario-1(single document add)")]
     public void VerifyIDField()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("this test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       List<string> idStringList = new List<string>();
       var col = CreateCollection("my_collection");
       Result result = null;
@@ -1553,7 +1553,7 @@ public void VerifyIDField()
     [Test, Description("Unique _ids generated server side for multiple documents, single add and generated ids count should be number of docs added-Scenario3")]
     public void VerifyIDFieldScenario3()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("this test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       List<string> idStringList = new List<string>();
       var col = CreateCollection("my_collection");
       Result result = null;
@@ -1618,7 +1618,7 @@ public void VerifyIDFieldScenario3()
     [Test, Description("Verify that the field and column _id has a value when it's not given to a document-Scenario-1(single document add)-when doc already exists")]
     public void VerifyIDFieldScenario4()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("this test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       List<string> idStringList = new List<string>();
       var col = CreateCollection("my_collection");
       Result result = null;
@@ -1759,7 +1759,7 @@ public void VerifyIDFieldScenario4()
     [Test, Description("Unique _ids generated server side for multiple documents,multiple add and generated ids count should be number of docs added-when doc already exists Scenario2")]
     public void VerifyIDFieldScenario5()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("this test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       List<string> idStringList = new List<string>();
       Result result = null;
       string generatedIDs1 = null;
@@ -1927,7 +1927,7 @@ public void VerifyIDFieldScenario5()
     [Test, Description("Unique _ids generated server side for multiple documents, single add and generated ids count should be number of docs added-when doc already exists Scenario3")]
     public void VerifyIDFieldScenario6()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("this test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       List<string> idStringList = new List<string>();
       var col = CreateCollection("my_collection");
       Result result = null;
@@ -2247,7 +2247,7 @@ public void CollectionAddMultipleDocsSameId()
     [Test, Description("Verify the behaviour if a sequence is incremented by the user and added as _id for the document")]
     public void VerifySequenceAndIdAdded()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       string incrementedString = null, generatedString = null;
       var col = CreateCollection("my_collection");
       Result result = null;
@@ -2287,7 +2287,7 @@ public void VerifySequenceAndIdAdded()
     [Test, Description("documents inserted concurrently by two threads")]
     public async Task CollectionConcurrentAdd()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       CreateCollection("my_collection");
       var r1 = await CollectionAddThread1();
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
index e14e77037..1bce4e78c 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
@@ -197,7 +197,7 @@ public void RemoveAll()
     [Test]
     public void RemoveWithInOperator()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       var docs = new[]
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
index 19216f6a5..c686b97c1 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
@@ -209,7 +209,7 @@ public void ModifyWithLimit()
     [Test]
     public void ModifyWithInOperator()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       var docs = new[]
@@ -982,7 +982,7 @@ public void ForbidModifyWithNoCondition_S2()
     [Test, Description("Test valid modify.patch to change element at Depth n for multiple arrays#Bug))")]
     public void ModifyPatchNDepth()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       string json = "";
       int i = 0, j = 0, maxField = 100;
       var collection = CreateCollection("test");
@@ -1012,7 +1012,7 @@ public void ModifyPatchNDepth()
     [Test, Description("Test valid modify.patch with condition/limit/OrderBy")]
     public void ModifyPatch()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var collection = CreateCollection("test");
       var docs = new[]
       {
@@ -1046,7 +1046,7 @@ public void ModifyPatch()
     [Test, Description("Test valid modify.patch with set/unset")]
     public void ModifyPatchWithSetUnset()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var collection = CreateCollection("test");
       var docs = new[]
       {
@@ -1080,7 +1080,7 @@ public void ModifyPatchWithSetUnset()
     [Test, Description("Test invalid modify.patch to attempt to change _id using modify.patch")]
     public void ModifyPatchChangeId()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var collection = CreateCollection("test");
       var docs = new[]
       {
@@ -1118,7 +1118,7 @@ public void ModifyPatchChangeId()
     [Test, Description("Test modify.patch where the key to be modified has array, dbDoc and normal constant value and condition is matched for all.")]
     public void ModifyPatchKeyWithArray()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var collection = CreateCollection("test");
       var docs1 = new[]
       {
@@ -1143,7 +1143,7 @@ public void ModifyPatchKeyWithArray()
     [Test, Description("Test that documents not matching conditions are not modified.")]
     public void ModifyPatchNotMatchingConditions()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var collection = CreateCollection("test");
       var docs = new[]
       {
@@ -1169,7 +1169,7 @@ public void ModifyPatchNotMatchingConditions()
     [Test, Description("Test modify.patch with different types of records(anonymous object,Json String,DbDoc) with same key and try to replace using a patch")]
     public void ModifyPatchDifferentTypesSameKey()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var collection = CreateCollection("test");
       var docs1 = new[]
       {
@@ -1200,7 +1200,7 @@ public void ModifyPatchDifferentTypesSameKey()
     [Test, Description("GetOne with ExistingID and NewID with doc(Verify the Immutable feature also))")]
     public void GetOneAndRemoveOne()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       var coll = CreateCollection("test");
       var docs = new[]
       {
@@ -1259,7 +1259,7 @@ public void GetOneAndRemoveOne()
     [Test, Description("AddReplaceOne with unique id generated by SQL")]
     public void AddReplaceOneUniqueId()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var collection = CreateCollection("test");
       var docs = new[]
       {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs b/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs
index be931efa9..85d2f494b 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs
@@ -134,7 +134,7 @@ public void PatchExpectedExceptions()
     [Test]
     public void SimplePatch()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add("{ \"_id\": \"123\", \"email\": \"alice@ora.com\", \"startDate\": \"4/1/2017\" }"));
@@ -158,7 +158,7 @@ public void SimplePatch()
     [Test]
     public void SimplePatchUsingMySqlExpressionClass()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add("{ \"_id\": \"123\", \"email\": \"alice@ora.com\", \"startDate\": \"4/1/2017\" }"));
@@ -177,7 +177,7 @@ public void SimplePatchUsingMySqlExpressionClass()
     [Test]
     public void CRUD()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsJsonStrings));
@@ -243,7 +243,7 @@ public void CRUD()
     [Test]
     public void ReplaceUpdateInDifferentNestingLevels()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
@@ -276,7 +276,7 @@ public void ReplaceUpdateInDifferentNestingLevels()
     [Test]
     public void AddRemoveFieldInDifferentNestingLevels()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
@@ -315,7 +315,7 @@ public void AddRemoveFieldInDifferentNestingLevels()
     [Test]
     public void CRUDMultipleFields()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
@@ -364,7 +364,7 @@ public void CRUDMultipleFields()
     [Test]
     public void AddNewFieldUsingExpressions()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
@@ -384,7 +384,7 @@ public void AddNewFieldUsingExpressions()
     [Test]
     public void ReplaceUpdateUsingExpressions()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
@@ -400,7 +400,7 @@ public void ReplaceUpdateUsingExpressions()
     [Test]
     public void ReplaceUpdateIdUsingExpressions()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
@@ -415,7 +415,7 @@ public void ReplaceUpdateIdUsingExpressions()
     [Test]
     public void AddIdToNestedDocumentUsingExpressions()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
@@ -431,7 +431,7 @@ public void AddIdToNestedDocumentUsingExpressions()
     [Test]
     public void AddNullFieldUsingExpressions()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
@@ -446,7 +446,7 @@ public void AddNullFieldUsingExpressions()
     [Test]
     public void ReplaceUpdateNullFieldReturnedFromExpression()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
@@ -462,7 +462,7 @@ public void ReplaceUpdateNullFieldReturnedFromExpression()
     [Test]
     public void AddNewFieldReturnedFromExpression()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
@@ -478,7 +478,7 @@ public void AddNewFieldReturnedFromExpression()
     [Test]
     public void ReplaceUpdateFieldWithDocumentReturnedFromExpression()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
@@ -498,7 +498,7 @@ public void ReplaceUpdateFieldWithDocumentReturnedFromExpression()
     [Test]
     public void ReplaceUpdateId()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
@@ -513,7 +513,7 @@ public void ReplaceUpdateId()
     [Test]
     public void AddIdToNestedDocument()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsDbDocs));
@@ -535,7 +535,7 @@ public void AddIdToNestedDocument()
     [Test]
     public void SetNullToId()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsJsonStrings));
@@ -549,7 +549,7 @@ public void SetNullToId()
     [Test]
     public void AddNullFields()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsJsonStrings));
@@ -580,7 +580,7 @@ public void AddNullFields()
     [Test]
     public void AddNestedNullFields()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       Collection collection = CreateCollection("test");
       Result r = ExecuteAddStatement(collection.Add(documentsAsJsonStrings));
@@ -726,7 +726,7 @@ public void PatchUsingOtherKnownFunctions()
     public void ModifyPatchMultipleRecords_S1()
     {
 
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var collection = CreateCollection("test");
       var docs = new[]
       {
@@ -992,7 +992,7 @@ public void ModifyPatchMultipleRecords_S1()
     [Test, Description("Test valid modify.patch to change element at Depth 5 for multiple arrays))")]
     public void ModifyInNestedObjects()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       string json = "";
       int i = 0, j = 0, k = 0, l = 0, m = 0, n = 0, maxFld = 10;
       var collection = CreateCollection("test");
@@ -1324,7 +1324,7 @@ public void ModifyInNestedObjects()
     [Test, Description("Test valid modify.patch to add/remove fields at Depth for multiple arrays.))")]
     public void ModifyPatchAtDepthMultipleArrays_S1()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       Collection collection = CreateCollection("test");
       List<DbDoc> listDocs = new List<DbDoc>();
       listDocs.Add(documentsAsDbDocs[0]);
@@ -1391,7 +1391,7 @@ public void ModifyPatchAtDepthMultipleArrays_S1()
     [Test, Description("Test valid modify.patch to use expr to change existing keys in document))")]
     public void ModifyPatchAtDepthMultipleArrays_S2()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       DbDoc document = null;
       Collection collection = CreateCollection("test");
       Result r = collection.Add("{ \"_id\": \"123\", \"email\": \"alice@ora.com\", " +
@@ -1700,7 +1700,7 @@ public void ModifyPatchAtDepthMultipleArrays_S2()
     [Test, Description("Test invalid modify.patch to attempt to use invalid string (non JSON string/empty/NULL) as patch string.))")]
     public void ModifyPatchInvalidString()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var collection = CreateCollection("test");
       var docs = new[]
       {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
index daf2f5f30..56fb53c8b 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
@@ -611,7 +611,7 @@ public void ConnectionPoolingTest()
     [Test, Description("Deallocate PreparedStatments When Closing Session Load-100 times")]
     public void DeallocatePreparedStatmentsWhenClosingSessionLoad()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("Check for Linux OS");
+      Assume.That(Platform.IsWindows(), "Check for Linux OS");
 
       InitCollection();
       string threadId;
@@ -881,7 +881,7 @@ public void SessionSqlStatementFail()
     [Test, Description("DELETE WHERE THROWS PARSE EXCEPTION WITH IN OPERATOR FOR ARRAY")]
     public void DeleteParseException()
     {
-      if (!session.Version.isAtLeast(8, 0, 16)) Assert.Ignore("This test is for MySql 8.0.16 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       var tableName = "newtable";
       Session session1 = null;
       Client client1 = null;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs
index d5c906c3c..7ce44ed11 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs
@@ -217,7 +217,7 @@ public void TablePositiveSession()
     [Test, Description("Stored Procedure Table-StringBuilder and Session")]
     public void StoredProcTablePositiveStringBuilderSession()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
 
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
       var connectionStringObject = new { connection = "server=" + sb.Server + ";user=" + sb.UserID + ";port=" + sb.Port + ";password=" + sb.Password };
@@ -313,7 +313,7 @@ public void StoredProcTablePositiveStringBuilderSession()
     [Test, Description("Stored Procedure Table-Negative(procedure returns null)")]
     public void StoredProcReturnsNull()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
 
       MySqlConnection mysql = new MySqlConnection(ConnectionStringRoot);
       mysql.Open();
@@ -393,7 +393,7 @@ public void StoredProcReturnsNull()
     [Test, Description("Bind Support for Session SQL Numeric Datatypes- integer,JSON,tinyint,smallint,mediumint,bigint,float,double,decimal")]
     public void BindSupportSessionSQLNumericDatatypes()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       var connectionString = ConnectionString + ";sslmode=" + MySqlSslMode.Required;
       SqlResult myResult;
       Row row;
@@ -581,7 +581,7 @@ public void BindSupportSessionSQLNumericDatatypes()
     [Test, Description("Bind Support for Session SQL DateTime Types- date,datetime,timestamp,time,year(M)")]
     public void BindSupportSessionSQLDateTimetypes()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       //DATE
       string connectionString = ConnectionString + ";sslmode=" + MySqlSslMode.Required;
       SqlResult myResult;
@@ -702,7 +702,7 @@ public void BindSupportSessionSQLDateTimetypes()
     [Test, Description("Bind Support for Session SQL String Types- CHAR(M),VARCHAR(M),BLOB,TINYBLOB,MEDIUMBLOB,LONGBLOB,ENUM")]
     public void BindSupportSessionSQLStringtypes()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       //CHAR(20)
       string connectionString = ConnectionString + ";sslmode=" + MySqlSslMode.Required;
       SqlResult myResult;
@@ -866,7 +866,7 @@ public void BindSupportSessionSQLStringtypes()
     [Test, Description("Bind Support for Session SQL Negative Tests-Null")]
     public void BindSupportSessionSQLNegativeTest1()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       SqlResult myResult = null;
 
       //integer
@@ -896,7 +896,7 @@ public void BindSupportSessionSQLNegativeTest1()
     [Test, Description("Bind Support for Session SQL Negative Tests-Bind Chaining Tests")]
     public void BindSupportSessionSQLNegativeTest2()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
 
       //integer
       string connectionString = ConnectionString + ";sslmode=" + MySqlSslMode.Required;
@@ -932,7 +932,7 @@ public void BindSupportSessionSQLNegativeTest2()
     [Test, Description("Test MySQLX plugin MySQL mixed scenario")]
     public void MixedChainedCommands()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       ExecuteSQL("Drop table if exists test");
       ExecuteSQL("CREATE TABLE test(c1 float(14,8),c2 double GENERATED ALWAYS AS (c1*101/102) Stored COMMENT 'First Gen Col')");
       ExecuteSQL("INSERT INTO test(c1) VALUES (22.7)");
@@ -955,7 +955,7 @@ public void MixedChainedCommands()
     [Test, Description("Test MySQLX plugin MySQL Date Time Bug")]
     public void DateTimeCheck()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       ExecuteSQL("CREATE TABLE test.test1212(dt DATETIME(6))");
       ExecuteSQL("INSERT INTO test.test1212 VALUES('2015-10-21 18:01:00.12345678')");
 
@@ -968,7 +968,7 @@ public void DateTimeCheck()
     [Test, Description("Test MySQLX plugin MySQL Datetime JSON")]
     public void DateTimeJSON()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       ExecuteSQL("DROP TABLE IF EXISTS test.test");
       ExecuteSQL("CREATE TABLE test.test(Id int NOT NULL PRIMARY KEY, jsoncolumn JSON)");
       ExecuteSQL(@"INSERT INTO test.test VALUES(100000,' { ""name"" : ""bob"",""Date"": ""2015-10-09"",""Time"": ""12:18:29.000000"",""DateTimeOfRegistration"": ""2015-10-09 12:18:29.000000"",""age"":12} ')");
@@ -980,8 +980,8 @@ public void DateTimeJSON()
     [Test, Description("Test MySQLX plugin JSON Variant")]
     public void JSONVariant()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       ExecuteSQL("DROP TABLE IF EXISTS Test");
       ExecuteSQL("CREATE TABLE test (Id int NOT NULL PRIMARY KEY, jsoncolumn JSON)");
       ExecuteSQL("INSERT INTO test VALUES (1, '[1]')");
@@ -994,8 +994,8 @@ public void JSONVariant()
     [Test, Description("Test MySQLX plugin big int as PK")]
     public void BigIntasPK()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
 
       ExecuteSQL("DROP TABLE IF EXISTS Test");
       ExecuteSQL("CREATE TABLE test (Id bigint NOT NULL PRIMARY KEY, jsoncolumn JSON)");
@@ -1009,8 +1009,8 @@ public void BigIntasPK()
     [Test, Description("Test MySQLX plugin tiny int as PK")]
     public void TinyIntasPK()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
 
       using (var ss = MySQLX.GetSession(ConnectionString))
       {
@@ -1027,8 +1027,8 @@ public void TinyIntasPK()
     [Test, Description("Test MySQLX plugin small int as PK")]
     public void SmallIntasPK()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
 
       using (var ss = MySQLX.GetSession(ConnectionString))
       {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
index 78ef32930..bcb824a7b 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
@@ -198,7 +198,7 @@ public void RowLockingNotSupportedInOlderVersions()
     [Test]
     public void SimpleSharedLock()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -227,7 +227,7 @@ public void SimpleSharedLock()
     [Test]
     public void SimpleExclusiveLock()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -258,7 +258,7 @@ public void SimpleExclusiveLock()
     [Test]
     public void SharedLockForbidsToModifyDocuments()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -294,7 +294,7 @@ public void SharedLockForbidsToModifyDocuments()
     [Test]
     public void ExclusiveLockForbidsToModifyDocuments()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -327,7 +327,7 @@ public void ExclusiveLockForbidsToModifyDocuments()
     [Test]
     public void SharedLockAfterExclusiveLock()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -362,7 +362,7 @@ public void SharedLockAfterExclusiveLock()
     [Test]
     public void ExclusiveLockAfterSharedLock()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       ExecuteSQLStatement(session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"));
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -555,7 +555,7 @@ public void InOperatorBindingJson(string condition, string bind, string value, i
     [Test, Description("Reading locked document(lock_shared) in a table using lock_exclusive with DEFAULT waiting option.")]
     public void ExclusiveLockAfterSharedLockDefaultWaiting()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -602,7 +602,7 @@ public void ExclusiveLockAfterSharedLockDefaultWaiting()
     [Test, Description("Reading exclusively locked document in a table using lock_shared with NOWAIT waiting option. ")]
     public void SharedLockAfterExclusiveLockWithNoWait()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -699,7 +699,7 @@ record = record + "\"}";
     [Test, Description("Test MySQLX plugin Datatype Tests")]
     public void DatatypesOnCreateTable()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL($"use {schemaName}");
       session.SQL("create table test1(c1 int,c2 double GENERATED ALWAYS AS (c1*101/102) Stored COMMENT 'First Gen Col',c3 Json GENERATED ALWAYS AS (concat('{\"F1\":',c1,'}')) VIRTUAL COMMENT 'Second Gen /**/Col', c4 bigint GENERATED ALWAYS as (c1*10000) VIRTUAL UNIQUE KEY Comment '3rd Col' NOT NULL)").Execute();
@@ -713,7 +713,7 @@ public void DatatypesOnCreateTable()
     [Test, Description("Test MySQLX plugin Table Expression using Where")]
     public void TableExpressionWhereBindGroupBy()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       string match = null;
       session.SQL("create table test1(name VARCHAR(40), age INT)").Execute();
@@ -804,7 +804,7 @@ public void TableSelectFetchValuesInOrder()
     [Test, Description("Reading exclusively locked document in a table using lock_exclusive with NOWAIT waiting option. ")]
     public void DoubleExclusiveLockWithNoWait()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -849,7 +849,7 @@ public void DoubleExclusiveLockWithNoWait()
     [Test, Description("Reading a locked document(lock_shared) in a table using lock_shared with NOWAIT waiting option. ")]
     public void DoubleSharedLockWithNoWait()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -890,7 +890,7 @@ public void DoubleSharedLockWithNoWait()
     [Test, Description("Reading a locked document(lock_shared) in a table using lock_shared with NOWAIT waiting option. ")]
     public void ExclusiveLockAfterSharedLockWithNoWait()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -932,7 +932,7 @@ public void ExclusiveLockAfterSharedLockWithNoWait()
     [Test, Description("Reading exclusively locked document in a table using lock_shared with SKIPLOCK waiting option. ")]
     public void SharedLockAfterExclusiveWithSkiplock()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -976,7 +976,7 @@ public void SharedLockAfterExclusiveWithSkiplock()
     [Test, Description("Reading exclusively locked document in a table using lock_exclusive with SKIPLOCK waiting option.")]
     public void DoubleExclusiveLockWithSkiplock()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -1018,7 +1018,7 @@ public void DoubleExclusiveLockWithSkiplock()
     [Test, Description("Reading a locked document(lock_shared) in a table using lock_shared with SKIPLOCK waiting option. ")]
     public void DoubleSharedLockWithSkiplock()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -1060,7 +1060,7 @@ public void DoubleSharedLockWithSkiplock()
     [Test, Description("Reading a locked document(lock_shared) in a table using lock_exclusive with SKIPLOCK waiting option.")]
     public void ExclusiveLockAfterSharedLockWithSkiplock()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -1103,7 +1103,7 @@ public void ExclusiveLockAfterSharedLockWithSkiplock()
     [Test, Description("Reading an exclusively locked document in a table using lock_shared without any waiting option. ")]
     public void ExclusiveLockBeforeSharedLockWithoutAwaiting()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -1145,7 +1145,7 @@ public void ExclusiveLockBeforeSharedLockWithoutAwaiting()
     [Test, Description("Reading an exclusively locked document in a table using lock_exclusive without any waiting option.")]
     public void DoubleExclusiveLockWithoutWaiting()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       using (var session2 = MySQLX.GetSession(ConnectionString))
       {
@@ -1182,7 +1182,7 @@ public void DoubleExclusiveLockWithoutWaiting()
     [Test, Description("Reading a locked document(lock_shared) in a table using lock_shared without any waiting option.")]
     public void DoubleSharedLockWithoutWaiting()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -1223,7 +1223,7 @@ public void DoubleSharedLockWithoutWaiting()
     [Test, Description("Reading a locked document(lock_shared) in a table using lock_exclusive without any waiting option. ")]
     public void SharedLockBeforeExclusiveLockWithoutWaiting()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -1265,7 +1265,7 @@ public void SharedLockBeforeExclusiveLockWithoutWaiting()
     [Test, Description("Reading a locked document(shared/exclusive) in a table using SKIPLOCK and NOWAIT waiting options when CRUD is happening parallely")]
     public void SingleLockExclusiveWithNoWaitAndSkip()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -1305,7 +1305,7 @@ public void SingleLockExclusiveWithNoWaitAndSkip()
     [Test, Description("Multiple lock calls on a document in table using NOWAIT and SKIPLOCK waiting options")]
     public void ChainedExclusiveLocks()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -1343,7 +1343,7 @@ public void ChainedExclusiveLocks()
     [Test, Description("Test MySQLX plugin - MYSQLCNET 755 Table GetIncrementValue")]
     public void TableGetAutoIncrementValue()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       session.SQL("CREATE TABLE address1" +
                   "(address_number1  MEDIUMINT NOT NULL AUTO_INCREMENT, " +
@@ -1492,7 +1492,7 @@ public void FetchoneReturnsNullNoTable()
     [Test, Description("MySQLX CNET-Test Table.Select() with exclusive lock and Table.Update() normal from two sessions. ")]
     public void DoubleChainedLocksWithTwoSessions_S1()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       session.SQL("SET autocommit = 0").Execute();
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -1554,7 +1554,7 @@ public void DoubleChainedLocksWithTwoSessions_S1()
     [Test, Description("MySQLX CNET-Test Table.Select() with shared lock and Table.Update() normal from two sessions. ")]
     public void DoubleChainedLocksWithTwoSessions_S2()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       session.SQL("SET autocommit = 0").Execute();
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -1621,7 +1621,7 @@ public void DoubleChainedLocksWithTwoSessions_S2()
     [Test, Description("MySQLX CNET-Test Table.Select() with exclusive lock from two sessions. ")]
     public void SingleExclusiveLock()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       session.SQL("SET autocommit = 0").Execute();
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -1652,7 +1652,7 @@ public void SingleExclusiveLock()
     [Test, Description("MySQLX CNET-Test Table.Select() with exclusive lock and Table.Select() with exclusive lock from two sessions-Select multiple records")]
     public void SingleTransactionWithLocks()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       session.SQL("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED").Execute();
       using (var session2 = MySQLX.GetSession(ConnectionString))
@@ -1693,8 +1693,8 @@ public void SingleTransactionWithLocks()
     [Test, Description("MySQLX CNET-Test Table.Select() with exclusive lock and Table.Update() normal from two sessions-50 Iterations")]
     public void IteratedExclusiveLocks()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       session.SQL("SET autocommit = 0").Execute();
       session.SQL("CREATE UNIQUE INDEX myIndex ON test.test (id)").Execute();
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs
index da0dcdd62..b8713cea6 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs
@@ -244,7 +244,7 @@ public void TableSelectGroupBy()
     [Test, Description("Reading exclusively locked document in a table using lock_shared with DEFAULT waiting option.")]
     public void ExclusiveLockBeforeSharedLockDefaultWaiting()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -286,7 +286,7 @@ public void ExclusiveLockBeforeSharedLockDefaultWaiting()
     [Test, Description("Reading locked document(lock_shared) in a table using lock_shared with DEFAULT waiting option.")]
     public void SharedLockDefaultWaiting()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
@@ -325,7 +325,7 @@ public void SharedLockDefaultWaiting()
     [Test,Description("Reading exclusively locked document in a table using lock_exclusive with DEFAULT waiting option ")]
     public void OnlyExclusiveLocksWithDefaultWaiting()
     {
-      if (!session.InternalSession.GetServerVersion().isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       session.SQL("DROP TABLE IF EXISTS test.test").Execute();
       session.SQL("CREATE TABLE test.test (id INT, a INT)").Execute();
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs
index 9f66e0459..07145c044 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs
@@ -174,7 +174,7 @@ public void ExceptionHandlingSchema()
     [Test, Description("Test MySQLX plugin Exception Handling Scenario 2")]
     public void ExceptionHandlingCollection()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
 
       Session sessionPlain = MySQLX.GetSession(ConnectionString);
 
@@ -213,7 +213,7 @@ public void CreateValidSchema()
     [Test, Description("Set Node Schema")]
     public void SessionSetSchema()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       if (!session.GetSchema("test1").ExistsInDatabase())
         session.CreateSchema("test1");
       Assert.DoesNotThrow(() => session.SetCurrentSchema("test1"));
@@ -238,7 +238,7 @@ public void SessionSetSchema()
     [Test, Description("Session Status before Execution - Negative")]
     public void SessionClosedBeforeExecution()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Schema schema = null;
       Session sessionPlain = MySQLX.GetSession(ConnectionString);
       schema = sessionPlain.GetSchema(schemaName);
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
index 78aedaa65..9be27390c 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
@@ -255,7 +255,7 @@ public void CheckConnectionUri()
       CheckConnectionData("mysqlx://myuser:password@[(address=[fe80::bd41:e449:45ee:2e1a%17]:3305,priority=100)]", "myuser", "password", "[fe80::bd41:e449:45ee:2e1a]", 3305);
       Assert.Throws<UriFormatException>(() => CheckConnectionData("mysqlx://myuser:password@[(address=fe80::bd41:e449:45ee:2e1a%17,priority=100)]", "myuser", "password", "[fe80::bd41:e449:45ee:2e1a]", 33060));
       CheckConnectionData("mysqlx://myuser@localhost/test", "myuser", "", "localhost", 33060, "database", schemaName);
-#if NET8_0
+#if NET8_0_OR_GREATER
       CheckConnectionData("mysqlx://myuser@localhost/test?ssl%20mode=disabled&connecttimeout=10", "myuser", "", "localhost", 33060, "database", schemaName, "ssl mode", "None", "connecttimeout", "10");
 #else
       CheckConnectionData("mysqlx://myuser@localhost/test?ssl%20mode=disabled&connecttimeout=10", "myuser", "", "localhost", 33060, "database", schemaName, "ssl mode", "Disabled", "connecttimeout", "10");
@@ -303,7 +303,7 @@ public void IPv6()
       csBuilder.Server = GetMySqlServerIp(true);
       csBuilder.Port = uint.Parse(XPort);
 
-      if (string.IsNullOrEmpty(csBuilder.Server)) Assert.Ignore("No IPv6 available.");
+      Assume.That(!string.IsNullOrEmpty(csBuilder.Server), "No IPv6 available.");
 
       using (var session = MySQLX.GetSession(csBuilder.ToString()))
       {
@@ -317,7 +317,7 @@ public void IPv6AsUrl()
     {
       var csBuilder = new MySqlXConnectionStringBuilder(ConnectionString);
       string ipv6 = GetMySqlServerIp(true);
-      if (string.IsNullOrEmpty(ipv6)) Assert.Ignore("No IPv6 available.");
+      Assume.That(!string.IsNullOrEmpty(ipv6), "No IPv6 available.");
 
       string connString = $"mysqlx://{csBuilder.UserID}:{csBuilder.Password}@[{ipv6}]:{XPort}";
       using (Session session = MySQLX.GetSession(connString))
@@ -332,7 +332,7 @@ public void IPv6AsAnonymous()
     {
       var csBuilder = new MySqlXConnectionStringBuilder(ConnectionString);
       string ipv6 = GetMySqlServerIp(true);
-      if (string.IsNullOrEmpty(ipv6)) Assert.Ignore("No IPv6 available.");
+      Assume.That(!string.IsNullOrEmpty(ipv6), "No IPv6 available.");
 
       using (Session session = MySQLX.GetSession(new { server = ipv6, user = csBuilder.UserID, password = csBuilder.Password, port = XPort }))
       {
@@ -483,7 +483,7 @@ public void GetUri()
     [Property("Category", "Security")]
     public void ConnectTimeout()
     {
-      if (Platform.IsMacOSX()) Assert.Ignore("Check failure on MacOS: <System.Net.Internals.SocketExceptionFactory+ExtendedSocketException (51): Network is unreachable 143.24.20.36:33060");
+      Assume.That(!Platform.IsMacOSX(), "Check failure on MacOS: <System.Net.Internals.SocketExceptionFactory+ExtendedSocketException (51): Network is unreachable 143.24.20.36:33060");
 
       // Create a session passing the new parameter "connect-timeout" and set it to a valid value.
       // ConnectionString.
@@ -733,7 +733,7 @@ private void TestConnectionAttributes(string connString, Dictionary<string, obje
     [Description("IPv6 connection Scenario [localhost],[127.0.0.1]")]
     public void ConnectionTest(string serverName)
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test only applies foe Windows OS.");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
 
       serverName = serverName.Replace("localhost", Host);
 
@@ -765,7 +765,7 @@ public void ConnectionTest(string serverName)
     [Description("IPv6 connection server * and ::$,invalid hostname")]
     public void IPv6ConnectionExceptions(string serverName)
     {
-      if (!Platform.IsWindows()) return;
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
 
       Session sessionTest = null;
       string connStr = "server=" + serverName + ";user=test;port=" + XPort + ";password=test;sslmode=" + MySqlSslMode.Required;
@@ -777,7 +777,7 @@ public void IPv6ConnectionExceptions(string serverName)
     [Test, Description("Unified connection string refinement-Negative Scenarios")]
     public void ConnectionNegativeScenarios()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
       var ipv6HostName2 = GetIPV6Address();
       string ipAddress = GetMySqlServerIp();
 
@@ -2221,8 +2221,8 @@ public void SessionAuditPluginTest()
     [Test, Description("Classic Client with xprotocol server")]
     public void ClassicClientXProtocol()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
 
       string connectionString = $"server={Host};user={session.Settings.UserID};port={XPort};password={session.Settings.Password}";
       using (var session1 = new MySqlConnection(connectionString))
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
index a91d11915..25828c3c7 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
@@ -123,7 +123,7 @@ public void SslRequiredByDefault()
     public void SslPreferredIsInvalid()
     {
       string prefered = "Prefered";
-#if NET8_0
+#if NET8_0_OR_GREATER
       prefered = "Preferred";
 #endif
       var expectedErrorMessage = "Value '{0}' is not of the correct type.";
@@ -682,7 +682,7 @@ public void AttemptConnectionWitSwitchedPemCertificates()
     [Test, Description("Wrong Certificate with TLS with URI")]
     public void PfxCertificateWithUri()
     {
-      if (!session.Version.isAtLeast(8, 0, 0)) Assert.Ignore("This test is for MySql 8.0 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 0), "This test is for MySql 8.0 or higher");
 
       var connStr = ConnectionStringUri + $"?ssl-mode=VerifyCA&ssl-ca={clientPfxIncorrect}&ssl-ca-pwd={sslCertificatePassword}";
       Assert.That(() => MySQLX.GetSession(connStr), Throws.Exception);
@@ -702,7 +702,7 @@ public void PfxCertificateWithUri()
     [Test, Description("MySQLX ran with Automation for server with TLS")]
     public void PfxCertificateWithConnectionString()
     {
-      if (!session.Version.isAtLeast(8, 0, 0)) Assert.Ignore("This test is for MySql 8.0 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 0), "This test is for MySql 8.0 or higher");
 
       var connStr = ConnectionString + $";ssl-mode=Required;ssl-ca={clientPfx};ssl-ca-pwd={sslCertificatePassword};";
       using (Session c = MySQLX.GetSession(connStr))
@@ -723,7 +723,7 @@ public void PfxCertificateWithConnectionString()
     [Test]
     public void ConnectUsingCertificateFileAndTlsVersionXplugin()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       var builder = new MySqlConnectionStringBuilder(ConnectionString);
       builder.SslMode = MySqlSslMode.Required;
@@ -746,8 +746,8 @@ public void ConnectUsingCertificateFileAndTlsVersionXplugin()
     [TestCase("TLSv1.2")]
     public void TlsVersionInConnectionStringXplugin(string tlsVersion)
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(8, 0, 16)) Assert.Ignore("This test is for MySql 8.0.16 or higher.");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
 
       var connStr = ConnectionString + $";sslmode=Required;tls-version={tlsVersion}";
       using (var c = MySQLX.GetSession(connStr))
@@ -761,7 +761,7 @@ public void TlsVersionInConnectionStringXplugin(string tlsVersion)
     [Test, Description("Verify PEM options (SslCa,SslCert,SslKey) with different SSL modes")]
     public void PemCertDifferentSSLmodes()
     {
-      if (!session.Version.isAtLeast(8, 0, 16)) Assert.Ignore("This test is for MySql 8.0.16 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       string CommandText1 = "SHOW STATUS LIKE '%Ssl_cipher%';";
       string CommandText2 = "show  status like '%Ssl_version%';";
       string connStr = null;
@@ -913,8 +913,8 @@ public void PemCertDifferentSSLmodes()
     [Test, Description("MySQLX-scenario (wrong/no ssl-ca,correct ssl-key/ssl-cert,ssl-mode VerifyCA)")]
     public void IncorrectSslCAVerifyCAMode()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       string sslmode = "VerifyCA";
       string[] sslcalist = new string[] { "ca_dummy.pem", "", " ", null, "file", "file.pem" };
       for (int i = 0; i < sslcalist.Length; i++)
@@ -983,8 +983,8 @@ public void IncorrectSslCAVerifyCAMode()
     [Test, Description("MySQLX-Scenario (correct ssl-ca,wrong/no ssl-key/ssl-cert,ssl-mode VerifyCA)")]
     public void IncorrectSslkeyAndSslcertVerifyCAMode()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(8, 0, 0)) Assert.Ignore("This test is for MySql 8.0 or higher.");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
+      Assume.That(session.Version.isAtLeast(8, 0, 0), "This test is for MySql 8.0 or higher");
       string sslmode = "VerifyCA";
       string[] sslcertlist = new string[] { "", " ", null, "file", "file.pem" };
       string[] sslkeylist = new string[] { "", " ", null, "file", "file.pem" };
@@ -1060,8 +1060,8 @@ public void IncorrectSslkeyAndSslcertVerifyCAMode()
     [Test, Description("MySQLX-Scenario (wrong ssl-ca,correct ssl-key/ssl-cert,ssl-mode required and default)")]
     public void IncorrectSslCACorrectKeyAndCertRequiredMode()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       string sslmode = "Required";
       string[] sslcalist = new string[] { "ca_dummy.pem", "", " ", null, "file", "file.pem" };
       List<string> csAndUriList = new List<string>();
@@ -1126,8 +1126,8 @@ public void IncorrectSslCACorrectKeyAndCertRequiredMode()
     [Test, Description("MySQLX-Scenario (no ssl-ca,correct ssl-key/ssl-cert,ssl-mode required and default)")]
     public void NoSslcaWithSslkeySslcertRequiredMode()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("This test is for MySql 8.0.11 or higher.");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       string sslmode = "Required";
       List<string> csAndUriList = new List<string>();
       List<object> connObjectList = new List<object>();
@@ -1171,7 +1171,7 @@ public void NoSslcaWithSslkeySslcertRequiredMode()
     [Test, Description("MySQLX-Scenario (correct ssl-ca,wrong ssl-key/ssl-cert,ssl-mode required and default)")]
     public void CorrectSslcaWrongSslkeySslcertRequiredMode()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
       string sslmode = "Required";
       string[] sslcertlist = new string[] { "", " ", null, "file", "file.pem" };
       string[] sslkeylist = new string[] { "", " ", null, "file", "file.pem" };
@@ -1251,8 +1251,8 @@ public void CorrectSslcaWrongSslkeySslcertRequiredMode()
     [Test, Description("MySQLX-Scenario (correct ssl-ca,no ssl-key/ssl-cert,ssl-mode required and default)")]
     public void CorrectSslcaNoSslkeyorCertRequiredMode()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(8, 0, 0)) Assert.Ignore("This test is for MySql 8.0 or higher.");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
+      Assume.That(session.Version.isAtLeast(8, 0, 0), "This test is for MySql 8.0 or higher");
       string sslmode = "Required";
       List<string> csAndUriList = new List<string>();
       //Connection string and Uris
@@ -1313,8 +1313,8 @@ public void CorrectSslcaNoSslkeyorCertRequiredMode()
     [Test, Description("mixed spelling ssl-ca, ssl-key/ssl-cert, ssl-mode VerifyCA and Required)")]
     public void MixedspellingSslcaSslkeySslcert()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
-      if (!session.Version.isAtLeast(8, 0, 0)) Assert.Ignore("This test is for MySql 8.0 or higher.");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
+      Assume.That(session.Version.isAtLeast(8, 0, 0), "This test is for MySql 8.0.0 or higher");
       string[] sslmode = new string[] { "VerifyCA", "Required" };
       for (int i = 0; i < sslmode.Length; i++)
       {
@@ -1378,7 +1378,7 @@ public void RepeatedTlsOption()
     [Test, Description("checking different versions of TLS")]
     public void SecurityTlsCheck()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("This test is for Windows OS only");
+      Assume.That(Platform.IsWindows(), "This test is only for Windows OS.");
       MySqlSslMode[] modes = { MySqlSslMode.Required, MySqlSslMode.VerifyCA, MySqlSslMode.VerifyFull };
       String[] version, ver1Tls;
       var conStrX = $"{ConnectionString};SslCa={sslCa};SslCert={sslCert};SslKey={sslKey};ssl-ca-pwd={sslCertificatePassword}";
@@ -1433,7 +1433,7 @@ public void Tlsv13Bug()
     [Ignore("Fix this")]
     public void Tlsv13Linux()
     {
-      if (Platform.IsWindows()) Assert.Ignore("This test is for Linux OS only");
+      Assume.That(!Platform.IsWindows(), "This test is only for Linux OS.");
 
       MySqlSslMode[] modes = { MySqlSslMode.Required, MySqlSslMode.VerifyCA, MySqlSslMode.VerifyFull };
       var conStr = $"{ConnectionString};SslCa={sslCa};SslCert={sslCert};SslKey={sslKey};ssl-ca-pwd={sslCertificatePassword}";
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs
index 6045bd692..41975b6eb 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs
@@ -339,7 +339,7 @@ public void RollbackAndReleaseAfterTransactionRollback()
     [Test, Description("Session Close Transaction")]
     public void SessionCloseTransaction()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       using (Session sessionTest = MySQLX.GetSession(ConnectionString))
       {
         Schema db = null;
@@ -359,7 +359,7 @@ public void SessionCloseTransaction()
     [Test, Description("Valid Commit and Check Warning ")]
     public void CommitValidWarning()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       using (Session sessionPlain = MySQLX.GetSession(ConnectionString))
       {
         sessionPlain.SetCurrentSchema("test");
@@ -379,7 +379,7 @@ public void CommitValidWarning()
     [Test, Description("Invalid Commit and Check Warning ")]
     public void CommitInvalidWarning()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       using (Session sessionPlain = MySQLX.GetSession(ConnectionString))
       {
         sessionPlain.SetCurrentSchema("test");
@@ -399,7 +399,7 @@ public void CommitInvalidWarning()
     [Test, Description("Valid Rollback and Check Warning ")]
     public void RollbackValidWarning()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       using (Session sessionPlain = MySQLX.GetSession(ConnectionString))
       {
         sessionPlain.SetCurrentSchema("test");
@@ -420,7 +420,7 @@ public void RollbackValidWarning()
     [Test, Description("Invalid Rollback and Check Warning ")]
     public void RollbackInvalidWarning()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       using (Session sessionPlain = MySQLX.GetSession(ConnectionString))
       {
         sessionPlain.SetCurrentSchema("test");
@@ -442,7 +442,7 @@ public void RollbackInvalidWarning()
     [Test, Description("Commit Rollback Invalid Warning")]
     public void CommitRollbackInvalidWarning()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       Collection coll = CreateCollection("test");
       var docs1 = new[]
       {
@@ -533,7 +533,7 @@ public void Warnings()
     [Test, Description("Rollback to same savepoint multiple times")]
     public void RollbackToSameSavepoint()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
 
       var col = CreateCollection("my_collection");
       session.StartTransaction();
@@ -569,7 +569,7 @@ public void RollbackToSameSavepoint()
     [Test, Description("Releasing a savepoint multiple times")]
     public void ReleaseSavepointMoreThanOnce()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       using (Session sessionTest = MySQLX.GetSession(ConnectionString))
       {
         var col = CreateCollection("my_collection");
@@ -604,7 +604,7 @@ public void ReleaseSavepointMoreThanOnce()
     [Description("Creating multiple savepoints with SetSavepoint([name]) and rolling back to a specific one")]
     public void MultipleSavepointsAndRollback(string savePoint1, string savePoint2)
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var col = CreateCollection("my_collection");
       session.StartTransaction();
       object[] data = new object[]
@@ -630,7 +630,7 @@ public void MultipleSavepointsAndRollback(string savePoint1, string savePoint2)
     [Test, Description("Test creating a savepoint without starting a transaction")]
     public void SavepointWithoutTransaction()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var col = CreateCollection("my_collection");
       object[] data = new object[]
       {
@@ -653,7 +653,7 @@ public void SavepointWithoutTransaction()
     [Test, Description("Validate that further savepoints get released once you release a preceding savepoint")]
     public void ValidateSavepointsReleased()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var col = CreateCollection("my_collection");
       session.StartTransaction();
 
@@ -684,7 +684,7 @@ public void ValidateSavepointsReleased()
     [Test, Description("Validate Nested-transactions with multiple savepoints")]
     public void NestedTransactions()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var col = CreateCollection("my_collection");
       session.StartTransaction();
       object[] data = new object[]
@@ -712,7 +712,7 @@ public void NestedTransactions()
     [Test, Description("Test the behaviour of Savepoints created immediately after one another")]
     public void SavepointsCreatedImmediately()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       var col = CreateCollection("my_collection");
       session.StartTransaction();
       object[] data = new object[]
@@ -732,7 +732,7 @@ public void SavepointsCreatedImmediately()
     [Test, Description("Test MySQLX plugin Commit After Commit")]
     public void CommitAfterCommit()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Collection coll = CreateCollection("test");
       var docs1 = new[]
       {
@@ -795,7 +795,7 @@ public void CommitAfterCommit()
     [Test, Description("Test MySQLX plugin Rollback Multiple")]
     public void RollBackMultiple()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Collection coll = CreateCollection("test");
       var docs1 = new[]
       {
@@ -838,7 +838,7 @@ public void RollBackMultiple()
     [Test, Description("Test MySQLX plugin Rollback after RollBack")]
     public void RollBackAfterRollBack()
     {
-      if (!session.Version.isAtLeast(8, 0, 3)) Assert.Ignore("This test is for MySql 8.0.3 or higher.");
+      Assume.That(session.Version.isAtLeast(8, 0, 3), "This test is for MySql 8.0.3 or higher");
       Collection coll = CreateCollection("test");
       var docs1 = new[]
       {
@@ -897,7 +897,7 @@ public void RollBackAfterRollBack()
     [Test, Description("Test MySQLX plugin Commit Rollback")]
     public void CommitRollBack()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Collection coll = CreateCollection("test");
       var docs1 = new[]
       {
@@ -949,7 +949,7 @@ public void CommitRollBack()
     [Test, Description("Test MySQLX plugin RollBack Commit")]
     public void RollBackCommit()
     {
-      if (!session.Version.isAtLeast(5, 7, 0)) Assert.Ignore("This test is for MySql 5.7 or higher.");
+      Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
       Collection coll = CreateCollection("test");
       var docs1 = new[]
       {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs b/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
index 24ae47b85..b9cccf21e 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
@@ -42,8 +42,8 @@ public class XAuth : BaseTest
     [Property("Category", "Security")]
     public void DefaultAuthNullPlugin()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("Check for Linux OS");
-      if (!session.Version.isAtLeast(8, 4, 0)) Assert.Ignore("Test available only to MySQL Server +8.4.0");
+      Assume.That(Platform.IsWindows(), "Check For Linux OS");
+      Assume.That(session.Version.isAtLeast(8, 4, 0), "This test is for MySql 8.4.0 or higher");
 
       string pluginName = "caching_sha2_password";//default plugin
       MySqlConnectionStringBuilder builder = new MySqlConnectionStringBuilder(ConnectionString);
@@ -146,7 +146,7 @@ public void DefaultAuthNullPlugin()
     [Property("Category", "Security")]
     public void DefaultAuthPublicKeyRetrieval()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("Test available only to MySQL Server +8.0.11");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
 
       string pluginName = "caching_sha2_password";//default plugin
       MySqlConnectionStringBuilder builder = new MySqlConnectionStringBuilder(ConnectionString);
@@ -198,9 +198,9 @@ public void DefaultAuthPublicKeyRetrieval()
     [Test, Description("User selects DEFAULT as authentication mechanism-mysql_native_password user,ssl mode default,fresh connection")]
     public void MySqlNativePlugin()
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("Test available only to MySQL Server +8.0.11");
-      if (!Check_Plugin_Enabled("mysql_native_password"))
-        Assert.Ignore("mysql_native_password plugin must be enabled on the server to run this test");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
+      Assume.That(Check_Plugin_Enabled("mysql_native_password"), "mysql_native_password plugin must be enabled on the server to run this test.");
+      Assume.That(Check_Plugin_Enabled("caching_sha2_password"), "The caching_sha2_password plugin isn't available.");
 
       string pluginName = "mysql_native_password";//mysql_native_password  plugin
       MySqlConnectionStringBuilder builder = new MySqlConnectionStringBuilder(ConnectionString);
@@ -261,8 +261,7 @@ public void MySqlNativePlugin()
     [Property("Category", "Security")]
     public void ConnectUsingMySQL41Auth()
     {
-      if (!Check_Plugin_Enabled("mysql_native_password"))
-        Assert.Ignore("mysql_native_password plugin must be enabled on the server to run this test");
+      Assume.That(Check_Plugin_Enabled("mysql_native_password"), "mysql_native_password plugin must be enabled on the server to run this test.");
       ExecuteSqlAsRoot("CREATE USER IF NOT EXISTS 'testNative'@'%' identified with mysql_native_password by 'test';");
 
       var connectionStringUri = ConnectionStringUri;
@@ -371,13 +370,9 @@ public void ConnectUsingSha256Memory()
     [Property("Category", "Security")]
     public void Sha256MemoryAuthWithDifferentPlugin(string pluginName)
     {
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("Test available only to MySQL Server +8.0.11");
-
-      if (pluginName == "mysql_native_password")
-      {
-        if (!Check_Plugin_Enabled("mysql_native_password"))
-          Assert.Ignore("mysql_native_password plugin must be enabled on the server to run this test");
-      }
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
+      Assume.That(Check_Plugin_Enabled("mysql_native_password"), "mysql_native_password plugin must be enabled on the server to run this test.");
+      
       MySqlConnectionStringBuilder builder = new MySqlConnectionStringBuilder(ConnectionString);
       builder.UserID = "testDefaultPlugin";
       builder.Password = "test";
@@ -422,10 +417,9 @@ public void Sha256MemoryAuthWithDifferentPlugin(string pluginName)
     [Property("Category", "Security")]
     public void NativeAuthValidAndInvalidConnection()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("Check for Linux OS");
-      if (!session.Version.isAtLeast(8, 0, 11)) Assert.Ignore("Test available only to MySQL Server +8.0.11");
-      if (!Check_Plugin_Enabled("mysql_native_password"))
-        Assert.Ignore("mysql_native_password plugin must be enabled on the server to run this test");
+      Assume.That(Platform.IsWindows(), "Check for Linux OS");
+      Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
+      Assume.That(Check_Plugin_Enabled("mysql_native_password"), "mysql_native_password plugin must be enabled on the server to run this test.");
       ExecuteSqlAsRoot("CREATE USER IF NOT EXISTS 'testNative'@'%' identified with mysql_native_password by 'test';");
 
       var user = "testNative";
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
index 78154a965..08acc6603 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
@@ -63,7 +63,7 @@ public void SessionCanBeOpened()
     [Test]
     public void ConnectionAfterSessionCanBeOpened()
     {
-      if (!Platform.IsWindows()) Assert.Ignore("Check for Linux OS");
+      Assume.That(Platform.IsWindows(), "Check for Linux OS");
 
       using (var session = MySQLX.GetSession(_xConnectionURI))
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));

From 381fb9c854f6285c6a5e964ec40d6d4cc60004e4 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Fri, 22 Mar 2024 17:53:34 -0600
Subject: [PATCH 23/99] WL#16308 [Add support for .NET 9 and EF Core 9]

Added support for .NET 9 and EFCore 9 preview versions.

Change-Id: Ib01dfb6715371f413fa2d3c7d38fcf11b7fd94ee
---
 CHANGES                                       |  1 +
 .../Conventions/MySQLConventionSetBuilder.cs  |  1 -
 .../MySqlEntityCharsetAttributeConvention.cs  |  2 +-
 ...MySqlEntityCollationAttributeConvention.cs |  2 +-
 .../Internal/MySQLAnnotationProvider.cs       |  8 ++--
 .../Internal/MySQLMigrationsModelDiffer.cs    | 38 +++++++++++++++++++
 .../Migrations/MySQLMigrationsSqlGenerator.cs |  2 +-
 EFCore/src/MySql.EntityFrameworkCore.csproj   |  9 +++++
 EFCore/src/Properties/AssemblyInfo.cs         |  4 +-
 .../MySQLStringComparisonMethodTranslator.cs  | 10 ++---
 .../MySQLParameterBasedSqlProcessor.cs        |  2 +-
 .../MySQLQueryTranslationPostprocessor.cs     |  2 +-
 ...SQLQueryTranslationPostprocessorFactory.cs |  3 +-
 ...LSqlTranslatingExpressionVisitorFactory.cs |  2 +-
 .../Internal/MySQLGeometryTypeMapping.cs      |  2 +-
 .../Internal/MySQLTypeMappingSource.cs        | 10 ++---
 EFCore/src/Update/IMySQLUpdateSqlGenerator.cs |  2 +-
 .../Update/MySQLModificationCommandBatch.cs   |  4 +-
 EFCore/src/Update/MySQLUpdateSqlGenerator.cs  |  2 +-
 .../Internal/MySQLValueGeneratorSelector.cs   |  2 +-
 EFCore/src/global.json                        |  5 ---
 .../ConnectionTests.cs                        |  2 +-
 ...Sql.EntityFrameworkCore.Basic.Tests.csproj |  8 ++++
 .../MySql.EFCore.Basic.Tests/global.json      |  5 ---
 ...ql.EntityFrameworkCore.Design.Tests.csproj | 17 ++++++++-
 .../MySql.EFCore.Design.Tests/global.json     |  5 ---
 ...ntityFrameworkCore.Migrations.Tests.csproj |  4 ++
 .../MySql.EFCore.Migrations.Tests/global.json |  5 ---
 EntityFramework/src/global.json               |  5 ---
 .../global.json                               |  5 ---
 .../global.json                               |  5 ---
 .../global.json                               |  5 ---
 MySQL.Data.OpenTelemetry/src/global.json      |  5 ---
 MySQL.Data/src/MySql.Data.csproj              |  6 ++-
 MySQL.Data/src/MySqlDataReader.cs             |  2 +-
 MySQL.Data/src/global.json                    |  5 ---
 .../Framework/netstandard2_0/BlobTestsPipe.cs |  6 +--
 .../netstandard2_0/BlobTestsPipeCompressed.cs |  6 +--
 .../netstandard2_0/BlobTestsSharedMem.cs      |  7 +---
 .../BlobTestsSharedMemCompressed.cs           |  6 +--
 .../Framework/netstandard2_0/CmdTestsPipe.cs  |  5 ---
 .../netstandard2_0/CmdTestsPipeCompressed.cs  |  5 +--
 .../netstandard2_0/CmdTestsSharedMem.cs       |  6 +--
 .../CmdTestsSharedmemCompressed.cs            |  5 ---
 .../Framework/netstandard2_0/PSPipe.cs        |  5 ---
 .../netstandard2_0/PSPipeCompressed.cs        |  7 +---
 .../netstandard2_0/PSSharedMemory.cs          |  6 +--
 .../PSSharedMemoryCompressed.cs               |  6 +--
 .../netstandard2_0/StressTestsPipe.cs         |  4 --
 .../StressTestsPipeCompressed.cs              |  6 +--
 .../netstandard2_0/StressTestsSharedMemory.cs |  6 +--
 .../StressTestsSharedMemoryCompressed.cs      |  4 +-
 .../netstandard2_0/TimeoutAndCancel.cs        |  1 +
 .../netstandard2_0/TimeoutAndCancelPipe.cs    |  4 --
 .../TimeoutAndCancelSharedMemory.cs           |  4 +-
 .../MySql.Data.Tests/MySql.Data.Tests.csproj  |  8 +++-
 MySQL.Data/tests/MySql.Data.Tests/global.json |  5 ---
 .../MySqlX.Data.Tests.csproj                  |  6 ++-
 .../tests/MySqlX.Data.Tests/global.json       |  5 ---
 MySql.Web/src/global.json                     |  5 ---
 MySql.Web/tests/global.json                   |  5 ---
 61 files changed, 151 insertions(+), 179 deletions(-)
 delete mode 100644 EFCore/src/global.json
 delete mode 100644 EFCore/tests/MySql.EFCore.Basic.Tests/global.json
 delete mode 100644 EFCore/tests/MySql.EFCore.Design.Tests/global.json
 delete mode 100644 EFCore/tests/MySql.EFCore.Migrations.Tests/global.json
 delete mode 100644 EntityFramework/src/global.json
 delete mode 100644 EntityFramework/tests/MySql.EntityFramework.Basic.Tests/global.json
 delete mode 100644 EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/global.json
 delete mode 100644 EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/global.json
 delete mode 100644 MySQL.Data.OpenTelemetry/src/global.json
 delete mode 100644 MySQL.Data/src/global.json
 delete mode 100644 MySQL.Data/tests/MySql.Data.Tests/global.json
 delete mode 100644 MySQL.Data/tests/MySqlX.Data.Tests/global.json
 delete mode 100644 MySql.Web/src/global.json
 delete mode 100644 MySql.Web/tests/global.json

diff --git a/CHANGES b/CHANGES
index 8d2032816..78347380f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 9.1.0
 - Updated test suite to use constraint-based assertions (WL16397).
 - Changed testsuite to use assummptions instead of Assert.Ignore (WL16402).
+- Added support for .NET 9 and EFCore 9 preview versions (WL16308).
 
 
 9.0.0
diff --git a/EFCore/src/Metadata/Conventions/MySQLConventionSetBuilder.cs b/EFCore/src/Metadata/Conventions/MySQLConventionSetBuilder.cs
index 51691531a..7d7fce3d0 100644
--- a/EFCore/src/Metadata/Conventions/MySQLConventionSetBuilder.cs
+++ b/EFCore/src/Metadata/Conventions/MySQLConventionSetBuilder.cs
@@ -69,7 +69,6 @@ public override ConventionSet CreateConventionSet()
       conventionSet.PropertyAddedConventions.Add(new MySqlCollationAttributeConvention(Dependencies));
       conventionSet.EntityTypeAddedConventions.Add(new MySqlEntityCharsetAttributeConvention(Dependencies));
       conventionSet.EntityTypeAddedConventions.Add(new MySqlEntityCollationAttributeConvention(Dependencies));
-
       ValueGenerationConvention valueGeneratorConvention = new MySQLValueGenerationConvention(Dependencies, RelationalDependencies);
       ReplaceConvention(conventionSet.EntityTypeBaseTypeChangedConventions, valueGeneratorConvention);
       ReplaceConvention(conventionSet.EntityTypePrimaryKeyChangedConventions, valueGeneratorConvention);
diff --git a/EFCore/src/Metadata/Conventions/MySqlEntityCharsetAttributeConvention.cs b/EFCore/src/Metadata/Conventions/MySqlEntityCharsetAttributeConvention.cs
index 19b084852..3b6be795c 100644
--- a/EFCore/src/Metadata/Conventions/MySqlEntityCharsetAttributeConvention.cs
+++ b/EFCore/src/Metadata/Conventions/MySqlEntityCharsetAttributeConvention.cs
@@ -34,7 +34,7 @@
 
 namespace MySql.EntityFrameworkCore.Metadata.Conventions
 {
-#if !NET8_0
+#if !NET8_0_OR_GREATER
   /// <summary>
   ///   Represents a character-set attribute for an entity.
   /// </summary>
diff --git a/EFCore/src/Metadata/Conventions/MySqlEntityCollationAttributeConvention.cs b/EFCore/src/Metadata/Conventions/MySqlEntityCollationAttributeConvention.cs
index a7de5f837..6249a5145 100644
--- a/EFCore/src/Metadata/Conventions/MySqlEntityCollationAttributeConvention.cs
+++ b/EFCore/src/Metadata/Conventions/MySqlEntityCollationAttributeConvention.cs
@@ -34,7 +34,7 @@
 
 namespace MySql.EntityFrameworkCore.Metadata.Conventions
 {
-#if !NET8_0
+#if !NET8_0_OR_GREATER
   /// <summary>
   ///   Represents a collation attribute for an entity.
   /// </summary>
diff --git a/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs b/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs
index 74a77b683..d437571e7 100644
--- a/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs
+++ b/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs
@@ -70,7 +70,7 @@ public override IEnumerable<IAnnotation> For(ITable table, bool designTime)
       {
         yield break;
       }
-#if NET8_0
+#if NET8_0_OR_GREATER
       var entityType = table.EntityTypeMappings.First().TypeBase;
       if (GetActualTypeBaseCharSet(entityType) is string charSet)
         yield return new Annotation(MySQLAnnotationNames.Charset, charSet);
@@ -132,7 +132,7 @@ public override IEnumerable<IAnnotation> For(IColumn column, bool designTime)
 
       var table = StoreObjectIdentifier.Table(column.Table.Name, column.Table.Schema);
       var properties = column.PropertyMappings.Select(m => m.Property).ToArray();
-#if NET8_0
+#if NET8_0_OR_GREATER
       if (column.PropertyMappings.Where(m => m.TableMapping.IsSharedTablePrincipal ?? true && m.TableMapping.TypeBase == m.Property.DeclaringType)
       .Select(m => m.Property)
       .FirstOrDefault(p => p.GetValueGenerationStrategy(table) == MySQLValueGenerationStrategy.IdentityColumn) is IProperty identityProperty)
@@ -162,7 +162,7 @@ protected virtual string GetActualModelCollation(IModel model)
       return model.GetCollation()!;
     }
 
-#if NET8_0
+#if NET8_0_OR_GREATER
     protected virtual string? GetActualTypeBaseCharSet(ITypeBase typeBase)
     {
       var typeBaseCharSet = typeBase.GetCharSet();
@@ -270,7 +270,7 @@ protected virtual string GetActualModelCollation(IModel model)
 
     protected virtual string? GetActualPropertyCharSet(IProperty[] properties)
     {
-#if NET8_0
+#if NET8_0_OR_GREATER
       return properties.Select(p => p.GetCharSet()).FirstOrDefault(s => s is not null) ??
         properties.Select(
         p => p.FindTypeMapping() is MySQLStringTypeMapping
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs b/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
index 22ffaa57a..3c02ec2ed 100644
--- a/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
+++ b/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
@@ -115,6 +115,44 @@ protected override IEnumerable<MigrationOperation> Add(IColumn target, DiffConte
       }
       return base.Add(target, diffContext, inline);
     }
+
+#elif NET9_0
+    public MySQLMigrationsModelDiffer(
+  [NotNull] IRelationalTypeMappingSource typeMappingSource,
+  [NotNull] IMigrationsAnnotationProvider migrationsAnnotations,
+  [NotNull] IRelationalAnnotationProvider relationalAnnotationProvider,
+  [NotNull] IRowIdentityMapFactory rowIdentityMapFactory,
+  [NotNull] CommandBatchPreparerDependencies commandBatchPreparerDependencies)
+  : base(
+      typeMappingSource,
+      migrationsAnnotations,
+      relationalAnnotationProvider,
+      rowIdentityMapFactory,
+      commandBatchPreparerDependencies)
+    {
+    }
+
+    protected override IEnumerable<MigrationOperation> Add(IColumn target, DiffContext diffContext, bool inline = false)
+    {
+      var _property = target.PropertyMappings.ToArray().FirstOrDefault()!.Property;
+      if (_property.FindTypeMapping() is RelationalTypeMapping storeType)
+      {
+        var valueGenerationStrategy = MySQLValueGenerationStrategyCompatibility.GetValueGenerationStrategy(MigrationsAnnotationProvider.ForRemove(target).ToArray());
+        // Ensure that null will be set for the columns default value, if CURRENT_TIMESTAMP has been required,
+        // or when the store type of the column does not support default values at all.
+        inline = inline ||
+                 (storeType.StoreTypeNameBase == "datetime" ||
+                  storeType.StoreTypeNameBase == "timestamp") &&
+                 (valueGenerationStrategy == MySQLValueGenerationStrategy.IdentityColumn ||
+                  valueGenerationStrategy == MySQLValueGenerationStrategy.ComputedColumn) ||
+                 storeType.StoreTypeNameBase.Contains("text") ||
+                 storeType.StoreTypeNameBase.Contains("blob") ||
+                 storeType.StoreTypeNameBase == "geometry" ||
+                 storeType.StoreTypeNameBase == "json";
+      }
+      return base.Add(target, diffContext, inline);
+    }
+
 #endif
 
 
diff --git a/EFCore/src/Migrations/MySQLMigrationsSqlGenerator.cs b/EFCore/src/Migrations/MySQLMigrationsSqlGenerator.cs
index 39b21d652..2ca5009c3 100644
--- a/EFCore/src/Migrations/MySQLMigrationsSqlGenerator.cs
+++ b/EFCore/src/Migrations/MySQLMigrationsSqlGenerator.cs
@@ -537,7 +537,7 @@ protected override void Generate(
 
       if (model?.GetRelationalModel().FindTable(operation.Name, operation.Schema) != null)
       {
-#if !NET8_0
+#if !NET8_0_OR_GREATER
         var entity = model?.GetRelationalModel().FindTable(operation.Name, operation.Schema)!.EntityTypeMappings.FirstOrDefault()!.EntityType;
 #else
         var entity = model?.GetRelationalModel().FindTable(operation.Name, operation.Schema)!.EntityTypeMappings.FirstOrDefault()!.TypeBase;
diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
index d3230975c..51c6d3741 100644
--- a/EFCore/src/MySql.EntityFrameworkCore.csproj
+++ b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -30,6 +30,10 @@
     <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
+    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+  
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.30" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.30" />
@@ -40,6 +44,11 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.5" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0-preview.2.24128.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0-preview.2.24128.4" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\MySQL.Data\src\MySql.Data.csproj" />
   </ItemGroup>
diff --git a/EFCore/src/Properties/AssemblyInfo.cs b/EFCore/src/Properties/AssemblyInfo.cs
index 66005293d..9e1f85f5f 100644
--- a/EFCore/src/Properties/AssemblyInfo.cs
+++ b/EFCore/src/Properties/AssemblyInfo.cs
@@ -37,7 +37,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("MySql.EntityFrameworkCore")]
-[assembly: AssemblyDescription("MySql.EntityFrameworkCore adds support for Microsoft Entity Framework Core (EF Core) 6, 7, and 8.")]
+[assembly: AssemblyDescription("MySql.EntityFrameworkCore adds support for Microsoft Entity Framework Core (EF Core) 6, 7, 8 and 9.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle Corporation")]
 [assembly: AssemblyProduct("MySQL Connector/NET")]
@@ -45,6 +45,8 @@
 [assembly: AssemblyCopyright("Copyright © 2021, 2024, Oracle and/or its affiliates.")]
 #elif NET8_0
 [assembly: AssemblyCopyright("Copyright © 2024, Oracle and/or its affiliates.")]
+#elif NET9_0
+[assembly: AssemblyCopyright("Copyright © 2024, Oracle and/or its affiliates.")]
 #endif
 [assembly: AssemblyTrademark("Oracle®, Java, MySQL, and NetSuite are registered trademarks of Oracle and/or its affiliates.")]
 [assembly: AssemblyCulture("")]
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs b/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs
index 952e87a71..8fd775d7d 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs
@@ -166,7 +166,7 @@ public MySQLStringComparisonMethodTranslator(ISqlExpressionFactory sqlExpression
       }
       else
       {
-      #if !NET8_0
+#if !NET8_0_OR_GREATER
         return new CaseExpression(
           new[]
           {
@@ -232,7 +232,7 @@ public MySQLStringComparisonMethodTranslator(ISqlExpressionFactory sqlExpression
       }
       else
       {
-#if !NET8_0
+#if !NET8_0_OR_GREATER
         return new CaseExpression(
           new[]
           {
@@ -330,7 +330,7 @@ private SqlBinaryExpression MakeStartsWithExpressionImpl(
       }
       else
       {
-#if !NET8_0
+#if !NET8_0_OR_GREATER
         return new CaseExpression(
           new[]
           {
@@ -446,7 +446,7 @@ private SqlExpression MakeEndsWithExpressionImpl(
       }
       else
       {
-#if !NET8_0
+#if !NET8_0_OR_GREATER
         return new CaseExpression(
           new[]
           {
@@ -565,7 +565,7 @@ private SqlExpression MakeContainsExpressionImpl(
             e => Utf8Bin(LCase(e))));
       }
 
-#if !NET8_0
+#if !NET8_0_OR_GREATER
       return _sqlExpressionFactory.Case(
         new[]
         {
diff --git a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
index c73a1f77f..d31ef25e2 100644
--- a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
+++ b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
@@ -62,7 +62,7 @@ protected override SelectExpression ProcessSqlNullability(
 
       return selectExpression;
     }
-#elif NET8_0
+#elif NET8_0_OR_GREATER
     protected override Expression ProcessSqlNullability(
       Expression selectExpression, IReadOnlyDictionary<string, object?> parametersValues, out bool canCache)
     {
diff --git a/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessor.cs b/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessor.cs
index 2e96e6b32..0cd1f61f6 100644
--- a/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessor.cs
+++ b/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessor.cs
@@ -39,7 +39,7 @@ internal class MySQLQueryTranslationPostprocessor : RelationalQueryTranslationPo
     public MySQLQueryTranslationPostprocessor(
       QueryTranslationPostprocessorDependencies dependencies,
       RelationalQueryTranslationPostprocessorDependencies relationalDependencies,
-      QueryCompilationContext queryCompilationContext,
+      MySQLQueryCompilationContext queryCompilationContext,
       IMySQLOptions options)
       : base(dependencies, relationalDependencies, queryCompilationContext)
     {
diff --git a/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessorFactory.cs b/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessorFactory.cs
index 79bd9c4d3..70d18e8d6 100644
--- a/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessorFactory.cs
+++ b/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessorFactory.cs
@@ -51,7 +51,8 @@ public virtual QueryTranslationPostprocessor Create(QueryCompilationContext quer
       => new MySQLQueryTranslationPostprocessor(
         _dependencies,
         _relationalDependencies,
-        queryCompilationContext,
+        (MySQLQueryCompilationContext)queryCompilationContext,
         _options);
   }
+
 }
diff --git a/EFCore/src/Query/Internal/MySQLSqlTranslatingExpressionVisitorFactory.cs b/EFCore/src/Query/Internal/MySQLSqlTranslatingExpressionVisitorFactory.cs
index d83df7410..2361df0cb 100644
--- a/EFCore/src/Query/Internal/MySQLSqlTranslatingExpressionVisitorFactory.cs
+++ b/EFCore/src/Query/Internal/MySQLSqlTranslatingExpressionVisitorFactory.cs
@@ -45,7 +45,7 @@ public virtual RelationalSqlTranslatingExpressionVisitor Create(
       QueryableMethodTranslatingExpressionVisitor queryableMethodTranslatingExpressionVisitor)
       => new MySQLSqlTranslatingExpressionVisitor(
         _dependencies,
-        model,
+        (MySQLQueryCompilationContext)model,
         queryableMethodTranslatingExpressionVisitor);
   }
 }
diff --git a/EFCore/src/Storage/Internal/MySQLGeometryTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLGeometryTypeMapping.cs
index 02572bf57..f808990f1 100644
--- a/EFCore/src/Storage/Internal/MySQLGeometryTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLGeometryTypeMapping.cs
@@ -43,7 +43,7 @@ protected MySQLGeometryTypeMapping(RelationalTypeMappingParameters parameters)
     {
     }
 
-#if NET8_0
+#if NET8_0_OR_GREATER
     public CoreTypeMapping Clone(ValueConverter? converter)
       => new MySQLGeometryTypeMapping(Parameters.WithComposedConverter(converter,null,null,null,null));
 #else
diff --git a/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs b/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs
index 5ee73bf1a..a1b59b05b 100644
--- a/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs
+++ b/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs
@@ -187,7 +187,7 @@ protected void Initialize()
         { typeof(byte), _utinyint },
         { typeof(sbyte), _tinyint },
 
-        #if !NET8_0
+        #if !NET8_0_OR_GREATER
         // DateTime
         { typeof(DateTime), _datetime.Clone(6, null) },
         { typeof(DateOnly), _dateonly },
@@ -252,7 +252,7 @@ protected void Initialize()
 
         if (_storeTypeMappings.TryGetValue(storeTypeNameBase!, out mapping))
         {
-#if !NET8_0
+#if !NET8_0_OR_GREATER
           return clrType == null
           ? mapping[0].Clone(in mappingInfo)
           : mapping.FirstOrDefault(m => m.ClrType == clrType)?.Clone(in mappingInfo);
@@ -274,7 +274,7 @@ protected void Initialize()
                     clrType == typeof(DateTimeOffset) ||
                     clrType == typeof(TimeSpan))
             {
-#if !NET8_0
+#if !NET8_0_OR_GREATER
               return mapping.Clone(mappingInfo.Precision.Value, null);
 #else
               return mapping.WithPrecisionAndScale(mappingInfo.Precision.Value, null);
@@ -301,7 +301,7 @@ protected void Initialize()
           mapping = isFixedLength ? _charUnicode : size == null
           ? _longtextUnicode : _varcharUnicode;
 
-#if !NET8_0
+#if !NET8_0_OR_GREATER 
           return size == null ? mapping : mapping.Clone($"{mapping.StoreTypeNameBase}({size})", size);
 #else
           return size == null ? mapping : mapping.WithStoreTypeAndSize($"{mapping.StoreTypeNameBase}({size})", size);
@@ -320,7 +320,7 @@ protected void Initialize()
       return null;
     }
 
-#if !NET8_0
+#if !NET8_0_OR_GREATER
     protected override string ParseStoreTypeName(string? storeTypeName, out bool? unicode, out int? size, out int? precision, out int? scale)
     {
       var storeTypeBaseName = base.ParseStoreTypeName(storeTypeName, out unicode, out size, out precision, out scale);
diff --git a/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs b/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs
index 5e94a0019..8b396ecfc 100644
--- a/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs
+++ b/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs
@@ -42,7 +42,7 @@ ResultSetMapping AppendBulkInsertOperation(
     [NotNull] IReadOnlyList<IReadOnlyModificationCommand> modificationCommands,
     int commandPosition);
   }
-#elif NET8_0
+#elif NET8_0_OR_GREATER
   /// <summary>
   ///   <para>
   ///     The service lifetime is <see cref="ServiceLifetime.Singleton" />. This means a single instance
diff --git a/EFCore/src/Update/MySQLModificationCommandBatch.cs b/EFCore/src/Update/MySQLModificationCommandBatch.cs
index 965390c17..bcf6df3b9 100644
--- a/EFCore/src/Update/MySQLModificationCommandBatch.cs
+++ b/EFCore/src/Update/MySQLModificationCommandBatch.cs
@@ -55,7 +55,7 @@ internal class MySQLModificationCommandBatch : AffectedCountModificationCommandB
     private readonly int _maxBatchSize;
     private readonly List<ModificationCommand> _bulkInsertCommands = new List<ModificationCommand>();
     private int _commandsLeftToLengthCheck = 50;
-#elif NET8_0
+#elif NET8_0_OR_GREATER
     private readonly List<IReadOnlyModificationCommand> _pendingBulkInsertCommands = new();
 #endif
 
@@ -200,7 +200,7 @@ protected override void UpdateCachedCommandText(int commandPosition)
       }
     }
 
-#elif NET8_0
+#elif NET8_0_OR_GREATER
     /// <summary>
     ///   This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///   the same compatibility standards as public APIs. It may be changed or removed without notice in
diff --git a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
index b94d96dba..b7e5431ec 100644
--- a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
+++ b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
@@ -233,7 +233,7 @@ internal enum ResultsGrouping
       OneResultSet,
       OneCommandPerResultSet
     }
-#elif NET8_0
+#elif NET8_0_OR_GREATER
     public virtual ResultSetMapping AppendBulkInsertOperation(
       StringBuilder commandStringBuilder,
       IReadOnlyList<IReadOnlyModificationCommand> modificationCommands,
diff --git a/EFCore/src/ValueGeneration/Internal/MySQLValueGeneratorSelector.cs b/EFCore/src/ValueGeneration/Internal/MySQLValueGeneratorSelector.cs
index 47119f3f1..a332347e1 100644
--- a/EFCore/src/ValueGeneration/Internal/MySQLValueGeneratorSelector.cs
+++ b/EFCore/src/ValueGeneration/Internal/MySQLValueGeneratorSelector.cs
@@ -52,7 +52,7 @@ public MySQLValueGeneratorSelector(
     }
 
 
-    #if NET8_0
+    #if NET8_0_OR_GREATER
     /// <inheritdoc/>
     public ValueGenerator Create(IProperty property, IEntityType entityType)
     {
diff --git a/EFCore/src/global.json b/EFCore/src/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/EFCore/src/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
index e919b9341..3f32516bf 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
@@ -85,7 +85,7 @@ public static RelationalConnectionDependencies CreateDependencies(DbContextOptio
               TestServiceFactory.Instance.Create<RelationalTypeMappingSourceDependencies>(),
               new MySQLOptions()))));
     }
-#elif NET8_0
+#elif NET8_0_OR_GREATER
     public static RelationalConnectionDependencies CreateDependencies(DbContextOptions? options = null)
     {
       options ??= new DbContextOptionsBuilder()
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index c29cff6d4..00582a122 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -13,6 +13,10 @@
     <NoWarn>CS1591,CS1701,CS1702,EF1001</NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
+    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+  
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="6.0.30" />
   </ItemGroup>
@@ -21,6 +25,10 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.5" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="9.0.0-preview.2.24128.4" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/global.json b/EFCore/tests/MySql.EFCore.Basic.Tests/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index 939de4597..f047fc92a 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -13,6 +13,10 @@
     <NoWarn>$(NoWarn);CS1591,EF1001</NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
+    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+  
   <ItemGroup>
     <None Remove="Properties\sakiladb-schema.sql" />
     <None Remove="Properties\world.sql" />
@@ -24,12 +28,23 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.30" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.2.24128.5" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\MySql.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\MySql.EFCore.Basic.Tests\MySql.EntityFrameworkCore.Basic.Tests.csproj" />
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/global.json b/EFCore/tests/MySql.EFCore.Design.Tests/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/EFCore/tests/MySql.EFCore.Design.Tests/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
index a0c036a21..429a0cc63 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
@@ -13,6 +13,10 @@
     <NoWarn>$(NoWarn);CS1591,EF1001</NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
+    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/global.json b/EFCore/tests/MySql.EFCore.Migrations.Tests/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/EntityFramework/src/global.json b/EntityFramework/src/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/EntityFramework/src/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/global.json b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/global.json b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/global.json b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/MySQL.Data.OpenTelemetry/src/global.json b/MySQL.Data.OpenTelemetry/src/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/MySQL.Data.OpenTelemetry/src/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index 39432847d..78f716ab5 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -35,6 +35,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
+    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+  
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
     <TargetFrameworks>net462;net48;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
@@ -81,7 +85,7 @@
     <EmbeddedResource Include="Resources.resx;ResourcesX.resx;Properties\ReservedWords.txt" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netstandard2.1' or '$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net8.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netstandard2.1' or '$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0' or '$(TargetFramework)'=='net8.0' or '$(TargetFramework)'=='net9.0'">
     <Compile Remove="Framework/net462/*" />
     <PackageReference Include="System.Security.Permissions" Version="8.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
diff --git a/MySQL.Data/src/MySqlDataReader.cs b/MySQL.Data/src/MySqlDataReader.cs
index 32a441b48..ff86e4368 100644
--- a/MySQL.Data/src/MySqlDataReader.cs
+++ b/MySQL.Data/src/MySqlDataReader.cs
@@ -336,7 +336,7 @@ public sbyte GetSByte(int i)
       if (v is MySqlByte)
         return (sbyte)ChangeType(v, i, typeof(sbyte));
       else
-#if !NET8_0
+#if !NET8_0_OR_GREATER
         return checked(((MySqlByte)v).Value);
 #else
         return checked((sbyte)((MySqlUByte)v).Value);
diff --git a/MySQL.Data/src/global.json b/MySQL.Data/src/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/MySQL.Data/src/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipe.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipe.cs
index 645764316..36a9281a9 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipe.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipe.cs
@@ -26,14 +26,12 @@
 // along with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+using NUnit.Framework.Internal;
+
 namespace MySql.Data.MySqlClient.Tests
 {
   public class BlobTestsPipe : BlobTests
   {
-    public BlobTestsPipe(TestFixture fixture) : base(fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.NamedPipe;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipeCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipeCompressed.cs
index 880541c8f..bd69d5086 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipeCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipeCompressed.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 
+using NUnit.Framework.Internal;
 using System.ComponentModel;
 
 namespace MySql.Data.MySqlClient.Tests
@@ -34,11 +35,6 @@ namespace MySql.Data.MySqlClient.Tests
   [Category("Compressed")]
   public class BlobTestsPipeCompressed : BlobTests
   {
-    public BlobTestsPipeCompressed(TestFixture fixture) : base(fixture)
-    {
-
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.NamedPipe;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMem.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMem.cs
index 163a24b5b..c70b45b11 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMem.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMem.cs
@@ -27,15 +27,12 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 
+using NUnit.Framework.Internal;
+
 namespace MySql.Data.MySqlClient.Tests
 {
   public class BlobTestsSharedMem : BlobTests
   {    
-
-    public BlobTestsSharedMem(TestFixture fixture) : base(fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.SharedMemory;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMemCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMemCompressed.cs
index 36c8932ad..bd6193578 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMemCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMemCompressed.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 
+using NUnit.Framework.Internal;
 using System.ComponentModel;
 
 namespace MySql.Data.MySqlClient.Tests
@@ -34,11 +35,6 @@ namespace MySql.Data.MySqlClient.Tests
   [Category("Compressed")]
   public class BlobTestsSharedMemCompressed : BlobTests
   {
-    public BlobTestsSharedMemCompressed(TestFixture fixture) : base(fixture)
-    {
-
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.SharedMemory;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipe.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipe.cs
index 8a98b187b..d5e732c1b 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipe.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipe.cs
@@ -31,11 +31,6 @@ namespace MySql.Data.MySqlClient.Tests
 {
   public class CmdTestsPipe : CmdTests
   {    
-
-    public CmdTestsPipe(TestFixture fixture) : base(fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.NamedPipe;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipeCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipeCompressed.cs
index 68ec9c1b1..3e00525f3 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipeCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipeCompressed.cs
@@ -26,16 +26,13 @@
 // along with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+using NUnit.Framework.Internal;
 using System;
 
 namespace MySql.Data.MySqlClient.Tests
 {
   public class CmdTestsPipeCompressed : CmdTests
   {
-    public CmdTestsPipeCompressed(TestFixture fixture) : base(fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.NamedPipe;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedMem.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedMem.cs
index 75533132f..17945408a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedMem.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedMem.cs
@@ -26,14 +26,12 @@
 // along with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+using NUnit.Framework.Internal;
+
 namespace MySql.Data.MySqlClient.Tests
 {
   public class CmdTestsSharedMem : CmdTests
   {
-    public CmdTestsSharedMem(TestFixture fixture) : base(fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.SharedMemory;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedmemCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedmemCompressed.cs
index a5a61238e..f92501fdd 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedmemCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedmemCompressed.cs
@@ -31,11 +31,6 @@ namespace MySql.Data.MySqlClient.Tests
 {
   public class CmdTestsSharedMemCompressed : CmdTests
   {
-
-    public CmdTestsSharedMemCompressed(TestFixture fixture) : base(fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.SharedMemory;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipe.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipe.cs
index 556ed12d6..310dbc630 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipe.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipe.cs
@@ -30,11 +30,6 @@ namespace MySql.Data.MySqlClient.Tests
 {
   public class PSPipe : PreparedStatements
   {    
-
-    public PSPipe(TestFixture fixture) : base(fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.NamedPipe;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipeCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipeCompressed.cs
index 8554aa4da..c67b92fe1 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipeCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipeCompressed.cs
@@ -26,15 +26,12 @@
 // along with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+using NUnit.Framework.Internal;
+
 namespace MySql.Data.MySqlClient.Tests
 {
   public class PSPipeCompressed : PreparedStatements
   {
-
-    public PSPipeCompressed(TestFixture fixture) : base(fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.NamedPipe;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemory.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemory.cs
index 93c1b3ee5..3c9bcb2d6 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemory.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemory.cs
@@ -26,14 +26,12 @@
 // along with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+using NUnit.Framework.Internal;
+
 namespace MySql.Data.MySqlClient.Tests
 {
   public class PSSharedMemory : PreparedStatements
   {
-    public PSSharedMemory(TestFixture fixture) : base (fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.SharedMemory;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemoryCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemoryCompressed.cs
index ea2b05efb..ae6452fb4 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemoryCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemoryCompressed.cs
@@ -26,14 +26,12 @@
 // along with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+using NUnit.Framework.Internal;
+
 namespace MySql.Data.MySqlClient.Tests
 {
   public class PSSharedMemoryCompressed : PreparedStatements
   {
-    public PSSharedMemoryCompressed(TestFixture fixture) : base(fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.SharedMemory;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipe.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipe.cs
index ce7589b61..0e5345faa 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipe.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipe.cs
@@ -30,10 +30,6 @@ namespace MySql.Data.MySqlClient.Tests
 {
   public class StressTestsPipe : StressTests
   {
-    public StressTestsPipe(TestFixture fixture) : base(fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.NamedPipe;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipeCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipeCompressed.cs
index 0fcbf6fab..5c64fedf6 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipeCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipeCompressed.cs
@@ -26,14 +26,12 @@
 // along with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+using NUnit.Framework.Internal;
+
 namespace MySql.Data.MySqlClient.Tests
 {
   public class StressTestsPipeCompressed : StressTests
   {
-    public StressTestsPipeCompressed(TestFixture fixture) : base(fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.NamedPipe;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemory.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemory.cs
index 794e92c25..6944ff02e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemory.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemory.cs
@@ -26,14 +26,12 @@
 // along with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+using NUnit.Framework.Internal;
+
 namespace MySql.Data.MySqlClient.Tests
 {
   public class StressTestsSharedMemory : StressTests
   {
-    public StressTestsSharedMemory(TestFixture fixture) : base(fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.SharedMemory;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemoryCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemoryCompressed.cs
index 8872d295d..681d90af5 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemoryCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemoryCompressed.cs
@@ -26,11 +26,13 @@
 // along with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+using NUnit.Framework.Internal;
+
 namespace MySql.Data.MySqlClient.Tests
 {
   public class StressTestsSharedMemoryCompressed : StressTests
   {
-    public StressTestsSharedMemoryCompressed(TestFixture fixture) : base(fixture)
+    public StressTestsSharedMemoryCompressed() : base()
     {
     }
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
index 51ff85733..5d3fb086b 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
@@ -33,6 +33,7 @@
 using System.Data;
 using System.Globalization;
 using System.IO;
+using NUnit.Framework.Internal;
 
 namespace MySql.Data.MySqlClient.Tests
 {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelPipe.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelPipe.cs
index db56d7dd4..403617770 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelPipe.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelPipe.cs
@@ -30,10 +30,6 @@ namespace MySql.Data.MySqlClient.Tests
 {
   public class TimeoutAndCancelPipe : TimeoutAndCancel
   {
-    public TimeoutAndCancelPipe(TestFixture fixture) : base(fixture)
-    {
-    }
-
     internal override void AdjustConnectionSettings(MySqlConnectionStringBuilder settings)
     {
       settings.ConnectionProtocol = MySqlConnectionProtocol.NamedPipe;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelSharedMemory.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelSharedMemory.cs
index 811c4d7a2..eee7c5c24 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelSharedMemory.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelSharedMemory.cs
@@ -28,11 +28,13 @@
 
 
 
+using NUnit.Framework.Internal;
+
 namespace MySql.Data.MySqlClient.Tests
 {
   public class TimeoutAndCancelSharedMemory : TimeoutAndCancel
   {
-    public TimeoutAndCancelSharedMemory(TestFixture fixture) : base(fixture)
+    public TimeoutAndCancelSharedMemory() : base()
     {
     }
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index 3af700db8..03175dec2 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -8,7 +8,7 @@
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
-    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;</TargetFrameworks>
     <PackageId>MySql.Data.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
@@ -28,11 +28,15 @@
     <NoWarn>CS1591,CS1587,CS1701,CS1702,CS1570,CA2100</NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
+    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+  
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
     <TargetFrameworks>net462;net48;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net8.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net8.0' or '$(TargetFramework)'=='net9.0'">
     <Compile Remove="Framework\netstandard2_0\PartialTrustSandbox.cs" />
     <Compile Remove="Framework\netstandard2_0\CmdTestsPipe.cs;Framework\netstandard2_0\CmdTestsPipeCompressed.cs;Framework\netstandard2_0\CmdTestsSharedmemCompressed.cs;Framework\netstandard2_0\CmdTestsSharedMem.cs;" />
     <Compile Remove="Framework\netstandard2_0\PSPipeCompressed.cs;Framework\netstandard2_0\PSPipe.cs;Framework\netstandard2_0\PSSharedMemory.cs;Framework\netstandard2_0\PSSharedMemoryCompressed.cs;" />
diff --git a/MySQL.Data/tests/MySql.Data.Tests/global.json b/MySQL.Data/tests/MySql.Data.Tests/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/MySQL.Data/tests/MySql.Data.Tests/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 27f1dff62..5f3390b1e 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -8,7 +8,7 @@
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
-    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;</TargetFrameworks>
     <PackageId>MySqlx.Data.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
@@ -28,6 +28,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
+    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+  
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
     <TargetFrameworks>net462;net48;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/global.json b/MySQL.Data/tests/MySqlX.Data.Tests/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/MySQL.Data/tests/MySqlX.Data.Tests/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/MySql.Web/src/global.json b/MySql.Web/src/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/MySql.Web/src/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/MySql.Web/tests/global.json b/MySql.Web/tests/global.json
deleted file mode 100644
index a8ab760dd..000000000
--- a/MySql.Web/tests/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false
-  }
-}
\ No newline at end of file

From 5aec3146a8876f67fda0b58d69c20421fb7e2e44 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Fri, 9 Aug 2024 07:56:03 -0600
Subject: [PATCH 24/99] Updated dependencies

Change-Id: Ida31ef86e84df57396cf23cc4e1dcf29182f3dbf
---
 MySQL.Data/src/MySql.Data.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index 78f716ab5..9f57e77ce 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -90,7 +90,7 @@
     <PackageReference Include="System.Security.Permissions" Version="8.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.3" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>

From 69812d8cab6fcfc8d214e7032fc57efeeef959fa Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Tue, 2 Jul 2024 10:30:19 -0600
Subject: [PATCH 25/99] WL#16453 [Add OpenTelemetry.Api NuGet package]

Change-Id: I6e1008abd8f752f90e4e934517a2a87b52ceb675
---
 CHANGES                                         |   1 +
 .../OpenTelemetry.Api/OpenTelemetry.Api.dll     | Bin 87640 -> 0 bytes
 .../src/MySQL.Data.OpenTelemetry.csproj         |   5 ++---
 3 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 Dependencies/OpenTelemetry.Api/OpenTelemetry.Api.dll

diff --git a/CHANGES b/CHANGES
index 78347380f..a9d5cdf86 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 - Updated test suite to use constraint-based assertions (WL16397).
 - Changed testsuite to use assummptions instead of Assert.Ignore (WL16402).
 - Added support for .NET 9 and EFCore 9 preview versions (WL16308).
+- Added OpenTelemetry.Api NuGet package reference (WL16453).
 
 
 9.0.0
diff --git a/Dependencies/OpenTelemetry.Api/OpenTelemetry.Api.dll b/Dependencies/OpenTelemetry.Api/OpenTelemetry.Api.dll
deleted file mode 100644
index 9f8aee47ff594dc9b067567faa8014c4496684f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 87640
zcmbq+3t&{$(f{0gckezDl5E}~kKH6BSvC(KLFFy4fKhn{5NH*aWPy~B4Z8_~NDLo{
zt<@@Oefx=uwzSr2t*y@%D?X@FZPiw*BGyN>wY63Isr@Yd|7Om;cQ*vv{{R2z&YhVv
z=bSln=FEBAv&+1dmy<z6E`0v^Pon$r<iF_x|1}sya#rxcEc&7EaOM5lnTIQvtnW&O
zdK2+=iRi{qN3^FW-WOUE3nlt{LR~$f*$di38{?g^rV%6jqpYGAwi2DG8MMCC^+&t5
zqf`~j(8dyt(ull@`#-aQhk&oflPE`UUFppX)?fbiA|3n%*Jx<h>I+$v|4%(FQc2UT
zD0czlC^yF`1ay-|%fomMYLtn`7E_~MJpbdrkfXX}@q#`rEpt;}Y)c>L&#R#?(xk1>
zJN+*Nt(p?aL<g9n8+0TSL@l0af78)jO^H}{9D=MX>&!NwhGB9uIXV6B*KAk(v2HrK
ziIx+6`aL3_a8uw@w?>00@(ZyFJsc$RN9^Z0iq?xRZ70%d3XL1Lqe53?lEpWUC!x2?
z$(@pdX3X9uPt=|_R+nx?VF5jtjujN3crzU0x~p_!JKV+<vE(Z7M6rPZ*v=KNgh)+e
zMlEOZBf*Spdyj>i!_}~^zFmmZ^=({2O`}m;7ztN#skPZ;aQSAWNjJh-Knjm(k<zgS
z?Lhe$Ljk?fpR1`tJrO<5xwuS!63*`T>+u>qGV3Sh>fu^oBXW&!9iHJZKtqlRax}0w
zwD#B5=i9U;6|V;yIUDe3eB?-0u70c#I+Vs6!Fbh7q9rD`SA(zXR6}#S3CYS%s72Z@
zc9JHG`i<Uf3Kw&}a0Z}1*P_I>|0)kUI4zG*k_YNbJ%(diRgW)Q)59g{nJg0WrDI(L
z&*1SJkPh&h8HJf1w6qBgGhMlcGN?}#m65H(_#;tP{Rs1X?kbC{86h3#8*#+%Z7@CI
zF>DrJ#IlE<rp_g_oa-}a(HGZe99N&8RWIY}GOg-_`l8xw`}=8f>;HRw<wNRY>i@1j
zj%QzBPyM*|`QQQ=9%g-pYMu~ZRGacGKTVva+BVZ3Bxdb^2UW8F<-xw}I~b<{BZ1M`
z8%9(zm1IMXdcr~CW7(1Q{0O`@4?Zx_%HvYQ!HaI?hDVO8LXD?!$ZPm(OqYxb<@*@)
z(lt<m`}i`Hhv6PD8jYfQpAm*8^%$=W9(@y!fG;lBZ^T<rd`A65PkcO(Ot>N%lp3b`
zal=&6mXs*uiJycFjXyo&_rMj0j!<R8iPSovZ1~?_*uWY?g#y*Qys?^O;5g<CugJ3F
za!ZJba33s1`_U%>CD4$ko)VJ^kLj>Py;kHm4T*9MdFnYdwMj3Gn2otAqY?<C_WDSX
z>SvuWq}6!uXOlK$8@Kb*uS*y<BZVx-ebI#{qN$}zO{3*5{$L=(w1Q$Y>?c9d6D(S3
z#!rF$?07f<`0@<q+o2G?0uFLWFns*@VCdm`m7Pb@sVh=(5RsqfwX}J_Z#D*!Q#1rW
znH$XbBou8%zLG#d><uHP*AMcXk(><nptyJ`=A8h_;Xl1F4$m-;c=T{C1YS+mi+X%)
zexgZwkqGJGDG-6TV`7}j7@i3HDSETw!;7aOxzRA{-2<lr+YXIo=Chx$u}h{n8woda
zIkkFzei(LR%&;)j&%S_g$-WcNdECLAW}`WP2D%~`KyYyrUFFJOROqPGlw1YwpopZ@
z-B!d|c;3Ao<slLMi7Cd_FhV_z_;hZUp^M-t83{~xy~!EiooBS7``J}E8|CAJu}$c2
zLYO9KL=dC;)AViGD9~Turf<VE24uRv4aNp?ioOjd2GXQ&%M+wV--d#~Dbu%M?gs)N
zFBC*(VI-D%(3dEfZLkMV{<Cz>vUGOEXZ~xY5jSKl#C^{G&OS66pK<tb%!=r)?W{CE
zS!aH-%KT)F`N<0NllA2%tIJQ;77HQ6m7E17!T_e&cRb3)Ixe6mP)l!k4fs6dQ4D5q
zJvke~+u8EDWJ(XjTbaY%V;*0ewEdeXZv>a8x+cR@v|OZNo{F&vvlX5todX{s=q&zH
zg(uq%zC{=m1T#_n94xF<V-2gZhSgZZYOG;3*036DSdBGQWA*UqXpHSIbJ+B2^g>Za
zF>4z2+DLdVC#ZfyW983CfT?VuC%y#Kh@S?jcpE?%%9(m%t8h_)&A5pf;V2SC0{)$x
zim@JP*2AdUyaXdsA4+hYIvqldurK_ZZR$4*$6}sR`ek?;bWg-s*yuBYImt6n*CMlU
z+I7faEL7eb=T@0TErziWa>|hvuh`+SgD75!!((Srypax%9Y^s>9UeQ8;*~i(b|}Rw
zcX;ev!h;@AkH^4yc%u8Paa+?EsMW1T)F_8CF{rqIB_D8hXd8EQ2H(*YxT7O*M>pV(
zPHI$2F;<^eLl2CrfF3>*wyJ5&l(jfAXlA`TJP$lxi{dG31D$yNF7ifW1`h-!X&T3g
zO5dUT<xdaKM>*TEymjgM+p&Uk>E|QpxFmNeSSXa&jtd|aUc~-mgcma2u5hsY;iaqs
zHXU3_q({%z!i&K!ZbESOfPko~fn^XJR9F@S3`AYU5Cn`;n;{4otd&G^LBL=Ig&_zS
ztfVjmVc$fnc;6E+8ftVSzJ#?@+Q*@+t$lnM<D$K+`J33ZN{%-uV?cUTLkpFZ@_X2o
z=eB?jmv45P!Qydxp??5PcA3{JA9B&#%DfaTxfGRPLzj3GqwLn2qQvX+EKdAUo+XLT
z<T*0o!N&R4n$kppJj)W5@+?n`k!M8$LlWshU*Zgf_!CPNl97liBr~y5AtMr76_S<M
zsgUf%WeUkj+@O#^;#&&IP28)Hyu_ml$xl41kb=Z(3Movyr;wt=CkiP}xOM0=$gPIu
z^LZm-V%p|;e;nEl*AIlxf_dZ10sMl7S1`R2K#wCd`7@4W3f~mot7+?z3@WZxTlATF
zW2TYFLtV))Bg=VM%BhuaX5u6;jpW%jcN&m}%tTijw^?uWV%D%ljDpZV|M|}g^79kl
zf>3xJYdjOviaX1d<<2t0*bCGTVYr#WeeRNdKZbBX??=EWZSd*0^V45{QsN(6q26fZ
z*JtSAbD)H@jaP4pHiLSfW4SOE3jXkFfF#1K|2&?*Ou7bkLMRAiW4INvSR7NBzpxn$
zcRFKSUzV%UBdeVH%tSj1&2sT>!SBy<AIEnKKO@VmX&hTC_D-yT{K!jD51i0-30DIz
zG;ggbc3VV==hkp1O3O5K;dqlV)-i%LsV?n?zr$NlOn5C4Y8qX&`G`L-pFhKsc$4|-
zfj4G*5`S_Cv))_muQyBl^*YwinMd5UMVUv)8{zdP|IL^|Zq{k7UQ+Ota2N7pePp=Q
zEY#0EbHbE!Ib}^MPbR{VOk91OFpx^fLlinzh<T}0x+9$UH|a@EuhL7xUx6xE8jdu=
z8x&URU}Y8-(JP>7HzzmgL0=l~Ps1~8981HEBAeWbN(K=Pu><6N%2?O|E*8*R4PZJx
z7&WqcsV`3a6Q=an=gKJc*ZUJ0E~fQ-EY*09S^`P*Wk7Fe6;Zu3+=ILgzQSZ2Pk;Rc
z$?33*Eq0|8<gkk@wk!n^zGW%M@e??~dYF68hthtmh{L@ocL|=G@Raq}wUB{apwMp=
zF2TxJkHgBc5rj3dGwjRN!sr+O2;U}jb!nbE*BwUJ`tw`?S0aG+D8I=8)#6Z9^;6Tt
zH$%LC8T`ZuZ)ZKs#^S<=>qG*J%m$YW>kZTiC-FD#RBJ@6dw4w>P`YIxm38yiH=-e|
zTc%fZ<3lD^%@CCuvQu2vAOc}2^ym31zU$PAaxr09<?=kt0u5uWVlzBaEN_a_ip_PU
z*j(<SqKIrLP!`)9lb4!Tikm#4k1&(hyF&=u&??y3Y#QcR>@<rbKhVW?m{-3Ci-flU
z#J51GRu?ORf0x5zKU4b}%%yz(hxQL36&o95#>U2zyc47q<IqWjDHcAJ!&{)5V+Au{
z`S67-!RJqRARRL<=2XNxEyC{XuSs8Io(D!83W0kQW;Hc5g@Mz8)4^AJwt$(o29;zN
zdl@{Y)DuTH`!h|;Zg{Yr;?UV|off>7ep;Z*YM0Myuqn`dX7U1-9t5aGo7CQR1=S6z
zGlcoNvF&y=J3qMt65DTM3!G>1TpYknSNIAvHZ57kDcc3z5YW%(EaCq`W^{NGP2@GQ
zV(tV}9erLVY(4~KjL$x~Z>v!T`Zr+o1JfHyjNAF?SGmn?w{gL{xQxQc>56%*5NmoZ
zK9QLg%Se+u-P#9BFKpk(ZQ(NnSeb&XYxr{1ZlrcbMjXw6<CmIZ;tU<Gz^;i0n>c&}
z#7%V|0~4DKAR58v&APH<G1Z-_?1%-I)W=)0OE3*+l9~6@E`><~<^(H2NQC%da;Y3A
z!qysz4h{>L6ir<^#&C%zL@w5iO}tifZNjQUb7#536R=;&awXxa{_Whwk&_`(fJ8;1
zmzXQ7Sne_*7DCt|usBQ+yP4?G!~cz%!`}gD$kf9(Gx1#jIk4eAZHBEw;ulihMaZSr
zCT7^=l|%At;Gm10R5N@E^sJS&GBcIK?B_C@*<l!Che3C9^07j0f${*`hbqN~YAhe(
zr&WO|t{uLZRTm%P5|qCyriw8+(7B3r<_&^c?|z-LaQU1DuT*JlSu=bIr%l6l_WLLe
zTk*SDYxF;p{1jSF{O@yG!5FvVE?pv2aZ8piA<2rZI9aTN+7Xp%SOJLZKMD1ZlJ>Dc
zBch#gJ7az&iqOgtuO&|v2a*Gw1Z;JN#<A`clmV**f&qUpXs%Q_5%!N2hEbB(a=Del
zxp^^DSnsy@vX62R#vLEJ1WN6t`v$ln7EP)!41KGxFTpriM<w=1a*0yw)|!!t?=vHO
zDckM}mC1_Mw(eGtwspU{C|}Glh+yn0v~Uj4#TE`#<yFvB6p7CG5tH1Xnj8+nM%b$|
z6E9ZKt?U(iBFvolJY+%pRkT{Em~dy6_zhN3&L6of#3$ANX=RBU*kxVD;-{;;aspv+
zFf=2_6>G#VXFVek4hYXdKxY?nUGf#UR5~pYA}w7)grd{3{#z7wa8Vv~M-R){oth2I
z{O~WOZoGza*|^AZJCBo15C2xSmB{9nS-~yA$70V(YkqhS8{|7S$Ed9zfu6+_;tyX5
zP-`dfS&fK(!)Vmu`Dte|YF@M!vCptExnB)B2Re>Mdy+6EmS1Y(%rvdp_9`&l4v*(r
zcbs`Hhljbj*CjkN&T|^0yu_9X(+oceR;`Xxu%h_0K&?~PW~FfWo7}7+4ZWH<=jh=F
zAl!gML3S-fV_A1Za3m}Ie4Fo1pNE_ClRrkTL4<{L9|q6%;X<?(%?`*h2bOr|fXJGX
z4@>L@==TfOQf%XuwJFCzz0knf9+oNW@Un>uzX~zLG7tAJpFzSOT<(ST(TNNUY+de$
z6h?}*?R$yy%;Cc9ji8jm{qTQP&TmyYMJFgnr<0*iJ?m4nqSX!Dk54W>IzCzWV8WpK
zd~BI=NBZlt3bEqH*2yfwioZ|}XIYnPAk)BQY-8iaLHcc5xx=q;o3c!H*xD>};IELV
zX)LN8_zRF@W-I2M<h969Gsr1n4{FQE&omlMF*@P_7wN(rD$@w|l_<x9iIshahkCvz
z%M-sI1&r|7bt1D@T*aq4%08(dIRN{*BIg*^-ZV$U9vsUHfAV>@P*d_XJO)L^J~hY6
zEPNv*bPiMg?U;AP|M(flyz9RNL$;J74|9y$nTqdaA$Y7KggIZOtE7<w53w2*`k*{v
zyV9|4!or0b*@lUGd2P`FRR$h}oWC%`#8RjUg$k|5Zvom+n0OpwdLqLO;akB;Vx{Ik
zFZ@386<ykffL2qO+Tq_CNAZ4#zl`JEDsXO%-!6Qtz#y;R8ovW%UkDmys>;0aZ-L{*
zOIf@LGwqkMYTcDb7hbE@U5PZM_3+=ILL!^>^73NiWIgP|(};f?CBZI2#rHFD@fYNS
z4?_NrC?~S}Ux>v2z!FWOY5Y4}AZ*An3iA%ZU;)(zyfeY-$lq9)D1lPxCc~`8M;>2E
zVoLK5vbCQ>7wBRd)j7Dopr$sS()pbaFEIRaq9+K)sk^~(-VUW4<{q%O|A3_tu=p9j
z7r=2C=2#B%Ll%O=I6~|&k{*|&tMzS&JO0K3qankRLYVXGMcbJT4`mIYQ(+i)JopVl
zxE@bT#|Yc5$jE`8^MmaYg<bd$b3r*IxF^g8-H52um&U?@c1R}X!AgmB0P%jL8xi-A
zgdM2_eH&NMfO7^nUqGmjFp|j#>fpI=mnJWW0#<#9Y_ibhBTRG;jxaH{{f)u2<b`11
zW`vw@dN~~W8w%32x{fQ~%)M@@oSrBuOQO3mo&SK7Nhv&WH`GgFVnE19t9k(#ybXsN
z_~RIv{#swKG5)Y1X=1D)@17rV#L^NMfmyVwp&*qr@k_2<igUXXFM{yNxljBj5RHKK
z3Rr0+4AFvRAo91NB11G_k+kfV0s-V2VWJzQcBzVEjE?>oi*eyHq}upTk=Z^q8-aeq
z%aKu@_@m$kb6PSJbtu83&h0$mpMe{G48ULS)$`o1q3bZyif+To8R2Wl@~IpLkt0*(
zxDYuC^IQW@BO`LMe#3IcABTKnjpz-TwiC&WR0m3Cz*V$5&t-Z8uKXg|VDVK5o=(aD
z^4v#?^URd%1k89h{05pIp@16>$}x=pe*b$aW|Hlb1^bLs_Tioyrk&rEWlRGM;CbzL
z$c#|iBcU_ccvJidsGi~ZMptpO2{>|`NWp)|Q+R!*H!UXuA$f<I*(+v-lw;-*o}%md
zJWAzrqsAjiP?F9@&2ty#aXrQ3!k*&m^Sol#fL9qXTMQWRI;JvVD$^Hm2h0=M$^%>Z
z(ro3kY~_Ki`0(4d)khyGTX8HwyX7y56&sFK*p1^)0j;f3K4IajxCbp<dfdXLX9XYp
zIs74f2w9WBP?Y$rCAQPaKFDqpIo+!6Qil)q<c<P@EAM+b*02-scEiuxjc_))X?T#k
z2?eMicP`S?f}A8skW&eipMk+7_3?1Y^fnZF`6^R=Lzb7zu1CnoMuoN3DD*UVJ#yni
z-Y_}-IO0eVTwmfV*AQ^UH=^DnWJIhxPJ~-cZP!x)+5=y7(I;q63;UuRecJ&orS=wN
zM`*SJo$w{l3EwgThqEB$IPf+=`H9~|p@o?$_JLOmUY;x0mAW6(*z5y28vHO~yNZLs
zsS*Wku@t{SMMtafh7xbl@|w&LrYssW!WTb`{2>aVSH9^}RMCo}_%Fb%wG5gT32_Ak
zn^&0Cx({dH`)Z}z-j!vj%<CVa=<%>g0TxC1nfeGslL@~B&lhlApXc^WdKP%VEk_-b
z*dGG!0VKO*WagQLd7cSZFxL!tFknm!77leq%a{92QFKg>w;|w_%YxF1W>-;0eNVs(
z1E6HQ|5z084m^hfi{pU)JYT?v@z*jr;48eIH(~xff52B{p&0>n=F(Ue$PkSh^Sq6w
zTtvzA2K<2xxoH%@tNc7qz!NaP(RFGEUIHPgE$3m6l25GxZFm=X^N$%=dB~(5+3iG}
zsW%O>E)Lyr(;zn%2ZthQBp!vIsWU1g`73C*{drCvIRG3R9QLtEu*OL+h`x=J;sA*5
zxSbS!0T?FpIAUadjt0hyU^Kp?dI_s5tCtLRR><ghB~}qp{lw*-a-wpx)5;C-xUouo
z_xMunzR#qxuqv}jM*W~D?$1XPpdZeN9iy0X5(FLjB<R<ihJ_lF{1jSFg7D%}-Te##
z;e((%bXf;kBR335KQ3BH{IEulTv~L_)k@H=lVLBTA5iW~@ssaMNzvAMg-%l-2O9)J
zjW@UDg+?!3dOOa0c*Vu1AgQyn<#rNB35?Zag&eWekq;XAl4`)9Jevl712SC0O<0y3
ziN_!_gsUX%Ez5aUh<w=zku`}A92{q{ZaND6CO|*C;U``PdOUWB>>nB;B_VAcNEpvj
z0|!W)(E3ciPE}vj<TmomBj=joJPDJzxVso01I-(SzbZe^g^Z#mXUua4+zrJTz7kxs
zfk<?9g>e96)_S}c<kmE=BD|XBO~h4?imR+vz#~%^$JKyoz0*652A)uHmDi-OAm973
z+s;e51*n~m>YL!rKD8zdS*GFSg`A9g2V;<o8TfvX_M%iQaT4l1(V{eEzs*BpweVAm
z(!^5aPpgi#;kQ1#4o#drG>uh}fX%DV@XG*xGcD^PFp5?+dJ<7&t9K{5@Q{TCuOhjJ
zOj&lO<+unru<9%HggF!zjvHb1h)1nY;U_$v+h8-qihyM!%NFj!C571dOhd-T5xT_E
zfj8ijV{ksI54-}bXhr<DNDVgfRYY92V<J2b-I;-HlS5>Bg4rz|F94)Gh2!)hzdrEV
z@!84HW%0w!m%;~Lg$SQ6sAcI6?!6<v+Cr>NuZQ0H!0W?`aHSQ&6$~74ir^*H4(?$q
z-}01xBaWC{>XEs=qE$sLrrUjb(ds2;V}aFVu4Vuu%C%fBTsBmsnPOZ(7n7u!p(rBD
zPtwYuByFeK+sL;V^%5PRiJy_lIIpj!gEN_JF0a=Y=@Vf$lA-OF`5Tw4CyW3~_g*h{
zk;(86C^FZ8lfpLsU_&?`1CPg5K~p)iF{Z>`XtqBO>*s(QlV6^zzQoBBR!ML_G>cu$
z45MlONqbPR8GnOI4K<^i0%mZkDjky-gjl-C9q<%zALg2c0gu#_=f!;5%tKz-JllzC
z;TDT$=6cg!hRZ^cMLn{5C>-bW1g%8|DoGc72=&zlaJgJ+KGlnv6046)ua0T+563WV
zdSsV{_n7bK!LiL5dT`=c6WEGhMf6~_IZF?&9qR+OBIsZKt4LxK28w=34@{rv2bzqb
z`15!VtJ6DZIpR64K1fxC<FYJl02=@oF4#n}sW1%O-xeNkwW`2hlv#gLHhC3)gfBR~
z#pU(aH~5rDp)a_qDS%C4Q>HH%Y4Z4jW7v131y<?JkD9P$QN(QUngee-HHi-9ilP-5
zv|i7^TULU}iw3R{T`#I|r>nX~2HdDDAF#103oz2;1(f>iwT4~g0lpZ_zK5pM)DyP(
zZL7k<jQUa8<WZGndf^n=-r&Gkzc<*><i>(YhH?>Z{aR%gt!REO8+X@4|DqKtpWh5t
zHs_hhmt`WK4?cBF<9WF-lHgu*qu0jeaDSnz&XY^eNGfusedwymJ#nZ@5=JG84Z_D=
ziF-NrJ&JA_<T#P|n?v%zPn_ztQ#k}Aq7KQUIdRw_k23kZLt+59LOfOnx${GRMZJUE
zIl-(!?h2K}HsbY_L4QX2G}zI)8H6q_^2-p$g`A&3wO}ZW+&obE0W+!*JHl5u#*2xE
z2i1sNz0fCPDc6Nt3KQAGTsVbIU`9&aBEe1&8(iKqHIx|vGZ(jXig=awC2*3^%pZqR
z{(8<h(TKyPQT4binKt8_FtWj~^jS4F73JzaYn<}*2NU=wMlrz5#tb9=dr(+NA1T7L
zdn6az&UUmGD`|`!>}C)cQv1bBI{Y%_@Dh=2aSd#7D%%3PXSvLe(^}AeylyK%l!89~
zls*#Su*lctDt~7E1g~7>AK|HiPX$9`!uFSI<YdL(ps26oD3%pAyz0gA0r^si*Sg7X
zN_4SzBVr_b%{iWCZ&7EOc~~di1f6j%!t)-R6Z0NFbSw19y;5AUPjhn)jRxX@sp9Or
zXx|RbVr*g<p2WSEE6r4#c$|$NabYM~W5cr|6{01pOJ$v$%Bnc=Udig*<#)j=r$g65
zKT6_0Yn*8nDPB2td^QgJBsO3?jYtvajVntLW7AV6a&W^z|5PU(9y+~gf)@o~jGs3y
z<mEx?#UL&8azOKPK=X1y^Qr&?(_np~27U7bOj(4<@yqQAW^omm@@JZ%4`J(ZlQ^1M
zY9eZ)9v|1^<9d8t&xr%)ka~VnBxjv)eZG`#$8BYVf?+Wz7~)W+!`JFZ<)#I+h9(5G
zsZ9uIA#UP;D9SyJZ3~af=3hx1LX`AJ7V8Du|A=9LH~U!W>f133<D^1ApP%|RPT@t8
zTw9)oZoCAuaw*QfRT8dpOJ0#vdHBfLJjNTGk;(T^!Ff%|*~mBe7cSRc=2xgY7m=Cm
zr_a<lB;hX;pUvZ&#x}K#Z5f9}F5lwn2AqNds|Sd_jpwd<;O%{huAX&CmT2fAnvD%W
z_0o1M_tkeRtLH9ln~k(V&|4-WZDu#$0F*x+<N2)Mtr@-wkbl=&__7z*4tL~OM;sIJ
zQim?UCjcA`pd<Jk!)FFQBk>u755_*UBRQ+*{02TQd^jBe!D`Xj#heCn(4oNeDwBSi
z%WzX3!@R)jm3g$fic_}>e_P<K0+W{K{dJ^CGjbWO7Wis_@y`UlE}X@J-<-qzr*pWp
z3-d}!O!{CH!~e};xV)yM#7|d@e!bG9a5i(+62rT+PxTJkUCH%s0&ddn0+$oxW2KxY
z1<%T0`Slt@R|UffQo`+lO4N9rX!0lj*`rK)EyS=!%DGAMHVJ-i8Ru%wnNn=h!~nw`
zS*+D8<Mm2EJuNU?%^IGHlKs?L&o~rEuH5oh(YkwJB@?%Am~(e7!*_D7ftB9%GIZx%
zQ;<d9kW?>llNJ|WQ}8rlDnS^0$j7yGco>Gm4Cj_|X%C2Ho+x6D3o<4}rHx7Y0ZRCW
zR)&+~3&moC!s!Zdy{}5UUKHrlnUf>%oQjLW-?HraP$~286B}*|GJdbfuPtQ!dzD=N
zpjgJpxUbx#pGXN6<=l@|9+nBYSmrlU&PuUfrSw9#;Pa&ycGa?EUKO|ZL-74Hzm8jR
zrj*ty)*C6gz9jAXlaw|ZwPaDbc*v9GT*4=jO*JNc6RGT@_hD$T-@;>YDDptgCDpAC
zH5(qw6px-9s)H{x1)m31Bx(HJ-9b<j%lRbGfNycyRe^4l;<l(DyqqZy?Le9_>W7g<
zNb!*mRFD6Mkrkl)_%>?}6;yDVk80=^==7b6L-1A~-rM6l(li}Z1E`2d-V2H)>uE0}
zzh1GTnkAcP5R%!!71f-^<28rIA*}&l06Iz1t^&0P5oa=aQF|b~qIw0WsY1P>GgVAy
zpbfaWSHGhAFz$YxE$wR>#rY<J;`V8%VLHA)x=PZ1UHy8|B2ZDGe&kWq8lh$f6}3U~
zz2tqp=xs=LOIlRYme4k#{!m@vT|{TmfKa`o6tzPrs$ps`S}wK@GIbj$w&&?0c^mzg
z*sQyv!b?coE!O=-QH6H}sEfpcKd9n-`{;5>I~L}&+v!Hq(AqJc3h!auNW4?h8d2X0
z;CD*eV?Iv1hkh)je6NH{xzD1WEobV-^t_~1q4oxRm;W{Cqkd3}=mB~|(%zxN;RvX=
zMbEzl4~K~!q(4X-J_sKUF9P+x<jc{RdKhQP-0yBs5qboXSVL<IL*~e%^iy&{=^UyS
z>M&&rb&^oO!lg{^qlH4fKt&q+S@~#l<O+I`$~3mwW24NGi|9A_@;iIoHz2u)UZ${=
zvRCrGj4!dXtsg|bMc7T9q8Xrmf!Sjb=7uSn9~8&Z6==a!%?%3<loB0A3ub9XWe$Ce
zA+w170;-ngRR6uSmaZr`R=R9(bi}1E8>|Jaq`TZMeH?wePAeNnUH*)+O4=;&TJSac
zv!rUlyt4Me^XrNLe-<e!Gw9K(k$6*dl2!-!Gl3zU@f89u6nMG78wB1V@KTgu(DMaj
zAld954|s-qBH&ldX@EDIT;s>)EZ|3go94@UQQ5M=de@nN4PJ&1X$(trhKmJWP{{aU
z;nxeNQ{aqp=Ko&!rwV6_KtuR%2!En*5(3`~vizTf-zuB|f#G82|5o_T!r1`WK6v*C
zm)<`3xWKD38UI+|V&S|X@DAa)1YaXCGm9l(6n=|v_6Yn?;1j|hCHQ{{94Yc|34f+=
z_6mGc;E#l#FL(lQ9L1{^mKD;r!X?nTET4P%gFJ>V!9T8Jd~rF$p9}uS48~)^d0jZ8
zQRA{f-Nmp~Qr{I$pO-mTdl>$-nBiaz!-ZjnUlN(+KE|&U&V7}PhoIrI!RthaM|H**
z)iSIsVtBdKa;%W?sNlbol0(9|ILQ3-MTZGePPgE3DPjFcPW_r_b-m=$1b<dEe04OZ
z8l?<Bmekdfx>Hi8ik^Adocbk$p|5~pSm3J_j2|jvc#f2Coz!)wwDBy_<a)u6ij1d3
z@`}s^DSwXO7f8LYO6q>Wd!(*61U@D`@`k|eBELyWo+Vn{;O8=%Mdub7t!o9&0Ia4b
zik4%X&Nt64tHv5@O_@DXg2ijm@6QAouCHbI>vD$m;G9g46>R`~s)pfv!3`*(!`%z$
zNgHcV)$~ICu_A`=1$)a{=q7JJYH6)M576bi08wJMxeK`-s{65f92M1ktt>!?-B)1D
za>QW%Wc*sla@TCLeJ~F#Z6CZ?;CBShKrgos{-cWFnS$RIyauD`WJ!Gie$qbp3xOBH
zGUMnUmDi)j*Q>5ajh~crnJ>c!77e~$SX8!X@b2m&r2af~E8vd>daCY#<g=sh0;h2F
z{lFhF*8pDNegvHFmOlz@N12Zz@8$5KMT2EIT+1PpHjb_rc)7rb1%6xLUj%BzGFKNd
z+$!+P0%rj(8eCSuuub4vL^%^{ibr6R7pk5B{QGEdtZ3Hc{yA)WXf(rPSwBZ#+@n8>
zF<U?{lr0Qlu|T_v_f+yqX!#IowL^W361O<iXP_=}C{DZDp}3U)b||bE=zEItQsz=!
zr~8Gvn*PW2&oZ4}5NaoCcb6M<RHb=cb=l=E@?(}Ey4sslmk+8)sNLQ#*FA|9Rm4hr
zEi$s)P2(-<Jy0H+t|%;ls>*$I)S}w`jpcsI$L<4V($2~W<r#FEMYa29m1okRMV;e6
zy*!Kl;!y470a}e!7U%oS*IAxN&smhm-(6lnQ$}&xZff@@%L{3tL!A$5mqnf9-%(yf
zhaBpw<t6ljLtRxqk_Ky3DWCanD=(#QTa?GYzr2ioVo^IQ?*jFLQ158_tA7k?LM`We
zg7#NGQeIB0Evm}*ByQopE7Tr(s^Vwm6;yy1fkb<Xuc>?r)L5YoQWw4^SV60WdPn;d
zuf{8gzd%oP5LB&ML7RlyB_0yw1pGbWzAXEh@*r(ZOAFDCA(Sn7Xyhy9Aw?kH^}%<`
zrAw?*J}9rEuQ~a!vY~GYwcEQgW2ruhzHd<nOPKnxP&>TOmE`aZZ~1$|eQx2g@)|lI
zX*=n;EUeh+kjh7y!K{ifJ?~I?ppH6JNyTWKUvM!8wZB$`DjFzLC^a6MC|@XLvnC1&
zr7VHh7xMRn`_Ra6MHBX0Oupk|{~SYOE$X@AlPbp0TSD#jzFd52#W>nAnkAW<>}sLQ
zg@R}KPp>$Mo>OU5=bG#~nT|Ttii!!e14nc0XOEU^SdZUmQQs}?sF+CaThz|VuT)H;
zkA-?edoMJ@HHkEwAP~KwbyiNn>OV)Qop=k=TQQm56>10c)vy=nZIBwIr>D|hhq}08
zDm~*+dn%?;Rij9Hx0HWNKb0aDwY&V<ic@KhMO7G=>C<VxMMaF8E2h&~7Il^JO??Kf
zvZ$MlJ1S<-dW$lvZ_sB_uSFG9f3IRDZMCTHhL`HIXop2T9L}Lxbg@P0^*^kbO;=b{
zcKuI4-C$9fk)=BBCRkKKBnRKSx>Kkt>9Wy>D&~+^I`nE>qJ6&NG-?n^^?MtY^M=Zb
zk!@5f)Dy&B*G7EDk|V={!j~(~pe;;kS5vb1XvLZIHH$i{{+){XbhAah=Xs}MA>C(D
zbIRYZSWG{&sP*BGDwfhq7WIh#vx>9mJ%@4y&!NvPsyRD57^8(_xxPJg$X^s(PaiV{
zT_Pp5!8k1+$JB0`RMr5Bzre$k2h=9I#G-;_9TiEs-J*)z<AZ(lxJ4avjSu$I+ZHu9
zN2AU3XGbyz)TfSQ4xLMSv#Q~xU=D4eOp97Px`4J)kwt9+wT-GRD&Jp#H)>-nYAUD;
zXtJWj2Y1jcp;SNYpoL7qy0`kK1$WRT7Ik`lYw*A5eT$l#zbLqqa$1yRdCkh;h4e#<
z>d0Rg{3>ORS7|#6;=zk)HB+!zuWxJcQo7hmi`484UPkv@RH)|C;2t_^QQs}SI(UU#
z#9&>%Te>%R6&Ha&j*52$uc3n{F~u?Dr@?FKC5L)4cpZJJDDRu$Uj=WVVq8doq<2r%
z2G<Q#Bh=O2*CH<=ZHz^|2kIu8B9w~rH`4}-;yAyT287}n;djBkv_~iv!ET{_4)tE}
z7Ro$@>)VO?J_+7R`9keRwD||9YKJPoUb)esjL;o4#i4wmZ_^nLl^yyHEp@2E(4Dl(
zp~^#dQI|uF3f)afp?1*!6is&hfG$;Ouu?s)@7(QBdnz8FpD4=9G2}sd+M+mWJV-BD
z6vv4N>1~VpTFzMQLHf|5K6EjagG&=^T~AJH=s}t<)YaaXYZilAW>K$2R)!v;)fV+0
zs7Gj{P)`tB_op;yQ9Q%`l)f(%+qyG!fDQ_^hhB7T2t7(iE$S^-BJ?x*Tqs`KYz;j|
znG=;RO}-tW$0^^UzFxLef1JvM;(osfX|)#h9;hd&MM=^PWqU%0Xthwv3w}=fEQ<Af
zn%=djDTPb*r)k0@u8;M+HuN-|EtDEZ&(KbxShI^Oo}sIR+ASV=n4Ykx#|p-3hv}$A
zJqXJmCO^)WIfg`PZVnx$a;CK1bX~?Bp<mE=i~2P8d!c9PREN4R^h;XcP>+P3r&SL1
zc<4onJJjLOZ|FRS`gQ1Ky3nCs54}Q{JJh?O*XTxznpAg3=yiI?q5c{=N>4e||Au}?
zA3Bt~@-6b=<uGfV<<aQ(RO(Q<mA|Js7WLiIlFE0fn<=#RyQNi?@6oR%O|6jLr?-XL
zNrQ-r@6(4Osn$#HlMAQzg!3F7^ZTEu%%X~l=es_jNkXZ9_>krb#r;rU`5`SA>T2(W
zCC!x|(RoZEzI>%*0;sPFwVS?KGNbZiy3?X=D_LIo869<~WaU5UV~bjeG`GetGPt!X
zOOllt+7zMo&`QrYDg)Y}P&;UR@S4h8t(p(`Nv&;4w0fbg_Ug6wR+ebZLhYt!${zrA
zx=^YOrP{Kze5D$f!Ex}=$VV$v)GxfxR$`N2rG4!EO=Y=ujw%yv&!Gw}A=Ep*2lG}^
zP}^lu2lI|p2DNLL(w?A=H4jlp+h<Yd*L<pl>@r7iK5SrA4I?;TrS=0U<!bMm>^Cc`
zv<EC|bM||n4l0VStouu4wYF<IXS|yBf*PgW!W1ljWB%urHQM(r>dJgqRh{-QQ;@td
zKcgzFy>3xg<_D@Gnl^*euEhH6sq%U)N2op2?+H}ZYqJz3Ywrf_9HH3OIXG?GD3n_7
zHfsGs?eKPF<WQr=C9*xa?M)8FZEw;BL{fR=80}J_ln;*4E)$C9fE*gD-KHePy5qF_
zEQ+l(PJ4<e%eu|lix$N-G;42)<U!(nK#S&^$-1a{WxST_P_^cGtx~8bydPE;R-L5r
zum3=6T38bVb*)9Ms+mwVK?~33v^{jgs57c2Yp1m;>h<z7s-|gubA%Er&CvcVlqz$E
z=9<fCs>~VM3l_y?&eq;Njnl5AdVgotT<!O5OesCvv=4+*-rA-GPPfxGRkdkjg;F(~
zu1!#sXnneNxkYge^R%~wQl%`^{*sn&q4rT)zJ=P~)AF@zp9`gQS*E$p;M!Fw%QRCc
zPCLJ9nO3MM@3hh9>&rDPCGof0`zPQ2^5t5sP&_~Es#>m%wW#+%t<<In#c}={RbSTD
z3#I0Vv$e}Disy%Ow3n=WYeV0xI!Ak5s4KlYLpOl>y`t#eny1QFX&(ut^jxK}Cb0Yn
z?pud)vt3dY_w*XgcP2}!7!uP0LMiLUw6Tg3>&CQ(c~T~EDeJY>^O?GmZmhkvYJ>K|
z0!6LPxwk5=g%&ZjhwjXKsA`k;Ws6!FIZ&0*7A{t4Z{!`QN@~Am3TxrFYkpqUr+p-8
z%JTi%=SosMt6#geo%3Bug*new^=tc<D5|ya^{R8V<x82`L$~MuscMVnTBazjZ=05X
zmZG@6^R;b4sT#IxJB5;yjOy*$wL-n)bJb;54`|;N>J8u9wJY(S^?sG64dABa1==eX
z#XIi{wAYlRc2x~iZwaOP;R5Y1LaF*L&^{GvC*IQ(RP(!AjdC*?;x!TAW<SFp<um*R
z&I@#U9x#RHVBR`V&2Y0{K~7zkm6M}ed6#8zt{>&+<QNu*<x{B&PtU7LP`MaCfKw71
za%mdjzyR>4MGQ9<GQ2LE;Z36R*Q-(-CI6#*K27>S51`%`B=uMc%W$gtQ@BnxUx&_x
zQVW-9%lsYtXg(23>2?uPxpmA}C8u*P%VYkIGP?x3oB^@we0*C=qg$m+Rl<J)KhU|x
z`So0Kla!F&F0PCFi>>-V#=pn!L$4YCLXuMtl;q^N=%vv)Ic|C^BPYkCY3N@M-6yTE
z>-u++cH3=vr5m?}_2gRk9>7bm2G_#x*r%a)>{{By_x>TaO2-w4ZEkyMI{tz5ppsXX
zQTV^+|H8+mjh8+hpU<A4IP>cju0z}Jik-O^blN9&wsB77U$(%nQh7M_N-0gHj+e2c
z`c83_{x;5UhL?!9Ux!hQ-whqDAeW=OYdQuda2coRxEc#;TnzWabf5g!_@88SD4G8R
zS0k(4;5XdAHMk!qV|2Ud>Kyi#I>ZIr!~N2C^F{y9MgMd>U4Q(Z6moHCh%-L+<VVEX
zb0qJ_k~bY!sp%ys3#-wjBEY|HwUQhz^PgBi$*5Ww>U2vvYp!tB7b(7B_2X3{qk8{h
z#4cS%lR*o-oL9xPbbVAry``K-nevc4@vDcdIL21$^>FImDz^V^=mj@DA<<IR-iv(-
zZg|RAW*N80n2wApA%GIbVx+sIoa1F!&;S2&cwA^S51Q*@CH$_GCx9BcUbob1if*1E
zx~a&V9^s#samTH*$Nup6d8y20DQL&)f5lOKH?&OEBg5-b{7<Aee*h21@9H4t81xf~
zJn5XrhjE6>{3je$PN<Y)k(!;K#R0ZP>2(b+=Rc`k$?$w+mwcibKV@w-;*`zPYyVH`
z`a%tBxn1oBN73H`;=9Dsx@Kwbm|CtqAd!JbhuuetbF6?h@6Ta=oxtaVT-rquE-f|2
zITyzz9-H>8^owFYW}FP1BIe<%M|rqSlSkjgCl~J#DsY>o3U2~xagSy@zN>#fjm2{u
zo+snJ%oJRNn?l#&vmG~P`0ZB!(2d{tV!RU24_V$nO%ymoV4J{20#^u(3hWZNN#It%
z0_^{}oa+Efac_e0TjX6!rN(9E;|){`jn;PJOn#i^s#^(oFV=ifq;}DMK#d*{_^7~N
z3VZ|5jr$H<!q=qC{q$bscIuS9aX0b1hg<aDW&aNMZ1(U825R}3`p8vhYUk5~dBxg2
z`d8}9fmcKxLh8f$Ra!T_TpZT=h*zVZVW)?B_4|X<wFmTn)XYWd<@pN%_f)RX4(VTy
z?ACUP=9i$%hoCd(I;1xh{}3`g!B@1aaAx+tc8i>xbrSC)Ij=^))T0G+!Dsv){b5fz
zG#RLO={M4I#dZ1~Y0-_)WW2r)GGXmT!0AZk7Tt*R$xp%I_a2M1mDvmQmvw$Ov`D+m
zzZ5cTlRdEEW_^$LX83%)OFKMzhrXZq>~KHvnc;rov%)T|#B&Sa#aZ8iB&Y7tICYOU
z3aRhu1+GT{Z_9pCzePKoeHi%t+0W~@5TB?06&e=MX98~_)}c*r$@qhQk3O^JBi(0k
zkBld8`TJ<s<QmOjzQ^Ep1&k8o*ZwMSrq?co{A-aq<B)a=ekbOTHmlA}45tY`8&KJ2
zfAu-WLA2{r?I2~<K12s;Oa54GkM_!_TMeAvRXz;ps(ZrNC;hljdiELV!9Ch}1tVMm
z)T>dOekZIH(D_}GPv2QN!_^?Y7SQ?4(>Uln-?c}ZRJX!a3HddEY`seTW1K}->ieq)
zT>GKJwSauKx}Q8bOZ7wOwfkHzfUnVhymS1eYm@d~<Tck;z(2XT?SA(j?I$kQmd_0L
zXmjv3ZjW|1`mRJjPb?qLs&EH%?%6$BPF*A9+3QB@KN>Ywdle<Gav##y*2LVS_38B&
z0kY+nfS*HeNxkpOJ%G2+>W9ENnD?pnIc<wniRIsNuaLfI(~ayuy4&>suKb%jYCP-z
zr~7m9bC<?G>C*T-<#X|<&&9*JXLG>eb}b=3ds!lP3zo>)N2c^kzQ*?qGBvI@Q{#H`
zHNJC@Df(~HUK2aK20QE!`)|^s@SGibu4k#q@XO{_;go65`Zt=R0IxF->7m+N&3p6<
z3!kJeBU$nTbCZ@`_%I~13!gF@w8Pchu1{({0?xWMXmzeC?H2v{qTd1EQ~7t4fZuEL
zY&G8WRT(>^oE`eZ`BOdj=!t?a1AbByMe55)9S`~G`gp{g?Vc$ZFAw217mwfl^crHw
zA^oDd2R(=MHDT6ga?P)hch9JIJrC1L@1F#gdb^B7K`mgYWP<l$Vx1qRE%jry29103
zVT|R4lKNlX^I^%b_JWMu7i1K_AlB|O4%AKX?m!=Dh}W64)|Z8QXq1Ux-=Tf@PVs1g
zjeuSnOV<OAr<=h)N%%7awh6?2KJb?UdTCJLF4_<Lt8^FOC3G*~<#a#bRrCnpwe&N{
zUni0`(v#rqmGbw|Gr+%1zXZIKehqjxy#n|{Itq9{y$$#<{Q>X*H1T3AegOCseGK>v
zeFpd(9RqxUjBGExL|(vGX$0U=%FWJ#hZX_8OHF|9(?r0(&>X;zsU7fBS`GL)Z2%-~
z3!qE85YVe#0hp=X0GOlQ0hq7d16Zs*3|OW;4j9s&101Ej0vOib!S{7XYx}aY;1_=d
zXRLM%aJ-h01M3NYf>xZ9g+8waXR2_fYh%HgtxW}|RXFpshf1?(p>{eri-fa8TMC)w
zQvM3zd|6uw&T6e6GEw1lYM11ADW<)Oyz8}Z0q@e@0N$<r3^E%<rdN9z_$I;ow2y(~
z<OSMp(Xs<sbiOtU-(%h`oI!1BU<7VQzJn5WY0H6MsC@wZtJ)^Wd`)C7(Y^}&Qo%3R
zt^>YD@T;`DQQEcIV}LhmzXks$;qTS{7o2@sS#B16TWbNlQ(FRfx7G#tLv1(U{o3t-
z4{NUi9?%-|vT!G0E#Ony1AxzH&j3EB{SEL1&6S@;FKOcdU)9zC9@RDhzNK9Z_^x&v
z;QQKxfPc}R1pHY05b#s22zR$X*X96{z6sE!?*{bhHvwkqKLE_pUjfY5KL#w;eTC?2
zeF9)e-vBsD-vt=fZvkx3e+4*J*NV`~dM)4t{S3e<`Z<8p^-X}Y^(z2R(;opmQ~wZf
zp<Y*<MN9NE0hjAL0Kcr?2)J5*9I#XW6mY#hqXd1Y?*;7Dp9JjFe+#%p{{--SeI#yG
z59+f3cj=vgU)8T1>7^TW9({Xt9)0_C9(~`|dGy_>^XPj@=W+Us$UFxbonF&FEzPAj
zz=uurAE6vFo&|In?*MuYA9_5~r~=F}PJv{=*q3EczA*)yV&hc6GGjGh$mjqZCHQ!w
zyVOe)jBS8Zj6v`_jSB(S8#jV;t#J?FjRN-?KLY+kgLS^&V4WW}?nQif6t(2i<A7dz
z5vjTKvT$A#_=dp03jCYE&j7vn{YaK{yEv~;;0S>Mft3Pl1dayu(m0VnNjMV)P8B#q
z;8KAr1fDH0DzFQ%32WW`fO&MVx`|5ZFkm&k4_Hrs6S%B~@fT|uuEft!)zjmn8BVBY
zcqcA4)KhH}!<)x2G{-gJcPkRjO}HEKAmA)|5%3K99bh{h1N;(Yv@}r%oeH=?V3L-#
z%))#8{aO4E)9lac5WGY17}nfxl<gD_ZkZr;C+(ztlP(ng*YJIjy)Cy$>TMQencE=q
z^rYL7`scF8Me<E>KAiL(@M|Z1Bz)4iMnj9B1Vdv<L)%H-$v)tBwD`2g@Gdc=v3)AR
z+1pYn^3}qbA^0r(G{XL@N3|;Y`lL4iubuR!l=e38H_9}fIR<_l?v55i=khCsQw`4E
zmTKY55KdHJhwwXu-=X7u{p20O-zg>R6#gy3c~szIBLA51AJbV+!w_u^ZdWyaoZ*g^
zYJ=+?Wqci+8N!bW>@Z%TiIaB-z7vvrTXu@%EyB4?%6U}q$0YSJNqtlBHwCYDab2Ta
zTyh6~?G82<xKH3gfo}?Qx!Inh0Qa^Wa<fg|68N5Q@VzMT@eg63gpk1L0%w^Y(I*pU
zn=HS}<P!D)KWp-1_-U8@Sx1rUj+VECPaeiy9+sR9c-G`jz^_jl1Rw1J{BzkZ;q1k?
zx1guzdB6jLKjz_j4+?(3D<umgALAi`qXf<txXafJ{yyI%>YRK)I0uFEmT>Sp0Z1i3
zm+A7eWJvH)ewLpusndnCTHv5?1_j^c=Qi#V$-TlkAgKogKPdd8f>Vank|DKZaLFOT
zrwf0&;Hw4h&EP(IOUY!iHA0!pnV$JH;A(+`0{2SlUcvWea!(x){2;E~z}kYpmC1F{
z2+kW4IBEpzJbeV0JY6`0Bi=;nF5&MLe4pS41V1SFQNbyTB|}+%q&r)t18y9@8ZdIw
zAmATQ+6#E|$p-+>JLM?gk_nXkN8Dssoy~ncC~&X91KHf7qXH>MS|@O|z(Ij~6+c({
zI+v~I%40Z6;EsIe?=4_>K;Rn!wL<3XDrCuh0<|LMj4EPIRPY@FZyCw_M+Iu7QjWmE
za>n-xq#)xVft^9AJ;ZP@#D2b4;8B5Z37_zm{*#IODy8-+hP$f2&ZSjL`2q(=N%;Z~
z)UnJ_3rb&ynKNDBzA=m+9K&N|FMSWUJH~5gY8$n?wa2v&HIJUDPu5S@SLo~Y@996%
zAJl)R|F2$boMFU`^NeSV4~+s>nXAgR#dV?UTdt>Fzj6KE^@-~rE|)vUUF@!Nk9SXU
zPj^4&t}^GE=bEpWZco_L>PdJm_gw9{$@949x1P^DbG<9QtG!ov_j~X5VunK`=il{p
zVdgP$df~&Y!#6N_-JVBvI5infrFivJff*%;vz8D}SSoQ3vI?vCYMi5tqGm|8;4Ef5
zq))=HYMzW7r$BlFeu;7-a!lc003=stMK%5{gSslfi|XnC7iBT$e@YlC&TGZ>z+Wpq
z3GkZoNq}b<(*d71<^YbZJ`?ajnB`BYUkq3hVf;IzzYKV&YK_1+;P70R=J1bd|Bs7d
zS<Y6#$9%g1?<q@_@MHm}{zU5fTFE8A>uRq6ygUC|2cDOGBXFg;;%8Rf3eIqN#pv&X
z-{Zd<@S@Ot$I0Z^Jp|5AYOk%<@$Y#V=z$EpW#NAx6Tc0IZ#sJb$D%LzU&_b;zZp=+
zJ<bt;)9~$m4c{_kI2~tO{4bg00bc;9(?Z<+#%T(mPK&7scsrnuU2h5SrGPl&MUQIu
zUREja<@mjJeA5O{C*05g{v|*ir%;uE7o(4Lx&l3{(|@CXb-Ee7t7C^%4|ofDSEpOy
z4LZJ&H4gB5@C2Rif*;^MIJ^MwlHdb6J%}|3-jbjNI=+K?D&RZ#4l3W%nF0I{Set0{
zM?f7rDgHj*p8$32q2>br3{a<kQX6p6+JKwd8GxDEJit6{0br4~2(Vmh2dvPR0*=zo
zf_x32jy=>0zy|G0fYY?I0Z-Ld!J?;&kADL#%EOMb9-ca&v%l`r$Ds9L{7X&q@hiK%
zxbrxO-RI@lY5o9v#eY&jyI#9pds{2TFHm2k|6V`ESZmyE{M6O%{+9du?gQ>u-EOnq
zY%x2`ubVHJU7m|Pu0cKnRe$_E==~nvmEy&r^Y@VVJ2-`xe`zkAhqn*v+qjw~{gC%E
zoU`&TlK7!%9xOT%9>FXZdhz~|oVJpFBSo*ao@?ak!fj2J{=CJ1(c(X@DgJAk%J;hU
ze8YOaX+5)bl^(F3dDgSQdX`$xa_c$Tde&Rdan`fNdbV57rPlLH*7IyUW7zj?#OGD*
z7)~30tG_@;^Z?GDTC@T8uV{pML@P3XMP+8bUW9)Npvc^z-DSq;F7p~Zmw;Z3&-a1f
zgU>_Sc<=X-*8^MOZ%HEB5$la6Vm*Cl#(LKEtzR~lrc9f-YSp-LtAMrlMH7APz0sc2
zV%@#5#I!Y5!kqq|j@9F6et&m&bWL{*Xxps#MwDYytv&r4V<~D=f3(j^nvvYv({X0J
zBifBzOV%f1(N3FM417UP_g1cui?r!k@$T+eM_*T5xUDFxyQ^=jsxX#dNvpcPxKQn}
zJ}^&<Cf6%0RpsLTp1!V)v03pR{)ckgyW=dFro;);9X-zMO0s;k4_{PY)87{xN8MdL
z8^%$xFWT3i#1nd3MMI~azLsVZLp9S3rF}D<5!<>f+T9;p80|`|Zl<=`U6K+_Yz2k9
z9sLRJiy>^M{vllHx#pBI%``i<rhi?t=!A-4@a|?hE1Kv*H9c$N&D5Gm#1qYyws@wr
zwe)PU^=wgo(UK~?MU~#7%59NyTcq3;RW1{KCy!Sd$EPylw<}n!@hanZ$v9pzj#nAe
zWKT+EJ2{1(l0ql2Z_<=`@y`D4*fg3ui)Pq;aavzr@2u`F*sg6M0{mt+@~TyIW_;b^
zSVuh3IUDw%P6kt^bx`}(WM6D!Q_8WDO><*Cu|!t~EuYyUrfut_b+NuxHl9qwm-b>T
z*a_UVo8gW&-Nz#enH|mM#gfVBx)ZSQV+W};RLgE})oP(!sf8kap$yYBsUZwo4?C+W
z>^Ln@C7f(?ERl@za7tIRwWqT`8B16S%u;@+h6c^(?4+eV$=+B;*V?XFC$%M8dw4i^
zvbEZy8+$DjLvl@557?bu$=-Mph*LlJ&*B)kJxMkE?0~bhrvs5A0V53;-_##V_Q{Ak
zp)~hTTXIHsH+Syhm`J0Lwxrb;7-?NhDw8Nm<x#kZ@!*Yt?vJ%4+j=%jmQ(`9Yl^*~
zyOX9^Wl!6%YSqkW#|Bt*PFIW*R4pgqOLUlpf1!MM+RW&>b?}Yh3G<^HPryZogWnfR
zoH*HvJsj4SZ0$Wk{$=QRbo=n?X2+5piLPGui4!HRjrMo<EkVSb7wuh`i1$X<MG<O;
zOFF%s9G)h2o6{X#cY?IpF{xpAruG<ol?NB<9-eBuyw&dE0yE>CTZeP)LWiYb2+$0S
zZ9Ldb&gcRH*NQE{lpzFnu^>)E)c}SQz=C~UJu<39LJhONC2?Cx;cnm}=k`Yvo%7>;
zbK?D6p&h{%_jb&S^{tPmv3Sr}yq;JeJhi72Sych>Yo2}=B+gpj)fa<i9kEndv)7z9
zGn$OCn<OO#137+f+uF1oitp4ud(EsU;#5y(A_|{Zi3?zgC9&=pTrRP-Njfl9Me7zU
z9N1y7M(Ehk$5D@`78`Bv?n+k(jcbo3HV@$~jKvben6uZk^>9Oxd44?J>kwANp4}B)
z*As`SJCaQ)yglBZ;MzJnEo_M9GkUvPH)CQ*Nu3#67wy<;(^det$mmdVZmf?N5<Gmx
zDbQNX^+GzfL*wQq(7+QUaSx{P5dq`fo4L2xY$#|>JaL@J`k^^c|B~oBiBFJCE6Vn(
zG*&XDz|utbY|ML58dxhrtfjscaA<LCV|;VWre<}=q6wRr6YWAcUlMQK!kyY@vzH{c
z9>=i-+j_o&)tM~^g>4k8FB@&$*xR?&Cf2B^mzvkx5ls*V#lY5-cmhYWQ{dA)q4K(o
zeR@HE--5M^qdnjte#bY&2r9JpZ0<_Ldp4rmmqim@JXtxbM8;=f-PsqLlZbCjtyFn6
z#?zJv&yM%AoV6h2aC#aB2RPgzpg60=as0rVLKnv&whjS=had4AE{G#Gd(H9mykz^P
zZrjx*acM8sDl&elFS<@xT;d#zcp-SHy-~1@T|M%QV@)FAM<~nGr(s2{W{Z?P=g0bZ
z<cS!UIb>2HDcGK3Qkld_F@TRRZ1$SdJJ)o~PIMt<RyQJu6zeo~PBfaF9q+(ipr>zW
ziW5F$Xi8cV^OhhIX`0*D#}kTH3)>W}*0w2H7P%=>R=X)uEqhb6l-`n}rSvpfN>8J?
z^fZ!7Pa~!DG+Ig@e_ZKlw3MDkbLnX$m!3vS>1lM@A}m#fRGA{BJt<NuOp#n)idqs+
z;aqi!lA2Sb)1&a7(-429pEgFfsE&gd@zCjxZWX$R{octTuG6s|vj`y|V2to|D&u2m
zUxz)t(vtYn9(JN+v|G}h?Ce6rIkr<t3gTX(PcT%#!zdvRC!?Xg0|O(aj5S0RcXmIL
z=0!KethGOn>y)S!ZiFfES1@}bjU(s`m3KT^*jAX3b{@AblaO#cuaD~nb8XkU{zQyA
z9E^vkwHjaAHVf-8PUfI8jLDL`f<?IN>9Zx7xggPrrAc=iX3j(m(|n9nptHlED5<;%
zGYCu|YoIhnAJ6VQ(Zr~=vkSp`CL*uINyS_ekI#$tY;D7y3TtS|$a7H)yFq)>NMlNA
zDqSWq78Ko+JS&0dvXL3s6l`46y%lSqDB@w%aSCePxF*)w8S6}O_&5L)S3>#{MW!XC
z&HgEQ2V2UMi9@OF>N=hSQaoNZ4donXhLotS@{+E;^b!`V!NiZSni5<RO`y?pctL+|
zJh35_fR!QFmtwT_q;MJB>tc!1y3qPGKBnea53lW0qP8Y;V3lQR;Xgc)2Yq6rjFf2i
zFsWHl9K0lEB-Y7zYTY8+v=dfhd#;o;yqdKAMJf>o2C)SEGP$fP*#&!Jt!%G_(F?L8
zn1}9%0uEdD4=GahxzxEh)*am<STdDvn*e*3&i;<RR085eikKho5f4e@Sp97c(o}-X
zl`|5F=++dk4c@BGtx`O@Vpb3XBbDGBFoECKwWf;?vQnv0r=bpyqvzr{4x8w-*p^xA
zqlqQ)nOm&^BT-3Wfx@h1t=f+(7GM`fj@sbTf(<-g)$-L|RjN~%6Yw$D#QILa=aG9{
z5g6uk(`B(zb&5xVgJUV9)Z*ceWwj!tQx&QTQaJj^VZ!don0<Dp4tK02?D6p$Td{@F
zt=;ixXM5Lq!=iaAm3u}VI-E!jM-=}uIsMQ=@{6YPqFaQ3qBh#z-z(M3;Q-7Ewe@ty
zwk%l7Qz6X40dm&*SjUDrU5TVH*ckTlRBD5hl-(D!x0BSt3^Ul2?1FsA#Wc@@=%S6i
z*6D<u!}7c)Yml>ODy*xY-b`B+TMWkyu|16U^r%BvD-CN0`N2+J5j!kr{&6^PTMO@$
z)iqb#y0NPdCvz&+N(<ECGuaUciv)Fy_C@>|J)OLXYU>;-urLu@+qK2vq8F@%uqC!Y
zcC1N@a#|;Y>_mrCDeqDu!w;m?fhP|WHO5e-Rl2l564-HZs1Q$lLE@5F4`%EyNKCPZ
zY-*dZtEKpwuV75esVyHto{7_Fv8FZQ)6g7tyybnegQrJAhY10Rhz>&*k?>ixA3Jk7
zfw%pNM@qa0>wBEa#=1%Jof+E<bZG6+x2dzc+upVD6qmBDT5G{I5UKm(9r))GoW7a8
z20Pdk=|~RYa_=xh1_M?h5)^qklFB%HjXFX|arjI^&Vf@br*tb}Nup~b@eWa(Jhl<t
z)YXBJz{d%g2jNa_Jv1|psXf|*Ws59lWOq;K_(WeCeO6cBdiGeFA;*!t&q5i(VWq9b
zoY0bWaXhY4g%ZAV6eCoU3&ZA5+H8#*H5aJ4{sfJ(jcZG9wj_sklr`x!*#~`S=LyP6
zJMTI{>XO*T-V;j9UW3ZiKJ^6IPLMVyZ3mf3UUJ+jU%7NLec^BW=Un_sFo#}Q8`#Xn
zv9;D4rIZ%4*UXFetc!D`vtKunbyAVWNiAN}n9|RDOo`LYbhbU6r#B)koxQewm{Z~0
ztB<D*?0#dN&ZYv>9Y^>SZLi8w#~;Jfc#x&I*6Frm#Z-zFB(3wE6kkGEl4IMjB)iF$
zw+v5r7LC?1As^20Vg&n-zElk{`xH^!IBl6oJYdpkR--?e&go1YTBmxEP2IXB*3r-7
zb0~Wj4umi+`A4Q@U6$xdg25YNY`pm8C03wh?VEUAOltKhD4NOM)q%Z_(DnjP2y0Kc
zGM0#^YP617+Iokuc<&4r4|!*zmQkCcFjJ(6K6^Ho(@<!SUs$(}LJ{pZk(}HSuM6d1
ziYLtkspT#Zt5^7}svWKFj;Zq?N~RNS))_2vZSKNp5%I~fLx>9`91^oOb{`IjjaeGi
zhIJqI5>BeJ_00aRZZ5VBYx-Csfulvy(v}*QJhX~o$wR8NQ(JqI*cRJ|UU8|<nL*ek
z5Xf0^S#QbFpQ=TyYN1%hSXj3-lHz^qk)tD;NOa-J9>DLkRb=N7tlo*!iAS-Oi0BQk
zwFn9H%G0=*lp~^4M_bHycn!w^O<Kxt*x;S=T5Wc$y9+BPq_*<biM@y)Sf=xXyAh9G
zyjfO@k|6_^-~AHI57_2xLY%kYvV5J<(Segy2;fzt^O6VNAg`#>I5OiWp~tW{LSoM0
zTyD3up&OnE?Y}rtT*V48Lp9hKZSPvw)6RDn_+1pqnq(*|?N)$2W>Ue|dEwh+i(v;k
z#Tr^C60>(7{N~=4Q+?QA<yx?Y&%vin!>eQ*bFr_8W+x~!t;*wsn>fNyQ-?fIPFma{
zOiz6Fl5!RHJnR=XgNLA=_NoS+gIC!}yVYs?2#GxM!ZJyCacW_5I&b5=wn1ZYDADPZ
zU~e8|K^VuRC9iUZC9`Mn8H|&zjw=vtcyX9ay^XhD!8r$vN#aApq^Rc%g(P*M#a+?V
zSqN&xz)KTY0GD6e9X~gX6}4ww2&Zj@lWN<js^E#5N0w|oRW#<Hq)7HialBNjJ=>+R
z`%)R~;~^!FO>XkI{y<!DY?am-xPQ<Yn}Lnt)?`<b=5=)>;>q~hzM*WsVv<zu4H;)c
zBWG>)`a}^tPNH2s5Vj{(#D8@vgwD2JYpGClf&^=nrKMo{i_7_)T?U$=Rv~uxr3u^R
zr?G}RK4R4IOX#H9g<2ak=?b3BxDjk&9FWB~&cmr^7w#CS*(=F6d-y62U)V_UWM{pP
zPU4@6Na6MfjG?d9$b=DW*HDLV$9a>CHLUQ##+!&F&lMPfDuP3E8&eArxvUfIBQ@ob
zIz_XUCRHJpJRA{_mlvBnLE9q|ivun(r4SEgrIam_9)s+7fzjWDSBS_s8*4INB`jFG
zmPt9Qq3+n)KEgz|zK`O)tJ-iaqpPE<4=;+(jGv2BwC>*Z(b-+=z-dQHACv`HmkPhE
zpiBe{5>~V(IhII~;`1`CKnrvVPVJ>=XV*WpK|GPoSch<eWeVTSNu^>l#;ZzxErhwu
zc~z(8EgbeRALh4wKt`R~Fez`b@Zk>T1ar2OwWs=b24xG_qOhfdpP+PjNQb%@!}GIj
zb?GeJPlzeh83P<bl`G>Fe;<$9^w|Sj1m@bI3#p3HA?(Gmb?n;-_Cf9uc@CekiQksN
zMqL|W$wZoIt##)@Y#&ng29sBw!<euvuJy1e4tM$C3~^_u@JJ(!A$iWjOJgS`xg@@1
zeavo#q&sQs&s?MOAbZnqZ2{PEaioa}ZF6jXY>P80cyW-@S=Lpud=fr)lO1=2!F@G^
zF?0^J;+fSAveL2N=GsX-m)JOOr)}Kwemk;YBVnf~$FnI`$?kKTXTKD;T=$ETRb)6m
zwH?ROR-CrWiylXJsH=-=q{tvz+Sk>coF6+^T8dX{^W*2z#^{!mA!n~y9K+cgLPm5=
zG#Qf<NX)D_hop|aEf~Xcpe@<?!i;Q31mX6<anVnk7UFGqR|gYZr#k*+$}ZFy&iwL=
z6A(z`;5n5gZR^HNZXnNAjBmhaMi0tX*YecF0~LA8#W6zm?sH%Y%tu3~R%aApJYuO3
z$7DJyiW@K3jB^Z>RiTBq_2BplS|R1E*c!GPqv>uXEw^1NH542U_60-dKeZRIyNv9<
zvfZ861q%|gxN>gmD2i*vB|5$ofq&SfhoZERVz|T~$L|=#@S6oqv<5sJ?g~UoMi>5V
z>rSL?!9PS4g%kokbwR3MawPFj<Z)UDBznQY(IEd@*yY1{O-S7e8I)OlqEyx+iT}8E
z$c#Rb4CZX4ci?++tOa9`ELw^i;_bL|--^5IZ8Qg;R+<gXm*DRG4Ded<&z7a|<{=b*
zx;8CsJaWy3{7l@@pNo_f&bd+)=Soq?<!gfub8!2gGHeVv931iv&eCT=uf@ng88*h!
zHqO#E&Kk8sb}`Ccj9ODTYm}l`qZGxt=Ae!x_~3`(Mx=1gm7+LTibAf+dFWTRatOW1
zJ`qAs$As#KcXZ<);r@3LA>>OSM+~0D9sxg_`k&@Gm)66B*b}j&vio;wDz~i*`&c7B
zczp{g_PWiYrK-6O?d}r4j*FKz!6SO`uT`-ptJ3R8J7X4d_TWF&$_`Mf-F5ihB>$30
z9on!KEs3L~5U6c5&f;Q`V{w{=qhTCb)^Sfl3e7uSW3D*_J=cqt?728S1<ul6vg%Xi
zH-NJZ-!$0{*aCPqzGScf?P*0nu7a1h(mZ(d0{G4{p}B`=qJ3xLvjpEgScNpchP(<i
z{L8l<wf4c56tJ-|7|s36$x!2_71HEh!2dc?Whx4&k=7^PunOZWE-`?{e31l4h$Q4V
zHl)P?&j#?}0X6N=f_sX+Ya7~;qGnlTPyIjay$Lv#-S;qjj(I%hq0C8?c|6FFIa3p5
zC}gJ0L*_B1QYsP>N+d&tM53fJRT2^*M3KsnA(_9m&*4$e|M~yk_j|wJ_g(+*x_*wc
z?>(%&_S$Q$z3%&7>)iVWtAS>({g0TSl{5@y;R`y5XxIhV2$o9+_4j}pWG|4uu0ikv
zgd5P~2uBB?fuE3f2Kvz490?@{f&@StNa0Jp))NCy-~M+v*Yw2+ApBw6zc6gj1bOWN
zteynTCF&*8N6dyb?cfLg*g_5B5gH%EvEG8T0ZEEb&xiEo7=eCQ7y<SBou1$O`TpLI
z6gCVew*xvb8_Z#SAd196x@(qFA8=tg)?45WcQA$rXbRN-*24s9(b{zb+|VK*1?%Bo
zeK2h6ICY^Hvf#cLtl)a>9;ic-KyvzHRBB|${h<ZJ@VE1hpe6y&+Ii?7Im_V%z5mW{
zUpP;#pB>ip7@a59Ytg*d=)s7ubLdaG|Kpf^$d>#I*-#=*iGxPLmr|U-H{wwm>g@lp
zg+yx>K(I;3?s=@*1JobA5p2zp9t3K|!4_Fzuo_a3cY<fS6yWJDX@HW3oIOZM4rC3#
zeuwA%<lv(S9JK>0A`KsVC`mypf`;++iS+$H#RIb==!FyDRsecz;Uh)3c2I(&4CL?_
z%+Y_>SP0L*8VRT&M=%)A|L;abBf$<-+;3kMysy)~G1}B+BWryQL&^{P74T!RROFB_
zv7s!EoSy`XgA^+CDcG2;uuLK}Y|P$RHYQgR95)p|hK)H0%Yq^2$1q2x(y}o}rmr@k
z{Pop5Am)Z%L90ayge~$mB|yB#@?zi!Xd}<A9xtsPucG!RfP1yvNk)lf+7Aylk}&OO
z+K&n%R0Ig-$nRwQ@FW|MXG?;^!C+MElw`yLlL#A=BUBQ|#gW51wWIdZ!jzzA)PBHC
z0}}uM7I+Mhf(S{dab2r{N#YQ4EE&8{9I*i!D4{><00WWGQj)>&@K3@dLV+Q{ax;<u
zB$k_$5{skaCjn?i7Ay;NfbnbzNLL5uq$DL$_!nDNX{2GqVo4B(c`;NpM26wkIgYZc
zY{bDBB(TdW$tpCl58K+zseYe0HIfry!oVarqM1;E)F`n)I^>ZAX;7Yo0tcLB-hrbe
zAxfB-B4OsNN)NzUFjT-TqyQ9%mn;}04I^s6gNQ&y5-Lz4V73r22?xlKq}CA7Qv%pu
zB_xx`M&L2ie#kOK-lt?^imb&lnL>Z2$O=OGh>+HxG|HQhzfVO;0<BDukAMqQ6qF>)
zku5~=`a?Su2xwc7ra^&}21^BBdLWY*LjsJ&V1YEIs3=Md84kzI%}q{8iUTdjfV6Sc
z7*ZT_)M*?KOpX+b<Hk`_k}^e3<KPRTB|rffH3*j}a)v4DB5(p;)JBRH3Kb4@p~B&q
z5&O_ABCo9-L2F2GOi@W77h(equwgYTOi6*@=T<rVTb7Z?W}<Fz(<5#D3yk)+JQ6T!
zA*@737K{+6!8+t`*;Rx@v>QPQ*P;Gs0&+ntAYjDjYdFvprYLew(Do?mzci4Wh=nPN
zo?s=o>5!JKEpi&fJZORrRQw=>My9A#SP`&<p@smtW<(I~$g?0S5~e67#JRt4tWKVv
z8~~84nIda&B!8$6jv6*3C2Ia}I!Yin@)Bq&*a`yr3Tk9G5RwW)`4O=U7#|VJS7Dx1
zFi}F`8azpj<H1p)sb3-@h@xMeMC5${VUD~&0jnG)MJS+@DGJL>Nd_q*2F)X~5&nUu
zs11PSEYu(#adUDquC7-CAiR1B0r0{z$5b?{aD4m}&=Xh(tU}0$Ojtz=3<Yx-#RGyy
z=CPEx6p0mJUO+(5DgX-;xCq7*;U^qWCsa)V%8hg!BoZaW17AX}80COl+&tU}E9yrL
zwuhJ_qk$s9Iy`{2#*NMjBnaKsRT`eJ(SRyQC_p}BV4w-|Vvf=Pu|f*#0v$*}ccN5D
zdBG%5gL)t%%0j|INeR%fydJ@~hAFa>IWmtP;FJ&?nl>_|00zLcU>nhtka2|d3`-R)
zAy|Akc*Y%&5DSF-BVrzzJ83MAgOUaW3it`*5Qo9RI6xK;j)#<nV7UnPk&TiZ&KZOg
z31Ms^J#;WIdQTQ%WL8RYqHTo}5KM|79~@dQQ5sZm=Aokk-lG!{4~}Z}i_RfnfdB@L
zMnyD+%#r;B6A+~Xiqub7z>o#g%Em;jBIsf#T7dhRM7SxT7x03}ShNs+BM+T32+h10
zI!bbw=PLgR<_*M65B7ze9H>UTA^}=Rso*3?D8hJD0+dKDz$P>UA`s9>0A4)+gVvzw
z;fzD91+7I=AjPdoVYLe-1r-$)DeTk4kL8Oz2gZmB%qx^(7~l*V=MUV(0uIbg9s`C*
z6tYS{DJh)B2_&r<gw<0d1tl2_KuSZfUH}J!y$WGjX%hdiH}V>6D1jl1#K7Keu;Vld
zBv9UGq9F~Bx5G6L>}*hTU>h|<QRCD_>^7MVan@E>4v#!w$m%GSYyAAGTqx}w#gOOa
z!_G$*oe~~2)di_;peEbTBS2bSB6(Axr!t!Ac=CydJ0z~1e?oVj4fASTq;e)T-(jWr
zV|x$RlqL;6;9=iT@(GXheUvnNo_#eJXrLYEc%j@pFY+t>Ez88^Un$Wk=uUAD+&S36
z{e~-C*BZhVZxB3(kFLsO;0hQWi63+|yq1@OYvAA8P`v_tWqyPBv%fsF$zx=pmo%i(
zt8l;LSgRu*(N(z?eB}YJ4BVTe5v9O0qzS1O<aGfHx@wn#FKU;C6kVAs0)#x=-OI!M
zuM*TFs&pWyNuVD2Xy7qxxTe+wN)R;&7lPJ;k0#V3DiO3cp{D}0DZob;>d=vRjjjM#
zbO9dKC_xW|TMK%i8a&j%qt*mkh&0OqMl>630)^-f0*#{yC3t9?K%p%3L%lT#m=F&Y
z;e+Ofhod~yY7n>$4}e1swW84x&$S47#3f=0`RH^3FXDnG<j`CY7Z4xd0dDwc0wp>G
zY7mDIhY=j&1R59d5l{G_F}0xu&3}y!#0@2=MY5CvC<Kp2)`DJ$GI<ymNdZwM1$YrH
z(f|h!c>@IUAR-Eo1kel=3AnUjWTX+g&;#+9Sg(lrpR1YnFi$y{74kvY6ZmBdtH%MT
zNB4z_kVAKjNRJ%hUP}hP=+06Rppl%>s&IlF@-7hd$sSsf-V*OYrJ$b!0Sev6+d@eJ
z_#*`)I>FZ-QhO-jp*K8sPr#`JxRB1-K^swD&<J<}MKaJEeTWpJ^@m220eC!6hhSvj
z=m7AJfEA5s52K;`U^J2v0S}TOvII!WkhBq`E!5dT4Wb#P@=!we(n$a9;De||8fOQ1
z>|kz=fB~&jBx$4@PB4Nre3jrU2aw3KBts~p6n%*+A8`Ze1zHP;21GsbL!tSh60%8%
zKZw(4MA%IM#zQ$GSI|sRE8-~PKe9KDP=n||UIUbKB#e)Ef$S1$aa<h@`2Y|fkfx(m
zj7G;}$j~k(WUw13GUAY6QG#qc87WFoB^g}sW5_5_g0?{+qecl0N?=cM*gOa&^eDlh
z1omggkTIcz86_+zVMPgSIE^8L_fKHRV0#q|87Cy{|LmiuS$E6Rt!HI0zZGPEFUVnN
z*4^%O>sjcrUVt9!1=uwhIYN<Zo@Om0v!0b*&jRF{)17851CVQ3fLzN073;2cy7eqj
zv0eZw)(g;M-OWz7o`oLk1?aI}fFA4aSu*6E-H6=Xeh{D`y0JXK#pVUhFCQqguQj3Q
z3i2RIz&X)ty~ld>T93bwtv9X3g8oA00@#uJ>~F}{tN#nK^`<pstjOnw{LRQuNu<jG
z!}<40<itbH#*Ke(Kpth}-*d!pt`kZ`b&PP@cf_!-`L!ho{$S)|N4{#t^=f|@*zI>X
z<a>tSumM&-4D&kN8uh<nMB^i$J@Pd3uS2dm716ZTo#X#4z?yIRH^fc^H|a4T6+$Jy
zBSu_8u?!zT{1+3~0T8E%fj92;N_)aJ5YfA8Ly$c0dgB`FZD7)9%E$$)u-=Tkpx%HI
zdGGyJCqwk6qtu2V78I*MeBJYZ*3Aacdk_SPoXTiG6y`(5P4Q2JM1@9*?fAc-WZ(a3
z$N!!dW_13OfUzMA4YNfu7a>*=o$qLg*+T;{z-dDOLXLdI92^mFjn!hrB0LKKA8%kG
zT0v-9NbwLS(Dc@XD@6o80_;F%9SJxhv}-zmWQ!tG@G~_yB0XFkY^}&i?7yaxL|sL)
zTWugN9~1&uqn(}D<L@NV5vz%-WgD?TjEbR{ELz0~3EHC+U1=j(5#z6$iJ&e(J|ff+
zK-Oqm2a+HHA>li~?0gCHL?of}9<dwJTr>)b<E#$v4%&|RixxBz4w3{4LjEoZR`}s5
zfp5P{j(xq7xS-H2f+OZHSj5LQOChob>kJcILxl+Yd+>`B^;(ZmO8@{dp3VCA1{AcB
z_<JQH{_hI_sgWxt81Tyc9sIvrGwWSAoq$NhJ46Z685Ffg)8$@oK+HtkLN<e_xl-$m
z4nPrVLPH~s`DX@8{HqTCRl7F-D{w>v8tq>Kt!WSQI;ORLzg3}7Bhn83-x)_-j(@J=
zZT|#73|AtwXtXun$o=nw+Q2#>>gzvtA{r1cSm*yd(&m2}i5Sg7(Pg5d|0CwV1KF&a
z3ZzJg9~=J(GjUOi{8Q8Kb;vFu-Tgxu*LX@agG9T8EW#Soh+TI6j%TgQ?{x?_G8sXz
zem&vn0Od91w}I6i1PIacvi`l(|1P3`y|#WwzvZ9M|5q(${;$72;r_2x>n32+KQ;b7
zlp{vupFoIa`_CV=@c(x)b~H<*P7?ne08!We9)#aSG@k$U3}FK-Ct5Jh^-%44FcgJ_
z+1DFP2;w6~i#M%T?*UmNvyKeN?;yXS{4<`+y54s^SWJfQD@kBu({)eHKj%oKF;vLf
zp(_>~I(4l7REZ2+LKw1AbhkmgL`EhbsoWZQtn1b5%z$tN^n#uk{`FsNtVQ{W5n5!Q
zk+DIyNRebKD=QIHkig&g%320q5lBkGLry|LP7U5taQ;FVh;l8KM!|fDgo26=HLQhi
zpp6jvA)|m`4N59d@(3k0C@e$>-jGr-nF3ZEDFw3|v_vtHQGnYYYWE|!6qH;=$u+2t
z%tlEgf?z|rLcl`wR--B*5(-j84)PlUMq*wbe7{7Rz;%l7bOLG-)VUurMyO^Qm3|@0
z|MI}oVTt#T7%bd7lB1hQ;2suB4xVo;4>>thGwlbbB{;s3`xaQnBm$KXXCwq2MIiDC
zUglNjFl5=7-2seHyXFt3KoKNx3u8!`L{Nqi193s*s3kgy37DV-#R>rv0HTNq!UA;Q
zz)23!I2<iMwDAyo;81=Y0Z<AMAaY_?LTD4}pc^0{;f8x)5FXqUW1%0jA_xuME)scy
zS&>c(q7|ro8a(I77q1B3a5(Jz3uGq)geQ=@mT3<mHG)BycK~jP1p-}=A{RFaj*)o>
z0U7FvkO9Al>Oe(<0${{Ec!ZgZ{-T<jz|+-mA<z+-M~*^!6C0rGx>_;*mIn#}tPvd;
znf9Xts2cH5K|DMn9%_hjuUZHf5`6eX<%8G`^xFd%KzukRQ(!i7_Ct6N%Z)=Ruo^>%
z)1d+tjs^oUL>v{w?Fd<V96dc`DZ$ari{ZxM7_lg9h(qpfs0JQ`ase+0IEhn3&T2FW
z=raT#h)V#1W>gS!!ZAW69flM|(@>TX2g<|^1r%o_gxDClfnKJ_B?$OXA<Cf*76%ou
zF!CzoSF3=2dY~C9Ajb%?I7SdnWYJ&pi!7ofa4Yf>k^_u%34&AvK3@V1gwWDzj4kpk
zJwUEY2Y_H{5+Zmsgp`Dk(u33?3PwXbART}b3GqO`0YY*xMg@FPP!8PsYbySGWDlka
zF)Sd3NWmq@f!KhSOTa8RR1go35Ho=_I0CuXh`?82_5chi42^(M2^HZ076U0GI;<V3
zR?8%-M+nyu+93wBnxR_DkgR3sA%=@^Kum2l2P~uGCta;WK|VC(YUnQ;_)bM^L@N~(
zG>VO|-m*bd&;|b4`N;`=BU7L+VhJJeN52sT^kA6C6h;EvKQ|F2w%!XVKonp|;o_%+
zZV)?${(lD|5Ku^%^DPMTpjA%L3A8dnAE3a4XoVxPFj#_th!O&}qwpV!rh)#TXdgk@
zv7q7<PzOcABH<>(z<ME=s3<VFoKjd)FtqSbh+3|P=a``Z2qjh%qkEi;{|zi1=pqje
z);hAV#ITz;kk=1WK&m1_P0&>|2#^g@?<CBypFnYBKkPD2SWpDL17_4v648OJ#*&jl
zG;lS11Vwnu6SP5)Z0)>-qlX2$uBRNZ`iM~`2z#UTyLv#9Wn?l!vtIp$3yS7~AW20q
zIPgO<i9m*mT4c@Yk%=IiB7%OnKu9YH=_5i~LoI@$^2j<7%9rS%ytY!fp$eT6MKC14
zR}*nvBc}pOo=r##0fZanqJ*eWe<TYs7;ryIL<k`LsDVf>7Jl4-{&-QW%anxO%*WOX
z?bWjObQ9sRTVE{I+IG-U@TTS{i$9(M5aa*rhwG|RQZjN<=ub|Oa8M$aq@)z2WC#_j
z?ea46vU1Y0(g>1Jk8<#pm)4S&SCG+=Qj*ful+setl~t0Kl9thsm629b)Rfne*H+R{
zkkV1oRFu-ykkQ6#%E`)UDe1^-X=&nR<drnF6{Hk&6cluo6d;3F(9qRVP*9T5RMgVe
zQot+8YD+5tW;uCzX>A#4DOpXtri_fPhJvhuww9)*qKuTHqO1~LQC?F+PD(~cLrPIs
zOG-*hQCC_X4q7_8GK!j-y7Ed&8X5|6y1JUuI?~$m+FH_@y0UUIQW~;&JYG{nTUSQ`
z;ZV>~(w3Kz!b@q$OKHjKXvizdNNXudY3k@o<FzzoHMDeL0*bndO4{1M2wf>91;{I6
zFi~N^;DA3EjJBabI|UG)9A14I7ao0BePZlC?Ekm2|2VKe?EeP)B}`!_7~lU0;om9*
zR}g~ze-*-iSpDxeH{QVNqkpoR_?VibkA%Jl@hPGIX!pNWyM2J=ZhvR_nmLz1PxQgV
z-2dVEzm?~Kz;mDf70>@;%l}`vo(TZXd;iIK6Bk!^UkO4TJbn(!{vXEwzrc7$V7$$r
zjQ`IG^xuC1JpycY&<=vFHC*lCB0UiHGw@j3xk%>UX~pg3<?!~l_Of_eI|n5tdqoF3
z85wy;CmAONdqrDWxWRIgwS$9#y}gp6lC*-9yn~dCovp3Bg0z&JlbpSiy%b(n&em2|
z$xcbu&IxW&WSsC0N-_!x3V>K%*4|!53Gaw^ka2Wya+I>OwU@Scuy;~&!b{_2<fP^0
zr5vSf@pjTm($Y%uc6bE^yq%q#lY*R`y`7??jI@ljtfG{YgS3N^gPek`gA5>s1n%Xe
z<fW8km1N{#-y2&eyqvw9qJp%elaqpst(}tskRqcb?dTw7D=R1EC@n2(2Z^JCE#5&E
z3XafC5eUb_9h<#9JY=H>uYQ);rDF;YLK8OW7hBzAP4$?JgcRJq;#mLM>h-s+l9^B!
z{<S{*0J;%=1OCUt;Meenmjb{>7x0oN3?*!H>IlzpV=!D;4EvvO1XLP(^ofAd67mvK
z67VdJEEXd{D2O`B*eOZbD>}*HW#QgW*1_IRUP($(4tO9hZ>tCl!z%!@Y~krOc6d+x
zAIJ&24Px}M82WvVutPf9h9(I1+f#6X$NYVjB_&}~2^W7m342d>Nl(~`M%-`htpSAM
zUnOw|Pd^XXt^#?i!DkIAc&{U?!D|n<`6R$3O5z55j@yWj(ewLx^1~zdzK;BUV2shW
zmVS=PQ0d7J+lU15!^R8lzNY*AS05YyeP<Qe*nnWX*S8}S<A;#}15rBsYvKWxqmLN>
z>c(HH9*+JnnA>lw!xZ+E_fQ2X+eynhIoX5mI5@~llM^;MM1)6H5}onCPhblofJiVu
zJl)Rk>dWs+-2Y6BP*&v^4v`8I{vSX*a335~e{%mf;$hD=f5$(_C)WJWnLr5^gMKUb
zJNJ2hn*dRN2s>XX|Bqq%d!ldacbc`=RUWp%0PXSPU)xWBe|6IbP$7QeMl-835nF3P
zW$7?siT?rm)QN?6_5CRht@Ww75_ZJ-|L4r!p!Y-mIkWBSGg}jy9dW<3e~{H`%l{x*
zHDlq;e}B$Md3{E!vikqigc7ir$g{BR5dZI6*zwz=7gO*%!A?^Af1cIWJ(Yj$b_!=&
ze!^B{=(Raw{Jt)(uo=DszpXDi5&7|ZI{ojVfZj)KogF0zCu1@Kk5QzSmUyZIpFRe&
z1&fI}N?<+-J#5A18L+m^75KWT^*vzkK{&rTATT5NJujGwe+kA0GvA6H3;BCz<V62p
zb*6?B7}`S&p8Y5I+HqvNU^liuF9F2C)4LjV1{k2922LD=a{&eeE_gx+8gqERs0sy!
zkL4ZT?odCPajklvzQ@&@RRx~*`E84sadeX(P9SkQH5}esT+wc=SV=GB%T}+Rb#cM>
z^*K=&(fvGO$_1~xBRDb)yNz*K$Ciz2LcVUYbdlw$yIyqtOKpUAU14<aUAZ)y1Cx~k
z<W&J)jlbdqpO~v)xwYSA89e7Q2S#Hw*qWm;SmQlFBK(#LgZV;%#eDgKT8Mv$QuHfn
zVfeCB!e!J5v3@N@zs>%~KbR!?owcJ1JU$NnRH5HK6KxX?!^LXhV|RCEikOhP(_)ek
z{y)_W`N+K->@X%fHDu%!FsmIz);a*eB%cqOo4-z6jCd2eWNExdTT{*(gSlTtX`a|I
zOBv3hNhSDQmGl&Uh^Nj?H&d^Vbc|BWR9iHjZ{XhVJ#OXvA>`fOg8c{0K3LA?hrDZf
zXIZ~;H4Q((T-4V$wYU<IF+A0~5HzkjJm%Z{NI?HZv(W$}u11|@NByPEE!QqQIXoXd
z(I^#&qX;}Ew)H7~95b@1Uy$l_K&+hVso?_F))z8DH^*Ics2HXK8io6`s%Qpz9y(<2
z_%cZD=s>zVp>c1j)w_DWN0jcnYz7kVn%NpT33pxHa6<WEg*aZpPpI^ONFQ!u;{_T?
zT@o?=Wil_?i47O1yvWF~%$RwMXV%5ouPyV3AJR|ZRvyr|G`&ib-h5`OVC?a;7s@b(
zPm~)Ta&6|-`XwAQ29K|P^3u1Va%3EfnV^a}c?efL?4!>?Whiin?4vGKrq(a&ry{C2
z{f@zei;TODPw>YK^UL)|ai2Gw6cCH@5{TjA52g4>NkuxXwAnh-@DgKuG@#+&_v`mP
z#gJ(@uOSlar51CPKa}KS2-OXG#q8tQOOzj3sm^N!l53J;V>@XcWRu2N2`sWdJ;!Jr
zHNg}Uf0Dbk?t<YN0n;51n4T^%K8~4SiLuq?PH=cGbc6pY?xO}(^Nufv>1L#d5;UoD
z7$su8L}Mfc7RhWwSa6N99}{XA<Bxku#?%WeQffwBFx(Wwoj`J(`zaHnM~s&`0rL9!
zt+CpvK8+ZvqXIp+kGmOzQ@nS^Y)D?DzkX3ESw%i}kuiL<`SL5;QX$c3MF*=3yh>Ov
z+INDtvDiqj9o+oXdni*dDYz7dPVxtsU!?qWErJRdh8>Fhyi(j!Y*HLWWJR=Im<gK0
z+%E)wMw0EQ-{WporC+{>Zy)!IJDH*vV;?fhALc%6aBJwp_dWO$x+03A4PKWX2M7*p
z>U^R(SDCnQeQdMvtMpf-6VE=JW_&}zNMcUYNufypfbIc#AQdOqM~$B(;S^UXLrEq!
zsh%Q#!rM>bLQjQ>AsxWzN7C)k+kxM~7rD8FEfs6dGNPkE`ctRtLgps-#%fHW$iV>;
zDzeS+tDh5*GCSNa@mMfA?hePMXm_)4?BM6ezF~Sp`-blt$t`RmW(p&Eqqym(gJG%c
zd-_0n7dCric-=ad(*9~gTZ%%=^D+T;nD$|@7r!p%o2$#vN%6w$DT_FZn2UIe#NTCp
z$EuK-*UzyCN8<VEE?^o+{76|zKSkPlV;yMvY5LXrH}uo@^I=Xi@KazIA|?4*8EJQt
zIFKll(hMHo$+Ux-ljIiZSxO^vG4k&uS4j?G4xMKZXvSt@Zn|roqQ553&w7EbfpnT=
zC-ykz2DS|-`-Z8+>cLBY%Q4OHB4MXd&7CyYM6Yq~fp=G@v`btPBjYCRAyFZ(qNt(_
z#ZItjp5Ds8P2emYaS&rF;R2S<Da%Z^-EV~P*ja2d#&ct<c*8ImZB}1zbPA@9gq`F7
zsRDKvW{kv|WM`I;H1+|;Qs~HM@zZ=0zqCaYAW%C^#){33{HjgbX-(JQ`o#T-R^-71
zY%1+94ykPxJ8oidq$>N!vT^02oA@v1oqW!A0iw62q(j*oFV;pTMb6}PO`dBkGqv~O
z^dj-Xd69c@O)ySuYLEGnlgcO<N&ZC0xMNEybDx|^E4deWe_zcd74kxTypSH|#D<#=
zx+k~vMbpXpVE3fC>c*2CDtXm#R;+1W{p#mk5?BxTu}UvS&B660l~9ixDJS`8xTit)
z&W#VSPZ%>SJ#bRdcuR?Eqi&yybdEQ_X=sUHEO{U#e&Zq+$t&}ol*=s*-#A~B$1enk
zrE{DtiuL6@cv?BlN0dGG{;om`mCXJOPpXCLlL4Dt7U*3WTq=0H)SgY<Qf--zEL*~f
z#eY^J;gC|H=zl)Yss36_E$L(DQ^hUSv{HhX)y&xOn_QZ?l;%Y@v5#xkcQVc!KjXph
zJ~8H$aD1@U%UQX%|0ou3-&$iOcsnvpmOE^d<eQtHznI;3@;0%o*Nxw8BVzp0`|+=l
z34ZnfELmH)n-N3H$LnJ8OB}Bg^muCq6eBkI2eQW5hh#+^l;U1`V$NPa$6h~R9)9o(
zkAi3YKp)ezFxQ;lju7_xWqpSqUOSk*3=ag$#5Gf7W6JFwsPZS(wtUGhR(zLB8aFs^
z(D8ADSUC3u>YkGywJ;WMwp)%-H#m78s#X%qpl)#V7E?c8n~ve3c1`F#UF%(?{4IO<
zTQ<j+?0^>i@%+SIW8p`YyMh_gr!~{3Gn7XjnU6M-PoK1Y>vPC6EV5f>5qnKC?nbCO
zdwnivu+2+v500q&#rE&d+p+5{2`L|XI-r=5qdelMJU{=<YinFC{HUnh`PU)#*~kYp
zdvH05#gi|u{j`k#nXMUXR-*XYOewCCNhMSMGpPmlf?>_T1M4K^Lpje1EVxHM^0U{^
z9K7+2^4o-fa;QkD=F1j#dVBAyanCHcyYVDqxw6lOrF+O9khVn#Mpep;Y!HhtV+mEw
zq8O{o&XqYt)^l}hHO_9Va0XA)s>(UWz}Yn5(p-n}to1qy47REDlI&M(_700DUAmp>
zC;B9iy?$~_k>b|^XYZ>KEEe4L_6fV@9oY3kWXK=jU3<oJzfQQm;c`<;ua&jvxtO;?
z7s+sR>2-{sxL$~ITy1gqJ^$9>FB28YbHgJObIPGnIGct6MN0OXFD^=V@@mB-$U<KZ
zblMpD{o2R#*eF)g+57u>HnI4S&j$VO=1WsNarR+m#fo1KHVt&H95v^z_Z0WCIWVux
zUawSX9qWm?ZRtVLxpOCJ{k&W2$25z%;_!p!+~3NRYL_tG<|-sbJP-Ju{RnrW^on>F
zUXfUP5PPin0mor{A%l4R+=OaeImLHd?}JaQfukkoYl|a(e*3f%Roi0CbJ+WPCZGQ=
z4W96wddtE*;pVY?Eg$tPxH}e_#o~XCbEN;|Zp&NoX4m677F`>L6}I3Wez}!>ob(r4
zAf_N<_dUh<@eLq&XNw-3SA1=YjmllY2(0eK+bf&m?3X053=a2aW#VqAuAHk4!<YfZ
zzWarjuI!rkXFpHYbJ)Ab#`9@Dm19#tRpMJ8wSEOrp6-y?+TzCn{-5}Eh-+F5&RwW2
zRy%LbJv?X+svrDxz~y|#x3|OOarQxyw*Ibj2JCv>vfL9ift-o)&S%ukxo4`Kyv0`N
z<8FijyT{1J&vPl2t?Xv6pL%2S<e9}nU*9$PtMbd^)UN&JD-q`0OXtoj&#4zHs;O(O
z#N3;orHwoI#^@aPLh`eLPBn=*`-K^E?os;lEN`>b=EdS?KEixsv2k&GPuA9ZZJaZT
z4pHsg)6Zn2oZNOv-LBO>%AR|;nrTAOeeUYbMe)Q8GH%bBFwP9RMR7q-I+YWRHmAd$
zP#^8@RM%whdp!^+(Qr6$;{>_(VDlA{@h6{F(mswDEx)I0ChI+Z5l@;?n=d(eDC<Y=
zE*TXD#c*Az(;s=Fa%Gkrv9MlN#FX~ZbB|tUiyI6yzo*!%-dUtLrd}o%Kh+V>^5Myk
zy7w8ido#frw577NJ!x64^a9<P`=0;ogZZ5I3Tv_A<#8Zj<zvmjm%D)^l7|CTuCc|+
zc@<`I0Bdhwe@rg6)GHQ0INa>o{iJw>#C#DKH~8L;>=|v;%Bu!SlJPt%Nk%g4c+&(O
zRdiI`hTe=?@7pJ&s#07Qy*W-MV>oPAq^ejIGio#TrIvY7w0?QEki3UIqQPs!#ExiZ
zfBL(a_{RsRo{2_DZV6=X@KW+BP5KpN!a1=`w~z58!{&_<3RgeU^mm$>*L(FFTvk2j
z;9VtoCVJ-PXUPqBNaD+e%}z3Gy0TE5O2<dCxUJ=vbIX(1lApq#o<$Azp5PdgexfHe
z(s|Ro|H#QH#f@q-fog3w4SJ;N4W+`kUz}SacC*jgcXeF0r}(xjF@8Ai7-;&Ys9NJM
zoOqueNoEV~Onu;^e9~b16Z%s_&AJTg!*N-X&0(MCxSCG$N&4u^gqfV>qkkHtyYT74
z0@=*wd)Xds&WcMSBYw|Vobcz$ujhs2oxDBW<d*NeRoqcEtS?io(xeGLvXD02B#Rq*
z``q`-y^}BQ<S4gH9`!BDQkrd<HFVvoX*p#f7j7fVESI6*SDqVeP;pD(<WHmPymgYT
zD!<;|klk(1p!7-7@&K2m7LG$*e7|?`-Mein!Y(5ww-jFG>E#5<<*FqOv@MbhJkg=`
zPyc$==wMgcaiw!Ex9_y!^;||0^C*nf)vwP5w3-H}zCAro{z+iWz4VZv-SybAowCup
zT}7Q*Eh`f1u5`3q$=q~H<8@8N^{ulZ%GPzJU$>csbTs8WzQ;R*>8IP-=b7U^ea&4(
z=V<4-<6T!3JL~xJcF|hmY4cO{zD?j=FFiEOQMvWjDt`{!{#_%a^W0<Vo1^sEjyWcI
zF54V6x|g{|cYAhaUYXzCwz#3R%yznoD}PGR{UT)n&O`1zm#bKu*4O9<**|2xT<jS$
zPX^aq30YCN-pNoWH^y>Ofjx|s^u@SNmb!Kr|D*y<N6FCClwr%4`mVNLr#MF|(zSLy
z&srHX7+e_Crk^^hwOs{Yn)O4FI&i2pRKcc|SMPOl9e&He2g=?|vVD)`HY}X(vU%~$
zq~&LS5aTFk7rpPi+GhG$m#Ty3bAx9Z!wfyY)Tn=S-BIX<)2iHka5-M~nU7qo-fPQc
zTyxxI(FZC%y^}?}=X**Pc{1=~i9sqpO_Ne8cg??!Of@*Zd^S<#ToHFy@8K1zlew95
zHWPmL-^lh~+<v+AIHf+TL0*-NITy9S<TkdL7mQhA(e4I0j2wnC2B%644pB#$zTYpF
zc=^J%V$+M37Mjm%w~g@U<trG{WIxO|$l94;rd7(CIk&Ai-!fH9@*-nWcGel4q;o9>
z`o;+l3XKkJ5zsL*7r6cEqDYe5Hr~Q>1{>{!CJm@Bie@{u8Wa~A>iXO_+JF0kOa7TF
zLJk+q570|Kcg%jEJ|cPGXUEsqmrXC{&1>0<8h)ZVd24ghfB~D<3!(c)MmMRmwYS_B
z6E>jsW0aHQ(o8*YkU}nQ=MRmSbrc4Z*Kh2+NcQz+Q<7M6<L27VyuxiIHfLU5dKi@d
zoJK$A%*=r{`>o85#hM0`r!Fz%N9S+duat0R)9L8x<Wq+HhhG>azr4`+$<dLq--Suv
z(f@?Dz=1}#E{!I$ttsBM=Jp>pnqQ&IKS>u%e%!$Og!XBJ?S^MQpGnY8G7u2YKTxw>
zX?j<lk@d4+At#+wiv)VrytlVrx4n{~x4p^z*5rD$*;4H`%Pj5MuN|+Mh0e<Ebs;$*
z+=AVCa_;7)+UdMYjr*lY4A@L5Zl<4Ucy3@+V5(1HQY+;xYd~>y3-y-+w=U>YB-*tf
zHuB&u&p#P><`V9>`Ci(kThY!*nld}L-94~H##penou<&3w4<!T_Kt{efn$k^&bGI=
zE=#E1yXRgP;c1&B=V5nlq_cv{t&hXs;Me>9=-SdyA1P1rfK-$6;I?<IFG_j1zLjTN
zEY1a0Z}S@J`gYu8OK$3kJH3@lnr2~fCT+>O!(u^W_ro<}1~E&+nE@H;a>~B1@0Vst
zFO=M&QvP)ImfZKGM<ZSOQ;$eZHM8(L3*RK_$4%#-(fn{pCrpb(Q#0%M4Nc9bB$}IU
z2-<5tjehowR4`iWhSsL;hJtJI%&FO$Bu(@p7Ynut<wst4a_UJxrm=rpg(e##J2ML}
zGt<yJyIm=K%*Mx5bFw-&F-)?$Op$Flpr3x9C#i5l^4ppsx)#h<(zv888ZkFKMd-d9
zkTq4cFjZ`S{z2eQ_>+p43`4x?f)Rs?GT+@DtM9a@bw6NGS=?0nTx@S%j68oq(=D;2
zZ#!+6j34wFjMqnKw?*To?-(n7`+Oz9@A=b|^Ns4A<K1a$IfrDPpDI=}CjaK96KzK6
zye0eU!i3Y3-3|A_1C_ZOV;j`8XW4Im5Sep7q@C>Oq;Hp#eM3`iCyl7Fp7QRu3p1b6
z+3Y2)GE0yByuV?FBXjnJ$d_K5^u1r^J6etzR5$5T7*&2?PP(5|`+m}{xKP%}+Vw<?
zenYGUou#pbrEo_RyOn(El3nh|eP30M(9p8)$st;JvC4tUh$f$Q<*BW-D#z(4gPr8e
z+Sr7H?W7Amat^f^4U_KuLfsx|QBY#T+w&`f#Uf1iN8L}ytixkfvxcwkaCgsjj$M;3
zg@wPRj_vSe)|-x|$w~)1Zl&za%j)p_UgddCGJR=$SNQ>}q@!DwD{gsq8}o^dB|mrG
zbze!^GgrRt<4T^>Rgq60l{3lDkJ4)$D5zh)SE1IQwe$nGy{t2aPbxDp;PX3%S*wK4
zZ2NtL#Fj~1oZ=sRRi8;`Z)&x9_kq8q=C#0FUtjl1=*%&E`^$4tdgspu`qhum50>J!
zMtwg|=C2&jZ@H6opYq1+74>6xo2^>L-@SOuw6vK+aP)3dgVoBDeV&7DcWleyinf+c
zi#9lW)Adr*mfVRQ-LbBMS~5Hdb;{f8)6|122ckn?_NFLUr`KIkc&GI~I{J2&#a4ln
zX}S%`uNqa|<YH#sKG_Vvs(Qupl8r;{?KpjL+JmR_E3Fy$O&?F?gd8hZ_wsx_&N08;
zdHO+#p-<tbkFn<%XonBDb1B%qRf#1jEi*D)Hta~@Y^iVD?HfaCIuxX&H|W86XdBO4
z<?X!#eioa@wcn&uuHd@uOx_%Bsl1gf<9H|gCb_D;j?!H=!>jDvDY8!_KE>%2^?u_x
z(et_W-hR;x=D19)^WwLBM#S<i6l5nku7tFoo!ehJ@%~&~iGYH%^mb8`0|&WpTUh00
zTI~(}@h<(CzzX+x(XU7y6Y+-|>y%HcMLhIBGVNM_<x0f%a`v#cA2k>I1`I}%L;HMp
z^sy)ugpUW-4MlX=yLmFre!hM&S$Xa*{nCMng*f-29Q_l`5^052MTI}@KHhE9!l#^}
znHN3Gx1xUKc(JJV?CZN<r$!%^xK`PmNj#MKT%s!DTT6gfLVbR1by-*S;>#Dq(R3FM
zM5cYpzF$7Vydlul_?5WfNN0e(`ssvAZ1`{IQ&TnsjUL(~G$py&@K^y&Re-<sXBJ=c
zJ|~Ar_pgULL%okhST*4{Z1UH6pPxYgC`3Pk+or<yarvOIMti;7arN^VO0!xPjnTta
zWIXw`XA+#E+q5O5w-1!)HqVwdEbIOHxa%i(W7Y(Rkj;VMT(`i`#=(r;!sUKR`P*#v
zVXf0jIp-;>lnT$@bZnaD;TY|;w(@m7k>36G#mKSO!k%Z(R9sg4(fe%s4F{|4X)n$d
z-wQ_*KTs>=n!ZhuynBGv(69ZRFJseJ73Tu2Jx^aGkk3`KRk2CnTt5%ZEcJe1$*itA
zkh0-f_tEaEBTWyT4@I<8SjP>epWTqTT$~ka<X`lmXEL2;!GwKfvCG|CV@IEKl^o^t
zX0FApZ^$28<m6Y}Y|7I4#t`xFm3pPLk<#WZLLbXbgeQm9R0KO;tXz=x6(63v;2?11
zNJT*1lHkTLulpxf-o|%Rn(6yETQJP~c<DRd8M!}8dS<9p-fiL7k5JijeZ3`%zeM)>
zYZh57xg^fkKQdHbF7ka-KX;VbIwh4u;%D$w_=|-1gXL2tpB)Wm&$8<0k*RD>>Hd;%
zWVR{$NM50~+32q;Kb~pdWJ|kR)>9d7(SG39$k3gDh+mHuKG(eqkJ#0=qSWEoB9z>A
za-&Yu=G}2)&892U&P%z`X#!khLhA0KN}p2uLx(?I9ohYQLuQF;SHWGKwryXIr0_E~
zE&Jtm(3NAm2ahcGUiGtUKbppNUDTlPjvhmxqk6WV=iLuKS8{cY8d%*A3g5QaGyL=O
zlOOiF)w|!z^!q=Z8$17@weKB=xJd6~6_KX`m8p{H^b%pR#<DthC1N-&g<{_QRI5qz
zP`nYEI@rFK!C}<O^U*Hj56dE3wslr%n4B>e^0?W5Q)I<Du%7CXa9HRo)j1`;0pah#
z#aRW<sO|}KRGMe6lsSE+{6;}O_iC@6nf{}KhO*_L{=ti$-IsWkdOTaM>Tvwbot+qv
zyzM3X!aq20t}n^vP}<hHD<?4iwOORDw?k5Gs`z}Imos!mXN@?6hV8zWSq%2gUG)y;
zopl{4Zqn>YJjgpd@1DhiS3H{Rx#;6*TeQ%_70~=B?TFtTWpj@;bvxJ4xu(2tqem~0
zzO=9`WR-uV8u&w9_xAGn`Pr=IYPyOEN2~JX<JM%;Up(3ip5!d#&Zse*Z*pG|5O6nN
z94;R+p8m2eB}G7ae~~(Vuz50#l)_(qMla<0z(W1)JH`QzwigZO=G@NA;OgxjTiJK<
z^vtHV!82!%m2+gfn|<%z_}wSsV>EqQzS^Y@)rDo>(Y}CKzcU@VX?f?~l}6mYE1Z!T
zsKctN=H1#ktG9iZx!<QF2g573IX+K)Y~ow!`}&~z{LxpRqv|)BiR_>6yPp;qo>1U2
ze(!A>OI35|^pw$*O{t2qLt=BcmeugE??QIp8HG=NTjib%TFX{!YpGQolcb5Jz4t=G
zLdWR6f7?-)=(f(@kl-_AmE=pMkJM-5bXcBs6pAOlJ2knSVtqxBt@&Z==f%5{y6G!|
zua68oE3Yqkd~ddqD>P!b+01yaR$PeEDRnmSRNFSECsm^5%E2)r9%SazHudW1eP&lm
zM%rdBY?uvoHpc6ESGBxJO7GE~zIOX;^~-?0FRF5Q`V=#Rl6-xGhkFzfd^c!VjV*<C
z&yV<NoxAV0Wh+x{czJd6-8(CON<k|Z-1G~?51l_zJG@!YC-+V>U&(~${oAIUf$FVB
z!KZgF+L`^x6V3{&%?iP*D0`2`8!d#5)^OB2+suu$)!M!||LhglPszeiS#rG2y;z$o
zkJL+7#B%9}7fu}F*%;;=_F%-*cSx~$CBW_D&F(bijYm#enfaV45b^Qwc0Z7rHuiZo
zKI7;10YBB2rH9v5WW$yg>|;50D?Xfw(P^V@GtvrZ+3gwk_@Mje<-%p77Y2>xeTywo
zZudv_7tel8IK?si=pk;*c_reCj|uxJF^*$?M*=M6kNwz@JEupQJ62&AnDtF}B(2am
zZt)JcjI~%>A_u+H7dlm}o~()D$$`rjB)fE74i`D!6LdLDnOe0|>|54z$z`(38s3-B
z)f&%*y|}UU?#)nk_bQKcsjWe~ZE`;pZwZNQKl!fdd(zxe-i-R<eWBd+)cJ#L+weF6
zj__|~LeJFue|aheRXdS8%sYR&+PxGqlsXucnyWlVc2zB@-Pr2B?K6?;(-!GTTsF=s
z=YpocEWdc?Ysjls5>)0~+L-q}6VLas|L5RxRjb;Vpqp;t%*KJQpL13ozwBiGHg0)$
zll36&f%i>c9^WeeZWhMOnv!ODp;_)#b-_^Aol$-lyK6uBdmMhq9ew-OM%$pIr0Un)
zT>RaIYQydy#=*fyLN8~J-zh&fJbB{TJ9hQ$`PQd8>aBJyAD%WT@?WS_|3n{JQer<G
zRdOy%zLr8Ygr_2;Vz-ai)3aP^&tmV4hku!=xq^RfHG0>{tx`Q~^nq>Md9e>tH%%`*
z`g)`9NzOO34GT%>RqAzNU5Noa?HqWa*|H1^b?35$CkH%Si!+mRDU5%0@9#YJ<2>6`
zc;Hv>n!cfCW451cCJa}V-h6Bxo5`carC$t~d)zbU+EB9Bd0JxPlQ(s*##ocyzF~@M
z7Kyn$ERPa4ZwWk5@Q$HrUv*yke2;8sTYK2ivhmOq*5zA6&vHJW^yiA7qI$0=su!->
z`6<mT(|w;$`Z1pEAKZuHpKZQ1tl06WjIHv}WA735h~(ws4P(QLYL6!+UMg2U8^;az
zd`cQ$o|v3WpNtC_-}O3n(7`O%;Y4rdJEu>h5$fN26kqPh=XRX9b0l=q5m!Du|5h}_
zW85a>*t?|`k3M0)sm2j=x5MvcJx8*6a&wcp4^El%u@sLw^YVtN9rIeqaK8MmJpI$G
zty5{&dm+DpfurNIJw@}C?U8(%k38OnR{q>ET_z}@P<-#Qd#7x8MfYG?@=&$PBZos@
zV{cg<EYQ3A;!5=|?T`5$qU_<mM|S<n5lqt^5A@okVA~*^)4buEf61qg*kvB|=N^mp
zt`maIUBcv^^&$$N=oXyoI|Cx<slqwBzV(UJIxm>h4vq{OM)O@QdK~J?SKfC1>-9zs
zhq&|p)FUCmCpS-LJD3HG&)n~ROkcDV9%c2uadfxAS7+X@0yc|Bn+G+R8byV-XFMDV
zv2YApu4f6#?2ud>ZBS|MYo58}@ny@mrP&<e;oz<SC3z*=ujA>I*4vC9vR8`!XsW8_
zc&noF>6c5q*WouMLiNo?OOs8fYSL_kzBhzU*EcB?_zZn$-YD!XkoDDd`6Zv8x0}+T
zT}R`E>rb$}qW<*Dhg%89EfDLe_V$Lh^&u;)M|rE@u`d%JZ(L1{b7wX<0~hrBQni_`
zg|YE+@^W%BZs6R=&dkls$vnitw2@~6o5i7hrW+5LS{}08$I8OaX1R}>NeG8Kzilh^
z<x8x3mt&GynNlB=6mA^PN>n|az{^Tvpy3}mL?N>&x}jkI{`UMxpDK>sdAC{3c7EI`
zd;@>2pVTmpH8APaYzAAaz;srmh@4ZLY2)+!eHB^Jn-9F(Vz!^<#1MDqo)HoAFHGSr
zH6O1FT@=s}*vs^>CSih8U)x;U;VfA`mld<+HuhLnz31Ax+OhI)OEuIsD@vtY+G&uJ
z#GH`XB7m2#t-j`K=aU~X{Pz3X=ZmHha+2hyE4H3aH|hNG=5dYN##a0TPwU~wJj%IS
z*t3s$Tw$JUzx3wr&6qHGp~Zr&Og6@+7Yz(t5-k(wZun-`(p2oT&Zqgl<u)BH{r6ju
zOxOS#Bj?jbx>U}0-?wXKZPAXn`o2JDs@%`~SMAK$J!#v3ZI}9oUS#VSm6@f`t7m6;
zatm|jH(0#2H-D=%n^|9?Ah2ba+oa)r?-jC)K6B}0UuFGAW9<cV_94BEclYOSW;^^k
zzceFm%L;=LxusBFg3*NGuCBI_x{>3u)$(?e!uyk>yKmke&01CplkzP*dds@@F=bHO
z=A)bL^{StBkimyvyA~5D<m-If<jt<`hR-aj+dqq!@O@)+vU&W7{QXT5we7n??kr`$
zPTMyf*E))GHl-!0n0$dtFi>P-{nk*YI2`jMB=x3o)5ewH=5+mgmKU1tCa@aT%8W4T
zpN=mYCqLK`elV1|x;w(+t$#`7LyZSn2G-Q{FR?ZT?6)3?kU1*b2RqhxnejN<mvnHK
zsLBL>v(k7uY5bCIvZ{4X;Ph+jY5}M5Wsl<n2QOd8Qw3@q(i{)iz!S^KW0-lq;$hKD
z)KA%i^){txlIcAq@lGatMVHfetLKV4-ALd_9}u3Vy1(IFNuY*%QcUj-k^aK#H$D#5
z<W_5UpWAiUH>}gLHUGmM3i>323ZtyVxnlkK+NZ5yN|krE@`YZWE^=uod^6PZ?32pR
zrbt(v>IP=~oyqjaVResljCKWYI?=UXjxO@ROxF*VjH_RgFWu-J@C-V3$wKAewY;w>
z6TO~o&Uf_R2Q9pbZC49w?7F(o+al*sUbH>$J6?76eIv(`qh?wU%kDRA{TY3B9N%6i
z=B6R1v(MD3?i7#h^L_2tLj*S!wv~0JTUSWj>$)ved{WWZBD>|ntjVnYuLzu~y3Lhi
zQuoYyFNu0@RlOl|&+^R$iZqJBr+fQyT-oYUo662oUrkdTJZD&~wKsjC^cp7Asj8!c
ziSB$~`h2J5C8hRn9mWB{eT#YI8Wa3+FZ23t3of`Wb&ijj#=kaKcrx&4DLP2j@<Q#=
z&mLY6lSOWkRFyoby?vu$-l6B5>yMJsoZ(5Irk~484~2AmDvZj<Ucc<v6}WO;@u<h_
zoK|erN^Xgeba3peu}K?F+j?1hljGl-ojn(BQ4K^?9(iUKQ#07XBv$!J!DVpc%TEu_
zK4m-juDtpw)e)IT&y518g4lbc3x0h}yd?i}u#Yz^^l;>XO3g!UxAq=A)McHPz8LzU
z^^<pOq9Q{`*X0ohkFtmN<&_+VroS(+IBnQoC2XO1B5XxhG}n6*N$OEsp6k;=3pbw!
zx;LaR1b0jb(SEO!(!9cg8?+_c66eU=bK1}F>i34qw>6p>k18S}GMo2W6pPc~*}QQ}
zd2x!t4)Z1WOcphEWmVU`G5&llrpm4nLJ^J(-jgrpS#Pi;i|NU>ZU}mNa_eC={N+H+
z?K@@<(1)t}+SFa*z%SbTu%{>!JN_-N@r~<f{ny)xca_7wBt3MTn2b;EI@4S#W-W4C
zlU`Zp?(Wm#<E)IyCCkFEZ|Zs9xGeudp=o$Y+r{zFV|CBDom{;IO=`P0PRSR%)7N#N
zEpN^Jb->{3+p*nt!!Kql?u#U3MY=wfVX*utSS+e*^|(K=^p&k_v%{BsA(%;;v*pO~
z9{p`|r)QN43J3J&$A8AT?tPeMzQ3p1*72xL@~)|Q|AqL0tE$3VBp2tNH&1QUkv+V^
zSg=`WZd(P3x@mjE(u)S2*smc!-0lpWRSLS(*XTUB1^?pn&TXI0ba8v{Ps%2XGyA%e
zX0|S!y}n{|gy%7Hi{ZIXRyQ2<T=#2@wHb|BJlf);aLD3HNyYQ(XP^0=U#;u0+9vuu
zX-_e;an#(l6WWKa3##r-uh8`p6!0B;v8SFgfc?8|c8x#Zt;DIjp6RikqoKvmTo}^4
zb1D5@>R+cSn{O}hJ6i7G7@Q_nKBB}`=69>wq>0+z(4SSbKjlropPZaXMVNl)E91O^
zhd9m_&o{Fh+%E2FXV$s>;Fj&XjCP5ZJkLJWhcid(9x^?;eY`Bm<%6Q}v(&237v*)b
z`I5iOZQp@AYm=h<@LTfxw%y!|X^m;3E%PUvIdgbFl#QJGzU(`+d}8Wc*)6kXTgT@N
zjwwCEDLo89Htav}y}P*U^&iUm?yom2?5P-_Sxm-N6kc((D)pJ)Ixe>RrbN@iv4y6f
z%E8C_jxY61<$ZLN?ojBQctHL>qhQQ5)Z%MjxD!6}aai@M7tW2x+~iujdP4ddtS9l+
zO@)1)MTb4D-?<<2_;A8E<6`RL%?&}ziuyxiiKJRIRYpl-sjm~F+L?0<%$|<5JU`xJ
z<?A~;>2ZGcRg+qMLPK&SOMLR^#?!QCwLiX}<tdvikV#$<8m;U(j?WYqkd#Q4WA(ns
zw6jokujgo|Qqc7l*}m4u^1dRnhx%t)N7O0hmD`n{dW@vWyt1G6`MUe$u5qU62Y2#{
z%APo+mi{QZ#<sM#WvRHPGAECAVeHD{>_7>Nc-#>O32B+?Eg9P@m)h=3Cv9oYT`p>R
zwoml<N@mP<zqYOA@xH?!9`DC1zbzQ!-Z(ohNBW`1>bm~qNmX~>M^%)|xp()*%(qns
z`v(o$;lG!fCot9Q{LDrl`Q5GB`ry`K8>fg6*Ei?R&QvB$a%B9veU<5p*jD#0=dQ)4
zuLJZRKj;wh52&Y%)9vUrI+{`a{%3&2b{<{f*-vAcowoJ)l!<qEd2Ct^mA>y;IL8z=
z<=y)F_56yHCvEWCm4K=Hq+Hta$&3c4KJNUsb5uk{HsA$=WFr2qpvN%Z^G7Zk1}rbH
z*X=b6y?;?r$-!>8G%xNe1sj9A{QcAibsP@acck{cS07$XNaD^YGYems%0BV3RKf6D
z^=8>*={e?F{;k_a_T{lAA34{VESAHWMD^Y7-KoA^yDTfV%=8`mJaly>C%eGZLj1DO
zH`Ce$nU%s9st=#tnd#>FsrUZ0f2oU%P3<c~>i1WZIem1+3{scHbau}d=U&`3<a8t0
z_-LRE{h{rAA)U5~iwCB2TQ7Mi`-}{{NT>@l7L_Xwh>b8F?GrXOJM)vzr7|KRo^ff~
z+PeKs)y=21GHK#{Rv~Gol6{|<*aSmo)nig;n~aD3b!}=s?9zLkp7*Ltw$E7Z{gc^>
zc(wGIyrhS151Vdx*nDrr2ZdWNO^x1@R^GR#%CsXcwDDAikz#Fx)qSy$#$SDHDxtBJ
zi@7cvZ{N@Vac7X?#%HhBOIE4i1I!iTQ%zRPj_r;((rBviR#P;yby%hTduHjY#%Jd}
z3T(nkn<HM}52oTbh=<g<SEcz5`p>hvYPYA{qg^>@I7^cnA9%!gCU-%B+LcoG5Sv?&
zsHEd_uCiE%RCCMg;!~G@8hjafIn#IIfw23Bk|1M^WYYMi7}opyw*{qY9%`>vklK4-
zOKka4nrq{V(}$Y_4w;|Y<C)I$=5>WE=3aKlIhI)6bgJ*$!<EGteLi3Iy5aYiCie}l
zn5f(@F}H4gK!4Q#ljwH(YOlu!yS~s?^QFv$R*gq|bx|M-;1vISS9#p>-jRb{0fXg6
zL6v5A7b1>~@G@~HitW9XozrSpoUhSgrJLO8{wwKoa7alm&x4r`K2ZwtZ(pMgOxX<!
zo_BdKreExSY+7<a?d5jYr?oRT+y?E^&Iz8|DOatKD;WI!LuYfCgsS1yzJRBxgYsK4
zxwJ>-+rL{B<$f&`n5ul?s=4(2Dqp?-?hOh~c1Lw-&VPCM=(hM5laYf3K{s!h=o)WV
zI@Vs2nk0Tk?w+sZ$a${b+Pmi4US0{={$1B%mcGVq<aI*HkyP`Rp4oO9v*v1*d!gU&
zmHtQ%33rzN^_KOv)KYnF-Id;sc$dbq@#%=IFVd|d{IadOA5J>GpQ6xbl?gub=3?pe
zqxr2tt;ye0MVqS@ZVXS!H*KbU{=&z7lvh^MYJA)`rN3PAsN4BbwvI>V=@-vjh)-NT
zby2PKsh-Nxr`VrIX#%#^ssFHSJ#?kc@5T51o^K-bK1SgV-W#h+4z~7QIb*6<ap<Pt
z22Qyq$FUi23qw9Lx3PzhHy2cF=HxvQzvrFeQb)nk{P5YZh*uMPpB9B#3Y_39>)TRZ
z*+pG8Rk!<n9Ld4YV)_vmmk-Vx3hPEMo49KD?|)XIb@1uwr;}4Gxw{+9rKWOf15OLx
zFQ;yD9{b?F6reXJEIcMsDIfGbz&*f4)&K&T@?Dlyb}}z3Dbu^YWL}&ZeZpK2`_AUI
zOez=sh^W&-hI&_E{AsObT;*Vi&E=|n#<q?Q>HXHSN0O$p*=fskgqpeJqC&d@mlZ_I
z>k^L)bh)J6Qht1W_{<1<1?{vZ1+F@*F;1wx^;oXB+wqE#1(ojIN+z`&W+5J70jGrC
zsh*g7dxj|}UsW``;rmFysL8xRub+M9b;<D}oox=vnwIA)`dhD0+hT((+LYZEe|}Fr
z!DM^_yu~g_2i#0LzD_=zpS-l!FkE4K*_65B!NMEn?KZ+8b!iNOn;6EMx)%qxJR7NU
z9BL~0R;DldtEtArB3<vU=iPV1m1BW>Ha{P)DV>u0#Iif%Nu<|<`=RHyjUKC87K@x?
ztSS1a?fFWXCT--ZZj--RjQdMk%Mgt12j()r?zolIi{@J|w{Oca_;y*M%1@QSYW!{b
zJy&t(Hul#y6R#R4E2fS4C_EZ+8}d=u?xnEctKjUb5ci|NScT71EtawSo#w*b&$)eF
z?t<Crj&0LzUPJc;yKj1OEz?emZj|&@P#^ZC{?S}|v+q_@R#ccU2c1}DuKnR&{G)VU
z0o>Aw;OA$Br8Wuvy3hVRX8RLN^_|aJT~w#k@77%^9iTQkEx^%xV&dp+>VU(N_KUkN
zH@vIG7`WW!b&R*Y@-XA%$k)`N*D9K!?S?U-c1`3b-m7SkE!~ug^&%scKYj52=?WE%
z6psO0cRK^x(;W9t7prLOwBHo2@ya5sxksBXzWS@Pru`l9^X3?)JasB^?dL31fj1W|
zUtP9#w(I2$-eKx27(+3*`Sw7EvgWH~1*;v|6whhX#?BhokGE1&DfD!m+S=Uo7$44b
zJ4?d!%MQ0aBwtV7#@{-6G+u}7T~123=H^NXtuLC&lc%_tCdm#ZVC5s-YW%HU{rKh)
z?th}l(kMuqA)AYa<3eD~&X7gT455$j%-ebuiocJN=}^8+qCIz7kb~^7`LAsGWKI^Y
zaPjaZBdhTvE+=hBYiFECH_1JJuN?u`tF;!<?+aCITcecKtZq(3vm8E^*iu7%Su$3y
z`lPVkKuTZx{><k4!_;onu{H&%J@Il>UbRm)KS|v6Sy7Ah_EQDxEu4WADV;mU$@QXw
z4GV*~xM@v{sc%-C4AySQvAKE9uRXU<AfP4p#DM6HCnrV8FOL+t{xFd#xcMz6yy#8-
zXPuJK4bI)p56v@u%MLng=BY7BnOIJdYqp-TIl6OGAc?&_Z}mIM%dt5E(t`;rGg8-V
z1_~pU7yQWf_uhJeiBK-m;0qUg(@Ql(l^HW2IW@FY9p`=a*6Gvv(gD$1`}6M{A3N7y
zv-!+NW`V{h8$LbHvB@~QZ?}9N>(hq(;f<EeX1w7Gt(l6n+7uVKUkbeL!L9H;|G(P%
z>aZ%dwr}>PyBnmtX45U*h;&GIcPhE*5)njFL6HzpKm-Jl20=<1Q6!W`x<$X)DCg*V
z&ig#){r-5a>$~1>ym0o+taY!NHNX45*UbHU8H5=;Z^J0mI@ir&T{HvnX{BXjdD-e=
z*HD5l!?GLLkzwl<kIK=3o>vNljk0L~H3r{J9%2r5m5{d+)#zHF2n}^hnm!#Rq9hP8
zMY|cCFO}pR-I0#(=hz>~TYPMpvD#`m{_VT!#_{tx`>0Q&V$|aBcm`I5jx#!Z8`m-z
zx0*$m4Swd_7{y_nfPbrK=&oQJB^i=d)00NX9A#E^%frd=z(%%g0zN&$aD02WDH8G7
zw#})LKElP!lN$|0ofSe6bhv8QoZ!NO?1vL541yHPrI^8vz-vR|p{ENwG2%|p)XUsA
za#Aa$TjALRhTKvFbXW89!ZQi4@k$1J-Si4XcC&nahSp*}HyAl)8P7zjwh<-4m%;1e
zbHk?3NK-Re<zqjQBx*pVV<|L(QiF*gfz+`fE;8k*TjrEwBDa9mf?A7-Y|oLL9)=5V
z^nP0zjk#^5c_uD$s^uis7Ha5oBPo3;ZO3FqE9F{!KB8=)+sRbcR*G>CuhY4bwtF!}
zYAV=jswACc4n;EWpd2u#ViQARgl{wF%;THwpq)&&Ofkth77n&=!X<Vr13c%k0xg|B
z?@7#^eC5a6o^7QrvaXuM<PZ&*i?+djg|*ADWGHTXNcy;gJiS9eZ8;GLBph%KbCrC#
zwS-wtWnS2pXt{`rcT4|C7j|oX2*j6;IDp%>^Hiwo+Fj=Z%A^~wqm<s&*FAuJ5i=q#
zUi>gMq<EiV_kF>{hK3b>O*_wEwuGKcpecv%z=R|fY;yVPwOcsR4C_v-j#y-<+?Xpp
zXE0;x%_|FXMwl`A8{G<(os0fawyg3wFTIo+wpALWGU+WQU0sK+i_W&+xoaD9?WxcT
zGyURAD(tVlftO#sNMlVQ;7Ll+uHeChK|~^_ncm-;R4i%;{cud&o-sd%WYT~t%vrlI
zHc5nisn5r~qL~2(({fwDptfdlZ!xNq$<6S0By$Ud`fPc~44DGA+>`2`SW8-=b<GnI
z&NUEiyLcg$L8A`}iOIt}(yn0(v7&Cv5nCrqa8Ih(I8em9GH7b}Mx-v|4WvP|TIO17
z$z;B2<UebHJfoL<6?dHut?)gPWFpm;e~g546YUFa3$_g-)*uX?=i72&TW+4Ft?+0i
zli95X*5MXTfvj(yn#H!SxM;W=uu_8#AIR1(hFdP7nJW@}iL2)eZsNO-4t_D=Vbc|B
zMdhxM6c}CefRRW(M6lekRy&e<S+T;vh}mF}#hiWAV2q{0tGB_|wu#R*sWC%v(W}C?
z6WwLrk;HWDp&-hku*ANokrc1waK3eB^APRA7oL-?i1Md|p-r8qWJCMJ46eX#1(9R%
zb^GC#Mr_=d9fENieBLCoz);(5g@uwj<r~wuBB3|>yEY3A0$PX6q@M7_Tw3K2+|wT<
zp{j3>(jFvdOhJwP(1NV_L9HNyO&rT*Mdroqi;iTfKuy2E)@)oRxPPr#FqxDIvxC)Q
zd2m5q*F(I;iFY+{T`jt0zSWa=a~U5f7puudgOM!>W4BRnGGB6KgGGqfu}ZE{nWRGf
zXn913dxoMqs0mM6$lVkGJMg80M=wP5#y-mBi#4ENl@w=A4z$rc{*qY`vdJ)1Ul}d8
zYLic<%rW|!Hkpw`U2~Ek&`R!5aF{AaZ&Jm+s;63MzG7ySeF66daw3gQnmW#QYkQBG
zq?@CzIsAjI&b!CoNyS}siB@r11^GK_2h<#&<hjrJ@p`_iv@_*cH642%5n70+Egi_{
zhJjg{7_GP%Ei6Qsv)uiZ^cGFhv1K`O*UKTFo;J6(D6KK0F+aOJXr<|4L#Uh$k5@^W
zut8hV6P=L|-}@skDVYl&881-NL?7_ROumhH0+^cjd7gD+kxz$DFKl3sOi}h%pbuDE
z^w%5LjO-E7Ejn$QGN9Rol#p^fDJ-`}$>UdC<&dMh%sAT`_kxJaoE~381fMP{$jB?!
zMguCLk#M<wY4tOZT~k7zdso|(2%`epZaw8$s}t7!bbrJZBKVM{IYV`ORD(vDygfz$
z>#06aJH<$V)<HE*Qy@lXT$fPLO}W%1ke(Ww1)1EM>-zqA?rPmk-`z{ov}cZ%<eY_#
z-Wm_>W?!H?!z(k90D{n4tti-pbIbmnHYUu?<Iy$kifFMA>i2G%mGVI*i9OWI!)+BB
z3(dC^OrCs{9hTO7HaLf08CWFKdQUWLcnit4bBw!Trz_$5D8}2v!>C97pVBP{Wb6l~
zhHE%9hoOS%EqYRh3sOcXL_`X-HF~ZT&jO$2;wG!OJk)Wf^OWSS3Ai%JXP&KFdY4VA
zQEBy_-}Fe3^C!%Oxq&3~4S&rri4&IwDUFehs_gOE!AYa%v6LPO#YisiTU<TSrWPWn
z(2}OJwD}Bg+>JI|u~<<tLPA%a=U-MSS6jmyf(961<M_b0>jF&z2(yU<_T<aGDAhfy
zvI-(CqkXCiBi>m%<7io`%%c{v#@#X(YV$9|8Cij)tKAj6%4zmq#;r=-%oE<e@|F~z
zD~6fMW@_0Y?rMb;Uc%+(aUwRYjPStunw?SGEk$K``&}~hNK)OWwVo|gMX>?wN`XYe
ztra~ehwcK9%;H+OiF4nc$~8f?cN3PCd!nn6pjy<4ab#*CO+!_I^4zmaet$?UB)4X@
ziXp0_?5PYx#oNiOf?blRedkD_!qHTVH|=SdX{&ut?N(Fa`<}CN9*S?%B((Cih>o8Z
zb>Q<^yL!gR@Gbj{+SGSMm&RD;`(TgdH!srIXDT@h8RRD$R%$QgJ?fqqzp~@Hk$;HE
z($P<T(AU+<<1Ai3kA@}n#RbKR=F-MWC;rh%(R-_}CIQyT`fEz);n*;N8e4)jVl*<0
zra-R|*ye-`^4nzJmNYJ@iesAv<YQpCGB)!zClis{^&MxaN=cuZ+ZmItyamlm_{GJZ
zMs$(Uqt4#jB0aO*gS%th_mhbTIPO#II3IQ3)_EE-Szs>;@zzoi52J>m<bE*=PWS1M
z#S|RQWye*aW^%kwCtS^gkL4!>PmOOWU5RPOxbvyjPq?Unq~1r>L+Yh%{-wtf<*UrR
zXLcnt_(odp^-2pt**3cq>l;2a(l#G0wNY{@;layMf-Fr|4zpu2#rTH>b)NQ0d5$qg
z254dC$@vV(%C{mC__um-)>F&?v@ciW`h)IfQ+ose^8T)2y=;0u(TlQt4(+EyZ>B_X
zM6))czpBX1>$JN)uq^8*nb#l{orC&4a3{t}&;bY%_)Esz9>MN9O8Bg|ithA{alxe6
z*(Z0KZ*un~=}knmI?>K_%)HLI(xY~eo&<wWWe!Ymi--809w|gHS;hL?dgUWiz`p)O
zSk$jIILB#RDDOE-^0SPmS<jDQmi3?7Q1~lL=N`L?$8%AYT!%IbN0cagsk&6kT~*+A
zhwnXUOA*5>JM5PG_}D?_<2B2Vx+AtJZp&z)5nb}Qq~VG3HV~+1DzviN6ZGx9d?w>#
z%@S@TYLSEA`vhqFDBZn!!&-l~5~DUbPu3nvS)D~}V#6Eq9(EK+v6S{IcoO0i>f>s}
zcdx}*UK0h`DW&AFdrt9ynBfVn+-0M=h2U7yE};j_*U5XSom4ccv{jCv>PB${k?qYa
zGa1zLzWcEwJnrG1!K5u;D+M}>tRjPlwv^|wiXA=(*OR!x?hj$OL5sw#i{I*{=8r28
zKkHQ2<a$r`aw`&YNT&?P9V_GMnErwiSbC3vY?k>^U8vuNmH9iXCNob|iHAmpp%vE+
zBsDf0prW0_WR1pfsRyv30lVy21G_>(VJ*7DfaK2E=kpVCB3VddTzHGE>qPR9iq6WR
zD(_OIt1b*ahK_PNUTQkdgG;LdoSK0Z^&NR{83sQ;#M{cJNqhLN&G><PR;^A<FmFXP
z%Qz#|;O^dYb6g`*mtj=2NgY>J9l@oF<pwjk_s@tGW9$pLW^Ue@Wg?|x+9FKGXOXr(
z0-%`7>oxMm!20T)4UFyGv3ptNRrr#Y$c#Or>LJPbBYkggw5JHDKn@y$B2lApZ&GP7
z`F^3rY?7weFhM#9qWRLXXu2W67fc@GZ_p8WiD-V&AsU&vBQ(Zq1pN@Lcfz!4?ma30
zw3-2w;Tx7`;<A)H*F%$&({M>m2(M^`CQwW`asS>Ju4)#fen=?h`Va|STSe8_rAg$C
z8~(%(QqYyP%PH+6Nx1ZsBwCQk^CS!#(atJ6YwLLzwr?uL^{ccy&BkrM6L}fgTlOx}
zp?HSrllPcQAhWu_+kMpR2*LJ<sPW~s#93Q~s3OtqkdRE(j@>&um5fUD5X?;Dl(e|6
zzNEO+S8)^c248yPvg$b_i7{6Szj5!4>KWcop)<Df=uMs_F#umbaipmmCqd~;+(xo9
zC&#J?u=?V+lG?<Z9hzXPLr$LLZ;FxFt>@E&)nqWydh6cOTD2pq?mpFI^mn>m`5#|w
zBffP0g!oO5`1RLq{Fih{NEY%Q-U_a+npRHkNNzqh9^Q6#ytb~cKeK&j0j2!S=hKk$
zlOO?A`0w(6d^HZnsQJrzL^>7l&&U#jRD+1I@^h;}76gA8fFbTJ!2c1<PP!m(x)w++
zWdZJg5KJMGHlb{OLwpPm2F*Utd9lBIegwu!2lt5Y!++frzyk;<6%nak2_#@Z5S*xj
z0re3a^N5Z4JlBuF{0JHu1S8A^`@(qwq)HSLM8I;ePKXfqKUfp~DrpNW7y@#FUHn7v
zoPm7+mPrntmj_F81ONR9<qt;v0b7S4U2+E*<n7Mugt&%~9|U$bFW6>9@CrT1i+2^Q
zEn?F^BKt!QBJRFBnDPp^N903n|4N?hIYkMAg2@|fAwm`rDC?pP3ZMi87Zajwp1-yI
zzn94i*31)3j|8?6j063LECWy$qKqGO8Hjqpz}5(Xf57?QMLQ59fS{!C2KQEA`~Pgo
zzb_NP;)5WnK|%r}6N6=IfN~H__O9o>><RYE555)zjS&*qhe%*gBKl72=Xt~kB2r(p
zA93`f7yl<^E1dV?4;Fg_2N#0A=+9RCtMT}=@8C#$V7-2q@n3uJ&;H{A+lk<QM{r&u
zxC0T~e+bUMAFPWAhI$0A9)jHw!3K$7wL@^^A^7>M&W{lccnCheAFO*;;K(30(ev?>
z1;-3QFXRSFa6P{V|E?ZC#t<=<|9|^m*#j~VBm__4k--1T*8i_>v=KYl1yCpw0B2W6
z!{m%ni8;iDphNTF?2_OqQ78lg!v}EDFfC(LAa=+oPzWj#V2Xytg$6-^z(t@Cl>94z
z20;GH8GHZ}8G@9L@&Fo+1V&^3JueD<`><zy<73fr^b<;%F_OfZFmB3~g<kHv6h%XW
z77T$K`EcA~0FG7(z)>>uk)aSMlmMebrrL5iSL42Ue`!<NlPQGEpEZTxfc3G4VFQ?G
z$RNuLF;rg{MhXxk4zP%E6r3EK<n6#<K&tLGFiNnN;Aw1Pf`EVkUR&^z4R{F=2@l2q
z&>=1%6I1+=L(kjK2Mp>%ujAq2ORp>lTq4H>gS`v#i=79W2TaIu!6=D>{G$8<Lg34T
zCV<oLbsz^wf7Ai*LLxV!61*^3;PQ{6L@zGTUlgS*NH6bUYe%o^<lqj5Go=R!q`{DX
z!t`J;8Uay3dVYW(MlUZ51K?1`UwZ%?5o9<N9~?m_78DMJAdS`V$qlhr1lF02i5XK@
z#mVgpB&|tB-1Y2i?1*Ls?ib#4oHX5E6J$o8Q`Z^^l;0ztxb*ILc+7!HM+>jO@M~OF
zYieHvvb3frv+c9wd5jRj5RGs{A{Y7Wtes8?x}D88$|l4`8qXl~EV~3FiPfhVTM4sy
zm@Rh2Cz;`@La|cXl*_jm0u^}+?sLykv{ChSeo0gHl;cl1?OLVTwR22;ps4{TRMByq
zA!s5oG+U-1w(AV5){5p<DKv-@8b9XEeT+o<R^%HMT6$aX>s4z0#oo5P;)lq1zK@=Y
z)s|TjEi8|}IE2l;ulPifKiSHpto*D1-~C~kTP9j0b)B;V&v26h)op@^lu8NAiS8VJ
zleX{9mU@Y*t!W!`HKwy3YplmfW7Wr^1dFQ!sr#=+PCe4B1WjM2DY8cjbK0|8RQe1g
zva+C6M~<2vkWy-FSc6N7JIl-KSjCmdT&dN<L9Y%gFfREO+4VIps9fC*NTvEVef5FT
zYbzsgr5Z{m8OdHD7PCHDhpRhuq`c?{B(DQ${v<`$)XjXYG%pjS`p+~Qz40dCklh;V
zbYt~*B$OpK%6`wv1=)+&G@cF|j8K!7QMTxbxat#4z{Fr|nP98e+Q&e(EJ_({PtzYL
zst9CheYerlXnc%|p(`6~B&Gc9q;@@t9~0W=Dv4u22nDAf<RKhl48S4!01<e*(Go)-
z-%&6CG;jyrAOJ1m93Bc83W=l0>{_kFkp*GQ={Ktz7;$!cSLDto11%E@1wa-~vOci@
zANDe{)%eKkaCxaA^9c>U7J!GykB^Xv0?yEw^Z7>0f`S8Jp<#ee22=#~IuLO28v;Rb
z0h|Eli(>#1LxBiK2}Yyzu<`NyZ7Kq?f24xO2>nb2#w!J9s?To;`7Wl<&)I{Rr^<r7
zHr~E~Jfe1VD3X9UAet|nFBrprA;;TQ;GYR`1!xdL=uyCD34o4<>JWhgK?X3;&=5aR
zAiqvO@Bsu)KM0aIlY&$-hX0q8m*QC?2D4DAM@K4xyWF*lzV?Ud-c?AwPh9~vVxoJu
z6z;2^-Fq0!IwtZ`+)Tyo&e&zuJ+?-&2*s;sxlOgvv;LtXUT+u=O&;GG+)r~}SfhVC
zb~Pw2J0YR9wy8jcBJ}-aI29o!MZZ;6guy}2g8x#-Cu$4%BkA<-{$f)1MzaRhKCrJ@
zuom1gQW>NAHo<oJ?ABZVm=83SmZrP7C0}Oa3!22{M6bMaZxqfu{mh_i(%!q`y!}9W
zTE1T3wU#K!?X3L|1A1;#W>6A38G&Hr`8(BZ41PX3Z<HoG1Zf^TQcv#p@E75ZzDza1
zx<c{l7J8+8*qu0fxaU@1@8%hYkSSffsQ#fyLLz3t8|)Pr)puS>Q!%f(SGmPlXydF7
zb+;F<Sj=26R~_Un^u1j%Em@cwL$}asK+VPUJ>~go+zn5c#r%dd@ym)u9m`~?I*GC^
zDpBegnq>+y3&~rg>;oIy6b9&=d;}dh7`BoEDNopwB;TaOVdFMS><wJHadY$e+MBwq
z0OG|Z_RHl&Pag3xy2>8IO-b$hT=9B4W7-c`1#r;S^GDF3&dxG`in?HlHhp6Sbu`Aj
zF|J!L>Q$~)HJW>m&hm@t(0rG6#&vF;J&jgjI5w21$wl6XQQWJsa&LB=XSIx3ef_lb
zTRQEM4YhcTLEse-vo=A@n)r!XXn1@n_ox#;Q;dD%avJQb`t_E<1~KbDh!+Ux5&#51
z&XV&Dgf4y|01S<L0bK#VLl-eX2;TcB7{pleR<2H96ias}s|!p;C&tmSvkma@u%(xG
z@(qH~0@R4KSi~e+U>r<WJ9=3+Fc_YV)labdc^UcdFN2S#2fud9Igmk8Kp=x8K;e)G
zq*A7M^>~X@O``R*qjskCiR}GOE72w3*-2uEa0}YA0S4v!<d}S#6{%p1tK^U50nXNa
z+SObu<+@6$U9<Oky-z5=RtQ9q*sv(K7zK0}P6?3)VQb1>iHIm0Y}mMcm{?}o-P|oH
zgRJ<3)<Y8~_GwLu+}C%vN5x5VKffz|RNR8jU8S33ZCEzl@LDrx=7T1o)k7|U7hbqD
zFRGPPJqr#JIeRwS8h0u`=}pa4aAFpca7qAp9?#mSC40j&XYqVHckz|pq}GH7<VQ~1
zVZU0kOL7o%LjCwLw`~?TzBKX`;66eUvkR~^&o39bcZIa(c&o@2r~7*r;7#e4xnCQt
zO=4h4m^)IlBQm4hy<5dM8m;ZJOEL7VN@CLu&4T00A_HxcKb=9KFs^B2UQ^aJzlVn}
zgWfT}=8)rE?V~FFd~F#5xuq()bE#bOowH!l@#6Z3D{t%Q>99J9oQOoN93*}1E=F7)
zFPXRlgMebqQN6sytz!a>gLn1j*Jxd-SAGHs6d4?m@4unK-@?Y9sG?nepfCn?u26%M
z=H>>Ki4c8CUHlz1(8K>8G$Nk=cz8!t01=M?-F)qQtr*RJ`uJ8BMCeaH)u*4@(+}kd
zp*w-969^Bke-$eDFEQbt36=f<7b0MwYJopcf&*Z?Kr<+WjQVFY{;T%MCx2BJh)BOk
z38H00ED#a(5Ao9UA|C*axq8u2{{S!lNwa*<wQ5>o6e#Ec`$gvlpI_&Y2Yh!Wj5&@C
z;hLZKq{D9Qspj%NHCES4!w^ihRy0#=s1;Yu_o(s5Jg6SeXw}Kbo8PU()fP|8(sEp5
z5ZM+=YPGtmbiAUeh6+g2JZYz5G`>wKr`10hrce2GPmgeXImH(USg^l2K7%nnk*3>t
z?L*U*??oIi1<}G+SH|Xw3N8BGP_)^pMQ}NJ!=l?IBQP8G37@_dD@~+bf@x^#Uzt1_
z$vWs25?zpdAnvL7ep`bxhcRAcqPW7<>Tbm~Q3(&*`UA;W@s|9q)e%7E+P87?E>oz*
z6MOHqq)+h2*VET-h}_|cq9U_+mY13J0y#Zp!60x;+At1t!G1N@%1vU<JUFxX@*yN>
z<q@QGQl~Y{$HyoXmFlBAd;!YW!mN&6ydmRje*7x=<0Ps!R?#aSmZo_fG5sZPk$Y)0
zxQ?sOw}aQrn=|YJHf%yg9pWR={ThR)i5rCH>~h-31+QU@wh8CWYFX1ZG<|W-U%f|a
z`Qn!1JC%GW#a9!5oaw+q&gJ@Uo~OeRaF_I4*#{?TpS^fweWq7kMDS$=$F;YP2s{hx
zRYyreXQG9p2Y2$r1{$bN60!x|RAz&g3A0-{bH3K%O7&whD?d0(*cP-YZHfHyy~a#G
zBa!k$Z;5P}9Q76!Ar4BUj$(&?|J`TgQy7K&HNE%6ajfGy%52&Q{a|n^asW<63>t|*
z$bS&gpag%1uD@8Q`QWpI@(&vk6B&l{i+zd$>UMwHuh=j=;Mc390N<Y(QDBTH^jdB3
zk6puhF-g7py7)zr(<S*9bxxZQT3()-{dyQ^5K8|d4hN(k<IU#|=lmDW+Y4vmPp9Xv
zGYf=36gVVY;kEnCZwA=8O#G9Z_LX;ByRSDBRW7NkQ&6TcZwPhUG&rcpFMM;TmSVo%
zVA|M77uC6AT=vCPNfg_pffprwTRs&qZnR_SS$eMN>!*7VA9J=4xiY_7rdPOxv?6T2
zVOM>X<rO!JYjT({`YqZjCVY;q*F1Oam2)<)NPT1L@Z)ZqDRWGqoJ)mJFzZ{MyeW${
zk0CGD{9;UdhSs6^^<y-dKt_ZZ-ma#$-ErRi#lCAZuO?>LD6ke63WF>3phx%SryG(M
z(|{0@S9Mdt^B9Airy)<j(Z-8sRodo=u(o7y<>i!ZLT;*bR1Mt7A)fe7+_Ph0X~FU#
z0qgB|S1s&l`FKY;L;k+BSBn&<#1&q|?KgZdD27x?1+4WZx=IQYBg<mfWWD5*UixR!
z`QM3UJP<@T%8EedWfm-iK1Fr&v@a&TgP+a0_2$x+->f7Y^GT_k!|tYFzIC<T?bN}$
zI6Yq&<7K<n)el07`Hu8Ld=--Kyk7s@6fE3$^hk8_MFE^#8i13F|1q%0$PgHuoD)39
z`p4aYaFURN_dhv!|0Dm^NfL;L{nJN*NdS6DoKPG9J8+`>@TA0?xuQe<#yQe`871|S
z^nf0BBF17M1#g^)Wk1_9?aUZdFInA|Y`R7$AyVGvWvV;Ij9eweZ5)b~cfBa^L2wfQ
zgkc~<gOHdY%p@O9j1DTJEub=5@>3bb(RA`wPd}05RFmRB50^6e^_D{@qc*>5fd8%Y
zLIMy&sC&r7{1?{Oug;5K{1ssETzWkxH#?9o!Oaul%aE5n_n`0tVxSl0LJbu_D4~C-
zp-R73f)K#}p;}^Glm%l37=IK`eR1l%5RfXs%@g4s;iu;TcmK{kGPwSTRlKWo$E7j3
z6*qgjV3{P^SAdGOe27N>(j{THm$&tCtoHIS1EfeZF!)?-3(wFZ$tF^7i_*ZL8K>S=
zcg6Le3ancttQ4_N-?A}nir1YL=Shl{d%{}ysWC9{#dWedgRYhaTir%ZvZbpkjd4ym
zab4T5X8A%Ss(N*kWg;&vz42CMzoZd<DcWEudSl1x<zsR5kb^S!&-NeYP51dWl1DY~
zL^&>mzi|$FJ4}$O#IYvLx>J+XukphEb>ri!qPU-v(#<GMn)h$WxO<S5War*dj)@ME
z#xb`~qQYW+mHT)&xAsuWJ+OoQ@<ST@t7sw(7*j$;&o8|TG@=z-KGH}f$OzS(`_NYL
zDD;Sjnr@v-iQ*yUf!N`GtCkmUJTl<}^~TKR6Rl4-gg4O?KIwlKUi};lTiR{Y=~yJY
zVG{a?#b>(3Ig5eE=Ckp>Cf_YOwz}amlFy>{vDz3er@HcDL$)UdgR^^BizIHgfsL7G
z>FquYyL@fD^b--~Birbsb4^ob>h7>~j>JXTLc8=9qtBmtIc^ozS=pXU(YsP;TQ(F$
z;A67rZZ}J;l%eA}ql;Nn_KZh|5l<xt4O(}u&)s;@=Rk~}-5R*j75BQ*oj<4>+c+}0
z>&rfO@Qs^qY~#19I_j5n%`NnYLnt|nk*}PXtt$G^M1@Wa%#Vr(T)0OPL9I6SFIp)M
zLXkUnmmriLGQ<%J!qM@oZvz9MN1Ufe0bPoJI0c{p_OEjr;ZVHrp)`<9xoJl8`EdAW
z^Z6w?)2G~f?eU8b#yVkU$m(kfjAY|3cE1#7I>|?!T)+g8pAJPA&<3>fHS^VDR4<gf
zf9J$d7W`B71?S<f(@<XaTmz1{b)hsOl+8#WBK#jJn?@J;KxI?oqCWpf+5Fd4^8GIl
zq;u_3|1l@kuF`Ixp$PERZ$WE3nrZv%@g1=omc>Kwgv|DUQQNPir^0Qj+T4M0Hu{)K
zVn|<|MtgHOP9I)w=|RdNrmf73e;>Hh9~|AUoA=au-pc+V38!MLTBaP=)vwgg?_mI#
zC!csGFyn)cF&E<oLa6JVALO*^T4F9gtk0XMprff@&y?LdzzaY9^!;NVLGc<=gN0fO
zmAFpLYBQ!PsgSU7Hoo3)HFa31Ic9~wUV^V%?=Y$Zm;c)L%xcy<qLgt8B%iU2AGj<r
zN-Ho7U#4lv*$7stp1h5dswHWk{?rVryLNB>-lq||7>I2yQrn7&uOF_|Tu@vy4diYQ
zB~$o>u!%(mS(Ob=my(RcfSJ&!v9x?P#gq1)H|?i6#1_uayJvS%+l@c6S#!<E_UOL&
zE=b^Tz{;O_<D02mdPF)ruN*6}OPy40B=eS{r9k*B)65Za;en#^=Ye`;Ipt+pVXuIS
zvj@v}eXsDoyF{C0^7>NtSld<?V~JKy(<Du{b_ZYffkiRf-G&U_Xu}rEr9gu)=gqb|
z+3JMQ*YMmPD%9Wxujf~;XSwbz-y1c_e0{$;xsk#YeBX<6dEWX<Aj)*p+tX`UC7z*M
zccTIqFp$lZxot{VMDId|FN?qX{P|!p=Y1%5-*<8iO{52t;}E?1#4n4p-um&}Y?M|9
z0gxmR!=8W`mhltA(1k_nnDv4umCMiA?K#b_{g+$jKeh<K4+wy8`v-)9^gR6h7oL>=
z2#)?ceCvu4LQ{R#D&?)Jt>4Xp+_94?QhHarV0<|8?LCbLZuymck;f(ngarzuau$Vg
zyN)LzySee$VR>}-@CE3u5@WOaWVjs}mOw+!<ZGhd5pMfbJ^R8H9+kjI@p0{)R0nxj
z86}sr+<S+ctJ+dq;|8Nk>^y5DRnPsF=+Nwv(>X?_)}201-HKI0x-qRF8~;Ao+3@<7
zNYH(=@;A#-wlz9C{>q0|k(3`SYV@!f9Nk428fD5Ys%O+f2KL2>95(SD*|>fx>ZI)l
zof>0{)FrL9zB0uv-kl9s=&GI@X$F0pNbyN4=N6lPq%yu$2_r5w<j7#--H$Cwx#CZ%
z&+3`U8kSF`OfSD6ZxepQ&z+6sR;IWp;j@E-dy5j+)+1&ZNv7bO-M5?bXBMO%_?#@!
znYe-<pWPwkGV+ySFY}Qf_^4Ju<09J0vD^DN!$;2Xey!58Jn@HP$g|B`4<vi#-czWA
zkq8bBYm{x~NPWYrx8*$XV`rA#kZVTGwO7@-x~IJ>tg4wvKg?|?6vS1st7!R>DcR`o
zz12+GH?fxEYT%K^#7d@`k@N_1+_z^bBj)P<MA~URNjMVM5*SNbSuu`D2#AnFESMT?
z7i?yW=A;kWe5)^C!t`G+GgI=Lw|r=X2?0r=qx8NEteCwv2Z)-K?mZvze=&^bl7%xY
zP}5&^fp2CYz8U`;_y6A_)34C=f9w9o_<!8}|L+0*Z~P%4#y4BiYCSSb6&N9*_T!Tb
za&wgwyabxWgMjWpGsS85RkL|@j#JMB+{YYFU!7V9Y0+1tEniP!e>S}~;TC%mMb9D#
zbLg)n%JAs8s$oqFM(QmgYbrGuB=t##FtQBXak{J=aO&+#GV#4kD}noZS#-a=#fD|=
zW35#Cd))VC6UslICB3v|jdi`<loveYi50wA^3qSM!Q`-%pxSKZJG)-|)>wj<zumjO
zE$@d+CoODng(q2T)Md<<SX=96IM)vDRRv{5JT!<Y!&2<|*pZySlzDnul;{1lqr0`$
z*=wqcI2^O1_I`hCEOVpQL)8}n_Nm+6xhv{Wonn#DG~IFuS`1bE^nS7HAHK8LWU+Be
zU3Mwnwr`j1*Q%AtVPKFMsv~CZe@`1I{^?%DXF;#q6Ra+uM19JNAX-hAB?2onDo#7@
z+}Oaf5D<%%4ZJS8k~{Z->5P_rr2BYzJJaHnYch04DbJ7l5*s(`v<K;pOO%Pi^=YGv
zJLFl$y`Ebl&6!9a>B+R%PAwhC3hWy`=(mV-#8hVHb8Xy_trH(3&4krhW8z~qMNAQY
zYc71dYdG~1<pe&%{}CmA3#s3%?RbbO3<>*_Ka_Q9%g$e}h$9wLnQJkOsxTV=Yi7oQ
zz8)7{_({tS9@ppb(^5VKQne*wJlbgyQK|y2gN^avuK*l18AL3<pNNH*LvizXh-YbY
z`szG}48?C&7h>7k?stRdf4*$}H}(+78R+K?E?cWA{8+jE!|oDA5TheD#L6`c1_KST
zpDWk@iPiIehgr>ww|pFD8b6t-Ndk<3lfZggF$-@GgVavKq;cCEN3oPqnSXZwlN;1g
zxE%o9E_I<O*_uJuT{qgY>Y$xo!r@OA<EWB4_&Ri5_edXwzPev(NM@|>{nRndv#q+p
zFU#47Km9F%0s-$w_%3?XqOXLT*E|mn^%wfF9(r0E4xWK^^DD2@ju@<R1lLfz%-63`
zy<F=V>@OFTv8cLk|0UqHN{PLp;e9=$n>bu`TE)N=__pT_vxSNtE%VPpORzWZ(#+rA
zObLHio0=(eE2urNySA$1xif_*GC}g>s7N6%YDnBZT$&)&vrHc@%Re!V;=}2l3JGS=
z7=8JK8rjb*(0)oBrjRWl(~L1;qFUItSeozfp^)umftJ{FLL>4+W>cjU+rw6;IR8w4
zDPuD^|JeAuPS;hoW*-ny+h_as&Zu8n!n1j@IJ$ZJw)j1%_eh@<S>kK66)3qvTheQW
zt=!fGraC{WqagK#(A;THIb^7=Cah}=+Zjvp<d(I3TxCO{aEHp@I`kmC@^sm@NZ@Te
z`dm}pqI@AmeNg~p4nG}-fwo$YgC*YeGoFsNvhOR_@>*Fxa1qZU`Et+85m`c_Yo7_O
zuE9Ecy~!9cKL%^~UA9?gu;`%IcJZhxi%HaK8&|Z*qyJiPsk0^JK~*RgYu5fJC%#Nt
zp8cuPYTD1#7nmguVwUi^;s3)1Lj{mQ<Leh&>2LAqSHMzSd+>Dc_8T~iM?0~&m?3Z1
z?KS@IMjp6c9du#GfcB3Y;PMZxANh-1p!Fm2PpqGxlTlRxu{eEhd-(#2KkPbb09>BV
z2bZT~1TQ50w|3oM#kig?(SZgi762~lqoIJd=x+}C^EGJ*1j#eMS>9BCNz@|$p)a*m
zE!o6jvmts@c6mW8_j<H>DODrmQ7n~{9^*z~T!32>70Dj4+I2pjI?>I&@8K_w3J!O?
zXP95=Aiusc#5r@qV=#EUcUTTw&rYm1A02!vuaG0pu$JLnpi-0dCQqvv4VgHAO<{B?
zY}vSEtC<hGXk|xGa{UmwJGNw4LxxgF$=OM-vcACJ=6d0n)N<APGn&c0025QaB#+I4
zt5RS6F&(4sd-P7zCxa|DP~<oCmE}hHcrrGfnT)N~#{2p%gKTB4{sSINJbR&D&P*<h
z--+t=c-TTG#izDvV>8aKy)`YTXxF^&QwJ%%Z}`}pef~u{436v%z>&QX4(fpah?fgW
z@OQqp-(1sg0jfWIh@fj4_cuQw=$pQHwFwgyhJU_t`=@IU;QA#o6bD8FPyygu8Ym>Y
zv5cBA0`S{HrRgu5QZiP)(FFVa#gT1pHoRY_Ho2WEknOU7^s%Z)u>6`c1=8L_)&(`G
zx2^hs$gk4*VC(=Z07483efQqnD}MHP`m%Xe@mEwGU$qtkX?SdhG{XH1^O>I4p8RTx
zoqMpMNMeb)&pGGogBsE<_gQ{$%4p-3?2BdK+D5+mL3X*pnm1RZDmPqZb0zUB>seM$
zRiUkCn9kHN-@AFSxAMoQy8A}R%r6p+UT95xtZdxDQ(LE-kv$kq(H4xAKjx0aGLWKi
z+y1ni@I0=fxYM4jYBM{EJ*uNZ&Z<<!A_EIAS!BM}Lz70U+5d<=I8=yf|3Ncfl$6+!
zXDsKqtWl!#ln&0!jxR}iZBMRGxc2D%s1%RdgEa*QvV(8l-cy~idQTo@-|{|dxh*KY
zaQHa+s+mro)Qcq6XHwMBgjmi@ibV<<1;_Rd%xN8#r6IV(@9FyG{n%hoK)Pou><)%u
z&{Juz2-Ic4Sho~v!q;XD>LJaadeVA^9L+k^UUQ3LaH&>05v3sU&)F2#)wc@W_0v{S
z8>)7E*r52Ky?wF(KJt3+B~6v&=UOiv5C0}MKW>j>@~E?uoc@^p!h{tpN{IFzHmt<u
zs2;W`e<oP7ztS5Ych^8->b9&XiNC0JN!buVaFSP8<trN4tcY`N6aP3Nj~1k{GiOi>
z{BURMDRl(~vpCUnhQQwJfZex&xRsc}y9|%6h%<G|>^@^u3<x4jCMPX9UXdgqs4iiM
z7^`IqN?2ju?z$spymzSrhoEiott4GJ<34YJn38~JHnV$95H{`1?XHx!-um^>5&ncU
Ivgb(u2WYJzQ~&?~

diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index 96097c5f2..d2d44f5c7 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -40,8 +40,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <Reference Include="OpenTelemetry.Api">
-      <HintPath>..\..\Dependencies\OpenTelemetry.Api\OpenTelemetry.Api.dll</HintPath>
-    </Reference>
+    <PackageReference Include="OpenTelemetry.Api" Version="1.9.0" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file

From 70518f25aea6c2da6600f551e28cd4e255734594 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Tue, 27 Aug 2024 16:00:48 -0600
Subject: [PATCH 26/99] Formatted Resources and ResourcesX files.

Change-Id: I63d58c77a09856e77dc1ea2b9d9fcc658a2c1806
---
 MySQL.Data/src/Resources.Designer.cs  | 250 +++++++++++++-------------
 MySQL.Data/src/Resources.resx         | 250 +++++++++++++-------------
 MySQL.Data/src/ResourcesX.Designer.cs | 126 ++++++-------
 MySQL.Data/src/ResourcesX.resx        | 126 ++++++-------
 4 files changed, 376 insertions(+), 376 deletions(-)

diff --git a/MySQL.Data/src/Resources.Designer.cs b/MySQL.Data/src/Resources.Designer.cs
index c937bc965..991529e42 100644
--- a/MySQL.Data/src/Resources.Designer.cs
+++ b/MySQL.Data/src/Resources.Designer.cs
@@ -97,7 +97,7 @@ internal static string AuthenticationFailed {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Authentication method &apos;{0}&apos; not supported by any of the available plugins..
+        ///   Looks up a localized string similar to Authentication method &apos;{0}&apos; not supported by any of the available plugins.
         /// </summary>
         internal static string AuthenticationMethodNotSupported {
             get {
@@ -106,7 +106,7 @@ internal static string AuthenticationMethodNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Authentication plugin &apos;{0}&apos; is currently not supported..
+        ///   Looks up a localized string similar to Authentication plugin &apos;{0}&apos; is currently not supported.
         /// </summary>
         internal static string AuthenticationPluginNotSupported {
             get {
@@ -142,7 +142,7 @@ internal static string BufferNotLargeEnough {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Canceling an executing query requires MySQL 5.0 or higher..
+        ///   Looks up a localized string similar to Canceling an executing query requires MySQL 5.0 or higher.
         /// </summary>
         internal static string CancelNeeds50 {
             get {
@@ -151,7 +151,7 @@ internal static string CancelNeeds50 {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Canceling an active query is only supported on MySQL 5.0.0 and above. .
+        ///   Looks up a localized string similar to Canceling an active query is only supported on MySQL 5.0.0 and above.
         /// </summary>
         internal static string CancelNotSupported {
             get {
@@ -160,7 +160,7 @@ internal static string CancelNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Parameters can only be derived for commands using the StoredProcedure command type..
+        ///   Looks up a localized string similar to Parameters can only be derived for commands using the StoredProcedure command type.
         /// </summary>
         internal static string CanNotDeriveParametersForTextCommands {
             get {
@@ -196,7 +196,7 @@ internal static string ChaosNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Clear-password authentication is not supported over insecure channels..
+        ///   Looks up a localized string similar to Clear-password authentication is not supported over insecure channels.
         /// </summary>
         internal static string ClearPasswordNotSupported {
             get {
@@ -205,7 +205,7 @@ internal static string ClearPasswordNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The CommandText property has not been properly initialized..
+        ///   Looks up a localized string similar to The CommandText property has not been properly initialized.
         /// </summary>
         internal static string CommandTextNotInitialized {
             get {
@@ -214,7 +214,7 @@ internal static string CommandTextNotInitialized {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Compression is not supported..
+        ///   Looks up a localized string similar to Compression is not supported.
         /// </summary>
         internal static string CompressionNotSupported {
             get {
@@ -223,7 +223,7 @@ internal static string CompressionNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection is already open..
+        ///   Looks up a localized string similar to The connection is already open.
         /// </summary>
         internal static string ConnectionAlreadyOpen {
             get {
@@ -232,7 +232,7 @@ internal static string ConnectionAlreadyOpen {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection unexpectedly terminated..
+        ///   Looks up a localized string similar to Connection unexpectedly terminated.
         /// </summary>
         internal static string ConnectionBroken {
             get {
@@ -250,7 +250,7 @@ internal static string ConnectionMustBeOpen {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection is not open..
+        ///   Looks up a localized string similar to The connection is not open.
         /// </summary>
         internal static string ConnectionNotOpen {
             get {
@@ -259,7 +259,7 @@ internal static string ConnectionNotOpen {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection property has not been set or is null..
+        ///   Looks up a localized string similar to The connection property has not been set or is null.
         /// </summary>
         internal static string ConnectionNotSet {
             get {
@@ -295,7 +295,7 @@ internal static string CSNoSetLength {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The given value was not in a supported format..
+        ///   Looks up a localized string similar to The given value was not in a supported format.
         /// </summary>
         internal static string DataNotInSupportedFormat {
             get {
@@ -304,7 +304,7 @@ internal static string DataNotInSupportedFormat {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There is already an open DataReader associated with this Connection which must be closed first..
+        ///   Looks up a localized string similar to There is already an open DataReader associated with this Connection which must be closed first.
         /// </summary>
         internal static string DataReaderOpen {
             get {
@@ -313,7 +313,7 @@ internal static string DataReaderOpen {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The default connection encoding was not found. Please report this as a bug along with your connection string and system details..
+        ///   Looks up a localized string similar to The default connection encoding was not found. Please report this as a bug along with your connection string and system details.
         /// </summary>
         internal static string DefaultEncodingNotFound {
             get {
@@ -322,7 +322,7 @@ internal static string DefaultEncodingNotFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to MySQL Connector/NET does not currently support distributed transactions..
+        ///   Looks up a localized string similar to MySQL Connector/NET does not currently support distributed transactions.
         /// </summary>
         internal static string DistributedTxnNotSupported {
             get {
@@ -331,7 +331,7 @@ internal static string DistributedTxnNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Specifying multiple host names with DNS SRV lookup is not permitted..
+        ///   Looks up a localized string similar to Specifying multiple host names with DNS SRV lookup is not permitted.
         /// </summary>
         internal static string DnsSrvInvalidConnOptionMultihost {
             get {
@@ -340,7 +340,7 @@ internal static string DnsSrvInvalidConnOptionMultihost {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Specifying a port number with DNS SRV lookup is not permitted..
+        ///   Looks up a localized string similar to Specifying a port number with DNS SRV lookup is not permitted.
         /// </summary>
         internal static string DnsSrvInvalidConnOptionPort {
             get {
@@ -349,7 +349,7 @@ internal static string DnsSrvInvalidConnOptionPort {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Using Unix domain sockets with DNS SRV lookup is not permitted..
+        ///   Looks up a localized string similar to Using Unix domain sockets with DNS SRV lookup is not permitted.
         /// </summary>
         internal static string DnsSrvInvalidConnOptionUnixSocket {
             get {
@@ -358,7 +358,7 @@ internal static string DnsSrvInvalidConnOptionUnixSocket {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to locate any hosts for {0}..
+        ///   Looks up a localized string similar to Unable to locate any hosts for {0}.
         /// </summary>
         internal static string DnsSrvNoHostsAvailable {
             get {
@@ -367,7 +367,7 @@ internal static string DnsSrvNoHostsAvailable {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Encoding error during validation..
+        ///   Looks up a localized string similar to Encoding error during validation.
         /// </summary>
         internal static string EncodingError {
             get {
@@ -385,7 +385,7 @@ internal static string ErrorCreatingSocket {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Verify that user &apos;{0}&apos;@&apos;{1}&apos; has enough privileges to execute..
+        ///   Looks up a localized string similar to Verify that user &apos;{0}&apos;@&apos;{1}&apos; has enough privileges to execute.
         /// </summary>
         internal static string ExecuteProcedureUnauthorized {
             get {
@@ -394,7 +394,7 @@ internal static string ExecuteProcedureUnauthorized {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Fatal error encountered during command execution..
+        ///   Looks up a localized string similar to Fatal error encountered during command execution.
         /// </summary>
         internal static string FatalErrorDuringExecute {
             get {
@@ -403,7 +403,7 @@ internal static string FatalErrorDuringExecute {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Fatal error encountered during data read..
+        ///   Looks up a localized string similar to Fatal error encountered during data read.
         /// </summary>
         internal static string FatalErrorDuringRead {
             get {
@@ -412,7 +412,7 @@ internal static string FatalErrorDuringRead {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Fatal error encountered attempting to read the resultset..
+        ///   Looks up a localized string similar to Fatal error encountered attempting to read the resultset.
         /// </summary>
         internal static string FatalErrorReadingResult {
             get {
@@ -421,7 +421,7 @@ internal static string FatalErrorReadingResult {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Challenge received is corrupt..
+        ///   Looks up a localized string similar to Challenge received is corrupt.
         /// </summary>
         internal static string FidoChallengeCorrupt {
             get {
@@ -430,7 +430,7 @@ internal static string FidoChallengeCorrupt {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to FIDO registration is missing..
+        ///   Looks up a localized string similar to FIDO registration is missing.
         /// </summary>
         internal static string FidoRegistrationMissing {
             get {
@@ -439,7 +439,7 @@ internal static string FidoRegistrationMissing {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to File based certificates are only supported when connecting to MySQL Server 5.1 or greater..
+        ///   Looks up a localized string similar to File based certificates are only supported when connecting to MySQL Server 5.1 or greater.
         /// </summary>
         internal static string FileBasedCertificateNotSupported {
             get {
@@ -448,7 +448,7 @@ internal static string FileBasedCertificateNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The specified file cannot be converted to a certificate..
+        ///   Looks up a localized string similar to The specified file cannot be converted to a certificate.
         /// </summary>
         internal static string FileIsNotACertificate {
             get {
@@ -457,7 +457,7 @@ internal static string FileIsNotACertificate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The specified file cannot be converted to a key..
+        ///   Looks up a localized string similar to The specified file cannot be converted to a key.
         /// </summary>
         internal static string FileIsNotAKey {
             get {
@@ -466,7 +466,7 @@ internal static string FileIsNotAKey {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failed to read file at the specified location..
+        ///   Looks up a localized string similar to Failed to read file at the specified location.
         /// </summary>
         internal static string FileNotFound {
             get {
@@ -475,7 +475,7 @@ internal static string FileNotFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No file path has been provided for the connection option {0}..
+        ///   Looks up a localized string similar to No file path has been provided for the connection option {0}.
         /// </summary>
         internal static string FilePathNotSet {
             get {
@@ -502,7 +502,7 @@ internal static string FromIndexMustBeValid {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Call to GetHostEntry failed after {0} while querying for hostname &apos;{1}&apos;: SocketErrorCode={2}, ErrorCode={3}, NativeErrorCode={4}..
+        ///   Looks up a localized string similar to Call to GetHostEntry failed after {0} while querying for hostname &apos;{1}&apos;: SocketErrorCode={2}, ErrorCode={3}, NativeErrorCode={4}.
         /// </summary>
         internal static string GetHostEntryFailed {
             get {
@@ -511,7 +511,7 @@ internal static string GetHostEntryFailed {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Retrieving procedure metadata for {0} from server..
+        ///   Looks up a localized string similar to Retrieving procedure metadata for {0} from server.
         /// </summary>
         internal static string HardProcQuery {
             get {
@@ -520,7 +520,7 @@ internal static string HardProcQuery {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Value has an unsupported format..
+        ///   Looks up a localized string similar to Value has an unsupported format.
         /// </summary>
         internal static string ImproperValueFormat {
             get {
@@ -529,7 +529,7 @@ internal static string ImproperValueFormat {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to An incorrect response was received from the server..
+        ///   Looks up a localized string similar to An incorrect response was received from the server.
         /// </summary>
         internal static string IncorrectTransmission {
             get {
@@ -556,7 +556,7 @@ internal static string IndexMustBeValid {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The provided key is invalid..
+        ///   Looks up a localized string similar to The provided key is invalid.
         /// </summary>
         internal static string InvalidCertificateKey {
             get {
@@ -565,7 +565,7 @@ internal static string InvalidCertificateKey {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Certificate with Thumbprint &apos;{0}&apos; not found..
+        ///   Looks up a localized string similar to Certificate with Thumbprint &apos;{0}&apos; not found.
         /// </summary>
         internal static string InvalidCertificateThumbprint {
             get {
@@ -574,7 +574,7 @@ internal static string InvalidCertificateThumbprint {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You have specified an invalid column ordinal..
+        ///   Looks up a localized string similar to You have specified an invalid column ordinal.
         /// </summary>
         internal static string InvalidColumnOrdinal {
             get {
@@ -583,7 +583,7 @@ internal static string InvalidColumnOrdinal {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The requested value &apos;{0}&apos; is invalid for the given keyword &apos;{1}&apos;..
+        ///   Looks up a localized string similar to The requested value &apos;{0}&apos; is invalid for the given keyword &apos;{1}&apos;.
         /// </summary>
         internal static string InvalidConnectionStringValue {
             get {
@@ -592,7 +592,7 @@ internal static string InvalidConnectionStringValue {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The host name or IP address is invalid..
+        ///   Looks up a localized string similar to The host name or IP address is invalid.
         /// </summary>
         internal static string InvalidHostNameOrAddress {
             get {
@@ -601,7 +601,7 @@ internal static string InvalidHostNameOrAddress {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Microsecond must be a value between 0 and 999999..
+        ///   Looks up a localized string similar to Microsecond must be a value between 0 and 999999.
         /// </summary>
         internal static string InvalidMicrosecondValue {
             get {
@@ -610,7 +610,7 @@ internal static string InvalidMicrosecondValue {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Millisecond must be a value between 0 and 999. For more precision use Microsecond..
+        ///   Looks up a localized string similar to Millisecond must be a value between 0 and 999. For more precision use Microsecond.
         /// </summary>
         internal static string InvalidMillisecondValue {
             get {
@@ -619,7 +619,7 @@ internal static string InvalidMillisecondValue {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Either provide a valid path for &apos;allowloadlocalinfileinpath&apos; or enable &apos;allowloadlocalinfile&apos;..
+        ///   Looks up a localized string similar to Either provide a valid path for &apos;allowloadlocalinfileinpath&apos; or enable &apos;allowloadlocalinfile&apos;.
         /// </summary>
         internal static string InvalidPathForLoadLocalInfile {
             get {
@@ -628,7 +628,7 @@ internal static string InvalidPathForLoadLocalInfile {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Procedure or function &apos;{0}&apos; cannot be found in database &apos;{1}&apos;..
+        ///   Looks up a localized string similar to Procedure or function &apos;{0}&apos; cannot be found in database &apos;{1}&apos;.
         /// </summary>
         internal static string InvalidProcName {
             get {
@@ -637,7 +637,7 @@ internal static string InvalidProcName {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The certificate is invalid..
+        ///   Looks up a localized string similar to The certificate is invalid.
         /// </summary>
         internal static string InvalidSslCertificate {
             get {
@@ -646,7 +646,7 @@ internal static string InvalidSslCertificate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to validate the signature..
+        ///   Looks up a localized string similar to Unable to validate the signature.
         /// </summary>
         internal static string InvalidSslCertificateSignature {
             get {
@@ -655,7 +655,7 @@ internal static string InvalidSslCertificateSignature {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to verify the signature..
+        ///   Looks up a localized string similar to Unable to verify the signature.
         /// </summary>
         internal static string InvalidSslCertificateSignatureGeneral {
             get {
@@ -664,7 +664,7 @@ internal static string InvalidSslCertificateSignatureGeneral {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Value &apos;{0}&apos; is not of the correct type..
+        ///   Looks up a localized string similar to Value &apos;{0}&apos; is not of the correct type.
         /// </summary>
         internal static string InvalidSslMode {
             get {
@@ -673,7 +673,7 @@ internal static string InvalidSslMode {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; is an illegal value for a boolean option..
+        ///   Looks up a localized string similar to &apos;{0}&apos; is an illegal value for a boolean option.
         /// </summary>
         internal static string InvalidValueForBoolean {
             get {
@@ -682,7 +682,7 @@ internal static string InvalidValueForBoolean {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Keyword does not allow null values..
+        ///   Looks up a localized string similar to Keyword does not allow null values.
         /// </summary>
         internal static string KeywordNoNull {
             get {
@@ -691,7 +691,7 @@ internal static string KeywordNoNull {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Option not supported..
+        ///   Looks up a localized string similar to Option not supported.
         /// </summary>
         internal static string KeywordNotSupported {
             get {
@@ -700,7 +700,7 @@ internal static string KeywordNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Server asked for stream in response to LOAD DATA LOCAL INFILE, but the functionality is disabled by the client setting &apos;allowlocalinfile&apos; to &apos;false&apos;..
+        ///   Looks up a localized string similar to Server asked for stream in response to LOAD DATA LOCAL INFILE, but the functionality is disabled by the client setting &apos;allowlocalinfile&apos; to &apos;false&apos;.
         /// </summary>
         internal static string LocalInfileDisabled {
             get {
@@ -709,7 +709,7 @@ internal static string LocalInfileDisabled {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Mixing named and unnamed parameters is not allowed..
+        ///   Looks up a localized string similar to Mixing named and unnamed parameters is not allowed.
         /// </summary>
         internal static string MixedParameterNamingNotAllowed {
             get {
@@ -718,7 +718,7 @@ internal static string MixedParameterNamingNotAllowed {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to INTERNAL ERROR:  More than one output parameter row detected..
+        ///   Looks up a localized string similar to INTERNAL ERROR:  More than one output parameter row detected.
         /// </summary>
         internal static string MoreThanOneOPRow {
             get {
@@ -727,7 +727,7 @@ internal static string MoreThanOneOPRow {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Multiple simultaneous connections or connections with different connection strings inside the same transaction are not currently supported..
+        ///   Looks up a localized string similar to Multiple simultaneous connections or connections with different connection strings inside the same transaction are not currently supported.
         /// </summary>
         internal static string MultipleConnectionsInTransactionNotSupported {
             get {
@@ -754,7 +754,7 @@ internal static string NamedPipeNoSetLength {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The new value must be a MySqlParameter object..
+        ///   Looks up a localized string similar to The new value must be a MySqlParameter object.
         /// </summary>
         internal static string NewValueShouldBeMySqlParameter {
             get {
@@ -763,7 +763,7 @@ internal static string NewValueShouldBeMySqlParameter {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to call NextResult when the reader is closed..
+        ///   Looks up a localized string similar to Invalid attempt to call NextResult when the reader is closed.
         /// </summary>
         internal static string NextResultIsClosed {
             get {
@@ -772,7 +772,7 @@ internal static string NextResultIsClosed {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to When calling stored procedures and &apos;Use Procedure Bodies&apos; is false, all parameters must have their type explicitly set..
+        ///   Looks up a localized string similar to When calling stored procedures and &apos;Use Procedure Bodies&apos; is false, all parameters must have their type explicitly set.
         /// </summary>
         internal static string NoBodiesAndTypeNotSet {
             get {
@@ -781,7 +781,7 @@ internal static string NoBodiesAndTypeNotSet {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Nested transactions are not supported..
+        ///   Looks up a localized string similar to Nested transactions are not supported.
         /// </summary>
         internal static string NoNestedTransactions {
             get {
@@ -790,7 +790,7 @@ internal static string NoNestedTransactions {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The host {0} does not support SSL connections..
+        ///   Looks up a localized string similar to The host {0} does not support SSL connections.
         /// </summary>
         internal static string NoServerSSLSupport {
             get {
@@ -799,7 +799,7 @@ internal static string NoServerSSLSupport {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unix sockets are not supported on Windows..
+        ///   Looks up a localized string similar to Unix sockets are not supported on Windows.
         /// </summary>
         internal static string NoUnixSocketsOnWindows {
             get {
@@ -808,7 +808,7 @@ internal static string NoUnixSocketsOnWindows {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot retrieve Windows identity for current user. Connections that use  IntegratedSecurity cannot be  pooled. Use either &apos;ConnectionReset=true&apos; or  &apos;Pooling=false&apos; in the connection string to fix..
+        ///   Looks up a localized string similar to Cannot retrieve Windows identity for current user. Connections that use  IntegratedSecurity cannot be  pooled. Use either &apos;ConnectionReset=true&apos; or  &apos;Pooling=false&apos; in the connection string to fix.
         /// </summary>
         internal static string NoWindowsIdentity {
             get {
@@ -817,7 +817,7 @@ internal static string NoWindowsIdentity {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The object is not open or has been disposed..
+        ///   Looks up a localized string similar to The object is not open or has been disposed.
         /// </summary>
         internal static string ObjectDisposed {
             get {
@@ -826,7 +826,7 @@ internal static string ObjectDisposed {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to OCI configuration file could not be read..
+        ///   Looks up a localized string similar to OCI configuration file could not be read.
         /// </summary>
         internal static string OciConfigFileNotFound {
             get {
@@ -835,7 +835,7 @@ internal static string OciConfigFileNotFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to OCI configuration profile not found..
+        ///   Looks up a localized string similar to OCI configuration profile not found.
         /// </summary>
         internal static string OciConfigProfileNotFound {
             get {
@@ -844,7 +844,7 @@ internal static string OciConfigProfileNotFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to OCI configuration file does not contain a &apos;fingerprint&apos; or &apos;key_file&apos; entry..
+        ///   Looks up a localized string similar to OCI configuration file does not contain a &apos;fingerprint&apos; or &apos;key_file&apos; entry.
         /// </summary>
         internal static string OciEntryNotFound {
             get {
@@ -853,7 +853,7 @@ internal static string OciEntryNotFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to OCI configuration entry &apos;key_file&apos; does not reference a valid key file..
+        ///   Looks up a localized string similar to OCI configuration entry &apos;key_file&apos; does not reference a valid key file.
         /// </summary>
         internal static string OciInvalidKeyFile {
             get {
@@ -862,7 +862,7 @@ internal static string OciInvalidKeyFile {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Private key could not be found at location given by OCI configuration entry &apos;key_file&apos;..
+        ///   Looks up a localized string similar to Private key could not be found at location given by OCI configuration entry &apos;key_file&apos;.
         /// </summary>
         internal static string OciKeyFileDoesNotExists {
             get {
@@ -871,7 +871,7 @@ internal static string OciKeyFileDoesNotExists {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The OCI SDK cannot be found or is not installed..
+        ///   Looks up a localized string similar to The OCI SDK cannot be found or is not installed.
         /// </summary>
         internal static string OciSDKNotFound {
             get {
@@ -880,7 +880,7 @@ internal static string OciSDKNotFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Secutiry token file could not be found at location given by OCI configuration entry &apos;security_token_file&apos;..
+        ///   Looks up a localized string similar to Secutiry token file could not be found at location given by OCI configuration entry &apos;security_token_file&apos;.
         /// </summary>
         internal static string OciSecurityTokenDoesNotExists {
             get {
@@ -889,7 +889,7 @@ internal static string OciSecurityTokenDoesNotExists {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The size of the OCI security token file exceeds the maximum value of 10KB allowed..
+        ///   Looks up a localized string similar to The size of the OCI security token file exceeds the maximum value of 10KB allowed.
         /// </summary>
         internal static string OciSecurityTokenFileExceeds10KB {
             get {
@@ -916,7 +916,7 @@ internal static string OffsetMustBeValid {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Authentication with old password no longer supported, use 4.1 style passwords..
+        ///   Looks up a localized string similar to Authentication with old password no longer supported, use 4.1 style passwords.
         /// </summary>
         internal static string OldPasswordsNotSupported {
             get {
@@ -925,7 +925,7 @@ internal static string OldPasswordsNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The option &apos;{0}&apos; is not currently supported..
+        ///   Looks up a localized string similar to The option &apos;{0}&apos; is not currently supported.
         /// </summary>
         internal static string OptionNotCurrentlySupported {
             get {
@@ -934,7 +934,7 @@ internal static string OptionNotCurrentlySupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; has already been defined..
+        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; has already been defined.
         /// </summary>
         internal static string ParameterAlreadyDefined {
             get {
@@ -961,7 +961,7 @@ internal static string ParameterCannotBeNull {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; can&apos;t be null or empty..
+        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; can&apos;t be null or empty.
         /// </summary>
         internal static string ParameterCannotBeNullOrEmpty {
             get {
@@ -970,7 +970,7 @@ internal static string ParameterCannotBeNullOrEmpty {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Parameter index was not found in Parameter Collection..
+        ///   Looks up a localized string similar to Parameter index was not found in Parameter Collection.
         /// </summary>
         internal static string ParameterIndexNotFound {
             get {
@@ -979,7 +979,7 @@ internal static string ParameterIndexNotFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Parameter is invalid..
+        ///   Looks up a localized string similar to Parameter is invalid.
         /// </summary>
         internal static string ParameterIsInvalid {
             get {
@@ -988,7 +988,7 @@ internal static string ParameterIsInvalid {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; must be defined..
+        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; must be defined.
         /// </summary>
         internal static string ParameterMustBeDefined {
             get {
@@ -997,7 +997,7 @@ internal static string ParameterMustBeDefined {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; was not found during prepare..
+        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; was not found during prepare.
         /// </summary>
         internal static string ParameterNotFoundDuringPrepare {
             get {
@@ -1006,7 +1006,7 @@ internal static string ParameterNotFoundDuringPrepare {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Parameter can&apos;t be null or empty..
+        ///   Looks up a localized string similar to Parameter can&apos;t be null or empty.
         /// </summary>
         internal static string ParameterNullOrEmpty {
             get {
@@ -1042,7 +1042,7 @@ internal static string PerfMonCategoryName {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The number of times a procedures metadata had to be queried from the server..
+        ///   Looks up a localized string similar to The number of times a procedures metadata had to be queried from the server.
         /// </summary>
         internal static string PerfMonHardProcHelp {
             get {
@@ -1060,7 +1060,7 @@ internal static string PerfMonHardProcName {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The number of times a procedures metadata was retrieved from the client-side cache..
+        ///   Looks up a localized string similar to The number of times a procedures metadata was retrieved from the client-side cache.
         /// </summary>
         internal static string PerfMonSoftProcHelp {
             get {
@@ -1078,7 +1078,7 @@ internal static string PerfMonSoftProcName {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to same name are not supported..
+        ///   Looks up a localized string similar to same name are not supported.
         /// </summary>
         internal static string ProcAndFuncSameName {
             get {
@@ -1087,7 +1087,7 @@ internal static string ProcAndFuncSameName {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to MySQL Server {0} dos not support query attributes..
+        ///   Looks up a localized string similar to MySQL Server {0} dos not support query attributes.
         /// </summary>
         internal static string QueryAttributesNotSupported {
             get {
@@ -1096,7 +1096,7 @@ internal static string QueryAttributesNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to MySQL Connector/NET does not support query attributes with prepared statements for this version of MySQL Server..
+        ///   Looks up a localized string similar to MySQL Connector/NET does not support query attributes with prepared statements for this version of MySQL Server.
         /// </summary>
         internal static string QueryAttributesNotSupportedByCnet {
             get {
@@ -1105,7 +1105,7 @@ internal static string QueryAttributesNotSupportedByCnet {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Packets larger than max_allowed_packet are not allowed..
+        ///   Looks up a localized string similar to Packets larger than max_allowed_packet are not allowed.
         /// </summary>
         internal static string QueryTooLarge {
             get {
@@ -1114,7 +1114,7 @@ internal static string QueryTooLarge {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Reading from the stream has failed..
+        ///   Looks up a localized string similar to Reading from the stream has failed.
         /// </summary>
         internal static string ReadFromStreamFailed {
             get {
@@ -1132,7 +1132,7 @@ internal static string ReadingPriorColumnUsingSeqAccess {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Replicated connections allow only readonly statements..
+        ///   Looks up a localized string similar to Replicated connections allow only readonly statements.
         /// </summary>
         internal static string ReplicatedConnectionsAllowOnlyReadonlyStatements {
             get {
@@ -1141,7 +1141,7 @@ internal static string ReplicatedConnectionsAllowOnlyReadonlyStatements {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Attempt to connect to &apos;{0}&apos; server failed..
+        ///   Looks up a localized string similar to Attempt to connect to &apos;{0}&apos; server failed.
         /// </summary>
         internal static string Replication_ConnectionAttemptFailed {
             get {
@@ -1150,7 +1150,7 @@ internal static string Replication_ConnectionAttemptFailed {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No available server found..
+        ///   Looks up a localized string similar to No available server found.
         /// </summary>
         internal static string Replication_NoAvailableServer {
             get {
@@ -1159,7 +1159,7 @@ internal static string Replication_NoAvailableServer {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Replication group &apos;{0}&apos; not found..
+        ///   Looks up a localized string similar to Replication group &apos;{0}&apos; not found.
         /// </summary>
         internal static string ReplicationGroupNotFound {
             get {
@@ -1177,7 +1177,7 @@ internal static string ReplicationServerNotFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Routine &apos;{0}&apos; cannot be found. Either check the spelling or make sure you have sufficient rights to execute the routine..
+        ///   Looks up a localized string similar to Routine &apos;{0}&apos; cannot be found. Either check the spelling or make sure you have sufficient rights to execute the routine.
         /// </summary>
         internal static string RoutineNotFound {
             get {
@@ -1195,7 +1195,7 @@ internal static string RoutineRequiresReturnParameter {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Retrieval of the RSA public key is not enabled for insecure connections..
+        ///   Looks up a localized string similar to Retrieval of the RSA public key is not enabled for insecure connections.
         /// </summary>
         internal static string RSAPublicKeyRetrievalNotEnabled {
             get {
@@ -1213,7 +1213,7 @@ internal static string ServerTooOld {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Snapshot isolation level is not supported..
+        ///   Looks up a localized string similar to Snapshot isolation level is not supported.
         /// </summary>
         internal static string SnapshotNotSupported {
             get {
@@ -1231,7 +1231,7 @@ internal static string SocketNoSeek {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Retrieving procedure metadata for {0} from procedure cache..
+        ///   Looks up a localized string similar to Retrieving procedure metadata for {0} from procedure cache.
         /// </summary>
         internal static string SoftProcQuery {
             get {
@@ -1249,7 +1249,7 @@ internal static string SPNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The certificate authority (CA) does not match..
+        ///   Looks up a localized string similar to The certificate authority (CA) does not match.
         /// </summary>
         internal static string SslCertificateCAMismatch {
             get {
@@ -1258,7 +1258,7 @@ internal static string SslCertificateCAMismatch {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The host name does not match the name on the certificate..
+        ///   Looks up a localized string similar to The host name does not match the name on the certificate.
         /// </summary>
         internal static string SslCertificateHostNameMismatch {
             get {
@@ -1267,7 +1267,7 @@ internal static string SslCertificateHostNameMismatch {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The certificate is not a certificate authority (CA)..
+        ///   Looks up a localized string similar to The certificate is not a certificate authority (CA).
         /// </summary>
         internal static string SslCertificateIsNotCA {
             get {
@@ -1276,7 +1276,7 @@ internal static string SslCertificateIsNotCA {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to SSL Connection error..
+        ///   Looks up a localized string similar to SSL Connection error.
         /// </summary>
         internal static string SslConnectionError {
             get {
@@ -1285,7 +1285,7 @@ internal static string SslConnectionError {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection protocol &apos;{0}&apos; does not support SSL connections..
+        ///   Looks up a localized string similar to Connection protocol &apos;{0}&apos; does not support SSL connections.
         /// </summary>
         internal static string SslNotAllowedForConnectionProtocol {
             get {
@@ -1321,7 +1321,7 @@ internal static string StreamNoWrite {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to String can&apos;t be empty..
+        ///   Looks up a localized string similar to String can&apos;t be empty.
         /// </summary>
         internal static string StringEmpty {
             get {
@@ -1330,7 +1330,7 @@ internal static string StringEmpty {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Timeout expired.  The timeout period elapsed prior to completion of the operation or the server is not responding..
+        ///   Looks up a localized string similar to Timeout expired.  The timeout period elapsed prior to completion of the operation or the server is not responding.
         /// </summary>
         internal static string Timeout {
             get {
@@ -1339,7 +1339,7 @@ internal static string Timeout {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to error connecting: Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached..
+        ///   Looks up a localized string similar to error connecting: Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached.
         /// </summary>
         internal static string TimeoutGettingConnection {
             get {
@@ -1348,7 +1348,7 @@ internal static string TimeoutGettingConnection {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to All server connection attempts were aborted. Timeout of {0} seconds was exceeded for each selected server..
+        ///   Looks up a localized string similar to All server connection attempts were aborted. Timeout of {0} seconds was exceeded for each selected server.
         /// </summary>
         internal static string TimeOutMultipleHost {
             get {
@@ -1393,7 +1393,7 @@ internal static string TraceCloseConnection {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to trace.  There are more than Int32.MaxValue connections in use..
+        ///   Looks up a localized string similar to Unable to trace.  There are more than Int32.MaxValue connections in use.
         /// </summary>
         internal static string TraceErrorMoreThanMaxValueConnections {
             get {
@@ -1546,7 +1546,7 @@ internal static string TraceUAWarningSkippedColumns {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0}: Usage Advisor Warning: Skipped {2} rows. Consider a more focused query..
+        ///   Looks up a localized string similar to {0}: Usage Advisor Warning: Skipped {2} rows. Consider a more focused query.
         /// </summary>
         internal static string TraceUAWarningSkippedRows {
             get {
@@ -1582,7 +1582,7 @@ internal static string TypeIsNotExceptionInterceptor {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to connect to any of the specified MySQL hosts..
+        ///   Looks up a localized string similar to Unable to connect to any of the specified MySQL hosts.
         /// </summary>
         internal static string UnableToConnectToHost {
             get {
@@ -1591,7 +1591,7 @@ internal static string UnableToConnectToHost {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to create plugin for authentication method &apos;{0}&apos;. Please see inner exception for details..
+        ///   Looks up a localized string similar to Unable to create plugin for authentication method &apos;{0}&apos;. Please see inner exception for details.
         /// </summary>
         internal static string UnableToCreateAuthPlugin {
             get {
@@ -1600,7 +1600,7 @@ internal static string UnableToCreateAuthPlugin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to derive stored routine parameters.  The &apos;Parameters&apos; information schema table is not available and access to the stored procedure body has been disabled..
+        ///   Looks up a localized string similar to Unable to derive stored routine parameters.  The &apos;Parameters&apos; information schema table is not available and access to the stored procedure body has been disabled.
         /// </summary>
         internal static string UnableToDeriveParameters {
             get {
@@ -1609,7 +1609,7 @@ internal static string UnableToDeriveParameters {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to enable query analysis.  Be sure the MySql.Data.EMTrace assembly is properly located and registered..
+        ///   Looks up a localized string similar to Unable to enable query analysis.  Be sure the MySql.Data.EMTrace assembly is properly located and registered.
         /// </summary>
         internal static string UnableToEnableQueryAnalysis {
             get {
@@ -1627,7 +1627,7 @@ internal static string UnableToEnumerateUDF {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to execute stored procedure &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Unable to execute stored procedure &apos;{0}&apos;.
         /// </summary>
         internal static string UnableToExecuteSP {
             get {
@@ -1636,7 +1636,7 @@ internal static string UnableToExecuteSP {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There was an error parsing the foreign key definition..
+        ///   Looks up a localized string similar to There was an error parsing the foreign key definition.
         /// </summary>
         internal static string UnableToParseFK {
             get {
@@ -1645,7 +1645,7 @@ internal static string UnableToParseFK {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error encountered reading the RSA public key..
+        ///   Looks up a localized string similar to Error encountered reading the RSA public key.
         /// </summary>
         internal static string UnableToReadRSAKey {
             get {
@@ -1654,7 +1654,7 @@ internal static string UnableToReadRSAKey {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to retrieve stored procedure metadata for routine &apos;{0}&apos;.  Either grant  SELECT privilege to mysql.proc for this user or use &quot;check parameters=false&quot; with  your connection string..
+        ///   Looks up a localized string similar to Unable to retrieve stored procedure metadata for routine &apos;{0}&apos;.  Either grant  SELECT privilege to mysql.proc for this user or use &quot;check parameters=false&quot; with  your connection string.
         /// </summary>
         internal static string UnableToRetrieveParameters {
             get {
@@ -1663,7 +1663,7 @@ internal static string UnableToRetrieveParameters {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to start a second async operation while one is running..
+        ///   Looks up a localized string similar to Unable to start a second async operation while one is running.
         /// </summary>
         internal static string UnableToStartSecondAsyncOp {
             get {
@@ -1681,7 +1681,7 @@ internal static string UnixSocketsNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unknown authentication method &apos;{0}&apos; was requested..
+        ///   Looks up a localized string similar to Unknown authentication method &apos;{0}&apos; was requested.
         /// </summary>
         internal static string UnknownAuthenticationMethod {
             get {
@@ -1699,7 +1699,7 @@ internal static string UnknownConnectionProtocol {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to MySQL user &apos;{0}&apos; does not equal the logged-in Windows user &apos;{1}&apos;..
+        ///   Looks up a localized string similar to MySQL user &apos;{0}&apos; does not equal the logged-in Windows user &apos;{1}&apos;.
         /// </summary>
         internal static string UnmatchedWinUserAndMySqlUser {
             get {
@@ -1708,7 +1708,7 @@ internal static string UnmatchedWinUserAndMySqlUser {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Trying to upload a file from outside the path set on &apos;allowloadlocalinfileinpath&apos; is invalid..
+        ///   Looks up a localized string similar to Trying to upload a file from outside the path set on &apos;allowloadlocalinfileinpath&apos; is invalid.
         /// </summary>
         internal static string UnsafePathForLoadLocalInfile {
             get {
@@ -1717,7 +1717,7 @@ internal static string UnsafePathForLoadLocalInfile {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Value &apos;{0}&apos; is not of the correct type..
+        ///   Looks up a localized string similar to Value &apos;{0}&apos; is not of the correct type.
         /// </summary>
         internal static string ValueNotCorrectType {
             get {
@@ -1726,7 +1726,7 @@ internal static string ValueNotCorrectType {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The requested column value could not be treated as or conveted to a Guid..
+        ///   Looks up a localized string similar to The requested column value could not be treated as or conveted to a Guid.
         /// </summary>
         internal static string ValueNotSupportedForGuid {
             get {
@@ -1735,7 +1735,7 @@ internal static string ValueNotSupportedForGuid {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to An event handler for WebAuthnActionRequested was not specified..
+        ///   Looks up a localized string similar to An event handler for WebAuthnActionRequested was not specified.
         /// </summary>
         internal static string WebAuthnMissingHandler {
             get {
@@ -1744,7 +1744,7 @@ internal static string WebAuthnMissingHandler {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The timeout of 15 seconds for user interaction with FIDO device has been exceeded..
+        ///   Looks up a localized string similar to The timeout of 15 seconds for user interaction with FIDO device has been exceeded.
         /// </summary>
         internal static string WebAuthnTimeout {
             get {
@@ -1762,7 +1762,7 @@ internal static string WinAuthNotSupportOnPlatform {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Writing to the stream failed..
+        ///   Looks up a localized string similar to Writing to the stream failed.
         /// </summary>
         internal static string WriteToStreamFailed {
             get {
@@ -1771,7 +1771,7 @@ internal static string WriteToStreamFailed {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; is not found but a parameter with the name &apos;{1}&apos; is found. Parameter names must include the leading parameter marker..
+        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; is not found but a parameter with the name &apos;{1}&apos; is found. Parameter names must include the leading parameter marker.
         /// </summary>
         internal static string WrongParameterName {
             get {
diff --git a/MySQL.Data/src/Resources.resx b/MySQL.Data/src/Resources.resx
index 732ef98b1..c5aa46d9a 100644
--- a/MySQL.Data/src/Resources.resx
+++ b/MySQL.Data/src/Resources.resx
@@ -184,16 +184,16 @@
     <value>Connection must be valid and open</value>
   </data>
   <data name="DataReaderOpen" xml:space="preserve">
-    <value>There is already an open DataReader associated with this Connection which must be closed first.</value>
+    <value>There is already an open DataReader associated with this Connection which must be closed first</value>
   </data>
   <data name="SPNotSupported" xml:space="preserve">
     <value>Stored procedures are not supported on this version of MySQL</value>
   </data>
   <data name="ConnectionNotSet" xml:space="preserve">
-    <value>The connection property has not been set or is null.</value>
+    <value>The connection property has not been set or is null</value>
   </data>
   <data name="ConnectionNotOpen" xml:space="preserve">
-    <value>The connection is not open.</value>
+    <value>The connection is not open</value>
   </data>
   <data name="AdapterIsNull" xml:space="preserve">
     <value>Improper MySqlCommandBuilder state: adapter is null</value>
@@ -214,67 +214,67 @@
     <value>Chaos isolation level is not supported </value>
   </data>
   <data name="ParameterIsInvalid" xml:space="preserve">
-    <value>Parameter is invalid.</value>
+    <value>Parameter is invalid</value>
   </data>
   <data name="ConnectionAlreadyOpen" xml:space="preserve">
-    <value>The connection is already open.</value>
+    <value>The connection is already open</value>
   </data>
   <data name="KeywordNotSupported" xml:space="preserve">
-    <value>Option not supported.</value>
+    <value>Option not supported</value>
   </data>
   <data name="WriteToStreamFailed" xml:space="preserve">
-    <value>Writing to the stream failed.</value>
+    <value>Writing to the stream failed</value>
   </data>
   <data name="ReadFromStreamFailed" xml:space="preserve">
-    <value>Reading from the stream has failed.</value>
+    <value>Reading from the stream has failed</value>
   </data>
   <data name="QueryTooLarge" xml:space="preserve">
-    <value>Packets larger than max_allowed_packet are not allowed.</value>
+    <value>Packets larger than max_allowed_packet are not allowed</value>
   </data>
   <data name="UnableToExecuteSP" xml:space="preserve">
-    <value>Unable to execute stored procedure '{0}'.</value>
+    <value>Unable to execute stored procedure '{0}'</value>
   </data>
   <data name="ProcAndFuncSameName" xml:space="preserve">
-    <value>same name are not supported.</value>
+    <value>same name are not supported</value>
   </data>
   <data name="KeywordNoNull" xml:space="preserve">
-    <value>Keyword does not allow null values.</value>
+    <value>Keyword does not allow null values</value>
   </data>
   <data name="ImproperValueFormat" xml:space="preserve">
-    <value>Value has an unsupported format.</value>
+    <value>Value has an unsupported format</value>
   </data>
   <data name="InvalidProcName" xml:space="preserve">
-    <value>Procedure or function '{0}' cannot be found in database '{1}'.</value>
+    <value>Procedure or function '{0}' cannot be found in database '{1}'</value>
   </data>
   <data name="HardProcQuery" xml:space="preserve">
-    <value>Retrieving procedure metadata for {0} from server.</value>
+    <value>Retrieving procedure metadata for {0} from server</value>
   </data>
   <data name="SoftProcQuery" xml:space="preserve">
-    <value>Retrieving procedure metadata for {0} from procedure cache.</value>
+    <value>Retrieving procedure metadata for {0} from procedure cache</value>
   </data>
   <data name="ConnectionBroken" xml:space="preserve">
-    <value>Connection unexpectedly terminated.</value>
+    <value>Connection unexpectedly terminated</value>
   </data>
   <data name="IncorrectTransmission" xml:space="preserve">
-    <value>An incorrect response was received from the server.</value>
+    <value>An incorrect response was received from the server</value>
   </data>
   <data name="CancelNotSupported" xml:space="preserve">
-    <value>Canceling an active query is only supported on MySQL 5.0.0 and above. </value>
+    <value>Canceling an active query is only supported on MySQL 5.0.0 and above</value>
   </data>
   <data name="Timeout" xml:space="preserve">
-    <value>Timeout expired.  The timeout period elapsed prior to completion of the operation or the server is not responding.</value>
+    <value>Timeout expired.  The timeout period elapsed prior to completion of the operation or the server is not responding</value>
   </data>
   <data name="CancelNeeds50" xml:space="preserve">
-    <value>Canceling an executing query requires MySQL 5.0 or higher.</value>
+    <value>Canceling an executing query requires MySQL 5.0 or higher</value>
   </data>
   <data name="NoNestedTransactions" xml:space="preserve">
-    <value>Nested transactions are not supported.</value>
+    <value>Nested transactions are not supported</value>
   </data>
   <data name="CommandTextNotInitialized" xml:space="preserve">
-    <value>The CommandText property has not been properly initialized.</value>
+    <value>The CommandText property has not been properly initialized</value>
   </data>
   <data name="UnableToParseFK" xml:space="preserve">
-    <value>There was an error parsing the foreign key definition.</value>
+    <value>There was an error parsing the foreign key definition</value>
   </data>
   <data name="PerfMonCategoryHelp" xml:space="preserve">
     <value>This category includes a series of counters for MySQL</value>
@@ -283,91 +283,91 @@
     <value>.NET Data Provider for MySQL</value>
   </data>
   <data name="PerfMonHardProcHelp" xml:space="preserve">
-    <value>The number of times a procedures metadata had to be queried from the server.</value>
+    <value>The number of times a procedures metadata had to be queried from the server</value>
   </data>
   <data name="PerfMonHardProcName" xml:space="preserve">
     <value>Hard Procedure Queries</value>
   </data>
   <data name="PerfMonSoftProcHelp" xml:space="preserve">
-    <value>The number of times a procedures metadata was retrieved from the client-side cache.</value>
+    <value>The number of times a procedures metadata was retrieved from the client-side cache</value>
   </data>
   <data name="PerfMonSoftProcName" xml:space="preserve">
     <value>Soft Procedure Queries</value>
   </data>
   <data name="WrongParameterName" xml:space="preserve">
-    <value>Parameter '{0}' is not found but a parameter with the name '{1}' is found. Parameter names must include the leading parameter marker.</value>
+    <value>Parameter '{0}' is not found but a parameter with the name '{1}' is found. Parameter names must include the leading parameter marker</value>
   </data>
   <data name="UnableToConnectToHost" xml:space="preserve">
-    <value>Unable to connect to any of the specified MySQL hosts.</value>
+    <value>Unable to connect to any of the specified MySQL hosts</value>
   </data>
   <data name="UnableToRetrieveParameters" xml:space="preserve">
-    <value>Unable to retrieve stored procedure metadata for routine '{0}'.  Either grant  SELECT privilege to mysql.proc for this user or use "check parameters=false" with  your connection string.</value>
+    <value>Unable to retrieve stored procedure metadata for routine '{0}'.  Either grant  SELECT privilege to mysql.proc for this user or use "check parameters=false" with  your connection string</value>
   </data>
   <data name="NextResultIsClosed" xml:space="preserve">
-    <value>Invalid attempt to call NextResult when the reader is closed.</value>
+    <value>Invalid attempt to call NextResult when the reader is closed</value>
   </data>
   <data name="NoBodiesAndTypeNotSet" xml:space="preserve">
-    <value>When calling stored procedures and 'Use Procedure Bodies' is false, all parameters must have their type explicitly set.</value>
+    <value>When calling stored procedures and 'Use Procedure Bodies' is false, all parameters must have their type explicitly set</value>
   </data>
   <data name="TimeoutGettingConnection" xml:space="preserve">
-    <value>error connecting: Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached.</value>
+    <value>error connecting: Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached</value>
   </data>
   <data name="ParameterAlreadyDefined" xml:space="preserve">
-    <value>Parameter '{0}' has already been defined.</value>
+    <value>Parameter '{0}' has already been defined</value>
   </data>
   <data name="ParameterMustBeDefined" xml:space="preserve">
-    <value>Parameter '{0}' must be defined.</value>
+    <value>Parameter '{0}' must be defined</value>
   </data>
   <data name="ObjectDisposed" xml:space="preserve">
-    <value>The object is not open or has been disposed.</value>
+    <value>The object is not open or has been disposed</value>
   </data>
   <data name="MultipleConnectionsInTransactionNotSupported" xml:space="preserve">
-    <value>Multiple simultaneous connections or connections with different connection strings inside the same transaction are not currently supported.</value>
+    <value>Multiple simultaneous connections or connections with different connection strings inside the same transaction are not currently supported</value>
   </data>
   <data name="DistributedTxnNotSupported" xml:space="preserve">
-    <value>MySQL Connector/NET does not currently support distributed transactions.</value>
+    <value>MySQL Connector/NET does not currently support distributed transactions</value>
   </data>
   <data name="FatalErrorDuringExecute" xml:space="preserve">
-    <value>Fatal error encountered during command execution.</value>
+    <value>Fatal error encountered during command execution</value>
   </data>
   <data name="FatalErrorDuringRead" xml:space="preserve">
-    <value>Fatal error encountered during data read.</value>
+    <value>Fatal error encountered during data read</value>
   </data>
   <data name="FatalErrorReadingResult" xml:space="preserve">
-    <value>Fatal error encountered attempting to read the resultset.</value>
+    <value>Fatal error encountered attempting to read the resultset</value>
   </data>
   <data name="RoutineNotFound" xml:space="preserve">
-    <value>Routine '{0}' cannot be found. Either check the spelling or make sure you have sufficient rights to execute the routine.</value>
+    <value>Routine '{0}' cannot be found. Either check the spelling or make sure you have sufficient rights to execute the routine</value>
   </data>
   <data name="ParameterNotFoundDuringPrepare" xml:space="preserve">
-    <value>Parameter '{0}' was not found during prepare.</value>
+    <value>Parameter '{0}' was not found during prepare</value>
   </data>
   <data name="ValueNotSupportedForGuid" xml:space="preserve">
-    <value>The requested column value could not be treated as or conveted to a Guid.</value>
+    <value>The requested column value could not be treated as or conveted to a Guid</value>
   </data>
   <data name="UnableToDeriveParameters" xml:space="preserve">
-    <value>Unable to derive stored routine parameters.  The 'Parameters' information schema table is not available and access to the stored procedure body has been disabled.</value>
+    <value>Unable to derive stored routine parameters.  The 'Parameters' information schema table is not available and access to the stored procedure body has been disabled</value>
   </data>
   <data name="DefaultEncodingNotFound" xml:space="preserve">
-    <value>The default connection encoding was not found. Please report this as a bug along with your connection string and system details.</value>
+    <value>The default connection encoding was not found. Please report this as a bug along with your connection string and system details</value>
   </data>
   <data name="GetHostEntryFailed" xml:space="preserve">
-    <value>Call to GetHostEntry failed after {0} while querying for hostname '{1}': SocketErrorCode={2}, ErrorCode={3}, NativeErrorCode={4}.</value>
+    <value>Call to GetHostEntry failed after {0} while querying for hostname '{1}': SocketErrorCode={2}, ErrorCode={3}, NativeErrorCode={4}</value>
   </data>
   <data name="UnableToEnumerateUDF" xml:space="preserve">
     <value>An error occured attempting to enumerate the user-defined functions.  Do you have SELECT privileges on the mysql.func table?</value>
   </data>
   <data name="DataNotInSupportedFormat" xml:space="preserve">
-    <value>The given value was not in a supported format.</value>
+    <value>The given value was not in a supported format</value>
   </data>
   <data name="NoServerSSLSupport" xml:space="preserve">
-    <value>The host {0} does not support SSL connections.</value>
+    <value>The host {0} does not support SSL connections</value>
   </data>
   <data name="CouldNotFindColumnName" xml:space="preserve">
     <value>Could not find specified column in results: {0}</value>
   </data>
   <data name="InvalidColumnOrdinal" xml:space="preserve">
-    <value>You have specified an invalid column ordinal.</value>
+    <value>You have specified an invalid column ordinal</value>
   </data>
   <data name="ReadingPriorColumnUsingSeqAccess" xml:space="preserve">
     <value>Invalid attempt to read a prior column using SequentialAccess</value>
@@ -376,19 +376,19 @@
     <value>Invalid attempt to access a field before calling Read()</value>
   </data>
   <data name="UnableToStartSecondAsyncOp" xml:space="preserve">
-    <value>Unable to start a second async operation while one is running.</value>
+    <value>Unable to start a second async operation while one is running</value>
   </data>
   <data name="MoreThanOneOPRow" xml:space="preserve">
-    <value>INTERNAL ERROR:  More than one output parameter row detected.</value>
+    <value>INTERNAL ERROR:  More than one output parameter row detected</value>
   </data>
   <data name="InvalidValueForBoolean" xml:space="preserve">
-    <value>'{0}' is an illegal value for a boolean option.</value>
+    <value>'{0}' is an illegal value for a boolean option</value>
   </data>
   <data name="ServerTooOld" xml:space="preserve">
     <value>Connector/NET no longer supports server versions prior to 5.0</value>
   </data>
   <data name="InvalidConnectionStringValue" xml:space="preserve">
-    <value>The requested value '{0}' is invalid for the given keyword '{1}'.</value>
+    <value>The requested value '{0}' is invalid for the given keyword '{1}'</value>
   </data>
   <data name="TraceCloseConnection" xml:space="preserve">
     <value>{0}: Connection Closed</value>
@@ -418,7 +418,7 @@
     <value>{0}: Resultset Closed. Total rows={1}, skipped rows={2}, size (bytes)={3}</value>
   </data>
   <data name="TraceUAWarningSkippedRows" xml:space="preserve">
-    <value>{0}: Usage Advisor Warning: Skipped {2} rows. Consider a more focused query.</value>
+    <value>{0}: Usage Advisor Warning: Skipped {2} rows. Consider a more focused query</value>
   </data>
   <data name="TraceUAWarningSkippedColumns" xml:space="preserve">
     <value>{0}: Usage Advisor Warning: The following columns were not accessed: {2}</value>
@@ -436,7 +436,7 @@
     <value>{0}: MySql Warning: Level={1}, Code={2}, Message={3}</value>
   </data>
   <data name="TraceErrorMoreThanMaxValueConnections" xml:space="preserve">
-    <value>Unable to trace.  There are more than Int32.MaxValue connections in use.</value>
+    <value>Unable to trace.  There are more than Int32.MaxValue connections in use</value>
   </data>
   <data name="TraceStatementPrepared" xml:space="preserve">
     <value>{0}: Statement prepared: sql='{1}', statement id={2}</value>
@@ -448,28 +448,28 @@
     <value>{0}: Statement executed: statement id = {1}</value>
   </data>
   <data name="UnableToEnableQueryAnalysis" xml:space="preserve">
-    <value>Unable to enable query analysis.  Be sure the MySql.Data.EMTrace assembly is properly located and registered.</value>
+    <value>Unable to enable query analysis.  Be sure the MySql.Data.EMTrace assembly is properly located and registered</value>
   </data>
   <data name="TraceQueryNormalized" xml:space="preserve">
     <value>{0}: Query Normalized: {2}</value>
   </data>
   <data name="NoWindowsIdentity" xml:space="preserve">
-    <value>Cannot retrieve Windows identity for current user. Connections that use  IntegratedSecurity cannot be  pooled. Use either 'ConnectionReset=true' or  'Pooling=false' in the connection string to fix.</value>
+    <value>Cannot retrieve Windows identity for current user. Connections that use  IntegratedSecurity cannot be  pooled. Use either 'ConnectionReset=true' or  'Pooling=false' in the connection string to fix</value>
   </data>
   <data name="RoutineRequiresReturnParameter" xml:space="preserve">
     <value>Attempt to call stored function '{0}' without specifying a return parameter</value>
   </data>
   <data name="CanNotDeriveParametersForTextCommands" xml:space="preserve">
-    <value>Parameters can only be derived for commands using the StoredProcedure command type.</value>
+    <value>Parameters can only be derived for commands using the StoredProcedure command type</value>
   </data>
   <data name="ReplicatedConnectionsAllowOnlyReadonlyStatements" xml:space="preserve">
-    <value>Replicated connections allow only readonly statements.</value>
+    <value>Replicated connections allow only readonly statements</value>
   </data>
   <data name="FileBasedCertificateNotSupported" xml:space="preserve">
-    <value>File based certificates are only supported when connecting to MySQL Server 5.1 or greater.</value>
+    <value>File based certificates are only supported when connecting to MySQL Server 5.1 or greater</value>
   </data>
   <data name="SnapshotNotSupported" xml:space="preserve">
-    <value>Snapshot isolation level is not supported.</value>
+    <value>Snapshot isolation level is not supported</value>
   </data>
   <data name="TypeIsNotExceptionInterceptor" xml:space="preserve">
     <value>Type '{0}' is not derived from BaseExceptionInterceptor</value>
@@ -478,7 +478,7 @@
     <value>Type '{0}' is not derived from BaseCommandInterceptor</value>
   </data>
   <data name="UnknownAuthenticationMethod" xml:space="preserve">
-    <value>Unknown authentication method '{0}' was requested.</value>
+    <value>Unknown authentication method '{0}' was requested</value>
   </data>
   <data name="AuthenticationFailed" xml:space="preserve">
     <value>Authentication to host '{0}' for user '{1}' using method '{2}' failed with message: {3}</value>
@@ -487,133 +487,133 @@
     <value>Windows authentication connections are not supported on {0}</value>
   </data>
   <data name="AuthenticationMethodNotSupported" xml:space="preserve">
-    <value>Authentication method '{0}' not supported by any of the available plugins.</value>
+    <value>Authentication method '{0}' not supported by any of the available plugins</value>
   </data>
   <data name="UnableToCreateAuthPlugin" xml:space="preserve">
-    <value>Unable to create plugin for authentication method '{0}'. Please see inner exception for details.</value>
+    <value>Unable to create plugin for authentication method '{0}'. Please see inner exception for details</value>
   </data>
   <data name="MixedParameterNamingNotAllowed" xml:space="preserve">
-    <value>Mixing named and unnamed parameters is not allowed.</value>
+    <value>Mixing named and unnamed parameters is not allowed</value>
   </data>
   <data name="ParameterIndexNotFound" xml:space="preserve">
-    <value>Parameter index was not found in Parameter Collection.</value>
+    <value>Parameter index was not found in Parameter Collection</value>
   </data>
   <data name="OldPasswordsNotSupported" xml:space="preserve">
-    <value>Authentication with old password no longer supported, use 4.1 style passwords.</value>
+    <value>Authentication with old password no longer supported, use 4.1 style passwords</value>
   </data>
   <data name="InvalidMicrosecondValue" xml:space="preserve">
-    <value>Microsecond must be a value between 0 and 999999.</value>
+    <value>Microsecond must be a value between 0 and 999999</value>
   </data>
   <data name="InvalidMillisecondValue" xml:space="preserve">
-    <value>Millisecond must be a value between 0 and 999. For more precision use Microsecond.</value>
+    <value>Millisecond must be a value between 0 and 999. For more precision use Microsecond</value>
   </data>
   <data name="Replication_NoAvailableServer" xml:space="preserve">
-    <value>No available server found.</value>
+    <value>No available server found</value>
   </data>
   <data name="Replication_ConnectionAttemptFailed" xml:space="preserve">
-    <value>Attempt to connect to '{0}' server failed.</value>
+    <value>Attempt to connect to '{0}' server failed</value>
   </data>
   <data name="UnknownConnectionProtocol" xml:space="preserve">
     <value>Unknown connection protocol</value>
   </data>
   <data name="NoUnixSocketsOnWindows" xml:space="preserve">
-    <value>Unix sockets are not supported on Windows.</value>
+    <value>Unix sockets are not supported on Windows</value>
   </data>
   <data name="ReplicationServerNotFound" xml:space="preserve">
     <value>Replicated server not found: '{0}'</value>
   </data>
   <data name="ReplicationGroupNotFound" xml:space="preserve">
-    <value>Replication group '{0}' not found.</value>
+    <value>Replication group '{0}' not found</value>
   </data>
   <data name="NewValueShouldBeMySqlParameter" xml:space="preserve">
-    <value>The new value must be a MySqlParameter object.</value>
+    <value>The new value must be a MySqlParameter object</value>
   </data>
   <data name="ValueNotCorrectType" xml:space="preserve">
-    <value>Value '{0}' is not of the correct type.</value>
+    <value>Value '{0}' is not of the correct type</value>
   </data>
   <data name="CompressionNotSupported" xml:space="preserve">
-    <value>Compression is not supported.</value>
+    <value>Compression is not supported</value>
   </data>
   <data name="SslConnectionError" xml:space="preserve">
-    <value>SSL Connection error.</value>
+    <value>SSL Connection error</value>
   </data>
   <data name="OptionNotCurrentlySupported" xml:space="preserve">
-    <value>The option '{0}' is not currently supported.</value>
+    <value>The option '{0}' is not currently supported</value>
   </data>
   <data name="ParameterNullOrEmpty" xml:space="preserve">
-    <value>Parameter can't be null or empty.</value>
+    <value>Parameter can't be null or empty</value>
   </data>
   <data name="UnableToReadRSAKey" xml:space="preserve">
-    <value>Error encountered reading the RSA public key.</value>
+    <value>Error encountered reading the RSA public key</value>
   </data>
   <data name="RSAPublicKeyRetrievalNotEnabled" xml:space="preserve">
-    <value>Retrieval of the RSA public key is not enabled for insecure connections.</value>
+    <value>Retrieval of the RSA public key is not enabled for insecure connections</value>
   </data>
   <data name="StringEmpty" xml:space="preserve">
-    <value>String can't be empty.</value>
+    <value>String can't be empty</value>
   </data>
   <data name="InvalidSslMode" xml:space="preserve">
-    <value>Value '{0}' is not of the correct type.</value>
+    <value>Value '{0}' is not of the correct type</value>
   </data>
   <data name="ParameterCannotBeNullOrEmpty" xml:space="preserve">
-    <value>Parameter '{0}' can't be null or empty.</value>
+    <value>Parameter '{0}' can't be null or empty</value>
   </data>
   <data name="EncodingError" xml:space="preserve">
-    <value>Encoding error during validation.</value>
+    <value>Encoding error during validation</value>
   </data>
   <data name="FileIsNotACertificate" xml:space="preserve">
-    <value>The specified file cannot be converted to a certificate.</value>
+    <value>The specified file cannot be converted to a certificate</value>
   </data>
   <data name="FileIsNotAKey" xml:space="preserve">
-    <value>The specified file cannot be converted to a key.</value>
+    <value>The specified file cannot be converted to a key</value>
   </data>
   <data name="FileNotFound" xml:space="preserve">
-    <value>Failed to read file at the specified location.</value>
+    <value>Failed to read file at the specified location</value>
   </data>
   <data name="FilePathNotSet" xml:space="preserve">
-    <value>No file path has been provided for the connection option {0}.</value>
+    <value>No file path has been provided for the connection option {0}</value>
   </data>
   <data name="InvalidCertificateKey" xml:space="preserve">
-    <value>The provided key is invalid.</value>
+    <value>The provided key is invalid</value>
   </data>
   <data name="InvalidSslCertificate" xml:space="preserve">
-    <value>The certificate is invalid.</value>
+    <value>The certificate is invalid</value>
   </data>
   <data name="InvalidSslCertificateSignature" xml:space="preserve">
-    <value>Unable to validate the signature.</value>
+    <value>Unable to validate the signature</value>
   </data>
   <data name="InvalidSslCertificateSignatureGeneral" xml:space="preserve">
-    <value>Unable to verify the signature.</value>
+    <value>Unable to verify the signature</value>
   </data>
   <data name="SslCertificateCAMismatch" xml:space="preserve">
-    <value>The certificate authority (CA) does not match.</value>
+    <value>The certificate authority (CA) does not match</value>
   </data>
   <data name="SslCertificateHostNameMismatch" xml:space="preserve">
-    <value>The host name does not match the name on the certificate.</value>
+    <value>The host name does not match the name on the certificate</value>
   </data>
   <data name="SslCertificateIsNotCA" xml:space="preserve">
-    <value>The certificate is not a certificate authority (CA).</value>
+    <value>The certificate is not a certificate authority (CA)</value>
   </data>
   <data name="LocalInfileDisabled" xml:space="preserve">
-    <value>Server asked for stream in response to LOAD DATA LOCAL INFILE, but the functionality is disabled by the client setting 'allowlocalinfile' to 'false'.</value>
+    <value>Server asked for stream in response to LOAD DATA LOCAL INFILE, but the functionality is disabled by the client setting 'allowlocalinfile' to 'false'</value>
   </data>
   <data name="InvalidHostNameOrAddress" xml:space="preserve">
-    <value>The host name or IP address is invalid.</value>
+    <value>The host name or IP address is invalid</value>
   </data>
   <data name="TimeOutMultipleHost" xml:space="preserve">
-    <value>All server connection attempts were aborted. Timeout of {0} seconds was exceeded for each selected server.</value>
+    <value>All server connection attempts were aborted. Timeout of {0} seconds was exceeded for each selected server</value>
   </data>
   <data name="DnsSrvInvalidConnOptionMultihost" xml:space="preserve">
-    <value>Specifying multiple host names with DNS SRV lookup is not permitted.</value>
+    <value>Specifying multiple host names with DNS SRV lookup is not permitted</value>
   </data>
   <data name="DnsSrvInvalidConnOptionPort" xml:space="preserve">
-    <value>Specifying a port number with DNS SRV lookup is not permitted.</value>
+    <value>Specifying a port number with DNS SRV lookup is not permitted</value>
   </data>
   <data name="DnsSrvInvalidConnOptionUnixSocket" xml:space="preserve">
-    <value>Using Unix domain sockets with DNS SRV lookup is not permitted.</value>
+    <value>Using Unix domain sockets with DNS SRV lookup is not permitted</value>
   </data>
   <data name="DnsSrvNoHostsAvailable" xml:space="preserve">
-    <value>Unable to locate any hosts for {0}.</value>
+    <value>Unable to locate any hosts for {0}</value>
   </data>
   <data name="TlsNonValidProtocols" xml:space="preserve">
     <value>Specified list of TLS versions only contains non valid TLS protocols. Accepted values are TLSv1.2 and TLSv1.3</value>
@@ -622,72 +622,72 @@
     <value>Specified list of TLS versions is empty. Accepted values are TLSv1.2 and TLSv1.3</value>
   </data>
   <data name="ExecuteProcedureUnauthorized" xml:space="preserve">
-    <value>Verify that user '{0}'@'{1}' has enough privileges to execute.</value>
+    <value>Verify that user '{0}'@'{1}' has enough privileges to execute</value>
   </data>
   <data name="ClearPasswordNotSupported" xml:space="preserve">
-    <value>Clear-password authentication is not supported over insecure channels.</value>
+    <value>Clear-password authentication is not supported over insecure channels</value>
   </data>
   <data name="UnsafePathForLoadLocalInfile" xml:space="preserve">
-    <value>Trying to upload a file from outside the path set on 'allowloadlocalinfileinpath' is invalid.</value>
+    <value>Trying to upload a file from outside the path set on 'allowloadlocalinfileinpath' is invalid</value>
   </data>
   <data name="InvalidPathForLoadLocalInfile" xml:space="preserve">
-    <value>Either provide a valid path for 'allowloadlocalinfileinpath' or enable 'allowloadlocalinfile'.</value>
+    <value>Either provide a valid path for 'allowloadlocalinfileinpath' or enable 'allowloadlocalinfile'</value>
   </data>
   <data name="InvalidCertificateThumbprint" xml:space="preserve">
-    <value>Certificate with Thumbprint '{0}' not found.</value>
+    <value>Certificate with Thumbprint '{0}' not found</value>
   </data>
   <data name="QueryAttributesNotSupported" xml:space="preserve">
-    <value>MySQL Server {0} dos not support query attributes.</value>
+    <value>MySQL Server {0} dos not support query attributes</value>
   </data>
   <data name="QueryAttributesNotSupportedByCnet" xml:space="preserve">
-    <value>MySQL Connector/NET does not support query attributes with prepared statements for this version of MySQL Server.</value>
+    <value>MySQL Connector/NET does not support query attributes with prepared statements for this version of MySQL Server</value>
   </data>
   <data name="SslNotAllowedForConnectionProtocol" xml:space="preserve">
-    <value>Connection protocol '{0}' does not support SSL connections.</value>
+    <value>Connection protocol '{0}' does not support SSL connections</value>
   </data>
   <data name="AuthenticationPluginNotSupported" xml:space="preserve">
-    <value>Authentication plugin '{0}' is currently not supported.</value>
+    <value>Authentication plugin '{0}' is currently not supported</value>
   </data>
   <data name="UnmatchedWinUserAndMySqlUser" xml:space="preserve">
-    <value>MySQL user '{0}' does not equal the logged-in Windows user '{1}'.</value>
+    <value>MySQL user '{0}' does not equal the logged-in Windows user '{1}'</value>
   </data>
   <data name="OciSDKNotFound" xml:space="preserve">
-    <value>The OCI SDK cannot be found or is not installed.</value>
+    <value>The OCI SDK cannot be found or is not installed</value>
   </data>
   <data name="OciConfigFileNotFound" xml:space="preserve">
-    <value>OCI configuration file could not be read.</value>
+    <value>OCI configuration file could not be read</value>
   </data>
   <data name="OciEntryNotFound" xml:space="preserve">
-    <value>OCI configuration file does not contain a 'fingerprint' or 'key_file' entry.</value>
+    <value>OCI configuration file does not contain a 'fingerprint' or 'key_file' entry</value>
   </data>
   <data name="OciInvalidKeyFile" xml:space="preserve">
-    <value>OCI configuration entry 'key_file' does not reference a valid key file.</value>
+    <value>OCI configuration entry 'key_file' does not reference a valid key file</value>
   </data>
   <data name="OciKeyFileDoesNotExists" xml:space="preserve">
-    <value>Private key could not be found at location given by OCI configuration entry 'key_file'.</value>
+    <value>Private key could not be found at location given by OCI configuration entry 'key_file'</value>
   </data>
   <data name="OciSecurityTokenFileExceeds10KB" xml:space="preserve">
-    <value>The size of the OCI security token file exceeds the maximum value of 10KB allowed.</value>
+    <value>The size of the OCI security token file exceeds the maximum value of 10KB allowed</value>
   </data>
   <data name="OciConfigProfileNotFound" xml:space="preserve">
-    <value>OCI configuration profile not found.</value>
+    <value>OCI configuration profile not found</value>
   </data>
   <data name="OciSecurityTokenDoesNotExists" xml:space="preserve">
-    <value>Secutiry token file could not be found at location given by OCI configuration entry 'security_token_file'.</value>
+    <value>Secutiry token file could not be found at location given by OCI configuration entry 'security_token_file'</value>
   </data>
   <data name="TlsUnsupportedVersions" xml:space="preserve">
     <value>TLS protocols TLSv1 and TLSv1.1 are no longer supported. Accepted values are TLSv1.2 and TLSv1.3</value>
   </data>
   <data name="FidoChallengeCorrupt" xml:space="preserve">
-    <value>Challenge received is corrupt.</value>
+    <value>Challenge received is corrupt</value>
   </data>
   <data name="FidoRegistrationMissing" xml:space="preserve">
-    <value>FIDO registration is missing.</value>
+    <value>FIDO registration is missing</value>
   </data>
   <data name="WebAuthnMissingHandler" xml:space="preserve">
-    <value>An event handler for WebAuthnActionRequested was not specified.</value>
+    <value>An event handler for WebAuthnActionRequested was not specified</value>
   </data>
   <data name="WebAuthnTimeout" xml:space="preserve">
-    <value>The timeout of 15 seconds for user interaction with FIDO device has been exceeded.</value>
+    <value>The timeout of 15 seconds for user interaction with FIDO device has been exceeded</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/MySQL.Data/src/ResourcesX.Designer.cs b/MySQL.Data/src/ResourcesX.Designer.cs
index 86b984d69..e1b04614d 100644
--- a/MySQL.Data/src/ResourcesX.Designer.cs
+++ b/MySQL.Data/src/ResourcesX.Designer.cs
@@ -61,7 +61,7 @@ internal ResourcesX() {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Appdata path is not defined..
+        ///   Looks up a localized string similar to Appdata path is not defined.
         /// </summary>
         internal static string AppdataNotDefined {
             get {
@@ -70,7 +70,7 @@ internal static string AppdataNotDefined {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Authentication failed using MYSQL41 and SHA256_MEMORY. Check the user name and password or try using a secure connection..
+        ///   Looks up a localized string similar to Authentication failed using MYSQL41 and SHA256_MEMORY. Check the user name and password or try using a secure connection.
         /// </summary>
         internal static string AuthenticationFailed {
             get {
@@ -79,7 +79,7 @@ internal static string AuthenticationFailed {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You can&apos;t get more sessions because Client is closed..
+        ///   Looks up a localized string similar to You can&apos;t get more sessions because Client is closed.
         /// </summary>
         internal static string ClientIsClosed {
             get {
@@ -88,7 +88,7 @@ internal static string ClientIsClosed {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Client option &apos;{0}&apos; does not support value &apos;{1}&apos;..
+        ///   Looks up a localized string similar to Client option &apos;{0}&apos; does not support value &apos;{1}&apos;.
         /// </summary>
         internal static string ClientOptionInvalidValue {
             get {
@@ -97,7 +97,7 @@ internal static string ClientOptionInvalidValue {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Client option &apos;{0}&apos; is not recognized as valid..
+        ///   Looks up a localized string similar to Client option &apos;{0}&apos; is not recognized as valid.
         /// </summary>
         internal static string ClientOptionNotValid {
             get {
@@ -106,7 +106,7 @@ internal static string ClientOptionNotValid {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} &apos;{1}&apos; does not exist in schema &apos;{2}&apos;..
+        ///   Looks up a localized string similar to {0} &apos;{1}&apos; does not exist in schema &apos;{2}&apos;.
         /// </summary>
         internal static string CollectionTableDoesNotExist {
             get {
@@ -115,7 +115,7 @@ internal static string CollectionTableDoesNotExist {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Compression requested but the compression algorithm negotiation failed..
+        ///   Looks up a localized string similar to Compression requested but the compression algorithm negotiation failed.
         /// </summary>
         internal static string CompressionAlgorithmNegotiationFailed {
             get {
@@ -124,7 +124,7 @@ internal static string CompressionAlgorithmNegotiationFailed {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Compression using {0} is not supported..
+        ///   Looks up a localized string similar to Compression using {0} is not supported.
         /// </summary>
         internal static string CompressionAlgorithmNotSupported {
             get {
@@ -133,7 +133,7 @@ internal static string CompressionAlgorithmNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Compression using {0} is not supported in .NET Framework..
+        ///   Looks up a localized string similar to Compression using {0} is not supported in .NET Framework.
         /// </summary>
         internal static string CompressionForSpecificAlgorithmNotSupportedInNetFramework {
             get {
@@ -142,7 +142,7 @@ internal static string CompressionForSpecificAlgorithmNotSupportedInNetFramework
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection property &apos;compression&apos; acceptable values are: &apos;preferred&apos;, &apos;required&apos; or &apos;disabled&apos;. The value &apos;{0}&apos; is not acceptable..
+        ///   Looks up a localized string similar to The connection property &apos;compression&apos; acceptable values are: &apos;preferred&apos;, &apos;required&apos; or &apos;disabled&apos;. The value &apos;{0}&apos; is not acceptable.
         /// </summary>
         internal static string CompressionInvalidValue {
             get {
@@ -151,7 +151,7 @@ internal static string CompressionInvalidValue {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Compression is not enabled..
+        ///   Looks up a localized string similar to Compression is not enabled.
         /// </summary>
         internal static string CompressionNotEnabled {
             get {
@@ -160,7 +160,7 @@ internal static string CompressionNotEnabled {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Compression requested but the server does not support it..
+        ///   Looks up a localized string similar to Compression requested but the server does not support it.
         /// </summary>
         internal static string CompressionNotSupportedByServer {
             get {
@@ -169,7 +169,7 @@ internal static string CompressionNotSupportedByServer {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There are still decompressed messages pending to be processed..
+        ///   Looks up a localized string similar to There are still decompressed messages pending to be processed.
         /// </summary>
         internal static string CompressionPendingMessagesToProcess {
             get {
@@ -178,7 +178,7 @@ internal static string CompressionPendingMessagesToProcess {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Custom type mapping is only supported from .NET Core 3.1 and later..
+        ///   Looks up a localized string similar to Custom type mapping is only supported from .NET Core 3.1 and later.
         /// </summary>
         internal static string CustomTypeNotSupported {
             get {
@@ -187,7 +187,7 @@ internal static string CustomTypeNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; cannot be set to false with DNS SRV lookup enabled..
+        ///   Looks up a localized string similar to &apos;{0}&apos; cannot be set to false with DNS SRV lookup enabled.
         /// </summary>
         internal static string DnsSrvConflictingOptions {
             get {
@@ -196,7 +196,7 @@ internal static string DnsSrvConflictingOptions {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Scheme &apos;{0}&apos; is not valid..
+        ///   Looks up a localized string similar to Scheme &apos;{0}&apos; is not valid.
         /// </summary>
         internal static string DnsSrvInvalidScheme {
             get {
@@ -205,7 +205,7 @@ internal static string DnsSrvInvalidScheme {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The document path cannot be null or an empty string..
+        ///   Looks up a localized string similar to The document path cannot be null or an empty string.
         /// </summary>
         internal static string DocPathNullOrEmpty {
             get {
@@ -214,7 +214,7 @@ internal static string DocPathNullOrEmpty {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Duplicate key &apos;{0}&apos; used in &quot;connection-attributes&quot;..
+        ///   Looks up a localized string similar to Duplicate key &apos;{0}&apos; used in &quot;connection-attributes&quot;.
         /// </summary>
         internal static string DuplicateUserDefinedAttribute {
             get {
@@ -223,7 +223,7 @@ internal static string DuplicateUserDefinedAttribute {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Key name in connection attribute cannot be an empty string..
+        ///   Looks up a localized string similar to Key name in connection attribute cannot be an empty string.
         /// </summary>
         internal static string EmptyKeyConnectionAttribute {
             get {
@@ -232,7 +232,7 @@ internal static string EmptyKeyConnectionAttribute {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to At least one option must be specified..
+        ///   Looks up a localized string similar to At least one option must be specified.
         /// </summary>
         internal static string EmptyOptions {
             get {
@@ -241,7 +241,7 @@ internal static string EmptyOptions {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This feature is currently not supported..
+        ///   Looks up a localized string similar to This feature is currently not supported.
         /// </summary>
         internal static string FeatureNotSupported {
             get {
@@ -250,7 +250,7 @@ internal static string FeatureNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This functionality is only supported in MySQL {0} and higher..
+        ///   Looks up a localized string similar to This functionality is only supported in MySQL {0} and higher.
         /// </summary>
         internal static string FunctionalityNotSupported {
             get {
@@ -259,7 +259,7 @@ internal static string FunctionalityNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Collation with id &apos;{0}&apos; not found..
+        ///   Looks up a localized string similar to Collation with id &apos;{0}&apos; not found.
         /// </summary>
         internal static string InvalidCollationId {
             get {
@@ -268,7 +268,7 @@ internal static string InvalidCollationId {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The value of &quot;connection-attributes&quot; must be either a boolean or a list of key-value pairs..
+        ///   Looks up a localized string similar to The value of &quot;connection-attributes&quot; must be either a boolean or a list of key-value pairs.
         /// </summary>
         internal static string InvalidConnectionAttributes {
             get {
@@ -277,7 +277,7 @@ internal static string InvalidConnectionAttributes {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection Data is incorrect..
+        ///   Looks up a localized string similar to Connection Data is incorrect.
         /// </summary>
         internal static string InvalidConnectionData {
             get {
@@ -286,7 +286,7 @@ internal static string InvalidConnectionData {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection string is invalid..
+        ///   Looks up a localized string similar to The connection string is invalid.
         /// </summary>
         internal static string InvalidConnectionString {
             get {
@@ -295,7 +295,7 @@ internal static string InvalidConnectionString {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; is not a valid connection string attribute..
+        ///   Looks up a localized string similar to &apos;{0}&apos; is not a valid connection string attribute.
         /// </summary>
         internal static string InvalidConnectionStringAttribute {
             get {
@@ -304,7 +304,7 @@ internal static string InvalidConnectionStringAttribute {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection timeout value must be a positive integer (including 0)..
+        ///   Looks up a localized string similar to The connection timeout value must be a positive integer (including 0).
         /// </summary>
         internal static string InvalidConnectionTimeoutValue {
             get {
@@ -313,7 +313,7 @@ internal static string InvalidConnectionTimeoutValue {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Decimal (BCD) format is invalid..
+        ///   Looks up a localized string similar to Decimal (BCD) format is invalid.
         /// </summary>
         internal static string InvalidDecimalFormat {
             get {
@@ -322,7 +322,7 @@ internal static string InvalidDecimalFormat {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Field type with name &apos;{0}&apos; not found..
+        ///   Looks up a localized string similar to Field type with name &apos;{0}&apos; not found.
         /// </summary>
         internal static string InvalidFieldType {
             get {
@@ -331,7 +331,7 @@ internal static string InvalidFieldType {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Index type with name &apos;{0}&apos; not found..
+        ///   Looks up a localized string similar to Index type with name &apos;{0}&apos; not found.
         /// </summary>
         internal static string InvalidIndexType {
             get {
@@ -349,7 +349,7 @@ internal static string InvalidJsonDocument {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} is not a valid column name in the row..
+        ///   Looks up a localized string similar to {0} is not a valid column name in the row.
         /// </summary>
         internal static string InvalidNameIndex {
             get {
@@ -358,7 +358,7 @@ internal static string InvalidNameIndex {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} is not a valid index for the row..
+        ///   Looks up a localized string similar to {0} is not a valid index for the row.
         /// </summary>
         internal static string InvalidRowIndex {
             get {
@@ -367,7 +367,7 @@ internal static string InvalidRowIndex {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Session state is not valid..
+        ///   Looks up a localized string similar to Session state is not valid.
         /// </summary>
         internal static string InvalidSession {
             get {
@@ -394,7 +394,7 @@ internal static string InvalidUriQuery {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Key names in &quot;connection-attributes&quot; cannot start with &quot;_&quot;..
+        ///   Looks up a localized string similar to Key names in &quot;connection-attributes&quot; cannot start with &quot;_&quot;.
         /// </summary>
         internal static string InvalidUserDefinedAttribute {
             get {
@@ -403,7 +403,7 @@ internal static string InvalidUserDefinedAttribute {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Json configuration must contain &apos;uri&apos; or &apos;host&apos; but not both..
+        ///   Looks up a localized string similar to Json configuration must contain &apos;uri&apos; or &apos;host&apos; but not both.
         /// </summary>
         internal static string JsonUriOrHost {
             get {
@@ -412,7 +412,7 @@ internal static string JsonUriOrHost {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Keyword &apos;{0}&apos; not found..
+        ///   Looks up a localized string similar to Keyword &apos;{0}&apos; not found.
         /// </summary>
         internal static string KeywordNotFound {
             get {
@@ -421,7 +421,7 @@ internal static string KeywordNotFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Keyword not supported..
+        ///   Looks up a localized string similar to Keyword not supported.
         /// </summary>
         internal static string KeywordNotSupported {
             get {
@@ -430,7 +430,7 @@ internal static string KeywordNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Field &apos;{0}&apos; is mandatory..
+        ///   Looks up a localized string similar to Field &apos;{0}&apos; is mandatory.
         /// </summary>
         internal static string MandatoryFieldNotFound {
             get {
@@ -439,7 +439,7 @@ internal static string MandatoryFieldNotFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Missed required schema option..
+        ///   Looks up a localized string similar to Missed required schema option.
         /// </summary>
         internal static string MissingSchemaOption {
             get {
@@ -448,7 +448,7 @@ internal static string MissingSchemaOption {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to More than one document id was generated.  Please use the DocumentIds property instead..
+        ///   Looks up a localized string similar to More than one document id was generated.  Please use the DocumentIds property instead.
         /// </summary>
         internal static string MoreThanOneDocumentId {
             get {
@@ -466,7 +466,7 @@ internal static string NoDataAtIndex {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No &apos;host&apos; has been specified..
+        ///   Looks up a localized string similar to No &apos;host&apos; has been specified.
         /// </summary>
         internal static string NoHost {
             get {
@@ -475,7 +475,7 @@ internal static string NoHost {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No more data in resultset..
+        ///   Looks up a localized string similar to No more data in resultset.
         /// </summary>
         internal static string NoMoreData {
             get {
@@ -493,7 +493,7 @@ internal static string NoObjectFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No placeholders..
+        ///   Looks up a localized string similar to No placeholders.
         /// </summary>
         internal static string NoPlaceholders {
             get {
@@ -529,7 +529,7 @@ internal static string NoticeServerShutdown {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} must be a value greater than 0..
+        ///   Looks up a localized string similar to {0} must be a value greater than 0.
         /// </summary>
         internal static string NumberNotGreaterThanZero {
             get {
@@ -538,7 +538,7 @@ internal static string NumberNotGreaterThanZero {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Path not found &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Path not found &apos;{0}&apos;.
         /// </summary>
         internal static string PathNotFound {
             get {
@@ -547,7 +547,7 @@ internal static string PathNotFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Queue timeout expired. The timeout period elapsed prior to getting a session from the pool..
+        ///   Looks up a localized string similar to Queue timeout expired. The timeout period elapsed prior to getting a session from the pool.
         /// </summary>
         internal static string PoolingQueueTimeout {
             get {
@@ -556,7 +556,7 @@ internal static string PoolingQueueTimeout {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Providing a port number as part of the host address isn&apos;t supported when using connection strings in basic format or anonymous objects. Use URI format instead..
+        ///   Looks up a localized string similar to Providing a port number as part of the host address isn&apos;t supported when using connection strings in basic format or anonymous objects. Use URI format instead.
         /// </summary>
         internal static string PortNotSupported {
             get {
@@ -565,7 +565,7 @@ internal static string PortNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You must either assign no priority to any of the hosts or give a priority for every host..
+        ///   Looks up a localized string similar to You must either assign no priority to any of the hosts or give a priority for every host.
         /// </summary>
         internal static string PriorityForAllOrNoHosts {
             get {
@@ -574,7 +574,7 @@ internal static string PriorityForAllOrNoHosts {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The priority must be between 0 and 100..
+        ///   Looks up a localized string similar to The priority must be between 0 and 100.
         /// </summary>
         internal static string PriorityOutOfLimits {
             get {
@@ -583,7 +583,7 @@ internal static string PriorityOutOfLimits {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ProgramData path is not defined..
+        ///   Looks up a localized string similar to ProgramData path is not defined.
         /// </summary>
         internal static string ProgramDataNotDefined {
             get {
@@ -593,7 +593,7 @@ internal static string ProgramDataNotDefined {
         
         /// <summary>
         ///   Looks up a localized string similar to Replacement document has an &apos;_id&apos; that is
-        ///different from the matched document..
+        ///different from the matched document.
         /// </summary>
         internal static string ReplaceWithNoMatchingId {
             get {
@@ -602,7 +602,7 @@ internal static string ReplaceWithNoMatchingId {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The server doesn&apos;t support the requested operation. Please update the MySQL Server, client library, or both..
+        ///   Looks up a localized string similar to The server doesn&apos;t support the requested operation. Please update the MySQL Server, client library, or both.
         /// </summary>
         internal static string SchemaCreateCollectionMsg {
             get {
@@ -611,7 +611,7 @@ internal static string SchemaCreateCollectionMsg {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The process of closing the resultset and resulted in results being lost..
+        ///   Looks up a localized string similar to The process of closing the resultset and resulted in results being lost.
         /// </summary>
         internal static string ThrowingAwayResults {
             get {
@@ -620,7 +620,7 @@ internal static string ThrowingAwayResults {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to All server connection attempts were aborted. Timeout of {0} milliseconds was exceeded for each selected server..
+        ///   Looks up a localized string similar to All server connection attempts were aborted. Timeout of {0} milliseconds was exceeded for each selected server.
         /// </summary>
         internal static string TimeOutMultipleHost {
             get {
@@ -629,7 +629,7 @@ internal static string TimeOutMultipleHost {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to All server connection attempts were aborted. Timeout was exceeded for each selected server..
+        ///   Looks up a localized string similar to All server connection attempts were aborted. Timeout was exceeded for each selected server.
         /// </summary>
         internal static string TimeOutMultipleHost0ms {
             get {
@@ -638,7 +638,7 @@ internal static string TimeOutMultipleHost0ms {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection attempt to the server was aborted. Timeout of {0} milliseconds was exceeded..
+        ///   Looks up a localized string similar to Connection attempt to the server was aborted. Timeout of {0} milliseconds was exceeded.
         /// </summary>
         internal static string TimeOutSingleHost {
             get {
@@ -647,7 +647,7 @@ internal static string TimeOutSingleHost {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection attempt to the server was aborted. Timeout was exceeded..
+        ///   Looks up a localized string similar to Connection attempt to the server was aborted. Timeout was exceeded.
         /// </summary>
         internal static string TimeOutSingleHost0ms {
             get {
@@ -656,7 +656,7 @@ internal static string TimeOutSingleHost0ms {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to connect to any specified host..
+        ///   Looks up a localized string similar to Unable to connect to any specified host.
         /// </summary>
         internal static string UnableToConnect {
             get {
@@ -665,7 +665,7 @@ internal static string UnableToConnect {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to read or decode data value..
+        ///   Looks up a localized string similar to Unable to read or decode data value.
         /// </summary>
         internal static string UnableToDecodeDataValue {
             get {
@@ -674,7 +674,7 @@ internal static string UnableToDecodeDataValue {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to open a session..
+        ///   Looks up a localized string similar to Unable to open a session.
         /// </summary>
         internal static string UnableToOpenSession {
             get {
@@ -692,7 +692,7 @@ internal static string UnexpectedEndOfPacketFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Field name &apos;{0}&apos; is not allowed..
+        ///   Looks up a localized string similar to Field name &apos;{0}&apos; is not allowed.
         /// </summary>
         internal static string UnexpectedField {
             get {
@@ -710,7 +710,7 @@ internal static string UnknownPlaceholder {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Value &apos;{0}&apos; is not of the correct type..
+        ///   Looks up a localized string similar to Value &apos;{0}&apos; is not of the correct type.
         /// </summary>
         internal static string ValueNotCorrectType {
             get {
diff --git a/MySQL.Data/src/ResourcesX.resx b/MySQL.Data/src/ResourcesX.resx
index 7ec1a4298..c32081e6c 100644
--- a/MySQL.Data/src/ResourcesX.resx
+++ b/MySQL.Data/src/ResourcesX.resx
@@ -118,52 +118,52 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="InvalidCollationId" xml:space="preserve">
-    <value>Collation with id '{0}' not found.</value>
+    <value>Collation with id '{0}' not found</value>
   </data>
   <data name="InvalidConnectionData" xml:space="preserve">
-    <value>Connection Data is incorrect.</value>
+    <value>Connection Data is incorrect</value>
   </data>
   <data name="InvalidConnectionStringAttribute" xml:space="preserve">
-    <value>'{0}' is not a valid connection string attribute.</value>
+    <value>'{0}' is not a valid connection string attribute</value>
   </data>
   <data name="InvalidConnectionString" xml:space="preserve">
-    <value>The connection string is invalid.</value>
+    <value>The connection string is invalid</value>
   </data>
   <data name="InvalidDecimalFormat" xml:space="preserve">
-    <value>Decimal (BCD) format is invalid.</value>
+    <value>Decimal (BCD) format is invalid</value>
   </data>
   <data name="InvalidNameIndex" xml:space="preserve">
-    <value>{0} is not a valid column name in the row.</value>
+    <value>{0} is not a valid column name in the row</value>
   </data>
   <data name="InvalidRowIndex" xml:space="preserve">
-    <value>{0} is not a valid index for the row.</value>
+    <value>{0} is not a valid index for the row</value>
   </data>
   <data name="KeywordNotSupported" xml:space="preserve">
-    <value>Keyword not supported.</value>
+    <value>Keyword not supported</value>
   </data>
   <data name="MoreThanOneDocumentId" xml:space="preserve">
-    <value>More than one document id was generated.  Please use the DocumentIds property instead.</value>
+    <value>More than one document id was generated.  Please use the DocumentIds property instead</value>
   </data>
   <data name="NoDataAtIndex" xml:space="preserve">
     <value>There is no data at index {0}</value>
   </data>
   <data name="NoMoreData" xml:space="preserve">
-    <value>No more data in resultset.</value>
+    <value>No more data in resultset</value>
   </data>
   <data name="NoPlaceholders" xml:space="preserve">
-    <value>No placeholders.</value>
+    <value>No placeholders</value>
   </data>
   <data name="PathNotFound" xml:space="preserve">
-    <value>Path not found '{0}'.</value>
+    <value>Path not found '{0}'</value>
   </data>
   <data name="ThrowingAwayResults" xml:space="preserve">
-    <value>The process of closing the resultset and resulted in results being lost.</value>
+    <value>The process of closing the resultset and resulted in results being lost</value>
   </data>
   <data name="UnableToConnect" xml:space="preserve">
-    <value>Unable to connect to any specified host.</value>
+    <value>Unable to connect to any specified host</value>
   </data>
   <data name="UnableToDecodeDataValue" xml:space="preserve">
-    <value>Unable to read or decode data value.</value>
+    <value>Unable to read or decode data value</value>
   </data>
   <data name="UnexpectedEndOfPacketFound" xml:space="preserve">
     <value>Unexpected end of packet found while reading data values</value>
@@ -172,7 +172,7 @@
     <value>Unknown placeholder :{0}</value>
   </data>
   <data name="ValueNotCorrectType" xml:space="preserve">
-    <value>Value '{0}' is not of the correct type.</value>
+    <value>Value '{0}' is not of the correct type</value>
   </data>
   <data name="NoObjectFound" xml:space="preserve">
     <value>Object '{0}' not found</value>
@@ -184,139 +184,139 @@
     <value>Invalid uri query value</value>
   </data>
   <data name="JsonUriOrHost" xml:space="preserve">
-    <value>Json configuration must contain 'uri' or 'host' but not both.</value>
+    <value>Json configuration must contain 'uri' or 'host' but not both</value>
   </data>
   <data name="NoHost" xml:space="preserve">
-    <value>No 'host' has been specified.</value>
+    <value>No 'host' has been specified</value>
   </data>
   <data name="AppdataNotDefined" xml:space="preserve">
-    <value>Appdata path is not defined.</value>
+    <value>Appdata path is not defined</value>
   </data>
   <data name="ProgramDataNotDefined" xml:space="preserve">
-    <value>ProgramData path is not defined.</value>
+    <value>ProgramData path is not defined</value>
   </data>
   <data name="KeywordNotFound" xml:space="preserve">
-    <value>Keyword '{0}' not found.</value>
+    <value>Keyword '{0}' not found</value>
   </data>
   <data name="PriorityForAllOrNoHosts" xml:space="preserve">
-    <value>You must either assign no priority to any of the hosts or give a priority for every host.</value>
+    <value>You must either assign no priority to any of the hosts or give a priority for every host</value>
   </data>
   <data name="PriorityOutOfLimits" xml:space="preserve">
-    <value>The priority must be between 0 and 100.</value>
+    <value>The priority must be between 0 and 100</value>
   </data>
   <data name="PortNotSupported" xml:space="preserve">
-    <value>Providing a port number as part of the host address isn't supported when using connection strings in basic format or anonymous objects. Use URI format instead.</value>
+    <value>Providing a port number as part of the host address isn't supported when using connection strings in basic format or anonymous objects. Use URI format instead</value>
   </data>
   <data name="NumberNotGreaterThanZero" xml:space="preserve">
-    <value>{0} must be a value greater than 0.</value>
+    <value>{0} must be a value greater than 0</value>
   </data>
   <data name="FunctionalityNotSupported" xml:space="preserve">
-    <value>This functionality is only supported in MySQL {0} and higher.</value>
+    <value>This functionality is only supported in MySQL {0} and higher</value>
   </data>
   <data name="MandatoryFieldNotFound" xml:space="preserve">
-    <value>Field '{0}' is mandatory.</value>
+    <value>Field '{0}' is mandatory</value>
   </data>
   <data name="UnexpectedField" xml:space="preserve">
-    <value>Field name '{0}' is not allowed.</value>
+    <value>Field name '{0}' is not allowed</value>
   </data>
   <data name="InvalidFieldType" xml:space="preserve">
-    <value>Field type with name '{0}' not found.</value>
+    <value>Field type with name '{0}' not found</value>
   </data>
   <data name="InvalidIndexType" xml:space="preserve">
-    <value>Index type with name '{0}' not found.</value>
+    <value>Index type with name '{0}' not found</value>
   </data>
   <data name="AuthenticationFailed" xml:space="preserve">
-    <value>Authentication failed using MYSQL41 and SHA256_MEMORY. Check the user name and password or try using a secure connection.</value>
+    <value>Authentication failed using MYSQL41 and SHA256_MEMORY. Check the user name and password or try using a secure connection</value>
   </data>
   <data name="FeatureNotSupported" xml:space="preserve">
-    <value>This feature is currently not supported.</value>
+    <value>This feature is currently not supported</value>
   </data>
   <data name="InvalidJsonDocument" xml:space="preserve">
     <value>The value provided is not a valid JSON document. {0}</value>
   </data>
   <data name="InvalidConnectionTimeoutValue" xml:space="preserve">
-    <value>The connection timeout value must be a positive integer (including 0).</value>
+    <value>The connection timeout value must be a positive integer (including 0)</value>
   </data>
   <data name="TimeOutMultipleHost" xml:space="preserve">
-    <value>All server connection attempts were aborted. Timeout of {0} milliseconds was exceeded for each selected server.</value>
+    <value>All server connection attempts were aborted. Timeout of {0} milliseconds was exceeded for each selected server</value>
   </data>
   <data name="TimeOutSingleHost" xml:space="preserve">
-    <value>Connection attempt to the server was aborted. Timeout of {0} milliseconds was exceeded.</value>
+    <value>Connection attempt to the server was aborted. Timeout of {0} milliseconds was exceeded</value>
   </data>
   <data name="TimeOutMultipleHost0ms" xml:space="preserve">
-    <value>All server connection attempts were aborted. Timeout was exceeded for each selected server.</value>
+    <value>All server connection attempts were aborted. Timeout was exceeded for each selected server</value>
   </data>
   <data name="TimeOutSingleHost0ms" xml:space="preserve">
-    <value>Connection attempt to the server was aborted. Timeout was exceeded.</value>
+    <value>Connection attempt to the server was aborted. Timeout was exceeded</value>
   </data>
   <data name="ClientOptionInvalidValue" xml:space="preserve">
-    <value>Client option '{0}' does not support value '{1}'.</value>
+    <value>Client option '{0}' does not support value '{1}'</value>
   </data>
   <data name="ClientOptionNotValid" xml:space="preserve">
-    <value>Client option '{0}' is not recognized as valid.</value>
+    <value>Client option '{0}' is not recognized as valid</value>
   </data>
   <data name="PoolingQueueTimeout" xml:space="preserve">
-    <value>Queue timeout expired. The timeout period elapsed prior to getting a session from the pool.</value>
+    <value>Queue timeout expired. The timeout period elapsed prior to getting a session from the pool</value>
   </data>
   <data name="InvalidSession" xml:space="preserve">
-    <value>Session state is not valid.</value>
+    <value>Session state is not valid</value>
   </data>
   <data name="UnableToOpenSession" xml:space="preserve">
-    <value>Unable to open a session.</value>
+    <value>Unable to open a session</value>
   </data>
   <data name="ClientIsClosed" xml:space="preserve">
-    <value>You can't get more sessions because Client is closed.</value>
+    <value>You can't get more sessions because Client is closed</value>
   </data>
   <data name="CollectionTableDoesNotExist" xml:space="preserve">
-    <value>{0} '{1}' does not exist in schema '{2}'.</value>
+    <value>{0} '{1}' does not exist in schema '{2}'</value>
   </data>
   <data name="DuplicateUserDefinedAttribute" xml:space="preserve">
-    <value>Duplicate key '{0}' used in "connection-attributes".</value>
+    <value>Duplicate key '{0}' used in "connection-attributes"</value>
   </data>
   <data name="InvalidUserDefinedAttribute" xml:space="preserve">
-    <value>Key names in "connection-attributes" cannot start with "_".</value>
+    <value>Key names in "connection-attributes" cannot start with "_"</value>
   </data>
   <data name="InvalidConnectionAttributes" xml:space="preserve">
-    <value>The value of "connection-attributes" must be either a boolean or a list of key-value pairs.</value>
+    <value>The value of "connection-attributes" must be either a boolean or a list of key-value pairs</value>
   </data>
   <data name="EmptyKeyConnectionAttribute" xml:space="preserve">
-    <value>Key name in connection attribute cannot be an empty string.</value>
+    <value>Key name in connection attribute cannot be an empty string</value>
   </data>
   <data name="SchemaCreateCollectionMsg" xml:space="preserve">
-    <value>The server doesn't support the requested operation. Please update the MySQL Server, client library, or both.</value>
+    <value>The server doesn't support the requested operation. Please update the MySQL Server, client library, or both</value>
   </data>
   <data name="EmptyOptions" xml:space="preserve">
-    <value>At least one option must be specified.</value>
+    <value>At least one option must be specified</value>
   </data>
   <data name="MissingSchemaOption" xml:space="preserve">
-    <value>Missed required schema option.</value>
+    <value>Missed required schema option</value>
   </data>
   <data name="DnsSrvInvalidScheme" xml:space="preserve">
-    <value>Scheme '{0}' is not valid.</value>
+    <value>Scheme '{0}' is not valid</value>
   </data>
   <data name="DnsSrvConflictingOptions" xml:space="preserve">
-    <value>'{0}' cannot be set to false with DNS SRV lookup enabled.</value>
+    <value>'{0}' cannot be set to false with DNS SRV lookup enabled</value>
   </data>
   <data name="CompressionAlgorithmNegotiationFailed" xml:space="preserve">
-    <value>Compression requested but the compression algorithm negotiation failed.</value>
+    <value>Compression requested but the compression algorithm negotiation failed</value>
   </data>
   <data name="CompressionInvalidValue" xml:space="preserve">
-    <value>The connection property 'compression' acceptable values are: 'preferred', 'required' or 'disabled'. The value '{0}' is not acceptable.</value>
+    <value>The connection property 'compression' acceptable values are: 'preferred', 'required' or 'disabled'. The value '{0}' is not acceptable</value>
   </data>
   <data name="CompressionNotSupportedByServer" xml:space="preserve">
-    <value>Compression requested but the server does not support it.</value>
+    <value>Compression requested but the server does not support it</value>
   </data>
   <data name="CompressionAlgorithmNotSupported" xml:space="preserve">
-    <value>Compression using {0} is not supported.</value>
+    <value>Compression using {0} is not supported</value>
   </data>
   <data name="CompressionForSpecificAlgorithmNotSupportedInNetFramework" xml:space="preserve">
-    <value>Compression using {0} is not supported in .NET Framework.</value>
+    <value>Compression using {0} is not supported in .NET Framework</value>
   </data>
   <data name="CompressionNotEnabled" xml:space="preserve">
-    <value>Compression is not enabled.</value>
+    <value>Compression is not enabled</value>
   </data>
   <data name="CompressionPendingMessagesToProcess" xml:space="preserve">
-    <value>There are still decompressed messages pending to be processed.</value>
+    <value>There are still decompressed messages pending to be processed</value>
   </data>
   <data name="NoticeIdleConnection" xml:space="preserve">
     <value>Connection closed. Reason: connection idle was too long</value>
@@ -329,12 +329,12 @@
   </data>
   <data name="ReplaceWithNoMatchingId" xml:space="preserve">
     <value>Replacement document has an '_id' that is
-different from the matched document.</value>
+different from the matched document</value>
   </data>
   <data name="DocPathNullOrEmpty" xml:space="preserve">
-    <value>The document path cannot be null or an empty string.</value>
+    <value>The document path cannot be null or an empty string</value>
   </data>
   <data name="CustomTypeNotSupported" xml:space="preserve">
-    <value>Custom type mapping is only supported from .NET Core 3.1 and later.</value>
+    <value>Custom type mapping is only supported from .NET Core 3.1 and later</value>
   </data>
 </root>
\ No newline at end of file

From 72f607fac1b8ae2f61c14f44ec4897a984ed1e7b Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 28 Aug 2024 11:37:51 -0600
Subject: [PATCH 27/99] Updated failing tests.

Change-Id: I9eb563e8e23e85b71f8eabcb2522d3b2c37e6365
---
 .../tests/MySql.Data.Tests/AuthTests.cs       | 12 +++---
 .../tests/MySql.Data.Tests/BlobTests.cs       |  2 +-
 .../ClientSideFailoverTests.cs                | 12 +++---
 .../ConnectionStringBuilderTests.cs           |  8 ++--
 .../tests/MySql.Data.Tests/ConnectionTests.cs |  2 +-
 .../tests/MySql.Data.Tests/DnsSrvTests.cs     | 14 +++----
 .../netstandard2_0/UsageAdvisorTests.cs       |  6 +--
 .../tests/MySql.Data.Tests/ParameterTests.cs  |  4 +-
 .../tests/MySql.Data.Tests/PoolingTests.cs    |  4 +-
 .../MySql.Data.Tests/PreparedStatements.cs    |  2 +-
 .../MySql.Data.Tests/SimpleTransactions.cs    |  4 +-
 .../tests/MySql.Data.Tests/Transactions.cs    |  2 +-
 .../tests/MySqlX.Data.Tests/BasicFindTests.cs |  4 +-
 .../ClientSideFailoverTests.cs                | 38 +++++++++----------
 .../tests/MySqlX.Data.Tests/ClientTests.cs    | 10 ++---
 .../MySqlX.Data.Tests/CollectionIndexTests.cs | 18 ++++-----
 .../MySqlX.Data.Tests/CollectionTests.cs      |  4 +-
 .../MySqlX.Data.Tests/CompressionTests.cs     |  6 +--
 .../MySqlX.Data.Tests/CrudRemoveTests.cs      |  8 ++--
 .../MySqlX.Data.Tests/CrudUpdateTests.cs      | 12 +++---
 .../tests/MySqlX.Data.Tests/DnsSrvTests.cs    | 26 ++++++-------
 .../RelationalTests/TableSelectTests.cs       |  4 +-
 .../tests/MySqlX.Data.Tests/SessionTests.cs   |  4 +-
 .../tests/MySqlX.Data.Tests/SslTests.cs       |  2 +-
 .../XConnectionStringBuilderTests.cs          |  2 +-
 MySql.Web/tests/SchemaManagerTests.cs         |  2 +-
 26 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
index 0a3a3df2d..3d5028a4a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
@@ -463,7 +463,7 @@ public void ConnectUsingSha256PasswordPlugin()
         if (serverCompiledUsingOpenSsl)
         {
           Exception ex = Assert.Throws<MySqlException>(() => connection.Open());
-          Assert.That(ex.Message, Is.EqualTo("Retrieval of the RSA public key is not enabled for insecure connections."));
+          Assert.That(ex.Message, Is.EqualTo(Resources.RSAPublicKeyRetrievalNotEnabled));
         }
         else Assert.Throws<MySqlException>(() => connection.Open());
       }
@@ -541,7 +541,7 @@ public void AllowPublicKeyRetrievalForSha256PasswordPlugin()
       {
         Exception ex = Assert.Throws<MySqlException>(() => connection.Open()); ;
         if (serverCompiledUsingOpenSsl)
-          Assert.That(ex.Message, Is.EqualTo("Retrieval of the RSA public key is not enabled for insecure connections."));
+          Assert.That(ex.Message, Is.EqualTo(Resources.RSAPublicKeyRetrievalNotEnabled));
         else
           Assert.That(ex.Message, Does.StartWith("Authentication to host"));
       }
@@ -694,7 +694,7 @@ public void ConnectUsingCachingSha2Plugin()
         using (MySqlConnection connection = new MySqlConnection(builder.ConnectionString))
         {
           ex = Assert.Throws<MySqlException>(() => connection.Open());
-          Assert.That(ex.Message, Is.EqualTo("Retrieval of the RSA public key is not enabled for insecure connections."));
+          Assert.That(ex.Message, Is.EqualTo(Resources.RSAPublicKeyRetrievalNotEnabled));
         }
 
         builder.AllowPublicKeyRetrieval = true;
@@ -762,7 +762,7 @@ public void AllowPublicKeyRetrievalForCachingSha2PasswordPlugin()
       {
         Exception ex = Assert.Throws<MySqlException>(() => connection.Open());
         if (serverCompiledUsingOpenSsl)
-          Assert.That(ex.Message, Is.EqualTo("Retrieval of the RSA public key is not enabled for insecure connections."));
+          Assert.That(ex.Message, Is.EqualTo(Resources.RSAPublicKeyRetrievalNotEnabled));
         else
           Assert.That(ex.Message, Does.StartWith("Authentication to host"));
       }
@@ -833,7 +833,7 @@ public void CachingSha2AuthFailsAfterFlushPrivileges()
       {
         ex = Assert.Throws<MySqlException>(() => connection.Open());
         if (serverCompiledUsingOpenSsl)
-          Assert.That(ex.Message, Is.EqualTo("Retrieval of the RSA public key is not enabled for insecure connections."));
+          Assert.That(ex.Message, Is.EqualTo(Resources.RSAPublicKeyRetrievalNotEnabled));
         else
           Assert.That(ex.Message, Does.StartWith("Authentication to host"));
       }
@@ -1009,7 +1009,7 @@ public void ConnectUsingClearPasswordPlugin()
       using (MySqlConnection connection = new MySqlConnection(settings.ConnectionString))
       {
         Exception ex = Assert.Throws<MySqlException>(() => connection.Open());
-        Assert.That(ex.Message, Does.Contain("Clear-password authentication is not supported over insecure channels"));
+        Assert.That(ex.Message, Is.EqualTo(Resources.ClearPasswordNotSupported));
       }
 
       // Test connection for VALID user in LDAP server with different SSLMode values, expected result pass
diff --git a/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs b/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs
index a69bc6902..eaba3d20f 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs
@@ -297,7 +297,7 @@ public void BlobBiggerThanMaxPacket()
         cmd.Parameters.AddWithValue("?image", image);
 
         Exception ex = Assert.Throws<MySqlException>(() => cmd.ExecuteNonQuery());
-        Assert.That(ex.Message, Is.EqualTo("Packets larger than max_allowed_packet are not allowed."));
+        Assert.That(ex.Message, Is.EqualTo(Resources.QueryTooLarge));
       }
     }
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
index 313f4c353..e62d39e50 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
@@ -62,7 +62,7 @@ public void RandomMethod(string server, bool shouldPass = true)
       if (!shouldPass)
       {
         Exception ex = Assert.Throws<MySqlException>(() => TryConnection(Settings.ConnectionString));
-        Assert.That(ex.Message, Is.EqualTo("Unable to connect to any of the specified MySQL hosts."));
+        Assert.That(ex.Message, Is.EqualTo(Resources.UnableToConnectToHost));
       }
       else
         Assert.That(TryConnection(Settings.ConnectionString), Is.EqualTo(ConnectionState.Open));
@@ -133,11 +133,11 @@ public void PriorityMethod()
       }
     }
 
-    [TestCase("(address=server.example,priority=-20),(address=127.0.0.1,priority=100)", "The priority must be between 0 and 100.", "argument")] // Priority outside the 0-100 allowed range
-    [TestCase("(address=server.example,priority=-50),(address=127.0.0.1,priority=101)", "The priority must be between 0 and 100.", "argument")] // Priority outside the 0-100 allowed range
-    [TestCase("(address=server.example),(address=127.0.0.1,priority=100)", "You must either assign no priority to any of the hosts or give a priority for every host.", "argument")] // Set priority for a subset of the hosts.
-    [TestCase("(address=server.example,priority=50),(address=127.0.0.1,priority=100),(address=server.example)", "You must either assign no priority to any of the hosts or give a priority for every host.", "argument")] // Set priority for a subset of the hosts.
-    [TestCase("(address=server.example,priority=100),(address=10.10.10.10,priority=25),(address=192.0.10.56,priority=75)", "Unable to connect to any of the specified MySQL hosts.", "mysql")] // Multiple hosts. All attempts fail.
+    [TestCase("(address=server.example,priority=-20),(address=127.0.0.1,priority=100)", "The priority must be between 0 and 100", "argument")] // Priority outside the 0-100 allowed range
+    [TestCase("(address=server.example,priority=-50),(address=127.0.0.1,priority=101)", "The priority must be between 0 and 100", "argument")] // Priority outside the 0-100 allowed range
+    [TestCase("(address=server.example),(address=127.0.0.1,priority=100)", "You must either assign no priority to any of the hosts or give a priority for every host", "argument")] // Set priority for a subset of the hosts.
+    [TestCase("(address=server.example,priority=50),(address=127.0.0.1,priority=100),(address=server.example)", "You must either assign no priority to any of the hosts or give a priority for every host", "argument")] // Set priority for a subset of the hosts.
+    [TestCase("(address=server.example,priority=100),(address=10.10.10.10,priority=25),(address=192.0.10.56,priority=75)", "Unable to connect to any of the specified MySQL hosts", "mysql")] // Multiple hosts. All attempts fail.
     public void PriorityMethodConnectionFail(string server, string exceptionMessage, string exceptionType)
     {
       Settings.Server = server.Replace("127.0.0.1", Host);
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
index bf4bd2450..5973f4a9f 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
@@ -65,9 +65,9 @@ public void Simple()
       Assert.That(Convert.ToInt32(sb.Keepalive), Is.EqualTo(1));
       Exception ex = Assert.Throws<ArgumentException>(() => sb.ConnectionString = "server=localhost;badkey=badvalue");
 #if NETFRAMEWORK
-      Assert.That(ex.Message, Is.EqualTo($"Option not supported.{Environment.NewLine}Parameter name: badkey"));
+      Assert.That(ex.Message, Is.EqualTo($"Option not supported{Environment.NewLine}Parameter name: badkey"));
 #else
-      Assert.That(ex.Message, Is.EqualTo("Option not supported. (Parameter 'badkey')"));
+      Assert.That(ex.Message, Is.EqualTo("Option not supported (Parameter 'badkey')"));
 #endif
       sb.Clear();
       Assert.That(Convert.ToInt32(sb.ConnectionTimeout), Is.EqualTo(15));
@@ -151,9 +151,9 @@ public void SettingInvalidKeyThrowsArgumentException(string invalidKey)
       MySqlConnectionStringBuilder s = new MySqlConnectionStringBuilder();
       Exception ex = Assert.Throws<ArgumentException>(() => s[invalidKey] = "foo");
 #if NETFRAMEWORK
-      Assert.That(ex.Message, Is.EqualTo($"Option not supported.{Environment.NewLine}Parameter name: {invalidKey}"));
+      Assert.That(ex.Message, Is.EqualTo($"Option not supported{Environment.NewLine}Parameter name: {invalidKey}"));
 #else
-      Assert.That(ex.Message, Is.EqualTo($"Option not supported. (Parameter '{invalidKey}')"));
+      Assert.That(ex.Message, Is.EqualTo($"Option not supported (Parameter '{invalidKey}')"));
 #endif
     }
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
index 0b53cf79a..bb0664c28 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
@@ -110,7 +110,7 @@ public void ConnectionPoolExhaustion()
       {
         var ex = Assert.Catch<MySqlException>(() => CreateCommandTimeoutException());
         //Prior to the fix the exception thrown was 'error connecting: Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached.' after the 10th execution.
-        Assert.That(ex.Message, Is.EqualTo("Fatal error encountered during command execution."));
+        Assert.That(ex.Message, Is.EqualTo("Fatal error encountered during command execution"));
       }
     }
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs b/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs
index 205c5d3c6..0aa3f84b6 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs
@@ -51,13 +51,13 @@ public void DnsSrvConnectionStringInvalidOptions(string connString)
       var exception = Assert.Throws<ArgumentException>(() => new MySqlConnection(connString));
     }
 
-    [TestCase("server=localhost;port=33060;dns-srv=true;", "Specifying a port number with DNS SRV lookup is not permitted.")]
-    [TestCase("server=localhost,10.10.10.10;dns-srv=true;", "Specifying multiple host names with DNS SRV lookup is not permitted.")]
-    [TestCase("host=localhost,10.10.10.10;dns-srv=TRUE;", "Specifying multiple host names with DNS SRV lookup is not permitted.")]
-    [TestCase("server=(address=localhost,priority=100), (address=10.10.10.10,priority=90);dns-srv=true;", "Specifying multiple host names with DNS SRV lookup is not permitted.")]
-    [TestCase("server=localhost;protocol=unix;Dns-Srv=true;", "Using Unix domain sockets with DNS SRV lookup is not permitted.")]
-    [TestCase("server=localhost;protocol=unixSocket;dns-srv=true;", "Using Unix domain sockets with DNS SRV lookup is not permitted.")]
-    [TestCase("server=localhost;connectionprotocol=unix;DnsSrv=true;", "Using Unix domain sockets with DNS SRV lookup is not permitted.")]
+    [TestCase("server=localhost;port=33060;dns-srv=true;", "Specifying a port number with DNS SRV lookup is not permitted")]
+    [TestCase("server=localhost,10.10.10.10;dns-srv=true;", "Specifying multiple host names with DNS SRV lookup is not permitted")]
+    [TestCase("host=localhost,10.10.10.10;dns-srv=TRUE;", "Specifying multiple host names with DNS SRV lookup is not permitted")]
+    [TestCase("server=(address=localhost,priority=100), (address=10.10.10.10,priority=90);dns-srv=true;", "Specifying multiple host names with DNS SRV lookup is not permitted")]
+    [TestCase("server=localhost;protocol=unix;Dns-Srv=true;", "Using Unix domain sockets with DNS SRV lookup is not permitted")]
+    [TestCase("server=localhost;protocol=unixSocket;dns-srv=true;", "Using Unix domain sockets with DNS SRV lookup is not permitted")]
+    [TestCase("server=localhost;connectionprotocol=unix;DnsSrv=true;", "Using Unix domain sockets with DNS SRV lookup is not permitted")]
     public void DnsSrvConnectionStringInvalidConfiguration(string connString, string exceptionMessage)
     {
       var exception = Assert.Throws<ArgumentException>(() => new MySqlConnection(connString));
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs
index 84652a091..ec5eb62e6 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs
@@ -75,12 +75,12 @@ public void NotReadingEveryField()
       Assert.That(listener.Strings[0], Does.Contain("Query Opened: SELECT * FROM Test; SELECT * FROM Test WHERE id > 2"));
       Assert.That(listener.Strings[1], Does.Contain("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1"));
       Assert.That(listener.Strings[2], Does.Contain("Usage Advisor Warning: Query does not use an index"));
-      Assert.That(listener.Strings[3], Does.Contain("Usage Advisor Warning: Skipped 2 rows. Consider a more focused query."));
+      Assert.That(listener.Strings[3], Does.Contain("Usage Advisor Warning: Skipped 2 rows. Consider a more focused query"));
       Assert.That(listener.Strings[4], Does.Contain("Usage Advisor Warning: The following columns were not accessed: name"));
       Assert.That(listener.Strings[5], Does.Contain("Resultset Closed. Total rows=4, skipped rows=2, size (bytes)=32"));
       Assert.That(listener.Strings[6], Does.Contain("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1"));
       Assert.That(listener.Strings[7], Does.Contain("Usage Advisor Warning: Query does not use an index"));
-      Assert.That(listener.Strings[8], Does.Contain("Usage Advisor Warning: Skipped 1 rows. Consider a more focused query."));
+      Assert.That(listener.Strings[8], Does.Contain("Usage Advisor Warning: Skipped 1 rows. Consider a more focused query"));
       Assert.That(listener.Strings[9], Does.Contain("Usage Advisor Warning: The following columns were not accessed: id"));
       Assert.That(listener.Strings[10], Does.Contain("Resultset Closed. Total rows=2, skipped rows=1, size (bytes)=16"));
       Assert.That(listener.Strings[11], Does.Contain("Query Closed"));
@@ -115,7 +115,7 @@ public void NotReadingEveryRow()
       Assert.That(listener.Strings[0], Does.Contain("Query Opened: SELECT * FROM Test; SELECT * FROM Test WHERE id > 2"));
       Assert.That(listener.Strings[1], Does.Contain("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1"));
       Assert.That(listener.Strings[2], Does.Contain("Usage Advisor Warning: Query does not use an index"));
-      Assert.That(listener.Strings[3], Does.Contain("Usage Advisor Warning: Skipped 2 rows. Consider a more focused query."));
+      Assert.That(listener.Strings[3], Does.Contain("Usage Advisor Warning: Skipped 2 rows. Consider a more focused query"));
       Assert.That(listener.Strings[4], Does.Contain("Usage Advisor Warning: The following columns were not accessed: id,name"));
       Assert.That(listener.Strings[5], Does.Contain("Resultset Closed. Total rows=4, skipped rows=2, size (bytes)=32"));
       Assert.That(listener.Strings[6], Does.Contain("Resultset Opened: field(s) = 2, affected rows = -1, inserted id = -1"));
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs
index ce075ed76..bca23970c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs
@@ -486,7 +486,7 @@ public void DoubleAddingParameters()
       Assert.That(cmd.Parameters.IndexOf("@id"), Is.EqualTo(-1));
       cmd.Parameters.AddWithValue("name", "test");
       Exception ex = Assert.Throws<MySqlException>(() => cmd.Parameters.AddWithValue("?id", 2));
-      Assert.That(ex.Message, Is.EqualTo("Parameter '?id' has already been defined."));
+      Assert.That(ex.Message, Is.EqualTo("Parameter '?id' has already been defined"));
     }
 
     /// <summary>
@@ -696,7 +696,7 @@ public void CanThrowAnExceptionWhenMixingParameterNaming()
       cmd.Parameters.AddWithValue("?Id", 1);
       cmd.Parameters.AddWithValue("?name", "test");
       Exception ex = Assert.Throws<MySqlException>(() => cmd.ExecuteNonQuery());
-      Assert.That(ex.Message, Is.EqualTo("Fatal error encountered during command execution."));
+      Assert.That(ex.Message, Is.EqualTo("Fatal error encountered during command execution"));
     }
 
     /// <summary>
diff --git a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
index bc638723a..46b466f8d 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
@@ -126,7 +126,7 @@ public void ReclaimBrokenConnection()
       // now attempting to open a connection should fail
       MySqlConnection c2 = new MySqlConnection(connStr);
       Exception ex = Assert.Throws<MySqlException>(() => c2.Open());
-      Assert.That(ex.Message, Does.Contain("error connecting: Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool."));
+      Assert.That(ex.Message, Does.Contain("error connecting: Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool"));
 
       // we now kill the first connection to simulate a server stoppage
       KillConnection(c);
@@ -134,7 +134,7 @@ public void ReclaimBrokenConnection()
       // now we do something on the first connection
 
       ex = Assert.Throws<InvalidOperationException>(() => c.ChangeDatabase("mysql"));
-      Assert.That(ex.Message, Does.Contain("The connection is not open."));
+      Assert.That(ex.Message, Does.Contain("The connection is not open"));
 
       // Opening a connection now should work
       MySqlConnection connection = new MySqlConnection(connStr);
diff --git a/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs b/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs
index 226e5abcb..53166d748 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs
@@ -620,7 +620,7 @@ public void PrepareEmptyString()
       MySqlCommand cmd = new MySqlCommand("", Connection);
       cmd.Prepare();
       Exception ex = Assert.Throws<InvalidOperationException>(() => cmd.ExecuteNonQuery());
-      Assert.That(ex.Message, Is.EqualTo("The CommandText property has not been properly initialized."));
+      Assert.That(ex.Message, Is.EqualTo("The CommandText property has not been properly initialized"));
     }
 
     /// <summary>
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs b/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs
index b2719f841..f71fce02c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs
@@ -81,7 +81,7 @@ public void NestedTransactions()
       MySqlTransaction t1 = Connection.BeginTransaction();
 
       Exception ex = Assert.Throws<InvalidOperationException>(() => { Connection.BeginTransaction(); });
-      Assert.That(ex.Message, Is.EqualTo("Nested transactions are not supported."));
+      Assert.That(ex.Message, Is.EqualTo("Nested transactions are not supported"));
 
       t1.Rollback();
     }
@@ -99,7 +99,7 @@ public void BeginTransactionOnPreviouslyOpenConnection()
       }
       catch (Exception ex)
       {
-        Assert.That(ex.Message, Is.EqualTo("The connection is not open."));
+        Assert.That(ex.Message, Is.EqualTo("The connection is not open"));
       }
     }
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs b/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
index 0ac8a5152..83c264d3b 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
@@ -661,7 +661,7 @@ public void SnapshotIsolationLevelThrowsNotSupportedException()
       {
         newcon.Open();
         var ex = Assert.Throws<NotSupportedException>(() => newcon.BeginTransaction(System.Data.IsolationLevel.Snapshot));
-        Assert.That(ex.Message, Is.EqualTo("Snapshot isolation level is not supported."));
+        Assert.That(ex.Message, Is.EqualTo("Snapshot isolation level is not supported"));
       }
     }
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
index df3f15a85..55208117a 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
@@ -211,10 +211,10 @@ public void RowLockingNotSupportedInOlderVersions()
       Collection coll = CreateCollection("test");
 
       Exception ex = Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll.Find().LockShared()));
-      Assert.That(ex.Message, Is.EqualTo("This functionality is only supported from server version 8.0.3 onwards."));
+      Assert.That(ex.Message, Is.EqualTo("This functionality is only supported from server version 8.0.3 onwards"));
 
       ex = Assert.Throws<MySqlException>(() => ExecuteFindStatement(coll.Find().LockExclusive()));
-      Assert.That(ex.Message, Is.EqualTo("This functionality is only supported from server version 8.0.3 onwards."));
+      Assert.That(ex.Message, Is.EqualTo("This functionality is only supported from server version 8.0.3 onwards"));
     }
 
     [Test]
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
index 34834ca26..d66254a17 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
@@ -82,11 +82,11 @@ public void RandomMethodWithBasicFormatConnectionString()
 
       // Multiple hosts. All attempts fail.
       Exception ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession($"server= 10.10.10.10, 20.20.20.20 ;port={XPort};uid=test;password=test;connecttimeout={connectionTimeout}"));
-      Assert.That(ex.Message, Is.EqualTo("Unable to connect to any of the specified MySQL hosts."));
+      Assert.That(ex.Message, Is.EqualTo("Unable to connect to any of the specified MySQL hosts"));
 
       // Providing port number as part of the host name.
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server= 10.10.10.10:33050, 20.20.20.20:33060, {Host}:{XPort} ;port={XPort};uid=test;password=test;connecttimeout={connectionTimeout}"));
-      Assert.That(ex.Message, Is.EqualTo("Providing a port number as part of the host address isn't supported when using connection strings in basic format or anonymous objects. Use URI format instead."));
+      Assert.That(ex.Message, Is.EqualTo("Providing a port number as part of the host address isn't supported when using connection strings in basic format or anonymous objects. Use URI format instead"));
     }
 
     [Test]
@@ -167,11 +167,11 @@ public void RandomMethodWithAnonymousTypes()
 
       // Multiple hosts. All attempts fail.
       Exception ex = Assert.Throws<MySqlException>(() => MySQLX.GetSession(new { server = "10.10.10.10, 20.20.20.20", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.That(ex.Message, Is.EqualTo("Unable to connect to any of the specified MySQL hosts."));
+      Assert.That(ex.Message, Is.EqualTo("Unable to connect to any of the specified MySQL hosts"));
 
       // Providing port number as part of the host name.
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(new { server = "10.10.10.10:33060, 20.20.20.20:33060", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.That(ex.Message, Is.EqualTo("Providing a port number as part of the host address isn't supported when using connection strings in basic format or anonymous objects. Use URI format instead."));
+      Assert.That(ex.Message, Is.EqualTo("Providing a port number as part of the host address isn't supported when using connection strings in basic format or anonymous objects. Use URI format instead"));
     }
 
     [Test]
@@ -242,18 +242,18 @@ public void PriorityMethodWithBasicFormatConnectionString()
 
       // Priority outside the 0-100 allowed range.
       Exception ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server=(address=server.example,priority=-20),(address={Host},priority=100);port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout));
-      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100."));
+      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100"));
 
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server=(address=server.example,priority=-50),(address={Host},priority=101);port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout));
-      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100."));
+      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100"));
 
       // Set priority for a subset of the hosts.
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server=(address=server.example),(address={Host},priority=100);port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout));
-      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host"));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server=(address=server.example,priority=50),(address={Host});port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout));
-      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host"));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server=(address=server.example,priority=50),(address={Host},priority=100),(address=server.example);port=" + XPort + ";uid=test;password=test;connecttimeout=" + connectionTimeout));
-      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host"));
 
       // Automatically set priority if no priority is given.
       string hostList = string.Empty;
@@ -324,18 +324,18 @@ public void PriorityMethodWithUriFormatConnectonString()
 
       // Priority outside the 0-100 allowed range.
       Exception ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"mysqlx://test:test@[(address=server.example,priority=-20),(address={Host}:{XPort},priority=100)]?connecttimeout=" + connectionTimeout));
-      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100."));
+      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100"));
 
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"mysqlx://test:test@[(address=server.example,priority=50),(address={Host}:{XPort},priority=101)]?connecttimeout=" + connectionTimeout));
-      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100."));
+      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100"));
 
       // Set priority for a subset of the hosts.
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"mysqlx://test:test@[(address=server.example),(address={Host}:{XPort},priority=100)]?connecttimeout=" + connectionTimeout));
-      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host"));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"mysqlx://test:test@[(address=server.example,priority=100),(address={Host}:{XPort})]?connecttimeout=" + connectionTimeout));
-      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host"));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"mysqlx://test:test@[(address=server.example),(address={Host}:{XPort}),(address=server2.example,priority=100)]?connecttimeout=" + connectionTimeout));
-      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host"));
 
       // Automatically set priority if no priority is given.
       string hostList = string.Empty;
@@ -414,18 +414,18 @@ public void PriorityMethodWithAnonymousTypes()
 
       // Priority outside the 0-100 allowed range.
       Exception ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(new { server = $"(address=server.example,priority=-20),(address={Host},priority=100)", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100."));
+      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100"));
 
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(new { server = $"(address=server.example,priority=-50),(address={Host},priority=101)", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100."));
+      Assert.That(ex.Message, Is.EqualTo("The priority must be between 0 and 100"));
 
       // Set priority for a subset of the hosts.
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(new { server = $"(address=server.example),(address={Host},priority=100)", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host"));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(new { server = $"(address=server.example,priority=50),(address={Host})", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host"));
       ex = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(new { server = $"(address=server.example,priority=50),(address={Host},priority=100),(address=server.example)", port = XPort, uid = uid, password = password, connecttimeout = connectionTimeout }));
-      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host."));
+      Assert.That(ex.Message, Is.EqualTo("You must either assign no priority to any of the hosts or give a priority for every host"));
 
       // Automatically set priority if no priority is given.
       string hostList = string.Empty;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
index f56f03b76..bc5a2b17c 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
@@ -467,7 +467,7 @@ public void ConnectionAttributes()
       builder.UserID = RootUser;
       builder.ConnectionAttributes = ";";
       ex = Assert.Throws<MySqlException>(() => MySQLX.GetClient(builder.ConnectionString, "{ \"pooling\": { \"enabled\": true } }"));
-      Assert.That(ex.Message, Is.EqualTo("The requested value ';' is invalid for the given keyword 'connection-attributes'."));
+      Assert.That(ex.Message, Is.EqualTo("The requested value ';' is invalid for the given keyword 'connection-attributes'"));
     }
 
     private void TestConnectionAttributes(string connString, Dictionary<string, object> userAttrs = null)
@@ -1479,7 +1479,7 @@ public void GetSessionExceptionWithConnetionAttribute()
       , "{ \"pooling\": { \"enabled\": true } }"))
       {
         Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.That(ex.Message, Is.EqualTo("The requested value '=' is invalid for the given keyword 'connection-attributes'."));
+        Assert.That(ex.Message, Is.EqualTo("The requested value '=' is invalid for the given keyword 'connection-attributes'"));
       }
     }
 
@@ -1743,7 +1743,7 @@ public void ConnectionAttributesInvalidCombinations()
     {
       Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       object[] invalid = new object[] { "var1", "1", "2", "(var1)", "{var1}", "[_testValue = test123, emptyValue]" };
-      var errorMsgs = new string[] { @"The value of ""connection-attributes"" must be either a boolean or a list of key-value pairs.", @"Key names in ""connection-attributes"" cannot start with ""_""." };
+      var errorMsgs = new string[] { @"The value of ""connection-attributes"" must be either a boolean or a list of key-value pairs", @"Key names in ""connection-attributes"" cannot start with ""_""" };
       for (int i = 0; i < invalid.Length; i++)
       {
         //Connection String
@@ -1992,7 +1992,7 @@ public void ConnectionAttributesKeyWithUnderLineChars()
       Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
       Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
-      var expectedMsg = @"Key names in ""connection-attributes"" cannot start with ""_"".";
+      var expectedMsg = @"Key names in ""connection-attributes"" cannot start with ""_""";
       //Connection string
       using (Client client = MySQLX.GetClient(ConnectionString + ";connection-attributes=[_foo32=bar,quua=qux,key]", "{ \"pooling\": { \"enabled\": true } }"))
       {
@@ -2061,7 +2061,7 @@ public void ConnectionAttributesKeyBlankChars()
       Assume.That(Platform.IsWindows(), "This test is for Windows OS only.");
       Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
-      var expectedMsg = "Key name in connection attribute cannot be an empty string.";
+      var expectedMsg = "Key name in connection attribute cannot be an empty string";
       //Connection String
       using (Client client = MySQLX.GetClient(ConnectionString + ";connection-attributes=[=bar,quua=qux,key]", "{ \"pooling\": { \"enabled\": true } }"))
       {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
index ed80e6497..f8c5f6736 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
@@ -48,19 +48,19 @@ public void IncorrectlyFormatedIndexDefinition()
       var collection = CreateCollection("test");
 
       Exception ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"type\": \"INDEX\" }"));
-      Assert.That(ex.Message, Is.EqualTo("Field 'fields' is mandatory."));
+      Assert.That(ex.Message, Is.EqualTo("Field 'fields' is mandatory"));
 
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"TEXT\" } ], \"unexpectedField\" : false }"));
-      Assert.That(ex.Message, Is.EqualTo("Field name 'unexpectedField' is not allowed."));
+      Assert.That(ex.Message, Is.EqualTo("Field name 'unexpectedField' is not allowed"));
 
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"fields\":$.myField, \"types\":\"TEXT\" } ] }"));
-      Assert.That(ex.Message, Is.EqualTo("Field 'field' is mandatory."));
+      Assert.That(ex.Message, Is.EqualTo("Field 'field' is mandatory"));
 
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"types\":\"TEXT\" } ] }"));
-      Assert.That(ex.Message, Is.EqualTo("Field 'type' is mandatory."));
+      Assert.That(ex.Message, Is.EqualTo("Field 'type' is mandatory"));
 
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"TEXT\", \"unexpectedField\" : false } ] }"));
-      Assert.That(ex.Message, Is.EqualTo("Field name 'unexpectedField' is not allowed."));
+      Assert.That(ex.Message, Is.EqualTo("Field name 'unexpectedField' is not allowed"));
 
       Assume.That(session.Version.isAtLeast(8, 0, 11), "This test is for MySql 8.0.11 or higher");
       collection = CreateCollection("test");
@@ -251,13 +251,13 @@ public void CreateIndexWithInvalidJsonDocumentStructure()
       var collection = CreateCollection("test");
 
       Exception ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"type\":\"INT\", \"myCustomField\":\"myCustomValue\" } ] }"));
-      Assert.That(ex.Message, Is.EqualTo("Field name 'myCustomField' is not allowed."));
+      Assert.That(ex.Message, Is.EqualTo("Field name 'myCustomField' is not allowed"));
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.myField, \"mytype\":\"INT\" } ] }"));
-      Assert.That(ex.Message, Is.EqualTo("Field 'type' is mandatory."));
+      Assert.That(ex.Message, Is.EqualTo("Field 'type' is mandatory"));
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"myfield\":$.myField, \"type\":\"INT\" } ] }"));
-      Assert.That(ex.Message, Is.EqualTo("Field 'field' is mandatory."));
+      Assert.That(ex.Message, Is.EqualTo("Field 'field' is mandatory"));
       ex = Assert.Throws<FormatException>(() => collection.CreateIndex("myIndex", "{\"fields\": [ { \"field\":$.name, \"type\":\"TEXT\" , \"myCustomField\":\"myCustomValue\"} ] }"));
-      Assert.That(ex.Message, Is.EqualTo("Field name 'myCustomField' is not allowed."));
+      Assert.That(ex.Message, Is.EqualTo("Field name 'myCustomField' is not allowed"));
       ex = Assert.Throws<Exception>(() => collection.CreateIndex("myIndex", ""));
       Assert.That(ex.Message, Is.EqualTo("The value provided is not a valid JSON document. Index was outside the bounds of the array."));
     }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
index 7b9471364..6a03fdf4b 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
@@ -187,9 +187,9 @@ public void CountCollection()
 
       // Collection/Table does not exist
       var ex = Assert.Throws<MySqlException>(() => schema.GetCollection("testCount_").Count());
-      Assert.That(ex.Message, Is.EqualTo("Collection 'testCount_' does not exist in schema 'test'."));
+      Assert.That(ex.Message, Is.EqualTo("Collection 'testCount_' does not exist in schema 'test'"));
       ex = Assert.Throws<MySqlException>(() => schema.GetTable("testCount_").Count());
-      Assert.That(ex.Message, Is.EqualTo("Table 'testCount_' does not exist in schema 'test'."));
+      Assert.That(ex.Message, Is.EqualTo("Table 'testCount_' does not exist in schema 'test'"));
     }
 
     [Test]
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
index d6e7b8a5d..88212c2e3 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
@@ -175,10 +175,10 @@ public void SettingAnInvalidCompressionTypeRaisesException()
       foreach (var invalidValue in invalidValues)
       {
         var exception = Assert.Throws<ArgumentException>(() => new MySqlXConnectionStringBuilder($"server={Host};port={XPort};compression={invalidValue}"));
-        Assert.That(exception.Message, Is.EqualTo($"The connection property 'compression' acceptable values are: 'preferred', 'required' or 'disabled'. The value '{invalidValue}' is not acceptable."));
+        Assert.That(exception.Message, Is.EqualTo($"The connection property 'compression' acceptable values are: 'preferred', 'required' or 'disabled'. The value '{invalidValue}' is not acceptable"));
 
         exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession($"server={Host};port={XPort};user=root;compression={invalidValue}"));
-        Assert.That(exception.Message, Is.EqualTo($"The connection property 'compression' acceptable values are: 'preferred', 'required' or 'disabled'. The value '{invalidValue}' is not acceptable."));
+        Assert.That(exception.Message, Is.EqualTo($"The connection property 'compression' acceptable values are: 'preferred', 'required' or 'disabled'. The value '{invalidValue}' is not acceptable"));
       }
     }
 
@@ -460,7 +460,7 @@ public void ConfigurableCompressionAlgorithms()
       // The connection should terminate with an error when compression option is set to required.
 
       Exception ex = Assert.Throws<System.NotSupportedException>(() => MySQLX.GetSession(ConnectionString + ";compression=required;compression-algorithms=NotSupported,SomethingElse;"));
-      Assert.That(ex.Message, Is.EqualTo("Compression requested but the compression algorithm negotiation failed."));
+      Assert.That(ex.Message, Is.EqualTo("Compression requested but the compression algorithm negotiation failed"));
 
       // FR4_4 Start server with specific compression algorithm and create session with option 
       // compression-algorithms.Set the option with multiple compression algorithms.
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
index 1bce4e78c..741cb7a92 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
@@ -59,9 +59,9 @@ public void RemoveSingleDocumentById()
 
       var ex = Assert.Throws<ArgumentNullException>(() => coll.Remove(""));
 #if !NETFRAMEWORK
-      Assert.That(ex.Message, Is.EqualTo("Parameter can't be null or empty. (Parameter 'condition')"));
+      Assert.That(ex.Message, Is.EqualTo("Parameter can't be null or empty (Parameter 'condition')"));
 #else
-      Assert.That(ex.Message, Is.EqualTo("Parameter can't be null or empty.\r\nParameter name: condition"));
+      Assert.That(ex.Message, Is.EqualTo("Parameter can't be null or empty\r\nParameter name: condition"));
 #endif
     }
 
@@ -176,9 +176,9 @@ public void RemoveAll()
       // Condition can't be null or empty.
       string errorMessage = string.Empty;
 #if !NETFRAMEWORK
-      errorMessage = "Parameter can't be null or empty. (Parameter 'condition')";
+      errorMessage = "Parameter can't be null or empty (Parameter 'condition')";
 #else
-      errorMessage = "Parameter can't be null or empty.\r\nParameter name: condition";
+      errorMessage = "Parameter can't be null or empty\r\nParameter name: condition";
 #endif
       Exception ex = Assert.Throws<ArgumentNullException>(() => ExecuteRemoveStatement(collection.Remove(string.Empty)));
       Assert.That(ex.Message, Is.EqualTo(errorMessage));
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
index c686b97c1..fab5a0f31 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
@@ -166,9 +166,9 @@ public void ModifyAll()
       // Condition can't be null or empty.
       string errorMessage = string.Empty;
 #if !NETFRAMEWORK
-      errorMessage = "Parameter can't be null or empty. (Parameter 'condition')";
+      errorMessage = "Parameter can't be null or empty (Parameter 'condition')";
 #else
-      errorMessage = "Parameter can't be null or empty.\r\nParameter name: condition";
+      errorMessage = "Parameter can't be null or empty\r\nParameter name: condition";
 #endif
       Exception ex = Assert.Throws<ArgumentNullException>(() => ExecuteModifyStatement(collection.Modify(string.Empty)));
       Assert.That(errorMessage, Is.EqualTo(ex.Message));
@@ -350,9 +350,9 @@ public void ArrayInsert()
 
       // Insert an empty string fails.
       var ex = Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(collection.Modify("true").ArrayInsert("x[0]", "")));
-      Assert.That(ex.Message, Does.Contain("String can't be empty."));
+      Assert.That(ex.Message, Does.Contain("String can't be empty"));
       ex = Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(collection.Modify("true").ArrayInsert("x[0]", string.Empty)));
-      Assert.That(ex.Message, Does.Contain("String can't be empty."));
+      Assert.That(ex.Message, Does.Contain("String can't be empty"));
 
       // Not specifying an index raises an error.
       var ex2 = Assert.Throws<MySqlException>(() => ExecuteModifyStatement(collection.Modify("true").ArrayInsert("dates", "5/1/2018")));
@@ -457,9 +457,9 @@ public void ArrayAppend()
       Assert.That(document.values.ContainsKey("y"), Is.False);
 
       var ex = Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(collection.Modify("true").ArrayAppend("x", "")));
-      Assert.That(ex.Message, Does.Contain("String can't be empty."));
+      Assert.That(ex.Message, Does.Contain("String can't be empty"));
       ex = Assert.Throws<ArgumentException>(() => ExecuteModifyStatement(collection.Modify("true").ArrayAppend("x", string.Empty)));
-      Assert.That(ex.Message, Does.Contain("String can't be empty."));
+      Assert.That(ex.Message, Does.Contain("String can't be empty"));
 
       var col = CreateCollection("my_collection");
       var t1 = "{\"_id\": \"1001\", \"ARR\":[1,2,3], \"ARR1\":[\"name1\",\"name2\", \"name3\"]}";
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs
index ff82ee248..d6ebc34c8 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs
@@ -39,13 +39,13 @@ namespace MySqlX.Data.Tests
   /// </summary>
   public class DnsSrvTests : BaseTest
   {
-    [TestCase("server=localhost;port=33060;dns-srv=true;", "Specifying a port number with DNS SRV lookup is not permitted.")]
-    [TestCase("server=localhost,10.10.10.10;dns-srv=true;", "Specifying multiple host names with DNS SRV lookup is not permitted.")]
-    [TestCase("host=localhost,10.10.10.10;dns-srv=TRUE;", "Specifying multiple host names with DNS SRV lookup is not permitted.")]
-    [TestCase("server=(address=localhost,priority=100), (address=10.10.10.10,priority=90);dns-srv=true;", "Specifying multiple host names with DNS SRV lookup is not permitted.")]
-    [TestCase("server=localhost;protocol=unix;Dns-Srv=true;", "Using Unix domain sockets with DNS SRV lookup is not permitted.")]
-    [TestCase("server=localhost;protocol=unixSocket;dns-srv=true;", "Using Unix domain sockets with DNS SRV lookup is not permitted.")]
-    [TestCase("server=localhost;connectionprotocol=unix;DnsSrv=true;", "Using Unix domain sockets with DNS SRV lookup is not permitted.")]
+    [TestCase("server=localhost;port=33060;dns-srv=true;", "Specifying a port number with DNS SRV lookup is not permitted")]
+    [TestCase("server=localhost,10.10.10.10;dns-srv=true;", "Specifying multiple host names with DNS SRV lookup is not permitted")]
+    [TestCase("host=localhost,10.10.10.10;dns-srv=TRUE;", "Specifying multiple host names with DNS SRV lookup is not permitted")]
+    [TestCase("server=(address=localhost,priority=100), (address=10.10.10.10,priority=90);dns-srv=true;", "Specifying multiple host names with DNS SRV lookup is not permitted")]
+    [TestCase("server=localhost;protocol=unix;Dns-Srv=true;", "Using Unix domain sockets with DNS SRV lookup is not permitted")]
+    [TestCase("server=localhost;protocol=unixSocket;dns-srv=true;", "Using Unix domain sockets with DNS SRV lookup is not permitted")]
+    [TestCase("server=localhost;connectionprotocol=unix;DnsSrv=true;", "Using Unix domain sockets with DNS SRV lookup is not permitted")]
     public void DnsSrvConnectionStringInvalidConfiguration(string connString, string exceptionMessage)
     {
       connString = connString.Replace("localhost", Host).Replace("33060", XPort);
@@ -104,12 +104,12 @@ public void DnsSrvConnectionAnonymousTypeInvalidConfiguration()
       Assert.That(exception.Message, Is.EqualTo(MySql.Data.Resources.DnsSrvInvalidConnOptionUnixSocket));
     }
 
-    [TestCase("mysqlx+srv://test:test@localhost:33060", "Specifying a port number with DNS SRV lookup is not permitted.")]
-    [TestCase("mysqlx+srv://test:test@[192.1.10.10,localhost]", "Specifying multiple host names with DNS SRV lookup is not permitted.")]
-    [TestCase("mysqlx+srv://test:test@[192.1.10.10,localhost:33060]/test", "Specifying multiple host names with DNS SRV lookup is not permitted.")]
-    [TestCase("mysqlx+srv://test:test@[(address = server.example, priority = 50),(address = localhost:33060,priority=100)]", "Specifying multiple host names with DNS SRV lookup is not permitted.")]
-    [TestCase("mysqlx+srv://test:test@./tmp/mysql.sock?protocol=unix", "Using Unix domain sockets with DNS SRV lookup is not permitted.")]
-    [TestCase("mysqlx+srv://test:test@localhost?dns-srv=false;", "'dns-srv' cannot be set to false with DNS SRV lookup enabled.")]
+    [TestCase("mysqlx+srv://test:test@localhost:33060", "Specifying a port number with DNS SRV lookup is not permitted")]
+    [TestCase("mysqlx+srv://test:test@[192.1.10.10,localhost]", "Specifying multiple host names with DNS SRV lookup is not permitted")]
+    [TestCase("mysqlx+srv://test:test@[192.1.10.10,localhost:33060]/test", "Specifying multiple host names with DNS SRV lookup is not permitted")]
+    [TestCase("mysqlx+srv://test:test@[(address = server.example, priority = 50),(address = localhost:33060,priority=100)]", "Specifying multiple host names with DNS SRV lookup is not permitted")]
+    [TestCase("mysqlx+srv://test:test@./tmp/mysql.sock?protocol=unix", "Using Unix domain sockets with DNS SRV lookup is not permitted")]
+    [TestCase("mysqlx+srv://test:test@localhost?dns-srv=false;", "'dns-srv' cannot be set to false with DNS SRV lookup enabled")]
     public void DnsSrvConnectionStringUriInvalidConfiguration(string connStringUri, string exceptionMessage)
     {
       connStringUri = connStringUri.Replace("localhost", Host).Replace("33060", XPort);
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
index bcb824a7b..5e26dc418 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
@@ -189,10 +189,10 @@ public void RowLockingNotSupportedInOlderVersions()
       Table table = session.Schema.GetTable("test");
 
       Exception ex = Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table.Select().LockShared()));
-      Assert.That(ex.Message, Is.EqualTo("This functionality is only supported from server version 8.0.3 onwards."));
+      Assert.That(ex.Message, Is.EqualTo("This functionality is only supported from server version 8.0.3 onwards"));
 
       ex = Assert.Throws<MySqlException>(() => ExecuteSelectStatement(table.Select().LockExclusive()));
-      Assert.That(ex.Message, Is.EqualTo("This functionality is only supported from server version 8.0.3 onwards."));
+      Assert.That(ex.Message, Is.EqualTo("This functionality is only supported from server version 8.0.3 onwards"));
     }
 
     [Test]
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
index 9be27390c..2cb9c748b 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
@@ -344,7 +344,7 @@ public void IPv6AsAnonymous()
     [Property("Category", "Security")]
     public void CreateSessionWithUnsupportedOptions()
     {
-      var errorMessage = "Option not supported.";
+      var errorMessage = "Option not supported";
       var connectionUri = string.Format("{0}?", ConnectionStringUri);
 
       // Use a connection URI.
@@ -438,7 +438,7 @@ public void CreateSessionWithUnsupportedOptions()
     [Property("Category", "Security")]
     public void CreateBuilderWithUnsupportedOptions()
     {
-      var errorMessage = "Option not supported.";
+      var errorMessage = "Option not supported";
       var ex = Assert.Throws<ArgumentException>(() => new MySqlXConnectionStringBuilder("pipe=MYSQL"));
       Assert.That(ex.Message, Does.StartWith(errorMessage));
       ex = Assert.Throws<ArgumentException>(() => new MySqlXConnectionStringBuilder("allow batch=false"));
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
index 25828c3c7..500a1453e 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
@@ -126,7 +126,7 @@ public void SslPreferredIsInvalid()
 #if NET8_0_OR_GREATER
       prefered = "Preferred";
 #endif
-      var expectedErrorMessage = "Value '{0}' is not of the correct type.";
+      var expectedErrorMessage = "Value '{0}' is not of the correct type";
 
       // In connection string.
       var exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionStringUri + "?ssl-mode=Preferred"));
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
index 08acc6603..7b949d01c 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
@@ -154,7 +154,7 @@ public void IncorrectAuthOptionThrowsArgumentException()
       foreach (var value in values)
       {
         Exception ex = Assert.Throws<ArgumentException>(() => new MySqlXConnectionStringBuilder(String.Format("server=localhost;aUth={0}", value)));
-        Assert.That(ex.Message, Is.EqualTo(String.Format("Value '{0}' is not of the correct type.", value)));
+        Assert.That(ex.Message, Is.EqualTo(String.Format("Value '{0}' is not of the correct type", value)));
       }
     }
 
diff --git a/MySql.Web/tests/SchemaManagerTests.cs b/MySql.Web/tests/SchemaManagerTests.cs
index 86dd3790d..a4f1f68d2 100644
--- a/MySql.Web/tests/SchemaManagerTests.cs
+++ b/MySql.Web/tests/SchemaManagerTests.cs
@@ -314,7 +314,7 @@ public void InitializeInvalidConnStringThrowsArgumentException()
       config.Add("connectionString", badConnectionString);
 
       Exception ex = Assert.Throws<ArgumentException>(() => provider.Initialize(null, config));
-      Assert.That(ex.Message, Is.EqualTo("Option not supported.\r\nParameter name: fookey"));
+      Assert.That(ex.Message, Is.EqualTo("Option not supported\r\nParameter name: fookey"));
     }
   }
 }

From 3946ae3e464d9d48f71ca3a1da4864faefb4b2aa Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 14 Jul 2024 12:06:22 -0600
Subject: [PATCH 28/99] WL#16309 [Fix Code coverage]

Change-Id: Idb52593fd76e8b946678432e68618e5d73a278d1
---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index a9d5cdf86..bf1295dbc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@
 - Changed testsuite to use assummptions instead of Assert.Ignore (WL16402).
 - Added support for .NET 9 and EFCore 9 preview versions (WL16308).
 - Added OpenTelemetry.Api NuGet package reference (WL16453).
+- Fixed Code coverage (WL16309).
 
 
 9.0.0

From 0087ace671d3a8f46193337bccc55018d28458ed Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Mon, 12 Aug 2024 11:48:53 -0600
Subject: [PATCH 29/99] WL#16491 [OpenID Connect authentication support]

Change-Id: Ib30ed5528a6080a34d9322cdfe88dd4cf5d86b65
---
 CHANGES                                       |  1 +
 .../Authentication/AuthenticationManager.cs   |  1 +
 .../OpenIdConnectClientAuthentication.cs      | 41 ++++++++
 .../src/MySqlConnectionStringBuilder.cs       | 17 +++-
 MySQL.Data/src/Resources.Designer.cs          | 20 +++-
 MySQL.Data/src/Resources.resx                 |  6 ++
 .../tests/MySql.Data.Tests/AuthTests.cs       | 96 +++++++++++++++++++
 7 files changed, 180 insertions(+), 2 deletions(-)
 create mode 100644 MySQL.Data/src/Authentication/OpenIdConnectClientAuthentication.cs

diff --git a/CHANGES b/CHANGES
index bf1295dbc..fd4dba44e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@
 - Added support for .NET 9 and EFCore 9 preview versions (WL16308).
 - Added OpenTelemetry.Api NuGet package reference (WL16453).
 - Fixed Code coverage (WL16309).
+- Added support for OpenID Connect client authentication (WL16491).
 
 
 9.0.0
diff --git a/MySQL.Data/src/Authentication/AuthenticationManager.cs b/MySQL.Data/src/Authentication/AuthenticationManager.cs
index 78e78000d..cbdcf8adb 100644
--- a/MySQL.Data/src/Authentication/AuthenticationManager.cs
+++ b/MySQL.Data/src/Authentication/AuthenticationManager.cs
@@ -49,6 +49,7 @@ static AuthenticationPluginManager()
       Plugins["authentication_kerberos_client"] = new PluginInfo("MySql.Data.MySqlClient.Authentication.KerberosAuthenticationPlugin");
       Plugins["authentication_oci_client"] = new PluginInfo("MySql.Data.MySqlClient.Authentication.OciAuthenticationPlugin");
       Plugins["authentication_webauthn_client"] = new PluginInfo("MySql.Data.MySqlClient.Authentication.WebAuthnAuthenticationPlugin");
+      Plugins["authentication_openid_connect_client"] = new PluginInfo("MySql.Data.MySqlClient.Authentication.OpenIdConnectClientAuthentication");
 
       AuthenticationManagerCtorConfiguration();
     }
diff --git a/MySQL.Data/src/Authentication/OpenIdConnectClientAuthentication.cs b/MySQL.Data/src/Authentication/OpenIdConnectClientAuthentication.cs
new file mode 100644
index 000000000..ef330b3c5
--- /dev/null
+++ b/MySQL.Data/src/Authentication/OpenIdConnectClientAuthentication.cs
@@ -0,0 +1,41 @@
+using MySql.Data.MySqlClient;
+using MySql.Data.MySqlClient.Authentication;
+using Org.BouncyCastle.Utilities.Encoders;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MySql.Data.MySqlClient.Authentication
+{
+  internal class OpenIdConnectClientAuthentication : MySqlAuthenticationPlugin
+  {
+    public override string PluginName => "authentication_openid_connect_client";
+
+    private static int IdentityToken_sizelimit = 10 * 1024;
+
+    protected override Task<byte[]> MoreDataAsync(byte[] data, bool execAsync)
+    {
+      byte[] IdToken = Encoding.GetBytes(Settings.OpenIdIdentityToken);
+      int responseLength = 10;//1 Byte for capability flag. the rest is for Bytes lenenc.
+      responseLength += IdToken.Length;
+
+      if (IdToken == null || IdToken.Length == 0)
+        throw new ArgumentException(Resources.OpenIdIdentityTokenIsEmpty);
+
+      if (IdToken.Length > IdentityToken_sizelimit)
+        throw new ArgumentException(Resources.OpenIdIdentityTokenTooBig);
+
+      var response = new MySqlPacket(new MemoryStream(responseLength));
+      response.Write(new byte[] { 0x01 }); //capability flag.
+      response.WriteLength(IdToken.Length);
+      response.Write(IdToken);
+
+      response.Position = 0;
+      return Task.FromResult<byte[]>(response.Buffer);
+    }
+  }
+}
diff --git a/MySQL.Data/src/MySqlConnectionStringBuilder.cs b/MySQL.Data/src/MySqlConnectionStringBuilder.cs
index 0a5d60e11..273da4e44 100644
--- a/MySQL.Data/src/MySqlConnectionStringBuilder.cs
+++ b/MySQL.Data/src/MySqlConnectionStringBuilder.cs
@@ -144,7 +144,7 @@ static MySqlConnectionStringBuilder()
             msb.SetValue("kerberosauthmode", value);
         },
         (msb, sender) => msb.KerberosAuthMode));
-
+      Options.Add(new MySqlConnectionStringOption("openididentitytoken", null, typeof(string), string.Empty, false));
       #endregion
 
       #region OtherProperties
@@ -536,6 +536,21 @@ public KerberosAuthMode KerberosAuthMode
       set { SetValue("kerberosauthmode", value); }
     }
 
+    /// <summary>
+    /// Gets or sets the Identity Token to be used in OpenID Connect authentication.
+    /// </summary>
+    /// <remarks>
+    /// If <see cref="OpenIdIdentityToken"/> is set the value will be used to try to log in using OpenID Connect authentication.
+    /// </remarks>
+    [Category("Authentication")]
+    [DisplayName("OpenIdIdentityToken")]
+    [Description("Specifies the Identity Token to use during OpenID Connect authentication.")]
+    public string OpenIdIdentityToken
+    {
+      get { return (string)values["openididentitytoken"]; }
+      set { SetValue("openididentitytoken", value); }
+    }
+
     #endregion
 
     #region Other Properties
diff --git a/MySQL.Data/src/Resources.Designer.cs b/MySQL.Data/src/Resources.Designer.cs
index 991529e42..8a38ca951 100644
--- a/MySQL.Data/src/Resources.Designer.cs
+++ b/MySQL.Data/src/Resources.Designer.cs
@@ -925,7 +925,25 @@ internal static string OldPasswordsNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The option &apos;{0}&apos; is not currently supported.
+        ///   Looks up a localized string similar to The OpenID Connect Identity Token is empty.
+        /// </summary>
+        internal static string OpenIdIdentityTokenIsEmpty {
+            get {
+                return ResourceManager.GetString("OpenIdIdentityTokenIsEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The OpenID Connect Identity Token is invalid.
+        /// </summary>
+        internal static string OpenIdIdentityTokenTooBig {
+            get {
+                return ResourceManager.GetString("OpenIdIdentityTokenTooBig", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The option &apos;{0}&apos; is not currently supported..
         /// </summary>
         internal static string OptionNotCurrentlySupported {
             get {
diff --git a/MySQL.Data/src/Resources.resx b/MySQL.Data/src/Resources.resx
index c5aa46d9a..9b6998c6e 100644
--- a/MySQL.Data/src/Resources.resx
+++ b/MySQL.Data/src/Resources.resx
@@ -690,4 +690,10 @@
   <data name="WebAuthnTimeout" xml:space="preserve">
     <value>The timeout of 15 seconds for user interaction with FIDO device has been exceeded</value>
   </data>
+  <data name="OpenIdIdentityTokenIsEmpty" xml:space="preserve">
+    <value>The OpenID Connect Identity Token is empty</value>
+  </data>
+  <data name="OpenIdIdentityTokenTooBig" xml:space="preserve">
+    <value>The OpenID Connect Identity Token is invalid</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
index 3d5028a4a..ab6f94bca 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
@@ -34,6 +34,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 
@@ -1818,6 +1819,101 @@ private static void Conn_WebAuthnActionRequested()
     }
     #endregion
 
+    #region OpenID Connect client
+    /// <summary>
+    /// WL16491 - OpenID Connect authentication support
+    /// </summary>
+
+    private static string IdentityToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJteXN1YmoiLCJpc3MiOiJodHRw" +
+    "czovL215aXNzdWVyLmNvbSIsImV4cCI6MjEzNTE5ODEwNX0.kXjtDjcSYhpNP0IgSbQjPuOsd-nBDVulQKgZAq4HkgMPCNINh-EIMbuqvYKkE5a" +
+    "B6zicm6PHNvxDrS63NjQH7Nh7s29eN50DSK33zQsvdYr8O5eUTL2SrNRqpWgMQ0xlU9Hr4HCw10YmIcwjskANHJxXSgyUCKveeRCR-L-DoNFZDy" +
+    "UYyd3pu7M1zO-12LjebktMklCQBfiCAcqSNDZDE2s6OkxuoF7VOtK91Wsw17xOZVQDjCZkUDtUrRZs8uxJfbjBonQ7LVQQhg227z8lrUeXewVhx" +
+    "NKPrf-YUrdMmEfMBjwD9v1AU5onKlkHuW0DtvZmt707Kyd-ve-HgQj1xX-W6BfEPo-28FCcDvLGlXZ8cyB1wPODogKhtc7bq3TPuTkDkegO7AG1" +
+    "NaYXcbSNEpQQ5zdfbzS_spV2zzJawPK1awNUeT_UA7t4swY4JcrOFkPkXUTqWT9QWvXuxCE9gZUAWIa3FHdeWjzLTZEKB8-ZhPYmyPphkzds9sm" +
+    "TJi4gawmNtb8WvEpXZUUXIZzIRcunXEdIayr18E9XfFCOCQo8JQOSxY3HQGgzqYk4S0AMeR0BiBIKe9VySsykdAuhLvL51AZDXvKQ9fQDu4lAtk" +
+    "cXrKCZwA_2RXjLzOM7dkySQu66t-GIIZXxqCdcWf1";
+
+    private static string OpenId_server_config = "JSON://{\"myissuer\":\"{\\\\\"kty\\\\\": \\\\\"RSA\\\\\",\\\\\"n\\\\\":" +
+    " \\\\\"zpnGGekMZHmWtpcsBmJdUODRApNHU7_bijsn4E0MWhthfkyK1LilQp5-aemc6Id5yL978CMfn10LXsjGchZKIGAgk52nW7kI3Zt973npwzB2M" +
+    "YJ4FFqsHQSAM9kvd3iUz2aQG-nVVl9Ia8Yimcssav8sEjOlEqZ1n_JLXavWwI9z-_lkTcZBgsM9jke_tWa1yLjYce009yBmf-sJMDrXZ-3TALrNUDzGt" +
+    "9mQwDxjE0UGnQIQE7vXJ2O5-k1qXMKPTew32zvRD7Bxcsxe71LRaerEPmgnricajk5LJVsbonavecrvHDCGDvOgzueZrr15kUhXZxZbXmtx6dUYqJ-0A" +
+    "qbZ0Km3elrYnDFysJR5pJsjmDnH2wzHDQ_gZeC_Up_4d78pzLyXHhiOmyDTLyogmeN7xYunvgzu-B4tepSC9XCSu-WZDmJASFaxRzOJhQBKLX2Ly0XmS" +
+    "LMXEP-vOupwvEi-SpBOVw2WzxT9dJrK-vI6cBGewB-zHrwsLFBvt1OZVNV5YGpQ1kqFfFoWrtkINFwJc39UnboDqalhvim9K-ITRe6xYk_Dlf9f-BA5b" +
+    "sry8n3GBBXEjkirM_QFb_DcbBXj1OJX_B0BZAK0bupYgOpxDG_su1a8N3CqOOWJguVzuydl7uW_uicDkCua3cVWd-n8QtXDaM6qZLRTB7q0_ek\\\\\"" +
+    ",\\\\\"e\\\\\": \\\\\"AQAB\\\\\",\\\\\"alg\\\\\": \\\\\"RS256\\\\\",\\\\\"use\\\\\": \\\\\"sig\\\\\",\\\\\"name" +
+    "\\\\\": \\\\\"https://myissuer.com\\\\\"}\"}";
+
+    [Test]
+    [Ignore("This test requires a server version 9.1.0 or higher configured to use OpenID Connect authentication")]
+    public void OpenIdConnectClient()
+    {
+      Assume.That(Version >= new Version("9.1.0"), "This test is for MySQL 9.1.0 or higher");
+      Assume.That(Check_Plugin_Enabled("authentication_openid_connect"), "authentication_openid_connect plugin must be enabled on the server to run this test");
+
+      ExecuteSQL("SET GLOBAL authentication_openid_connect_configuration = '" + OpenId_server_config + "'", true);
+
+      ExecuteSQL("CREATE USER IF NOT EXISTS 'openid-testuser'@'%' IDENTIFIED WITH 'authentication_openid_connect' AS '{\"identity_provider\" : \"myissuer\", \"user\" : \"mysubj\"}'", true);
+
+      var connStringBuilder1 = new MySqlConnectionStringBuilder()
+      {
+        UserID = "openid-testuser",
+        Server = Settings.Server,
+        Port = Settings.Port,
+        OpenIdIdentityToken = IdentityToken
+      };
+      using (MySqlConnection conn = new MySqlConnection(connStringBuilder1.ConnectionString))
+      {
+        conn.Open();
+        Assert.That(conn.connectionState, Is.EqualTo(ConnectionState.Open));
+      }
+
+      var connStringBuilder2 = new MySqlConnectionStringBuilder()
+      {
+        UserID = "openid-testuser",
+        Server = Settings.Server,
+        Port = Settings.Port,
+        OpenIdIdentityToken = IdentityToken,
+        DefaultAuthenticationPlugin = "authentication_openid_connect_client"
+      };
+      using (MySqlConnection conn = new MySqlConnection(connStringBuilder2.ConnectionString))
+      {
+        conn.Open();
+        Assert.That(conn.connectionState, Is.EqualTo(ConnectionState.Open));
+      }
+
+      var connStringBuilder3 = new MySqlConnectionStringBuilder()
+      {
+        UserID = "openid-testuser",
+        Server = Settings.Server,
+        Port = Settings.Port,
+        OpenIdIdentityToken = "",
+        DefaultAuthenticationPlugin = "authentication_openid_connect_client"
+      };
+      using (MySqlConnection conn = new MySqlConnection(connStringBuilder3.ConnectionString))
+      {
+        Assert.Throws<MySqlException>(() => conn.Open());
+      }
+
+      char[] reversedIdentityToken = IdentityToken.ToCharArray();
+      Array.Reverse(reversedIdentityToken);
+
+      var connStringBuilder4 = new MySqlConnectionStringBuilder()
+      {
+        UserID = "openid-testuser",
+        Server = Settings.Server,
+        Port = Settings.Port,
+        OpenIdIdentityToken = new string(reversedIdentityToken),
+        DefaultAuthenticationPlugin = "authentication_openid_connect_client"
+      };
+      using (MySqlConnection conn = new MySqlConnection(connStringBuilder4.ConnectionString))
+      {
+        Assert.Throws<MySqlException>(() => conn.Open());
+      }
+
+      ExecuteSQL("DROP USER IF EXISTS 'openid-testuser'@'%'", true);
+    }
+    #endregion
+
     [Test, Description("Test User Authentication Fails with classic protocol")]
     public void AuthPlainAndMySql41()
     {

From cfc92c1ef1736a554322d73adb1b544edb866e6a Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 4 Sep 2024 17:57:20 -0600
Subject: [PATCH 30/99] Updated LIUMS

Change-Id: I2ae26128b16cd1bd85cd11216c02b0548c26c13d
---
 LICENSE | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/LICENSE b/LICENSE
index b6c7a6e7e..f0067f828 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Licensing Information User Manual
 
-MySQL Connector/NET 9.0.0 Community
+MySQL Connector/NET 9.1.0 Community
      __________________________________________________________________
 
 Introduction
@@ -8,18 +8,18 @@ Introduction
    This License Information User Manual contains Oracle's product license
    and other licensing information, including licensing information for
    third-party software which may be included in this distribution of
-   MySQL Connector/NET 9.0.0 Community.
+   MySQL Connector/NET 9.1.0 Community.
 
-   Last updated: May 2024
+   Last updated: August 2024
 
 Licensing Information
 
-   This release of MySQL Connector/NET 9.0.0 Community is brought to you
+   This release of MySQL Connector/NET 9.1.0 Community is brought to you
    by the MySQL team at Oracle. This software is released under version 2
    of the GNU General Public License (GPLv2), as set forth below, with the
    following additional permissions:
 
-   This distribution of MySQL Connector/NET 9.0.0 Community is designed to
+   This distribution of MySQL Connector/NET 9.1.0 Community is designed to
    work with certain software (including but not limited to OpenSSL) that
    is licensed under separate terms, as designated in a particular file or
    component or in the license documentation. Without limiting your rights

From a9cf9f81021e81bcd8022fba7a7f1448dba464e5 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sat, 7 Sep 2024 20:10:54 -0600
Subject: [PATCH 31/99] Updated EF Core references

Change-Id: Ib1f144b7e651ade361bd4eb7f575eb656c2d7ea0
---
 EFCore/src/MySql.EntityFrameworkCore.csproj               | 8 ++++----
 .../MySql.EntityFrameworkCore.Basic.Tests.csproj          | 6 +++---
 .../MySql.EntityFrameworkCore.Design.Tests.csproj         | 4 ++--
 .../MySql.EntityFrameworkCore.Migrations.Tests.csproj     | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
index 51c6d3741..40ea8927b 100644
--- a/EFCore/src/MySql.EntityFrameworkCore.csproj
+++ b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -35,13 +35,13 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.30" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.30" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.33" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.33" />
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.8" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index 00582a122..3a15f0496 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -18,11 +18,11 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="6.0.30" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="6.0.33" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.8" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index f047fc92a..83fe6a293 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -28,13 +28,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.30" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
index 429a0cc63..9d357b0b8 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>

From 40c64c612d3fa406990872ad161ac01cbf97b36b Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 8 Sep 2024 16:07:51 -0600
Subject: [PATCH 32/99] Updated documentation.

Change-Id: Ie60211c4cb31ca7168d189b951ac002c777af49c
---
 Documentation/index.md |  4 ++--
 README.md              |  2 ++
 Release Notes.txt      | 12 ++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Documentation/index.md b/Documentation/index.md
index ffb271d5f..8c681525e 100644
--- a/Documentation/index.md
+++ b/Documentation/index.md
@@ -1,6 +1,6 @@
 ## MySQL Connector/NET and X DevAPI
 
-MySQL Connector/NET 9.0 supports X Protocol, which enables you to use X DevAPI with the .NET language of choice to develop applications that communicate with a MySQL server functioning as a document store, relational database, or both.
+MySQL Connector/NET 9.1 supports X Protocol, which enables you to use X DevAPI with the .NET language of choice to develop applications that communicate with a MySQL server functioning as a document store, relational database, or both.
 
 To get started, review the following main classes:
 
@@ -16,7 +16,7 @@ For an introduction to X DevAPI concepts, see the [X DevAPI User Guide](https://
 
 ## MySQL Connector/NET
 
-MySQL Connector/NET 9.0 also supports the development of .NET, .NET Core and .NET Framework applications that require secure, high-performance data connectivity with MySQL through the classic protocol. It supports ADO.NET, Entity Framework and various web providers.
+MySQL Connector/NET 9.1 also supports the development of .NET, .NET Core and .NET Framework applications that require secure, high-performance data connectivity with MySQL through the classic protocol. It supports ADO.NET, Entity Framework and various web providers.
 
 To get started, review the following main classes:
 
diff --git a/README.md b/README.md
index 0a25e8138..f2eab22b9 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,8 @@ From MySQL Connector/NET 8.4, the driver adds support for TLS1.3 and removes sup
 
 From MySQL Connector/NET 9.0, the driver removes support for .NET 7 and EF Core 7.
 
+From MySQL Connector/NET 9.1, the driver adds support for .NET 9 and EF Core 9 preview versions.
+
 For detailed information please visit the official [MySQL Connector/NET documentation.](https://dev.mysql.com/doc/connector-net/en/)
 
 ## Licensing
diff --git a/Release Notes.txt b/Release Notes.txt
index b6cf83c91..8ca04ebb3 100644
--- a/Release Notes.txt	
+++ b/Release Notes.txt	
@@ -1,10 +1,10 @@
-Connector/NET 9.0 Release Notes
+Connector/NET 9.1 Release Notes
 ------------------------------------
-Welcome to the release notes for Connector/NET 9.0
+Welcome to the release notes for Connector/NET 9.1
 
-What's new in 9.0
+What's new in 9.1
 --------------------
 
-Connector/NET now uses NUnit 4.1 in the testsuite.
-Connector/NET updated 3rd party dependencies.
-Connector/NET removes support for .NET 7 and EF Core 7.
\ No newline at end of file
+Connector/NET adds support for .NET 9 and EF Core 9 preview versions.
+Connector/NET adds support for OpenID Connect authentication.
+Connector/NET now uses constraint model in testsuite.
\ No newline at end of file

From 9b45247075ff882133a5b6f2153d0ace25f96ff7 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 8 Sep 2024 15:39:32 -0600
Subject: [PATCH 33/99] Bug#35937318 [8.0.33 Removes Important Locks]

Change-Id: I080cc163c5bd1bc587631ee121dac57c664b8553
---
 CHANGES                                       |   1 +
 .../MySQLAuthenticationPlugin.cs              |   2 +-
 MySQL.Data/src/CharSetMap.cs                  |  48 ++++---
 MySQL.Data/src/MySql.Data.csproj              |   2 +-
 MySQL.Data/src/MySqlPool.cs                   | 132 +++++++++++++-----
 MySQL.Data/src/MySqlPoolManager.cs            |   6 +-
 MySQL.Data/src/NativeDriver.cs                |   4 +-
 .../src/Replication/ReplicationManager.cs     |  79 ++++++-----
 .../src/X/XDevAPI/Common/BaseStatement.cs     |   2 +-
 MySQL.Data/src/common/Ssl.cs                  |  39 ++++--
 10 files changed, 205 insertions(+), 110 deletions(-)

diff --git a/CHANGES b/CHANGES
index fd4dba44e..c52e4d610 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@
 - Added OpenTelemetry.Api NuGet package reference (WL16453).
 - Fixed Code coverage (WL16309).
 - Added support for OpenID Connect client authentication (WL16491).
+- Fixed bug 8.0.33 Removes Important Locks (MySQL Bug #111759, Oracle Bug #35937318). Thanks to Stuart Lang for the contribution.
 
 
 9.0.0
diff --git a/MySQL.Data/src/Authentication/MySQLAuthenticationPlugin.cs b/MySQL.Data/src/Authentication/MySQLAuthenticationPlugin.cs
index f33b42bd5..9af2e8f3b 100644
--- a/MySQL.Data/src/Authentication/MySQLAuthenticationPlugin.cs
+++ b/MySQL.Data/src/Authentication/MySQLAuthenticationPlugin.cs
@@ -171,7 +171,7 @@ internal async Task AuthenticateAsync(bool reset, bool execAsync)
         await packet.WriteStringAsync(PluginName, execAsync).ConfigureAwait(false);
 
       await _driver.SetConnectAttrsAsync(execAsync).ConfigureAwait(false);
-      await _driver.SendPacketAsync(packet, execAsync);
+      await _driver.SendPacketAsync(packet, execAsync).ConfigureAwait(false);
 
       // Read server response.
       packet = await ReadPacketAsync(execAsync).ConfigureAwait(false);
diff --git a/MySQL.Data/src/CharSetMap.cs b/MySQL.Data/src/CharSetMap.cs
index 8775e9e3a..52bbc3e02 100644
--- a/MySQL.Data/src/CharSetMap.cs
+++ b/MySQL.Data/src/CharSetMap.cs
@@ -42,13 +42,12 @@ internal class CharSetMap
     private static Dictionary<string, string> _defaultCollations;
     private static Dictionary<string, int> _maxLengths;
     private static Dictionary<string, CharacterSet> _mapping;
-    private static readonly object LockObject;
+    private static SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1, 1);
 
     // we use a static constructor here since we only want to init
     // the mapping once
     static CharSetMap()
     {
-      LockObject = new Object();
       InitializeMapping();
     }
 
@@ -57,8 +56,8 @@ public static CharacterSet GetCharacterSet(string charSetName)
       if (charSetName == null)
         throw new ArgumentNullException("CharSetName is null");
       CharacterSet cs = null;
-      if (_mapping.ContainsKey(charSetName))
-        cs = _mapping[charSetName];
+      if (_mapping.TryGetValue(charSetName, out var charset))
+        cs = charset;
 
       if (cs == null)
         throw new NotSupportedException("Character set '" + charSetName + "' is not supported by .Net Framework.");
@@ -181,27 +180,42 @@ internal static async Task InitCollectionsAsync(MySqlConnection connection, bool
 
     internal static async Task<string> GetDefaultCollationAsync(string charset, MySqlConnection connection, bool execAsync, CancellationToken cancellationToken = default)
     {
-      SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1);
-      semaphoreSlim.Wait();
+      if (execAsync)
+        await semaphoreSlim.WaitAsync(cancellationToken);
+      else
+        semaphoreSlim.Wait(cancellationToken);
 
-      if (_defaultCollations == null)
-        await InitCollectionsAsync(connection, execAsync, cancellationToken).ConfigureAwait(false);
+      try
+      {
+        if (_defaultCollations == null)
+          await InitCollectionsAsync(connection, execAsync, cancellationToken).ConfigureAwait(false);
+      }
+      finally
+      {
+        semaphoreSlim.Release();
+      }
 
-      semaphoreSlim.Release();
-      return !_defaultCollations.ContainsKey(charset) ? null : _defaultCollations[charset];
+      return !_defaultCollations.TryGetValue(charset, out string collation) ? null : collation;
     }
 
     internal static async Task<int> GetMaxLengthAsync(string charset, MySqlConnection connection, bool execAsync, CancellationToken cancellationToken = default)
     {
-      SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1);
-      semaphoreSlim.Wait();
-
-      if (_maxLengths == null)
-        await InitCollectionsAsync(connection, execAsync, cancellationToken).ConfigureAwait(false);
+      if (execAsync)
+        await semaphoreSlim.WaitAsync(cancellationToken);
+      else
+        semaphoreSlim.Wait(cancellationToken);
 
-      semaphoreSlim.Release();
+      try
+      {
+        if (_maxLengths == null)
+          await InitCollectionsAsync(connection, execAsync, cancellationToken).ConfigureAwait(false);
+      }
+      finally
+      {
+        semaphoreSlim.Release();
+      }
 
-      return !_maxLengths.ContainsKey(charset) ? 1 : _maxLengths[charset];
+      return !_maxLengths.TryGetValue(charset, out int maxLength) ? 1 : maxLength;
     }
   }
 
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index 9f57e77ce..ebc805e3b 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -42,7 +42,7 @@
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
     <TargetFrameworks>net462;net48;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <None Include="..\..\Nuget\Images\logo-mysql-170x115.png" Pack="true" PackagePath="\" />
   </ItemGroup>
diff --git a/MySQL.Data/src/MySqlPool.cs b/MySQL.Data/src/MySqlPool.cs
index 98f28750f..e8efab95f 100644
--- a/MySQL.Data/src/MySqlPool.cs
+++ b/MySQL.Data/src/MySqlPool.cs
@@ -49,7 +49,9 @@ internal sealed class MySqlPool
     private readonly AutoResetEvent _autoEvent;
     private int _available;
     // Object used to lock the list of host obtained from DNS SRV lookup.
-    private readonly object _dnsSrvLock = new object();
+    private readonly SemaphoreSlim inUsePoolSemaphore = new SemaphoreSlim(1, 1);
+    private readonly SemaphoreSlim idlePoolSemaphore = new SemaphoreSlim(1, 1);
+    private readonly SemaphoreSlim dnsSrvSemaphore = new SemaphoreSlim(1, 1);
 
     private void EnqueueIdle(Driver driver)
     {
@@ -121,7 +123,12 @@ private async Task<Driver> GetPooledConnectionAsync(bool execAsync, Cancellation
 
       // if we don't have an idle connection but we have room for a new
       // one, then create it here.
-      lock ((_idlePool as ICollection).SyncRoot)
+      if (execAsync)
+        await idlePoolSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
+      else
+        idlePoolSemaphore.Wait(cancellationToken);
+
+      try
       {
         if (HasIdleConnections)
         {
@@ -129,6 +136,10 @@ private async Task<Driver> GetPooledConnectionAsync(bool execAsync, Cancellation
           _idlePool.RemoveLast();
         }
       }
+      finally
+      {
+        idlePoolSemaphore.Release();
+      }
 
       // Obey the connection timeout
       if (driver != null)
@@ -164,10 +175,20 @@ private async Task<Driver> GetPooledConnectionAsync(bool execAsync, Cancellation
         driver = await CreateNewPooledConnectionAsync(execAsync, cancellationToken).ConfigureAwait(false);
 
       Debug.Assert(driver != null);
-      lock ((_inUsePool as ICollection).SyncRoot)
+      if (execAsync)
+        await inUsePoolSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
+      else
+        inUsePoolSemaphore.Wait(cancellationToken);
+
+      try
       {
         _inUsePool.Add(driver);
       }
+      finally
+      {
+        inUsePoolSemaphore.Release();
+      }
+
       return driver;
     }
 
@@ -185,11 +206,20 @@ private async Task<Driver> CreateNewPooledConnectionAsync(bool execAsync, Cancel
 
     public async Task ReleaseConnectionAsync(Driver driver, bool execAsync)
     {
-      lock ((_inUsePool as ICollection).SyncRoot)
+      if (execAsync)
+        await inUsePoolSemaphore.WaitAsync().ConfigureAwait(false);
+      else
+        inUsePoolSemaphore.Wait();
+
+      try
       {
         if (_inUsePool.Contains(driver))
           _inUsePool.Remove(driver);
       }
+      finally
+      {
+        inUsePoolSemaphore.Release();
+      }
 
       if (driver.ConnectionLifetimeExpired() || BeingCleared)
       {
@@ -198,32 +228,48 @@ public async Task ReleaseConnectionAsync(Driver driver, bool execAsync)
       }
       else
       {
-        lock ((_idlePool as ICollection).SyncRoot)
+        if (execAsync)
+          await idlePoolSemaphore.WaitAsync().ConfigureAwait(false);
+        else
+          idlePoolSemaphore.Wait();
+
+        try
         {
           EnqueueIdle(driver);
         }
+        finally
+        {
+          idlePoolSemaphore.Release();
+        }
       }
 
-      SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1);
-      semaphoreSlim.Wait();
+      if (execAsync)
+        await dnsSrvSemaphore.WaitAsync().ConfigureAwait(false);
+      else
+        dnsSrvSemaphore.Wait();
 
-      if (driver.Settings.DnsSrv)
+      try
       {
-        var dnsSrvRecords = DnsSrv.GetDnsSrvRecords(DnsSrv.ServiceName);
-        FailoverManager.SetHostList(dnsSrvRecords.ConvertAll(r => new FailoverServer(r.Target, r.Port, null)),
-          FailoverMethod.Sequential);
-
-        foreach (var idleConnection in _idlePool)
+        if (driver.Settings.DnsSrv)
         {
-          string idleServer = idleConnection.Settings.Server;
-          if (!FailoverManager.FailoverGroup.Hosts.Exists(h => h.Host == idleServer) && !idleConnection.IsInActiveUse)
+          var dnsSrvRecords = DnsSrv.GetDnsSrvRecords(DnsSrv.ServiceName);
+          FailoverManager.SetHostList(dnsSrvRecords.ConvertAll(r => new FailoverServer(r.Target, r.Port, null)),
+            FailoverMethod.Sequential);
+
+          foreach (var idleConnection in _idlePool)
           {
-            await idleConnection.CloseAsync(execAsync).ConfigureAwait(false);
+            string idleServer = idleConnection.Settings.Server;
+            if (!FailoverManager.FailoverGroup.Hosts.Exists(h => h.Host == idleServer) && !idleConnection.IsInActiveUse)
+            {
+              await idleConnection.CloseAsync(execAsync).ConfigureAwait(false);
+            }
           }
         }
       }
-
-      semaphoreSlim.Release();
+      finally
+      {
+        dnsSrvSemaphore.Release();
+      }
 
       Interlocked.Increment(ref _available);
       _autoEvent.Set();
@@ -238,7 +284,8 @@ public async Task ReleaseConnectionAsync(Driver driver, bool execAsync)
     /// <param name="driver"></param>
     public void RemoveConnection(Driver driver)
     {
-      lock ((_inUsePool as ICollection).SyncRoot)
+      inUsePoolSemaphore.Wait();
+      try
       {
         if (_inUsePool.Contains(driver))
         {
@@ -247,6 +294,10 @@ public void RemoveConnection(Driver driver)
           _autoEvent.Set();
         }
       }
+      finally
+      {
+        inUsePoolSemaphore.Release();
+      }
 
       // if we are being cleared and we are out of connections then have
       // the manager destroy us.
@@ -301,21 +352,28 @@ public async Task<Driver> GetConnectionAsync(bool execAsync, CancellationToken c
     /// </summary>
     internal async Task ClearAsync(bool execAsync)
     {
-      SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1);
-      semaphoreSlim.Wait();
+      if (execAsync)
+        await idlePoolSemaphore.WaitAsync().ConfigureAwait(false);
+      else
+        idlePoolSemaphore.Wait();
 
-      // first, mark ourselves as being cleared
-      BeingCleared = true;
+      try
+      {
+        // first, mark ourselves as being cleared
+        BeingCleared = true;
 
-      // then we remove all connections sitting in the idle pool
-      while (_idlePool.Count > 0)
+        // then we remove all connections sitting in the idle pool
+        while (_idlePool.Count > 0)
+        {
+          Driver d = _idlePool.Last.Value;
+          await d.CloseAsync(execAsync).ConfigureAwait(false);
+          _idlePool.RemoveLast();
+        }
+      }
+      finally
       {
-        Driver d = _idlePool.Last.Value;
-        await d.CloseAsync(execAsync).ConfigureAwait(false);
-        _idlePool.RemoveLast();
+        idlePoolSemaphore.Release();
       }
-
-      semaphoreSlim.Release();
       // there is nothing left to do here.  Now we just wait for all
       // in use connections to be returned to the pool.  When they are
       // they will be closed.  When the last one is closed, the pool will
@@ -338,23 +396,29 @@ internal List<Driver> RemoveOldIdleConnections()
       var connectionsToClose = new List<Driver>();
       DateTime now = DateTime.Now;
 
-      lock ((_idlePool as ICollection).SyncRoot)
+      idlePoolSemaphore.Wait();
+
+      try
       {
         while (_idlePool.Count > _minSize)
         {
-          var iddleConnection = _idlePool.First.Value;
-          DateTime expirationTime = iddleConnection.IdleSince.Add(
+          var idleConnection = _idlePool.First.Value;
+          DateTime expirationTime = idleConnection.IdleSince.Add(
             new TimeSpan(0, 0, MySqlPoolManager.maxConnectionIdleTime));
 
           if (expirationTime.CompareTo(now) < 0)
           {
-            connectionsToClose.Add(iddleConnection);
+            connectionsToClose.Add(idleConnection);
             _idlePool.RemoveFirst();
           }
           else
             break;
         }
       }
+      finally
+      {
+        idlePoolSemaphore.Release();
+      }
       return connectionsToClose;
     }
   }
diff --git a/MySQL.Data/src/MySqlPoolManager.cs b/MySQL.Data/src/MySqlPoolManager.cs
index cc16792d0..3e624340a 100644
--- a/MySQL.Data/src/MySqlPoolManager.cs
+++ b/MySQL.Data/src/MySqlPoolManager.cs
@@ -49,7 +49,7 @@ internal class MySqlPoolManager
     private static readonly Dictionary<string, MySqlPool> Pools = new Dictionary<string, MySqlPool>();
     private static readonly List<MySqlPool> ClearingPools = new List<MySqlPool>();
     internal const int DEMOTED_TIMEOUT = 120000;
-    private static SemaphoreSlim waitHandle = new(1);
+    private static SemaphoreSlim waitHandle = new(1, 1);
 
     #region Properties
     /// <summary>
@@ -158,10 +158,6 @@ public static async Task<MySqlPool> GetPoolAsync(MySqlConnectionStringBuilder se
 
         return pool;
       }
-      catch (Exception ex)
-      {
-        throw;
-      }
       finally
       {
         waitHandle.Release();
diff --git a/MySQL.Data/src/NativeDriver.cs b/MySQL.Data/src/NativeDriver.cs
index b6d6f860b..0afe4712e 100644
--- a/MySQL.Data/src/NativeDriver.cs
+++ b/MySQL.Data/src/NativeDriver.cs
@@ -117,7 +117,7 @@ private async Task HandleExceptionAsync(MySqlException ex, bool execAsync)
 
     internal async Task SendPacketAsync(MySqlPacket p, bool execAsync)
     {
-      await stream.SendPacketAsync(p, execAsync);
+      await stream.SendPacketAsync(p, execAsync).ConfigureAwait(false);
     }
 
     internal async Task SendEmptyPacketAsync(bool execAsync)
@@ -421,7 +421,7 @@ public async Task AuthenticateAsync(string authMethod, bool reset, bool execAsyn
 
         authPlugin = await MySqlAuthenticationPlugin.GetPluginAsync(authMethod, this, encryptionSeed, execAsync).ConfigureAwait(false);
       }
-      await authPlugin.AuthenticateAsync(reset, execAsync);
+      await authPlugin.AuthenticateAsync(reset, execAsync).ConfigureAwait(false);
     }
 
     #endregion
diff --git a/MySQL.Data/src/Replication/ReplicationManager.cs b/MySQL.Data/src/Replication/ReplicationManager.cs
index 5c0fb0dd1..48d0e3186 100644
--- a/MySQL.Data/src/Replication/ReplicationManager.cs
+++ b/MySQL.Data/src/Replication/ReplicationManager.cs
@@ -41,8 +41,7 @@ namespace MySql.Data.MySqlClient.Replication
   internal static class ReplicationManager
   {
     private static List<ReplicationServerGroup> groups = new List<ReplicationServerGroup>();
-    private static Object thisLock = new Object();
-    //private static Dictionary<string, ReplicationServerSelector> selectors = new Dictionary<string, ReplicationServerSelector>();
+    private static SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1, 1);
 
     static ReplicationManager()
     {
@@ -147,55 +146,61 @@ internal static async Task GetNewConnectionAsync(string groupName, bool source,
     {
       do
       {
-        SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1);
-        semaphoreSlim.Wait();
+        if (execAsync)
+          await semaphoreSlim.WaitAsync(cancellationToken).ConfigureAwait(false);
+        else
+          semaphoreSlim.Wait(cancellationToken);
 
-        if (!IsReplicationGroup(groupName)) return;
+        try
+        {
+          if (!IsReplicationGroup(groupName)) return;
 
-        ReplicationServerGroup group = GetGroup(groupName);
-        ReplicationServer server = group.GetServer(source, connection.Settings);
+          ReplicationServerGroup group = GetGroup(groupName);
+          ReplicationServer server = group.GetServer(source, connection.Settings);
 
-        if (server == null)
-          throw new MySqlException(Resources.Replication_NoAvailableServer);
+          if (server == null)
+            throw new MySqlException(Resources.Replication_NoAvailableServer);
 
-        try
-        {
-          bool isNewServer = false;
-          if (connection.driver == null || !connection.driver.IsOpen)
+          try
           {
-            isNewServer = true;
-          }
-          else
-          {
-            MySqlConnectionStringBuilder msb = new MySqlConnectionStringBuilder(server.ConnectionString);
-            if (!msb.Equals(connection.driver.Settings))
+            bool isNewServer = false;
+            if (connection.driver == null || !connection.driver.IsOpen)
             {
               isNewServer = true;
             }
+            else
+            {
+              MySqlConnectionStringBuilder msb = new MySqlConnectionStringBuilder(server.ConnectionString);
+              if (!msb.Equals(connection.driver.Settings))
+              {
+                isNewServer = true;
+              }
+            }
+            if (isNewServer)
+            {
+              Driver driver = await Driver.CreateAsync(new MySqlConnectionStringBuilder(server.ConnectionString), execAsync, cancellationToken).ConfigureAwait(false);
+              connection.driver = driver;
+            }
+            return;
           }
-          if (isNewServer)
+          catch (MySqlException ex)
           {
-            Driver driver = await Driver.CreateAsync(new MySqlConnectionStringBuilder(server.ConnectionString), execAsync, cancellationToken).ConfigureAwait(false);
-            connection.driver = driver;
+            connection.driver = null;
+            server.IsAvailable = false;
+            MySqlTrace.LogError(ex.Number, ex.ToString());
+            if (ex.Number == 1042)
+            {
+              // retry to open a failed connection and update its status
+              group.HandleFailover(server, ex);
+            }
+            else
+              throw;
           }
-          return;
         }
-        catch (MySqlException ex)
+        finally
         {
-          connection.driver = null;
-          server.IsAvailable = false;
-          MySqlTrace.LogError(ex.Number, ex.ToString());
-          if (ex.Number == 1042)
-          {
-            // retry to open a failed connection and update its status
-            group.HandleFailover(server, ex);
-          }
-          else
-            throw;
+          semaphoreSlim.Release();
         }
-
-        semaphoreSlim.Release();
-
       } while (true);
     }
   }
diff --git a/MySQL.Data/src/X/XDevAPI/Common/BaseStatement.cs b/MySQL.Data/src/X/XDevAPI/Common/BaseStatement.cs
index a335a59fa..8ead4959a 100644
--- a/MySQL.Data/src/X/XDevAPI/Common/BaseStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/Common/BaseStatement.cs
@@ -89,7 +89,7 @@ public async Task<TResult> ExecuteAsync()
       },
         CancellationToken.None,
         TaskCreationOptions.None,
-        Session._scheduler);
+        Session._scheduler).ConfigureAwait(false);
     }
 
     /// <summary>
diff --git a/MySQL.Data/src/common/Ssl.cs b/MySQL.Data/src/common/Ssl.cs
index 7e16343e5..00a782459 100644
--- a/MySQL.Data/src/common/Ssl.cs
+++ b/MySQL.Data/src/common/Ssl.cs
@@ -69,7 +69,7 @@ internal class Ssl
     private static SslProtocols[] tlsProtocols = new SslProtocols[] { SslProtocols.Tls12};
     private static Dictionary<string, SslProtocols> tlsConnectionRef = new Dictionary<string, SslProtocols>();
     private static Dictionary<string, int> tlsRetry = new Dictionary<string, int>();
-    private static Object thisLock = new Object();
+    private static SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1, 1);
 
     #endregion
 
@@ -232,24 +232,39 @@ public async Task<Tuple<MySqlStream, Stream>> StartSSLAsync(Stream baseStream, E
         tlsProtocols = listProtocols.ToArray();
       }
 
-      if (tlsConnectionRef.ContainsKey(connectionId))
-      {
-        tlsProtocol = tlsConnectionRef[connectionId];
-      }
+      if (execAsync)
+        await semaphoreSlim.WaitAsync(cancellationToken).ConfigureAwait(false);
       else
+        semaphoreSlim.Wait(cancellationToken);
+
+
+      try
       {
-        if (!tlsRetry.ContainsKey(connectionId))
+        if (tlsConnectionRef.TryGetValue(connectionId, out var protocol))
         {
-          lock (tlsRetry)
-          {
-            tlsRetry[connectionId] = 0;
-          }
+          tlsProtocol = protocol;
         }
-        for (int i = tlsRetry[connectionId]; i < tlsProtocols.Length; i++)
+        else
         {
-          tlsProtocol |= tlsProtocols[i];
+          if (!tlsRetry.ContainsKey(connectionId))
+          {
+            lock (tlsRetry)
+            {
+              tlsRetry[connectionId] = 0;
+            }
+          }
+          for (int i = tlsRetry[connectionId]; i < tlsProtocols.Length; i++)
+          {
+            tlsProtocol |= tlsProtocols[i];
+          }
         }
       }
+      finally
+      {
+        semaphoreSlim.Release();
+      }
+
+
       try
       {
         tlsProtocol = (tlsProtocol == SslProtocols.None) ? SslProtocols.Tls12 : tlsProtocol;

From 9b59c9ae5579ba825bda3873fa511534d4e46a80 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 15 Sep 2024 15:38:35 -0600
Subject: [PATCH 34/99] Updated CHANGES file with contributors names.

Change-Id: Ie0b8a5e811ba46d90f3e14f900a3eb2e7eaded1e
---
 CHANGES | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index c52e4d610..0368f1289 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,7 +14,7 @@
 - Remove MySqlX.Data.Performance.Console.Tests project (WL16387).
 - Updated third party dependencies (WL16291).
 - Remove .NET 7 and EF Core 7 (WL16386).
-- Fixed bug SQL Keyword "RETURNING" not handled properly when updating data (Oracle Bug #36116171).
+- Fixed bug SQL Keyword "RETURNING" not handled properly when updating data (Oracle Bug #36116171). Thanks to Wang Shiyao for the contribution.
 - Fixed bug IIS Website is crashing after upgrading MySQL.Data package to 8.3.0 (Oracle Bug #36483069).
 - Updated Wix Toolset to 4.0.5 (Oracle Bug #36627858).
 - Fixed bug disabling of mysql_native_password in server causes errors in testsuite (Oracle Bug #36529814).
@@ -32,7 +32,7 @@
 - Fixed bug Minpoolsize different than 0 causes connector to hang after first connection (Oracle Bug #36319784).
 - Fixed bug Tests failing due to removal of 'HAVE_SSL' variable from server (Oracle Bug #36374702).
 - Added support for Vector data type (WL16175).
-- Fixed bug Fix deadlock in mysql poolmanager attempt (Oracle Bug #36380976)
+- Fixed bug Fix deadlock in mysql poolmanager attempt (Oracle Bug #36380976). Thanks to Marek Matys for the contribution.
 - Fixed bug Test failing due to removal of 'default_authentication_plugin' server variable (Oracle Bug #36405198).
 
 

From 90935198e384a3ad9a19e10451e93ecffa4e3552 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 15 Sep 2024 15:54:08 -0600
Subject: [PATCH 35/99] Bug#37032982 [EntityFramework SQL generation of TPT
 pseudo discriminator column incorrect]

Change-Id: Ifbe3a1cd3ff5192741c3d5afe3395a954d85f548
---
 CHANGES                                       |  1 +
 .../src/Statements/SelectStatement.cs         |  2 +-
 .../CodeFirstTests.cs                         | 37 +++++++++++++
 .../Vehicle.cs                                | 52 +++++++++++++++++++
 4 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 0368f1289..63a3e53ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@
 - Fixed Code coverage (WL16309).
 - Added support for OpenID Connect client authentication (WL16491).
 - Fixed bug 8.0.33 Removes Important Locks (MySQL Bug #111759, Oracle Bug #35937318). Thanks to Stuart Lang for the contribution.
+- Fixed bug EntityFramework SQL generation of TPT pseudo discriminator column incorrect (MySQL Bug #116028, Oracle Bug #37032982). Thanks to Kristoffer Sjöberg for the contribution.
 
 
 9.0.0
diff --git a/EntityFramework/src/Statements/SelectStatement.cs b/EntityFramework/src/Statements/SelectStatement.cs
index 96d8ab4ea..74e7b2fef 100644
--- a/EntityFramework/src/Statements/SelectStatement.cs
+++ b/EntityFramework/src/Statements/SelectStatement.cs
@@ -232,7 +232,7 @@ List<ColumnFragment> GetDefaultColumnsForFragment(InputFragment input)
           if (generator.GetTopOp() == OpType.Join)
           {
             newColumn.ColumnAlias = cf.ColumnAlias;
-            newColumn.PushInput(cf.ColumnName);
+            newColumn.PushInput(cf.ActualColumnName);
             if (cf.TableName != null)
               newColumn.PushInput(cf.TableName);
           }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
index 1b247cd6c..a393ea79d 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
@@ -191,6 +191,43 @@ public void CallStoredProcedure()
       }
     }
 
+    /// <summary>
+    /// Tests for fix of http://bugs.mysql.com/bug.php?id=116028
+    /// Incorrect discriminator generated column values when it's used code-first, inheritance and in a join statement
+    /// </summary>
+    [Test]
+    public void Bug116028_Test1()
+    {
+      List<Vehicle4> vehicles;
+      using (VehicleDbContext4 context = new VehicleDbContext4())
+      {
+        context.Database.Delete();
+        context.Database.Initialize(true);
+        var manuf = context.Manufacturers.Add(new Manufacturer4 { Name = "ACME" });
+        context.Vehicles.Add(new Car4 { Id = 1, Name = "Mustang", Year = 2012, CarProperty = "Car", Manufacturer = manuf });
+        context.Vehicles.Add(new Bike4 { Id = 101, Name = "Mountain", Year = 2011, BikeProperty = "Bike", Manufacturer = manuf });
+        context.SaveChanges();
+
+        vehicles = context.Manufacturers.SelectMany(v => v.Vehicles).ToList();
+
+        int records = -1;
+        using (MySqlConnection conn = new MySqlConnection(context.Database.Connection.ConnectionString))
+        {
+          conn.Open();
+          MySqlCommand cmd = new MySqlCommand("SELECT COUNT(*) FROM Vehicles", conn);
+          records = Convert.ToInt32(cmd.ExecuteScalar());
+        }
+
+        Assert.That(records, Is.EqualTo(context.Vehicles.Count()));
+      }
+      using (VehicleDbContext4 context = new VehicleDbContext4())
+      {
+        var vehiclesfromdb = context.Manufacturers.SelectMany(v => v.Vehicles).ToList();
+        Assert.That(vehiclesfromdb.OfType<Car4>().Single().CarProperty, Is.EqualTo(vehicles.OfType<Car4>().Single().CarProperty));
+        Assert.That(vehiclesfromdb.OfType<Bike4>().Single().BikeProperty, Is.EqualTo(vehicles.OfType<Bike4>().Single().BikeProperty));
+      }
+    }
+
     /// <summary>
     /// Tests for fix of http://bugs.mysql.com/bug.php?id=63920
     /// Maxlength error when it's used code-first and inheritance (discriminator generated column)
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Vehicle.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Vehicle.cs
index a5b8989cb..4dd1630e7 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Vehicle.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Vehicle.cs
@@ -118,6 +118,58 @@ public VehicleDbContext3() : base(CodeFirstFixture.GetEFConnectionString<Vehicle
   }
   }
 
+  public class Car4 : Vehicle4
+  {
+    public string CarProperty { get; set; }
+  }
+
+  public class Bike4 : Vehicle4
+  {
+    public string BikeProperty { get; set; }
+  }
+  public class Manufacturer4
+  {
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public Guid ManufacturerId { get; set; }
+    public string Name { get; set; }
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public Guid GroupIdentifier { get; set; }
+    public virtual ICollection<Vehicle4> Vehicles { get; set; }
+  }
+  public class Vehicle4
+  {
+    public int Id { get; set; }
+    public int Year { get; set; }
+
+    [MaxLength(1024)]
+    public string Name { get; set; }
+    public Guid ManufacturerId { get; set; }
+    [ForeignKey(nameof(ManufacturerId))]
+    public virtual Manufacturer4 Manufacturer { get; set; }
+  }
+  [DbConfigurationType(typeof(MySqlEFConfiguration))]
+  public class VehicleDbContext4 : DbContext
+  {
+    public DbSet<Vehicle4> Vehicles { get; set; }
+    public DbSet<Manufacturer4> Manufacturers { get; set; }
+
+    public VehicleDbContext4() : base(CodeFirstFixture.GetEFConnectionString<VehicleDbContext4>())
+    {
+      Database.SetInitializer<VehicleDbContext4>(new VehicleDBInitializer4());
+
+    }
+    protected override void OnModelCreating(DbModelBuilder modelBuilder)
+    {
+      modelBuilder.Entity<Vehicle4>().ToTable("Vehicles");
+      modelBuilder.Entity<Car4>().ToTable("Cars");
+      modelBuilder.Entity<Bike4>().ToTable("Bikes");
+    }
+  }
+  public class VehicleDBInitializer4 : DropCreateDatabaseReallyAlways<VehicleDbContext4>
+  {
+  }
+
   public class Accessory
   {
     [Key]

From 5baf667e7b81943884d483cd1e892c78adc778ab Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 15 Sep 2024 12:45:13 -0600
Subject: [PATCH 36/99] Bug#35937293 [Connector does crashes when retrieving
 data from the database]

Change-Id: I6eef797885460b48b0ded464809863e3e3dff35a
---
 CHANGES                                       |   1 +
 .../src/Authentication/MySqlPemReader.cs      |   2 +-
 MySQL.Data/src/MySqlPacket.cs                 |  12 +-
 MySQL.Data/src/PacketBitConverter.cs          | 115 ++++++++++++++++++
 MySQL.Data/src/Types/MySqlDouble.cs           |   4 +-
 MySQL.Data/src/Types/MySqlGeometry.cs         |   8 +-
 MySQL.Data/src/Types/MySqlSingle.cs           |   4 +-
 7 files changed, 131 insertions(+), 15 deletions(-)
 create mode 100644 MySQL.Data/src/PacketBitConverter.cs

diff --git a/CHANGES b/CHANGES
index 63a3e53ac..04486f4ca 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@
 - Added support for OpenID Connect client authentication (WL16491).
 - Fixed bug 8.0.33 Removes Important Locks (MySQL Bug #111759, Oracle Bug #35937318). Thanks to Stuart Lang for the contribution.
 - Fixed bug EntityFramework SQL generation of TPT pseudo discriminator column incorrect (MySQL Bug #116028, Oracle Bug #37032982). Thanks to Kristoffer Sjöberg for the contribution.
+- Fixed bug Connector does crashes when retrieving data from the database (MySQL Bug #111630, Oracle Bug #35937293). Thanks to Sidraya Jayagond for the contribution.
 
 
 9.0.0
diff --git a/MySQL.Data/src/Authentication/MySqlPemReader.cs b/MySQL.Data/src/Authentication/MySqlPemReader.cs
index 95a0bc7a4..22a09ff68 100644
--- a/MySQL.Data/src/Authentication/MySqlPemReader.cs
+++ b/MySQL.Data/src/Authentication/MySqlPemReader.cs
@@ -113,7 +113,7 @@ static RSACryptoServiceProvider DecodeX509Key(byte[] key)
             }
             else return null;
 
-            int modulusSize = BitConverter.ToInt32(new byte[] { lowByte, highByte, 0x00, 0x00 }, 0);
+            int modulusSize = highByte << 8 | lowByte;
             byte firstByte = reader.ReadByte();
             reader.BaseStream.Seek(-1, SeekOrigin.Current);
 
diff --git a/MySQL.Data/src/MySqlPacket.cs b/MySQL.Data/src/MySqlPacket.cs
index 70d4f7c45..513a04be7 100644
--- a/MySQL.Data/src/MySqlPacket.cs
+++ b/MySQL.Data/src/MySqlPacket.cs
@@ -222,9 +222,9 @@ public long ReadLong(int numbytes)
 
       switch (numbytes)
       {
-        case 2: return BitConverter.ToUInt16(bits, pos);
-        case 4: return BitConverter.ToUInt32(bits, pos);
-        case 8: return BitConverter.ToInt64(bits, pos);
+        case 2: return PacketBitConverter.ToUInt16(bits, pos);
+        case 4: return PacketBitConverter.ToUInt32(bits, pos);
+        case 8: return PacketBitConverter.ToInt64(bits, pos);
       }
       throw new NotSupportedException("Only byte lengths of 2, 4, or 8 are supported");
     }
@@ -240,9 +240,9 @@ public ulong ReadULong(int numbytes)
 
       switch (numbytes)
       {
-        case 2: return BitConverter.ToUInt16(bits, pos);
-        case 4: return BitConverter.ToUInt32(bits, pos);
-        case 8: return BitConverter.ToUInt64(bits, pos);
+        case 2: return PacketBitConverter.ToUInt16(bits, pos);
+        case 4: return PacketBitConverter.ToUInt32(bits, pos);
+        case 8: return PacketBitConverter.ToUInt64(bits, pos);
       }
       throw new NotSupportedException("Only byte lengths of 2, 4, or 8 are supported");
     }
diff --git a/MySQL.Data/src/PacketBitConverter.cs b/MySQL.Data/src/PacketBitConverter.cs
new file mode 100644
index 000000000..dc185ba94
--- /dev/null
+++ b/MySQL.Data/src/PacketBitConverter.cs
@@ -0,0 +1,115 @@
+// Copyright © 2004, 2024, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+namespace MySql.Data
+{
+  public static class PacketBitConverter
+  {
+    // Due to the lack of support of the C# BinaryPrimitives class
+    // on net452 and net48 this class is necessary for back compatibility.
+    // All instances of PacketBitConverter can be replaced with corresponding
+    // BinaryPrimitives methods for future versions.
+
+    // The server sends MySql Packets in LittleEndian encoding
+    // The methods provided by the BitConverter class check for the
+    // endian-ness of the client system and do conversions accordingly
+    // which lead to incorrect conversions on BigEndian systems
+
+    // Following function are analogues with BinaryPrimitives.Write*LittleEndian
+    public static byte[] GetBytes(int value)
+    {
+      return new byte[] {
+                (byte)value, (byte)(value >> 8), (byte)(value >> 16), (byte)(value >> 24)
+            };
+    }
+
+    public static byte[] GetBytes(long value)
+    {
+      return new byte[] {
+                (byte)value, (byte)(value >> 8), (byte)(value >> 16), (byte)(value >> 24),
+                (byte)(value >> 32), (byte)(value >> 40), (byte)(value >> 48), (byte)(value >> 56)
+            };
+    }
+
+    unsafe public static byte[] GetBytes(float value)
+    {
+      int val = *(int*)&value;
+      return GetBytes(val);
+    }
+
+    unsafe public static byte[] GetBytes(double value)
+    {
+      long val = *(long*)&value;
+      return GetBytes(val);
+    }
+
+    // Following functions are analogous to BinaryPrimitives.Read*LittleEndian
+    unsafe public static float ToSingle(byte[] byteArray, int startIndex)
+    {
+      int val = ToInt32(byteArray, startIndex);
+      return *(float*)&val;
+    }
+
+    unsafe public static double ToDouble(byte[] byteArray, int startIndex)
+    {
+      long val = ToInt64(byteArray, startIndex);
+      return *(double*)&val;
+    }
+
+    public static ushort ToUInt16(byte[] byteArray, int startIndex)
+    {
+      return (ushort)(byteArray[startIndex++] | byteArray[startIndex] << 8);
+    }
+
+    public static uint ToUInt32(byte[] byteArray, int startIndex)
+    {
+      return (uint)(byteArray[startIndex++] | byteArray[startIndex++] << 8
+            | byteArray[startIndex++] << 16 | byteArray[startIndex] << 24);
+    }
+
+    public static ulong ToUInt64(byte[] byteArray, int startIndex)
+    {
+      return (ulong)ToUInt32(byteArray, startIndex) + ((ulong)ToUInt32(byteArray, startIndex + 4) << 32);
+    }
+
+    public static short ToInt16(byte[] byteArray, int startIndex)
+    {
+      return (short)ToUInt16(byteArray, startIndex);
+    }
+
+    public static int ToInt32(byte[] byteArray, int startIndex)
+    {
+      return (int)ToUInt32(byteArray, startIndex);
+    }
+
+    public static long ToInt64(byte[] byteArray, int startIndex)
+    {
+      return (long)ToUInt64(byteArray, startIndex);
+    }
+  }
+}
diff --git a/MySQL.Data/src/Types/MySqlDouble.cs b/MySQL.Data/src/Types/MySqlDouble.cs
index 150dda727..9b342b6ba 100644
--- a/MySQL.Data/src/Types/MySqlDouble.cs
+++ b/MySQL.Data/src/Types/MySqlDouble.cs
@@ -66,7 +66,7 @@ async Task IMySqlValue.WriteValueAsync(MySqlPacket packet, bool binary, object v
     {
       double v = val as double? ?? Convert.ToDouble(val);
       if (binary)
-        await packet.WriteAsync(BitConverter.GetBytes(v), execAsync).ConfigureAwait(false);
+        await packet.WriteAsync(PacketBitConverter.GetBytes(v), execAsync).ConfigureAwait(false);
       else
         await packet.WriteStringNoNullAsync(v.ToString("R", CultureInfo.InvariantCulture), execAsync).ConfigureAwait(false);
     }
@@ -80,7 +80,7 @@ async Task<IMySqlValue> IMySqlValue.ReadValueAsync(MySqlPacket packet, long leng
       {
         byte[] b = new byte[8];
         await packet.ReadAsync(b, 0, 8, execAsync).ConfigureAwait(false);
-        return new MySqlDouble(BitConverter.ToDouble(b, 0));
+        return new MySqlDouble(PacketBitConverter.ToDouble(b, 0));
       }
 
       string s = await packet.ReadStringAsync(length, execAsync).ConfigureAwait(false);
diff --git a/MySQL.Data/src/Types/MySqlGeometry.cs b/MySQL.Data/src/Types/MySqlGeometry.cs
index 9b71626d9..963ee3837 100644
--- a/MySQL.Data/src/Types/MySqlGeometry.cs
+++ b/MySQL.Data/src/Types/MySqlGeometry.cs
@@ -109,7 +109,7 @@ internal MySqlGeometry(MySqlDbType type, Double xValue, Double yValue, int srid)
       this._srid = srid;
       this.Value = new byte[GEOMETRY_LENGTH];
 
-      byte[] sridBinary = BitConverter.GetBytes(srid);
+      byte[] sridBinary = PacketBitConverter.GetBytes(srid);
 
       for (int i = 0; i < sridBinary.Length; i++)
         Value[i] = sridBinary[i];
@@ -148,9 +148,9 @@ public MySqlGeometry(MySqlDbType type, byte[] val)
       var yIndex = val.Length == GEOMETRY_LENGTH ? 17 : 13;
 
       Value = buffValue;
-      _xValue = val.Length >= xIndex + 8 ? BitConverter.ToDouble(val, xIndex) : 0;
-      _yValue = val.Length >= yIndex + 8 ? BitConverter.ToDouble(val, yIndex) : 0;
-      this._srid = val.Length == GEOMETRY_LENGTH ? BitConverter.ToInt32(val, 0) : 0;
+      _xValue = val.Length >= xIndex + 8 ? PacketBitConverter.ToDouble(val, xIndex) : 0;
+      _yValue = val.Length >= yIndex + 8 ? PacketBitConverter.ToDouble(val, yIndex) : 0;
+      this._srid = val.Length == GEOMETRY_LENGTH ? PacketBitConverter.ToInt32(val, 0) : 0;
       this.IsNull = false;
       this._type = type;
     }
diff --git a/MySQL.Data/src/Types/MySqlSingle.cs b/MySQL.Data/src/Types/MySqlSingle.cs
index ff04eedee..9dc777912 100644
--- a/MySQL.Data/src/Types/MySqlSingle.cs
+++ b/MySQL.Data/src/Types/MySqlSingle.cs
@@ -68,7 +68,7 @@ async Task IMySqlValue.WriteValueAsync(MySqlPacket packet, bool binary, object v
     {
       Single v = val as Single? ?? Convert.ToSingle(val);
       if (binary)
-        await packet.WriteAsync(BitConverter.GetBytes(v), execAsync).ConfigureAwait(false);
+        await packet.WriteAsync(PacketBitConverter.GetBytes(v), execAsync).ConfigureAwait(false);
       else
         await packet.WriteStringNoNullAsync(v.ToString("R", CultureInfo.InvariantCulture), execAsync).ConfigureAwait(false);
     }
@@ -82,7 +82,7 @@ async Task<IMySqlValue> IMySqlValue.ReadValueAsync(MySqlPacket packet, long leng
       {
         byte[] b = new byte[4];
         await packet.ReadAsync(b, 0, 4, execAsync).ConfigureAwait(false);
-        return new MySqlSingle(BitConverter.ToSingle(b, 0));
+        return new MySqlSingle(PacketBitConverter.ToSingle(b, 0));
       }
 
       return new MySqlSingle(Single.Parse(await packet.ReadStringAsync(length, execAsync).ConfigureAwait(false),

From e13fbe0580adba77a408f1f38ef68c68d1eadbfa Mon Sep 17 00:00:00 2001
From: Manohar Prajapati <manohar.prajapati@oracle.com>
Date: Wed, 18 Sep 2024 08:50:47 +0200
Subject: [PATCH 37/99] Updated the LICENSE files

---
 LICENSE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index f0067f828..27bc95437 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@ Introduction
    third-party software which may be included in this distribution of
    MySQL Connector/NET 9.1.0 Community.
 
-   Last updated: August 2024
+   Last updated: September 2024
 
 Licensing Information
 
@@ -1017,4 +1017,4 @@ Written Offer for Source Code
        that included the binary that is the subject of your request, or
 
     b. in the case of code licensed under the GPL v3 for as long as Oracle
-       offers spare parts or customer support for that product model.
\ No newline at end of file
+       offers spare parts or customer support for that product model.

From 504668ee77fd43956aa1993e634ba70529d89f4f Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 18 Sep 2024 09:25:21 -0600
Subject: [PATCH 38/99] Bug#37032982 [EntityFramework SQL generation of TPT
 pseudo discriminator column incorrect] - Complement

Change-Id: I07c704270fee44001d3748ecbf8f58f414c6c743
---
 .../MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs
index 49ea6b4e8..e5af704a4 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs
@@ -126,6 +126,7 @@ public CodeFirstFixture()
       DeleteContext<VehicleDbContext>();
       DeleteContext<VehicleDbContext2>();
       DeleteContext<VehicleDbContext3>();
+      DeleteContext<VehicleDbContext4>();
       DeleteContext<ProductsDbContext>();
       DeleteContext<ShortDbContext>();
       DeleteContext<UsingUnionContext>();

From 67e39c50ad8fa3bff218b322caf994a86e791791 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipe.silva@oracle.com>
Date: Fri, 20 Sep 2024 16:37:34 +0100
Subject: [PATCH 39/99] Updated CONTRIBUTING and README files, and added
 SECURITY file.

Change-Id: Id913dd7371638f18d599305c5eb2ec8e5ef70cb8
---
 CONTRIBUTING.md | 69 ++++++++++++++++++++++++++++++-------------------
 README          | 16 ++++++------
 README.md       | 41 +++++++++++++++++------------
 SECURITY.md     | 29 +++++++++++++++++++++
 4 files changed, 105 insertions(+), 50 deletions(-)
 create mode 100644 SECURITY.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 280a049de..e5612e3bd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,48 +1,65 @@
 # Contributing Guidelines
 
-We love getting feedback from our users. Bugs and code contributions are great forms of feedback and we thank you for any bugs you report or code you contribute.
+We greatly appreciate feedback from our users, including bug reports and code contributions. Your input helps us improve, and we thank you for any issues you report or code you contribute.
 
 ## Reporting Issues
 
-Before reporting a new bug, please [check first](https://bugs.mysql.com/search.php) to see if a similar bug exists.
+Before submitting a new bug report, please [check here](https://bugs.mysql.com/search.php) to see if the issue has already been reported.
 
-Bug reports should be as complete as possible. Please try and include the following:
-* Complete steps to reproduce the issue.
-* Any information about platform and environment that could be specific to the bug.
-* Specific version of the product you are using.
-* Specific version of the server being used.
-* Sample code to help reproduce the issue if possible.
+When reporting a bug, ensure your report is as detailed as possible. Please include the following:
+
+* Clear, reproducible steps to demonstrate the issue.
+* Relevant platform and environment information.
+* The specific version of the product in use.
+* The version of the MySQL Server in use.
+* Sample code that can help reproduce the issue, if applicable.
 
 ## Contributing Code
 
-Contributing to this project is easy. You just need to follow these steps:
+We welcome your code contributions. Before submitting code via a GitHub pull request or by filing a bug on [bugs.mysql.com](https://bugs.mysql.com), you will need to sign the Oracle Contributor Agreement (OCA). Instructions for signing the OCA are available on the [OCA Page](https://oca.opensource.oracle.com).
+
+**Only pull requests from contributors who have signed the OCA can be accepted.**
+
+### Submitting a Contribution
 
-* Make sure you have a user account at [bugs.mysql.com](bugs.mysql.com). You'll need to reference this user account when you submit your OCA (Oracle Contributor Agreement).
-* Sign the Oracle OCA. You can find instructions for doing that at the [OCA Page](https://oca.opensource.oracle.com/).
-* Develop your pull request.
-  * Make sure you are aware of the requirements for the project (e.g. don't require .NET Core 3.0 if we are curently supporting .NET Core 2.2 and lower).
-* Validate your pull request by including tests that sufficiently cover the functionality.
-* Verify that the entire test suite passes with your code applied.
-* Submit your pull request. While you can submit the pull request with [Github](https://github.com/mysql/mysql-connector-net/pulls), you can also submit it directly with [bugs.mysql.com](https://bugs.mysql.com).
+1. Ensure you have a user account at [bugs.mysql.com](https://bugs.mysql.com). You'll need to reference this account when submitting your OCA.
+2. Sign the Oracle Contributor Agreement. Instructions are provided on the [OCA Page](https://oca.opensource.oracle.com).
+3. Validate your contribution by including tests that adequately cover the functionality you're adding.
+4. Ensure the entire test suite passes with your changes applied.
+5. Submit your pull request through [GitHub](https://github.com/mysql/mysql-connector-net/pulls/) or upload it to a bug record on [bugs.mysql.com](https://bugs.mysql.com) using the _Contributions_ tab.
 
-Thanks again for being willing to contribute to MySQL. We truly believe in the principles of open source and appreciate any and all contributions to our projects.
+### Developing Your Pull Request
+
+1. Create your pull request, following the [project's requirements](https://dev.mysql.com/doc/connector-net/en/connector-net-installation.html).
+2. Include sufficient tests to validate the new functionality.
+3. Confirm that the entire test suite passes with your changes applied.
+4. Submit the pull request via [GitHub](https://github.com/mysql/mysql-connector-net/pulls/) or directly via [bugs.mysql.com](https://bugs.mysql.com).
+
+We deeply value contributions to MySQL and thank you for supporting open-source development.
 
 ## Setting Up a Development Environment
 
-You can use your preferred .NET IDE to view, edit, and compile the MySQL Connector/NET source code. The configuration setup can be adapted from [Installing from Source](https://dev.mysql.com/doc/connector-net/en/connector-net-installation-source.html).
+You can use your preferred .NET IDE to view, edit, and compile the MySQL Connector/NET source code. For project configuration, please refer to the instructions in [Installing from Source](https://dev.mysql.com/doc/connector-net/en/connector-net-installation-source.html).
 
 ## Running Tests
 
-Any code you contribute needs to pass our test suite, each of our projects have his own (e.g. MySql.Data.Tests). You must run the entire suite just to make sure that no other functionality have been affected by the change. You can run the test suite by using the IDE of your preference or by CLI with the help of the "dotnet" tool.
- 
+Any code you contribute must pass our test suite. Each project has its own suite (e.g., *MySql.Data.Tests*). Be sure to run the entire test suite to ensure that no other functionality is affected by your changes. You can run the tests using your preferred IDE or via the CLI with the "dotnet" tool.
+
 ## Getting Help
 
-If you need help or just want to get in touch with us, please use the following resources:
+If you need assistance or would like to reach out to the community, please use the following resources:
 
-* [MySQL Connector/NET and C# forum](https://forums.mysql.com/list.php?38)
-* [MySQL NuGet](https://www.nuget.org/profiles/MySQL)
-* [MySQL Bugs database](https://bugs.mysql.com/)
+* [MySQL Connector/NET Developer Guide](https://dev.mysql.com/doc/connector-net/en/)
+* [MySQL Connector/NET API](https://dev.mysql.com/doc/dev/connector-net/latest/)
+* [MySQL NuGet](https://www.nuget.org/profiles/MySQL/)
+* [MySQL Connector/NET and C#, Mono, .Net Forum](https://forums.mysql.com/list.php?38)
+* [`#connectors` channel on MySQL Community Slack](https://mysqlcommunity.slack.com/messages/connectors/)  ([Sign-up](https://lefred.be/mysql-community-on-slack/) required if you do not have an Oracle account.)
+* [@MySQL on X](https://x.com/MySQL/).
+* [MySQL Blog](https://blogs.oracle.com/mysql/).
+* [MySQL Connectors Blog archive](https://dev.mysql.com/blog-archive/?cat=Connectors%20%2F%20Languages).
+* [MySQL Newsletter](https://www.mysql.com/news-and-events/newsletter/).
+* [MySQL Bugs Tracking System](https://bugs.mysql.com).
 
-We hope to hear from you soon. Enjoy your coding!
+We look forward to hearing from you and encourage you to get involved. Happy coding!
 
-[![Twitter Follow](https://img.shields.io/twitter/follow/MySQL.svg?label=Follow%20%40MySQL&style=social)](https://twitter.com/intent/follow?screen_name=MySQL)
\ No newline at end of file
+[![X (formerly Twitter) Follow](https://img.shields.io/twitter/follow/MySQL?style=social)](https://x.com/intent/follow?screen_name=MySQL)
diff --git a/README b/README
index 6e6fc8689..7fa428330 100644
--- a/README
+++ b/README
@@ -1,16 +1,16 @@
 Copyright © 2004, 2024, Oracle and/or its affiliates.
 
-This is a release of MySQL Connector/NET, Oracle's fully managed ADO .NET Driver for MySQL.
+This is a release of MySQL Connector/NET, Oracle's fully managed ADO .NET Driver
+for MySQL.
 
-License information can be found in the LICENSE file.
-
-This distribution may include materials developed by third parties.
-For license and attribution notices for these materials, please refer to the LICENSE file.
+License information can be found in the LICENSE file. This distribution may
+include materials developed by third parties. For license and attribution
+notices for these materials, please refer to the LICENSE file.
 
 For more information on MySQL Connector/NET, visit
-  http://dev.mysql.com/doc/connector-net/en/
+http://dev.mysql.com/doc/connector-net/en/.
 
-For additional downloads and the source of MySQL Connector/NET, visit
-  http://dev.mysql.com/downloads
+For additional downloads and the source of MySQL Connector/NET, visit 
+http://dev.mysql.com/downloads/.
 
 MySQL Connector/NET is brought to you by the MySQL team at Oracle.
diff --git a/README.md b/README.md
index f2eab22b9..ff4709d51 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # MySQL Connector/NET
 
-[![Languages](https://img.shields.io/github/languages/top/mysql/mysql-connector-net)](https://github.com/mysql/mysql-connector-net) [![License: GNU General Public License (GPLv2)](https://img.shields.io/badge/license-GPLv2_with_FOSS_exception-c30014.svg?style=flat)](LICENSE) [![NuGet](https://img.shields.io/nuget/v/MySql.Data)](https://www.nuget.org/profiles/MySQL)
+[![GitHub top language](https://img.shields.io/github/languages/top/mysql/mysql-connector-net)](https://github.com/mysql/mysql-connector-net) [![License: GPLv2 with FOSS exception](https://img.shields.io/badge/license-GPLv2_with_FOSS_exception-c30014)](LICENSE) [![NuGet Version](https://img.shields.io/nuget/v/MySQL.Data)](https://www.nuget.org/profiles/MySQL/)
 
 MySQL provides connectivity for client applications developed in .NET compatible programming languages with Connector/NET.
 
@@ -8,30 +8,34 @@ MySQL Connector/NET is a library compatible with .NET Framework and .NET Core, f
 
 From MySQL Connector/NET 8.0, the driver also contains an implementation of [MySQL X DevAPI](https://dev.mysql.com/doc/x-devapi-userguide/en/), an Application Programming Interface for working with [MySQL as a Document Store](https://dev.mysql.com/doc/refman/8.0/en/document-store.html) through CRUD-based, NoSQL operations.
 
-From MySQL Connector/NET 8.1, the driver contains an implementation of [OpenTelemetry](https://dev.mysql.com/doc/connector-net/en/connector-net-programming-telemetry.html) which requires the use of the [MySql.Data.OpenTelemetry](https://www.nuget.org/profiles/MySQL/) Nuget package to enable the generation of telemetry data.
+From MySQL Connector/NET 8.1, the driver contains an implementation of [OpenTelemetry](https://dev.mysql.com/doc/connector-net/en/connector-net-programming-telemetry.html) which requires the use of the [MySql.Data.OpenTelemetry](https://www.nuget.org/packages/MySql.Data.OpenTelemetry/) Nuget package to enable the generation of telemetry data.
 
-From MySQL Connector/NET 8.2, the driver adds support for [WebAuthn authentication](https://dev.mysql.com/doc/dev/connector-net/latest/api/data_api/MySql.Data.MySqlClient.WebAuthnActionCallback.html), the driver also adds support for [.NET 8](https://learn.microsoft.com/en-us/dotnet/core/whats-new/dotnet-8).
+From MySQL Connector/NET 8.2, the driver adds support for [WebAuthn authentication](https://dev.mysql.com/doc/dev/connector-net/latest/api/data_api/MySql.Data.MySqlClient.WebAuthnActionCallback.html), the driver also adds support for [.NET 8](https://learn.microsoft.com/en-us/dotnet/core/whats-new/dotnet-8/).
 
-From MySQL Connector/NET 8.3, the driver also adds support for [.NET 8](https://learn.microsoft.com/en-us/dotnet/core/whats-new/dotnet-8) and [EFCore 8](https://learn.microsoft.com/en-us/ef/core/what-is-new/ef-core-8.0/whatsnew) GA versions.
+From MySQL Connector/NET 8.3, the driver also adds support for [.NET 8](https://learn.microsoft.com/en-us/dotnet/core/whats-new/dotnet-8/) and [EFCore 8](https://learn.microsoft.com/en-us/ef/core/what-is-new/ef-core-8.0/whatsnew/) GA versions.
 
 From MySQL Connector/NET 8.4, the driver adds support for TLS1.3 and removes support for FIDO authentication plugin.
 
 From MySQL Connector/NET 9.0, the driver removes support for .NET 7 and EF Core 7.
 
-From MySQL Connector/NET 9.1, the driver adds support for .NET 9 and EF Core 9 preview versions.
+From MySQL Connector/NET 9.1, the driver adds support for [.NET 9](https://learn.microsoft.com/en-us/dotnet/core/whats-new/dotnet-9/overview/) and [EF Core 9](https://learn.microsoft.com/en-us/ef/core/what-is-new/ef-core-9.0/whatsnew/) preview versions.
 
-For detailed information please visit the official [MySQL Connector/NET documentation.](https://dev.mysql.com/doc/connector-net/en/)
+For detailed information please visit the official [MySQL Connector/NET documentation](https://dev.mysql.com/doc/connector-net/en/).
 
 ## Licensing
 
 Please refer to files [README](README) and [LICENSE](LICENSE), available in this repository, and [Legal Notices in documentation](https://dev.mysql.com/doc/connector-net/en/preface.html) for further details.
 
+## Security
+
+Oracle values the independent security research community and believes that responsible disclosure of security vulnerabilities helps us ensure the security and privacy of all our users. Please refer to the [security guidelines](SECURITY.md) document for additional information.
+
 ## Download & Install
 
 MySQL Connector/NET can be installed from precompiled libraries by using MySQL installer or download the libraries itself, both can be found at [Connector/NET download page](https://dev.mysql.com/downloads/connector/net/). Also, you can get the latest stable release from the [official Nuget.org feed](https://www.nuget.org/profiles/MySQL).
 
 * By using MySQL Installer, you just need to follow the wizard in order to obtain the precompiled library and then add it to your project.
-* If you decided to download the precompiled libraries, decompress the folder and then add the library needed to your project as reference.
+* If you decided to download the precompiled libraries, decompress the folder and then add the library needed to your project as a reference.
 * If you go for NuGet, you could use the NuGet Package Manager inside Visual Studio or use the NuGet Command Line Interface (CLI).
 
 ### Building from sources
@@ -44,16 +48,21 @@ This repository contains the MySQL Connector/NET source code as per latest relea
 
 ## Contributing
 
-There are a few ways to contribute to the Connector/NET code. Please refer to the [contributing guidelines](CONTRIBUTING.md) for additional information.
+We greatly appreciate feedback from our users, including bug reports and code contributions. Your input helps us improve, and we thank you for any issues you report or code you contribute. Please refer to the [contributing guidelines](CONTRIBUTING.md) document for additional information.
 
 ### Additional Resources
 
-* [MySQL](http://www.mysql.com/)
 * [MySQL Connector/NET Developer Guide](https://dev.mysql.com/doc/connector-net/en/)
-* [MySQL Connector/NET API](https://dev.mysql.com/doc/dev/connector-net/8.0/)
-* [MySQL Connector/NET Discussion Forum](https://forums.mysql.com/list.php?38)
-* [MySQL Public Bug Tracker](https://bugs.mysql.com)
-* [`#connectors` channel in MySQL Community Slack](https://mysqlcommunity.slack.com/messages/connectors) ([Sign-up](https://lefred.be/mysql-community-on-slack/) required when not using an Oracle account)
-* For more information about this and other MySQL products, please visit [MySQL Contact & Questions](http://www.mysql.com/about/contact/).
-
-[![Twitter Follow](https://img.shields.io/twitter/follow/MySQL.svg?label=Follow%20%40MySQL&style=social)](https://twitter.com/intent/follow?screen_name=MySQL)
\ No newline at end of file
+* [MySQL Connector/NET API](https://dev.mysql.com/doc/dev/connector-net/latest/)
+* [MySQL NuGet](https://www.nuget.org/profiles/MySQL/)
+* [MySQL Connector/NET and C#, Mono, .Net Forum](https://forums.mysql.com/list.php?38)
+* [`#connectors` channel on MySQL Community Slack](https://mysqlcommunity.slack.com/messages/connectors/)  ([Sign-up](https://lefred.be/mysql-community-on-slack/) required if you do not have an Oracle account.)
+* [@MySQL on X](https://x.com/MySQL/).
+* [MySQL Blog](https://blogs.oracle.com/mysql/).
+* [MySQL Connectors Blog archive](https://dev.mysql.com/blog-archive/?cat=Connectors%20%2F%20Languages).
+* [MySQL Newsletter](https://www.mysql.com/news-and-events/newsletter/).
+* [MySQL Bugs Tracking System](https://bugs.mysql.com).
+
+For more information about this and other MySQL products, please visit [MySQL Contact & Questions](https://www.mysql.com/about/contact/).
+
+[![X (formerly Twitter) Follow](https://img.shields.io/twitter/follow/MySQL.svg?label=Follow%20%40MySQL&style=social)](https://x.com/intent/follow?screen_name=MySQL)
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..d25bea8e0
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,29 @@
+# Reporting security vulnerabilities
+
+Oracle values the independent security research community and believes that
+responsible disclosure of security vulnerabilities helps us ensure the security
+and privacy of all our users.
+
+Please do NOT raise a GitHub Issue to report a security vulnerability. If you
+believe you have found a security vulnerability, please submit a report to
+secalert_us@oracle.com preferably with a proof of concept. Please review some
+additional information [on how to report security vulnerabilities to Oracle](https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html).
+We encourage people who contact Oracle Security to use email encryption using
+our [encryption key](https://www.oracle.com/security-alerts/encryptionkey.html).
+
+We ask that you do not use other channels or contact the project maintainers
+directly.
+
+# Security updates, alerts and bulletins
+
+Security updates will be released on a regular cadence. Many of our projects
+will typically release security fixes in conjunction with the Oracle Critical
+Patch Update program. Additional information, including past advisories, is
+available on our [security alerts page](https://www.oracle.com/security-alerts/).
+
+# Security-related information
+
+We will provide security related information such as a threat model,
+considerations for secure use, or any known security issues in our
+documentation. Please note that labs and sample code are intended to demonstrate
+a concept and may not be sufficiently hardened for production use.

From ac184e8a3626790551d381732b08680922882dd9 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Fri, 20 Sep 2024 11:08:10 -0600
Subject: [PATCH 40/99] Added SECURITY, CONTRIBUTING and README files to
 packages.

Change-Id: Id02a5d2a77e32782fe23c14966d72edcf78f8dc1
---
 EFCore/src/MySql.EntityFrameworkCore.csproj      |  4 ++--
 .../src/MySql.Data.EntityFramework.csproj        |  7 ++++++-
 .../MySql.EntityFramework.Basic.Tests.csproj     |  2 +-
 .../MySql.EntityFramework.CodeFirst.Tests.csproj |  2 +-
 ...MySql.EntityFramework.Migrations.Tests.csproj |  2 +-
 .../src/MySQL.Data.OpenTelemetry.csproj          |  7 ++++++-
 MySQL.Data/src/MySql.Data.csproj                 | 16 ++++++----------
 .../MySql.Data.Tests/MySql.Data.Tests.csproj     |  2 +-
 .../MySqlX.Data.Tests/MySqlX.Data.Tests.csproj   |  2 +-
 MySql.Web/src/MySql.Web.csproj                   |  7 ++++++-
 MySql.Web/tests/MySql.Web.Tests.csproj           |  2 +-
 11 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
index 40ea8927b..f4c824aa4 100644
--- a/EFCore/src/MySql.EntityFrameworkCore.csproj
+++ b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -7,7 +7,7 @@
     <PackageTags>MySql;.NET Connector;MySql Entity Framework Core;netcore;.Net Core;MySql Conector/Net Entity Framework Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/mysql/mysql-connector-net</PackageProjectUrl>
-    <PackageLicenseExpression>GPL-2.0-only</PackageLicenseExpression>
+    <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <LangVersion>10.0</LangVersion>
     <TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
@@ -29,7 +29,7 @@
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
   </PropertyGroup>
-
+  
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
     <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index 15f1caca9..148d3e97d 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -14,7 +14,7 @@
     <PackageIcon>logo-mysql-170x115.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageProjectUrl>https://dev.mysql.com/downloads/</PackageProjectUrl>
-    <PackageLicenseExpression>GPL-2.0-only</PackageLicenseExpression>
+    <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -31,6 +31,11 @@
   <ItemGroup>
     <None Include="..\..\Nuget\Readme\EntityFramework\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
+
+  <ItemGroup>
+    <None Include="..\..\README" Pack="true" PackagePath="\" />
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="\" />
+  </ItemGroup>
   
   <ItemGroup>
     <None Remove="Properties\ProviderManifest.xml" />
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
index a421205e8..e0fd3608c 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
@@ -12,7 +12,7 @@
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
     <PackageProjectUrl>http://dev.mysql.com/downloads/</PackageProjectUrl>
-    <PackageLicenseExpression>GPL-2.0-only</PackageLicenseExpression>
+    <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
index edc58b2ce..8afd2a09b 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
@@ -12,7 +12,7 @@
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
     <PackageProjectUrl>http://dev.mysql.com/downloads/</PackageProjectUrl>
-    <PackageLicenseExpression>GPL-2.0-only</PackageLicenseExpression>
+    <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
index 213dd36a9..8d5a447e3 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
@@ -12,7 +12,7 @@
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
     <PackageProjectUrl>http://dev.mysql.com/downloads/</PackageProjectUrl>
-    <PackageLicenseExpression>GPL-2.0-only</PackageLicenseExpression>
+    <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index d2d44f5c7..55fd53746 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -13,7 +13,7 @@
     <PackageIcon>logo-mysql-170x115.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageProjectUrl>https://dev.mysql.com/downloads/</PackageProjectUrl>
-    <PackageLicenseExpression>GPL-2.0-only</PackageLicenseExpression>
+    <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>    
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
@@ -39,6 +39,11 @@
     <None Include="..\..\Nuget\Readme\MySQL.Data.OpenTelemetry\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
   
+  <ItemGroup>
+    <None Include="..\..\README" Pack="true" PackagePath="\" />
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="\" />
+  </ItemGroup>
+  
   <ItemGroup>
     <PackageReference Include="OpenTelemetry.Api" Version="1.9.0" />
   </ItemGroup>
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index ebc805e3b..0c93df32c 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -15,7 +15,7 @@
     <PackageIcon>logo-mysql-170x115.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageProjectUrl>https://dev.mysql.com/downloads/</PackageProjectUrl>
-    <PackageLicenseExpression>GPL-2.0-only</PackageLicenseExpression>
+    <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -50,6 +50,11 @@
   <ItemGroup>
     <None Include="..\..\Nuget\Readme\MySQL.Data\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <None Include="..\..\README" Pack="true" PackagePath="\" />
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="\" />
+  </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="Properties\ReservedWords.txt" />
@@ -67,15 +72,6 @@
 	<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="..\..\Release Notes.txt">
-      <Pack>true</Pack>
-    </None>
-    <None Update="..\..\README">
-      <Pack>true</Pack>
-    </None>
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)'=='net462' or '$(TargetFramework)'=='net48'">
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index 03175dec2..58c63070c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -13,7 +13,7 @@
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
     <PackageProjectUrl>http://dev.mysql.com/downloads/</PackageProjectUrl>
-    <PackageLicenseExpression>GPL-2.0-only</PackageLicenseExpression>
+    <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 5f3390b1e..7d67519c3 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -13,7 +13,7 @@
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
     <PackageProjectUrl>http://dev.mysql.com/downloads/</PackageProjectUrl>
-    <PackageLicenseExpression>GPL-2.0-only</PackageLicenseExpression>
+    <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
diff --git a/MySql.Web/src/MySql.Web.csproj b/MySql.Web/src/MySql.Web.csproj
index 602a6e64c..9172c452c 100644
--- a/MySql.Web/src/MySql.Web.csproj
+++ b/MySql.Web/src/MySql.Web.csproj
@@ -14,7 +14,7 @@
     <PackageIcon>logo-mysql-170x115.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageProjectUrl>https://dev.mysql.com/downloads/</PackageProjectUrl>
-    <PackageLicenseExpression>GPL-2.0-only</PackageLicenseExpression>
+    <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -36,6 +36,11 @@
     <None Include="..\..\Nuget\Readme\MySQL.Web\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\..\README" Pack="true" PackagePath="\" />
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Include="Properties\schema1.sql" />
     <EmbeddedResource Include="Properties\schema10.sql" />
diff --git a/MySql.Web/tests/MySql.Web.Tests.csproj b/MySql.Web/tests/MySql.Web.Tests.csproj
index 1733d05a7..8bf54e2b2 100644
--- a/MySql.Web/tests/MySql.Web.Tests.csproj
+++ b/MySql.Web/tests/MySql.Web.Tests.csproj
@@ -12,7 +12,7 @@
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
     <PackageProjectUrl>http://dev.mysql.com/downloads/</PackageProjectUrl>
-    <PackageLicenseExpression>GPL-2.0-only</PackageLicenseExpression>
+    <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>

From b16ffcfd8d1f5978c391e2b0abc1f11f8aad1420 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Mon, 23 Sep 2024 18:21:39 -0600
Subject: [PATCH 41/99] Bump up version to 9.2.0

Change-Id: Ie357e24e759ba510248d51bea66167b3e9dccd3e
---
 CHANGES                                                     | 3 +++
 .../templates/custom/partials/class.header.tmpl.partial     | 2 +-
 EntityFramework/src/MySql.Data.EntityFramework.csproj       | 2 +-
 .../MySql.EntityFramework.Basic.Tests.csproj                | 2 +-
 .../MySql.EntityFramework.CodeFirst.Tests.csproj            | 2 +-
 .../MySql.EntityFramework.Migrations.Tests.csproj           | 2 +-
 .../src/MySQL.Data.OpenTelemetry.csproj                     | 2 +-
 MySQL.Data/src/MySql.Data.csproj                            | 2 +-
 MySQL.Data/src/Properties/VersionInfo.cs                    | 6 +++---
 MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj   | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj | 2 +-
 MySql.Web/src/MySql.Web.csproj                              | 2 +-
 MySql.Web/tests/MySql.Web.Tests.csproj                      | 2 +-
 13 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index 04486f4ca..19b152d3d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+9.2.0
+
+
 9.1.0
 - Updated test suite to use constraint-based assertions (WL16397).
 - Changed testsuite to use assummptions instead of Assert.Ignore (WL16402).
diff --git a/Documentation/templates/custom/partials/class.header.tmpl.partial b/Documentation/templates/custom/partials/class.header.tmpl.partial
index 2eff37671..2ee15b21b 100644
--- a/Documentation/templates/custom/partials/class.header.tmpl.partial
+++ b/Documentation/templates/custom/partials/class.header.tmpl.partial
@@ -25,7 +25,7 @@
 {{/implements.0}}
 <h6><strong>{{__global.namespace}}</strong>: {{{namespace.specName.0.value}}}</h6>
 <h6><strong>{{__global.assembly}}</strong>: {{assemblies.0}}.dll</h6>
-<h6><strong>Version</strong>: 9.1.0</h6>
+<h6><strong>Version</strong>: 9.2.0</h6>
 <h5 id="{{id}}_syntax">{{__global.syntax}}</h5>
 <div class="codewrapper">
   <pre><code class="lang-{{_lang}} hljs">{{syntax.content.0.value}}</code></pre>
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index 148d3e97d..7852d3988 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.1.0</Version>
+    <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
index e0fd3608c..d9b06a899 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.CodeFirTests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.1.0</Version>
+    <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Basic.Tests</AssemblyName>
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
index 8afd2a09b..8695f22ac 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.CodeFirst.Tests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.1.0</Version>
+    <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.CodeFirst.Tests</AssemblyName>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
index 8d5a447e3..bb23ccb6e 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.Migrations.Tests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.1.0</Version>
+    <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Migrations.Tests</AssemblyName>
diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index 55fd53746..4d65a1c10 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.OpenTelemetry</Description>
     <Copyright>Copyright © 2023, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.1.0</Version>
+    <Version>9.2.0</Version>
     <Authors>Oracle</Authors>  
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>MySql.Data.OpenTelemetry</AssemblyName>
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index 0c93df32c..eb3fe9d67 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -5,7 +5,7 @@
     <Description>MySql.Data.MySqlClient .Net Core Class Library</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.1.0</Version>
+    <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
     <AssemblyName>MySql.Data</AssemblyName>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0;</TargetFrameworks>
diff --git a/MySQL.Data/src/Properties/VersionInfo.cs b/MySQL.Data/src/Properties/VersionInfo.cs
index 123b70f96..127f87162 100644
--- a/MySQL.Data/src/Properties/VersionInfo.cs
+++ b/MySQL.Data/src/Properties/VersionInfo.cs
@@ -40,7 +40,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.1.0")]
-[assembly: AssemblyInformationalVersion("9.1.0")]
-[assembly: AssemblyFileVersion("9.1.0")]
+[assembly: AssemblyVersion("9.2.0")]
+[assembly: AssemblyInformationalVersion("9.2.0")]
+[assembly: AssemblyFileVersion("9.2.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index 58c63070c..827d07e47 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -4,7 +4,7 @@
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
-    <Version>9.1.0</Version>
+    <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 7d67519c3..42f7c6eb3 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -4,7 +4,7 @@
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
-    <Version>9.1.0</Version>
+    <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
diff --git a/MySql.Web/src/MySql.Web.csproj b/MySql.Web/src/MySql.Web.csproj
index 9172c452c..e6d667f7d 100644
--- a/MySql.Web/src/MySql.Web.csproj
+++ b/MySql.Web/src/MySql.Web.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Web</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.1.0</Version>
+    <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
diff --git a/MySql.Web/tests/MySql.Web.Tests.csproj b/MySql.Web/tests/MySql.Web.Tests.csproj
index 8bf54e2b2..2ff8a784f 100644
--- a/MySql.Web/tests/MySql.Web.Tests.csproj
+++ b/MySql.Web/tests/MySql.Web.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Web.Tests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.1.0</Version>
+    <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.Web.Tests</AssemblyName>

From ef2b9c8e12361e2a6381b48e33e315336fe5b058 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 4 Dec 2024 13:54:35 -0700
Subject: [PATCH 42/99] Updated System.Text.Json

Change-Id: I0cba0ebe408d84894927a91fd5dab4ae7a3c672c
---
 MySQL.Data/src/MySql.Data.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index eb3fe9d67..e97db2a6f 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -86,7 +86,7 @@
     <PackageReference Include="System.Security.Permissions" Version="8.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="System.Text.Json" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

From 50dfed130a363cf0c0ecec114c40e2b03acbc76a Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Thu, 5 Dec 2024 17:42:54 -0700
Subject: [PATCH 43/99] WL#16638 [Add support for .NET 9 and EF Core 9 GA
 versions]

Change-Id: Ifaa210fc070ed407f8a0a56557633a516545f3e3
---
 CHANGES                                       |   1 +
 .../Internal/MySQLHistoryRepository.cs        |  85 +++
 .../Internal/MySQLMigrationDatabaseLockcs.cs  |  53 ++
 .../src/Migrations/Internal/MySQLMigrator.cs  | 675 ++++++++++++++++++
 EFCore/src/MySql.EntityFrameworkCore.csproj   |  12 +-
 .../Internal/MySQLBinaryExpression.cs         |  16 +
 .../Internal/MySQLCollateExpression.cs        |  49 +-
 .../MySQLColumnAliasReferenceExpression.cs    |  14 +
 .../MySQLComplexFunctionArgumentExpression.cs |  15 +
 .../Internal/MySQLJsonArrayIndexExpression.cs |  14 +
 .../Internal/MySQLJsonTraversalExpression.cs  |  14 +
 .../Internal/MySQLMatchExpression.cs          |  16 +
 .../Internal/MySQLRegexpExpression.cs         |  15 +
 .../MySQLStringComparisonMethodTranslator.cs  |   2 +-
 .../Internal/MySQLDateTimeMethodTranslator.cs |   4 +
 .../MySQLParameterBasedSqlProcessor.cs        |  22 +-
 .../MySQLParameterBasedSqlProcessorFactory.cs |   5 +
 .../Internal/MySQLSqlExpressionFactory.cs     |  13 +-
 .../Internal/MySQLSqlNullabilityProcessor.cs  |  15 +-
 ...Sql.EntityFrameworkCore.Basic.Tests.csproj |   6 +-
 .../Utils/MySqlTestStore.cs                   |  42 +-
 ...ql.EntityFrameworkCore.Design.Tests.csproj |   6 +-
 ...ntityFrameworkCore.Migrations.Tests.csproj |   4 +-
 MySQL.Data/src/MySql.Data.csproj              |   4 +-
 .../MySql.Data.Tests/MySql.Data.Tests.csproj  |   4 +-
 .../MySqlX.Data.Tests.csproj                  |   4 +-
 26 files changed, 1077 insertions(+), 33 deletions(-)
 create mode 100644 EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs

diff --git a/CHANGES b/CHANGES
index 19b152d3d..b5957b9ea 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 9.2.0
+- Added support for .NET 9 and EF Core 9 GA versions (WL16638).
 
 
 9.1.0
diff --git a/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs b/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
index 1a6d4e093..77f84336c 100644
--- a/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
+++ b/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
@@ -27,12 +27,15 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.DependencyInjection;
 using MySql.EntityFrameworkCore.Utils;
 using System;
 using System.Text;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace MySql.EntityFrameworkCore.Migrations.Internal
 {
@@ -50,7 +53,89 @@ public MySQLHistoryRepository([NotNull] HistoryRepositoryDependencies dependenci
       : base(dependencies)
     {
     }
+#if NET9_0
+    public override LockReleaseBehavior LockReleaseBehavior => LockReleaseBehavior.Connection;
 
+    public override IMigrationsDatabaseLock AcquireDatabaseLock()
+    {
+      Dependencies.MigrationsLogger.AcquiringMigrationLock();
+
+      var dbLock = CreateMigrationDatabaseLock();
+      int result;
+      try
+      {
+        result = (int)CreateGetLockCommand().ExecuteScalar(CreateRelationalCommandParameters())!;
+      }
+      catch
+      {
+        try
+        {
+          dbLock.Dispose();
+        }
+        catch
+        {
+        }
+
+        throw;
+      }
+
+      return result < 0
+          ? throw new TimeoutException()
+          : dbLock;
+    }
+
+    /// <summary>
+    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+    ///     any release. You should only use it directly in your code with extreme caution and knowing that
+    ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+    /// </summary>
+    public override async Task<IMigrationsDatabaseLock> AcquireDatabaseLockAsync(CancellationToken cancellationToken = default)
+    {
+      Dependencies.MigrationsLogger.AcquiringMigrationLock();
+
+      var dbLock = CreateMigrationDatabaseLock();
+      int result;
+      try
+      {
+        result = (int)(await CreateGetLockCommand().ExecuteScalarAsync(CreateRelationalCommandParameters(), cancellationToken)
+            .ConfigureAwait(false))!;
+      }
+      catch
+      {
+        try
+        {
+          await dbLock.DisposeAsync().ConfigureAwait(false);
+        }
+        catch
+        {
+        }
+
+        throw;
+      }
+
+      return result < 0
+          ? throw new TimeoutException()
+          : dbLock;
+    }
+
+    private IRelationalCommand CreateGetLockCommand()
+        => Dependencies.RawSqlCommandBuilder.Build("DECLARE @result int;EXEC @result = sp_getapplock @Resource = '__EFMigrationsLock', @LockOwner = 'Session', @LockMode = 'Exclusive';SELECT @result", []).RelationalCommand;
+
+    private MySQLMigrationDatabaseLock CreateMigrationDatabaseLock()
+    => new(
+        Dependencies.RawSqlCommandBuilder.Build("DECLARE @result int;EXEC @result = sp_releaseapplock @Resource = '__EFMigrationsLock', @LockOwner = 'Session';SELECT @result"),
+        CreateRelationalCommandParameters(),
+        this);
+
+    private RelationalCommandParameterObject CreateRelationalCommandParameters()
+        => new(
+            Dependencies.Connection,
+            null,
+            null,
+            Dependencies.CurrentContext.Context,
+            Dependencies.CommandLogger, CommandSource.Migrations);
+#endif
     protected override string ExistsSql
     {
       get
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs b/EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs
new file mode 100644
index 000000000..139c378dc
--- /dev/null
+++ b/EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs
@@ -0,0 +1,53 @@
+// Copyright © 2024, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MySql.EntityFrameworkCore.Migrations.Internal
+{
+#if NET9_0
+  internal class MySQLMigrationDatabaseLock(
+   IRelationalCommand releaseLockCommand,
+    RelationalCommandParameterObject relationalCommandParameters,
+    IHistoryRepository historyRepository,
+    CancellationToken cancellationToken = default)
+    : IMigrationsDatabaseLock
+  {
+    public virtual IHistoryRepository HistoryRepository => historyRepository;
+
+    public void Dispose()
+      => releaseLockCommand.ExecuteScalar(relationalCommandParameters);
+
+    public async ValueTask DisposeAsync()
+      => await releaseLockCommand.ExecuteScalarAsync(relationalCommandParameters, cancellationToken).ConfigureAwait(false);
+  }
+#endif
+}
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrator.cs b/EFCore/src/Migrations/Internal/MySQLMigrator.cs
index 1cff48605..23aa5d493 100644
--- a/EFCore/src/Migrations/Internal/MySQLMigrator.cs
+++ b/EFCore/src/Migrations/Internal/MySQLMigrator.cs
@@ -28,7 +28,9 @@
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Diagnostics.Internal;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Migrations.Internal;
 using Microsoft.EntityFrameworkCore.Migrations.Operations;
@@ -36,11 +38,683 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Threading;
+using System.Transactions;
 
 namespace MySql.EntityFrameworkCore.Migrations.Internal
 {
+#if NET9_0
+  public class MySQLMigrator : IMigrator
+  {
+    private readonly IMigrationsAssembly _migrationsAssembly;
+    private readonly IHistoryRepository _historyRepository;
+    private readonly IRelationalDatabaseCreator _databaseCreator;
+    private readonly IMigrationsSqlGenerator _migrationsSqlGenerator;
+    private readonly IRawSqlCommandBuilder _rawSqlCommandBuilder;
+    private readonly IMigrationCommandExecutor _migrationCommandExecutor;
+    private readonly IRelationalConnection _connection;
+    private readonly ISqlGenerationHelper _sqlGenerationHelper;
+    private readonly ICurrentDbContext _currentContext;
+    private readonly IModelRuntimeInitializer _modelRuntimeInitializer;
+    private readonly IDiagnosticsLogger<DbLoggerCategory.Migrations> _logger;
+    private readonly IRelationalCommandDiagnosticsLogger _commandLogger;
+    private readonly IMigrationsModelDiffer _migrationsModelDiffer;
+    private readonly IDesignTimeModel _designTimeModel;
+    private readonly string _activeProvider;
+    private readonly IDbContextOptions _dbContextOptions;
+    private readonly IExecutionStrategy _executionStrategy;
+
+    public MySQLMigrator(
+      IMigrationsAssembly migrationsAssembly,
+      IHistoryRepository historyRepository,
+      IDatabaseCreator databaseCreator,
+      IMigrationsSqlGenerator migrationsSqlGenerator,
+      IRawSqlCommandBuilder rawSqlCommandBuilder,
+      IMigrationCommandExecutor migrationCommandExecutor,
+      IRelationalConnection connection,
+      ISqlGenerationHelper sqlGenerationHelper,
+      ICurrentDbContext currentContext,
+      IModelRuntimeInitializer modelRuntimeInitializer,
+      IDiagnosticsLogger<DbLoggerCategory.Migrations> logger,
+      IRelationalCommandDiagnosticsLogger commandLogger,
+      IDatabaseProvider databaseProvider,
+      IMigrationsModelDiffer migrationsModelDiffer,
+      IDesignTimeModel designTimeModel,
+      IDbContextOptions dbContextOptions,
+      IExecutionStrategy executionStrategy)
+    {
+      _migrationsAssembly = migrationsAssembly;
+      _historyRepository = historyRepository;
+      _databaseCreator = (IRelationalDatabaseCreator)databaseCreator;
+      _migrationsSqlGenerator = migrationsSqlGenerator;
+      _rawSqlCommandBuilder = rawSqlCommandBuilder;
+      _migrationCommandExecutor = migrationCommandExecutor;
+      _connection = connection;
+      _sqlGenerationHelper = sqlGenerationHelper;
+      _currentContext = currentContext;
+      _modelRuntimeInitializer = modelRuntimeInitializer;
+      _logger = logger;
+      _commandLogger = commandLogger;
+      _migrationsModelDiffer = migrationsModelDiffer;
+      _designTimeModel = designTimeModel;
+      _activeProvider = databaseProvider.Name;
+      _dbContextOptions = dbContextOptions;
+      _executionStrategy = executionStrategy;
+    }
+
+    protected virtual System.Data.IsolationLevel? MigrationTransactionIsolationLevel => null;
+
+    public virtual void Migrate(string? targetMigration)
+    {
+      var useTransaction = _connection.CurrentTransaction is null;
+      if (!useTransaction
+          && _executionStrategy.RetriesOnFailure)
+      {
+        throw new NotSupportedException(RelationalStrings.TransactionSuppressedMigrationInUserTransaction);
+      }
+
+      if (RelationalResources.LogPendingModelChanges(_logger).WarningBehavior != WarningBehavior.Ignore
+          && HasPendingModelChanges())
+      {
+        _logger.PendingModelChangesWarning(_currentContext.Context.GetType());
+      }
+
+      if (!useTransaction)
+      {
+        _logger.MigrationsUserTransactionWarning();
+      }
+
+      _logger.MigrateUsingConnection(this, _connection);
+
+      using var transactionScope = new TransactionScope(TransactionScopeOption.Suppress, TransactionScopeAsyncFlowOption.Enabled);
+
+      if (!_databaseCreator.Exists())
+      {
+        _databaseCreator.Create();
+      }
+
+      _connection.Open();
+      try
+      {
+        var state = new MigrationExecutionState();
+        if (_historyRepository.LockReleaseBehavior != LockReleaseBehavior.Transaction
+            && useTransaction)
+        {
+          state.DatabaseLock = _historyRepository.AcquireDatabaseLock();
+        }
+
+        _executionStrategy.Execute(
+            this,
+            static (_, migrator) =>
+            {
+              migrator._connection.Open();
+              try
+              {
+                return migrator._historyRepository.CreateIfNotExists();
+              }
+              finally
+              {
+                migrator._connection.Close();
+              }
+            },
+            verifySucceeded: null);
+
+        _executionStrategy.Execute(
+            (Migrator: this,
+            TargetMigration: targetMigration,
+            State: state,
+            UseTransaction: useTransaction),
+            static (c, s) => s.Migrator.MigrateImplementation(c, s.TargetMigration, s.State, s.UseTransaction),
+            static (_, s) => new ExecutionResult<bool>(
+                successful: s.Migrator.VerifyMigrationSucceeded(s.TargetMigration, s.State),
+                result: true));
+      }
+      finally
+      {
+        _connection.Close();
+      }
+    }
+
+    private bool MigrateImplementation(DbContext context, string? targetMigration, MigrationExecutionState state, bool useTransaction)
+    {
+      var connectionOpened = _connection.Open();
+      try
+      {
+        if (useTransaction)
+        {
+          state.Transaction = MigrationTransactionIsolationLevel == null
+              ? _connection.BeginTransaction()
+              : _connection.BeginTransaction(MigrationTransactionIsolationLevel.Value);
+
+          state.DatabaseLock = state.DatabaseLock == null
+              ? _historyRepository.AcquireDatabaseLock()
+              : state.DatabaseLock.ReacquireIfNeeded(connectionOpened, useTransaction);
+        }
+
+        PopulateMigrations(
+            _historyRepository.GetAppliedMigrations().Select(t => t.MigrationId),
+            targetMigration,
+            out var migratorData);
+
+        var commandLists = GetMigrationCommandLists(migratorData);
+        foreach (var commandList in commandLists)
+        {
+          var (id, getCommands) = commandList;
+          if (id != state.CurrentMigrationId)
+          {
+            state.CurrentMigrationId = id;
+            state.LastCommittedCommandIndex = 0;
+          }
+
+          _migrationCommandExecutor.ExecuteNonQuery(getCommands(), _connection, state, commitTransaction: false, MigrationTransactionIsolationLevel);
+        }
+
+        var coreOptionsExtension =
+            _dbContextOptions.FindExtension<CoreOptionsExtension>()
+            ?? new CoreOptionsExtension();
+
+        var seed = coreOptionsExtension.Seeder;
+        if (seed != null)
+        {
+          seed(context, state.AnyOperationPerformed);
+        }
+        else if (coreOptionsExtension.AsyncSeeder != null)
+        {
+          throw new InvalidOperationException(CoreStrings.MissingSeeder);
+        }
+
+        state.Transaction?.Commit();
+        return state.AnyOperationPerformed;
+      }
+      finally
+      {
+        state.DatabaseLock?.Dispose();
+        state.DatabaseLock = null;
+        state.Transaction?.Dispose();
+        state.Transaction = null;
+        _connection.Close();
+      }
+    }
+
+    public virtual async Task MigrateAsync(
+        string? targetMigration,
+        CancellationToken cancellationToken = default)
+    {
+      var useTransaction = _connection.CurrentTransaction is null;
+      if (!useTransaction
+          && _executionStrategy.RetriesOnFailure)
+      {
+        throw new NotSupportedException(RelationalStrings.TransactionSuppressedMigrationInUserTransaction);
+      }
+
+      if (RelationalResources.LogPendingModelChanges(_logger).WarningBehavior != WarningBehavior.Ignore
+          && HasPendingModelChanges())
+      {
+        _logger.PendingModelChangesWarning(_currentContext.Context.GetType());
+      }
+
+      if (!useTransaction)
+      {
+        _logger.MigrationsUserTransactionWarning();
+      }
+
+      _logger.MigrateUsingConnection(this, _connection);
+
+      using var transactionScope = new TransactionScope(TransactionScopeOption.Suppress, TransactionScopeAsyncFlowOption.Enabled);
+
+      if (!await _databaseCreator.ExistsAsync(cancellationToken).ConfigureAwait(false))
+      {
+        await _databaseCreator.CreateAsync(cancellationToken).ConfigureAwait(false);
+      }
+
+      await _connection.OpenAsync(cancellationToken).ConfigureAwait(false);
+      try
+      {
+        var state = new MigrationExecutionState();
+        if (_historyRepository.LockReleaseBehavior != LockReleaseBehavior.Transaction
+            && useTransaction)
+        {
+          state.DatabaseLock = await _historyRepository.AcquireDatabaseLockAsync(cancellationToken).ConfigureAwait(false);
+        }
+
+        await _executionStrategy.ExecuteAsync(
+            this,
+            static async (_, migrator, ct) =>
+            {
+              await migrator._connection.OpenAsync(ct).ConfigureAwait(false);
+              try
+              {
+                return await migrator._historyRepository.CreateIfNotExistsAsync(ct).ConfigureAwait(false);
+              }
+              finally
+              {
+                await migrator._connection.CloseAsync().ConfigureAwait(false);
+              }
+            },
+            verifySucceeded: null,
+            cancellationToken).ConfigureAwait(false);
+
+        await _executionStrategy.ExecuteAsync(
+            (Migrator: this,
+            TargetMigration: targetMigration,
+            State: state,
+            UseTransaction: useTransaction),
+            async static (c, s, ct) => await s.Migrator.MigrateImplementationAsync(
+                c, s.TargetMigration, s.State, s.UseTransaction, ct).ConfigureAwait(false),
+            async static (_, s, ct) => new ExecutionResult<bool>(
+                successful: await s.Migrator.VerifyMigrationSucceededAsync(s.TargetMigration, s.State, ct).ConfigureAwait(false),
+                result: true),
+            cancellationToken)
+            .ConfigureAwait(false);
+      }
+      finally
+      {
+        await _connection.CloseAsync().ConfigureAwait(false);
+      }
+    }
+
+    private async Task<bool> MigrateImplementationAsync(
+        DbContext context, string? targetMigration, MigrationExecutionState state, bool useTransaction, CancellationToken cancellationToken = default)
+    {
+      var connectionOpened = await _connection.OpenAsync(cancellationToken).ConfigureAwait(false);
+      try
+      {
+        if (useTransaction)
+        {
+          state.Transaction = await (MigrationTransactionIsolationLevel == null
+              ? context.Database.BeginTransactionAsync(cancellationToken)
+              : context.Database.BeginTransactionAsync(MigrationTransactionIsolationLevel.Value, cancellationToken))
+                  .ConfigureAwait(false);
+
+          state.DatabaseLock = state.DatabaseLock == null
+              ? await _historyRepository.AcquireDatabaseLockAsync(cancellationToken).ConfigureAwait(false)
+              : await state.DatabaseLock.ReacquireIfNeededAsync(connectionOpened, useTransaction, cancellationToken)
+                  .ConfigureAwait(false);
+        }
+
+        PopulateMigrations(
+            (await _historyRepository.GetAppliedMigrationsAsync(cancellationToken).ConfigureAwait(false)).Select(t => t.MigrationId),
+            targetMigration,
+            out var migratorData);
+
+        var commandLists = GetMigrationCommandLists(migratorData);
+        foreach (var commandList in commandLists)
+        {
+          var (id, getCommands) = commandList;
+          if (id != state.CurrentMigrationId)
+          {
+            state.CurrentMigrationId = id;
+            state.LastCommittedCommandIndex = 0;
+          }
+
+          await _migrationCommandExecutor.ExecuteNonQueryAsync(
+              getCommands(), _connection, state, commitTransaction: false, MigrationTransactionIsolationLevel, cancellationToken)
+              .ConfigureAwait(false);
+        }
+
+        var coreOptionsExtension =
+            _dbContextOptions.FindExtension<CoreOptionsExtension>()
+            ?? new CoreOptionsExtension();
+
+        var seedAsync = coreOptionsExtension.AsyncSeeder;
+        if (seedAsync != null)
+        {
+          await seedAsync(context, state.AnyOperationPerformed, cancellationToken).ConfigureAwait(false);
+        }
+        else if (coreOptionsExtension.Seeder != null)
+        {
+          throw new InvalidOperationException(CoreStrings.MissingSeeder);
+        }
+
+        if (state.Transaction != null)
+        {
+          await state.Transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
+        }
+        return state.AnyOperationPerformed;
+      }
+      finally
+      {
+        if (state.DatabaseLock != null)
+        {
+          state.DatabaseLock.Dispose();
+          state.DatabaseLock = null;
+        }
+        if (state.Transaction != null)
+        {
+          await state.Transaction.DisposeAsync().ConfigureAwait(false);
+          state.Transaction = null;
+        }
+        await _connection.CloseAsync().ConfigureAwait(false);
+      }
+    }
+
+    private IEnumerable<(string, Func<IReadOnlyList<MigrationCommand>>)> GetMigrationCommandLists(MigratorData parameters)
+    {
+      var migrationsToApply = parameters.AppliedMigrations;
+      var migrationsToRevert = parameters.RevertedMigrations;
+      var actualTargetMigration = parameters.TargetMigration;
+
+      for (var i = 0; i < migrationsToRevert.Count; i++)
+      {
+        var migration = migrationsToRevert[i];
+
+        var index = i;
+        yield return (migration.GetId(), () =>
+        {
+          _logger.MigrationReverting(this, migration);
+
+          var commands = GenerateDownSql(
+              migration,
+              index != migrationsToRevert.Count - 1
+                  ? migrationsToRevert[index + 1]
+                  : actualTargetMigration);
+          if (migration.DownOperations.Count > 1
+              && commands.FirstOrDefault(c => c.TransactionSuppressed) is MigrationCommand nonTransactionalCommand)
+          {
+            _logger.NonTransactionalMigrationOperationWarning(this, migration, nonTransactionalCommand);
+          }
+
+          return commands;
+        }
+        );
+      }
+
+      foreach (var migration in migrationsToApply)
+      {
+        yield return (migration.GetId(), () =>
+        {
+          _logger.MigrationApplying(this, migration);
+
+          var commands = GenerateUpSql(migration);
+          if (migration.UpOperations.Count > 1
+              && commands.FirstOrDefault(c => c.TransactionSuppressed) is MigrationCommand nonTransactionalCommand)
+          {
+            _logger.NonTransactionalMigrationOperationWarning(this, migration, nonTransactionalCommand);
+          }
+
+          return commands;
+        }
+        );
+      }
+
+      if (migrationsToRevert.Count + migrationsToApply.Count == 0)
+      {
+        _logger.MigrationsNotApplied(this);
+      }
+    }
+
+    protected virtual void PopulateMigrations(
+        IEnumerable<string> appliedMigrationEntries,
+        string? targetMigration,
+        out MigratorData parameters)
+    {
+      var appliedMigrations = new Dictionary<string, TypeInfo>();
+      var unappliedMigrations = new Dictionary<string, TypeInfo>();
+      var appliedMigrationEntrySet = new HashSet<string>(appliedMigrationEntries, StringComparer.OrdinalIgnoreCase);
+      if (_migrationsAssembly.Migrations.Count == 0)
+      {
+        _logger.MigrationsNotFound(this, _migrationsAssembly);
+      }
+
+      foreach (var (key, typeInfo) in _migrationsAssembly.Migrations)
+      {
+        if (appliedMigrationEntrySet.Contains(key))
+        {
+          appliedMigrations.Add(key, typeInfo);
+        }
+        else
+        {
+          unappliedMigrations.Add(key, typeInfo);
+        }
+      }
+
+      IReadOnlyList<Migration> migrationsToApply;
+      IReadOnlyList<Migration> migrationsToRevert;
+      Migration? actualTargetMigration = null;
+      if (string.IsNullOrEmpty(targetMigration))
+      {
+        migrationsToApply = unappliedMigrations
+            .OrderBy(m => m.Key)
+            .Select(p => _migrationsAssembly.CreateMigration(p.Value, _activeProvider))
+            .ToList();
+        migrationsToRevert = [];
+      }
+      else if (targetMigration == Migration.InitialDatabase)
+      {
+        migrationsToApply = [];
+        migrationsToRevert = appliedMigrations
+            .OrderByDescending(m => m.Key)
+            .Select(p => _migrationsAssembly.CreateMigration(p.Value, _activeProvider))
+            .ToList();
+      }
+      else
+      {
+        targetMigration = _migrationsAssembly.GetMigrationId(targetMigration);
+        migrationsToApply = unappliedMigrations
+            .Where(m => string.Compare(m.Key, targetMigration, StringComparison.OrdinalIgnoreCase) <= 0)
+            .OrderBy(m => m.Key)
+            .Select(p => _migrationsAssembly.CreateMigration(p.Value, _activeProvider))
+            .ToList();
+        migrationsToRevert = appliedMigrations
+            .Where(m => string.Compare(m.Key, targetMigration, StringComparison.OrdinalIgnoreCase) > 0)
+            .OrderByDescending(m => m.Key)
+            .Select(p => _migrationsAssembly.CreateMigration(p.Value, _activeProvider))
+            .ToList();
+        actualTargetMigration = appliedMigrations
+            .Where(m => string.Compare(m.Key, targetMigration, StringComparison.OrdinalIgnoreCase) == 0)
+            .Select(p => _migrationsAssembly.CreateMigration(p.Value, _activeProvider))
+            .SingleOrDefault();
+      }
+
+      parameters = new MigratorData(migrationsToApply, migrationsToRevert, actualTargetMigration);
+    }
+
+    protected virtual bool VerifyMigrationSucceeded(
+        string? targetMigration, MigrationExecutionState state)
+        => false;
+
+    protected virtual Task<bool> VerifyMigrationSucceededAsync(
+        string? targetMigration, MigrationExecutionState state, CancellationToken cancellationToken)
+        => Task.FromResult(false);
+
+    public virtual string GenerateScript(
+        string? fromMigration = null,
+        string? toMigration = null,
+        MigrationsSqlGenerationOptions options = MigrationsSqlGenerationOptions.Default)
+    {
+      options |= MigrationsSqlGenerationOptions.Script;
+
+      var idempotent = options.HasFlag(MigrationsSqlGenerationOptions.Idempotent);
+      var noTransactions = options.HasFlag(MigrationsSqlGenerationOptions.NoTransactions);
+
+      IEnumerable<string> appliedMigrations;
+      if (string.IsNullOrEmpty(fromMigration)
+          || fromMigration == Migration.InitialDatabase)
+      {
+        appliedMigrations = Enumerable.Empty<string>();
+      }
+      else
+      {
+        var fromMigrationId = _migrationsAssembly.GetMigrationId(fromMigration);
+        appliedMigrations = _migrationsAssembly.Migrations
+            .Where(t => string.Compare(t.Key, fromMigrationId, StringComparison.OrdinalIgnoreCase) <= 0)
+            .Select(t => t.Key);
+      }
+
+      PopulateMigrations(appliedMigrations, toMigration, out var migratorData);
+
+      var builder = new IndentedStringBuilder();
+
+      if (fromMigration == Migration.InitialDatabase
+          || string.IsNullOrEmpty(fromMigration))
+      {
+        builder
+            .Append(_historyRepository.GetCreateIfNotExistsScript())
+            .Append(_sqlGenerationHelper.BatchTerminator);
+      }
+
+      var idempotencyEnd = idempotent
+          ? _historyRepository.GetEndIfScript()
+          : null;
+      var migrationsToApply = migratorData.AppliedMigrations;
+      var migrationsToRevert = migratorData.RevertedMigrations;
+      var actualTargetMigration = migratorData.TargetMigration;
+      var transactionStarted = false;
+      for (var i = 0; i < migrationsToRevert.Count; i++)
+      {
+        var migration = migrationsToRevert[i];
+        var previousMigration = i != migrationsToRevert.Count - 1
+            ? migrationsToRevert[i + 1]
+            : actualTargetMigration;
+
+        _logger.MigrationGeneratingDownScript(this, migration, fromMigration, toMigration, idempotent);
+
+        var idempotencyCondition = idempotent
+            ? _historyRepository.GetBeginIfExistsScript(migration.GetId())
+            : null;
+
+        GenerateSqlScript(
+            GenerateDownSql(migration, previousMigration, options),
+            builder, _sqlGenerationHelper, ref transactionStarted, noTransactions, idempotencyCondition, idempotencyEnd);
+      }
+
+      foreach (var migration in migrationsToApply)
+      {
+        _logger.MigrationGeneratingUpScript(this, migration, fromMigration, toMigration, idempotent);
+
+        var idempotencyCondition = idempotent
+            ? _historyRepository.GetBeginIfNotExistsScript(migration.GetId())
+            : null;
+
+        GenerateSqlScript(
+            GenerateUpSql(migration, options),
+            builder, _sqlGenerationHelper, ref transactionStarted, noTransactions, idempotencyCondition, idempotencyEnd);
+      }
+
+      if (transactionStarted)
+      {
+        builder
+            .AppendLine(_sqlGenerationHelper.CommitTransactionStatement)
+            .Append(_sqlGenerationHelper.BatchTerminator);
+      }
+
+      return builder.ToString();
+    }
+
+    private static void GenerateSqlScript(
+        IEnumerable<MigrationCommand> commands,
+        IndentedStringBuilder builder,
+        ISqlGenerationHelper sqlGenerationHelper,
+        ref bool transactionStarted,
+        bool noTransactions = false,
+        string? idempotencyCondition = null,
+        string? idempotencyEnd = null)
+    {
+      foreach (var command in commands)
+      {
+        if (!noTransactions)
+        {
+          if (!transactionStarted && !command.TransactionSuppressed)
+          {
+            builder
+                .AppendLine(sqlGenerationHelper.StartTransactionStatement);
+            transactionStarted = true;
+          }
+
+          if (transactionStarted && command.TransactionSuppressed)
+          {
+            builder
+                .AppendLine(sqlGenerationHelper.CommitTransactionStatement)
+                .Append(sqlGenerationHelper.BatchTerminator);
+            transactionStarted = false;
+          }
+        }
+
+        if (idempotencyCondition != null
+            && idempotencyEnd != null)
+        {
+          builder.AppendLine(idempotencyCondition);
+          using (builder.Indent())
+          {
+            builder.AppendLines(command.CommandText);
+          }
+
+          builder.Append(idempotencyEnd);
+        }
+        else
+        {
+          builder.Append(command.CommandText);
+        }
+
+        if (!transactionStarted)
+        {
+          builder.Append(sqlGenerationHelper.BatchTerminator);
+        }
+        else
+        {
+          builder.Append(Environment.NewLine);
+        }
+      }
+    }
+
+    protected virtual IReadOnlyList<MigrationCommand> GenerateUpSql(
+        Migration migration,
+        MigrationsSqlGenerationOptions options = MigrationsSqlGenerationOptions.Default)
+    {
+      var insertCommand = _rawSqlCommandBuilder.Build(
+          _historyRepository.GetInsertScript(new HistoryRow(migration.GetId(), ProductInfo.GetVersion())));
+
+      var operations = _migrationsSqlGenerator
+          .Generate(
+              migration.UpOperations,
+              FinalizeModel(migration.TargetModel),
+              options);
+
+      return
+      [
+          .. operations,
+            new MigrationCommand(insertCommand, _currentContext.Context, _commandLogger,
+                transactionSuppressed: operations.Any(o => o.TransactionSuppressed)),
+        ];
+    }
+
+    protected virtual IReadOnlyList<MigrationCommand> GenerateDownSql(
+        Migration migration,
+        Migration? previousMigration,
+        MigrationsSqlGenerationOptions options = MigrationsSqlGenerationOptions.Default)
+    {
+      var deleteCommand = _rawSqlCommandBuilder.Build(
+          _historyRepository.GetDeleteScript(migration.GetId()));
+
+      var operations = _migrationsSqlGenerator
+          .Generate(
+              migration.DownOperations,
+              previousMigration == null ? null : FinalizeModel(previousMigration.TargetModel),
+              options);
+
+      return [
+          .. operations,
+            new MigrationCommand(deleteCommand, _currentContext.Context, _commandLogger,
+                transactionSuppressed: operations.Any(o => o.TransactionSuppressed))
+          ];
+    }
+
+    private IModel? FinalizeModel(IModel? model)
+        => model == null
+            ? null
+            : _modelRuntimeInitializer.Initialize(model);
+
+    public bool HasPendingModelChanges()
+        => _migrationsModelDiffer.HasDifferences(
+            FinalizeModel(_migrationsAssembly.ModelSnapshot?.Model)?.GetRelationalModel(),
+            _designTimeModel.Model.GetRelationalModel());
+  }
+#else
+
   internal class MySQLMigrator : Migrator
   {
     private static readonly Dictionary<Type, Tuple<string, string>> _customMigrationCommands =
@@ -350,4 +1024,5 @@ INTO PRIMARY_KEY_COLUMN_NAME
 
     #endregion Custom SQL
   }
+#endif
 }
diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
index f4c824aa4..b2e9a5f12 100644
--- a/EFCore/src/MySql.EntityFrameworkCore.csproj
+++ b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -9,8 +9,8 @@
     <PackageProjectUrl>https://github.com/mysql/mysql-connector-net</PackageProjectUrl>
     <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <LangVersion>10.0</LangVersion>
-    <TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+    <LangVersion>13.0</LangVersion>
+    <TargetFrameworks>net9.0;net6.0;net8.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFrameworkCore</AssemblyName>
     <PackageId>MySql.EntityFrameworkCore</PackageId>
     <Nullable>enable</Nullable>
@@ -18,7 +18,7 @@
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>..\..\ConnectorNetPublicKey.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>$(NoWarn);CS1591;EF1001</NoWarn>
+    <NoWarn>$(NoWarn);CS1591;EF1001;EF9100</NoWarn>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -31,7 +31,7 @@
   </PropertyGroup>
   
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
@@ -45,8 +45,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0-preview.2.24128.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0-preview.2.24128.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs
index 088c0d229..fb5cb4112 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs
@@ -32,6 +32,7 @@
 using MySql.EntityFrameworkCore.Utils;
 using System;
 using System.Linq.Expressions;
+using System.Reflection;
 
 namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
 {
@@ -60,6 +61,9 @@ public MySQLBinaryExpression(
       Right = right;
     }
 
+#if NET9_0
+    private static ConstructorInfo? _quotingConstructor;
+#endif
     public virtual MySQLBinaryExpressionOperatorType OperatorType { get; }
     public virtual SqlExpression Left { get; }
     public virtual SqlExpression Right { get; }
@@ -77,6 +81,18 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
       return Update(left, right);
     }
 
+#if NET9_0
+    /// <inheritdoc />
+    public override Expression Quote() => New(
+      _quotingConstructor ??= typeof(MySQLBinaryExpression).GetConstructor(
+          [typeof(ExpressionType), typeof(SqlExpression), typeof(SqlExpression), typeof(Type), typeof(RelationalTypeMapping)])!,
+      Constant(OperatorType),
+      Left.Quote(),
+      Right.Quote(),
+      Constant(Type),
+      RelationalExpressionQuotingUtilities.QuoteTypeMapping(TypeMapping));
+#endif
+
     public virtual MySQLBinaryExpression Update(SqlExpression left, SqlExpression right)
       => left != Left || right != Right
         ? new MySQLBinaryExpression(OperatorType, left, right, Type, TypeMapping)
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs
index 0608e9f98..a88c77b49 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs
@@ -32,6 +32,7 @@
 using System;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 
 namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
 {
@@ -44,17 +45,31 @@ internal class MySQLCollateExpression : SqlExpression
     private readonly string _charset;
     private readonly string _collation;
 
+#if NET9_0
+    private static ConstructorInfo? _quotingConstructor;
+#endif
+
+#if NET9_0
+    public MySQLCollateExpression(SqlExpression operand, string collation)
+    : base(operand.Type, operand.TypeMapping)
+    {
+      Operand = operand;
+      Collation = collation;
+    }
+#else
     public MySQLCollateExpression(
-      SqlExpression valueExpression,
-      string charset,
-      string collation,
-      RelationalTypeMapping? typeMapping)
-      : base(typeof(string), typeMapping)
+    SqlExpression valueExpression,
+    string charset,
+    string collation,
+    RelationalTypeMapping? typeMapping)
+    : base(typeof(string), typeMapping)
     {
       _valueExpression = valueExpression;
       _charset = charset;
       _collation = collation;
     }
+#endif
+
 
     /// <summary>
     ///   The expression for which a collation is being specified.
@@ -66,10 +81,21 @@ public MySQLCollateExpression(
     /// </summary>
     public virtual string Charset => _charset;
 
+#if NET9_0
+    /// <summary>
+    ///   The expression on which collation is applied.
+    /// </summary>
+    public virtual SqlExpression Operand { get; }
+
+    public virtual string Collation { get; }
+#else
     /// <summary>
     ///   The collation that the string is being converted to.
     /// </summary>
     public virtual string Collation => _collation;
+#endif
+
+
 
     /// <summary>
     ///   Dispatches to the specific visit method for this node type.
@@ -100,11 +126,24 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
 
     }
 
+#if NET9_0
+    public virtual MySQLCollateExpression Update(SqlExpression operand)
+        => operand != Operand
+            ? new MySQLCollateExpression(operand, Collation)
+            : this;
+    /// <inheritdoc />
+    public override Expression Quote() => New(
+        _quotingConstructor ??= typeof(MySQLCollateExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
+        Operand.Quote(),
+        Constant(Collation));
+
+#else
     public virtual MySQLCollateExpression Update(SqlExpression valueExpression)
       => valueExpression != _valueExpression &&
       valueExpression != null
       ? new MySQLCollateExpression(valueExpression, _charset, _collation, TypeMapping)
       : this;
+#endif
 
     /// <summary>
     ///   Tests if this object is considered equal to another.
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs
index ca30dcf65..49a96f698 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs
@@ -31,6 +31,7 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using System;
 using System.Linq.Expressions;
+using System.Reflection;
 
 namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
 {
@@ -39,6 +40,10 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   /// </summary>
   internal class MySQLColumnAliasReferenceExpression : SqlExpression, IEquatable<MySQLColumnAliasReferenceExpression>
   {
+#if NET9_0
+    private static ConstructorInfo? _quotingConstructor;
+#endif
+
     [NotNull]
     public virtual string Alias { get; }
 
@@ -67,6 +72,15 @@ public virtual MySQLColumnAliasReferenceExpression Update(
     ? this
     : new MySQLColumnAliasReferenceExpression(alias, expression, Type, TypeMapping!);
 
+#if NET9_0
+    public override Expression Quote() => New(
+    _quotingConstructor ??= typeof(MySQLColumnAliasReferenceExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
+    Constant(Alias),
+    Expression.Quote(),
+    Constant(Type),
+    RelationalExpressionQuotingUtilities.QuoteTypeMapping(TypeMapping));
+#endif
+
     public override bool Equals(object? obj)
     => Equals(obj as MySQLColumnAliasReferenceExpression);
 
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs
index 528ee4a2c..5f176545e 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs
@@ -33,11 +33,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 
 namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
 {
   internal class MySQLComplexFunctionArgumentExpression : SqlExpression
   {
+
+#if NET9_0
+    private static ConstructorInfo? _quotingConstructor;
+#endif
+
     /// <summary>
     ///   The arguments parts.
     /// </summary>
@@ -74,6 +80,15 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
       return Update(argumentParts, Delimiter);
     }
 
+#if NET9_0
+    public override Expression Quote() => New(
+    _quotingConstructor ??= typeof(MySQLComplexFunctionArgumentExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
+    Constant(ArgumentParts),
+    Constant(Delimiter),
+    Constant(Type),
+    RelationalExpressionQuotingUtilities.QuoteTypeMapping(TypeMapping));
+#endif
+
     public virtual MySQLComplexFunctionArgumentExpression Update(IReadOnlyList<SqlExpression> argumentParts, string delimiter)
         => !argumentParts.SequenceEqual(ArgumentParts)
           ? new MySQLComplexFunctionArgumentExpression(argumentParts, delimiter, Type, TypeMapping!)
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs
index 0030496c4..6124ce5eb 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs
@@ -31,6 +31,7 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using System;
 using System.Linq.Expressions;
+using System.Reflection;
 
 namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
 {
@@ -39,6 +40,11 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   /// </summary>
   internal class MySQLJsonArrayIndexExpression : SqlExpression, IEquatable<MySQLJsonArrayIndexExpression>
   {
+
+#if NET9_0
+    private static ConstructorInfo? _quotingConstructor;
+#endif
+
     [NotNull]
     public virtual SqlExpression Expression { get; }
 
@@ -54,6 +60,14 @@ public MySQLJsonArrayIndexExpression(
     protected override Expression VisitChildren(ExpressionVisitor visitor)
       => Update((SqlExpression)visitor.Visit(Expression));
 
+#if NET9_0
+    public override Expression Quote() => New(
+    _quotingConstructor ??= typeof(MySQLJsonArrayIndexExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
+    Expression.Quote(),
+    Constant(Type),
+    RelationalExpressionQuotingUtilities.QuoteTypeMapping(TypeMapping));
+#endif
+
     public virtual MySQLJsonArrayIndexExpression Update(
       [NotNull] SqlExpression expression)
       => expression == Expression
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs
index f073a4194..e3b8430ac 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs
@@ -34,6 +34,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 
 namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
 {
@@ -42,6 +43,10 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   /// </summary>
   internal class MySQLJsonTraversalExpression : SqlExpression, IEquatable<MySQLJsonTraversalExpression>
   {
+
+#if NET9_0
+    private static ConstructorInfo? _quotingConstructor;
+#endif
     /// <summary>
     /// The JSON column.
     /// </summary>
@@ -91,6 +96,15 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
     => Update((SqlExpression)visitor.Visit(Expression),
       Path.Select(p => (SqlExpression)visitor.Visit(p)).ToArray());
 
+#if NET9_0
+    public override Expression Quote() => New(
+    _quotingConstructor ??= typeof(MySQLJsonTraversalExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
+    Expression.Quote(),
+    Constant(ReturnsText),
+    Constant(Type),
+    RelationalExpressionQuotingUtilities.QuoteTypeMapping(TypeMapping));
+#endif
+
     public virtual MySQLJsonTraversalExpression Update(
     [NotNull] SqlExpression expression,
     [NotNull] IReadOnlyList<SqlExpression> path)
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs
index 6469189c7..e90f336a8 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs
@@ -33,11 +33,17 @@
 using MySql.EntityFrameworkCore.Utils;
 using System;
 using System.Linq.Expressions;
+using System.Reflection;
 
 namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
 {
   internal class MySQLMatchExpression : SqlExpression
   {
+
+#if NET9_0
+    private static ConstructorInfo? _quotingConstructor;
+#endif
+
     public MySQLMatchExpression(
       SqlExpression match,
       SqlExpression against,
@@ -75,6 +81,16 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
       return Update(match, against);
     }
 
+#if NET9_0
+    public override Expression Quote() => New(
+    _quotingConstructor ??= typeof(MySQLMatchExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
+    Match.Quote(),
+    Against.Quote(),
+    Constant(SearchMode),
+    Constant(Type),
+    RelationalExpressionQuotingUtilities.QuoteTypeMapping(TypeMapping));
+#endif
+
     public virtual MySQLMatchExpression Update(SqlExpression match, SqlExpression against)
       => match != Match || against != Against
         ? new MySQLMatchExpression(
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs
index f10d3ea2e..f851e0eaa 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs
@@ -31,11 +31,17 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using MySql.EntityFrameworkCore.Utils;
 using System.Linq.Expressions;
+using System.Reflection;
 
 namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
 {
   internal class MySQLRegexpExpression : SqlExpression
   {
+
+#if NET9_0
+    private static ConstructorInfo? _quotingConstructor;
+#endif
+
     public MySQLRegexpExpression(
     [NotNull] SqlExpression match,
     [NotNull] SqlExpression pattern,
@@ -69,6 +75,15 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
       return Update(match, pattern);
     }
 
+#if NET9_0
+    public override Expression Quote() => New(
+    _quotingConstructor ??= typeof(MySQLMatchExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
+    Match.Quote(),
+    Pattern.Quote(),
+    Constant(Type),
+    RelationalExpressionQuotingUtilities.QuoteTypeMapping(TypeMapping));
+#endif
+
     public virtual MySQLRegexpExpression Update(SqlExpression match, SqlExpression pattern)
       => match != Match ||
       pattern != Pattern
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs b/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs
index 8fd775d7d..32b412960 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs
@@ -281,7 +281,7 @@ private SqlBinaryExpression MakeStartsWithExpressionImpl(
       SqlExpression prefix,
       SqlExpression? originalPrefix = null)
     {
-      return _sqlExpressionFactory.AndAlso(
+      return (SqlBinaryExpression)_sqlExpressionFactory.AndAlso(
         _sqlExpressionFactory.Like(
           target,
           _sqlExpressionFactory.ApplyDefaultTypeMapping(_sqlExpressionFactory.Function(
diff --git a/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs b/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs
index d03a3cce7..40fe8c1c6 100644
--- a/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs
+++ b/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs
@@ -100,7 +100,11 @@ public MySQLDateTimeMethodTranslator(ISqlExpressionFactory sqlExpressionFactory)
         typeof(string))
             },
             nullable: true,
+#if !NET9_0
             argumentsPropagateNullability: TrueArrays[1],
+#else
+            argumentsPropagateNullability: new[] { true, false },
+#endif
             instance!.Type,
             instance.TypeMapping);
       }
diff --git a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
index d31ef25e2..28ec64a92 100644
--- a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
+++ b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
@@ -39,6 +39,7 @@ internal class MySQLParameterBasedSqlProcessor : RelationalParameterBasedSqlProc
   {
     private readonly IMySQLOptions _options;
 
+#if !NET9_0
     public MySQLParameterBasedSqlProcessor(
       RelationalParameterBasedSqlProcessorDependencies dependencies,
       bool useRelationalNulls,
@@ -47,6 +48,16 @@ public MySQLParameterBasedSqlProcessor(
     {
       _options = options;
     }
+#else
+    public MySQLParameterBasedSqlProcessor(
+      RelationalParameterBasedSqlProcessorDependencies dependencies,
+      RelationalParameterBasedSqlProcessorParameters parameters,
+      IMySQLOptions options)
+      : base(dependencies, parameters)
+    {
+      _options = options;
+    }
+#endif
 
     /// <inheritdoc />
 #if NET6_0
@@ -62,7 +73,7 @@ protected override SelectExpression ProcessSqlNullability(
 
       return selectExpression;
     }
-#elif NET8_0_OR_GREATER
+#elif NET8_0
     protected override Expression ProcessSqlNullability(
       Expression selectExpression, IReadOnlyDictionary<string, object?> parametersValues, out bool canCache)
     {
@@ -71,6 +82,15 @@ protected override Expression ProcessSqlNullability(
 
       return new MySQLSqlNullabilityProcessor(Dependencies, UseRelationalNulls).Process(selectExpression, parametersValues, out canCache);
     }
+#elif NET9_0
+    protected override Expression ProcessSqlNullability(
+      Expression selectExpression, IReadOnlyDictionary<string, object?> parametersValues, out bool canCache)
+    {
+      Check.NotNull(selectExpression, nameof(selectExpression));
+      Check.NotNull(parametersValues, nameof(parametersValues));
+
+      return new MySQLSqlNullabilityProcessor(Dependencies, Parameters).Process(selectExpression, parametersValues, out canCache);
+    }
 #endif
   }
 }
diff --git a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs
index e99afda1d..aac4cbec9 100644
--- a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs
+++ b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs
@@ -42,7 +42,12 @@ public MySQLParameterBasedSqlProcessorFactory(RelationalParameterBasedSqlProcess
       _options = options;
     }
 
+#if NET9_0
+    public RelationalParameterBasedSqlProcessor Create(RelationalParameterBasedSqlProcessorParameters parameters)
+      => new MySQLParameterBasedSqlProcessor(_dependencies, parameters, _options);
+#else
     public virtual RelationalParameterBasedSqlProcessor Create(bool useRelationalNulls)
       => new MySQLParameterBasedSqlProcessor(_dependencies, useRelationalNulls, _options);
+#endif
   }
 }
diff --git a/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs b/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs
index bd440a1f1..048670b14 100644
--- a/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs
+++ b/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs
@@ -141,11 +141,18 @@ public MySQLCollateExpression Collate(
       string charset,
       string collation)
       => (MySQLCollateExpression)ApplyDefaultTypeMapping(
+#if NET9_0
+        new MySQLCollateExpression(
+          valueExpression,
+          collation)
+#else
         new MySQLCollateExpression(
           valueExpression,
           charset,
           collation,
-          null));
+          null)
+#endif
+          );
 
     public virtual MySQLBinaryExpression MySqlIntegerDivide(
       SqlExpression left,
@@ -287,11 +294,15 @@ private MySQLCollateExpression ApplyTypeMappingOnCollate(MySQLCollateExpression
       var inferredTypeMapping = ExpressionExtensions.InferTypeMapping(collateExpression.ValueExpression)
         ?? _typeMappingSource.FindMapping(collateExpression.ValueExpression.Type);
 
+#if NET9_0
+      return new MySQLCollateExpression(collateExpression.ValueExpression, collateExpression.Collation);
+#else
       return new MySQLCollateExpression(
         ApplyTypeMapping(collateExpression.ValueExpression, inferredTypeMapping),
         collateExpression.Charset,
         collateExpression.Collation,
         inferredTypeMapping ?? collateExpression.TypeMapping);
+#endif
     }
 
     private SqlExpression ApplyTypeMappingOnRegexp(MySQLRegexpExpression regexpExpression)
diff --git a/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs b/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs
index 936cff59f..28a37ed98 100644
--- a/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs
+++ b/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs
@@ -37,6 +37,8 @@ internal class MySQLSqlNullabilityProcessor : SqlNullabilityProcessor
   {
     private readonly ISqlExpressionFactory _sqlExpressionFactory;
 
+
+#if !NET9_0
     /// <summary>
     /// Creates a new instance of the <see cref="MySQLSqlNullabilityProcessor" />.
     /// </summary>
@@ -47,7 +49,18 @@ public MySQLSqlNullabilityProcessor(
       bool useRelationalNulls)
       : base(dependencies, useRelationalNulls)
       => _sqlExpressionFactory = dependencies.SqlExpressionFactory;
-
+#else
+    /// <summary>
+    /// Creates a new instance of the <see cref="MySQLSqlNullabilityProcessor" />.
+    /// </summary>
+    /// <param name="dependencies">Parameter object containing dependencies for this class.</param>
+    /// <param name="parameters">Parameter object containing parameters for this class.</param>
+    public MySQLSqlNullabilityProcessor(
+  RelationalParameterBasedSqlProcessorDependencies dependencies,
+  RelationalParameterBasedSqlProcessorParameters parameters)
+  : base(dependencies, parameters)
+  => _sqlExpressionFactory = dependencies.SqlExpressionFactory;
+#endif
     /// <inheritdoc />
     protected override SqlExpression VisitCustomSqlExpression(
       SqlExpression sqlExpression, bool allowOptimizedExpansion, out bool nullable)
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index 3a15f0496..7edc26f6f 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.EntityFrameworkCore.Basic.Tests Class Library</Description>
-    <TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net9.0;net6.0;net8.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFrameworkCore.Basic.Tests</AssemblyName>
     <PackageId>MySql.EntityFrameworkCore.Basic.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="9.0.0-preview.2.24128.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs
index 5e807de8e..1cbdf19c8 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs
@@ -34,6 +34,7 @@
 using MySql.EntityFrameworkCore.Infrastructure.Internal;
 using System;
 using System.Data;
+using System.Data.Common;
 
 namespace MySql.EntityFrameworkCore.Basic.Tests.Utils
 {
@@ -225,21 +226,42 @@ public static void DeleteDatabase(string name)
     public override DbContextOptionsBuilder AddProviderOptions(DbContextOptionsBuilder builder)
       => builder.UseMySQL(GetContextConnectionString<MyTestContext>());
 
+#if NET9_0
+    public virtual void Clean(DbContext context)
+      => context.Database.EnsureDeleted();
+#else
     public override void Clean(DbContext context)
       => context.Database.EnsureDeleted();
+#endif
 
-    public static MySQLTestStore Create(string name)
-      => new MySQLTestStore(name);
 
-    public static MySQLTestStore GetOrCreate(string name)
-      => new MySQLTestStore(name);
 
+#if NET9_0
+    private MySQLTestStore(string name, DbConnection connection)
+        : base(name, true, connection)
+    {
+      SslMode = true;
+      connection = new MySqlConnection(RootConnectionString);
+    }
+    public static MySQLTestStore Create(string name, DbConnection connection)
+      => new MySQLTestStore(name, connection);
+
+    public static MySQLTestStore GetOrCreate(string name, DbConnection connection)
+      => new MySQLTestStore(name, connection);
+#else
     private MySQLTestStore(string name)
     : base(name, true)
     {
       SslMode = true;
       Connection = new MySqlConnection(RootConnectionString);
     }
+
+        public static MySQLTestStore Create(string name)
+      => new MySQLTestStore(name);
+
+    public static MySQLTestStore GetOrCreate(string name)
+      => new MySQLTestStore(name);
+#endif
   }
 
   public class MySQLTestStoreFactory : RelationalTestStoreFactory
@@ -250,13 +272,25 @@ protected MySQLTestStoreFactory()
     {
     }
 
+#if NET9_0
+    public override TestStore Create(string storeName)
+        => MySQLTestStore.Create(storeName, new MySqlConnection(MySQLTestStore.RootConnectionString));
+
+    public override TestStore GetOrCreate(string storeName)
+        => MySQLTestStore.GetOrCreate(storeName, new MySqlConnection(MySQLTestStore.RootConnectionString));
+#else
     public override TestStore Create(string storeName)
         => MySQLTestStore.Create(storeName);
 
     public override TestStore GetOrCreate(string storeName)
         => MySQLTestStore.GetOrCreate(storeName);
+#endif
+
+
+
 
     public override IServiceCollection AddProviderServices(IServiceCollection serviceCollection)
         => serviceCollection.AddEntityFrameworkMySQL();
+
   }
 }
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index 83fe6a293..eaf4fc58c 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.EntityFrameworkCore.Design.Tests Class Library</Description>
-    <TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net9.0;net6.0;net8.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFrameworkCore.Design.Tests</AssemblyName>
     <PackageId>MySql.EntityFrameworkCore.Design.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
   </PropertyGroup>
   
   <ItemGroup>
@@ -42,7 +42,7 @@
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.2.24128.5" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
index 9d357b0b8..d99143584 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.EntityFrameworkCore.Migrations.Tests Class Library</Description>
-    <TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net9.0;net6.0;net8.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFrameworkCore.Migrations.Tests</AssemblyName>
     <PackageId>MySql.EntityFrameworkCore.Migrations.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index e97db2a6f..f27cf88ca 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -8,7 +8,7 @@
     <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
     <AssemblyName>MySql.Data</AssemblyName>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net9.0;net6.0;net8.0;</TargetFrameworks>
     <PackageId>MySql.Data</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageReleaseNotes>Review ReleaseNotes.txt for details.</PackageReleaseNotes>
@@ -36,7 +36,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
   </PropertyGroup>
   
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index 827d07e47..d95ee4112 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -8,7 +8,7 @@
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
-    <TargetFrameworks>net8.0;net6.0;</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net6.0;</TargetFrameworks>
     <PackageId>MySql.Data.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
   </PropertyGroup>
   
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 42f7c6eb3..3d856a042 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -8,7 +8,7 @@
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
-    <TargetFrameworks>net8.0;net6.0;</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net6.0;</TargetFrameworks>
     <PackageId>MySqlx.Data.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>
+    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
   </PropertyGroup>
   
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">

From 1e0ca06dcf2e42860cc88fbd4353c23afaa7dc28 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sat, 9 Nov 2024 19:57:27 -0700
Subject: [PATCH 44/99] WL#16654 [Remove support for .NET 6 and EF Core 6]

Change-Id: Id9478e25c63986ec147dfbf8b8120c9b64115999
---
 CHANGES                                       |   3 +-
 .../Internal/MySQLMigrationsModelDiffer.cs    |  39 +---
 EFCore/src/MySql.EntityFrameworkCore.csproj   |   7 +-
 EFCore/src/Properties/AssemblyInfo.cs         |   6 +-
 .../MySQLParameterBasedSqlProcessor.cs        |  15 +-
 EFCore/src/Update/IMySQLUpdateSqlGenerator.cs |  10 -
 .../Update/MySQLModificationCommandBatch.cs   | 147 +-------------
 EFCore/src/Update/MySQLUpdateSqlGenerator.cs  | 180 ------------------
 ...Sql.EntityFrameworkCore.Basic.Tests.csproj |   6 +-
 ...ql.EntityFrameworkCore.Design.Tests.csproj |   6 +-
 ...ntityFrameworkCore.Migrations.Tests.csproj |   2 +-
 MySQL.Data/src/MySql.Data.csproj              |   4 +-
 .../MySql.Data.Tests/MySql.Data.Tests.csproj  |   4 +-
 .../MySqlX.Data.Tests.csproj                  |   4 +-
 14 files changed, 17 insertions(+), 416 deletions(-)

diff --git a/CHANGES b/CHANGES
index b5957b9ea..8f91d1710 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
 9.2.0
 - Added support for .NET 9 and EF Core 9 GA versions (WL16638).
+- Removed support for .NET 6 and EFCore 6 (WL16654).
 
 
 9.1.0
@@ -525,4 +526,4 @@
 - Support for MySqlX.Session and NodeSession objects in new Dev API.
 - Support for Collection and Documents objects new Dev API.
 - Support for Relational tables in new Dev API.
-- Support for Transactions in new Dev API.
\ No newline at end of file
+- Support for Transactions in new Dev API.
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs b/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
index 3c02ec2ed..809da75ae 100644
--- a/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
+++ b/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
@@ -44,44 +44,7 @@ namespace MySql.EntityFrameworkCore.Migrations.Internal
   
   internal class MySQLMigrationsModelDiffer : MigrationsModelDiffer
   {
-#if NET6_0
-    public MySQLMigrationsModelDiffer(
-          [NotNull] IRelationalTypeMappingSource typeMappingSource,
-          [NotNull] IMigrationsAnnotationProvider migrationsAnnotations,
-          [NotNull] IChangeDetector changeDetector,
-          [NotNull] IUpdateAdapterFactory updateAdapterFactory,
-          [NotNull] CommandBatchPreparerDependencies commandBatchPreparerDependencies)
-          : base(
-            typeMappingSource,
-            migrationsAnnotations,
-            changeDetector,
-            updateAdapterFactory,
-            commandBatchPreparerDependencies)
-    {
-    }
-
-    protected override IEnumerable<MigrationOperation> Add(IColumn target, DiffContext diffContext, bool inline = false)
-    {
-      var _property = target.PropertyMappings.ToArray().FirstOrDefault()!.Property;
-      if (_property.FindTypeMapping() is RelationalTypeMapping storeType)
-      {
-        var valueGenerationStrategy = MySQLValueGenerationStrategyCompatibility.GetValueGenerationStrategy(MigrationsAnnotations.ForRemove(target).ToArray());
-        // Ensure that null will be set for the columns default value, if CURRENT_TIMESTAMP has been required,
-        // or when the store type of the column does not support default values at all.
-        inline = inline ||
-             (storeType.StoreTypeNameBase == "datetime" ||
-              storeType.StoreTypeNameBase == "timestamp") &&
-             (valueGenerationStrategy == MySQLValueGenerationStrategy.IdentityColumn ||
-              valueGenerationStrategy == MySQLValueGenerationStrategy.ComputedColumn) ||
-             storeType.StoreTypeNameBase.Contains("text") ||
-             storeType.StoreTypeNameBase.Contains("blob") ||
-             storeType.StoreTypeNameBase == "geometry" ||
-             storeType.StoreTypeNameBase == "json";
-      }
-      return base.Add(target, diffContext, inline);
-    }
-
-#elif NET8_0
+#if NET8_0
     public MySQLMigrationsModelDiffer(
       [NotNull] IRelationalTypeMappingSource typeMappingSource,
       [NotNull] IMigrationsAnnotationProvider migrationsAnnotations,
diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
index b2e9a5f12..4a6f45014 100644
--- a/EFCore/src/MySql.EntityFrameworkCore.csproj
+++ b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -10,7 +10,7 @@
     <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <LangVersion>13.0</LangVersion>
-    <TargetFrameworks>net9.0;net6.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFrameworkCore</AssemblyName>
     <PackageId>MySql.EntityFrameworkCore</PackageId>
     <Nullable>enable</Nullable>
@@ -34,11 +34,6 @@
     <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
   </PropertyGroup>
   
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.33" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.33" />
-  </ItemGroup>
-  
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.8" />
diff --git a/EFCore/src/Properties/AssemblyInfo.cs b/EFCore/src/Properties/AssemblyInfo.cs
index 9e1f85f5f..a831a6807 100644
--- a/EFCore/src/Properties/AssemblyInfo.cs
+++ b/EFCore/src/Properties/AssemblyInfo.cs
@@ -37,13 +37,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("MySql.EntityFrameworkCore")]
-[assembly: AssemblyDescription("MySql.EntityFrameworkCore adds support for Microsoft Entity Framework Core (EF Core) 6, 7, 8 and 9.")]
+[assembly: AssemblyDescription("MySql.EntityFrameworkCore adds support for Microsoft Entity Framework Core (EF Core) 8 and 9.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle Corporation")]
 [assembly: AssemblyProduct("MySQL Connector/NET")]
-#if NET6_0
-[assembly: AssemblyCopyright("Copyright © 2021, 2024, Oracle and/or its affiliates.")]
-#elif NET8_0
+#if NET8_0
 [assembly: AssemblyCopyright("Copyright © 2024, Oracle and/or its affiliates.")]
 #elif NET9_0
 [assembly: AssemblyCopyright("Copyright © 2024, Oracle and/or its affiliates.")]
diff --git a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
index 28ec64a92..6e0cf9b01 100644
--- a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
+++ b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
@@ -60,20 +60,7 @@ public MySQLParameterBasedSqlProcessor(
 #endif
 
     /// <inheritdoc />
-#if NET6_0
-    protected override SelectExpression ProcessSqlNullability(
-      SelectExpression selectExpression, IReadOnlyDictionary<string, object?> parametersValues, out bool canCache)
-    {
-      Check.NotNull(selectExpression, nameof(selectExpression));
-      Check.NotNull(parametersValues, nameof(parametersValues));
-
-      selectExpression = new MySQLSqlNullabilityProcessor(Dependencies, UseRelationalNulls).Process(selectExpression, parametersValues, out canCache);
-
-      selectExpression = (SelectExpression)new MySQLCompatibilityExpressionVisitor(_options).Visit(selectExpression);
-
-      return selectExpression;
-    }
-#elif NET8_0
+#if NET8_0
     protected override Expression ProcessSqlNullability(
       Expression selectExpression, IReadOnlyDictionary<string, object?> parametersValues, out bool canCache)
     {
diff --git a/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs b/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs
index 8b396ecfc..905cec451 100644
--- a/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs
+++ b/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs
@@ -34,15 +34,6 @@
 
 namespace MySql.EntityFrameworkCore.Update
 {
-#if NET6_0
-  internal interface IMySQLUpdateSqlGenerator : IUpdateSqlGenerator
-  {
-    ResultSetMapping AppendBulkInsertOperation(
-    [NotNull] StringBuilder commandStringBuilder,
-    [NotNull] IReadOnlyList<IReadOnlyModificationCommand> modificationCommands,
-    int commandPosition);
-  }
-#elif NET8_0_OR_GREATER
   /// <summary>
   ///   <para>
   ///     The service lifetime is <see cref="ServiceLifetime.Singleton" />. This means a single instance
@@ -70,6 +61,5 @@ ResultSetMapping AppendBulkInsertOperation(
       int commandPosition)
       => AppendBulkInsertOperation(commandStringBuilder, modificationCommands, commandPosition, out _);
   }
-#endif
 
 }
diff --git a/EFCore/src/Update/MySQLModificationCommandBatch.cs b/EFCore/src/Update/MySQLModificationCommandBatch.cs
index bcf6df3b9..8e238c2dd 100644
--- a/EFCore/src/Update/MySQLModificationCommandBatch.cs
+++ b/EFCore/src/Update/MySQLModificationCommandBatch.cs
@@ -49,158 +49,14 @@ internal class MySQLModificationCommandBatch : AffectedCountModificationCommandB
     private const int DefaultNetworkPacketSizeBytes = 4096;
     private const int MaxScriptLength = 65536 * DefaultNetworkPacketSizeBytes / 2;
     private const int MaxParameterCount = 2100;
-#if NET6_0
-    private const int MaxRowCount = 1000;
-    private int _parameterCount = 1; // Implicit parameter for the command text
-    private readonly int _maxBatchSize;
-    private readonly List<ModificationCommand> _bulkInsertCommands = new List<ModificationCommand>();
-    private int _commandsLeftToLengthCheck = 50;
-#elif NET8_0_OR_GREATER
     private readonly List<IReadOnlyModificationCommand> _pendingBulkInsertCommands = new();
-#endif
+
 
 
     
 
     protected new virtual IMySQLUpdateSqlGenerator UpdateSqlGenerator => (IMySQLUpdateSqlGenerator)base.UpdateSqlGenerator;
 
-#if NET6_0
-    public MySQLModificationCommandBatch(
-    [NotNull] ModificationCommandBatchFactoryDependencies dependencies,
-        int? maxBatchSize)
-        : base(dependencies)
-    {
-      if (maxBatchSize.HasValue
-        && maxBatchSize.Value <= 0)
-      {
-        throw new ArgumentOutOfRangeException(nameof(maxBatchSize), RelationalStrings.InvalidMaxBatchSize(maxBatchSize));
-      }
-
-      _maxBatchSize = Math.Min(maxBatchSize ?? int.MaxValue, MaxRowCount);
-    }
-
-    protected override bool CanAddCommand(IReadOnlyModificationCommand modificationCommand)
-    {
-      if (ModificationCommands.Count >= _maxBatchSize)
-      {
-        return false;
-      }
-
-      var additionalParameterCount = CountParameters(modificationCommand);
-
-      if (_parameterCount + additionalParameterCount >= MaxParameterCount)
-      {
-        return false;
-      }
-
-      _parameterCount += additionalParameterCount;
-      return true;
-    }
-
-    private static int CountParameters(IReadOnlyModificationCommand modificationCommand)
-    {
-      var parameterCount = 0;
-
-      foreach (var columnModification in modificationCommand.ColumnModifications)
-      {
-        if (columnModification.UseCurrentValueParameter)
-        {
-          parameterCount++;
-        }
-
-        if (columnModification.UseOriginalValueParameter)
-        {
-          parameterCount++;
-        }
-      }
-
-      return parameterCount;
-    }
-
-    /// <inheritdoc/>
-    protected override bool IsCommandTextValid()
-    {
-      if (--_commandsLeftToLengthCheck < 0)
-      {
-        var commandTextLength = GetCommandText().Length;
-        if (commandTextLength >= MaxScriptLength)
-        {
-          return false;
-        }
-
-        var averageCommandLength = commandTextLength / ModificationCommands.Count;
-        var expectedAdditionalCommandCapacity = (MaxScriptLength - commandTextLength) / averageCommandLength;
-        _commandsLeftToLengthCheck = Math.Max(1, expectedAdditionalCommandCapacity / 4);
-      }
-
-      return true;
-    }
-
-    /// <inheritdoc/>
-    protected override int GetParameterCount()
-      => _parameterCount;
-
-    /// <inheritdoc/>
-    protected override void ResetCommandText()
-    {
-      base.ResetCommandText();
-      _bulkInsertCommands.Clear();
-    }
-
-    /// <inheritdoc/>
-    protected override string GetCommandText()
-      => base.GetCommandText() + GetBulkInsertCommandText(ModificationCommands.Count);
-
-    private string GetBulkInsertCommandText(int lastIndex)
-    {
-      if (_bulkInsertCommands.Count == 0)
-      {
-        return string.Empty;
-      }
-
-      var stringBuilder = new StringBuilder();
-      var resultSetMapping = UpdateSqlGenerator.AppendBulkInsertOperation(
-        stringBuilder, _bulkInsertCommands, lastIndex - _bulkInsertCommands.Count);
-      for (var i = lastIndex - _bulkInsertCommands.Count; i < lastIndex; i++)
-      {
-        CommandResultSet[i] = resultSetMapping;
-      }
-
-      if (resultSetMapping != ResultSetMapping.NoResultSet)
-      {
-        CommandResultSet[lastIndex - 1] = ResultSetMapping.LastInResultSet;
-      }
-
-      return stringBuilder.ToString();
-    }
-
-    /// <inheritdoc/>
-    protected override void UpdateCachedCommandText(int commandPosition)
-    {
-      var newModificationCommand = ModificationCommands[commandPosition];
-      if (newModificationCommand.EntityState == EntityState.Added)
-      {
-        if (_bulkInsertCommands.Count > 0
-          && !CanBeInsertedInSameStatement(_bulkInsertCommands[0], (ModificationCommand)newModificationCommand))
-        {
-          CachedCommandText.Append(GetBulkInsertCommandText(commandPosition));
-          _bulkInsertCommands.Clear();
-        }
-
-        _bulkInsertCommands.Add((ModificationCommand)newModificationCommand);
-
-        LastCachedCommandIndex = commandPosition;
-      }
-      else
-      {
-        CachedCommandText.Append(GetBulkInsertCommandText(commandPosition));
-        _bulkInsertCommands.Clear();
-
-        base.UpdateCachedCommandText(commandPosition);
-      }
-    }
-
-#elif NET8_0_OR_GREATER
     /// <summary>
     ///   This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///   the same compatibility standards as public APIs. It may be changed or removed without notice in
@@ -322,7 +178,6 @@ public override async Task ExecuteAsync(IRelationalConnection connection, Cancel
         throw new DbUpdateException(MySQLStrings.SaveChangesFailed, e.InnerException, e.Entries);
       }
     }
-#endif
 
 
     private static bool CanBeInsertedInSameStatement(
diff --git a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
index b7e5431ec..cc01124ed 100644
--- a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
+++ b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
@@ -57,183 +57,6 @@ public MySQLUpdateSqlGenerator([NotNull] UpdateSqlGeneratorDependencies dependen
     {
     }
 
-#if NET6_0
-    public virtual ResultSetMapping AppendBulkInsertOperation(
-    StringBuilder commandStringBuilder,
-    IReadOnlyList<IReadOnlyModificationCommand> modificationCommands,
-    int commandPosition)
-    {
-      var table = StoreObjectIdentifier.Table(modificationCommands[0].TableName, modificationCommands[0].Schema);
-      if (modificationCommands.Count == 1
-        && modificationCommands[0].ColumnModifications.All(
-                   o => !o.IsKey
-                  || !o.IsRead
-                  || o.Property?.GetValueGenerationStrategy(table) == MySQLValueGenerationStrategy.IdentityColumn))
-      {
-        return AppendInsertOperation(commandStringBuilder, modificationCommands[0], commandPosition);
-      }
-
-      var readOperations = modificationCommands[0].ColumnModifications.Where(o => o.IsRead).ToList();
-      var writeOperations = modificationCommands[0].ColumnModifications.Where(o => o.IsWrite).ToList();
-      var keyOperations = modificationCommands[0].ColumnModifications.Where(o => o.IsKey).ToList();
-
-      var defaultValuesOnly = writeOperations.Count == 0;
-      var nonIdentityOperations = modificationCommands[0].ColumnModifications
-        .Where(o => o.Property?.GetValueGenerationStrategy(table) != MySQLValueGenerationStrategy.IdentityColumn)
-        .ToList();
-
-      if (defaultValuesOnly)
-      {
-        if (nonIdentityOperations.Count == 0 || readOperations.Count == 0)
-        {
-          foreach (var modification in modificationCommands)
-          {
-            AppendInsertOperation(commandStringBuilder, modification, commandPosition);
-          }
-
-          return readOperations.Count == 0
-              ? ResultSetMapping.NoResultSet
-              : ResultSetMapping.LastInResultSet;
-        }
-
-        if (nonIdentityOperations.Count > 1)
-        {
-          nonIdentityOperations = new List<IColumnModification> { nonIdentityOperations.First() };
-        }
-      }
-
-      if (readOperations.Count == 0)
-      {
-        return AppendBulkInsertWithoutServerValues(commandStringBuilder, modificationCommands, writeOperations);
-      }
-
-      foreach (var modification in modificationCommands)
-      {
-        AppendInsertOperation(commandStringBuilder, modification, commandPosition);
-      }
-
-      return ResultSetMapping.LastInResultSet;
-    }
-
-    private ResultSetMapping AppendBulkInsertWithoutServerValues(
-    StringBuilder commandStringBuilder,
-    IReadOnlyList<IReadOnlyModificationCommand> modificationCommands,
-    List<IColumnModification> writeOperations)
-    {
-      Debug.Assert(writeOperations.Count > 0);
-
-      var name = modificationCommands[0].TableName;
-      var schema = modificationCommands[0].Schema;
-
-      AppendInsertCommandHeader(commandStringBuilder, name, schema, writeOperations);
-      AppendValuesHeader(commandStringBuilder, writeOperations);
-      AppendValues(commandStringBuilder, string.Empty, null, writeOperations);
-      for (var i = 1; i < modificationCommands.Count; i++)
-      {
-        commandStringBuilder.Append(",").AppendLine();
-        AppendValues(commandStringBuilder, string.Empty, null, modificationCommands[i].ColumnModifications.Where(o => o.IsWrite).ToList());
-      }
-      commandStringBuilder.Append(SqlGenerationHelper.StatementTerminator).AppendLine();
-
-      return ResultSetMapping.NoResultSet;
-    }
-
-    protected override void AppendInsertCommandHeader(
-          [NotNull] StringBuilder commandStringBuilder,
-          [NotNull] string name,
-           string? schema,
-          [NotNull] IReadOnlyList<IColumnModification> operations)
-    {
-      Check.NotNull(commandStringBuilder, nameof(commandStringBuilder));
-      Check.NotEmpty(name, nameof(name));
-      Check.NotNull(operations, nameof(operations));
-
-      base.AppendInsertCommandHeader(commandStringBuilder, name, schema, operations);
-
-      if (operations.Count <= 0)
-      {
-        commandStringBuilder.Append(" ()");
-      }
-    }
-
-    protected override void AppendValuesHeader(
-      [NotNull] StringBuilder commandStringBuilder,
-      [NotNull] IReadOnlyList<IColumnModification> operations)
-    {
-      Check.NotNull(commandStringBuilder, nameof(commandStringBuilder));
-      Check.NotNull(operations, nameof(operations));
-
-      commandStringBuilder.AppendLine();
-      commandStringBuilder.Append("VALUES ");
-    }
-
-    protected override void AppendValues(
-          [NotNull] StringBuilder commandStringBuilder,
-          [NotNull] string name,
-            string? schema,
-          [NotNull] IReadOnlyList<IColumnModification> operations)
-    {
-      base.AppendValues(commandStringBuilder, name, schema, operations);
-
-      if (operations.Count <= 0)
-      {
-        commandStringBuilder.Append("()");
-      }
-    }
-
-    protected override void AppendIdentityWhereCondition(StringBuilder commandStringBuilder, IColumnModification columnModification)
-    {
-      Check.NotNull(columnModification, "columnModification");
-      Check.NotNull(commandStringBuilder, "commandStringBuilder");
-      commandStringBuilder.AppendFormat("{0} = LAST_INSERT_ID()", SqlGenerationHelper.DelimitIdentifier(columnModification.ColumnName));
-    }
-
-    protected override void AppendRowsAffectedWhereCondition(StringBuilder commandStringBuilder, int expectedRowsAffected)
-    {
-      Check.NotNull(commandStringBuilder, "commandStringBuilder");
-      commandStringBuilder
-        .Append("ROW_COUNT() = " + expectedRowsAffected.ToString(CultureInfo.InvariantCulture));
-    }
-
-    protected override ResultSetMapping AppendSelectAffectedCountCommand(StringBuilder commandStringBuilder, string name, string? schemaName, int commandPosition)
-    {
-      Check.NotNull(commandStringBuilder, "commandStringBuilder");
-      Check.NotEmpty(name, "name");
-
-      commandStringBuilder
-        .Append("SELECT ROW_COUNT()")
-        .Append(SqlGenerationHelper.StatementTerminator).AppendLine()
-        .AppendLine();
-
-      return ResultSetMapping.LastInResultSet;
-    }
-
-    protected override void AppendWhereAffectedClause(
-      [NotNull] StringBuilder commandStringBuilder,
-      [NotNull] IReadOnlyList<IColumnModification> operations)
-    {
-      Check.NotNull(commandStringBuilder, nameof(commandStringBuilder));
-      Check.NotNull(operations, nameof(operations));
-
-      var nonDefaultOperations = operations
-        .Where(
-            o => !o.IsKey ||
-               !o.IsRead ||
-               o.Property == null ||
-               !o.Property.ValueGenerated.HasFlag(ValueGenerated.OnAdd) ||
-               MySQLPropertyExtensions.IsCompatibleAutoIncrementColumn(o.Property))
-        .ToList()
-        .AsReadOnly();
-
-      base.AppendWhereAffectedClause(commandStringBuilder, nonDefaultOperations);
-    }
-
-    internal enum ResultsGrouping
-    {
-      OneResultSet,
-      OneCommandPerResultSet
-    }
-#elif NET8_0_OR_GREATER
     public virtual ResultSetMapping AppendBulkInsertOperation(
       StringBuilder commandStringBuilder,
       IReadOnlyList<IReadOnlyModificationCommand> modificationCommands,
@@ -585,8 +408,5 @@ private void AppendIdentityWhereCondition(StringBuilder commandStringBuilder, IC
       Check.NotNull(commandStringBuilder, "commandStringBuilder");
       commandStringBuilder.AppendFormat("{0} = LAST_INSERT_ID()", SqlGenerationHelper.DelimitIdentifier(columnModification.ColumnName));
     }
-#endif
-
-
   }
 }
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index 7edc26f6f..f406a3fb5 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.EntityFrameworkCore.Basic.Tests Class Library</Description>
-    <TargetFrameworks>net9.0;net6.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFrameworkCore.Basic.Tests</AssemblyName>
     <PackageId>MySql.EntityFrameworkCore.Basic.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -16,10 +16,6 @@
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
     <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
   </PropertyGroup>
-  
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="6.0.33" />
-  </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.8" />
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index eaf4fc58c..85a61dbc7 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.EntityFrameworkCore.Design.Tests Class Library</Description>
-    <TargetFrameworks>net9.0;net6.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFrameworkCore.Design.Tests</AssemblyName>
     <PackageId>MySql.EntityFrameworkCore.Design.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -32,10 +32,6 @@
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
-  </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
index d99143584..06039067f 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.EntityFrameworkCore.Migrations.Tests Class Library</Description>
-    <TargetFrameworks>net9.0;net6.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFrameworkCore.Migrations.Tests</AssemblyName>
     <PackageId>MySql.EntityFrameworkCore.Migrations.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index f27cf88ca..ac23dd10e 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -8,7 +8,7 @@
     <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
     <AssemblyName>MySql.Data</AssemblyName>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net9.0;net6.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net9.0;net8.0;</TargetFrameworks>
     <PackageId>MySql.Data</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageReleaseNotes>Review ReleaseNotes.txt for details.</PackageReleaseNotes>
@@ -137,4 +137,4 @@
   </ItemGroup>
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index d95ee4112..b0144ddf2 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -8,7 +8,7 @@
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
-    <TargetFrameworks>net9.0;net8.0;net6.0;</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
     <PackageId>MySql.Data.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
@@ -138,4 +138,4 @@
     </None>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 3d856a042..054e9dda3 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -8,7 +8,7 @@
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
-    <TargetFrameworks>net9.0;net8.0;net6.0;</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
     <PackageId>MySqlx.Data.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
@@ -117,4 +117,4 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

From 9bdaaaf01ce07cab78aee329bf0b9b3115905dfc Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sat, 28 Sep 2024 14:38:05 -0600
Subject: [PATCH 45/99] Bug#35240186 [Run inserts in batch command as one
 block]

Change-Id: I6ba904fe2640cc10ae497b9ca011cfee161da8d7
---
 CHANGES                                       |  1 +
 .../src/MySqlConnectionStringBuilder.cs       | 13 +++++
 MySQL.Data/src/Statement.cs                   |  7 ++-
 .../netstandard2_0/MySqlDataAdapterTests.cs   | 52 +++++++++++++++++++
 4 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 8f91d1710..37dcf35fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 9.2.0
 - Added support for .NET 9 and EF Core 9 GA versions (WL16638).
 - Removed support for .NET 6 and EFCore 6 (WL16654).
+- Fixed bug Run inserts in batch command as one block (MySQL Bug #110553, Oracle Bug #35240186). Thanks to Sebastian Schwarzhuber for the contribution.
 
 
 9.1.0
diff --git a/MySQL.Data/src/MySqlConnectionStringBuilder.cs b/MySQL.Data/src/MySqlConnectionStringBuilder.cs
index 273da4e44..f371e6c51 100644
--- a/MySQL.Data/src/MySqlConnectionStringBuilder.cs
+++ b/MySQL.Data/src/MySqlConnectionStringBuilder.cs
@@ -211,6 +211,7 @@ static MySqlConnectionStringBuilder()
         (msb, sender, value) => { msb.SetValue("exceptioninterceptors", value); }, (msb, sender) => msb.ExceptionInterceptors));
       Options.Add(new MySqlConnectionStringOption("commandinterceptors", "command interceptors", typeof(string), null, false,
         (msb, sender, value) => { msb.SetValue("commandinterceptors", value); }, (msb, sender) => msb.CommandInterceptors));
+      Options.Add(new MySqlConnectionStringOption("rewritebatchedstatements", null, typeof(bool), false, false));
 
       #endregion
 
@@ -864,6 +865,18 @@ public string CommandInterceptors
       set { SetValue("commandinterceptors", value); }
     }
 
+    /// <summary>
+    /// Gets or sets a boolean indicating if this connection should rewrite batched statements as one block.
+    /// </summary>
+    [Category("Advanced")]
+    [DisplayName("Rewrite Batched Statements")]
+    [Description("Indicates if this connection should rewrite batched statements as one block.")]
+    public bool RewriteBatchedStatements
+    {
+      get { return (bool)values["rewritebatchedstatements"]; }
+      set { SetValue("rewritebatchedstatements", value); }
+    }
+
     /// <summary>
     /// Gets or sets the event for the WebauthN callback.
     /// </summary>
diff --git a/MySQL.Data/src/Statement.cs b/MySQL.Data/src/Statement.cs
index bdddc47b9..5e559af42 100644
--- a/MySQL.Data/src/Statement.cs
+++ b/MySQL.Data/src/Statement.cs
@@ -181,7 +181,12 @@ protected async Task BindParametersAsync(bool execAsync)
           //long originalLength = packet.Length - 4;
 
           // and attempt to stream the next command
-          string text = ResolvedCommandText;
+          string text = "";
+          if (Connection.driver.Settings.RewriteBatchedStatements)
+            text = batchedCmd.BatchableCommandText;
+          else
+            text = ResolvedCommandText;
+
           if (text.StartsWith("(", StringComparison.Ordinal))
             await packet.WriteStringNoNullAsync(", ", execAsync).ConfigureAwait(false);
           else
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
index fa7802e05..2ecdde630 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
@@ -31,6 +31,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
+using System.Net;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -722,6 +723,57 @@ public void TestBatchingInsertsMoreThanMaxPacket()
         Assert.That(dt.Rows[i]["id"], Is.EqualTo(i));
     }
 
+    /// <summary>
+    /// Bug#35240186 Contribution: Run inserts in batch command as one block
+    /// </summary>
+    [Test]
+    [TestCase(true)]
+    [TestCase(false)]
+    public void TestBatchingInsertsAllRowsInOneGo(bool rewriteStatements)
+    {
+      ExecuteSQL("CREATE TABLE Test (id INT AUTO_INCREMENT, name VARCHAR(20), PRIMARY KEY(id))");
+      ExecuteSQL("INSERT INTO Test VALUES (1, 'Test 1')");
+      using MySqlConnection conn = new MySqlConnection(Connection.ConnectionString + ";rewritebatchedstatements=" + rewriteStatements.ToString() + ";");
+      {
+        conn.Open();
+        bool testing = true;
+        Console.WriteLine(testing.ToString());
+        MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM Test", conn);
+        MySqlCommand ins = new MySqlCommand("INSERT INTO Test (id, name) VALUES (?p1, ?p2)", conn);
+        da.InsertCommand = ins;
+        ins.UpdatedRowSource = UpdateRowSource.None;
+        ins.Parameters.Add("?p1", MySqlDbType.Int32).SourceColumn = "id";
+        ins.Parameters.Add("?p2", MySqlDbType.VarChar, 20).SourceColumn = "name";
+
+        DataTable dt = new DataTable();
+        da.Fill(dt);
+
+        for (int i = 1; i <= 3; i++)
+        {
+          DataRow row = dt.NewRow();
+          row["id"] = DBNull.Value;
+          row["name"] = "name " + i;
+          dt.Rows.Add(row);
+        }
+
+        da.UpdateBatchSize = 0;
+        da.Update(dt);
+        MySqlCommand lsid = new MySqlCommand("SELECT LAST_INSERT_ID();", conn);
+        var lastInsertedId = (ulong)lsid.ExecuteScalar();
+
+        if (rewriteStatements)
+        {
+          //The batched statements are rewritten to be processed all together, that is why the last inserted ID is 2
+          Assert.That(lastInsertedId, Is.EqualTo(2));
+        }
+        else
+        {
+          //The batched statements are not rewritten, and are processed one by one, in this case the last inserted ID is 4
+          Assert.That(lastInsertedId, Is.EqualTo(4));
+        }
+      }
+    }
+
     [Test]
     public void FunctionsReturnString()
     {

From e2603d7096418a8fc68454b418d519b98aee53f6 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Tue, 10 Dec 2024 18:00:35 -0700
Subject: [PATCH 46/99] Updated LIUMS

Change-Id: I13da854f6131885ae7c25a7ed520008596ac4734
---
 LICENSE | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/LICENSE b/LICENSE
index 27bc95437..c353553f9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Licensing Information User Manual
 
-MySQL Connector/NET 9.1.0 Community
+MySQL Connector/NET 9.2.0 Community
      __________________________________________________________________
 
 Introduction
@@ -8,18 +8,18 @@ Introduction
    This License Information User Manual contains Oracle's product license
    and other licensing information, including licensing information for
    third-party software which may be included in this distribution of
-   MySQL Connector/NET 9.1.0 Community.
+   MySQL Connector/NET 9.2.0 Community.
 
-   Last updated: September 2024
+   Last updated: November 2024
 
 Licensing Information
 
-   This release of MySQL Connector/NET 9.1.0 Community is brought to you
+   This release of MySQL Connector/NET 9.2.0 Community is brought to you
    by the MySQL team at Oracle. This software is released under version 2
    of the GNU General Public License (GPLv2), as set forth below, with the
    following additional permissions:
 
-   This distribution of MySQL Connector/NET 9.1.0 Community is designed to
+   This distribution of MySQL Connector/NET 9.2.0 Community is designed to
    work with certain software (including but not limited to OpenSSL) that
    is licensed under separate terms, as designated in a particular file or
    component or in the license documentation. Without limiting your rights
@@ -1017,4 +1017,4 @@ Written Offer for Source Code
        that included the binary that is the subject of your request, or
 
     b. in the case of code licensed under the GPL v3 for as long as Oracle
-       offers spare parts or customer support for that product model.
+       offers spare parts or customer support for that product model.
\ No newline at end of file

From 78361b73395bad0f4385aa415e082dee9d7fadb6 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Tue, 10 Dec 2024 18:50:44 -0700
Subject: [PATCH 47/99] Updated copyright year

Change-Id: I6a771b844c6ac31839fd101fde71bb351181bd59
---
 EFCore/src/Properties/AssemblyInfo.cs                        | 4 ++--
 EntityFramework/src/MySql.Data.EntityFramework.csproj        | 2 +-
 EntityFramework/src/Properties/AssemblyInfo.cs               | 2 +-
 MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj | 2 +-
 MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs      | 2 +-
 MySQL.Data/src/MySql.Data.csproj                             | 2 +-
 MySQL.Data/src/Properties/AssemblyInfo.cs                    | 2 +-
 MySql.Web/src/MySql.Web.csproj                               | 2 +-
 MySql.Web/src/Properties/AssemblyInfo.cs                     | 2 +-
 README                                                       | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/EFCore/src/Properties/AssemblyInfo.cs b/EFCore/src/Properties/AssemblyInfo.cs
index a831a6807..62ca664b2 100644
--- a/EFCore/src/Properties/AssemblyInfo.cs
+++ b/EFCore/src/Properties/AssemblyInfo.cs
@@ -42,9 +42,9 @@
 [assembly: AssemblyCompany("Oracle Corporation")]
 [assembly: AssemblyProduct("MySQL Connector/NET")]
 #if NET8_0
-[assembly: AssemblyCopyright("Copyright © 2024, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2025, Oracle and/or its affiliates.")]
 #elif NET9_0
-[assembly: AssemblyCopyright("Copyright © 2024, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2025, Oracle and/or its affiliates.")]
 #endif
 [assembly: AssemblyTrademark("Oracle®, Java, MySQL, and NetSuite are registered trademarks of Oracle and/or its affiliates.")]
 [assembly: AssemblyCulture("")]
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index 7852d3988..2f85d431a 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.Data.EntityFramework</Description>
-    <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
+    <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
diff --git a/EntityFramework/src/Properties/AssemblyInfo.cs b/EntityFramework/src/Properties/AssemblyInfo.cs
index 795f53733..622e7d7a4 100644
--- a/EntityFramework/src/Properties/AssemblyInfo.cs
+++ b/EntityFramework/src/Properties/AssemblyInfo.cs
@@ -40,7 +40,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle Corporation")]
 [assembly: AssemblyProduct("MySQL Connector/NET")]
-[assembly: AssemblyCopyright("Copyright © 2008, 2024, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2008, 2025, Oracle and/or its affiliates.")]
 [assembly: AssemblyTrademark("Oracle®, Java, MySQL, and NetSuite are registered trademarks of Oracle and/or its affiliates.")]
 [assembly: AssemblyCulture("")]
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index 4d65a1c10..7d8d93231 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.Data.OpenTelemetry</Description>
-    <Copyright>Copyright © 2023, 2024, Oracle and/or its affiliates.</Copyright>
+    <Copyright>Copyright © 2023, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.2.0</Version>
     <Authors>Oracle</Authors>  
diff --git a/MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs b/MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs
index eec58f246..74ae5278a 100644
--- a/MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs
+++ b/MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs
@@ -39,7 +39,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle Corporation")]
 [assembly: AssemblyProduct("MySQL Connector/NET")]
-[assembly: AssemblyCopyright("Copyright � 2023, 2024, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright � 2023, 2025, Oracle and/or its affiliates.")]
 [assembly: AssemblyTrademark("Oracle�, Java, MySQL, and NetSuite are registered trademarks of Oracle and/or its affiliates.")]
 [assembly: AssemblyCulture("")]
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index ac23dd10e..176b7eb93 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <Description>MySql.Data.MySqlClient .Net Core Class Library</Description>
-    <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
+    <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
diff --git a/MySQL.Data/src/Properties/AssemblyInfo.cs b/MySQL.Data/src/Properties/AssemblyInfo.cs
index 1a1f691c3..04a9e1969 100644
--- a/MySQL.Data/src/Properties/AssemblyInfo.cs
+++ b/MySQL.Data/src/Properties/AssemblyInfo.cs
@@ -40,7 +40,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle Corporation")]
 [assembly: AssemblyProduct("MySQL Connector/NET")]
-[assembly: AssemblyCopyright("Copyright © 2016, 2024, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2016, 2025, Oracle and/or its affiliates.")]
 [assembly: AssemblyTrademark("Oracle®, Java, MySQL, and NetSuite are registered trademarks of Oracle and/or its affiliates.")]
 [assembly: AssemblyCulture("")]
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
diff --git a/MySql.Web/src/MySql.Web.csproj b/MySql.Web/src/MySql.Web.csproj
index e6d667f7d..1c47d1d6d 100644
--- a/MySql.Web/src/MySql.Web.csproj
+++ b/MySql.Web/src/MySql.Web.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.Web</Description>
-    <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
+    <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.2.0</Version>
     <Authors>Oracle</Authors>
diff --git a/MySql.Web/src/Properties/AssemblyInfo.cs b/MySql.Web/src/Properties/AssemblyInfo.cs
index 9f1e50067..a621f8972 100644
--- a/MySql.Web/src/Properties/AssemblyInfo.cs
+++ b/MySql.Web/src/Properties/AssemblyInfo.cs
@@ -39,7 +39,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle Corporation")]
 [assembly: AssemblyProduct("MySQL Connector/NET")]
-[assembly: AssemblyCopyright("Copyright © 2004, 2024, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2004, 2025, Oracle and/or its affiliates.")]
 [assembly: AssemblyTrademark("Oracle®, Java, MySQL, and NetSuite are registered trademarks of Oracle and/or its affiliates.")]
 [assembly: AssemblyCulture("")]
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
diff --git a/README b/README
index 7fa428330..0a47845c3 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Copyright © 2004, 2024, Oracle and/or its affiliates.
+Copyright © 2004, 2025, Oracle and/or its affiliates.
 
 This is a release of MySQL Connector/NET, Oracle's fully managed ADO .NET Driver
 for MySQL.

From 9cbfe7f9f9b2654cddc043536bfa23040d916d92 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Tue, 10 Dec 2024 19:09:44 -0700
Subject: [PATCH 48/99] Updated dependencies versions

Change-Id: Icf8f664d4049c68e03b847e71d51d1d274b678ae
---
 EFCore/src/MySql.EntityFrameworkCore.csproj                   | 4 ++--
 .../MySql.EntityFrameworkCore.Basic.Tests.csproj              | 4 +++-
 .../MySql.EntityFrameworkCore.Design.Tests.csproj             | 2 +-
 EntityFramework/src/MySql.Data.EntityFramework.csproj         | 2 +-
 .../MySql.EntityFramework.Basic.Tests.csproj                  | 2 +-
 .../MySql.EntityFramework.CodeFirst.Tests.csproj              | 2 +-
 .../MySql.EntityFramework.Migrations.Tests.csproj             | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
index 4a6f45014..98a1fb348 100644
--- a/EFCore/src/MySql.EntityFrameworkCore.csproj
+++ b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -35,8 +35,8 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.11" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index f406a3fb5..061239671 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.11" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
@@ -29,6 +29,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index 85a61dbc7..b63438b20 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -34,7 +34,7 @@
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index 2f85d431a..3bf94edc0 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -77,7 +77,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EntityFramework" Version="6.4.4" />
+    <PackageReference Include="EntityFramework" Version="6.5.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
index d9b06a899..cc5342e98 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
@@ -44,7 +44,7 @@
     <Reference Include="System.Runtime" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="EntityFramework" Version="6.4.4" />
+    <PackageReference Include="EntityFramework" Version="6.5.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
index 8695f22ac..91610f9b1 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
@@ -60,7 +60,7 @@
     <Reference Include="System.Runtime" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="EntityFramework" Version="6.4.4" />
+    <PackageReference Include="EntityFramework" Version="6.5.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
index bb23ccb6e..d880fedad 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EntityFramework" Version="6.4.4" />
+    <PackageReference Include="EntityFramework" Version="6.5.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />

From d6ccf0440074f1d74ca554d7c5ce0420d9c8e4dc Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Tue, 10 Dec 2024 21:04:35 -0700
Subject: [PATCH 49/99] Updated documentation

Change-Id: I4e8033406d20d13504a224c780a691dbd61e939d
---
 Documentation/docfx.json | 2 +-
 Documentation/index.md   | 4 ++--
 README.md                | 4 ++++
 Release Notes.txt        | 9 ++++-----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Documentation/docfx.json b/Documentation/docfx.json
index cd6e78456..349839616 100644
--- a/Documentation/docfx.json
+++ b/Documentation/docfx.json
@@ -77,7 +77,7 @@
       }
     ],
     "globalMetadata": {
-      "_appFooter": "Copyright © 2021, 2024, Oracle and/or its affiliates.",
+      "_appFooter": "Copyright © 2021, 2025, Oracle and/or its affiliates.",
       "_appLogoPath": "/images/logo.svg",
       "_appFaviconPath": "/images/favicon.ico",
       "_enableSearch": true
diff --git a/Documentation/index.md b/Documentation/index.md
index 8c681525e..2e7520959 100644
--- a/Documentation/index.md
+++ b/Documentation/index.md
@@ -1,6 +1,6 @@
 ## MySQL Connector/NET and X DevAPI
 
-MySQL Connector/NET 9.1 supports X Protocol, which enables you to use X DevAPI with the .NET language of choice to develop applications that communicate with a MySQL server functioning as a document store, relational database, or both.
+MySQL Connector/NET 9.2 supports X Protocol, which enables you to use X DevAPI with the .NET language of choice to develop applications that communicate with a MySQL server functioning as a document store, relational database, or both.
 
 To get started, review the following main classes:
 
@@ -16,7 +16,7 @@ For an introduction to X DevAPI concepts, see the [X DevAPI User Guide](https://
 
 ## MySQL Connector/NET
 
-MySQL Connector/NET 9.1 also supports the development of .NET, .NET Core and .NET Framework applications that require secure, high-performance data connectivity with MySQL through the classic protocol. It supports ADO.NET, Entity Framework and various web providers.
+MySQL Connector/NET 9.2 also supports the development of .NET, .NET Core and .NET Framework applications that require secure, high-performance data connectivity with MySQL through the classic protocol. It supports ADO.NET, Entity Framework and various web providers.
 
 To get started, review the following main classes:
 
diff --git a/README.md b/README.md
index ff4709d51..8529fdb9a 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,10 @@ From MySQL Connector/NET 9.0, the driver removes support for .NET 7 and EF Core
 
 From MySQL Connector/NET 9.1, the driver adds support for [.NET 9](https://learn.microsoft.com/en-us/dotnet/core/whats-new/dotnet-9/overview/) and [EF Core 9](https://learn.microsoft.com/en-us/ef/core/what-is-new/ef-core-9.0/whatsnew/) preview versions.
 
+From MySQL Connector/NET 9.2, the driver adds support for [.NET 9](https://learn.microsoft.com/en-us/dotnet/core/whats-new/dotnet-9/overview/) and [EF Core 9](https://learn.microsoft.com/en-us/ef/core/what-is-new/ef-core-9.0/whatsnew/) GA versions.
+
+From MySQL Connector/NET 9.2, the driver removes support for .NET 6 and EF Core 6.
+
 For detailed information please visit the official [MySQL Connector/NET documentation](https://dev.mysql.com/doc/connector-net/en/).
 
 ## Licensing
diff --git a/Release Notes.txt b/Release Notes.txt
index 8ca04ebb3..7d478a2ef 100644
--- a/Release Notes.txt	
+++ b/Release Notes.txt	
@@ -1,10 +1,9 @@
-Connector/NET 9.1 Release Notes
+Connector/NET 9.2 Release Notes
 ------------------------------------
 Welcome to the release notes for Connector/NET 9.1
 
-What's new in 9.1
+What's new in 9.2
 --------------------
 
-Connector/NET adds support for .NET 9 and EF Core 9 preview versions.
-Connector/NET adds support for OpenID Connect authentication.
-Connector/NET now uses constraint model in testsuite.
\ No newline at end of file
+Connector/NET adds support for .NET 9 and EF Core 9 GA versions.
+Connector/NET removes support for .NET6 and EFCore 6.
\ No newline at end of file

From d4519f16b1c132bcc06aed17b42075833702c429 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Fri, 6 Dec 2024 12:59:51 -0700
Subject: [PATCH 50/99] Bug#37365939 [Fix failing tests due to server changes]

Change-Id: I71571061efeeea01e3cad63aedf51223d9cc6206
---
 CHANGES                                        |  1 +
 MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 37dcf35fa..a45f32787 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 - Added support for .NET 9 and EF Core 9 GA versions (WL16638).
 - Removed support for .NET 6 and EFCore 6 (WL16654).
 - Fixed bug Run inserts in batch command as one block (MySQL Bug #110553, Oracle Bug #35240186). Thanks to Sebastian Schwarzhuber for the contribution.
+- Fixed failing tests due to server changes (Oracle Bug #37365939).
 
 
 9.1.0
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
index 500a1453e..d8d9f225b 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
@@ -1463,7 +1463,13 @@ private void AssertTlsConnection(string inputString)
     {
       string CommandText1 = "SHOW STATUS LIKE '%Ssl_cipher%';";
       string CommandText2 = "show  status like '%Ssl_version%';";
-      string cipher = "ECDHE-RSA-AES256-GCM-SHA384";
+
+      string cipher = "";
+      if (session.Version.isAtLeast(9, 2, 0))
+        cipher = "ECDHE-RSA-AES128-GCM-SHA256";
+      else
+        cipher = "ECDHE-RSA-AES256-GCM-SHA384";
+
       string tls = "TLSv1.2";
       using (var session1 = MySQLX.GetSession(inputString))
       {
@@ -1478,7 +1484,13 @@ private void AssertTlsConnection(object inputObject)
     {
       string CommandText1 = "SHOW STATUS LIKE '%Ssl_cipher%';";
       string CommandText2 = "show  status like '%Ssl_version%';";
-      string cipher = "ECDHE-RSA-AES256-GCM-SHA384";
+
+      string cipher = "";
+      if (session.Version.isAtLeast(9, 2, 0))
+        cipher = "ECDHE-RSA-AES128-GCM-SHA256";
+      else
+        cipher = "ECDHE-RSA-AES256-GCM-SHA384";
+
       string tls = "TLSv1.2";
       using (var session1 = MySQLX.GetSession(inputObject))
       {

From 569d8cfd708f962d340594b94026501e394709f9 Mon Sep 17 00:00:00 2001
From: Swati Gupta <swggupta@onigiri.regionaliad02.mysql2iad.oraclevcn.com>
Date: Thu, 12 Dec 2024 10:19:10 +0100
Subject: [PATCH 51/99] Updated the LICENSE files

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index c353553f9..bebd4dbf0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1017,4 +1017,4 @@ Written Offer for Source Code
        that included the binary that is the subject of your request, or
 
     b. in the case of code licensed under the GPL v3 for as long as Oracle
-       offers spare parts or customer support for that product model.
\ No newline at end of file
+       offers spare parts or customer support for that product model.

From 0947f6a8fc4913e39ef16dfd479a3c04cb4ad5c9 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sat, 28 Sep 2024 18:48:15 -0600
Subject: [PATCH 52/99] Bug#36624158 [Fix: MySQLUpdateSqlGenerator to inherit
 UpdateAndSelectSqlGenerator]

Change-Id: Id7fa8f0ceed6ecb42d6ef196692fedafb8ac6b2e
---
 CHANGES                                      |  1 +
 EFCore/src/Update/MySQLUpdateSqlGenerator.cs | 25 ++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index a45f32787..8da3069cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@
 - Removed support for .NET 6 and EFCore 6 (WL16654).
 - Fixed bug Run inserts in batch command as one block (MySQL Bug #110553, Oracle Bug #35240186). Thanks to Sebastian Schwarzhuber for the contribution.
 - Fixed failing tests due to server changes (Oracle Bug #37365939).
+- Fixed bug Fix: MySQLUpdateSqlGenerator to inherit UpdateAndSelectSqlGenerator (MySQL Bug #115020, Oracle Bug #36624158). Thanks to Hikari Fujioka for the contribution.
 
 
 9.1.0
diff --git a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
index cc01124ed..c095de786 100644
--- a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
+++ b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
@@ -50,13 +50,14 @@ namespace MySql.EntityFrameworkCore
   ///     This service cannot depend on services registered as <see cref="ServiceLifetime.Scoped" />.
   ///   </para>
   /// </summary>
-  internal class MySQLUpdateSqlGenerator : UpdateSqlGenerator, IMySQLUpdateSqlGenerator
+  internal class MySQLUpdateSqlGenerator : UpdateAndSelectSqlGenerator, IMySQLUpdateSqlGenerator
   {
     public MySQLUpdateSqlGenerator([NotNull] UpdateSqlGeneratorDependencies dependencies)
       : base(dependencies)
     {
     }
 
+#if NET8_0_OR_GREATER
     public virtual ResultSetMapping AppendBulkInsertOperation(
       StringBuilder commandStringBuilder,
       IReadOnlyList<IReadOnlyModificationCommand> modificationCommands,
@@ -73,7 +74,7 @@ public virtual ResultSetMapping AppendBulkInsertOperation(
       || !o.IsRead
       || o.Property?.GetValueGenerationStrategy(table) == MySQLValueGenerationStrategy.IdentityColumn))
       {
-        return AppendInsertOperation(commandStringBuilder, firstCommand, commandPosition, false, out requiresTransaction);
+        return AppendInsertOperation(commandStringBuilder, firstCommand, commandPosition, out requiresTransaction);
       }
 
       var readOperations = firstCommand.ColumnModifications.Where(o => o.IsRead).ToList();
@@ -114,7 +115,7 @@ public virtual ResultSetMapping AppendBulkInsertOperation(
 
       foreach (var modification in modificationCommands)
       {
-        AppendInsertOperation(commandStringBuilder, modification, commandPosition, false, out requiresTransaction);
+        AppendInsertOperation(commandStringBuilder, modification, commandPosition, out requiresTransaction);
       }
 
       return ResultSetMapping.LastInResultSet;
@@ -387,7 +388,7 @@ protected override void AppendReturningClause(StringBuilder commandStringBuilder
       }
     }
 
-    private void AppendRowsAffectedWhereCondition(StringBuilder commandStringBuilder, int expectedRowsAffected)
+    protected override void AppendRowsAffectedWhereCondition(StringBuilder commandStringBuilder, int expectedRowsAffected)
     {
       Check.NotNull(commandStringBuilder, "commandStringBuilder");
       commandStringBuilder
@@ -402,11 +403,25 @@ private void AppendRowsAffectedWhereCondition(StringBuilder commandStringBuilder
     protected virtual bool IsIdentityOperation(IColumnModification modification)
       => modification.IsKey && modification.IsRead;
 
-    private void AppendIdentityWhereCondition(StringBuilder commandStringBuilder, IColumnModification columnModification)
+    protected override void AppendIdentityWhereCondition(StringBuilder commandStringBuilder, IColumnModification columnModification)
     {
       Check.NotNull(columnModification, "columnModification");
       Check.NotNull(commandStringBuilder, "commandStringBuilder");
       commandStringBuilder.AppendFormat("{0} = LAST_INSERT_ID()", SqlGenerationHelper.DelimitIdentifier(columnModification.ColumnName));
     }
+
+    protected override ResultSetMapping AppendSelectAffectedCountCommand(StringBuilder commandStringBuilder, string name, string? schemaName, int commandPosition)
+    {
+      Check.NotNull(commandStringBuilder, "commandStringBuilder");
+      Check.NotEmpty(name, "name");
+
+      commandStringBuilder
+        .Append("SELECT ROW_COUNT()")
+        .Append(SqlGenerationHelper.StatementTerminator).AppendLine()
+        .AppendLine();
+
+      return ResultSetMapping.LastInResultSet;
+    }
+#endif
   }
 }

From 8f69ad3fcd1e8e07ad147a7d9862000d042a6f1a Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sat, 28 Sep 2024 18:06:01 -0600
Subject: [PATCH 53/99] Bug#36568102 [Fixed NullReferenceException]

Change-Id: I10e0aca119293e6a5e84e44bd86eff937d0b4872
---
 CHANGES                                       |  1 +
 MySQL.Data/src/MySQLActivitySource.cs         |  9 +++++---
 MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs | 11 ++++++++++
 MySQL.Data/tests/MySql.Data.Tests/TestBase.cs | 22 +++++++++++++++++++
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8da3069cc..3e8018249 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@
 - Fixed bug Run inserts in batch command as one block (MySQL Bug #110553, Oracle Bug #35240186). Thanks to Sebastian Schwarzhuber for the contribution.
 - Fixed failing tests due to server changes (Oracle Bug #37365939).
 - Fixed bug Fix: MySQLUpdateSqlGenerator to inherit UpdateAndSelectSqlGenerator (MySQL Bug #115020, Oracle Bug #36624158). Thanks to Hikari Fujioka for the contribution.
+- Fixed bug Fixed NullReferenceException (MySQL Bug #114457, Oracle Bug #36568102). Thanks to Maximilian Bienhüls for the contribution.
 
 
 9.1.0
diff --git a/MySQL.Data/src/MySQLActivitySource.cs b/MySQL.Data/src/MySQLActivitySource.cs
index d156fc6aa..15e9cc665 100644
--- a/MySQL.Data/src/MySQLActivitySource.cs
+++ b/MySQL.Data/src/MySQLActivitySource.cs
@@ -102,9 +102,12 @@ internal static Activity CommandStart(MySqlCommand command)
       var settings = command.Connection.Settings;
       var activity = Activity.Current != null ? Source.StartActivity("SQL Statement", ActivityKind.Client, Activity.Current.Context) : Source.StartActivity("SQL Statement", ActivityKind.Client);
 
-      // passing through this attribute will propagate the context into the server
-      string query_attr = $"00-{Activity.Current.Context.TraceId}-{Activity.Current.Context.SpanId}-00";
-      command.Attributes.SetAttribute("traceparent", query_attr);
+      if (Activity.Current != null)
+      {
+        // passing through this attribute will propagate the context into the server
+        string query_attr = $"00-{Activity.Current.Context.TraceId}-{Activity.Current.Context.SpanId}-00";
+        command.Attributes.SetAttribute("traceparent", query_attr);
+      }
       
       activity?.SetTag("db.system", "mysql");
       activity?.SetTag("db.name", command.Connection.Database);
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
index cc377864e..236252e08 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
@@ -179,6 +179,17 @@ public void DeleteTest()
       Assert.That(Convert.ToInt32(after_cnt), Is.EqualTo(0));
     }
 
+    #if !NETFRAMEWORK
+    [Test]
+    public void ActivityTest()
+    {
+      using var cmd = Connection.CreateCommand();
+      cmd.CommandText = "SELECT 1;";
+      using var _ = TestListener((activity) => Assert.AreEqual("u-cmdtests-0", activity.GetTagItem("db.user")));
+      cmd.ExecuteNonQuery();
+    }
+    #endif
+
     [Test]
     public void CtorTest()
     {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs b/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs
index 80de1b551..8e6894567 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs
@@ -184,6 +184,28 @@ protected virtual void Cleanup() { }
     #endregion
 
     #region Public Methods
+
+    #if !NETFRAMEWORK
+    public static ActivityListener TestListener(Action<Activity> activityCheck)
+    {
+      ActivityListener activity_listener = new ActivityListener
+      {
+        ShouldListenTo = source =>
+        {
+          return source.Name == "connector-net";
+        },
+        ActivityStopped = activity =>
+        {
+          if (activityCheck != null)
+            activityCheck(activity);
+        },
+        Sample = (ref ActivityCreationOptions<ActivityContext> options) => ActivitySamplingResult.AllData,
+      };
+      ActivitySource.AddActivityListener(activity_listener);
+      return activity_listener;
+    }
+    #endif
+
     public MySqlConnection GetConnection(bool asRoot = false)
     {
       var s = asRoot ? RootSettings : Settings;

From 501e9aa1ca535302cf81b4a42120c352ae6f5792 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Mon, 21 Oct 2024 18:17:13 -0600
Subject: [PATCH 54/99] Bug#37198051 [MySql.Data.OpenTelemetry dll has a
 version 0.0.0.0]

Change-Id: Id4ed123e7f3ebd9d3a157a48d783b48ac20986cb
---
 CHANGES                                       |  1 +
 .../src/MySQL.Data.OpenTelemetry.csproj       | 10 +---
 .../src/Properties/VersionInfo.cs             | 47 +++++++++++++++++++
 3 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs

diff --git a/CHANGES b/CHANGES
index 3e8018249..18a13783a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@
 - Fixed failing tests due to server changes (Oracle Bug #37365939).
 - Fixed bug Fix: MySQLUpdateSqlGenerator to inherit UpdateAndSelectSqlGenerator (MySQL Bug #115020, Oracle Bug #36624158). Thanks to Hikari Fujioka for the contribution.
 - Fixed bug Fixed NullReferenceException (MySQL Bug #114457, Oracle Bug #36568102). Thanks to Maximilian Bienhüls for the contribution.
+- Fixed bug MySql.Data.OpenTelemetry dll has a version 0.0.0.0 (Oracle Bug #37198051).
 
 
 9.1.0
diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index 7d8d93231..53de7c190 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -20,15 +20,7 @@
     <AssemblyOriginatorKeyFile>..\..\ConnectorNetPublicKey.snk</AssemblyOriginatorKeyFile>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Title>MySql.Data.OpenTelemetry</Title>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-    <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs b/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
new file mode 100644
index 000000000..8ee3378d9
--- /dev/null
+++ b/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
@@ -0,0 +1,47 @@
+// Copyright � 2024, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+using System.Reflection;
+using System.Resources;
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("9.2.0")]
+[assembly: AssemblyInformationalVersion("9.2.0.0")]
+[assembly: AssemblyFileVersion("9.2.0.0")]
+[assembly: NeutralResourcesLanguage("en-US")]
+

From bd2a066e56dfab3fbe8f7ccb493f5023f23d4072 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 30 Oct 2024 20:17:52 -0600
Subject: [PATCH 55/99] Bug#37240118 [Missing VersionInfo file in multiple
 projects]

Change-Id: I5ef748f28e5bc0ffc5c934949fc7b2afc121c357
---
 CHANGES                                       |  1 +
 EFCore/src/MySql.EntityFrameworkCore.csproj   | 10 +---
 EFCore/src/Properties/VersionInfo.cs          | 58 +++++++++++++++++++
 .../src/MySql.Data.EntityFramework.csproj     |  9 +--
 EntityFramework/src/Properties/VersionInfo.cs | 46 +++++++++++++++
 .../src/MySQL.Data.OpenTelemetry.csproj       |  2 +-
 MySQL.Data/src/MySql.Data.csproj              | 13 +----
 MySQL.Data/src/Properties/AssemblyInfo.cs     |  2 +-
 MySQL.Data/src/Properties/VersionInfo.cs      |  4 +-
 MySql.Web/src/MySql.Web.csproj                |  9 +--
 MySql.Web/src/Properties/VersionInfo.cs       | 46 +++++++++++++++
 11 files changed, 162 insertions(+), 38 deletions(-)
 create mode 100644 EFCore/src/Properties/VersionInfo.cs
 create mode 100644 EntityFramework/src/Properties/VersionInfo.cs
 create mode 100644 MySql.Web/src/Properties/VersionInfo.cs

diff --git a/CHANGES b/CHANGES
index 18a13783a..c9ca4f218 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@
 - Fixed bug Fix: MySQLUpdateSqlGenerator to inherit UpdateAndSelectSqlGenerator (MySQL Bug #115020, Oracle Bug #36624158). Thanks to Hikari Fujioka for the contribution.
 - Fixed bug Fixed NullReferenceException (MySQL Bug #114457, Oracle Bug #36568102). Thanks to Maximilian Bienhüls for the contribution.
 - Fixed bug MySql.Data.OpenTelemetry dll has a version 0.0.0.0 (Oracle Bug #37198051).
+- Fixed bug Missing VersionInfo file in multiple projects (Oracle Bug #37240118).
 
 
 9.1.0
diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
index 98a1fb348..4c6eb9507 100644
--- a/EFCore/src/MySql.EntityFrameworkCore.csproj
+++ b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -19,15 +19,7 @@
     <AssemblyOriginatorKeyFile>..\..\ConnectorNetPublicKey.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);CS1591;EF1001;EF9100</NoWarn>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-    <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
diff --git a/EFCore/src/Properties/VersionInfo.cs b/EFCore/src/Properties/VersionInfo.cs
new file mode 100644
index 000000000..5b4202568
--- /dev/null
+++ b/EFCore/src/Properties/VersionInfo.cs
@@ -0,0 +1,58 @@
+// Copyright © 2024, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+using System.Reflection;
+using System.Resources;
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+#if NET6_0
+[assembly: AssemblyVersion("6.0.33")]
+[assembly: AssemblyInformationalVersion("6.0.33.0+MySQL9.2.0")]
+[assembly: AssemblyFileVersion("6.0.33.0")]
+[assembly: NeutralResourcesLanguage("en-US")]
+#elif NET8_0
+[assembly: AssemblyVersion("8.0.8")]
+[assembly: AssemblyInformationalVersion("8.0.8.0+MySQL9.2.0")]
+[assembly: AssemblyFileVersion("8.0.8.0")]
+[assembly: NeutralResourcesLanguage("en-US")]
+#elif NET9_0
+[assembly: AssemblyVersion("9.0.0")]
+[assembly: AssemblyInformationalVersion("9.0.0.0-preview+MySQL9.2.0")]
+[assembly: AssemblyFileVersion("9.0.0.0")]
+[assembly: NeutralResourcesLanguage("en-US")]
+#endif
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index 3bf94edc0..a441d54d2 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -5,7 +5,7 @@
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.2.0</Version>
-    <Authors>Oracle</Authors>
+    <Authors>Oracle Corporation</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <AssemblyName>MySql.Data.EntityFramework</AssemblyName>
@@ -16,12 +16,7 @@
     <PackageProjectUrl>https://dev.mysql.com/downloads/</PackageProjectUrl>
     <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/EntityFramework/src/Properties/VersionInfo.cs b/EntityFramework/src/Properties/VersionInfo.cs
new file mode 100644
index 000000000..b56581caa
--- /dev/null
+++ b/EntityFramework/src/Properties/VersionInfo.cs
@@ -0,0 +1,46 @@
+// Copyright © 2024, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+using System.Reflection;
+using System.Resources;
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("9.2.0")]
+[assembly: AssemblyInformationalVersion("9.2.0.0")]
+[assembly: AssemblyFileVersion("9.2.0.0")]
+[assembly: NeutralResourcesLanguage("en-US")]
diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index 53de7c190..2e3a72c00 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -5,7 +5,7 @@
     <Copyright>Copyright © 2023, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.2.0</Version>
-    <Authors>Oracle</Authors>  
+    <Authors>Oracle Corporation</Authors>  
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>MySql.Data.OpenTelemetry</AssemblyName>
     <PackageId>MySql.Data.OpenTelemetry</PackageId>
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index 176b7eb93..db2a83c0a 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -6,7 +6,7 @@
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.2.0</Version>
-    <Authors>Oracle</Authors>
+    <Authors>Oracle Corporation</Authors>
     <AssemblyName>MySql.Data</AssemblyName>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net9.0;net8.0;</TargetFrameworks>
     <PackageId>MySql.Data</PackageId>
@@ -17,16 +17,7 @@
     <PackageProjectUrl>https://dev.mysql.com/downloads/</PackageProjectUrl>
     <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-    <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>..\..\ConnectorNetPublicKey.snk</AssemblyOriginatorKeyFile>
diff --git a/MySQL.Data/src/Properties/AssemblyInfo.cs b/MySQL.Data/src/Properties/AssemblyInfo.cs
index 04a9e1969..7e6823c70 100644
--- a/MySQL.Data/src/Properties/AssemblyInfo.cs
+++ b/MySQL.Data/src/Properties/AssemblyInfo.cs
@@ -36,7 +36,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("MySql.Data")]
-[assembly: AssemblyDescription("MySql.Data.EntityFramework adds support for cross-platform application deployment with the Entity Framework 6.4 version.")]
+[assembly: AssemblyDescription("MySql.Data.MySqlClient .Net Core Class Library.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle Corporation")]
 [assembly: AssemblyProduct("MySQL Connector/NET")]
diff --git a/MySQL.Data/src/Properties/VersionInfo.cs b/MySQL.Data/src/Properties/VersionInfo.cs
index 127f87162..cc8ce728f 100644
--- a/MySQL.Data/src/Properties/VersionInfo.cs
+++ b/MySQL.Data/src/Properties/VersionInfo.cs
@@ -41,6 +41,6 @@
 // by using the '*' as shown below:
 
 [assembly: AssemblyVersion("9.2.0")]
-[assembly: AssemblyInformationalVersion("9.2.0")]
-[assembly: AssemblyFileVersion("9.2.0")]
+[assembly: AssemblyInformationalVersion("9.2.0.0")]
+[assembly: AssemblyFileVersion("9.2.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/MySql.Web/src/MySql.Web.csproj b/MySql.Web/src/MySql.Web.csproj
index 1c47d1d6d..b9f420f8d 100644
--- a/MySql.Web/src/MySql.Web.csproj
+++ b/MySql.Web/src/MySql.Web.csproj
@@ -5,7 +5,7 @@
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.2.0</Version>
-    <Authors>Oracle</Authors>
+    <Authors>Oracle Corporation</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <AssemblyName>MySql.Web</AssemblyName>
@@ -16,12 +16,7 @@
     <PackageProjectUrl>https://dev.mysql.com/downloads/</PackageProjectUrl>
     <PackageLicenseExpression>GPL-2.0-only WITH Universal-FOSS-exception-1.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
diff --git a/MySql.Web/src/Properties/VersionInfo.cs b/MySql.Web/src/Properties/VersionInfo.cs
new file mode 100644
index 000000000..b56581caa
--- /dev/null
+++ b/MySql.Web/src/Properties/VersionInfo.cs
@@ -0,0 +1,46 @@
+// Copyright © 2024, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+using System.Reflection;
+using System.Resources;
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("9.2.0")]
+[assembly: AssemblyInformationalVersion("9.2.0.0")]
+[assembly: AssemblyFileVersion("9.2.0.0")]
+[assembly: NeutralResourcesLanguage("en-US")]

From cfe120eb2ad7cbfb29c898709e8f6761cc7b84d5 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Mon, 16 Dec 2024 19:19:46 -0700
Subject: [PATCH 56/99] Fixed failing test from Bug#36568102

Change-Id: If699752f120c5956a673d18272fc465b7178ae79
---
 MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
index 236252e08..86e906c86 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
@@ -185,7 +185,7 @@ public void ActivityTest()
     {
       using var cmd = Connection.CreateCommand();
       cmd.CommandText = "SELECT 1;";
-      using var _ = TestListener((activity) => Assert.AreEqual("u-cmdtests-0", activity.GetTagItem("db.user")));
+      using var _ = TestListener((activity) => Assert.AreEqual(BaseUserName+"0", activity.GetTagItem("db.user")));
       cmd.ExecuteNonQuery();
     }
     #endif

From 4ea9d7a64e6d935c8cc228112bb1fd7d5e51a6b6 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Tue, 17 Dec 2024 16:33:50 -0700
Subject: [PATCH 57/99] Corrected copyright year in multiple projects

Change-Id: If878d5934a6205a3064ef5d81194ed7eb7560e2d
---
 EFCore/src/Properties/AssemblyInfo.cs               |  6 +-----
 EFCore/src/Properties/VersionInfo.cs                | 13 ++++---------
 .../src/MySql.Data.EntityFramework.csproj           |  2 +-
 MySQL.Data/src/MySql.Data.csproj                    |  2 +-
 MySQL.Data/src/Properties/AssemblyInfo.cs           |  2 +-
 MySql.Web/src/MySql.Web.csproj                      |  2 +-
 6 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/EFCore/src/Properties/AssemblyInfo.cs b/EFCore/src/Properties/AssemblyInfo.cs
index 62ca664b2..e5565c1a9 100644
--- a/EFCore/src/Properties/AssemblyInfo.cs
+++ b/EFCore/src/Properties/AssemblyInfo.cs
@@ -41,11 +41,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle Corporation")]
 [assembly: AssemblyProduct("MySQL Connector/NET")]
-#if NET8_0
-[assembly: AssemblyCopyright("Copyright © 2025, Oracle and/or its affiliates.")]
-#elif NET9_0
-[assembly: AssemblyCopyright("Copyright © 2025, Oracle and/or its affiliates.")]
-#endif
+[assembly: AssemblyCopyright("Copyright © 2021, 2025, Oracle and/or its affiliates.")]
 [assembly: AssemblyTrademark("Oracle®, Java, MySQL, and NetSuite are registered trademarks of Oracle and/or its affiliates.")]
 [assembly: AssemblyCulture("")]
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
diff --git a/EFCore/src/Properties/VersionInfo.cs b/EFCore/src/Properties/VersionInfo.cs
index 5b4202568..e4e387204 100644
--- a/EFCore/src/Properties/VersionInfo.cs
+++ b/EFCore/src/Properties/VersionInfo.cs
@@ -40,15 +40,10 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-#if NET6_0
-[assembly: AssemblyVersion("6.0.33")]
-[assembly: AssemblyInformationalVersion("6.0.33.0+MySQL9.2.0")]
-[assembly: AssemblyFileVersion("6.0.33.0")]
-[assembly: NeutralResourcesLanguage("en-US")]
-#elif NET8_0
-[assembly: AssemblyVersion("8.0.8")]
-[assembly: AssemblyInformationalVersion("8.0.8.0+MySQL9.2.0")]
-[assembly: AssemblyFileVersion("8.0.8.0")]
+#if NET8_0
+[assembly: AssemblyVersion("8.0.11")]
+[assembly: AssemblyInformationalVersion("8.0.11.0+MySQL9.2.0")]
+[assembly: AssemblyFileVersion("8.0.11.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 #elif NET9_0
 [assembly: AssemblyVersion("9.0.0")]
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index a441d54d2..44e51da4d 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.Data.EntityFramework</Description>
-    <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
+    <Copyright>Copyright © 2008, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.2.0</Version>
     <Authors>Oracle Corporation</Authors>
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index db2a83c0a..ab3649cd1 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <Description>MySql.Data.MySqlClient .Net Core Class Library</Description>
-    <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
+    <Copyright>Copyright © 2004, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.2.0</Version>
     <Authors>Oracle Corporation</Authors>
diff --git a/MySQL.Data/src/Properties/AssemblyInfo.cs b/MySQL.Data/src/Properties/AssemblyInfo.cs
index 7e6823c70..7dcf1fca6 100644
--- a/MySQL.Data/src/Properties/AssemblyInfo.cs
+++ b/MySQL.Data/src/Properties/AssemblyInfo.cs
@@ -40,7 +40,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle Corporation")]
 [assembly: AssemblyProduct("MySQL Connector/NET")]
-[assembly: AssemblyCopyright("Copyright © 2016, 2025, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2004, 2025, Oracle and/or its affiliates.")]
 [assembly: AssemblyTrademark("Oracle®, Java, MySQL, and NetSuite are registered trademarks of Oracle and/or its affiliates.")]
 [assembly: AssemblyCulture("")]
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
diff --git a/MySql.Web/src/MySql.Web.csproj b/MySql.Web/src/MySql.Web.csproj
index b9f420f8d..9d2d86701 100644
--- a/MySql.Web/src/MySql.Web.csproj
+++ b/MySql.Web/src/MySql.Web.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.Web</Description>
-    <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
+    <Copyright>Copyright © 2004, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.2.0</Version>
     <Authors>Oracle Corporation</Authors>

From fe156f745a1e0a2488d3a4a11c4c883c749776cc Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Mon, 16 Dec 2024 17:37:31 -0700
Subject: [PATCH 58/99] Bug#36960454 [Contribution: ConcurrencyFix - Added back
 in RowCount checking]

Change-Id: Ibec9aba52784f88adaa066afab49aa6975330963
---
 CHANGES                                       |  1 +
 EFCore/src/Update/MySQLUpdateSqlGenerator.cs  |  8 +-
 .../ConcurrencyTests.cs                       | 93 ++++++++++++++++++-
 .../DbContextClasses/EFFluentAPIContexts.cs   |  4 +-
 .../DbContextClasses/EntitiesClasses.cs       |  2 +-
 5 files changed, 97 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index c9ca4f218..1721922b4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@
 - Fixed bug Fixed NullReferenceException (MySQL Bug #114457, Oracle Bug #36568102). Thanks to Maximilian Bienhüls for the contribution.
 - Fixed bug MySql.Data.OpenTelemetry dll has a version 0.0.0.0 (Oracle Bug #37198051).
 - Fixed bug Missing VersionInfo file in multiple projects (Oracle Bug #37240118).
+- Fixed bug ConcurrencyFix - Added back in RowCount checking (MySQL Bug #115853, Oracle Bug #36960454). Thanks to Ryan Kelly for the contribution.
 
 
 9.1.0
diff --git a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
index c095de786..145b8fe39 100644
--- a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
+++ b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
@@ -179,7 +179,7 @@ public virtual ResultSetMapping AppendInsertOperation(
         return AppendSelectAffectedCommand(commandStringBuilder, name, schema, readOperations, keyOperations);
       }
 
-      return readOperations.Count > 0 ? ResultSetMapping.LastInResultSet : ResultSetMapping.NoResults;
+      return AppendSelectAffectedCountCommand(commandStringBuilder, name, schema, commandPosition);
     }
 
     protected virtual void AppendInsertCommand(
@@ -223,7 +223,7 @@ public override ResultSetMapping AppendUpdateOperation(
         return AppendSelectAffectedCommand(commandStringBuilder, name, schema, readOperations, keyOperations);
       }
 
-      return ResultSetMapping.NoResults;
+      return AppendSelectAffectedCountCommand(commandStringBuilder, name, schema, commandPosition);
     }
 
     public override ResultSetMapping AppendDeleteOperation(
@@ -242,7 +242,7 @@ public override ResultSetMapping AppendDeleteOperation(
 
       AppendDeleteCommand(commandStringBuilder, name, schema, Array.Empty<IColumnModification>(), conditionOperations);
 
-      return ResultSetMapping.NoResults;
+      return AppendSelectAffectedCountCommand(commandStringBuilder, name, schema,commandPosition);
     }
 
     protected override void AppendValues(
@@ -420,7 +420,7 @@ protected override ResultSetMapping AppendSelectAffectedCountCommand(StringBuild
         .Append(SqlGenerationHelper.StatementTerminator).AppendLine()
         .AppendLine();
 
-      return ResultSetMapping.LastInResultSet;
+      return ResultSetMapping.ResultSetWithRowsAffectedOnly;
     }
 #endif
   }
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs
index a0ac73b84..8e21b9acc 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs
@@ -43,8 +43,7 @@ public class ConcurrencyTests
     public void CanHandleConcurrencyConflicts()
     {
       var serviceCollection = new ServiceCollection();
-      serviceCollection.AddEntityFrameworkMySQL()
-        .AddDbContext<ConcurrencyTestsContext>();
+      serviceCollection.AddEntityFrameworkMySQL().AddDbContext<ConcurrencyTestsContext>();
 
       var serviceProvider = serviceCollection.BuildServiceProvider();
 
@@ -53,11 +52,11 @@ public void CanHandleConcurrencyConflicts()
         context.Database.EnsureDeleted();
         context.Database.EnsureCreated();
 
-        context.People.Add(new Person { Name = "Mike Redman", SocialSecurityNumber = "SSS1229932", PhoneNumber = "565665656" });
+        context.People.Add(new Person { Name = "John Doe", PersonNumber = "3333333333", PhoneNumber = "1111111111" });
         context.SaveChanges();
 
         var person = context.People.Single(p => p.PersonId == 1);
-        person.SocialSecurityNumber = "SS15555";
+        person.PersonNumber = "4444444444";
 
         context.Database.ExecuteSqlInterpolated($"UPDATE People SET Name = 'Jane' WHERE PersonId = 1");
 
@@ -103,5 +102,91 @@ public void CanHandleConcurrencyConflicts()
         }
       }
     }
+
+    [Test]
+    public void CanHandleUpdateConcurrencyConflicts()
+    {
+      var serviceCollection = new ServiceCollection();
+      serviceCollection.AddEntityFrameworkMySQL().AddDbContext<ConcurrencyTestsContext>();
+
+      var serviceProvider = serviceCollection.BuildServiceProvider();
+
+      using (var context = serviceProvider.GetRequiredService<ConcurrencyTestsContext>())
+      {
+        context.Database.EnsureDeleted();
+        context.Database.EnsureCreated();
+
+        context.People.Add(new Person
+        { Name = "John Doe", PersonNumber = "3333333333", PhoneNumber = "1111111111" });
+        context.SaveChanges();
+
+        var updatePerson1 = context.People.Single(p => p.PersonId == 1);
+        var updatePerson2 = context.People.Single(p => p.PersonId == 1);
+
+        updatePerson1.PersonNumber = "2222222222";
+        updatePerson1.PhoneNumber = "555555555";
+
+        context.SaveChanges();
+
+        var item = context.ChangeTracker.Entries().First(x => Object.ReferenceEquals(x.Entity, updatePerson2));
+        item.OriginalValues["PersonNumber"] = "3333333333";
+        updatePerson2.PersonNumber = "44444444";
+        updatePerson2.PhoneNumber = "666666666";
+
+        TestDelegate action = () => context.SaveChanges();
+        Assert.Throws<DbUpdateConcurrencyException>(action);
+      }
+    }
+
+    [Test]
+    public void CanHandleDeleteConcurrencyConflicts()
+    {
+      var serviceCollection = new ServiceCollection();
+      serviceCollection.AddEntityFrameworkMySQL().AddDbContext<ConcurrencyTestsContext>();
+
+      var serviceProvider = serviceCollection.BuildServiceProvider();
+
+      using (var context = serviceProvider.GetRequiredService<ConcurrencyTestsContext>())
+      {
+        context.Database.EnsureDeleted();
+        context.Database.EnsureCreated();
+        context.Remove(new Person { PersonId = 2 , PersonNumber = "88888888" });
+
+        TestDelegate action = () => context.SaveChanges();
+        Assert.Throws<DbUpdateConcurrencyException>(action);
+      }
+    }
+
+    [Test]
+    public void CanHandleInsertConcurrencyConflicts()
+    {
+      var serviceCollection = new ServiceCollection();
+      serviceCollection.AddEntityFrameworkMySQL().AddDbContext<ConcurrencyTestsContext>();
+
+      var serviceProvider = serviceCollection.BuildServiceProvider();
+
+      using (var context = serviceProvider.GetRequiredService<ConcurrencyTestsContext>())
+      {
+        context.Database.EnsureDeleted();
+        context.Database.EnsureCreated();
+        context.People.Add(new Person
+        { Name = "John Doe", PersonNumber = "3333333333", PhoneNumber = "1111111111" });
+        context.SaveChanges();
+
+        var insertedPerson1 = context.People.Single(p => p.PersonId == 1);
+        insertedPerson1.PersonNumber = "1111111111";
+
+        context.SaveChanges();
+
+        var item = context.ChangeTracker.Entries().First(x => Object.ReferenceEquals(x.Entity, insertedPerson1));
+        item.OriginalValues["PersonNumber"] = "3333333333";
+
+        context.People.Add(new Person
+        { Name = "John Doe", PersonNumber = "3333333333", PhoneNumber = "1111111111" });
+
+        TestDelegate action = () => context.SaveChanges();
+        Assert.Throws<DbUpdateConcurrencyException>(action);
+      }
+    }
   }
 }
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EFFluentAPIContexts.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EFFluentAPIContexts.cs
index ad39fb4ba..33940a28c 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EFFluentAPIContexts.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EFFluentAPIContexts.cs
@@ -27,6 +27,7 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using MySql.EntityFrameworkCore.Extensions;
 using System;
@@ -151,8 +152,7 @@ public class ConcurrencyTestsContext : MyTestContext
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
       modelBuilder.Entity<Person>()
-          .Property(p => p.SocialSecurityNumber)
-          .IsConcurrencyToken();
+          .Property(p => p.PersonNumber).IsConcurrencyToken();
     }
   }
 }
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EntitiesClasses.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EntitiesClasses.cs
index 2d3214dba..863606a21 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EntitiesClasses.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EntitiesClasses.cs
@@ -165,7 +165,7 @@ public class Person
     public int PersonId { get; set; }
 
     [ConcurrencyCheck]
-    public string? SocialSecurityNumber { get; set; }
+    public string? PersonNumber { get; set; }
     public string? PhoneNumber { get; set; }
     [ConcurrencyCheck]
     public string? Name { get; set; }

From 69d346f6f2b22e8d4f7aefecb872d855003cec1d Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Fri, 10 Jan 2025 13:01:56 -0700
Subject: [PATCH 59/99] Bump up version to 9.3.0

Change-Id: I6e86a46f25df1125a3a7efb5f9d52e6257f7d1f8
---
 CHANGES                                              |  3 +++
 .../custom/partials/class.header.tmpl.partial        |  2 +-
 EFCore/src/Properties/VersionInfo.cs                 | 12 ++++++------
 .../src/MySql.Data.EntityFramework.csproj            |  2 +-
 EntityFramework/src/Properties/VersionInfo.cs        |  6 +++---
 .../MySql.EntityFramework.Basic.Tests.csproj         |  2 +-
 .../MySql.EntityFramework.CodeFirst.Tests.csproj     |  2 +-
 .../MySql.EntityFramework.Migrations.Tests.csproj    |  2 +-
 .../src/MySQL.Data.OpenTelemetry.csproj              |  2 +-
 .../src/Properties/VersionInfo.cs                    |  6 +++---
 MySQL.Data/src/MySql.Data.csproj                     |  4 ++--
 MySQL.Data/src/Properties/VersionInfo.cs             |  6 +++---
 .../tests/MySql.Data.Tests/MySql.Data.Tests.csproj   |  4 ++--
 .../tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj |  4 ++--
 MySql.Web/src/MySql.Web.csproj                       |  2 +-
 MySql.Web/src/Properties/VersionInfo.cs              |  6 +++---
 MySql.Web/tests/MySql.Web.Tests.csproj               |  2 +-
 17 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1721922b4..9b519c42d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+9.3.0
+
+
 9.2.0
 - Added support for .NET 9 and EF Core 9 GA versions (WL16638).
 - Removed support for .NET 6 and EFCore 6 (WL16654).
diff --git a/Documentation/templates/custom/partials/class.header.tmpl.partial b/Documentation/templates/custom/partials/class.header.tmpl.partial
index 2ee15b21b..15ce5e483 100644
--- a/Documentation/templates/custom/partials/class.header.tmpl.partial
+++ b/Documentation/templates/custom/partials/class.header.tmpl.partial
@@ -25,7 +25,7 @@
 {{/implements.0}}
 <h6><strong>{{__global.namespace}}</strong>: {{{namespace.specName.0.value}}}</h6>
 <h6><strong>{{__global.assembly}}</strong>: {{assemblies.0}}.dll</h6>
-<h6><strong>Version</strong>: 9.2.0</h6>
+<h6><strong>Version</strong>: 9.3.0</h6>
 <h5 id="{{id}}_syntax">{{__global.syntax}}</h5>
 <div class="codewrapper">
   <pre><code class="lang-{{_lang}} hljs">{{syntax.content.0.value}}</code></pre>
diff --git a/EFCore/src/Properties/VersionInfo.cs b/EFCore/src/Properties/VersionInfo.cs
index e4e387204..9ff731567 100644
--- a/EFCore/src/Properties/VersionInfo.cs
+++ b/EFCore/src/Properties/VersionInfo.cs
@@ -41,13 +41,13 @@
 // by using the '*' as shown below:
 
 #if NET8_0
-[assembly: AssemblyVersion("8.0.11")]
-[assembly: AssemblyInformationalVersion("8.0.11.0+MySQL9.2.0")]
-[assembly: AssemblyFileVersion("8.0.11.0")]
+[assembly: AssemblyVersion("9.3.0")]
+[assembly: AssemblyInformationalVersion("8.0.11.0+MySQL9.3.0")]
+[assembly: AssemblyFileVersion("9.3.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 #elif NET9_0
-[assembly: AssemblyVersion("9.0.0")]
-[assembly: AssemblyInformationalVersion("9.0.0.0-preview+MySQL9.2.0")]
-[assembly: AssemblyFileVersion("9.0.0.0")]
+[assembly: AssemblyVersion("9.3.0")]
+[assembly: AssemblyInformationalVersion("9.0.0.0-preview+MySQL9.3.0")]
+[assembly: AssemblyFileVersion("9.3.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 #endif
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index 44e51da4d..d5c63d0f2 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework</Description>
     <Copyright>Copyright © 2008, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.2.0</Version>
+    <Version>9.3.0</Version>
     <Authors>Oracle Corporation</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
diff --git a/EntityFramework/src/Properties/VersionInfo.cs b/EntityFramework/src/Properties/VersionInfo.cs
index b56581caa..0e0ddbb1f 100644
--- a/EntityFramework/src/Properties/VersionInfo.cs
+++ b/EntityFramework/src/Properties/VersionInfo.cs
@@ -40,7 +40,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.2.0")]
-[assembly: AssemblyInformationalVersion("9.2.0.0")]
-[assembly: AssemblyFileVersion("9.2.0.0")]
+[assembly: AssemblyVersion("9.3.0")]
+[assembly: AssemblyInformationalVersion("9.3.0.0")]
+[assembly: AssemblyFileVersion("9.3.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
index cc5342e98..92e590f7e 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.CodeFirTests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.2.0</Version>
+    <Version>9.3.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Basic.Tests</AssemblyName>
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
index 91610f9b1..ffe3918ea 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.CodeFirst.Tests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.2.0</Version>
+    <Version>9.3.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.CodeFirst.Tests</AssemblyName>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
index d880fedad..51d53f219 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.Migrations.Tests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.2.0</Version>
+    <Version>9.3.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Migrations.Tests</AssemblyName>
diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index 2e3a72c00..f84a6c2e9 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.OpenTelemetry</Description>
     <Copyright>Copyright © 2023, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.2.0</Version>
+    <Version>9.3.0</Version>
     <Authors>Oracle Corporation</Authors>  
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>MySql.Data.OpenTelemetry</AssemblyName>
diff --git a/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs b/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
index 8ee3378d9..ab8190d46 100644
--- a/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
+++ b/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
@@ -40,8 +40,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.2.0")]
-[assembly: AssemblyInformationalVersion("9.2.0.0")]
-[assembly: AssemblyFileVersion("9.2.0.0")]
+[assembly: AssemblyVersion("9.3.0")]
+[assembly: AssemblyInformationalVersion("9.3.0.0")]
+[assembly: AssemblyFileVersion("9.3.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index ab3649cd1..ad5a5506c 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -5,7 +5,7 @@
     <Description>MySql.Data.MySqlClient .Net Core Class Library</Description>
     <Copyright>Copyright © 2004, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.2.0</Version>
+    <Version>9.3.0</Version>
     <Authors>Oracle Corporation</Authors>
     <AssemblyName>MySql.Data</AssemblyName>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net9.0;net8.0;</TargetFrameworks>
@@ -128,4 +128,4 @@
   </ItemGroup>
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MySQL.Data/src/Properties/VersionInfo.cs b/MySQL.Data/src/Properties/VersionInfo.cs
index cc8ce728f..2812dd600 100644
--- a/MySQL.Data/src/Properties/VersionInfo.cs
+++ b/MySQL.Data/src/Properties/VersionInfo.cs
@@ -40,7 +40,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.2.0")]
-[assembly: AssemblyInformationalVersion("9.2.0.0")]
-[assembly: AssemblyFileVersion("9.2.0.0")]
+[assembly: AssemblyVersion("9.3.0")]
+[assembly: AssemblyInformationalVersion("9.3.0.0")]
+[assembly: AssemblyFileVersion("9.3.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index b0144ddf2..abc240e49 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -4,7 +4,7 @@
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
-    <Version>9.2.0</Version>
+    <Version>9.3.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
@@ -138,4 +138,4 @@
     </None>
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 054e9dda3..bda016d41 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -4,7 +4,7 @@
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
-    <Version>9.2.0</Version>
+    <Version>9.3.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
@@ -117,4 +117,4 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MySql.Web/src/MySql.Web.csproj b/MySql.Web/src/MySql.Web.csproj
index 9d2d86701..78ebb7da5 100644
--- a/MySql.Web/src/MySql.Web.csproj
+++ b/MySql.Web/src/MySql.Web.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Web</Description>
     <Copyright>Copyright © 2004, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.2.0</Version>
+    <Version>9.3.0</Version>
     <Authors>Oracle Corporation</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
diff --git a/MySql.Web/src/Properties/VersionInfo.cs b/MySql.Web/src/Properties/VersionInfo.cs
index b56581caa..0e0ddbb1f 100644
--- a/MySql.Web/src/Properties/VersionInfo.cs
+++ b/MySql.Web/src/Properties/VersionInfo.cs
@@ -40,7 +40,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.2.0")]
-[assembly: AssemblyInformationalVersion("9.2.0.0")]
-[assembly: AssemblyFileVersion("9.2.0.0")]
+[assembly: AssemblyVersion("9.3.0")]
+[assembly: AssemblyInformationalVersion("9.3.0.0")]
+[assembly: AssemblyFileVersion("9.3.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/MySql.Web/tests/MySql.Web.Tests.csproj b/MySql.Web/tests/MySql.Web.Tests.csproj
index 2ff8a784f..aa64682dd 100644
--- a/MySql.Web/tests/MySql.Web.Tests.csproj
+++ b/MySql.Web/tests/MySql.Web.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Web.Tests</Description>
     <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.2.0</Version>
+    <Version>9.3.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.Web.Tests</AssemblyName>

From 26e80fde1dd9092677a54ff8f5dbaabe1c59e7be Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Fri, 10 Jan 2025 14:42:08 -0700
Subject: [PATCH 60/99] Organization and cleanup

Change-Id: Ie1f7dd658933faddb6c23655653bb76a48c8e944
---
 .../src/Properties/AssemblyInfo.cs            |  6 ++--
 .../src/Properties/VersionInfo.cs             |  2 +-
 .../OpenIdConnectClientAuthentication.cs      | 30 ++++++++++++++++++-
 MySQL.Data/src/MySqlConnection.cs             |  2 +-
 MySQL.Data/src/MySqlHelper.cs                 |  2 +-
 .../src/X/Protocol/X/Protobuf/MysqlxSql.cs    |  2 +-
 MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs |  2 +-
 .../tests/MySql.Data.Tests/GlobalUsings.cs    |  5 ----
 8 files changed, 37 insertions(+), 14 deletions(-)
 delete mode 100644 MySQL.Data/tests/MySql.Data.Tests/GlobalUsings.cs

diff --git a/MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs b/MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs
index 74ae5278a..37ea42a17 100644
--- a/MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs
+++ b/MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright � 2024, Oracle and/or its affiliates.
+// Copyright © 2024, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
@@ -39,8 +39,8 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle Corporation")]
 [assembly: AssemblyProduct("MySQL Connector/NET")]
-[assembly: AssemblyCopyright("Copyright � 2023, 2025, Oracle and/or its affiliates.")]
-[assembly: AssemblyTrademark("Oracle�, Java, MySQL, and NetSuite are registered trademarks of Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2023, 2025, Oracle and/or its affiliates.")]
+[assembly: AssemblyTrademark("Oracle®, Java, MySQL, and NetSuite are registered trademarks of Oracle and/or its affiliates.")]
 [assembly: AssemblyCulture("")]
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
 [assembly: CLSCompliant(false)]
diff --git a/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs b/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
index ab8190d46..c8499687d 100644
--- a/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
+++ b/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
@@ -1,4 +1,4 @@
-// Copyright � 2024, Oracle and/or its affiliates.
+// Copyright © 2024, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/OpenIdConnectClientAuthentication.cs b/MySQL.Data/src/Authentication/OpenIdConnectClientAuthentication.cs
index ef330b3c5..44d12ecb4 100644
--- a/MySQL.Data/src/Authentication/OpenIdConnectClientAuthentication.cs
+++ b/MySQL.Data/src/Authentication/OpenIdConnectClientAuthentication.cs
@@ -1,4 +1,32 @@
-using MySql.Data.MySqlClient;
+// Copyright © 2024, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+using MySql.Data.MySqlClient;
 using MySql.Data.MySqlClient.Authentication;
 using Org.BouncyCastle.Utilities.Encoders;
 using System;
diff --git a/MySQL.Data/src/MySqlConnection.cs b/MySQL.Data/src/MySqlConnection.cs
index 8deb192e8..4f633f83b 100644
--- a/MySQL.Data/src/MySqlConnection.cs
+++ b/MySQL.Data/src/MySqlConnection.cs
@@ -1,4 +1,4 @@
-// Copyright � 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2024, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlHelper.cs b/MySQL.Data/src/MySqlHelper.cs
index 9bf4518a6..052ba4e6b 100644
--- a/MySQL.Data/src/MySqlHelper.cs
+++ b/MySQL.Data/src/MySqlHelper.cs
@@ -1,4 +1,4 @@
-// Copyright � 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2024, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs
index 62320a573..db509cb32 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs
@@ -1,4 +1,4 @@
-// Copyright � 2022, 2023, Oracle and/or its affiliates.
+// Copyright © 2022, 2023, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
index 86e906c86..171d6630e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
@@ -185,7 +185,7 @@ public void ActivityTest()
     {
       using var cmd = Connection.CreateCommand();
       cmd.CommandText = "SELECT 1;";
-      using var _ = TestListener((activity) => Assert.AreEqual(BaseUserName+"0", activity.GetTagItem("db.user")));
+      using var _ = TestListener((activity) => Assert.That(BaseUserName+"0", Is.EqualTo(activity.GetTagItem("db.user"))));
       cmd.ExecuteNonQuery();
     }
     #endif
diff --git a/MySQL.Data/tests/MySql.Data.Tests/GlobalUsings.cs b/MySQL.Data/tests/MySql.Data.Tests/GlobalUsings.cs
deleted file mode 100644
index 575c7cfd0..000000000
--- a/MySQL.Data/tests/MySql.Data.Tests/GlobalUsings.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-global using Assert = NUnit.Framework.Legacy.ClassicAssert;
-global using CollectionAssert = NUnit.Framework.Legacy.CollectionAssert;
-global using StringAssert = NUnit.Framework.Legacy.StringAssert;
-global using DirectoryAssert = NUnit.Framework.Legacy.DirectoryAssert;
-global using FileAssert = NUnit.Framework.Legacy.FileAssert;

From e31297cabf23c7941bc2ed22a3ed4124f51ca8fe Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipe.silva@oracle.com>
Date: Sat, 11 Jan 2025 01:55:39 +0000
Subject: [PATCH 61/99] Fix enconding in a few files

Change-Id: I185779410605b1a08a842f7eae0beb5be26a1d8a
---
 .../Properties/sakila-data.sql                                  | 2 +-
 .../Properties/sakila-schema.sql                                | 2 +-
 MySQL.Data/src/MySqlCommand.cs                                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-data.sql b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-data.sql
index fcb99f2f6..e9d80306c 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-data.sql
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-data.sql
@@ -1,7 +1,7 @@
 -- Sakila Sample Database Data
 -- Version 1.0
 
--- Copyright � 2006, 2024, Oracle and/or its affiliates. 
+-- Copyright © 2006, 2024, Oracle and/or its affiliates. 
 
 -- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-schema.sql b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-schema.sql
index f25502e95..2d4ee1027 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-schema.sql
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-schema.sql
@@ -1,7 +1,7 @@
 -- Sakila Sample Database Schema
 -- Version 1.0
 
--- Copyright � 2006, 2024, Oracle and/or its affiliates. 
+-- Copyright © 2006, 2024, Oracle and/or its affiliates. 
 
 -- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
diff --git a/MySQL.Data/src/MySqlCommand.cs b/MySQL.Data/src/MySqlCommand.cs
index 925229172..9d389fb70 100644
--- a/MySQL.Data/src/MySqlCommand.cs
+++ b/MySQL.Data/src/MySqlCommand.cs
@@ -1,4 +1,4 @@
-// Copyright � 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2024, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as

From a8809a89122effe18432953e9d4b438e55015195 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipe.silva@oracle.com>
Date: Sat, 11 Jan 2025 02:08:05 +0000
Subject: [PATCH 62/99] Copyright header year bump

Change-Id: I73f7149c0bb0c14efeedbf2db48f6483cfae1d6b
---
 Documentation/docfx.json                                      | 2 +-
 EFCore/src/DataAnnotations/MySQLCharsetAttribute.cs           | 2 +-
 EFCore/src/DataAnnotations/MySQLCollationAttribute.cs         | 2 +-
 EFCore/src/Design/Internal/MySQLAnnotationCodeGenerator.cs    | 2 +-
 EFCore/src/Design/Internal/MySQLDesignTimeServices.cs         | 2 +-
 EFCore/src/Diagnostics/Internal/MySQLLoggingDefinitions.cs    | 2 +-
 EFCore/src/Diagnostics/MySQLEventId.cs                        | 2 +-
 EFCore/src/Extensions/MySQLDatabaseFacadeExtensions.cs        | 2 +-
 EFCore/src/Extensions/MySQLDbContextOptionsExtensions.cs      | 2 +-
 EFCore/src/Extensions/MySQLDbFunctionsEnums.cs                | 2 +-
 EFCore/src/Extensions/MySQLDbFunctionsExtensions.cs           | 2 +-
 EFCore/src/Extensions/MySQLEntityTypeBuilderExtensions.cs     | 2 +-
 EFCore/src/Extensions/MySQLEntityTypeExtensions.cs            | 2 +-
 EFCore/src/Extensions/MySQLIndexExtensions.cs                 | 2 +-
 EFCore/src/Extensions/MySQLKeyBuilderExtensions.cs            | 2 +-
 EFCore/src/Extensions/MySQLKeyExtensions.cs                   | 2 +-
 EFCore/src/Extensions/MySQLMigrationBuilderExtensions.cs      | 2 +-
 EFCore/src/Extensions/MySQLModelBuilderExtensions.cs          | 2 +-
 EFCore/src/Extensions/MySQLModelExtensions.cs                 | 2 +-
 EFCore/src/Extensions/MySQLPropertyBuilderExtensions.cs       | 2 +-
 EFCore/src/Extensions/MySQLPropertyExtensions.cs              | 2 +-
 EFCore/src/Extensions/MySQLServiceCollectionExtensions.cs     | 2 +-
 EFCore/src/Extensions/MySQLTypeBaseExtensions.cs              | 2 +-
 EFCore/src/Extensions/MySqlIndexBuilderExtensions.cs          | 2 +-
 EFCore/src/Infrastructure/Internal/IMySQLOptions.cs           | 2 +-
 EFCore/src/Infrastructure/Internal/MySQLOptionsExtension.cs   | 2 +-
 EFCore/src/Infrastructure/MySQLDbContextOptionsBuilder.cs     | 2 +-
 EFCore/src/Infrastructure/MySQLSchemaBehavior.cs              | 2 +-
 EFCore/src/Internal/MySQLModelValidator.cs                    | 2 +-
 EFCore/src/Internal/MySQLOptions.cs                           | 2 +-
 EFCore/src/Internal/MySQLRetryingExecutionStrategy.cs         | 2 +-
 .../src/Internal/MySQLValueGenerationStrategyCompatibility.cs | 2 +-
 EFCore/src/Metadata/Conventions/MySQLConventionSetBuilder.cs  | 2 +-
 .../Metadata/Conventions/MySQLValueGenerationConvention.cs    | 2 +-
 .../Metadata/Conventions/MySqlCharsetAttributeConvention.cs   | 2 +-
 .../Metadata/Conventions/MySqlCollationAttributeConvention.cs | 2 +-
 .../Conventions/MySqlEntityCharsetAttributeConvention.cs      | 2 +-
 .../Conventions/MySqlEntityCollationAttributeConvention.cs    | 2 +-
 EFCore/src/Metadata/Internal/MySQLAnnotationNames.cs          | 2 +-
 EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs       | 2 +-
 EFCore/src/Metadata/MySQLValueGenerationStrategy.cs           | 2 +-
 EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs      | 2 +-
 .../src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs   | 2 +-
 EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs  | 2 +-
 EFCore/src/Migrations/Internal/MySQLMigrator.cs               | 2 +-
 EFCore/src/Migrations/MySQLMigrationsSqlGenerator.cs          | 2 +-
 EFCore/src/Migrations/Operations/CreateDatabaseOperation.cs   | 2 +-
 EFCore/src/Migrations/Operations/DropDatabaseOperation.cs     | 2 +-
 .../MySQLDropPrimaryKeyAndRecreateForeignKeysOperation.cs     | 2 +-
 ...ySQLDropUniqueConstraintAndRecreateForeignKeysOperation.cs | 2 +-
 EFCore/src/Properties/AssemblyInfo.cs                         | 2 +-
 EFCore/src/Properties/VersionInfo.cs                          | 2 +-
 .../Internal/MySQLByteArrayMethodTranslator.cs                | 2 +-
 .../Internal/MySQLDbFunctionsExtensionsMethodTranslator.cs    | 2 +-
 .../Internal/MySQLRegexIsMatchTranslator.cs                   | 2 +-
 .../Internal/MySQLStringLengthTranslator.cs                   | 2 +-
 .../src/Query/Expressions/Internal/MySQLBinaryExpression.cs   | 2 +-
 .../src/Query/Expressions/Internal/MySQLCollateExpression.cs  | 2 +-
 .../Internal/MySQLColumnAliasReferenceExpression.cs           | 2 +-
 .../Internal/MySQLComplexFunctionArgumentExpression.cs        | 2 +-
 .../Expressions/Internal/MySQLJsonArrayIndexExpression.cs     | 2 +-
 .../Expressions/Internal/MySQLJsonTraversalExpression.cs      | 2 +-
 EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs | 2 +-
 .../src/Query/Expressions/Internal/MySQLRegexpExpression.cs   | 2 +-
 .../Internal/MySQLStringComparisonMethodTranslator.cs         | 2 +-
 EFCore/src/Query/Internal/MySQLCommandParser.cs               | 2 +-
 .../src/Query/Internal/MySQLCompatibilityExpressionVisitor.cs | 2 +-
 .../src/Query/Internal/MySQLCompiledQueryCacheKeyGenerator.cs | 2 +-
 EFCore/src/Query/Internal/MySQLConvertTranslator.cs           | 2 +-
 EFCore/src/Query/Internal/MySQLDateDiffFunctionsTranslator.cs | 2 +-
 EFCore/src/Query/Internal/MySQLDateTimeMemberTranslator.cs    | 2 +-
 EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs    | 2 +-
 EFCore/src/Query/Internal/MySQLEvaluatableExpressionFilter.cs | 2 +-
 EFCore/src/Query/Internal/MySQLMathTranslator.cs              | 2 +-
 EFCore/src/Query/Internal/MySQLMemberTranslatorProvider.cs    | 2 +-
 .../src/Query/Internal/MySQLMethodCallTranslatorProvider.cs   | 2 +-
 EFCore/src/Query/Internal/MySQLNewGuidTranslator.cs           | 2 +-
 EFCore/src/Query/Internal/MySQLObjectToStringTranslator.cs    | 2 +-
 EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs  | 2 +-
 .../Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs  | 2 +-
 EFCore/src/Query/Internal/MySQLQueryCompilationContext.cs     | 2 +-
 .../src/Query/Internal/MySQLQueryCompilationContextFactory.cs | 2 +-
 EFCore/src/Query/Internal/MySQLQueryStringFactory.cs          | 2 +-
 .../src/Query/Internal/MySQLQueryTranslationPostprocessor.cs  | 2 +-
 .../Internal/MySQLQueryTranslationPostprocessorFactory.cs     | 2 +-
 EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs        | 2 +-
 EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs     | 2 +-
 .../Query/Internal/MySQLSqlTranslatingExpressionVisitor.cs    | 2 +-
 .../Internal/MySQLSqlTranslatingExpressionVisitorFactory.cs   | 2 +-
 EFCore/src/Query/Internal/MySQLStringMemberTranslator.cs      | 2 +-
 EFCore/src/Query/Internal/MySQLStringMethodTranslator.cs      | 2 +-
 EFCore/src/Query/MySQLJsonString.cs                           | 2 +-
 EFCore/src/Query/Sql/Internal/MySQLQueryGeneratorFactory.cs   | 2 +-
 EFCore/src/Query/Sql/Internal/MySQLQuerySqlGenerator.cs       | 2 +-
 EFCore/src/Scaffolding/Internal/MySQLCodeGenerator.cs         | 2 +-
 EFCore/src/Scaffolding/Internal/MySQLDataReaderExtension.cs   | 2 +-
 EFCore/src/Scaffolding/Internal/MySQLDatabaseModelFactory.cs  | 2 +-
 EFCore/src/Storage/Internal/ByteArrayComparer.cs              | 2 +-
 EFCore/src/Storage/Internal/BytesToDateTimeConverter.cs       | 2 +-
 EFCore/src/Storage/Internal/IMySQLRelationalConnection.cs     | 2 +-
 EFCore/src/Storage/Internal/MySQLBoolTypeMapping.cs           | 2 +-
 EFCore/src/Storage/Internal/MySQLByteArrayTypeMapping.cs      | 2 +-
 EFCore/src/Storage/Internal/MySQLDatabaseCreator.cs           | 2 +-
 EFCore/src/Storage/Internal/MySQLDateTimeOffsetTypeMapping.cs | 2 +-
 EFCore/src/Storage/Internal/MySQLDateTypeMapping.cs           | 2 +-
 EFCore/src/Storage/Internal/MySQLDatetimeTypeMapping.cs       | 2 +-
 EFCore/src/Storage/Internal/MySQLDecimalTypeMapping.cs        | 2 +-
 EFCore/src/Storage/Internal/MySQLDoubleTypeMapping.cs         | 2 +-
 EFCore/src/Storage/Internal/MySQLExecutionStrategy.cs         | 2 +-
 EFCore/src/Storage/Internal/MySQLExecutionStrategyFactory.cs  | 2 +-
 EFCore/src/Storage/Internal/MySQLFloatTypeMapping.cs          | 2 +-
 EFCore/src/Storage/Internal/MySQLGeometryTypeMapping.cs       | 2 +-
 EFCore/src/Storage/Internal/MySQLGuidTypeMapping.cs           | 2 +-
 EFCore/src/Storage/Internal/MySQLJsonChangeTrackingOptions.cs | 2 +-
 EFCore/src/Storage/Internal/MySQLJsonTypeMapping.cs           | 2 +-
 EFCore/src/Storage/Internal/MySQLRelationalConnection.cs      | 2 +-
 .../Storage/Internal/MySQLScaffoldingConnectionSettings.cs    | 2 +-
 EFCore/src/Storage/Internal/MySQLSqlGenerationHelper.cs       | 2 +-
 EFCore/src/Storage/Internal/MySQLStringTypeMapping.cs         | 2 +-
 EFCore/src/Storage/Internal/MySQLTimeSpanMapping.cs           | 2 +-
 .../src/Storage/Internal/MySQLTransientExceptionDetector.cs   | 2 +-
 EFCore/src/Storage/Internal/MySQLTypeMapping.cs               | 2 +-
 EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs         | 2 +-
 EFCore/src/Update/IMySQLUpdateSqlGenerator.cs                 | 2 +-
 EFCore/src/Update/MySQLModificationCommandBatch.cs            | 2 +-
 EFCore/src/Update/MySQLModificationCommandBatchFactory.cs     | 2 +-
 EFCore/src/Update/MySQLUpdateSqlGenerator.cs                  | 2 +-
 EFCore/src/Utils/Check.cs                                     | 2 +-
 EFCore/src/Utils/CodeAnnotations.cs                           | 2 +-
 EFCore/src/Utils/CodeAttributes.cs                            | 2 +-
 EFCore/src/Utils/SharedTypeExtensions.cs                      | 2 +-
 EFCore/src/Utils/Static.cs                                    | 2 +-
 EFCore/src/Utils/StringBuilderExtensions.cs                   | 2 +-
 .../ValueGeneration/Internal/MySQLValueGeneratorSelector.cs   | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs       | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs     | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs      | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs            | 2 +-
 .../DbContextClasses/ConventionsContexts.cs                   | 2 +-
 .../DbContextClasses/EFFluentAPIContexts.cs                   | 2 +-
 .../DbContextClasses/EntitiesClasses.cs                       | 2 +-
 .../DbContextClasses/SakilaLiteContext.cs                     | 2 +-
 .../DbContextClasses/TestsContexts.cs                         | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs          | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs       | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/FunctionalTests.cs      | 2 +-
 .../tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/ModelingTests.cs        | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/MultiSchemaTests.cs     | 2 +-
 .../tests/MySql.EFCore.Basic.Tests/MySQLDatabaseFacadeTest.cs | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs | 2 +-
 .../MySql.EFCore.Basic.Tests/Properties/DatabaseSetup.sql     | 2 +-
 .../tests/MySql.EFCore.Basic.Tests/ShadowPropertiesTests.cs   | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/UpdateTests.cs          | 2 +-
 .../MySql.EFCore.Basic.Tests/Utils/EntityTestsFixtureClass.cs | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs | 2 +-
 EFCore/tests/MySql.EFCore.Basic.Tests/Utils/TestUtils.cs      | 2 +-
 EFCore/tests/MySql.EFCore.Design.Tests/Extensions.cs          | 2 +-
 .../MySQLAnnotationCodeGeneratorTest.cs                       | 2 +-
 .../tests/MySql.EFCore.Design.Tests/MySQLCodeGeneratorTest.cs | 2 +-
 .../MySQLDatabaseModelFactoryTest.cs                          | 2 +-
 .../MySql.EFCore.Design.Tests/MySQLDatabaseModelFixture.cs    | 2 +-
 .../MySQLDesignTimeProviderServicesTest.cs                    | 2 +-
 .../MySql.EFCore.Design.Tests/Properties/sakiladb-schema.sql  | 2 +-
 EFCore/tests/MySql.EFCore.Design.Tests/Properties/world.sql   | 2 +-
 .../MySQLHistoryRepositoryTests.cs                            | 2 +-
 .../MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs     | 2 +-
 .../MySqlMigrationsGeneratorTest.cs                           | 2 +-
 .../MySqlMigrationsGeneratorTestBase.cs                       | 2 +-
 .../MySql.EFCore.Migrations.Tests/Utilities/ContextUtils.cs   | 2 +-
 EntityFramework/src/EFMySqlCommand.cs                         | 2 +-
 EntityFramework/src/EFMySqlDataReader.cs                      | 2 +-
 EntityFramework/src/Fragments/InputFragment.cs                | 2 +-
 EntityFramework/src/Fragments/JoinFragment.cs                 | 2 +-
 EntityFramework/src/Fragments/SqlFragment.cs                  | 2 +-
 EntityFramework/src/Fragments/TableFragment.cs                | 2 +-
 EntityFramework/src/Generators/DeleteGenerator.cs             | 2 +-
 EntityFramework/src/Generators/FunctionGenerator.cs           | 2 +-
 EntityFramework/src/Generators/FunctionProcessor.cs           | 2 +-
 EntityFramework/src/Generators/InsertGenerator.cs             | 2 +-
 EntityFramework/src/Generators/Scope.cs                       | 2 +-
 EntityFramework/src/Generators/SelectGenerator.cs             | 2 +-
 EntityFramework/src/Generators/SqlGenerator.cs                | 2 +-
 EntityFramework/src/Generators/UpdateGenerator.cs             | 2 +-
 EntityFramework/src/Metadata.cs                               | 2 +-
 EntityFramework/src/MySql.Data.EntityFramework.csproj         | 2 +-
 EntityFramework/src/MySqlConnectionFactory.cs                 | 2 +-
 EntityFramework/src/MySqlDependencyResolver.cs                | 2 +-
 EntityFramework/src/MySqlEFConfiguration.cs                   | 2 +-
 EntityFramework/src/MySqlExecutionStrategy.cs                 | 2 +-
 EntityFramework/src/MySqlHistoryContext.cs                    | 2 +-
 EntityFramework/src/MySqlLogger.cs                            | 2 +-
 EntityFramework/src/MySqlMigrationSqlGenerator.cs             | 2 +-
 EntityFramework/src/MySqlSpatialDataReader.cs                 | 2 +-
 EntityFramework/src/MySqlSpatialServices.cs                   | 2 +-
 EntityFramework/src/Properties/AssemblyInfo.cs                | 2 +-
 EntityFramework/src/Properties/VersionInfo.cs                 | 2 +-
 EntityFramework/src/ProviderManifest.cs                       | 2 +-
 EntityFramework/src/ProviderServices.cs                       | 2 +-
 EntityFramework/src/Statements/DeleteStatement.cs             | 2 +-
 EntityFramework/src/Statements/InsertStatement.cs             | 2 +-
 EntityFramework/src/Statements/SelectStatement.cs             | 2 +-
 EntityFramework/src/Statements/UpdateStatement.cs             | 2 +-
 .../MySql.EntityFramework.Basic.Tests/AggregateOperators.cs   | 2 +-
 .../MySql.EntityFramework.Basic.Tests/CanonicalFunctions.cs   | 2 +-
 .../tests/MySql.EntityFramework.Basic.Tests/DataTypeTests.cs  | 2 +-
 .../MySql.EntityFramework.Basic.Tests/DatesTypesTests.cs      | 2 +-
 .../tests/MySql.EntityFramework.Basic.Tests/DefaultContext.cs | 2 +-
 .../tests/MySql.EntityFramework.Basic.Tests/DefaultFixture.cs | 2 +-
 .../tests/MySql.EntityFramework.Basic.Tests/DeleteTests.cs    | 2 +-
 .../MySql.EntityFramework.Basic.Tests/ExpressionTests.cs      | 2 +-
 .../MySql.EntityFramework.Basic.Tests/GenericListener.cs      | 2 +-
 .../tests/MySql.EntityFramework.Basic.Tests/InsertTests.cs    | 2 +-
 .../tests/MySql.EntityFramework.Basic.Tests/JoinTests.cs      | 2 +-
 .../MySql.EntityFramework.Basic.Tests.csproj                  | 4 ++--
 .../MySql.EntityFramework.Basic.Tests/OrderingAndGrouping.cs  | 2 +-
 .../tests/MySql.EntityFramework.Basic.Tests/Paging.cs         | 2 +-
 .../ProceduresAndFunctions.cs                                 | 2 +-
 .../Properties/AssemblyInfo.cs                                | 4 ++--
 .../ProviderManifestTests.cs                                  | 2 +-
 .../ProviderServicesTests.cs                                  | 2 +-
 .../MySql.EntityFramework.Basic.Tests/RelationalOperators.cs  | 2 +-
 .../MySql.EntityFramework.Basic.Tests/RestrictionOperators.cs | 2 +-
 .../MySql.EntityFramework.Basic.Tests/SchemaInformation.cs    | 2 +-
 .../tests/MySql.EntityFramework.Basic.Tests/SetOperators.cs   | 2 +-
 .../tests/MySql.EntityFramework.Basic.Tests/SimpleQuery.cs    | 2 +-
 .../tests/MySql.EntityFramework.Basic.Tests/UpdateTests.cs    | 2 +-
 .../tests/MySql.EntityFramework.Basic.Tests/Wizard.cs         | 2 +-
 .../tests/MySql.EntityFramework.CodeFirst.Tests/Blogs.cs      | 2 +-
 .../MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs | 4 ++--
 .../MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs   | 2 +-
 .../ContextForNormalFk.cs                                     | 2 +-
 .../MySql.EntityFramework.CodeFirst.Tests/ContextForString.cs | 2 +-
 .../tests/MySql.EntityFramework.CodeFirst.Tests/Dinosauria.cs | 2 +-
 .../tests/MySql.EntityFramework.CodeFirst.Tests/Movie.cs      | 2 +-
 .../MovieContextCodeBasedConfiguration.cs                     | 2 +-
 .../MySql.EntityFramework.CodeFirst.Tests.csproj              | 4 ++--
 .../MySql.EntityFramework.CodeFirst.Tests/PromotionsDB.cs     | 2 +-
 .../Properties/AssemblyInfo.cs                                | 4 ++--
 .../Properties/sakila-data.sql                                | 2 +-
 .../Properties/sakila-schema.sql                              | 2 +-
 .../SakilaModel/SakilaDb.cs                                   | 2 +-
 .../SakilaModel/actor.cs                                      | 2 +-
 .../SakilaModel/actor_info.cs                                 | 2 +-
 .../SakilaModel/address.cs                                    | 2 +-
 .../SakilaModel/category.cs                                   | 2 +-
 .../MySql.EntityFramework.CodeFirst.Tests/SakilaModel/city.cs | 2 +-
 .../SakilaModel/country.cs                                    | 2 +-
 .../SakilaModel/customer.cs                                   | 2 +-
 .../SakilaModel/customer_list.cs                              | 2 +-
 .../MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film.cs | 2 +-
 .../SakilaModel/film_actor.cs                                 | 2 +-
 .../SakilaModel/film_category.cs                              | 2 +-
 .../SakilaModel/film_list.cs                                  | 2 +-
 .../SakilaModel/film_text.cs                                  | 2 +-
 .../SakilaModel/inventory.cs                                  | 2 +-
 .../SakilaModel/language.cs                                   | 2 +-
 .../SakilaModel/nicer_but_slower_film_list.cs                 | 2 +-
 .../SakilaModel/payment.cs                                    | 2 +-
 .../SakilaModel/rental.cs                                     | 2 +-
 .../SakilaModel/sales_by_film_category.cs                     | 2 +-
 .../SakilaModel/sales_by_store.cs                             | 2 +-
 .../SakilaModel/staff.cs                                      | 2 +-
 .../SakilaModel/staff_list.cs                                 | 2 +-
 .../SakilaModel/store.cs                                      | 2 +-
 .../tests/MySql.EntityFramework.CodeFirst.Tests/Ship.cs       | 2 +-
 .../tests/MySql.EntityFramework.CodeFirst.Tests/SiteDB.cs     | 2 +-
 .../MySql.EntityFramework.CodeFirst.Tests/TransactionTests.cs | 2 +-
 .../tests/MySql.EntityFramework.CodeFirst.Tests/Vehicle.cs    | 2 +-
 .../MySql.EntityFramework.Migrations.Tests/BlogsModel.cs      | 2 +-
 .../MySql.EntityFramework.Migrations.Tests/MyConfiguration.cs | 2 +-
 .../MySql.EntityFramework.Migrations.Tests.csproj             | 4 ++--
 .../MySqlMigrationsTests.cs                                   | 2 +-
 .../Properties/AssemblyInfo.cs                                | 4 ++--
 .../SetUpMigrationsTests.cs                                   | 2 +-
 MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj  | 2 +-
 MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs       | 2 +-
 MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs        | 2 +-
 MySQL.Data.OpenTelemetry/src/TraceProviderBuilderExtension.cs | 4 ++--
 MySQL.Data/MySql.Replication.Tests/BaseTest.cs                | 2 +-
 MySQL.Data/MySql.Replication.Tests/Properties/AssemblyInfo.cs | 4 ++--
 MySQL.Data/MySql.Replication.Tests/ReplicationTest.cs         | 2 +-
 MySQL.Data/MySql.Replication.Tests/SetUp.cs                   | 2 +-
 MySQL.Data/src/Authentication/AuthenticationManager.cs        | 2 +-
 .../src/Authentication/CachingSha2AuthenticationPlugin.cs     | 2 +-
 MySQL.Data/src/Authentication/ClearPasswordPlugin.cs          | 2 +-
 MySQL.Data/src/Authentication/FIDO/FidoAssertion.cs           | 2 +-
 MySQL.Data/src/Authentication/FIDO/FidoDevice.cs              | 2 +-
 MySQL.Data/src/Authentication/FIDO/FidoDeviceInfo.cs          | 2 +-
 MySQL.Data/src/Authentication/FIDO/Native/NativeMethods.cs    | 2 +-
 MySQL.Data/src/Authentication/FIDO/Native/Structs.cs          | 2 +-
 .../src/Authentication/FIDO/Utility/ConstStringMarshaler.cs   | 2 +-
 MySQL.Data/src/Authentication/FIDO/Utility/Enums.cs           | 2 +-
 MySQL.Data/src/Authentication/FIDO/Utility/Extensions.cs      | 2 +-
 MySQL.Data/src/Authentication/FIDO/Utility/FidoExceptions.cs  | 2 +-
 MySQL.Data/src/Authentication/FIDO/Utility/Init.cs            | 2 +-
 MySQL.Data/src/Authentication/GSSAPI/Const.cs                 | 4 ++--
 MySQL.Data/src/Authentication/GSSAPI/GssContext.cs            | 2 +-
 MySQL.Data/src/Authentication/GSSAPI/GssContextFlags.cs       | 2 +-
 MySQL.Data/src/Authentication/GSSAPI/GssCredentials.cs        | 2 +-
 MySQL.Data/src/Authentication/GSSAPI/GssapiMechanism.cs       | 2 +-
 .../src/Authentication/GSSAPI/Native/GssBufferDescStruct.cs   | 2 +-
 MySQL.Data/src/Authentication/GSSAPI/Native/GssOidStruct.cs   | 2 +-
 MySQL.Data/src/Authentication/GSSAPI/Native/NativeMethods.cs  | 2 +-
 .../src/Authentication/GSSAPI/Native/NativeMethodsLinux.cs    | 2 +-
 .../src/Authentication/GSSAPI/Native/NativeMethodsWin64.cs    | 2 +-
 MySQL.Data/src/Authentication/GSSAPI/Utility/Disposable.cs    | 2 +-
 .../src/Authentication/GSSAPI/Utility/ExceptionMessages.cs    | 2 +-
 MySQL.Data/src/Authentication/GSSAPI/Utility/GssType.cs       | 2 +-
 .../src/Authentication/GSSAPI/Utility/KerberosConfig.cs       | 2 +-
 MySQL.Data/src/Authentication/GSSAPI/Utility/Pinned.cs        | 2 +-
 MySQL.Data/src/Authentication/KerberosAuthenticationPlugin.cs | 2 +-
 MySQL.Data/src/Authentication/MySQLAuthenticationPlugin.cs    | 2 +-
 MySQL.Data/src/Authentication/MySqlPemReader.cs               | 2 +-
 MySQL.Data/src/Authentication/MySqlSASLPlugin.cs              | 2 +-
 MySQL.Data/src/Authentication/NativePasswordPlugins.cs        | 2 +-
 MySQL.Data/src/Authentication/OciAuthenticationPlugin.cs      | 2 +-
 .../src/Authentication/OpenIdConnectClientAuthentication.cs   | 2 +-
 MySQL.Data/src/Authentication/SSPI/Const.cs                   | 2 +-
 MySQL.Data/src/Authentication/SSPI/NativeMethods.cs           | 2 +-
 MySQL.Data/src/Authentication/SSPI/SspiCredentials.cs         | 2 +-
 MySQL.Data/src/Authentication/SSPI/SspiSecurityContext.cs     | 2 +-
 MySQL.Data/src/Authentication/SSPI/Structs.cs                 | 2 +-
 MySQL.Data/src/Authentication/ScramBase.cs                    | 2 +-
 MySQL.Data/src/Authentication/ScramSha1Mechanism.cs           | 2 +-
 MySQL.Data/src/Authentication/ScramSha256Mechanism.cs         | 2 +-
 MySQL.Data/src/Authentication/Sha256AuthenticationPlugin.cs   | 2 +-
 .../src/Authentication/Sha256MemoryAuthenticationPlugin.cs    | 2 +-
 MySQL.Data/src/Authentication/WebAuthnAuthenticationPlugin.cs | 2 +-
 MySQL.Data/src/Authentication/WindowsAuthenticationPlugin.cs  | 2 +-
 MySQL.Data/src/BulkLoader.cs                                  | 2 +-
 MySQL.Data/src/CharSetMap.cs                                  | 2 +-
 MySQL.Data/src/CompressedStream.cs                            | 2 +-
 MySQL.Data/src/Crypt.cs                                       | 2 +-
 MySQL.Data/src/Driver.cs                                      | 2 +-
 MySQL.Data/src/Exception.cs                                   | 2 +-
 MySQL.Data/src/Failover/FailoverGroup.cs                      | 2 +-
 MySQL.Data/src/Failover/FailoverManager.cs                    | 2 +-
 MySQL.Data/src/Failover/FailoverServer.cs                     | 2 +-
 MySQL.Data/src/Failover/RandomFailoverGroup.cs                | 2 +-
 MySQL.Data/src/Failover/SequentialFailoverGroup.cs            | 2 +-
 MySQL.Data/src/Field.cs                                       | 2 +-
 MySQL.Data/src/Framework/net462/SystemPerformanceMonitor.cs   | 2 +-
 .../src/Framework/netstandard2_0/AuthenticationManager.cs     | 2 +-
 MySQL.Data/src/Framework/netstandard2_0/CommandBuilder.cs     | 2 +-
 .../src/Framework/netstandard2_0/MySqlClientPermission.cs     | 2 +-
 .../netstandard2_0/MySqlClientPermissionAttribute.cs          | 2 +-
 MySQL.Data/src/Framework/netstandard2_0/MySqlConfiguration.cs | 2 +-
 MySQL.Data/src/Framework/netstandard2_0/MySqlHelper.cs        | 2 +-
 .../Framework/netstandard2_0/MySqlPromotableTransaction.cs    | 2 +-
 .../src/Framework/netstandard2_0/MySqlSecurityPermission.cs   | 2 +-
 MySQL.Data/src/Framework/netstandard2_0/dataadapter.cs        | 2 +-
 MySQL.Data/src/ISSchemaProvider.cs                            | 2 +-
 MySQL.Data/src/Interceptors/CommandInterceptor.cs             | 2 +-
 MySQL.Data/src/Interceptors/ExceptionInterceptor.cs           | 2 +-
 MySQL.Data/src/Interceptors/Interceptor.cs                    | 2 +-
 MySQL.Data/src/MySQLActivitySource.cs                         | 2 +-
 MySQL.Data/src/MySql.Data.csproj                              | 2 +-
 MySQL.Data/src/MySqlAttribute.cs                              | 2 +-
 MySQL.Data/src/MySqlAttributeCollection.cs                    | 2 +-
 MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs            | 2 +-
 MySQL.Data/src/MySqlClientFactory.cs                          | 2 +-
 MySQL.Data/src/MySqlCommand.cs                                | 2 +-
 MySQL.Data/src/MySqlConnection.cs                             | 2 +-
 MySQL.Data/src/MySqlConnectionStringBuilder.cs                | 2 +-
 MySQL.Data/src/MySqlDataReader.cs                             | 2 +-
 MySQL.Data/src/MySqlError.cs                                  | 2 +-
 MySQL.Data/src/MySqlHelper.cs                                 | 2 +-
 MySQL.Data/src/MySqlPacket.cs                                 | 2 +-
 MySQL.Data/src/MySqlParameter.cs                              | 2 +-
 MySQL.Data/src/MySqlParameterCollection.cs                    | 2 +-
 MySQL.Data/src/MySqlPool.cs                                   | 2 +-
 MySQL.Data/src/MySqlPoolManager.cs                            | 2 +-
 MySQL.Data/src/MySqlScript.cs                                 | 2 +-
 MySQL.Data/src/MySqlStream.cs                                 | 2 +-
 MySQL.Data/src/MySqlTrace.cs                                  | 2 +-
 MySQL.Data/src/MySqlTransaction.cs                            | 2 +-
 MySQL.Data/src/MysqlDefs.cs                                   | 2 +-
 MySQL.Data/src/NativeDriver.cs                                | 2 +-
 MySQL.Data/src/OkPacket.cs                                    | 2 +-
 MySQL.Data/src/PacketBitConverter.cs                          | 2 +-
 MySQL.Data/src/PerformanceMonitor.cs                          | 2 +-
 MySQL.Data/src/PreparableStatement.cs                         | 2 +-
 MySQL.Data/src/ProcedureCache.cs                              | 2 +-
 MySQL.Data/src/Properties/AssemblyInfo.cs                     | 2 +-
 MySQL.Data/src/Properties/VersionInfo.cs                      | 2 +-
 MySQL.Data/src/Replication/ReplicationConfiguration.cs        | 2 +-
 MySQL.Data/src/Replication/ReplicationManager.cs              | 2 +-
 .../src/Replication/ReplicationRoundRobinServerGroup.cs       | 2 +-
 MySQL.Data/src/Replication/ReplicationServer.cs               | 2 +-
 MySQL.Data/src/Replication/ReplicationServerGroup.cs          | 2 +-
 MySQL.Data/src/ResultSet.cs                                   | 2 +-
 MySQL.Data/src/Runtime.cs                                     | 2 +-
 MySQL.Data/src/Schema.cs                                      | 2 +-
 MySQL.Data/src/SchemaProvider.cs                              | 2 +-
 MySQL.Data/src/Statement.cs                                   | 2 +-
 MySQL.Data/src/StoredProcedure.cs                             | 2 +-
 MySQL.Data/src/TableCache.cs                                  | 4 ++--
 MySQL.Data/src/TimedStream.cs                                 | 2 +-
 MySQL.Data/src/TracingDriver.cs                               | 2 +-
 MySQL.Data/src/Types/IMySqlValue.cs                           | 2 +-
 MySQL.Data/src/Types/MetaData.cs                              | 2 +-
 MySQL.Data/src/Types/MySqlBinary.cs                           | 2 +-
 MySQL.Data/src/Types/MySqlBit.cs                              | 2 +-
 MySQL.Data/src/Types/MySqlByte.cs                             | 2 +-
 MySQL.Data/src/Types/MySqlConversionException.cs              | 2 +-
 MySQL.Data/src/Types/MySqlDateTime.cs                         | 2 +-
 MySQL.Data/src/Types/MySqlDecimal.cs                          | 2 +-
 MySQL.Data/src/Types/MySqlDouble.cs                           | 2 +-
 MySQL.Data/src/Types/MySqlGeometry.cs                         | 2 +-
 MySQL.Data/src/Types/MySqlGuid.cs                             | 2 +-
 MySQL.Data/src/Types/MySqlInt16.cs                            | 2 +-
 MySQL.Data/src/Types/MySqlInt32.cs                            | 2 +-
 MySQL.Data/src/Types/MySqlInt64.cs                            | 2 +-
 MySQL.Data/src/Types/MySqlSingle.cs                           | 2 +-
 MySQL.Data/src/Types/MySqlString.cs                           | 2 +-
 MySQL.Data/src/Types/MySqlTime.cs                             | 2 +-
 MySQL.Data/src/Types/MySqlUByte.cs                            | 2 +-
 MySQL.Data/src/Types/MySqlUInt16.cs                           | 2 +-
 MySQL.Data/src/Types/MySqlUInt32.cs                           | 2 +-
 MySQL.Data/src/Types/MySqlUInt64.cs                           | 2 +-
 MySQL.Data/src/Utils.cs                                       | 2 +-
 .../src/X/Authentication/ExternalAuthenticationPlugin.cs      | 2 +-
 .../src/X/Authentication/MySQL41AuthenticationPlugin.cs       | 2 +-
 MySQL.Data/src/X/Authentication/PlainAuthenticationPlugin.cs  | 2 +-
 MySQL.Data/src/X/Common/Tools.cs                              | 2 +-
 MySQL.Data/src/X/Common/UnmanagedLibraryLoader.cs             | 2 +-
 MySQL.Data/src/X/Communication/CommunicationPacket.cs         | 2 +-
 MySQL.Data/src/X/Communication/XCompressionController.cs      | 2 +-
 MySQL.Data/src/X/Communication/XPacketProcessor.cs            | 2 +-
 MySQL.Data/src/X/Communication/XPacketReaderWriter.cs         | 2 +-
 MySQL.Data/src/X/Data/CollationMap.cs                         | 2 +-
 MySQL.Data/src/X/Data/Enums.cs                                | 2 +-
 MySQL.Data/src/X/Protocol/ProtocolBase.cs                     | 2 +-
 MySQL.Data/src/X/Protocol/ValueDecoder.cs                     | 2 +-
 MySQL.Data/src/X/Protocol/X/BitDecoder.cs                     | 2 +-
 MySQL.Data/src/X/Protocol/X/ByteDecoder.cs                    | 2 +-
 MySQL.Data/src/X/Protocol/X/DecimalDecoder.cs                 | 2 +-
 MySQL.Data/src/X/Protocol/X/Enum.cs                           | 2 +-
 MySQL.Data/src/X/Protocol/X/ExpUnparser.cs                    | 2 +-
 MySQL.Data/src/X/Protocol/X/ExprParser.cs                     | 2 +-
 MySQL.Data/src/X/Protocol/X/ExprUtil.cs                       | 2 +-
 MySQL.Data/src/X/Protocol/X/FloatDecoder.cs                   | 2 +-
 MySQL.Data/src/X/Protocol/X/IntegerDecoder.cs                 | 2 +-
 MySQL.Data/src/X/Protocol/X/Protobuf/Mysqlx.cs                | 2 +-
 MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxConnection.cs      | 2 +-
 MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCrud.cs            | 2 +-
 MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCursor.cs          | 2 +-
 MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxDatatypes.cs       | 2 +-
 MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpect.cs          | 2 +-
 MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpr.cs            | 2 +-
 MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxNotice.cs          | 2 +-
 MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxPrepare.cs         | 2 +-
 MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxResultset.cs       | 2 +-
 MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSession.cs         | 2 +-
 MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs             | 2 +-
 MySQL.Data/src/X/Protocol/X/SetDecoder.cs                     | 2 +-
 MySQL.Data/src/X/Protocol/X/XDateTimeDecoder.cs               | 2 +-
 MySQL.Data/src/X/Protocol/X/XProtocol.cs                      | 2 +-
 MySQL.Data/src/X/Protocol/X/XTimeDecoder.cs                   | 2 +-
 MySQL.Data/src/X/Protocol/X/XValueDecoderFactory.cs           | 2 +-
 MySQL.Data/src/X/RoutingServices/DefaultRoutingService.cs     | 2 +-
 MySQL.Data/src/X/RoutingServices/RoutingServiceBase.cs        | 2 +-
 MySQL.Data/src/X/Serialization/JsonParser.cs                  | 2 +-
 MySQL.Data/src/X/Sessions/InternalSession.cs                  | 2 +-
 MySQL.Data/src/X/Sessions/QueueTaskScheduler.cs               | 2 +-
 MySQL.Data/src/X/Sessions/XInternalSession.cs                 | 2 +-
 MySQL.Data/src/X/XDevAPI/BaseSession.cs                       | 2 +-
 MySQL.Data/src/X/XDevAPI/CRUD/AddStatement.cs                 | 2 +-
 .../src/X/XDevAPI/CRUD/CreateCollectionIndexStatement.cs      | 2 +-
 MySQL.Data/src/X/XDevAPI/CRUD/CreateIndexParams.cs            | 2 +-
 MySQL.Data/src/X/XDevAPI/CRUD/CrudStatement.cs                | 2 +-
 MySQL.Data/src/X/XDevAPI/CRUD/DocResult.cs                    | 2 +-
 MySQL.Data/src/X/XDevAPI/CRUD/FindParams.cs                   | 2 +-
 MySQL.Data/src/X/XDevAPI/CRUD/FindStatement.cs                | 2 +-
 MySQL.Data/src/X/XDevAPI/CRUD/ModifyStatement.cs              | 2 +-
 MySQL.Data/src/X/XDevAPI/CRUD/RemoveStatement.cs              | 2 +-
 MySQL.Data/src/X/XDevAPI/CRUD/UpdateSpec.cs                   | 2 +-
 MySQL.Data/src/X/XDevAPI/Client.cs                            | 2 +-
 MySQL.Data/src/X/XDevAPI/Collection.cs                        | 2 +-
 MySQL.Data/src/X/XDevAPI/Common/BaseResult.cs                 | 2 +-
 MySQL.Data/src/X/XDevAPI/Common/BaseStatement.cs              | 2 +-
 MySQL.Data/src/X/XDevAPI/Common/BufferingResult.cs            | 2 +-
 MySQL.Data/src/X/XDevAPI/Common/CollectionOptions.cs          | 2 +-
 MySQL.Data/src/X/XDevAPI/Common/ColumnType.cs                 | 2 +-
 MySQL.Data/src/X/XDevAPI/Common/ErrorInfo.cs                  | 2 +-
 MySQL.Data/src/X/XDevAPI/Common/FilterParams.cs               | 2 +-
 MySQL.Data/src/X/XDevAPI/Common/FilterableStatement.cs        | 2 +-
 MySQL.Data/src/X/XDevAPI/Common/QueryStatement.cs             | 2 +-
 MySQL.Data/src/X/XDevAPI/Common/Result.cs                     | 2 +-
 MySQL.Data/src/X/XDevAPI/Common/TargetedBaseStatement.cs      | 2 +-
 MySQL.Data/src/X/XDevAPI/Common/WarningInfo.cs                | 2 +-
 MySQL.Data/src/X/XDevAPI/DatabaseObject.cs                    | 2 +-
 MySQL.Data/src/X/XDevAPI/DbDoc.cs                             | 2 +-
 MySQL.Data/src/X/XDevAPI/GenericCollection.cs                 | 2 +-
 MySQL.Data/src/X/XDevAPI/Iterator.cs                          | 2 +-
 MySQL.Data/src/X/XDevAPI/MySqlExpression.cs                   | 2 +-
 MySQL.Data/src/X/XDevAPI/MySqlX.cs                            | 2 +-
 MySQL.Data/src/X/XDevAPI/MySqlXConnectionStringBuilder.cs     | 2 +-
 MySQL.Data/src/X/XDevAPI/Relational/Column.cs                 | 2 +-
 MySQL.Data/src/X/XDevAPI/Relational/InternalRowResult.cs      | 2 +-
 MySQL.Data/src/X/XDevAPI/Relational/Row.cs                    | 2 +-
 MySQL.Data/src/X/XDevAPI/Relational/RowResult.cs              | 2 +-
 MySQL.Data/src/X/XDevAPI/Relational/SqlResult.cs              | 2 +-
 MySQL.Data/src/X/XDevAPI/Relational/SqlStatement.cs           | 2 +-
 MySQL.Data/src/X/XDevAPI/Relational/Table.cs                  | 2 +-
 MySQL.Data/src/X/XDevAPI/Relational/TableDeleteStatement.cs   | 2 +-
 MySQL.Data/src/X/XDevAPI/Relational/TableInsertStatement.cs   | 2 +-
 MySQL.Data/src/X/XDevAPI/Relational/TableSelectStatement.cs   | 2 +-
 MySQL.Data/src/X/XDevAPI/Relational/TableUpdateStatement.cs   | 2 +-
 MySQL.Data/src/X/XDevAPI/Schema.cs                            | 2 +-
 MySQL.Data/src/X/XDevAPI/Session.cs                           | 2 +-
 MySQL.Data/src/common/Cache.cs                                | 2 +-
 MySQL.Data/src/common/ContextString.cs                        | 2 +-
 MySQL.Data/src/common/Dns/DnsEnums.cs                         | 2 +-
 MySQL.Data/src/common/Dns/DnsQuestion.cs                      | 2 +-
 MySQL.Data/src/common/Dns/DnsRecordHeader.cs                  | 2 +-
 MySQL.Data/src/common/Dns/DnsRecordReader.cs                  | 2 +-
 MySQL.Data/src/common/Dns/DnsRecordUnknown.cs                 | 2 +-
 MySQL.Data/src/common/Dns/DnsRequest.cs                       | 2 +-
 MySQL.Data/src/common/Dns/DnsResolver.cs                      | 2 +-
 MySQL.Data/src/common/Dns/DnsResourceRecord.cs                | 2 +-
 MySQL.Data/src/common/Dns/DnsResponse.cs                      | 2 +-
 MySQL.Data/src/common/Dns/DnsSrvRecord.cs                     | 2 +-
 MySQL.Data/src/common/DnsSrv.cs                               | 2 +-
 MySQL.Data/src/common/LowResolutionStopwatch.cs               | 2 +-
 MySQL.Data/src/common/MyNetworkStream.cs                      | 2 +-
 MySQL.Data/src/common/MySqlConnectionStringOption.cs          | 2 +-
 .../src/common/MySqlConnectionStringOptionCollection.cs       | 2 +-
 MySQL.Data/src/common/MySqlTokenizer.cs                       | 2 +-
 MySQL.Data/src/common/NativeMethods.cs                        | 2 +-
 MySQL.Data/src/common/Platform.cs                             | 2 +-
 MySQL.Data/src/common/QueryNormalizer.cs                      | 2 +-
 MySQL.Data/src/common/Ssl.cs                                  | 2 +-
 MySQL.Data/src/common/SslPemCertificateValidator.cs           | 2 +-
 MySQL.Data/src/common/StreamCreator.cs                        | 2 +-
 MySQL.Data/src/common/StringUtility.cs                        | 2 +-
 MySQL.Data/src/common/UnixEndPoint.cs                         | 2 +-
 MySQL.Data/src/common/Version.cs                              | 2 +-
 MySQL.Data/src/common/netstandard2_0/NamedPipeStream.cs       | 2 +-
 MySQL.Data/src/common/netstandard2_0/SharedMemoryStream.cs    | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs           | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs                | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs                | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/BlobTestsCompressed.cs      | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs             | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs         | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs  | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs                 | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/CmdTestsCompressed.cs       | 2 +-
 .../tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs    | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs          | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs            | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs            | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs              | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/EventTests.cs               | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs           | 2 +-
 .../Framework/netstandard2_0/BlobTestsPipe.cs                 | 2 +-
 .../Framework/netstandard2_0/BlobTestsPipeCompressed.cs       | 2 +-
 .../Framework/netstandard2_0/BlobTestsSharedMem.cs            | 2 +-
 .../Framework/netstandard2_0/BlobTestsSharedMemCompressed.cs  | 2 +-
 .../MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipe.cs | 2 +-
 .../Framework/netstandard2_0/CmdTestsPipeCompressed.cs        | 2 +-
 .../Framework/netstandard2_0/CmdTestsSharedMem.cs             | 2 +-
 .../Framework/netstandard2_0/CmdTestsSharedmemCompressed.cs   | 2 +-
 .../MySql.Data.Tests/Framework/netstandard2_0/CultureTests.cs | 2 +-
 .../Framework/netstandard2_0/DataTypeTests.cs                 | 2 +-
 .../Framework/netstandard2_0/DateTimeTests.cs                 | 2 +-
 .../Framework/netstandard2_0/GetSchemaTests.cs                | 2 +-
 .../Framework/netstandard2_0/InstallerTests.cs                | 2 +-
 .../Framework/netstandard2_0/MediumTrust/MediumTrustDomain.cs | 2 +-
 .../netstandard2_0/MediumTrust/MediumTrustFixtureAttribute.cs | 2 +-
 .../netstandard2_0/MediumTrust/MediumTrustTestClassCommand.cs | 2 +-
 .../netstandard2_0/MediumTrust/MediumTrustTestCommand.cs      | 2 +-
 .../netstandard2_0/MediumTrust/MySql.MediumTrustsTests.cs     | 2 +-
 .../netstandard2_0/MediumTrust/MySqlClientPermissionTests.cs  | 2 +-
 .../Framework/netstandard2_0/MySQLHelperTests.cs              | 2 +-
 .../Framework/netstandard2_0/MySqlCommandBuilderTests.cs      | 2 +-
 .../Framework/netstandard2_0/MySqlDataAdapterTests.cs         | 2 +-
 .../Framework/netstandard2_0/MySqlDataReaderTests.cs          | 2 +-
 .../Framework/netstandard2_0/NETCore20Tests.cs                | 4 ++--
 .../Framework/netstandard2_0/OutputParametersBatchPrepared.cs | 2 +-
 .../Framework/netstandard2_0/OutputParametersNoBatch.cs       | 2 +-
 .../netstandard2_0/OutputParametersNoBatchPrepared.cs         | 2 +-
 .../tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipe.cs | 2 +-
 .../Framework/netstandard2_0/PSPipeCompressed.cs              | 2 +-
 .../Framework/netstandard2_0/PSSharedMemory.cs                | 2 +-
 .../Framework/netstandard2_0/PSSharedMemoryCompressed.cs      | 2 +-
 .../Framework/netstandard2_0/PartialTrustSandbox.cs           | 2 +-
 .../MySql.Data.Tests/Framework/netstandard2_0/PerfMonTests.cs | 2 +-
 .../Framework/netstandard2_0/ProcedureParameterTests.cs       | 2 +-
 .../Framework/netstandard2_0/ReplicationTests.cs              | 2 +-
 .../Framework/netstandard2_0/StressTestsPipe.cs               | 2 +-
 .../Framework/netstandard2_0/StressTestsPipeCompressed.cs     | 2 +-
 .../Framework/netstandard2_0/StressTestsSharedMemory.cs       | 2 +-
 .../netstandard2_0/StressTestsSharedMemoryCompressed.cs       | 2 +-
 .../Framework/netstandard2_0/ThreadingTests.cs                | 2 +-
 .../Framework/netstandard2_0/TimeoutAndCancel.cs              | 2 +-
 .../Framework/netstandard2_0/TimeoutAndCancelCompressed.cs    | 2 +-
 .../Framework/netstandard2_0/TimeoutAndCancelPipe.cs          | 2 +-
 .../Framework/netstandard2_0/TimeoutAndCancelSharedMemory.cs  | 2 +-
 .../MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs    | 2 +-
 .../Framework/netstandard2_0/UsageAdvisorTests.cs             | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/GenericListener.cs          | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs             | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj     | 4 ++--
 MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs     | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/MySqlDataReaderTests.cs     | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/OutputParametersBatch.cs    | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs           | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs             | 2 +-
 .../tests/MySql.Data.Tests/PreparedStatementCompressed.cs     | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs       | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/Properties/AssemblyInfo.cs  | 4 ++--
 MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs          | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs       | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs            | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/SqlTokenizer.cs             | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/SslTests.cs                 | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs          | 2 +-
 .../tests/MySql.Data.Tests/StoredProcedureWithAccess.cs       | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/StressTests.cs              | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/StressTestsCompressed.cs    | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/Syntax.cs                   | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs                  | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs             | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/TestBase.cs                 | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs                | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/Transactions.cs             | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs              | 2 +-
 MySQL.Data/tests/MySql.Data.Tests/Utils.cs                    | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs                | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs          | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/BasicSelectTests.cs        | 2 +-
 .../tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs       | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs             | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs    | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs    | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs    | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs         | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs        | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs         | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs         | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs   | 2 +-
 .../tests/MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs    | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs         | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/CustomTypeTests.cs         | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs              | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs             | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/ExprParserTests.cs         | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/GenericListener.cs         | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/JsonParserTests.cs         | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs              | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj   | 4 ++--
 MySQL.Data/tests/MySqlX.Data.Tests/PerformanceTests.cs        | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/Properties/AssemblyInfo.cs | 4 ++--
 .../MySqlX.Data.Tests/RelationalTests/ColumnMetadataTests.cs  | 2 +-
 .../tests/MySqlX.Data.Tests/RelationalTests/DataTypeTests.cs  | 2 +-
 .../tests/MySqlX.Data.Tests/RelationalTests/DateTimeTests.cs  | 2 +-
 .../MySqlX.Data.Tests/RelationalTests/RelationalGCTests.cs    | 2 +-
 .../MySqlX.Data.Tests/RelationalTests/RowBufferingTests.cs    | 2 +-
 .../tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs       | 2 +-
 .../MySqlX.Data.Tests/RelationalTests/TableAsyncTests.cs      | 2 +-
 .../MySqlX.Data.Tests/RelationalTests/TableDeleteTests.cs     | 2 +-
 .../MySqlX.Data.Tests/RelationalTests/TableInsertTests.cs     | 2 +-
 .../MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs     | 2 +-
 .../MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs     | 2 +-
 .../tests/MySqlX.Data.Tests/RelationalTests/ViewTests.cs      | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs             | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs            | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs                | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs        | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs        | 2 +-
 MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs                   | 2 +-
 .../tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs  | 2 +-
 MySql.Web/src/Application.cs                                  | 2 +-
 MySql.Web/src/ConfigUtility.cs                                | 2 +-
 MySql.Web/src/MembershipProvider.cs                           | 2 +-
 MySql.Web/src/MySql.Web.csproj                                | 2 +-
 MySql.Web/src/MySqlDatabaseWrapper.cs                         | 2 +-
 MySql.Web/src/MySqlWebSecurity.cs                             | 2 +-
 MySql.Web/src/PersonalizationConnectionHelper.cs              | 2 +-
 MySql.Web/src/PersonalizationProvider.cs                      | 2 +-
 MySql.Web/src/PersonalizationProviderProcedures.cs            | 2 +-
 MySql.Web/src/ProfileProvider.cs                              | 2 +-
 MySql.Web/src/Properties/AssemblyInfo.cs                      | 2 +-
 MySql.Web/src/Properties/VersionInfo.cs                       | 2 +-
 MySql.Web/src/RoleProvider.cs                                 | 2 +-
 MySql.Web/src/Runtime.cs                                      | 2 +-
 MySql.Web/src/SchemaManager.cs                                | 2 +-
 MySql.Web/src/SessionProvider.cs                              | 2 +-
 MySql.Web/src/SimpleMembershipProvider.cs                     | 2 +-
 MySql.Web/src/SimpleRoleProvider.cs                           | 2 +-
 MySql.Web/src/SiteMapProvider.cs                              | 2 +-
 MySql.Web/tests/MySql.Web.Tests.csproj                        | 4 ++--
 MySql.Web/tests/PersonalizationTests.cs                       | 2 +-
 MySql.Web/tests/ProfileTests.cs                               | 2 +-
 MySql.Web/tests/Properties/AssemblyInfo.cs                    | 4 ++--
 MySql.Web/tests/RoleManagement.cs                             | 2 +-
 MySql.Web/tests/SchemaManagerTests.cs                         | 2 +-
 MySql.Web/tests/SchemaTests.cs                                | 2 +-
 MySql.Web/tests/SessionLocking/Global.asax.cs                 | 2 +-
 MySql.Web/tests/SessionLocking/InitSessionLocking.aspx.cs     | 2 +-
 MySql.Web/tests/SessionLocking/read.aspx.cs                   | 2 +-
 MySql.Web/tests/SessionLocking/write.aspx.cs                  | 2 +-
 MySql.Web/tests/SessionLocking/write2.aspx.cs                 | 2 +-
 MySql.Web/tests/SessionTests.cs                               | 2 +-
 MySql.Web/tests/SimpleMembership.cs                           | 2 +-
 MySql.Web/tests/SiteMapTests.cs                               | 2 +-
 MySql.Web/tests/TestProfile.cs                                | 2 +-
 MySql.Web/tests/UserManagement.cs                             | 2 +-
 MySql.Web/tests/WebTestBase.cs                                | 2 +-
 715 files changed, 733 insertions(+), 733 deletions(-)

diff --git a/Documentation/docfx.json b/Documentation/docfx.json
index 349839616..d01f8fce2 100644
--- a/Documentation/docfx.json
+++ b/Documentation/docfx.json
@@ -86,4 +86,4 @@
     "markdownEngineName": "markdig",
     "xrefService": [ "https://xref.docs.microsoft.com/query?uid={uid}" ]
   }
-}
\ No newline at end of file
+}
diff --git a/EFCore/src/DataAnnotations/MySQLCharsetAttribute.cs b/EFCore/src/DataAnnotations/MySQLCharsetAttribute.cs
index 72907a16b..6541f6d5e 100644
--- a/EFCore/src/DataAnnotations/MySQLCharsetAttribute.cs
+++ b/EFCore/src/DataAnnotations/MySQLCharsetAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/DataAnnotations/MySQLCollationAttribute.cs b/EFCore/src/DataAnnotations/MySQLCollationAttribute.cs
index a1a10b00c..53cdb1bb8 100644
--- a/EFCore/src/DataAnnotations/MySQLCollationAttribute.cs
+++ b/EFCore/src/DataAnnotations/MySQLCollationAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Design/Internal/MySQLAnnotationCodeGenerator.cs b/EFCore/src/Design/Internal/MySQLAnnotationCodeGenerator.cs
index 3bc26690f..4fce96898 100644
--- a/EFCore/src/Design/Internal/MySQLAnnotationCodeGenerator.cs
+++ b/EFCore/src/Design/Internal/MySQLAnnotationCodeGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Design/Internal/MySQLDesignTimeServices.cs b/EFCore/src/Design/Internal/MySQLDesignTimeServices.cs
index a621f6a8f..30389cea5 100644
--- a/EFCore/src/Design/Internal/MySQLDesignTimeServices.cs
+++ b/EFCore/src/Design/Internal/MySQLDesignTimeServices.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Diagnostics/Internal/MySQLLoggingDefinitions.cs b/EFCore/src/Diagnostics/Internal/MySQLLoggingDefinitions.cs
index b95397df1..6ac04605a 100644
--- a/EFCore/src/Diagnostics/Internal/MySQLLoggingDefinitions.cs
+++ b/EFCore/src/Diagnostics/Internal/MySQLLoggingDefinitions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Diagnostics/MySQLEventId.cs b/EFCore/src/Diagnostics/MySQLEventId.cs
index c51b1d6a8..e2a639ea6 100644
--- a/EFCore/src/Diagnostics/MySQLEventId.cs
+++ b/EFCore/src/Diagnostics/MySQLEventId.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLDatabaseFacadeExtensions.cs b/EFCore/src/Extensions/MySQLDatabaseFacadeExtensions.cs
index 4e6b24506..43f02dfe9 100644
--- a/EFCore/src/Extensions/MySQLDatabaseFacadeExtensions.cs
+++ b/EFCore/src/Extensions/MySQLDatabaseFacadeExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLDbContextOptionsExtensions.cs b/EFCore/src/Extensions/MySQLDbContextOptionsExtensions.cs
index 02306ebf6..9cc0b5150 100644
--- a/EFCore/src/Extensions/MySQLDbContextOptionsExtensions.cs
+++ b/EFCore/src/Extensions/MySQLDbContextOptionsExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLDbFunctionsEnums.cs b/EFCore/src/Extensions/MySQLDbFunctionsEnums.cs
index 867fac2e9..48e224773 100644
--- a/EFCore/src/Extensions/MySQLDbFunctionsEnums.cs
+++ b/EFCore/src/Extensions/MySQLDbFunctionsEnums.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLDbFunctionsExtensions.cs b/EFCore/src/Extensions/MySQLDbFunctionsExtensions.cs
index fcb9042ae..6cc956262 100644
--- a/EFCore/src/Extensions/MySQLDbFunctionsExtensions.cs
+++ b/EFCore/src/Extensions/MySQLDbFunctionsExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLEntityTypeBuilderExtensions.cs b/EFCore/src/Extensions/MySQLEntityTypeBuilderExtensions.cs
index fd8bf9b6a..33bc3b1e4 100644
--- a/EFCore/src/Extensions/MySQLEntityTypeBuilderExtensions.cs
+++ b/EFCore/src/Extensions/MySQLEntityTypeBuilderExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLEntityTypeExtensions.cs b/EFCore/src/Extensions/MySQLEntityTypeExtensions.cs
index 5465bfc06..9eec6cc26 100644
--- a/EFCore/src/Extensions/MySQLEntityTypeExtensions.cs
+++ b/EFCore/src/Extensions/MySQLEntityTypeExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLIndexExtensions.cs b/EFCore/src/Extensions/MySQLIndexExtensions.cs
index 0759214c0..bc4be7b3c 100644
--- a/EFCore/src/Extensions/MySQLIndexExtensions.cs
+++ b/EFCore/src/Extensions/MySQLIndexExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLKeyBuilderExtensions.cs b/EFCore/src/Extensions/MySQLKeyBuilderExtensions.cs
index 147d7f03b..72727aefb 100644
--- a/EFCore/src/Extensions/MySQLKeyBuilderExtensions.cs
+++ b/EFCore/src/Extensions/MySQLKeyBuilderExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLKeyExtensions.cs b/EFCore/src/Extensions/MySQLKeyExtensions.cs
index 71007b148..2be6817e1 100644
--- a/EFCore/src/Extensions/MySQLKeyExtensions.cs
+++ b/EFCore/src/Extensions/MySQLKeyExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLMigrationBuilderExtensions.cs b/EFCore/src/Extensions/MySQLMigrationBuilderExtensions.cs
index ff668966f..6aef77044 100644
--- a/EFCore/src/Extensions/MySQLMigrationBuilderExtensions.cs
+++ b/EFCore/src/Extensions/MySQLMigrationBuilderExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLModelBuilderExtensions.cs b/EFCore/src/Extensions/MySQLModelBuilderExtensions.cs
index 532b9eed3..89a4a2801 100644
--- a/EFCore/src/Extensions/MySQLModelBuilderExtensions.cs
+++ b/EFCore/src/Extensions/MySQLModelBuilderExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLModelExtensions.cs b/EFCore/src/Extensions/MySQLModelExtensions.cs
index 7f9f2cbb8..f2284ec4f 100644
--- a/EFCore/src/Extensions/MySQLModelExtensions.cs
+++ b/EFCore/src/Extensions/MySQLModelExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLPropertyBuilderExtensions.cs b/EFCore/src/Extensions/MySQLPropertyBuilderExtensions.cs
index 145f99d6e..88729618a 100644
--- a/EFCore/src/Extensions/MySQLPropertyBuilderExtensions.cs
+++ b/EFCore/src/Extensions/MySQLPropertyBuilderExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLPropertyExtensions.cs b/EFCore/src/Extensions/MySQLPropertyExtensions.cs
index 976550298..ebc0ebed1 100644
--- a/EFCore/src/Extensions/MySQLPropertyExtensions.cs
+++ b/EFCore/src/Extensions/MySQLPropertyExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLServiceCollectionExtensions.cs b/EFCore/src/Extensions/MySQLServiceCollectionExtensions.cs
index ce2e455a8..42317fa9b 100644
--- a/EFCore/src/Extensions/MySQLServiceCollectionExtensions.cs
+++ b/EFCore/src/Extensions/MySQLServiceCollectionExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySQLTypeBaseExtensions.cs b/EFCore/src/Extensions/MySQLTypeBaseExtensions.cs
index 509a2120d..ba1e608bc 100644
--- a/EFCore/src/Extensions/MySQLTypeBaseExtensions.cs
+++ b/EFCore/src/Extensions/MySQLTypeBaseExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2023, 2024, Oracle and/or its affiliates.
+// Copyright © 2023, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Extensions/MySqlIndexBuilderExtensions.cs b/EFCore/src/Extensions/MySqlIndexBuilderExtensions.cs
index 7cee66361..43257933f 100644
--- a/EFCore/src/Extensions/MySqlIndexBuilderExtensions.cs
+++ b/EFCore/src/Extensions/MySqlIndexBuilderExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Infrastructure/Internal/IMySQLOptions.cs b/EFCore/src/Infrastructure/Internal/IMySQLOptions.cs
index e23f97c94..116f21644 100644
--- a/EFCore/src/Infrastructure/Internal/IMySQLOptions.cs
+++ b/EFCore/src/Infrastructure/Internal/IMySQLOptions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Infrastructure/Internal/MySQLOptionsExtension.cs b/EFCore/src/Infrastructure/Internal/MySQLOptionsExtension.cs
index c6c590b25..e2fc4616d 100644
--- a/EFCore/src/Infrastructure/Internal/MySQLOptionsExtension.cs
+++ b/EFCore/src/Infrastructure/Internal/MySQLOptionsExtension.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Infrastructure/MySQLDbContextOptionsBuilder.cs b/EFCore/src/Infrastructure/MySQLDbContextOptionsBuilder.cs
index 350318233..b01a40fcf 100644
--- a/EFCore/src/Infrastructure/MySQLDbContextOptionsBuilder.cs
+++ b/EFCore/src/Infrastructure/MySQLDbContextOptionsBuilder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Infrastructure/MySQLSchemaBehavior.cs b/EFCore/src/Infrastructure/MySQLSchemaBehavior.cs
index acb97d767..75f1002e7 100644
--- a/EFCore/src/Infrastructure/MySQLSchemaBehavior.cs
+++ b/EFCore/src/Infrastructure/MySQLSchemaBehavior.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Internal/MySQLModelValidator.cs b/EFCore/src/Internal/MySQLModelValidator.cs
index d8c4f4d2d..3ffd0388f 100644
--- a/EFCore/src/Internal/MySQLModelValidator.cs
+++ b/EFCore/src/Internal/MySQLModelValidator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Internal/MySQLOptions.cs b/EFCore/src/Internal/MySQLOptions.cs
index a238b6abe..de900fed8 100644
--- a/EFCore/src/Internal/MySQLOptions.cs
+++ b/EFCore/src/Internal/MySQLOptions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Internal/MySQLRetryingExecutionStrategy.cs b/EFCore/src/Internal/MySQLRetryingExecutionStrategy.cs
index 3ee230428..980fce139 100644
--- a/EFCore/src/Internal/MySQLRetryingExecutionStrategy.cs
+++ b/EFCore/src/Internal/MySQLRetryingExecutionStrategy.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Internal/MySQLValueGenerationStrategyCompatibility.cs b/EFCore/src/Internal/MySQLValueGenerationStrategyCompatibility.cs
index 913c31738..2697dc2e7 100644
--- a/EFCore/src/Internal/MySQLValueGenerationStrategyCompatibility.cs
+++ b/EFCore/src/Internal/MySQLValueGenerationStrategyCompatibility.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Metadata/Conventions/MySQLConventionSetBuilder.cs b/EFCore/src/Metadata/Conventions/MySQLConventionSetBuilder.cs
index 7d7fce3d0..3566c9fab 100644
--- a/EFCore/src/Metadata/Conventions/MySQLConventionSetBuilder.cs
+++ b/EFCore/src/Metadata/Conventions/MySQLConventionSetBuilder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Metadata/Conventions/MySQLValueGenerationConvention.cs b/EFCore/src/Metadata/Conventions/MySQLValueGenerationConvention.cs
index 02167937a..4088d5797 100644
--- a/EFCore/src/Metadata/Conventions/MySQLValueGenerationConvention.cs
+++ b/EFCore/src/Metadata/Conventions/MySQLValueGenerationConvention.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Metadata/Conventions/MySqlCharsetAttributeConvention.cs b/EFCore/src/Metadata/Conventions/MySqlCharsetAttributeConvention.cs
index 4a7a91ac0..521cc2471 100644
--- a/EFCore/src/Metadata/Conventions/MySqlCharsetAttributeConvention.cs
+++ b/EFCore/src/Metadata/Conventions/MySqlCharsetAttributeConvention.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Metadata/Conventions/MySqlCollationAttributeConvention.cs b/EFCore/src/Metadata/Conventions/MySqlCollationAttributeConvention.cs
index 31aead290..9582ae16a 100644
--- a/EFCore/src/Metadata/Conventions/MySqlCollationAttributeConvention.cs
+++ b/EFCore/src/Metadata/Conventions/MySqlCollationAttributeConvention.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Metadata/Conventions/MySqlEntityCharsetAttributeConvention.cs b/EFCore/src/Metadata/Conventions/MySqlEntityCharsetAttributeConvention.cs
index 3b6be795c..9721eac51 100644
--- a/EFCore/src/Metadata/Conventions/MySqlEntityCharsetAttributeConvention.cs
+++ b/EFCore/src/Metadata/Conventions/MySqlEntityCharsetAttributeConvention.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Metadata/Conventions/MySqlEntityCollationAttributeConvention.cs b/EFCore/src/Metadata/Conventions/MySqlEntityCollationAttributeConvention.cs
index 6249a5145..5c2ea15c3 100644
--- a/EFCore/src/Metadata/Conventions/MySqlEntityCollationAttributeConvention.cs
+++ b/EFCore/src/Metadata/Conventions/MySqlEntityCollationAttributeConvention.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Metadata/Internal/MySQLAnnotationNames.cs b/EFCore/src/Metadata/Internal/MySQLAnnotationNames.cs
index 55dbdd66f..b60e8c7ca 100644
--- a/EFCore/src/Metadata/Internal/MySQLAnnotationNames.cs
+++ b/EFCore/src/Metadata/Internal/MySQLAnnotationNames.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs b/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs
index d437571e7..15783391d 100644
--- a/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs
+++ b/EFCore/src/Metadata/Internal/MySQLAnnotationProvider.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Metadata/MySQLValueGenerationStrategy.cs b/EFCore/src/Metadata/MySQLValueGenerationStrategy.cs
index ca361acb4..730a80900 100644
--- a/EFCore/src/Metadata/MySQLValueGenerationStrategy.cs
+++ b/EFCore/src/Metadata/MySQLValueGenerationStrategy.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs b/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
index 77f84336c..c5c86ebb6 100644
--- a/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
+++ b/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs b/EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs
index 139c378dc..ccd651a16 100644
--- a/EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs
+++ b/EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs
@@ -1,4 +1,4 @@
-// Copyright © 2024, Oracle and/or its affiliates.
+// Copyright © 2024, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs b/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
index 809da75ae..ac7fc3e4f 100644
--- a/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
+++ b/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrator.cs b/EFCore/src/Migrations/Internal/MySQLMigrator.cs
index 23aa5d493..3534d9152 100644
--- a/EFCore/src/Migrations/Internal/MySQLMigrator.cs
+++ b/EFCore/src/Migrations/Internal/MySQLMigrator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Migrations/MySQLMigrationsSqlGenerator.cs b/EFCore/src/Migrations/MySQLMigrationsSqlGenerator.cs
index 2ca5009c3..239ff6753 100644
--- a/EFCore/src/Migrations/MySQLMigrationsSqlGenerator.cs
+++ b/EFCore/src/Migrations/MySQLMigrationsSqlGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Migrations/Operations/CreateDatabaseOperation.cs b/EFCore/src/Migrations/Operations/CreateDatabaseOperation.cs
index 4dc9706fc..1e266a2ff 100644
--- a/EFCore/src/Migrations/Operations/CreateDatabaseOperation.cs
+++ b/EFCore/src/Migrations/Operations/CreateDatabaseOperation.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Migrations/Operations/DropDatabaseOperation.cs b/EFCore/src/Migrations/Operations/DropDatabaseOperation.cs
index 0e485c20b..bb9dc3bf0 100644
--- a/EFCore/src/Migrations/Operations/DropDatabaseOperation.cs
+++ b/EFCore/src/Migrations/Operations/DropDatabaseOperation.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Migrations/Operations/MySQLDropPrimaryKeyAndRecreateForeignKeysOperation.cs b/EFCore/src/Migrations/Operations/MySQLDropPrimaryKeyAndRecreateForeignKeysOperation.cs
index 4480fcc73..1626aff58 100644
--- a/EFCore/src/Migrations/Operations/MySQLDropPrimaryKeyAndRecreateForeignKeysOperation.cs
+++ b/EFCore/src/Migrations/Operations/MySQLDropPrimaryKeyAndRecreateForeignKeysOperation.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Migrations/Operations/MySQLDropUniqueConstraintAndRecreateForeignKeysOperation.cs b/EFCore/src/Migrations/Operations/MySQLDropUniqueConstraintAndRecreateForeignKeysOperation.cs
index 8989394bd..005a01f4b 100644
--- a/EFCore/src/Migrations/Operations/MySQLDropUniqueConstraintAndRecreateForeignKeysOperation.cs
+++ b/EFCore/src/Migrations/Operations/MySQLDropUniqueConstraintAndRecreateForeignKeysOperation.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Properties/AssemblyInfo.cs b/EFCore/src/Properties/AssemblyInfo.cs
index e5565c1a9..48eeec93c 100644
--- a/EFCore/src/Properties/AssemblyInfo.cs
+++ b/EFCore/src/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Properties/VersionInfo.cs b/EFCore/src/Properties/VersionInfo.cs
index 9ff731567..9833fee26 100644
--- a/EFCore/src/Properties/VersionInfo.cs
+++ b/EFCore/src/Properties/VersionInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2024, Oracle and/or its affiliates.
+// Copyright © 2024, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/ExpressionTranslators/Internal/MySQLByteArrayMethodTranslator.cs b/EFCore/src/Query/ExpressionTranslators/Internal/MySQLByteArrayMethodTranslator.cs
index d1a59fef5..61466321f 100644
--- a/EFCore/src/Query/ExpressionTranslators/Internal/MySQLByteArrayMethodTranslator.cs
+++ b/EFCore/src/Query/ExpressionTranslators/Internal/MySQLByteArrayMethodTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/ExpressionTranslators/Internal/MySQLDbFunctionsExtensionsMethodTranslator.cs b/EFCore/src/Query/ExpressionTranslators/Internal/MySQLDbFunctionsExtensionsMethodTranslator.cs
index 6bb8eb80f..82688e6cf 100644
--- a/EFCore/src/Query/ExpressionTranslators/Internal/MySQLDbFunctionsExtensionsMethodTranslator.cs
+++ b/EFCore/src/Query/ExpressionTranslators/Internal/MySQLDbFunctionsExtensionsMethodTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/ExpressionTranslators/Internal/MySQLRegexIsMatchTranslator.cs b/EFCore/src/Query/ExpressionTranslators/Internal/MySQLRegexIsMatchTranslator.cs
index f46e445cb..bda2f2990 100644
--- a/EFCore/src/Query/ExpressionTranslators/Internal/MySQLRegexIsMatchTranslator.cs
+++ b/EFCore/src/Query/ExpressionTranslators/Internal/MySQLRegexIsMatchTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/ExpressionTranslators/Internal/MySQLStringLengthTranslator.cs b/EFCore/src/Query/ExpressionTranslators/Internal/MySQLStringLengthTranslator.cs
index 2bb6e6986..64d23c763 100644
--- a/EFCore/src/Query/ExpressionTranslators/Internal/MySQLStringLengthTranslator.cs
+++ b/EFCore/src/Query/ExpressionTranslators/Internal/MySQLStringLengthTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs
index fb5cb4112..6b07143ad 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs
index a88c77b49..bbb59165a 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs
index 49a96f698..269c5386e 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs
index 5f176545e..37bbf5420 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs
index 6124ce5eb..79ba35577 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs
index e3b8430ac..a2771b34d 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs
index e90f336a8..26f177b81 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs
index f851e0eaa..3ecedf787 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs b/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs
index 32b412960..1af3ac2cb 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLCommandParser.cs b/EFCore/src/Query/Internal/MySQLCommandParser.cs
index 2b98ff175..9b4a36f4a 100644
--- a/EFCore/src/Query/Internal/MySQLCommandParser.cs
+++ b/EFCore/src/Query/Internal/MySQLCommandParser.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLCompatibilityExpressionVisitor.cs b/EFCore/src/Query/Internal/MySQLCompatibilityExpressionVisitor.cs
index d462ea9d6..492ed5957 100644
--- a/EFCore/src/Query/Internal/MySQLCompatibilityExpressionVisitor.cs
+++ b/EFCore/src/Query/Internal/MySQLCompatibilityExpressionVisitor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLCompiledQueryCacheKeyGenerator.cs b/EFCore/src/Query/Internal/MySQLCompiledQueryCacheKeyGenerator.cs
index bac0a49f2..d4658704c 100644
--- a/EFCore/src/Query/Internal/MySQLCompiledQueryCacheKeyGenerator.cs
+++ b/EFCore/src/Query/Internal/MySQLCompiledQueryCacheKeyGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLConvertTranslator.cs b/EFCore/src/Query/Internal/MySQLConvertTranslator.cs
index c959987b6..f600784a9 100644
--- a/EFCore/src/Query/Internal/MySQLConvertTranslator.cs
+++ b/EFCore/src/Query/Internal/MySQLConvertTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLDateDiffFunctionsTranslator.cs b/EFCore/src/Query/Internal/MySQLDateDiffFunctionsTranslator.cs
index cd293d598..439a3f2b3 100644
--- a/EFCore/src/Query/Internal/MySQLDateDiffFunctionsTranslator.cs
+++ b/EFCore/src/Query/Internal/MySQLDateDiffFunctionsTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLDateTimeMemberTranslator.cs b/EFCore/src/Query/Internal/MySQLDateTimeMemberTranslator.cs
index 7f4777754..b2c62c561 100644
--- a/EFCore/src/Query/Internal/MySQLDateTimeMemberTranslator.cs
+++ b/EFCore/src/Query/Internal/MySQLDateTimeMemberTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs b/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs
index 40fe8c1c6..d967aa091 100644
--- a/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs
+++ b/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLEvaluatableExpressionFilter.cs b/EFCore/src/Query/Internal/MySQLEvaluatableExpressionFilter.cs
index 2118664fd..50d159ff5 100644
--- a/EFCore/src/Query/Internal/MySQLEvaluatableExpressionFilter.cs
+++ b/EFCore/src/Query/Internal/MySQLEvaluatableExpressionFilter.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLMathTranslator.cs b/EFCore/src/Query/Internal/MySQLMathTranslator.cs
index 5704f945b..ba3f30f38 100644
--- a/EFCore/src/Query/Internal/MySQLMathTranslator.cs
+++ b/EFCore/src/Query/Internal/MySQLMathTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLMemberTranslatorProvider.cs b/EFCore/src/Query/Internal/MySQLMemberTranslatorProvider.cs
index d3c2cc9ab..7d51db057 100644
--- a/EFCore/src/Query/Internal/MySQLMemberTranslatorProvider.cs
+++ b/EFCore/src/Query/Internal/MySQLMemberTranslatorProvider.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLMethodCallTranslatorProvider.cs b/EFCore/src/Query/Internal/MySQLMethodCallTranslatorProvider.cs
index d059f1170..3538d2342 100644
--- a/EFCore/src/Query/Internal/MySQLMethodCallTranslatorProvider.cs
+++ b/EFCore/src/Query/Internal/MySQLMethodCallTranslatorProvider.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLNewGuidTranslator.cs b/EFCore/src/Query/Internal/MySQLNewGuidTranslator.cs
index f71d13bf8..0a2cd57dd 100644
--- a/EFCore/src/Query/Internal/MySQLNewGuidTranslator.cs
+++ b/EFCore/src/Query/Internal/MySQLNewGuidTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLObjectToStringTranslator.cs b/EFCore/src/Query/Internal/MySQLObjectToStringTranslator.cs
index 382f88cca..d8455bff7 100644
--- a/EFCore/src/Query/Internal/MySQLObjectToStringTranslator.cs
+++ b/EFCore/src/Query/Internal/MySQLObjectToStringTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
index 6e0cf9b01..e116a3c93 100644
--- a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
+++ b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs
index aac4cbec9..12f709cda 100644
--- a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs
+++ b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLQueryCompilationContext.cs b/EFCore/src/Query/Internal/MySQLQueryCompilationContext.cs
index 14cae9543..821c3ac54 100644
--- a/EFCore/src/Query/Internal/MySQLQueryCompilationContext.cs
+++ b/EFCore/src/Query/Internal/MySQLQueryCompilationContext.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLQueryCompilationContextFactory.cs b/EFCore/src/Query/Internal/MySQLQueryCompilationContextFactory.cs
index 0d1557b28..3629a6424 100644
--- a/EFCore/src/Query/Internal/MySQLQueryCompilationContextFactory.cs
+++ b/EFCore/src/Query/Internal/MySQLQueryCompilationContextFactory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLQueryStringFactory.cs b/EFCore/src/Query/Internal/MySQLQueryStringFactory.cs
index d226ef133..caac3d8f1 100644
--- a/EFCore/src/Query/Internal/MySQLQueryStringFactory.cs
+++ b/EFCore/src/Query/Internal/MySQLQueryStringFactory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessor.cs b/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessor.cs
index 0cd1f61f6..5112c5e0c 100644
--- a/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessor.cs
+++ b/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessorFactory.cs b/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessorFactory.cs
index 70d18e8d6..147a36511 100644
--- a/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessorFactory.cs
+++ b/EFCore/src/Query/Internal/MySQLQueryTranslationPostprocessorFactory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs b/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs
index 048670b14..df6173fc6 100644
--- a/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs
+++ b/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs b/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs
index 28a37ed98..4ecd6edd1 100644
--- a/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs
+++ b/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLSqlTranslatingExpressionVisitor.cs b/EFCore/src/Query/Internal/MySQLSqlTranslatingExpressionVisitor.cs
index 1d0634dcf..6ee7e7c35 100644
--- a/EFCore/src/Query/Internal/MySQLSqlTranslatingExpressionVisitor.cs
+++ b/EFCore/src/Query/Internal/MySQLSqlTranslatingExpressionVisitor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLSqlTranslatingExpressionVisitorFactory.cs b/EFCore/src/Query/Internal/MySQLSqlTranslatingExpressionVisitorFactory.cs
index 2361df0cb..7e476ba9d 100644
--- a/EFCore/src/Query/Internal/MySQLSqlTranslatingExpressionVisitorFactory.cs
+++ b/EFCore/src/Query/Internal/MySQLSqlTranslatingExpressionVisitorFactory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLStringMemberTranslator.cs b/EFCore/src/Query/Internal/MySQLStringMemberTranslator.cs
index c320307c3..1dee350d7 100644
--- a/EFCore/src/Query/Internal/MySQLStringMemberTranslator.cs
+++ b/EFCore/src/Query/Internal/MySQLStringMemberTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Internal/MySQLStringMethodTranslator.cs b/EFCore/src/Query/Internal/MySQLStringMethodTranslator.cs
index 5e69861b1..c3697e56c 100644
--- a/EFCore/src/Query/Internal/MySQLStringMethodTranslator.cs
+++ b/EFCore/src/Query/Internal/MySQLStringMethodTranslator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/MySQLJsonString.cs b/EFCore/src/Query/MySQLJsonString.cs
index 86abded85..809869338 100644
--- a/EFCore/src/Query/MySQLJsonString.cs
+++ b/EFCore/src/Query/MySQLJsonString.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Sql/Internal/MySQLQueryGeneratorFactory.cs b/EFCore/src/Query/Sql/Internal/MySQLQueryGeneratorFactory.cs
index 20c8752ff..75844a37e 100644
--- a/EFCore/src/Query/Sql/Internal/MySQLQueryGeneratorFactory.cs
+++ b/EFCore/src/Query/Sql/Internal/MySQLQueryGeneratorFactory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Query/Sql/Internal/MySQLQuerySqlGenerator.cs b/EFCore/src/Query/Sql/Internal/MySQLQuerySqlGenerator.cs
index 9d529e3ef..e986d1f97 100644
--- a/EFCore/src/Query/Sql/Internal/MySQLQuerySqlGenerator.cs
+++ b/EFCore/src/Query/Sql/Internal/MySQLQuerySqlGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Scaffolding/Internal/MySQLCodeGenerator.cs b/EFCore/src/Scaffolding/Internal/MySQLCodeGenerator.cs
index 0e24d85b8..51b081e41 100644
--- a/EFCore/src/Scaffolding/Internal/MySQLCodeGenerator.cs
+++ b/EFCore/src/Scaffolding/Internal/MySQLCodeGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Scaffolding/Internal/MySQLDataReaderExtension.cs b/EFCore/src/Scaffolding/Internal/MySQLDataReaderExtension.cs
index eaaac93d4..a68236874 100644
--- a/EFCore/src/Scaffolding/Internal/MySQLDataReaderExtension.cs
+++ b/EFCore/src/Scaffolding/Internal/MySQLDataReaderExtension.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Scaffolding/Internal/MySQLDatabaseModelFactory.cs b/EFCore/src/Scaffolding/Internal/MySQLDatabaseModelFactory.cs
index 1c43cc806..9818f28dc 100644
--- a/EFCore/src/Scaffolding/Internal/MySQLDatabaseModelFactory.cs
+++ b/EFCore/src/Scaffolding/Internal/MySQLDatabaseModelFactory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/ByteArrayComparer.cs b/EFCore/src/Storage/Internal/ByteArrayComparer.cs
index 72f36aa92..c99fda081 100644
--- a/EFCore/src/Storage/Internal/ByteArrayComparer.cs
+++ b/EFCore/src/Storage/Internal/ByteArrayComparer.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/BytesToDateTimeConverter.cs b/EFCore/src/Storage/Internal/BytesToDateTimeConverter.cs
index 704cc911a..d92aefb1d 100644
--- a/EFCore/src/Storage/Internal/BytesToDateTimeConverter.cs
+++ b/EFCore/src/Storage/Internal/BytesToDateTimeConverter.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/IMySQLRelationalConnection.cs b/EFCore/src/Storage/Internal/IMySQLRelationalConnection.cs
index ca4d34b15..32a6c4ae9 100644
--- a/EFCore/src/Storage/Internal/IMySQLRelationalConnection.cs
+++ b/EFCore/src/Storage/Internal/IMySQLRelationalConnection.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLBoolTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLBoolTypeMapping.cs
index 918770f7c..f1b7d2148 100644
--- a/EFCore/src/Storage/Internal/MySQLBoolTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLBoolTypeMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLByteArrayTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLByteArrayTypeMapping.cs
index d9ecd53dd..f95732c81 100644
--- a/EFCore/src/Storage/Internal/MySQLByteArrayTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLByteArrayTypeMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLDatabaseCreator.cs b/EFCore/src/Storage/Internal/MySQLDatabaseCreator.cs
index a91f1be01..21ef77904 100644
--- a/EFCore/src/Storage/Internal/MySQLDatabaseCreator.cs
+++ b/EFCore/src/Storage/Internal/MySQLDatabaseCreator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLDateTimeOffsetTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLDateTimeOffsetTypeMapping.cs
index 7c31ad5fd..d63ac03bf 100644
--- a/EFCore/src/Storage/Internal/MySQLDateTimeOffsetTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLDateTimeOffsetTypeMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLDateTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLDateTypeMapping.cs
index 03b6fd744..68f939a73 100644
--- a/EFCore/src/Storage/Internal/MySQLDateTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLDateTypeMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLDatetimeTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLDatetimeTypeMapping.cs
index 38df28500..269566f6c 100644
--- a/EFCore/src/Storage/Internal/MySQLDatetimeTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLDatetimeTypeMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLDecimalTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLDecimalTypeMapping.cs
index 739bd4a75..1520a8164 100644
--- a/EFCore/src/Storage/Internal/MySQLDecimalTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLDecimalTypeMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLDoubleTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLDoubleTypeMapping.cs
index e5091a087..401846f59 100644
--- a/EFCore/src/Storage/Internal/MySQLDoubleTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLDoubleTypeMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLExecutionStrategy.cs b/EFCore/src/Storage/Internal/MySQLExecutionStrategy.cs
index cdee7a927..cc0793aa7 100644
--- a/EFCore/src/Storage/Internal/MySQLExecutionStrategy.cs
+++ b/EFCore/src/Storage/Internal/MySQLExecutionStrategy.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLExecutionStrategyFactory.cs b/EFCore/src/Storage/Internal/MySQLExecutionStrategyFactory.cs
index a977b7cf2..b7caac1b4 100644
--- a/EFCore/src/Storage/Internal/MySQLExecutionStrategyFactory.cs
+++ b/EFCore/src/Storage/Internal/MySQLExecutionStrategyFactory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLFloatTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLFloatTypeMapping.cs
index 0ace2680d..9db0bee5e 100644
--- a/EFCore/src/Storage/Internal/MySQLFloatTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLFloatTypeMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLGeometryTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLGeometryTypeMapping.cs
index f808990f1..deb61e2c0 100644
--- a/EFCore/src/Storage/Internal/MySQLGeometryTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLGeometryTypeMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLGuidTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLGuidTypeMapping.cs
index 6f6977b93..3aee65a32 100644
--- a/EFCore/src/Storage/Internal/MySQLGuidTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLGuidTypeMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLJsonChangeTrackingOptions.cs b/EFCore/src/Storage/Internal/MySQLJsonChangeTrackingOptions.cs
index 5396f175e..2e7ab243c 100644
--- a/EFCore/src/Storage/Internal/MySQLJsonChangeTrackingOptions.cs
+++ b/EFCore/src/Storage/Internal/MySQLJsonChangeTrackingOptions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLJsonTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLJsonTypeMapping.cs
index 996abd8ae..332ca01ee 100644
--- a/EFCore/src/Storage/Internal/MySQLJsonTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLJsonTypeMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLRelationalConnection.cs b/EFCore/src/Storage/Internal/MySQLRelationalConnection.cs
index 69dd43bb8..cc1e391e7 100644
--- a/EFCore/src/Storage/Internal/MySQLRelationalConnection.cs
+++ b/EFCore/src/Storage/Internal/MySQLRelationalConnection.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLScaffoldingConnectionSettings.cs b/EFCore/src/Storage/Internal/MySQLScaffoldingConnectionSettings.cs
index fc306bfa1..9f4b301f7 100644
--- a/EFCore/src/Storage/Internal/MySQLScaffoldingConnectionSettings.cs
+++ b/EFCore/src/Storage/Internal/MySQLScaffoldingConnectionSettings.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLSqlGenerationHelper.cs b/EFCore/src/Storage/Internal/MySQLSqlGenerationHelper.cs
index fc5ebe71d..44bdba26f 100644
--- a/EFCore/src/Storage/Internal/MySQLSqlGenerationHelper.cs
+++ b/EFCore/src/Storage/Internal/MySQLSqlGenerationHelper.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLStringTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLStringTypeMapping.cs
index d4b1e6f8d..4979b239f 100644
--- a/EFCore/src/Storage/Internal/MySQLStringTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLStringTypeMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLTimeSpanMapping.cs b/EFCore/src/Storage/Internal/MySQLTimeSpanMapping.cs
index 354217789..9af35fb0a 100644
--- a/EFCore/src/Storage/Internal/MySQLTimeSpanMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLTimeSpanMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLTransientExceptionDetector.cs b/EFCore/src/Storage/Internal/MySQLTransientExceptionDetector.cs
index b8ce03b8c..d608ea6c7 100644
--- a/EFCore/src/Storage/Internal/MySQLTransientExceptionDetector.cs
+++ b/EFCore/src/Storage/Internal/MySQLTransientExceptionDetector.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLTypeMapping.cs
index 15c9caecf..94b3ba746 100644
--- a/EFCore/src/Storage/Internal/MySQLTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLTypeMapping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs b/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs
index a1b59b05b..831d01a94 100644
--- a/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs
+++ b/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs b/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs
index 905cec451..c27d2f48d 100644
--- a/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs
+++ b/EFCore/src/Update/IMySQLUpdateSqlGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Update/MySQLModificationCommandBatch.cs b/EFCore/src/Update/MySQLModificationCommandBatch.cs
index 8e238c2dd..bb93a4762 100644
--- a/EFCore/src/Update/MySQLModificationCommandBatch.cs
+++ b/EFCore/src/Update/MySQLModificationCommandBatch.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Update/MySQLModificationCommandBatchFactory.cs b/EFCore/src/Update/MySQLModificationCommandBatchFactory.cs
index d104ca6b1..e03dd8e76 100644
--- a/EFCore/src/Update/MySQLModificationCommandBatchFactory.cs
+++ b/EFCore/src/Update/MySQLModificationCommandBatchFactory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
index 145b8fe39..7caf477ec 100644
--- a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
+++ b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Utils/Check.cs b/EFCore/src/Utils/Check.cs
index 6984e9625..2b6408fdb 100644
--- a/EFCore/src/Utils/Check.cs
+++ b/EFCore/src/Utils/Check.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Utils/CodeAnnotations.cs b/EFCore/src/Utils/CodeAnnotations.cs
index ea07d310e..1ee0e5880 100644
--- a/EFCore/src/Utils/CodeAnnotations.cs
+++ b/EFCore/src/Utils/CodeAnnotations.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Utils/CodeAttributes.cs b/EFCore/src/Utils/CodeAttributes.cs
index 95b9ec4ea..dda508d4f 100644
--- a/EFCore/src/Utils/CodeAttributes.cs
+++ b/EFCore/src/Utils/CodeAttributes.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Utils/SharedTypeExtensions.cs b/EFCore/src/Utils/SharedTypeExtensions.cs
index b1ebef71c..b09c5b396 100644
--- a/EFCore/src/Utils/SharedTypeExtensions.cs
+++ b/EFCore/src/Utils/SharedTypeExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Utils/Static.cs b/EFCore/src/Utils/Static.cs
index 484e87a4d..42e67383d 100644
--- a/EFCore/src/Utils/Static.cs
+++ b/EFCore/src/Utils/Static.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/Utils/StringBuilderExtensions.cs b/EFCore/src/Utils/StringBuilderExtensions.cs
index 8a4785544..1a431a88d 100644
--- a/EFCore/src/Utils/StringBuilderExtensions.cs
+++ b/EFCore/src/Utils/StringBuilderExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/src/ValueGeneration/Internal/MySQLValueGeneratorSelector.cs b/EFCore/src/ValueGeneration/Internal/MySQLValueGeneratorSelector.cs
index a332347e1..81137081b 100644
--- a/EFCore/src/ValueGeneration/Internal/MySQLValueGeneratorSelector.cs
+++ b/EFCore/src/ValueGeneration/Internal/MySQLValueGeneratorSelector.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs
index 3b0eb6bf3..413d83328 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/BasicGuidTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs
index 8e21b9acc..feb4024b3 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ConcurrencyTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
index 3f32516bf..1a82a5f62 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs
index 39db69db3..c8c9f227e 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DataTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/ConventionsContexts.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/ConventionsContexts.cs
index aa5b635b1..c5f089188 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/ConventionsContexts.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/ConventionsContexts.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EFFluentAPIContexts.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EFFluentAPIContexts.cs
index 33940a28c..ea30b2019 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EFFluentAPIContexts.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EFFluentAPIContexts.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EntitiesClasses.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EntitiesClasses.cs
index 863606a21..d28d32e81 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EntitiesClasses.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EntitiesClasses.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/SakilaLiteContext.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/SakilaLiteContext.cs
index a3141586a..25f240287 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/SakilaLiteContext.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/SakilaLiteContext.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/TestsContexts.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/TestsContexts.cs
index 2cc62d404..156e905be 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/TestsContexts.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/TestsContexts.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs
index 3cab9cf34..645045092 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DbFunctionsMySQLTest.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
index d062758c1..531dd6025 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs
index 4a4c79982..37c27ffbb 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/FluentAPITests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/FunctionalTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/FunctionalTests.cs
index ef926a1b6..b12e73b80 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/FunctionalTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/FunctionalTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs
index c0c67bf8b..c73eb25c1 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/LoadingRelatedDataTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ModelingTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ModelingTests.cs
index 8ba63fd0b..d20647d7b 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ModelingTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ModelingTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MultiSchemaTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/MultiSchemaTests.cs
index 0a4959aed..8a82615aa 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MultiSchemaTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MultiSchemaTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLDatabaseFacadeTest.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLDatabaseFacadeTest.cs
index 1ce799ba6..1c203cc07 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLDatabaseFacadeTest.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLDatabaseFacadeTest.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
index e94c583c5..03a06aac0 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/Properties/DatabaseSetup.sql b/EFCore/tests/MySql.EFCore.Basic.Tests/Properties/DatabaseSetup.sql
index 4f4d91d2f..6a67848d2 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/Properties/DatabaseSetup.sql
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/Properties/DatabaseSetup.sql
@@ -1,5 +1,5 @@
 /*
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ShadowPropertiesTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ShadowPropertiesTests.cs
index cbc676c76..faf443047 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ShadowPropertiesTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ShadowPropertiesTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/UpdateTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/UpdateTests.cs
index baa1ec466..0a95d864b 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/UpdateTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/UpdateTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/EntityTestsFixtureClass.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/EntityTestsFixtureClass.cs
index 87696ef1b..2903470fa 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/EntityTestsFixtureClass.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/EntityTestsFixtureClass.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs
index 1cbdf19c8..776026ab7 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/TestUtils.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/TestUtils.cs
index a09e6ab14..7b9b59314 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/TestUtils.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/TestUtils.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/Extensions.cs b/EFCore/tests/MySql.EFCore.Design.Tests/Extensions.cs
index db11322d0..1543ee7ab 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/Extensions.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/Extensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLAnnotationCodeGeneratorTest.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLAnnotationCodeGeneratorTest.cs
index 6e5e9d6ce..7f0ed3e2a 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLAnnotationCodeGeneratorTest.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLAnnotationCodeGeneratorTest.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLCodeGeneratorTest.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLCodeGeneratorTest.cs
index b0e83d66f..42f3804c9 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLCodeGeneratorTest.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLCodeGeneratorTest.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs
index a5032f43a..beb0ab423 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFactoryTest.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFixture.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFixture.cs
index 3e7365b7b..fc586e967 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFixture.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDatabaseModelFixture.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDesignTimeProviderServicesTest.cs b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDesignTimeProviderServicesTest.cs
index 5331e8b81..8c30712d7 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDesignTimeProviderServicesTest.cs
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySQLDesignTimeProviderServicesTest.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/Properties/sakiladb-schema.sql b/EFCore/tests/MySql.EFCore.Design.Tests/Properties/sakiladb-schema.sql
index 5ea9e57d9..33a025602 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/Properties/sakiladb-schema.sql
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/Properties/sakiladb-schema.sql
@@ -1,5 +1,5 @@
 /*
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/Properties/world.sql b/EFCore/tests/MySql.EFCore.Design.Tests/Properties/world.sql
index 1251c03f6..9374e9c57 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/Properties/world.sql
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/Properties/world.sql
@@ -1,5 +1,5 @@
 /*
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLHistoryRepositoryTests.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLHistoryRepositoryTests.cs
index 7ae230162..6421977d3 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLHistoryRepositoryTests.cs
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLHistoryRepositoryTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs
index a91f32c00..204076761 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTest.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTest.cs
index 7be723ae2..53b36fcaa 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTest.cs
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTest.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTestBase.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTestBase.cs
index e597dfcee..402723c3e 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTestBase.cs
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySqlMigrationsGeneratorTestBase.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/Utilities/ContextUtils.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/Utilities/ContextUtils.cs
index 5f059f6a0..813de5cde 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/Utilities/ContextUtils.cs
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/Utilities/ContextUtils.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/EFMySqlCommand.cs b/EntityFramework/src/EFMySqlCommand.cs
index 0dd6d642c..9fcb1a1c9 100644
--- a/EntityFramework/src/EFMySqlCommand.cs
+++ b/EntityFramework/src/EFMySqlCommand.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/EFMySqlDataReader.cs b/EntityFramework/src/EFMySqlDataReader.cs
index c4342f567..68d923bf4 100644
--- a/EntityFramework/src/EFMySqlDataReader.cs
+++ b/EntityFramework/src/EFMySqlDataReader.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Fragments/InputFragment.cs b/EntityFramework/src/Fragments/InputFragment.cs
index 80ea10800..f55461249 100644
--- a/EntityFramework/src/Fragments/InputFragment.cs
+++ b/EntityFramework/src/Fragments/InputFragment.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Fragments/JoinFragment.cs b/EntityFramework/src/Fragments/JoinFragment.cs
index 466c04bc6..dde7a8608 100644
--- a/EntityFramework/src/Fragments/JoinFragment.cs
+++ b/EntityFramework/src/Fragments/JoinFragment.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Fragments/SqlFragment.cs b/EntityFramework/src/Fragments/SqlFragment.cs
index 97abc6c3b..1e16b734f 100644
--- a/EntityFramework/src/Fragments/SqlFragment.cs
+++ b/EntityFramework/src/Fragments/SqlFragment.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Fragments/TableFragment.cs b/EntityFramework/src/Fragments/TableFragment.cs
index b9c6653d4..a0371d500 100644
--- a/EntityFramework/src/Fragments/TableFragment.cs
+++ b/EntityFramework/src/Fragments/TableFragment.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Generators/DeleteGenerator.cs b/EntityFramework/src/Generators/DeleteGenerator.cs
index 7b1cd1408..d23018443 100644
--- a/EntityFramework/src/Generators/DeleteGenerator.cs
+++ b/EntityFramework/src/Generators/DeleteGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Generators/FunctionGenerator.cs b/EntityFramework/src/Generators/FunctionGenerator.cs
index 6ec949f79..b5f9f6197 100644
--- a/EntityFramework/src/Generators/FunctionGenerator.cs
+++ b/EntityFramework/src/Generators/FunctionGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Generators/FunctionProcessor.cs b/EntityFramework/src/Generators/FunctionProcessor.cs
index 1eaa1eb87..0db93eafa 100644
--- a/EntityFramework/src/Generators/FunctionProcessor.cs
+++ b/EntityFramework/src/Generators/FunctionProcessor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Generators/InsertGenerator.cs b/EntityFramework/src/Generators/InsertGenerator.cs
index b1fbb5e34..9dda3075a 100644
--- a/EntityFramework/src/Generators/InsertGenerator.cs
+++ b/EntityFramework/src/Generators/InsertGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Generators/Scope.cs b/EntityFramework/src/Generators/Scope.cs
index eabf4d397..cf7b7d873 100644
--- a/EntityFramework/src/Generators/Scope.cs
+++ b/EntityFramework/src/Generators/Scope.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Generators/SelectGenerator.cs b/EntityFramework/src/Generators/SelectGenerator.cs
index a4da311f4..5ef0362af 100644
--- a/EntityFramework/src/Generators/SelectGenerator.cs
+++ b/EntityFramework/src/Generators/SelectGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Generators/SqlGenerator.cs b/EntityFramework/src/Generators/SqlGenerator.cs
index 717d87d5f..a7cf234d3 100644
--- a/EntityFramework/src/Generators/SqlGenerator.cs
+++ b/EntityFramework/src/Generators/SqlGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Generators/UpdateGenerator.cs b/EntityFramework/src/Generators/UpdateGenerator.cs
index d4e1169fc..ac8c1aee8 100644
--- a/EntityFramework/src/Generators/UpdateGenerator.cs
+++ b/EntityFramework/src/Generators/UpdateGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Metadata.cs b/EntityFramework/src/Metadata.cs
index f4da5682a..414c4726f 100644
--- a/EntityFramework/src/Metadata.cs
+++ b/EntityFramework/src/Metadata.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index d5c63d0f2..5ded04f19 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -107,4 +107,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/EntityFramework/src/MySqlConnectionFactory.cs b/EntityFramework/src/MySqlConnectionFactory.cs
index b8e0fa159..6777c323f 100644
--- a/EntityFramework/src/MySqlConnectionFactory.cs
+++ b/EntityFramework/src/MySqlConnectionFactory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/MySqlDependencyResolver.cs b/EntityFramework/src/MySqlDependencyResolver.cs
index c4f5eafea..189c23353 100644
--- a/EntityFramework/src/MySqlDependencyResolver.cs
+++ b/EntityFramework/src/MySqlDependencyResolver.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/MySqlEFConfiguration.cs b/EntityFramework/src/MySqlEFConfiguration.cs
index 1f99e6a9a..36ce383f7 100644
--- a/EntityFramework/src/MySqlEFConfiguration.cs
+++ b/EntityFramework/src/MySqlEFConfiguration.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/MySqlExecutionStrategy.cs b/EntityFramework/src/MySqlExecutionStrategy.cs
index 8740d3173..1fa6a8348 100644
--- a/EntityFramework/src/MySqlExecutionStrategy.cs
+++ b/EntityFramework/src/MySqlExecutionStrategy.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/MySqlHistoryContext.cs b/EntityFramework/src/MySqlHistoryContext.cs
index 9235ba7ef..8154745b2 100644
--- a/EntityFramework/src/MySqlHistoryContext.cs
+++ b/EntityFramework/src/MySqlHistoryContext.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/MySqlLogger.cs b/EntityFramework/src/MySqlLogger.cs
index 00624aaa9..9b7863bf3 100644
--- a/EntityFramework/src/MySqlLogger.cs
+++ b/EntityFramework/src/MySqlLogger.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/MySqlMigrationSqlGenerator.cs b/EntityFramework/src/MySqlMigrationSqlGenerator.cs
index 32e3b50ac..5fc83f782 100644
--- a/EntityFramework/src/MySqlMigrationSqlGenerator.cs
+++ b/EntityFramework/src/MySqlMigrationSqlGenerator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/MySqlSpatialDataReader.cs b/EntityFramework/src/MySqlSpatialDataReader.cs
index 8299b68f0..8425a70da 100644
--- a/EntityFramework/src/MySqlSpatialDataReader.cs
+++ b/EntityFramework/src/MySqlSpatialDataReader.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/MySqlSpatialServices.cs b/EntityFramework/src/MySqlSpatialServices.cs
index f346f2ea6..bd7071d35 100644
--- a/EntityFramework/src/MySqlSpatialServices.cs
+++ b/EntityFramework/src/MySqlSpatialServices.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Properties/AssemblyInfo.cs b/EntityFramework/src/Properties/AssemblyInfo.cs
index 622e7d7a4..b99934a90 100644
--- a/EntityFramework/src/Properties/AssemblyInfo.cs
+++ b/EntityFramework/src/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Properties/VersionInfo.cs b/EntityFramework/src/Properties/VersionInfo.cs
index 0e0ddbb1f..e4c0f01b6 100644
--- a/EntityFramework/src/Properties/VersionInfo.cs
+++ b/EntityFramework/src/Properties/VersionInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2024, Oracle and/or its affiliates.
+// Copyright © 2024, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/ProviderManifest.cs b/EntityFramework/src/ProviderManifest.cs
index 0c3cf868f..e2cf1a83a 100644
--- a/EntityFramework/src/ProviderManifest.cs
+++ b/EntityFramework/src/ProviderManifest.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/ProviderServices.cs b/EntityFramework/src/ProviderServices.cs
index f992126ce..e48803aad 100644
--- a/EntityFramework/src/ProviderServices.cs
+++ b/EntityFramework/src/ProviderServices.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Statements/DeleteStatement.cs b/EntityFramework/src/Statements/DeleteStatement.cs
index e4f9db157..28dab1486 100644
--- a/EntityFramework/src/Statements/DeleteStatement.cs
+++ b/EntityFramework/src/Statements/DeleteStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Statements/InsertStatement.cs b/EntityFramework/src/Statements/InsertStatement.cs
index 9a818a170..0b22db824 100644
--- a/EntityFramework/src/Statements/InsertStatement.cs
+++ b/EntityFramework/src/Statements/InsertStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Statements/SelectStatement.cs b/EntityFramework/src/Statements/SelectStatement.cs
index 74e7b2fef..cf355998e 100644
--- a/EntityFramework/src/Statements/SelectStatement.cs
+++ b/EntityFramework/src/Statements/SelectStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/src/Statements/UpdateStatement.cs b/EntityFramework/src/Statements/UpdateStatement.cs
index 7ae917d37..110106dd4 100644
--- a/EntityFramework/src/Statements/UpdateStatement.cs
+++ b/EntityFramework/src/Statements/UpdateStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/AggregateOperators.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/AggregateOperators.cs
index 2692f73d1..2a19d098a 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/AggregateOperators.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/AggregateOperators.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/CanonicalFunctions.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/CanonicalFunctions.cs
index cecb039a7..1d9e66635 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/CanonicalFunctions.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/CanonicalFunctions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DataTypeTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DataTypeTests.cs
index f36994dc8..7e5471d39 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DataTypeTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DataTypeTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DatesTypesTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DatesTypesTests.cs
index f9b72046e..801858c3c 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DatesTypesTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DatesTypesTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2011, 2024, Oracle and/or its affiliates.
+// Copyright © 2011, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DefaultContext.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DefaultContext.cs
index 33e99cb62..4c2b5ca82 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DefaultContext.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DefaultContext.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DefaultFixture.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DefaultFixture.cs
index bd36e9c6c..8efdebde4 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DefaultFixture.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DefaultFixture.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DeleteTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DeleteTests.cs
index eac1476b9..8429f1f6f 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DeleteTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/DeleteTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ExpressionTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ExpressionTests.cs
index 9b2acc565..44667e099 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ExpressionTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ExpressionTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/GenericListener.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/GenericListener.cs
index ac9eb770f..dec000e96 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/GenericListener.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/GenericListener.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/InsertTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/InsertTests.cs
index 19c198969..2f1174097 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/InsertTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/InsertTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/JoinTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/JoinTests.cs
index 6528be396..bad80f7c0 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/JoinTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/JoinTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
index 92e590f7e..1434a7522 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.Data.EntityFramework.CodeFirTests</Description>
-    <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
+    <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.3.0</Version>
     <Authors>Oracle</Authors>
@@ -62,4 +62,4 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/OrderingAndGrouping.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/OrderingAndGrouping.cs
index 4160653a9..c95c995df 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/OrderingAndGrouping.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/OrderingAndGrouping.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Paging.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Paging.cs
index 2b04847a1..aab415d67 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Paging.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Paging.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProceduresAndFunctions.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProceduresAndFunctions.cs
index fd2b0126a..6a23d1b88 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProceduresAndFunctions.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProceduresAndFunctions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Properties/AssemblyInfo.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Properties/AssemblyInfo.cs
index 0c52fccc9..2bd86ed8d 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Properties/AssemblyInfo.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2008, 2024, Oracle and/or its affiliates.
+// Copyright © 2008, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
@@ -38,7 +38,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle")]
 [assembly: AssemblyProduct("MySql.Data.EntityFramework.Tests")]
-[assembly: AssemblyCopyright("Copyright © 2008, 2024, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2008, 2025, Oracle and/or its affiliates.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderManifestTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderManifestTests.cs
index fb7e0f4cc..aae8e618c 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderManifestTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderManifestTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderServicesTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderServicesTests.cs
index 6a500f835..c7724fbaa 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderServicesTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/ProviderServicesTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/RelationalOperators.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/RelationalOperators.cs
index 63af2ec8f..8d19b5a35 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/RelationalOperators.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/RelationalOperators.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/RestrictionOperators.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/RestrictionOperators.cs
index 7e236f3e3..ee2e87f67 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/RestrictionOperators.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/RestrictionOperators.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SchemaInformation.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SchemaInformation.cs
index 6bf9c7fc6..533520f5d 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SchemaInformation.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SchemaInformation.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SetOperators.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SetOperators.cs
index 3ebc28dbb..831028559 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SetOperators.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SetOperators.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SimpleQuery.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SimpleQuery.cs
index 8ef037ed9..5b5a5f857 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SimpleQuery.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/SimpleQuery.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/UpdateTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/UpdateTests.cs
index e47461739..887e14908 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/UpdateTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/UpdateTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Wizard.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Wizard.cs
index 9ed361481..331db08b4 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Wizard.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Wizard.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Blogs.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Blogs.cs
index fb191bfd1..46654e07f 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Blogs.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Blogs.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs
index e5af704a4..95fe2c649 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
@@ -191,4 +191,4 @@ public override void Fail(string message, string detailMessage)
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
index a393ea79d..5796c3e1e 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/ContextForNormalFk.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/ContextForNormalFk.cs
index 6596b2980..4f867370d 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/ContextForNormalFk.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/ContextForNormalFk.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/ContextForString.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/ContextForString.cs
index b4aa8c757..131e32d2b 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/ContextForString.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/ContextForString.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Dinosauria.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Dinosauria.cs
index 88cea952a..fcbd96de0 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Dinosauria.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Dinosauria.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Movie.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Movie.cs
index b9eef7b50..e7a03477e 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Movie.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Movie.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MovieContextCodeBasedConfiguration.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MovieContextCodeBasedConfiguration.cs
index a15080adc..eba30e4e5 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MovieContextCodeBasedConfiguration.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MovieContextCodeBasedConfiguration.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
index ffe3918ea..93bf4c32a 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.Data.EntityFramework.CodeFirst.Tests</Description>
-    <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
+    <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.3.0</Version>
     <Authors>Oracle</Authors>
@@ -89,4 +89,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/PromotionsDB.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/PromotionsDB.cs
index 0c828a3c2..9ac820133 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/PromotionsDB.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/PromotionsDB.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/AssemblyInfo.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/AssemblyInfo.cs
index 04f490d66..deb966b88 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/AssemblyInfo.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
@@ -38,7 +38,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle")]
 [assembly: AssemblyProduct("MySql.EntityFramework.CodeFirst.Tests")]
-[assembly: AssemblyCopyright("Copyright © 2011, 2024, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2011, 2025, Oracle and/or its affiliates.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-data.sql b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-data.sql
index e9d80306c..8d8cf971f 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-data.sql
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-data.sql
@@ -1,7 +1,7 @@
 -- Sakila Sample Database Data
 -- Version 1.0
 
--- Copyright © 2006, 2024, Oracle and/or its affiliates. 
+-- Copyright © 2006, 2025, Oracle and/or its affiliates.
 
 -- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-schema.sql b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-schema.sql
index 2d4ee1027..27d72af88 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-schema.sql
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Properties/sakila-schema.sql
@@ -1,7 +1,7 @@
 -- Sakila Sample Database Schema
 -- Version 1.0
 
--- Copyright © 2006, 2024, Oracle and/or its affiliates. 
+-- Copyright © 2006, 2025, Oracle and/or its affiliates.
 
 -- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/SakilaDb.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/SakilaDb.cs
index e55e11b2b..f85c5e1aa 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/SakilaDb.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/SakilaDb.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/actor.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/actor.cs
index 807687777..593109cba 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/actor.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/actor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/actor_info.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/actor_info.cs
index 5bbca857d..6d67e3e3b 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/actor_info.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/actor_info.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/address.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/address.cs
index 468690dd3..57de2b153 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/address.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/address.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/category.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/category.cs
index 73427f5a1..ef201da34 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/category.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/category.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/city.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/city.cs
index d85e1697b..6df411949 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/city.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/city.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/country.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/country.cs
index 976f99ed4..85a4613db 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/country.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/country.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/customer.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/customer.cs
index 1e3e91d29..5d6fbbeca 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/customer.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/customer.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/customer_list.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/customer_list.cs
index 723dbbaa2..a0440407f 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/customer_list.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/customer_list.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film.cs
index 0bfd594bf..715aa9f60 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_actor.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_actor.cs
index 2c7f0b3ad..572dd915f 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_actor.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_actor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_category.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_category.cs
index 141bc32c0..f76371277 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_category.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_category.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_list.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_list.cs
index 72d666a2f..cfb3c6c80 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_list.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_list.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_text.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_text.cs
index 4172112a3..327a9b74e 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_text.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_text.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/inventory.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/inventory.cs
index dfe44cc9d..c8506e285 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/inventory.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/inventory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/language.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/language.cs
index 11e03594a..f725d5b97 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/language.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/language.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/nicer_but_slower_film_list.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/nicer_but_slower_film_list.cs
index 18a3ba82a..c6bbcc04f 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/nicer_but_slower_film_list.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/nicer_but_slower_film_list.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/payment.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/payment.cs
index e5e340e12..5e2f44097 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/payment.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/payment.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/rental.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/rental.cs
index 0666386ae..676725c55 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/rental.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/rental.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/sales_by_film_category.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/sales_by_film_category.cs
index 3d57e8646..92f6a88a8 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/sales_by_film_category.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/sales_by_film_category.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/sales_by_store.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/sales_by_store.cs
index b201072ba..d6c5e81dc 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/sales_by_store.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/sales_by_store.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/staff.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/staff.cs
index e6b1de971..d117df6ff 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/staff.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/staff.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/staff_list.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/staff_list.cs
index 8178a9b58..3ed986485 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/staff_list.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/staff_list.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/store.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/store.cs
index 1e06daa1f..e32a13c0c 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/store.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/store.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Ship.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Ship.cs
index c84880871..b25950334 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Ship.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Ship.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SiteDB.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SiteDB.cs
index 0c4ef948f..8e30623d4 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SiteDB.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SiteDB.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/TransactionTests.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/TransactionTests.cs
index ad63970cc..15be38e01 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/TransactionTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/TransactionTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2016, 2024, Oracle and/or its affiliates.
+// Copyright © 2016, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Vehicle.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Vehicle.cs
index 4dd1630e7..f95bbbfa1 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Vehicle.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Vehicle.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/BlogsModel.cs b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/BlogsModel.cs
index c83ee138e..d2b4b4cf7 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/BlogsModel.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/BlogsModel.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MyConfiguration.cs b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MyConfiguration.cs
index 79e6de550..b316b0781 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MyConfiguration.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MyConfiguration.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
index 51d53f219..4aacbcf39 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.Data.EntityFramework.Migrations.Tests</Description>
-    <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
+    <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.3.0</Version>
     <Authors>Oracle</Authors>
@@ -58,4 +58,4 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySqlMigrationsTests.cs b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySqlMigrationsTests.cs
index e43268894..1fe29388d 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySqlMigrationsTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySqlMigrationsTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/Properties/AssemblyInfo.cs b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/Properties/AssemblyInfo.cs
index 17dbf24a2..c337fd60a 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/Properties/AssemblyInfo.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
@@ -39,7 +39,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle")]
 [assembly: AssemblyProduct("MySql.Data.EntityFramework.Migrations.Tests")]
-[assembly: AssemblyCopyright("Copyright © 2013, 2024, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2013, 2025, Oracle and/or its affiliates.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/SetUpMigrationsTests.cs b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/SetUpMigrationsTests.cs
index 1b5599a5f..f39c7375e 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/SetUpMigrationsTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/SetUpMigrationsTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index f84a6c2e9..bc38d3e17 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -40,4 +40,4 @@
     <PackageReference Include="OpenTelemetry.Api" Version="1.9.0" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs b/MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs
index 37ea42a17..50362f2a6 100644
--- a/MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs
+++ b/MySQL.Data.OpenTelemetry/src/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2024, Oracle and/or its affiliates.
+// Copyright © 2024, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs b/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
index c8499687d..10ed39647 100644
--- a/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
+++ b/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2024, Oracle and/or its affiliates.
+// Copyright © 2024, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data.OpenTelemetry/src/TraceProviderBuilderExtension.cs b/MySQL.Data.OpenTelemetry/src/TraceProviderBuilderExtension.cs
index 76393c2a3..0844c66db 100644
--- a/MySQL.Data.OpenTelemetry/src/TraceProviderBuilderExtension.cs
+++ b/MySQL.Data.OpenTelemetry/src/TraceProviderBuilderExtension.cs
@@ -1,4 +1,4 @@
-// Copyright © 2023, 2024, Oracle and/or its affiliates.
+// Copyright © 2023, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
@@ -37,4 +37,4 @@ public static class TracerProviderBuilderExtensions
     public static TracerProviderBuilder AddConnectorNet(
         this TracerProviderBuilder builder)
         => builder.AddSource("connector-net");
-}
\ No newline at end of file
+}
diff --git a/MySQL.Data/MySql.Replication.Tests/BaseTest.cs b/MySQL.Data/MySql.Replication.Tests/BaseTest.cs
index 12f0220d2..0857d727a 100644
--- a/MySQL.Data/MySql.Replication.Tests/BaseTest.cs
+++ b/MySQL.Data/MySql.Replication.Tests/BaseTest.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/MySql.Replication.Tests/Properties/AssemblyInfo.cs b/MySQL.Data/MySql.Replication.Tests/Properties/AssemblyInfo.cs
index 0e3b4168c..cc810761b 100644
--- a/MySQL.Data/MySql.Replication.Tests/Properties/AssemblyInfo.cs
+++ b/MySQL.Data/MySql.Replication.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
@@ -39,7 +39,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle Corporation")]
 [assembly: AssemblyProduct("MySql.LoadBalancing.Tests")]
-[assembly: AssemblyCopyright("Copyright © 2013, 2024, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2013, 2025, Oracle and/or its affiliates.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/MySQL.Data/MySql.Replication.Tests/ReplicationTest.cs b/MySQL.Data/MySql.Replication.Tests/ReplicationTest.cs
index ce9dc5ff1..b6f53f857 100644
--- a/MySQL.Data/MySql.Replication.Tests/ReplicationTest.cs
+++ b/MySQL.Data/MySql.Replication.Tests/ReplicationTest.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/MySql.Replication.Tests/SetUp.cs b/MySQL.Data/MySql.Replication.Tests/SetUp.cs
index 72bba93ff..88edd19b7 100644
--- a/MySQL.Data/MySql.Replication.Tests/SetUp.cs
+++ b/MySQL.Data/MySql.Replication.Tests/SetUp.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/AuthenticationManager.cs b/MySQL.Data/src/Authentication/AuthenticationManager.cs
index cbdcf8adb..92435f652 100644
--- a/MySQL.Data/src/Authentication/AuthenticationManager.cs
+++ b/MySQL.Data/src/Authentication/AuthenticationManager.cs
@@ -1,4 +1,4 @@
-// Copyright © 2012, 2024, Oracle and/or its affiliates.
+// Copyright © 2012, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/CachingSha2AuthenticationPlugin.cs b/MySQL.Data/src/Authentication/CachingSha2AuthenticationPlugin.cs
index f93b060a8..96295a57c 100644
--- a/MySQL.Data/src/Authentication/CachingSha2AuthenticationPlugin.cs
+++ b/MySQL.Data/src/Authentication/CachingSha2AuthenticationPlugin.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/ClearPasswordPlugin.cs b/MySQL.Data/src/Authentication/ClearPasswordPlugin.cs
index 6a7c4744a..b42ebda36 100644
--- a/MySQL.Data/src/Authentication/ClearPasswordPlugin.cs
+++ b/MySQL.Data/src/Authentication/ClearPasswordPlugin.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/FIDO/FidoAssertion.cs b/MySQL.Data/src/Authentication/FIDO/FidoAssertion.cs
index 9c9f610a3..4df6de4e4 100644
--- a/MySQL.Data/src/Authentication/FIDO/FidoAssertion.cs
+++ b/MySQL.Data/src/Authentication/FIDO/FidoAssertion.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/FIDO/FidoDevice.cs b/MySQL.Data/src/Authentication/FIDO/FidoDevice.cs
index 32fde9da4..71a20e1cb 100644
--- a/MySQL.Data/src/Authentication/FIDO/FidoDevice.cs
+++ b/MySQL.Data/src/Authentication/FIDO/FidoDevice.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/FIDO/FidoDeviceInfo.cs b/MySQL.Data/src/Authentication/FIDO/FidoDeviceInfo.cs
index ccac1e5a3..d38a265bb 100644
--- a/MySQL.Data/src/Authentication/FIDO/FidoDeviceInfo.cs
+++ b/MySQL.Data/src/Authentication/FIDO/FidoDeviceInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/FIDO/Native/NativeMethods.cs b/MySQL.Data/src/Authentication/FIDO/Native/NativeMethods.cs
index 53d00e0ee..2931a61b3 100644
--- a/MySQL.Data/src/Authentication/FIDO/Native/NativeMethods.cs
+++ b/MySQL.Data/src/Authentication/FIDO/Native/NativeMethods.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General internal License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/FIDO/Native/Structs.cs b/MySQL.Data/src/Authentication/FIDO/Native/Structs.cs
index c56b3570c..29a2a24a6 100644
--- a/MySQL.Data/src/Authentication/FIDO/Native/Structs.cs
+++ b/MySQL.Data/src/Authentication/FIDO/Native/Structs.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/FIDO/Utility/ConstStringMarshaler.cs b/MySQL.Data/src/Authentication/FIDO/Utility/ConstStringMarshaler.cs
index c6d7e6317..0129ab241 100644
--- a/MySQL.Data/src/Authentication/FIDO/Utility/ConstStringMarshaler.cs
+++ b/MySQL.Data/src/Authentication/FIDO/Utility/ConstStringMarshaler.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/FIDO/Utility/Enums.cs b/MySQL.Data/src/Authentication/FIDO/Utility/Enums.cs
index 68ec522d4..41503cb68 100644
--- a/MySQL.Data/src/Authentication/FIDO/Utility/Enums.cs
+++ b/MySQL.Data/src/Authentication/FIDO/Utility/Enums.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/FIDO/Utility/Extensions.cs b/MySQL.Data/src/Authentication/FIDO/Utility/Extensions.cs
index 2e9fd33cf..b141dc1af 100644
--- a/MySQL.Data/src/Authentication/FIDO/Utility/Extensions.cs
+++ b/MySQL.Data/src/Authentication/FIDO/Utility/Extensions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/FIDO/Utility/FidoExceptions.cs b/MySQL.Data/src/Authentication/FIDO/Utility/FidoExceptions.cs
index 4d628afe8..b0d5ce8dc 100644
--- a/MySQL.Data/src/Authentication/FIDO/Utility/FidoExceptions.cs
+++ b/MySQL.Data/src/Authentication/FIDO/Utility/FidoExceptions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/FIDO/Utility/Init.cs b/MySQL.Data/src/Authentication/FIDO/Utility/Init.cs
index 3b359c321..20d5584e5 100644
--- a/MySQL.Data/src/Authentication/FIDO/Utility/Init.cs
+++ b/MySQL.Data/src/Authentication/FIDO/Utility/Init.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/Const.cs b/MySQL.Data/src/Authentication/GSSAPI/Const.cs
index 4f70c4844..8f153be0c 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/Const.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/Const.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
@@ -107,4 +107,4 @@ internal static class Const
     };
     #endregion
   }
-}
\ No newline at end of file
+}
diff --git a/MySQL.Data/src/Authentication/GSSAPI/GssContext.cs b/MySQL.Data/src/Authentication/GSSAPI/GssContext.cs
index 70b070323..877656696 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/GssContext.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/GssContext.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/GssContextFlags.cs b/MySQL.Data/src/Authentication/GSSAPI/GssContextFlags.cs
index d94f00a49..e0bb81172 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/GssContextFlags.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/GssContextFlags.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/GssCredentials.cs b/MySQL.Data/src/Authentication/GSSAPI/GssCredentials.cs
index 49ca4af7b..ce0908868 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/GssCredentials.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/GssCredentials.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/GssapiMechanism.cs b/MySQL.Data/src/Authentication/GSSAPI/GssapiMechanism.cs
index 59653a8f7..d786785f8 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/GssapiMechanism.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/GssapiMechanism.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/Native/GssBufferDescStruct.cs b/MySQL.Data/src/Authentication/GSSAPI/Native/GssBufferDescStruct.cs
index 90dd88441..36932ed2d 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/Native/GssBufferDescStruct.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/Native/GssBufferDescStruct.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/Native/GssOidStruct.cs b/MySQL.Data/src/Authentication/GSSAPI/Native/GssOidStruct.cs
index 5c1e68877..14165a5f9 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/Native/GssOidStruct.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/Native/GssOidStruct.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/Native/NativeMethods.cs b/MySQL.Data/src/Authentication/GSSAPI/Native/NativeMethods.cs
index fc4c22001..7f4fe0c39 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/Native/NativeMethods.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/Native/NativeMethods.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/Native/NativeMethodsLinux.cs b/MySQL.Data/src/Authentication/GSSAPI/Native/NativeMethodsLinux.cs
index 90b3747df..0d8c060e8 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/Native/NativeMethodsLinux.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/Native/NativeMethodsLinux.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/Native/NativeMethodsWin64.cs b/MySQL.Data/src/Authentication/GSSAPI/Native/NativeMethodsWin64.cs
index 69e4bd2e1..0615eae73 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/Native/NativeMethodsWin64.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/Native/NativeMethodsWin64.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/Utility/Disposable.cs b/MySQL.Data/src/Authentication/GSSAPI/Utility/Disposable.cs
index f4ad1e83f..45274babe 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/Utility/Disposable.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/Utility/Disposable.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/Utility/ExceptionMessages.cs b/MySQL.Data/src/Authentication/GSSAPI/Utility/ExceptionMessages.cs
index 3fe8da347..c0947f76c 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/Utility/ExceptionMessages.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/Utility/ExceptionMessages.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/Utility/GssType.cs b/MySQL.Data/src/Authentication/GSSAPI/Utility/GssType.cs
index ba2b00f56..49943759f 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/Utility/GssType.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/Utility/GssType.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/Utility/KerberosConfig.cs b/MySQL.Data/src/Authentication/GSSAPI/Utility/KerberosConfig.cs
index b00744684..6d86220e6 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/Utility/KerberosConfig.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/Utility/KerberosConfig.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/GSSAPI/Utility/Pinned.cs b/MySQL.Data/src/Authentication/GSSAPI/Utility/Pinned.cs
index f6f192280..ebfad7e84 100644
--- a/MySQL.Data/src/Authentication/GSSAPI/Utility/Pinned.cs
+++ b/MySQL.Data/src/Authentication/GSSAPI/Utility/Pinned.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/KerberosAuthenticationPlugin.cs b/MySQL.Data/src/Authentication/KerberosAuthenticationPlugin.cs
index c85de89ce..57b30c6d4 100644
--- a/MySQL.Data/src/Authentication/KerberosAuthenticationPlugin.cs
+++ b/MySQL.Data/src/Authentication/KerberosAuthenticationPlugin.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/MySQLAuthenticationPlugin.cs b/MySQL.Data/src/Authentication/MySQLAuthenticationPlugin.cs
index 9af2e8f3b..48b2d38cc 100644
--- a/MySQL.Data/src/Authentication/MySQLAuthenticationPlugin.cs
+++ b/MySQL.Data/src/Authentication/MySQLAuthenticationPlugin.cs
@@ -1,4 +1,4 @@
-// Copyright © 2012, 2024, Oracle and/or its affiliates.
+// Copyright © 2012, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/MySqlPemReader.cs b/MySQL.Data/src/Authentication/MySqlPemReader.cs
index 22a09ff68..e89272f0e 100644
--- a/MySQL.Data/src/Authentication/MySqlPemReader.cs
+++ b/MySQL.Data/src/Authentication/MySqlPemReader.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/MySqlSASLPlugin.cs b/MySQL.Data/src/Authentication/MySqlSASLPlugin.cs
index 12dbdc569..2b8bf0d41 100644
--- a/MySQL.Data/src/Authentication/MySqlSASLPlugin.cs
+++ b/MySQL.Data/src/Authentication/MySqlSASLPlugin.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/NativePasswordPlugins.cs b/MySQL.Data/src/Authentication/NativePasswordPlugins.cs
index 53329e090..248a93d02 100644
--- a/MySQL.Data/src/Authentication/NativePasswordPlugins.cs
+++ b/MySQL.Data/src/Authentication/NativePasswordPlugins.cs
@@ -1,4 +1,4 @@
-// Copyright © 2012, 2024, Oracle and/or its affiliates.
+// Copyright © 2012, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/OciAuthenticationPlugin.cs b/MySQL.Data/src/Authentication/OciAuthenticationPlugin.cs
index 66c89dac9..dc3ade5f0 100644
--- a/MySQL.Data/src/Authentication/OciAuthenticationPlugin.cs
+++ b/MySQL.Data/src/Authentication/OciAuthenticationPlugin.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/OpenIdConnectClientAuthentication.cs b/MySQL.Data/src/Authentication/OpenIdConnectClientAuthentication.cs
index 44d12ecb4..b4ad5b251 100644
--- a/MySQL.Data/src/Authentication/OpenIdConnectClientAuthentication.cs
+++ b/MySQL.Data/src/Authentication/OpenIdConnectClientAuthentication.cs
@@ -1,4 +1,4 @@
-// Copyright © 2024, Oracle and/or its affiliates.
+// Copyright © 2024, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/SSPI/Const.cs b/MySQL.Data/src/Authentication/SSPI/Const.cs
index ec34d26e7..de84e35ca 100644
--- a/MySQL.Data/src/Authentication/SSPI/Const.cs
+++ b/MySQL.Data/src/Authentication/SSPI/Const.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/SSPI/NativeMethods.cs b/MySQL.Data/src/Authentication/SSPI/NativeMethods.cs
index 8c22c275e..3cc1277ca 100644
--- a/MySQL.Data/src/Authentication/SSPI/NativeMethods.cs
+++ b/MySQL.Data/src/Authentication/SSPI/NativeMethods.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/SSPI/SspiCredentials.cs b/MySQL.Data/src/Authentication/SSPI/SspiCredentials.cs
index 82674876e..682401d24 100644
--- a/MySQL.Data/src/Authentication/SSPI/SspiCredentials.cs
+++ b/MySQL.Data/src/Authentication/SSPI/SspiCredentials.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/SSPI/SspiSecurityContext.cs b/MySQL.Data/src/Authentication/SSPI/SspiSecurityContext.cs
index fb7add722..0f04fd1b0 100644
--- a/MySQL.Data/src/Authentication/SSPI/SspiSecurityContext.cs
+++ b/MySQL.Data/src/Authentication/SSPI/SspiSecurityContext.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/SSPI/Structs.cs b/MySQL.Data/src/Authentication/SSPI/Structs.cs
index 4a4d9b2d2..15d329fb4 100644
--- a/MySQL.Data/src/Authentication/SSPI/Structs.cs
+++ b/MySQL.Data/src/Authentication/SSPI/Structs.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/ScramBase.cs b/MySQL.Data/src/Authentication/ScramBase.cs
index 5d985667b..1a6a36192 100644
--- a/MySQL.Data/src/Authentication/ScramBase.cs
+++ b/MySQL.Data/src/Authentication/ScramBase.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/ScramSha1Mechanism.cs b/MySQL.Data/src/Authentication/ScramSha1Mechanism.cs
index e6c63a7eb..d3e8ca6f8 100644
--- a/MySQL.Data/src/Authentication/ScramSha1Mechanism.cs
+++ b/MySQL.Data/src/Authentication/ScramSha1Mechanism.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/ScramSha256Mechanism.cs b/MySQL.Data/src/Authentication/ScramSha256Mechanism.cs
index 367d3ec63..807d81853 100644
--- a/MySQL.Data/src/Authentication/ScramSha256Mechanism.cs
+++ b/MySQL.Data/src/Authentication/ScramSha256Mechanism.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/Sha256AuthenticationPlugin.cs b/MySQL.Data/src/Authentication/Sha256AuthenticationPlugin.cs
index 86364bdeb..b6882ea70 100644
--- a/MySQL.Data/src/Authentication/Sha256AuthenticationPlugin.cs
+++ b/MySQL.Data/src/Authentication/Sha256AuthenticationPlugin.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/Sha256MemoryAuthenticationPlugin.cs b/MySQL.Data/src/Authentication/Sha256MemoryAuthenticationPlugin.cs
index f278178e9..8c6a6161c 100644
--- a/MySQL.Data/src/Authentication/Sha256MemoryAuthenticationPlugin.cs
+++ b/MySQL.Data/src/Authentication/Sha256MemoryAuthenticationPlugin.cs
@@ -1,4 +1,4 @@
-// Copyright © 2018, 2024, Oracle and/or its affiliates.
+// Copyright © 2018, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/WebAuthnAuthenticationPlugin.cs b/MySQL.Data/src/Authentication/WebAuthnAuthenticationPlugin.cs
index 2e3487a02..08375cae9 100644
--- a/MySQL.Data/src/Authentication/WebAuthnAuthenticationPlugin.cs
+++ b/MySQL.Data/src/Authentication/WebAuthnAuthenticationPlugin.cs
@@ -1,4 +1,4 @@
-// Copyright © 2023, 2024, Oracle and/or its affiliates.
+// Copyright © 2023, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Authentication/WindowsAuthenticationPlugin.cs b/MySQL.Data/src/Authentication/WindowsAuthenticationPlugin.cs
index af668f091..393c52967 100644
--- a/MySQL.Data/src/Authentication/WindowsAuthenticationPlugin.cs
+++ b/MySQL.Data/src/Authentication/WindowsAuthenticationPlugin.cs
@@ -1,4 +1,4 @@
-// Copyright © 2012, 2024, Oracle and/or its affiliates.
+// Copyright © 2012, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/BulkLoader.cs b/MySQL.Data/src/BulkLoader.cs
index c211d53e4..3d9d80359 100644
--- a/MySQL.Data/src/BulkLoader.cs
+++ b/MySQL.Data/src/BulkLoader.cs
@@ -1,4 +1,4 @@
-// Copyright © 2006, 2024, Oracle and/or its affiliates.
+// Copyright © 2006, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/CharSetMap.cs b/MySQL.Data/src/CharSetMap.cs
index 52bbc3e02..2d4f18e7d 100644
--- a/MySQL.Data/src/CharSetMap.cs
+++ b/MySQL.Data/src/CharSetMap.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/CompressedStream.cs b/MySQL.Data/src/CompressedStream.cs
index 5a100569d..631cbe975 100644
--- a/MySQL.Data/src/CompressedStream.cs
+++ b/MySQL.Data/src/CompressedStream.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Crypt.cs b/MySQL.Data/src/Crypt.cs
index ab13a858c..3f897479e 100644
--- a/MySQL.Data/src/Crypt.cs
+++ b/MySQL.Data/src/Crypt.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Driver.cs b/MySQL.Data/src/Driver.cs
index 51db1aeb8..3ae102d32 100644
--- a/MySQL.Data/src/Driver.cs
+++ b/MySQL.Data/src/Driver.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Exception.cs b/MySQL.Data/src/Exception.cs
index 121d8cf58..701ca4bd0 100644
--- a/MySQL.Data/src/Exception.cs
+++ b/MySQL.Data/src/Exception.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Failover/FailoverGroup.cs b/MySQL.Data/src/Failover/FailoverGroup.cs
index f708ce12b..34d8765f8 100644
--- a/MySQL.Data/src/Failover/FailoverGroup.cs
+++ b/MySQL.Data/src/Failover/FailoverGroup.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Failover/FailoverManager.cs b/MySQL.Data/src/Failover/FailoverManager.cs
index 236a52f26..faba5ad35 100644
--- a/MySQL.Data/src/Failover/FailoverManager.cs
+++ b/MySQL.Data/src/Failover/FailoverManager.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Failover/FailoverServer.cs b/MySQL.Data/src/Failover/FailoverServer.cs
index 6081159f3..b0e7a7fb2 100644
--- a/MySQL.Data/src/Failover/FailoverServer.cs
+++ b/MySQL.Data/src/Failover/FailoverServer.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Failover/RandomFailoverGroup.cs b/MySQL.Data/src/Failover/RandomFailoverGroup.cs
index e2af1ebc4..66db9d1ef 100644
--- a/MySQL.Data/src/Failover/RandomFailoverGroup.cs
+++ b/MySQL.Data/src/Failover/RandomFailoverGroup.cs
@@ -1,4 +1,4 @@
-// Copyright © 2019, 2024, Oracle and/or its affiliates.
+// Copyright © 2019, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Failover/SequentialFailoverGroup.cs b/MySQL.Data/src/Failover/SequentialFailoverGroup.cs
index 3214fcbf4..998b077c5 100644
--- a/MySQL.Data/src/Failover/SequentialFailoverGroup.cs
+++ b/MySQL.Data/src/Failover/SequentialFailoverGroup.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Field.cs b/MySQL.Data/src/Field.cs
index 6f2e92a1c..29966d31b 100644
--- a/MySQL.Data/src/Field.cs
+++ b/MySQL.Data/src/Field.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Framework/net462/SystemPerformanceMonitor.cs b/MySQL.Data/src/Framework/net462/SystemPerformanceMonitor.cs
index 8795311f6..736383f6d 100644
--- a/MySQL.Data/src/Framework/net462/SystemPerformanceMonitor.cs
+++ b/MySQL.Data/src/Framework/net462/SystemPerformanceMonitor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Framework/netstandard2_0/AuthenticationManager.cs b/MySQL.Data/src/Framework/netstandard2_0/AuthenticationManager.cs
index f1672c2a3..75d6356e9 100644
--- a/MySQL.Data/src/Framework/netstandard2_0/AuthenticationManager.cs
+++ b/MySQL.Data/src/Framework/netstandard2_0/AuthenticationManager.cs
@@ -1,4 +1,4 @@
-// Copyright © 2012, 2024, Oracle and/or its affiliates.
+// Copyright © 2012, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Framework/netstandard2_0/CommandBuilder.cs b/MySQL.Data/src/Framework/netstandard2_0/CommandBuilder.cs
index 1d3c2fb5b..64a00b0df 100644
--- a/MySQL.Data/src/Framework/netstandard2_0/CommandBuilder.cs
+++ b/MySQL.Data/src/Framework/netstandard2_0/CommandBuilder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Framework/netstandard2_0/MySqlClientPermission.cs b/MySQL.Data/src/Framework/netstandard2_0/MySqlClientPermission.cs
index c2892661c..8284cc347 100644
--- a/MySQL.Data/src/Framework/netstandard2_0/MySqlClientPermission.cs
+++ b/MySQL.Data/src/Framework/netstandard2_0/MySqlClientPermission.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Framework/netstandard2_0/MySqlClientPermissionAttribute.cs b/MySQL.Data/src/Framework/netstandard2_0/MySqlClientPermissionAttribute.cs
index 9ebcf2a96..e2ee73a4a 100644
--- a/MySQL.Data/src/Framework/netstandard2_0/MySqlClientPermissionAttribute.cs
+++ b/MySQL.Data/src/Framework/netstandard2_0/MySqlClientPermissionAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Framework/netstandard2_0/MySqlConfiguration.cs b/MySQL.Data/src/Framework/netstandard2_0/MySqlConfiguration.cs
index 8a2882b6f..af38bb5f9 100644
--- a/MySQL.Data/src/Framework/netstandard2_0/MySqlConfiguration.cs
+++ b/MySQL.Data/src/Framework/netstandard2_0/MySqlConfiguration.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Framework/netstandard2_0/MySqlHelper.cs b/MySQL.Data/src/Framework/netstandard2_0/MySqlHelper.cs
index 8049e040c..4b88132c7 100644
--- a/MySQL.Data/src/Framework/netstandard2_0/MySqlHelper.cs
+++ b/MySQL.Data/src/Framework/netstandard2_0/MySqlHelper.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Framework/netstandard2_0/MySqlPromotableTransaction.cs b/MySQL.Data/src/Framework/netstandard2_0/MySqlPromotableTransaction.cs
index fcb67ee3f..c5e304829 100644
--- a/MySQL.Data/src/Framework/netstandard2_0/MySqlPromotableTransaction.cs
+++ b/MySQL.Data/src/Framework/netstandard2_0/MySqlPromotableTransaction.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Framework/netstandard2_0/MySqlSecurityPermission.cs b/MySQL.Data/src/Framework/netstandard2_0/MySqlSecurityPermission.cs
index 17c20ded6..3319eb2cd 100644
--- a/MySQL.Data/src/Framework/netstandard2_0/MySqlSecurityPermission.cs
+++ b/MySQL.Data/src/Framework/netstandard2_0/MySqlSecurityPermission.cs
@@ -1,4 +1,4 @@
-// Copyright © 2011, 2024, Oracle and/or its affiliates.
+// Copyright © 2011, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Framework/netstandard2_0/dataadapter.cs b/MySQL.Data/src/Framework/netstandard2_0/dataadapter.cs
index e704af69f..402fcb3a9 100644
--- a/MySQL.Data/src/Framework/netstandard2_0/dataadapter.cs
+++ b/MySQL.Data/src/Framework/netstandard2_0/dataadapter.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/ISSchemaProvider.cs b/MySQL.Data/src/ISSchemaProvider.cs
index decfa7016..545466a28 100644
--- a/MySQL.Data/src/ISSchemaProvider.cs
+++ b/MySQL.Data/src/ISSchemaProvider.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Interceptors/CommandInterceptor.cs b/MySQL.Data/src/Interceptors/CommandInterceptor.cs
index 655801fef..34e0ebb32 100644
--- a/MySQL.Data/src/Interceptors/CommandInterceptor.cs
+++ b/MySQL.Data/src/Interceptors/CommandInterceptor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Interceptors/ExceptionInterceptor.cs b/MySQL.Data/src/Interceptors/ExceptionInterceptor.cs
index 332283c35..475c6dc30 100644
--- a/MySQL.Data/src/Interceptors/ExceptionInterceptor.cs
+++ b/MySQL.Data/src/Interceptors/ExceptionInterceptor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Interceptors/Interceptor.cs b/MySQL.Data/src/Interceptors/Interceptor.cs
index 1c4f99843..87dd0c572 100644
--- a/MySQL.Data/src/Interceptors/Interceptor.cs
+++ b/MySQL.Data/src/Interceptors/Interceptor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySQLActivitySource.cs b/MySQL.Data/src/MySQLActivitySource.cs
index 15e9cc665..739bcee09 100644
--- a/MySQL.Data/src/MySQLActivitySource.cs
+++ b/MySQL.Data/src/MySQLActivitySource.cs
@@ -1,4 +1,4 @@
-// Copyright © 2023, 2024, Oracle and/or its affiliates.
+// Copyright © 2023, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index ad5a5506c..c14166c20 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -128,4 +128,4 @@
   </ItemGroup>
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MySQL.Data/src/MySqlAttribute.cs b/MySQL.Data/src/MySqlAttribute.cs
index f37930b3e..370b7c16a 100644
--- a/MySQL.Data/src/MySqlAttribute.cs
+++ b/MySQL.Data/src/MySqlAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlAttributeCollection.cs b/MySQL.Data/src/MySqlAttributeCollection.cs
index a98bed023..4c66ca4b9 100644
--- a/MySQL.Data/src/MySqlAttributeCollection.cs
+++ b/MySQL.Data/src/MySqlAttributeCollection.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs b/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
index e3cf80f6d..278cbcf16 100644
--- a/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
+++ b/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2018, 2024, Oracle and/or its affiliates.
+// Copyright © 2018, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlClientFactory.cs b/MySQL.Data/src/MySqlClientFactory.cs
index 236f77b24..29006a5b9 100644
--- a/MySQL.Data/src/MySqlClientFactory.cs
+++ b/MySQL.Data/src/MySqlClientFactory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlCommand.cs b/MySQL.Data/src/MySqlCommand.cs
index 9d389fb70..f6f93f415 100644
--- a/MySQL.Data/src/MySqlCommand.cs
+++ b/MySQL.Data/src/MySqlCommand.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlConnection.cs b/MySQL.Data/src/MySqlConnection.cs
index 4f633f83b..e68debbf1 100644
--- a/MySQL.Data/src/MySqlConnection.cs
+++ b/MySQL.Data/src/MySqlConnection.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlConnectionStringBuilder.cs b/MySQL.Data/src/MySqlConnectionStringBuilder.cs
index f371e6c51..c61949777 100644
--- a/MySQL.Data/src/MySqlConnectionStringBuilder.cs
+++ b/MySQL.Data/src/MySqlConnectionStringBuilder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlDataReader.cs b/MySQL.Data/src/MySqlDataReader.cs
index ff86e4368..380dd648a 100644
--- a/MySQL.Data/src/MySqlDataReader.cs
+++ b/MySQL.Data/src/MySqlDataReader.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlError.cs b/MySQL.Data/src/MySqlError.cs
index 219b14854..518aa70b0 100644
--- a/MySQL.Data/src/MySqlError.cs
+++ b/MySQL.Data/src/MySqlError.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlHelper.cs b/MySQL.Data/src/MySqlHelper.cs
index 052ba4e6b..06447877c 100644
--- a/MySQL.Data/src/MySqlHelper.cs
+++ b/MySQL.Data/src/MySqlHelper.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlPacket.cs b/MySQL.Data/src/MySqlPacket.cs
index 513a04be7..db939cca3 100644
--- a/MySQL.Data/src/MySqlPacket.cs
+++ b/MySQL.Data/src/MySqlPacket.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlParameter.cs b/MySQL.Data/src/MySqlParameter.cs
index 5e9b95c88..4377aeb69 100644
--- a/MySQL.Data/src/MySqlParameter.cs
+++ b/MySQL.Data/src/MySqlParameter.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlParameterCollection.cs b/MySQL.Data/src/MySqlParameterCollection.cs
index 54a1792a3..530ea93d6 100644
--- a/MySQL.Data/src/MySqlParameterCollection.cs
+++ b/MySQL.Data/src/MySqlParameterCollection.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlPool.cs b/MySQL.Data/src/MySqlPool.cs
index e8efab95f..c8c9b5cec 100644
--- a/MySQL.Data/src/MySqlPool.cs
+++ b/MySQL.Data/src/MySqlPool.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlPoolManager.cs b/MySQL.Data/src/MySqlPoolManager.cs
index 3e624340a..e3dea7676 100644
--- a/MySQL.Data/src/MySqlPoolManager.cs
+++ b/MySQL.Data/src/MySqlPoolManager.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlScript.cs b/MySQL.Data/src/MySqlScript.cs
index ec116addf..d36b8ff02 100644
--- a/MySQL.Data/src/MySqlScript.cs
+++ b/MySQL.Data/src/MySqlScript.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlStream.cs b/MySQL.Data/src/MySqlStream.cs
index f8de9c65d..60f79c199 100644
--- a/MySQL.Data/src/MySqlStream.cs
+++ b/MySQL.Data/src/MySqlStream.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlTrace.cs b/MySQL.Data/src/MySqlTrace.cs
index bd35cdff9..f3282e5d4 100644
--- a/MySQL.Data/src/MySqlTrace.cs
+++ b/MySQL.Data/src/MySqlTrace.cs
@@ -1,4 +1,4 @@
-// Copyright © 2009, 2024, Oracle and/or its affiliates.
+// Copyright © 2009, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MySqlTransaction.cs b/MySQL.Data/src/MySqlTransaction.cs
index d550763dc..a8b0c0c29 100644
--- a/MySQL.Data/src/MySqlTransaction.cs
+++ b/MySQL.Data/src/MySqlTransaction.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/MysqlDefs.cs b/MySQL.Data/src/MysqlDefs.cs
index 82e54f2aa..e2d54081d 100644
--- a/MySQL.Data/src/MysqlDefs.cs
+++ b/MySQL.Data/src/MysqlDefs.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/NativeDriver.cs b/MySQL.Data/src/NativeDriver.cs
index 0afe4712e..a726c2376 100644
--- a/MySQL.Data/src/NativeDriver.cs
+++ b/MySQL.Data/src/NativeDriver.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/OkPacket.cs b/MySQL.Data/src/OkPacket.cs
index 57e07a360..45a05f8ff 100644
--- a/MySQL.Data/src/OkPacket.cs
+++ b/MySQL.Data/src/OkPacket.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/PacketBitConverter.cs b/MySQL.Data/src/PacketBitConverter.cs
index dc185ba94..9c20ae703 100644
--- a/MySQL.Data/src/PacketBitConverter.cs
+++ b/MySQL.Data/src/PacketBitConverter.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/PerformanceMonitor.cs b/MySQL.Data/src/PerformanceMonitor.cs
index b4d93afc6..3f786dfc7 100644
--- a/MySQL.Data/src/PerformanceMonitor.cs
+++ b/MySQL.Data/src/PerformanceMonitor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/PreparableStatement.cs b/MySQL.Data/src/PreparableStatement.cs
index 02a7762e8..0f67d6413 100644
--- a/MySQL.Data/src/PreparableStatement.cs
+++ b/MySQL.Data/src/PreparableStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/ProcedureCache.cs b/MySQL.Data/src/ProcedureCache.cs
index 0a5662f41..0e9aada5c 100644
--- a/MySQL.Data/src/ProcedureCache.cs
+++ b/MySQL.Data/src/ProcedureCache.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Properties/AssemblyInfo.cs b/MySQL.Data/src/Properties/AssemblyInfo.cs
index 7dcf1fca6..402af246b 100644
--- a/MySQL.Data/src/Properties/AssemblyInfo.cs
+++ b/MySQL.Data/src/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Properties/VersionInfo.cs b/MySQL.Data/src/Properties/VersionInfo.cs
index 2812dd600..d259e153d 100644
--- a/MySQL.Data/src/Properties/VersionInfo.cs
+++ b/MySQL.Data/src/Properties/VersionInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Replication/ReplicationConfiguration.cs b/MySQL.Data/src/Replication/ReplicationConfiguration.cs
index 767d1b179..8cbd52523 100644
--- a/MySQL.Data/src/Replication/ReplicationConfiguration.cs
+++ b/MySQL.Data/src/Replication/ReplicationConfiguration.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Replication/ReplicationManager.cs b/MySQL.Data/src/Replication/ReplicationManager.cs
index 48d0e3186..bd6f696ed 100644
--- a/MySQL.Data/src/Replication/ReplicationManager.cs
+++ b/MySQL.Data/src/Replication/ReplicationManager.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Replication/ReplicationRoundRobinServerGroup.cs b/MySQL.Data/src/Replication/ReplicationRoundRobinServerGroup.cs
index b66a7a2e7..6fae451fc 100644
--- a/MySQL.Data/src/Replication/ReplicationRoundRobinServerGroup.cs
+++ b/MySQL.Data/src/Replication/ReplicationRoundRobinServerGroup.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Replication/ReplicationServer.cs b/MySQL.Data/src/Replication/ReplicationServer.cs
index 23b616853..c1b14506c 100644
--- a/MySQL.Data/src/Replication/ReplicationServer.cs
+++ b/MySQL.Data/src/Replication/ReplicationServer.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Replication/ReplicationServerGroup.cs b/MySQL.Data/src/Replication/ReplicationServerGroup.cs
index cb3e843a5..237348ba6 100644
--- a/MySQL.Data/src/Replication/ReplicationServerGroup.cs
+++ b/MySQL.Data/src/Replication/ReplicationServerGroup.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/ResultSet.cs b/MySQL.Data/src/ResultSet.cs
index 0de428e0e..3b7fa890f 100644
--- a/MySQL.Data/src/ResultSet.cs
+++ b/MySQL.Data/src/ResultSet.cs
@@ -1,4 +1,4 @@
-// Copyright © 2009, 2024, Oracle and/or its affiliates.
+// Copyright © 2009, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Runtime.cs b/MySQL.Data/src/Runtime.cs
index 089f1ec05..beb65869b 100644
--- a/MySQL.Data/src/Runtime.cs
+++ b/MySQL.Data/src/Runtime.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Schema.cs b/MySQL.Data/src/Schema.cs
index 4401cfec4..d63a28d86 100644
--- a/MySQL.Data/src/Schema.cs
+++ b/MySQL.Data/src/Schema.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/SchemaProvider.cs b/MySQL.Data/src/SchemaProvider.cs
index f56b8a78d..5141f383e 100644
--- a/MySQL.Data/src/SchemaProvider.cs
+++ b/MySQL.Data/src/SchemaProvider.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Statement.cs b/MySQL.Data/src/Statement.cs
index 5e559af42..2b3c81d54 100644
--- a/MySQL.Data/src/Statement.cs
+++ b/MySQL.Data/src/Statement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/StoredProcedure.cs b/MySQL.Data/src/StoredProcedure.cs
index 96da29eda..4a7cc52bc 100644
--- a/MySQL.Data/src/StoredProcedure.cs
+++ b/MySQL.Data/src/StoredProcedure.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/TableCache.cs b/MySQL.Data/src/TableCache.cs
index 3928a3ec3..2944cb380 100644
--- a/MySQL.Data/src/TableCache.cs
+++ b/MySQL.Data/src/TableCache.cs
@@ -1,4 +1,4 @@
-// Copyright © 2016, 2024, Oracle and/or its affiliates.
+// Copyright © 2016, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
@@ -161,4 +161,4 @@ private struct CacheEntry
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/MySQL.Data/src/TimedStream.cs b/MySQL.Data/src/TimedStream.cs
index d622c4126..4d788cdb3 100644
--- a/MySQL.Data/src/TimedStream.cs
+++ b/MySQL.Data/src/TimedStream.cs
@@ -1,4 +1,4 @@
-// Copyright © 2009, 2024, Oracle and/or its affiliates.
+// Copyright © 2009, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/TracingDriver.cs b/MySQL.Data/src/TracingDriver.cs
index 22fb996cd..308b767cd 100644
--- a/MySQL.Data/src/TracingDriver.cs
+++ b/MySQL.Data/src/TracingDriver.cs
@@ -1,4 +1,4 @@
-// Copyright © 2009, 2024, Oracle and/or its affiliates.
+// Copyright © 2009, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/IMySqlValue.cs b/MySQL.Data/src/Types/IMySqlValue.cs
index 891e62bb1..2b3df6aca 100644
--- a/MySQL.Data/src/Types/IMySqlValue.cs
+++ b/MySQL.Data/src/Types/IMySqlValue.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MetaData.cs b/MySQL.Data/src/Types/MetaData.cs
index 9d3df15a6..61fbb28de 100644
--- a/MySQL.Data/src/Types/MetaData.cs
+++ b/MySQL.Data/src/Types/MetaData.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlBinary.cs b/MySQL.Data/src/Types/MySqlBinary.cs
index 21d398eba..29faae119 100644
--- a/MySQL.Data/src/Types/MySqlBinary.cs
+++ b/MySQL.Data/src/Types/MySqlBinary.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlBit.cs b/MySQL.Data/src/Types/MySqlBit.cs
index 9ca6fbfcc..31fd94db8 100644
--- a/MySQL.Data/src/Types/MySqlBit.cs
+++ b/MySQL.Data/src/Types/MySqlBit.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlByte.cs b/MySQL.Data/src/Types/MySqlByte.cs
index 35fcbb28b..38b62bf8a 100644
--- a/MySQL.Data/src/Types/MySqlByte.cs
+++ b/MySQL.Data/src/Types/MySqlByte.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlConversionException.cs b/MySQL.Data/src/Types/MySqlConversionException.cs
index 3ca0deaa8..727fcd07a 100644
--- a/MySQL.Data/src/Types/MySqlConversionException.cs
+++ b/MySQL.Data/src/Types/MySqlConversionException.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlDateTime.cs b/MySQL.Data/src/Types/MySqlDateTime.cs
index e8984f0da..e7d1ff9a1 100644
--- a/MySQL.Data/src/Types/MySqlDateTime.cs
+++ b/MySQL.Data/src/Types/MySqlDateTime.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlDecimal.cs b/MySQL.Data/src/Types/MySqlDecimal.cs
index fa679f63e..13780c88c 100644
--- a/MySQL.Data/src/Types/MySqlDecimal.cs
+++ b/MySQL.Data/src/Types/MySqlDecimal.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlDouble.cs b/MySQL.Data/src/Types/MySqlDouble.cs
index 9b342b6ba..de72338fe 100644
--- a/MySQL.Data/src/Types/MySqlDouble.cs
+++ b/MySQL.Data/src/Types/MySqlDouble.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlGeometry.cs b/MySQL.Data/src/Types/MySqlGeometry.cs
index 963ee3837..9472e4b51 100644
--- a/MySQL.Data/src/Types/MySqlGeometry.cs
+++ b/MySQL.Data/src/Types/MySqlGeometry.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlGuid.cs b/MySQL.Data/src/Types/MySqlGuid.cs
index 7e2fa5129..5651a7501 100644
--- a/MySQL.Data/src/Types/MySqlGuid.cs
+++ b/MySQL.Data/src/Types/MySqlGuid.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlInt16.cs b/MySQL.Data/src/Types/MySqlInt16.cs
index 805e296b1..96a9577e0 100644
--- a/MySQL.Data/src/Types/MySqlInt16.cs
+++ b/MySQL.Data/src/Types/MySqlInt16.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlInt32.cs b/MySQL.Data/src/Types/MySqlInt32.cs
index 6cda1fa52..81aaba5af 100644
--- a/MySQL.Data/src/Types/MySqlInt32.cs
+++ b/MySQL.Data/src/Types/MySqlInt32.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlInt64.cs b/MySQL.Data/src/Types/MySqlInt64.cs
index 8fea63889..b0bae03ed 100644
--- a/MySQL.Data/src/Types/MySqlInt64.cs
+++ b/MySQL.Data/src/Types/MySqlInt64.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlSingle.cs b/MySQL.Data/src/Types/MySqlSingle.cs
index 9dc777912..5973d4542 100644
--- a/MySQL.Data/src/Types/MySqlSingle.cs
+++ b/MySQL.Data/src/Types/MySqlSingle.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlString.cs b/MySQL.Data/src/Types/MySqlString.cs
index f9bd06d6d..d7b2a8b2b 100644
--- a/MySQL.Data/src/Types/MySqlString.cs
+++ b/MySQL.Data/src/Types/MySqlString.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlTime.cs b/MySQL.Data/src/Types/MySqlTime.cs
index 8ef8fb77e..bd0969023 100644
--- a/MySQL.Data/src/Types/MySqlTime.cs
+++ b/MySQL.Data/src/Types/MySqlTime.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlUByte.cs b/MySQL.Data/src/Types/MySqlUByte.cs
index e773d6d03..5db414eed 100644
--- a/MySQL.Data/src/Types/MySqlUByte.cs
+++ b/MySQL.Data/src/Types/MySqlUByte.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlUInt16.cs b/MySQL.Data/src/Types/MySqlUInt16.cs
index e407f95cd..183b66f77 100644
--- a/MySQL.Data/src/Types/MySqlUInt16.cs
+++ b/MySQL.Data/src/Types/MySqlUInt16.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlUInt32.cs b/MySQL.Data/src/Types/MySqlUInt32.cs
index 612ec6383..a5d9af68d 100644
--- a/MySQL.Data/src/Types/MySqlUInt32.cs
+++ b/MySQL.Data/src/Types/MySqlUInt32.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Types/MySqlUInt64.cs b/MySQL.Data/src/Types/MySqlUInt64.cs
index 15ebc5146..d19033180 100644
--- a/MySQL.Data/src/Types/MySqlUInt64.cs
+++ b/MySQL.Data/src/Types/MySqlUInt64.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/Utils.cs b/MySQL.Data/src/Utils.cs
index e023de66b..329c3a3f7 100644
--- a/MySQL.Data/src/Utils.cs
+++ b/MySQL.Data/src/Utils.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Authentication/ExternalAuthenticationPlugin.cs b/MySQL.Data/src/X/Authentication/ExternalAuthenticationPlugin.cs
index ef7916205..6417a9ad2 100644
--- a/MySQL.Data/src/X/Authentication/ExternalAuthenticationPlugin.cs
+++ b/MySQL.Data/src/X/Authentication/ExternalAuthenticationPlugin.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Authentication/MySQL41AuthenticationPlugin.cs b/MySQL.Data/src/X/Authentication/MySQL41AuthenticationPlugin.cs
index a64f8cbf3..c4ef053d3 100644
--- a/MySQL.Data/src/X/Authentication/MySQL41AuthenticationPlugin.cs
+++ b/MySQL.Data/src/X/Authentication/MySQL41AuthenticationPlugin.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Authentication/PlainAuthenticationPlugin.cs b/MySQL.Data/src/X/Authentication/PlainAuthenticationPlugin.cs
index f0ca78138..824768ec1 100644
--- a/MySQL.Data/src/X/Authentication/PlainAuthenticationPlugin.cs
+++ b/MySQL.Data/src/X/Authentication/PlainAuthenticationPlugin.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Common/Tools.cs b/MySQL.Data/src/X/Common/Tools.cs
index b74fab9e4..814b5ab18 100644
--- a/MySQL.Data/src/X/Common/Tools.cs
+++ b/MySQL.Data/src/X/Common/Tools.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Common/UnmanagedLibraryLoader.cs b/MySQL.Data/src/X/Common/UnmanagedLibraryLoader.cs
index 8f0f6e419..a15352bee 100644
--- a/MySQL.Data/src/X/Common/UnmanagedLibraryLoader.cs
+++ b/MySQL.Data/src/X/Common/UnmanagedLibraryLoader.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Communication/CommunicationPacket.cs b/MySQL.Data/src/X/Communication/CommunicationPacket.cs
index 930593c45..76ab9ef25 100644
--- a/MySQL.Data/src/X/Communication/CommunicationPacket.cs
+++ b/MySQL.Data/src/X/Communication/CommunicationPacket.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Communication/XCompressionController.cs b/MySQL.Data/src/X/Communication/XCompressionController.cs
index fd55c5dc9..7dc6485f0 100644
--- a/MySQL.Data/src/X/Communication/XCompressionController.cs
+++ b/MySQL.Data/src/X/Communication/XCompressionController.cs
@@ -1,4 +1,4 @@
-// Copyright © 2019, 2024, Oracle and/or its affiliates.
+// Copyright © 2019, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Communication/XPacketProcessor.cs b/MySQL.Data/src/X/Communication/XPacketProcessor.cs
index df411e154..4da0c79e3 100644
--- a/MySQL.Data/src/X/Communication/XPacketProcessor.cs
+++ b/MySQL.Data/src/X/Communication/XPacketProcessor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Communication/XPacketReaderWriter.cs b/MySQL.Data/src/X/Communication/XPacketReaderWriter.cs
index 4002b7f36..a9ead2a58 100644
--- a/MySQL.Data/src/X/Communication/XPacketReaderWriter.cs
+++ b/MySQL.Data/src/X/Communication/XPacketReaderWriter.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Data/CollationMap.cs b/MySQL.Data/src/X/Data/CollationMap.cs
index 7f717f079..11b694d94 100644
--- a/MySQL.Data/src/X/Data/CollationMap.cs
+++ b/MySQL.Data/src/X/Data/CollationMap.cs
@@ -1,4 +1,4 @@
-// Copyright © 2016, 2024, Oracle and/or its affiliates.
+// Copyright © 2016, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Data/Enums.cs b/MySQL.Data/src/X/Data/Enums.cs
index 2cb0f2f56..7eea5cfee 100644
--- a/MySQL.Data/src/X/Data/Enums.cs
+++ b/MySQL.Data/src/X/Data/Enums.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/ProtocolBase.cs b/MySQL.Data/src/X/Protocol/ProtocolBase.cs
index cf96b6a9b..e8e469313 100644
--- a/MySQL.Data/src/X/Protocol/ProtocolBase.cs
+++ b/MySQL.Data/src/X/Protocol/ProtocolBase.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/ValueDecoder.cs b/MySQL.Data/src/X/Protocol/ValueDecoder.cs
index aff72fb26..5ec439f9f 100644
--- a/MySQL.Data/src/X/Protocol/ValueDecoder.cs
+++ b/MySQL.Data/src/X/Protocol/ValueDecoder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/BitDecoder.cs b/MySQL.Data/src/X/Protocol/X/BitDecoder.cs
index 55796cb1f..cc8971581 100644
--- a/MySQL.Data/src/X/Protocol/X/BitDecoder.cs
+++ b/MySQL.Data/src/X/Protocol/X/BitDecoder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2016, 2024, Oracle and/or its affiliates.
+// Copyright © 2016, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/ByteDecoder.cs b/MySQL.Data/src/X/Protocol/X/ByteDecoder.cs
index c85f49668..af7e0f8ba 100644
--- a/MySQL.Data/src/X/Protocol/X/ByteDecoder.cs
+++ b/MySQL.Data/src/X/Protocol/X/ByteDecoder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/DecimalDecoder.cs b/MySQL.Data/src/X/Protocol/X/DecimalDecoder.cs
index a064eb2e1..1b4360db5 100644
--- a/MySQL.Data/src/X/Protocol/X/DecimalDecoder.cs
+++ b/MySQL.Data/src/X/Protocol/X/DecimalDecoder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2016, 2024, Oracle and/or its affiliates.
+// Copyright © 2016, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Enum.cs b/MySQL.Data/src/X/Protocol/X/Enum.cs
index 1cffe1f21..371c10f38 100644
--- a/MySQL.Data/src/X/Protocol/X/Enum.cs
+++ b/MySQL.Data/src/X/Protocol/X/Enum.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/ExpUnparser.cs b/MySQL.Data/src/X/Protocol/X/ExpUnparser.cs
index cbcad148e..35d8ddac4 100644
--- a/MySQL.Data/src/X/Protocol/X/ExpUnparser.cs
+++ b/MySQL.Data/src/X/Protocol/X/ExpUnparser.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/ExprParser.cs b/MySQL.Data/src/X/Protocol/X/ExprParser.cs
index fa4aab5ec..72df42454 100644
--- a/MySQL.Data/src/X/Protocol/X/ExprParser.cs
+++ b/MySQL.Data/src/X/Protocol/X/ExprParser.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/ExprUtil.cs b/MySQL.Data/src/X/Protocol/X/ExprUtil.cs
index 101e1704c..1753cfb36 100644
--- a/MySQL.Data/src/X/Protocol/X/ExprUtil.cs
+++ b/MySQL.Data/src/X/Protocol/X/ExprUtil.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/FloatDecoder.cs b/MySQL.Data/src/X/Protocol/X/FloatDecoder.cs
index 40cee7549..8c792f475 100644
--- a/MySQL.Data/src/X/Protocol/X/FloatDecoder.cs
+++ b/MySQL.Data/src/X/Protocol/X/FloatDecoder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/IntegerDecoder.cs b/MySQL.Data/src/X/Protocol/X/IntegerDecoder.cs
index d3a2f4d66..6ac733faf 100644
--- a/MySQL.Data/src/X/Protocol/X/IntegerDecoder.cs
+++ b/MySQL.Data/src/X/Protocol/X/IntegerDecoder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/Mysqlx.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/Mysqlx.cs
index 2a79fe230..4886b7196 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/Mysqlx.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/Mysqlx.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxConnection.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxConnection.cs
index 5c62c39a0..8a72ed424 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxConnection.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxConnection.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCrud.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCrud.cs
index ba35a32d0..84c2a818e 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCrud.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCrud.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCursor.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCursor.cs
index 45c40d3ce..7bbd2d0fb 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCursor.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCursor.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxDatatypes.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxDatatypes.cs
index aa77ee2e9..014465646 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxDatatypes.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxDatatypes.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpect.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpect.cs
index 0bb7e9458..f94ce7ad9 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpect.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpect.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpr.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpr.cs
index 1542e6819..f3a9d024b 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpr.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpr.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxNotice.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxNotice.cs
index b6aaf703c..887934d05 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxNotice.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxNotice.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxPrepare.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxPrepare.cs
index c912575cc..ff9dfb598 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxPrepare.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxPrepare.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxResultset.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxResultset.cs
index 602775ded..be579784d 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxResultset.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxResultset.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSession.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSession.cs
index a049421f7..d844266ff 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSession.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSession.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs
index db509cb32..87ff8feb8 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2023, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/SetDecoder.cs b/MySQL.Data/src/X/Protocol/X/SetDecoder.cs
index c0435ce74..e2262e6ca 100644
--- a/MySQL.Data/src/X/Protocol/X/SetDecoder.cs
+++ b/MySQL.Data/src/X/Protocol/X/SetDecoder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/XDateTimeDecoder.cs b/MySQL.Data/src/X/Protocol/X/XDateTimeDecoder.cs
index fb8d10677..2189fbe78 100644
--- a/MySQL.Data/src/X/Protocol/X/XDateTimeDecoder.cs
+++ b/MySQL.Data/src/X/Protocol/X/XDateTimeDecoder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/XProtocol.cs b/MySQL.Data/src/X/Protocol/X/XProtocol.cs
index 41a5f95ba..4cd9cad42 100644
--- a/MySQL.Data/src/X/Protocol/X/XProtocol.cs
+++ b/MySQL.Data/src/X/Protocol/X/XProtocol.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/XTimeDecoder.cs b/MySQL.Data/src/X/Protocol/X/XTimeDecoder.cs
index 0addea64b..390460438 100644
--- a/MySQL.Data/src/X/Protocol/X/XTimeDecoder.cs
+++ b/MySQL.Data/src/X/Protocol/X/XTimeDecoder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Protocol/X/XValueDecoderFactory.cs b/MySQL.Data/src/X/Protocol/X/XValueDecoderFactory.cs
index c96fc1776..634ce78b1 100644
--- a/MySQL.Data/src/X/Protocol/X/XValueDecoderFactory.cs
+++ b/MySQL.Data/src/X/Protocol/X/XValueDecoderFactory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/RoutingServices/DefaultRoutingService.cs b/MySQL.Data/src/X/RoutingServices/DefaultRoutingService.cs
index c4f36483c..cf1a6ac14 100644
--- a/MySQL.Data/src/X/RoutingServices/DefaultRoutingService.cs
+++ b/MySQL.Data/src/X/RoutingServices/DefaultRoutingService.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/RoutingServices/RoutingServiceBase.cs b/MySQL.Data/src/X/RoutingServices/RoutingServiceBase.cs
index 026d8b17f..6d463413e 100644
--- a/MySQL.Data/src/X/RoutingServices/RoutingServiceBase.cs
+++ b/MySQL.Data/src/X/RoutingServices/RoutingServiceBase.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Serialization/JsonParser.cs b/MySQL.Data/src/X/Serialization/JsonParser.cs
index cba5307de..769d68afd 100644
--- a/MySQL.Data/src/X/Serialization/JsonParser.cs
+++ b/MySQL.Data/src/X/Serialization/JsonParser.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Sessions/InternalSession.cs b/MySQL.Data/src/X/Sessions/InternalSession.cs
index f04de1f48..bc58494da 100644
--- a/MySQL.Data/src/X/Sessions/InternalSession.cs
+++ b/MySQL.Data/src/X/Sessions/InternalSession.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Sessions/QueueTaskScheduler.cs b/MySQL.Data/src/X/Sessions/QueueTaskScheduler.cs
index 10054750b..adee17560 100644
--- a/MySQL.Data/src/X/Sessions/QueueTaskScheduler.cs
+++ b/MySQL.Data/src/X/Sessions/QueueTaskScheduler.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/Sessions/XInternalSession.cs b/MySQL.Data/src/X/Sessions/XInternalSession.cs
index 9b7322515..2bf7e8f15 100644
--- a/MySQL.Data/src/X/Sessions/XInternalSession.cs
+++ b/MySQL.Data/src/X/Sessions/XInternalSession.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/BaseSession.cs b/MySQL.Data/src/X/XDevAPI/BaseSession.cs
index e7804c907..8be04de67 100644
--- a/MySQL.Data/src/X/XDevAPI/BaseSession.cs
+++ b/MySQL.Data/src/X/XDevAPI/BaseSession.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/CRUD/AddStatement.cs b/MySQL.Data/src/X/XDevAPI/CRUD/AddStatement.cs
index f200f0556..4b0a12ebe 100644
--- a/MySQL.Data/src/X/XDevAPI/CRUD/AddStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/CRUD/AddStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/CRUD/CreateCollectionIndexStatement.cs b/MySQL.Data/src/X/XDevAPI/CRUD/CreateCollectionIndexStatement.cs
index 40bd6ab9f..b30f144c1 100644
--- a/MySQL.Data/src/X/XDevAPI/CRUD/CreateCollectionIndexStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/CRUD/CreateCollectionIndexStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/CRUD/CreateIndexParams.cs b/MySQL.Data/src/X/XDevAPI/CRUD/CreateIndexParams.cs
index 7039bcd67..af518edb6 100644
--- a/MySQL.Data/src/X/XDevAPI/CRUD/CreateIndexParams.cs
+++ b/MySQL.Data/src/X/XDevAPI/CRUD/CreateIndexParams.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/CRUD/CrudStatement.cs b/MySQL.Data/src/X/XDevAPI/CRUD/CrudStatement.cs
index f27d75b37..df71f408e 100644
--- a/MySQL.Data/src/X/XDevAPI/CRUD/CrudStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/CRUD/CrudStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/CRUD/DocResult.cs b/MySQL.Data/src/X/XDevAPI/CRUD/DocResult.cs
index 5ee41f76c..1808659a6 100644
--- a/MySQL.Data/src/X/XDevAPI/CRUD/DocResult.cs
+++ b/MySQL.Data/src/X/XDevAPI/CRUD/DocResult.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/CRUD/FindParams.cs b/MySQL.Data/src/X/XDevAPI/CRUD/FindParams.cs
index b658b1380..3616ca7fb 100644
--- a/MySQL.Data/src/X/XDevAPI/CRUD/FindParams.cs
+++ b/MySQL.Data/src/X/XDevAPI/CRUD/FindParams.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/CRUD/FindStatement.cs b/MySQL.Data/src/X/XDevAPI/CRUD/FindStatement.cs
index 813edad1f..7df9b0714 100644
--- a/MySQL.Data/src/X/XDevAPI/CRUD/FindStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/CRUD/FindStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/CRUD/ModifyStatement.cs b/MySQL.Data/src/X/XDevAPI/CRUD/ModifyStatement.cs
index dc21975cf..4e6265476 100644
--- a/MySQL.Data/src/X/XDevAPI/CRUD/ModifyStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/CRUD/ModifyStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/CRUD/RemoveStatement.cs b/MySQL.Data/src/X/XDevAPI/CRUD/RemoveStatement.cs
index de06ca276..4d9867384 100644
--- a/MySQL.Data/src/X/XDevAPI/CRUD/RemoveStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/CRUD/RemoveStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/CRUD/UpdateSpec.cs b/MySQL.Data/src/X/XDevAPI/CRUD/UpdateSpec.cs
index d6c76c627..86e127bd2 100644
--- a/MySQL.Data/src/X/XDevAPI/CRUD/UpdateSpec.cs
+++ b/MySQL.Data/src/X/XDevAPI/CRUD/UpdateSpec.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Client.cs b/MySQL.Data/src/X/XDevAPI/Client.cs
index 69d5e2749..fc4518dfb 100644
--- a/MySQL.Data/src/X/XDevAPI/Client.cs
+++ b/MySQL.Data/src/X/XDevAPI/Client.cs
@@ -1,4 +1,4 @@
-// Copyright © 2018, 2024, Oracle and/or its affiliates.
+// Copyright © 2018, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Collection.cs b/MySQL.Data/src/X/XDevAPI/Collection.cs
index fd9da2702..34afde110 100644
--- a/MySQL.Data/src/X/XDevAPI/Collection.cs
+++ b/MySQL.Data/src/X/XDevAPI/Collection.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Common/BaseResult.cs b/MySQL.Data/src/X/XDevAPI/Common/BaseResult.cs
index af7a8faf3..7d13a8193 100644
--- a/MySQL.Data/src/X/XDevAPI/Common/BaseResult.cs
+++ b/MySQL.Data/src/X/XDevAPI/Common/BaseResult.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Common/BaseStatement.cs b/MySQL.Data/src/X/XDevAPI/Common/BaseStatement.cs
index 8ead4959a..a56018d88 100644
--- a/MySQL.Data/src/X/XDevAPI/Common/BaseStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/Common/BaseStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Common/BufferingResult.cs b/MySQL.Data/src/X/XDevAPI/Common/BufferingResult.cs
index ae7c87bca..58a206a8d 100644
--- a/MySQL.Data/src/X/XDevAPI/Common/BufferingResult.cs
+++ b/MySQL.Data/src/X/XDevAPI/Common/BufferingResult.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Common/CollectionOptions.cs b/MySQL.Data/src/X/XDevAPI/Common/CollectionOptions.cs
index a08a391ea..845ae395d 100644
--- a/MySQL.Data/src/X/XDevAPI/Common/CollectionOptions.cs
+++ b/MySQL.Data/src/X/XDevAPI/Common/CollectionOptions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2019, 2024, Oracle and/or its affiliates.
+// Copyright © 2019, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Common/ColumnType.cs b/MySQL.Data/src/X/XDevAPI/Common/ColumnType.cs
index c850f65d4..ddd964286 100644
--- a/MySQL.Data/src/X/XDevAPI/Common/ColumnType.cs
+++ b/MySQL.Data/src/X/XDevAPI/Common/ColumnType.cs
@@ -1,4 +1,4 @@
-// Copyright © 2016, 2024, Oracle and/or its affiliates.
+// Copyright © 2016, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Common/ErrorInfo.cs b/MySQL.Data/src/X/XDevAPI/Common/ErrorInfo.cs
index af22db16c..ca31f42fb 100644
--- a/MySQL.Data/src/X/XDevAPI/Common/ErrorInfo.cs
+++ b/MySQL.Data/src/X/XDevAPI/Common/ErrorInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Common/FilterParams.cs b/MySQL.Data/src/X/XDevAPI/Common/FilterParams.cs
index 9d5ad512f..35348362e 100644
--- a/MySQL.Data/src/X/XDevAPI/Common/FilterParams.cs
+++ b/MySQL.Data/src/X/XDevAPI/Common/FilterParams.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Common/FilterableStatement.cs b/MySQL.Data/src/X/XDevAPI/Common/FilterableStatement.cs
index e1ab2cfbf..fa80d991a 100644
--- a/MySQL.Data/src/X/XDevAPI/Common/FilterableStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/Common/FilterableStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Common/QueryStatement.cs b/MySQL.Data/src/X/XDevAPI/Common/QueryStatement.cs
index 1fb41938e..9286523f7 100644
--- a/MySQL.Data/src/X/XDevAPI/Common/QueryStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/Common/QueryStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Common/Result.cs b/MySQL.Data/src/X/XDevAPI/Common/Result.cs
index 7312573b7..50ce51f96 100644
--- a/MySQL.Data/src/X/XDevAPI/Common/Result.cs
+++ b/MySQL.Data/src/X/XDevAPI/Common/Result.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Common/TargetedBaseStatement.cs b/MySQL.Data/src/X/XDevAPI/Common/TargetedBaseStatement.cs
index bf9cdac85..ec83f3dd9 100644
--- a/MySQL.Data/src/X/XDevAPI/Common/TargetedBaseStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/Common/TargetedBaseStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Common/WarningInfo.cs b/MySQL.Data/src/X/XDevAPI/Common/WarningInfo.cs
index 6d2306895..2e6877358 100644
--- a/MySQL.Data/src/X/XDevAPI/Common/WarningInfo.cs
+++ b/MySQL.Data/src/X/XDevAPI/Common/WarningInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/DatabaseObject.cs b/MySQL.Data/src/X/XDevAPI/DatabaseObject.cs
index b2b279f0a..8d550665e 100644
--- a/MySQL.Data/src/X/XDevAPI/DatabaseObject.cs
+++ b/MySQL.Data/src/X/XDevAPI/DatabaseObject.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/DbDoc.cs b/MySQL.Data/src/X/XDevAPI/DbDoc.cs
index ce84cc844..fe5fbc16b 100644
--- a/MySQL.Data/src/X/XDevAPI/DbDoc.cs
+++ b/MySQL.Data/src/X/XDevAPI/DbDoc.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/GenericCollection.cs b/MySQL.Data/src/X/XDevAPI/GenericCollection.cs
index e46c5a82f..16443acfc 100644
--- a/MySQL.Data/src/X/XDevAPI/GenericCollection.cs
+++ b/MySQL.Data/src/X/XDevAPI/GenericCollection.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Iterator.cs b/MySQL.Data/src/X/XDevAPI/Iterator.cs
index 208425359..e4b2d1fd8 100644
--- a/MySQL.Data/src/X/XDevAPI/Iterator.cs
+++ b/MySQL.Data/src/X/XDevAPI/Iterator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/MySqlExpression.cs b/MySQL.Data/src/X/XDevAPI/MySqlExpression.cs
index e3f433348..0b7167c0f 100644
--- a/MySQL.Data/src/X/XDevAPI/MySqlExpression.cs
+++ b/MySQL.Data/src/X/XDevAPI/MySqlExpression.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/MySqlX.cs b/MySQL.Data/src/X/XDevAPI/MySqlX.cs
index 9dc53bc73..a395cf4a0 100644
--- a/MySQL.Data/src/X/XDevAPI/MySqlX.cs
+++ b/MySQL.Data/src/X/XDevAPI/MySqlX.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/MySqlXConnectionStringBuilder.cs b/MySQL.Data/src/X/XDevAPI/MySqlXConnectionStringBuilder.cs
index edd0959b3..7e4177f2f 100644
--- a/MySQL.Data/src/X/XDevAPI/MySqlXConnectionStringBuilder.cs
+++ b/MySQL.Data/src/X/XDevAPI/MySqlXConnectionStringBuilder.cs
@@ -1,4 +1,4 @@
-// Copyright © 2019, 2024, Oracle and/or its affiliates.
+// Copyright © 2019, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Relational/Column.cs b/MySQL.Data/src/X/XDevAPI/Relational/Column.cs
index 08ac7a2d6..d9a550478 100644
--- a/MySQL.Data/src/X/XDevAPI/Relational/Column.cs
+++ b/MySQL.Data/src/X/XDevAPI/Relational/Column.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Relational/InternalRowResult.cs b/MySQL.Data/src/X/XDevAPI/Relational/InternalRowResult.cs
index ae6c99928..fe66dcf40 100644
--- a/MySQL.Data/src/X/XDevAPI/Relational/InternalRowResult.cs
+++ b/MySQL.Data/src/X/XDevAPI/Relational/InternalRowResult.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Relational/Row.cs b/MySQL.Data/src/X/XDevAPI/Relational/Row.cs
index 719303b1f..f54157d5b 100644
--- a/MySQL.Data/src/X/XDevAPI/Relational/Row.cs
+++ b/MySQL.Data/src/X/XDevAPI/Relational/Row.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Relational/RowResult.cs b/MySQL.Data/src/X/XDevAPI/Relational/RowResult.cs
index d8e7cede2..968307fa1 100644
--- a/MySQL.Data/src/X/XDevAPI/Relational/RowResult.cs
+++ b/MySQL.Data/src/X/XDevAPI/Relational/RowResult.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Relational/SqlResult.cs b/MySQL.Data/src/X/XDevAPI/Relational/SqlResult.cs
index c02d7ca6d..2e29f1255 100644
--- a/MySQL.Data/src/X/XDevAPI/Relational/SqlResult.cs
+++ b/MySQL.Data/src/X/XDevAPI/Relational/SqlResult.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Relational/SqlStatement.cs b/MySQL.Data/src/X/XDevAPI/Relational/SqlStatement.cs
index 18b83c872..39b617ef9 100644
--- a/MySQL.Data/src/X/XDevAPI/Relational/SqlStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/Relational/SqlStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Relational/Table.cs b/MySQL.Data/src/X/XDevAPI/Relational/Table.cs
index 48f22d541..940ce10f0 100644
--- a/MySQL.Data/src/X/XDevAPI/Relational/Table.cs
+++ b/MySQL.Data/src/X/XDevAPI/Relational/Table.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Relational/TableDeleteStatement.cs b/MySQL.Data/src/X/XDevAPI/Relational/TableDeleteStatement.cs
index 74dbbcb96..bbfaef2cb 100644
--- a/MySQL.Data/src/X/XDevAPI/Relational/TableDeleteStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/Relational/TableDeleteStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Relational/TableInsertStatement.cs b/MySQL.Data/src/X/XDevAPI/Relational/TableInsertStatement.cs
index fcd5706c3..bfd63743d 100644
--- a/MySQL.Data/src/X/XDevAPI/Relational/TableInsertStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/Relational/TableInsertStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Relational/TableSelectStatement.cs b/MySQL.Data/src/X/XDevAPI/Relational/TableSelectStatement.cs
index b32f39fb1..eabf3e900 100644
--- a/MySQL.Data/src/X/XDevAPI/Relational/TableSelectStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/Relational/TableSelectStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Relational/TableUpdateStatement.cs b/MySQL.Data/src/X/XDevAPI/Relational/TableUpdateStatement.cs
index f87e94347..f4aa6ecd1 100644
--- a/MySQL.Data/src/X/XDevAPI/Relational/TableUpdateStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/Relational/TableUpdateStatement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Schema.cs b/MySQL.Data/src/X/XDevAPI/Schema.cs
index f333ce894..a09f782a3 100644
--- a/MySQL.Data/src/X/XDevAPI/Schema.cs
+++ b/MySQL.Data/src/X/XDevAPI/Schema.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/X/XDevAPI/Session.cs b/MySQL.Data/src/X/XDevAPI/Session.cs
index 8a78297d3..784f2c9ad 100644
--- a/MySQL.Data/src/X/XDevAPI/Session.cs
+++ b/MySQL.Data/src/X/XDevAPI/Session.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Cache.cs b/MySQL.Data/src/common/Cache.cs
index ae74c0771..3535ece0c 100644
--- a/MySQL.Data/src/common/Cache.cs
+++ b/MySQL.Data/src/common/Cache.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/ContextString.cs b/MySQL.Data/src/common/ContextString.cs
index e91d49a6a..1108dc87b 100644
--- a/MySQL.Data/src/common/ContextString.cs
+++ b/MySQL.Data/src/common/ContextString.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Dns/DnsEnums.cs b/MySQL.Data/src/common/Dns/DnsEnums.cs
index 733c7d574..0291bda64 100644
--- a/MySQL.Data/src/common/Dns/DnsEnums.cs
+++ b/MySQL.Data/src/common/Dns/DnsEnums.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Dns/DnsQuestion.cs b/MySQL.Data/src/common/Dns/DnsQuestion.cs
index bde33a80d..89861c146 100644
--- a/MySQL.Data/src/common/Dns/DnsQuestion.cs
+++ b/MySQL.Data/src/common/Dns/DnsQuestion.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Dns/DnsRecordHeader.cs b/MySQL.Data/src/common/Dns/DnsRecordHeader.cs
index 424d665d6..8db53aa42 100644
--- a/MySQL.Data/src/common/Dns/DnsRecordHeader.cs
+++ b/MySQL.Data/src/common/Dns/DnsRecordHeader.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Dns/DnsRecordReader.cs b/MySQL.Data/src/common/Dns/DnsRecordReader.cs
index 430b06427..2e35895bd 100644
--- a/MySQL.Data/src/common/Dns/DnsRecordReader.cs
+++ b/MySQL.Data/src/common/Dns/DnsRecordReader.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Dns/DnsRecordUnknown.cs b/MySQL.Data/src/common/Dns/DnsRecordUnknown.cs
index fc29994a0..8c2bfaf3f 100644
--- a/MySQL.Data/src/common/Dns/DnsRecordUnknown.cs
+++ b/MySQL.Data/src/common/Dns/DnsRecordUnknown.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Dns/DnsRequest.cs b/MySQL.Data/src/common/Dns/DnsRequest.cs
index 5b201b89d..2a9372a40 100644
--- a/MySQL.Data/src/common/Dns/DnsRequest.cs
+++ b/MySQL.Data/src/common/Dns/DnsRequest.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Dns/DnsResolver.cs b/MySQL.Data/src/common/Dns/DnsResolver.cs
index 7f0cfee23..a82d579a2 100644
--- a/MySQL.Data/src/common/Dns/DnsResolver.cs
+++ b/MySQL.Data/src/common/Dns/DnsResolver.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Dns/DnsResourceRecord.cs b/MySQL.Data/src/common/Dns/DnsResourceRecord.cs
index 4b78af5a3..a0b8dcafd 100644
--- a/MySQL.Data/src/common/Dns/DnsResourceRecord.cs
+++ b/MySQL.Data/src/common/Dns/DnsResourceRecord.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Dns/DnsResponse.cs b/MySQL.Data/src/common/Dns/DnsResponse.cs
index d1b9e0433..1667744e1 100644
--- a/MySQL.Data/src/common/Dns/DnsResponse.cs
+++ b/MySQL.Data/src/common/Dns/DnsResponse.cs
@@ -1,4 +1,4 @@
-// Copyright © 2022, 2024, Oracle and/or its affiliates.
+// Copyright © 2022, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Dns/DnsSrvRecord.cs b/MySQL.Data/src/common/Dns/DnsSrvRecord.cs
index c153b4b16..3d8b1d62a 100644
--- a/MySQL.Data/src/common/Dns/DnsSrvRecord.cs
+++ b/MySQL.Data/src/common/Dns/DnsSrvRecord.cs
@@ -1,4 +1,4 @@
-// Copyright © 2019, 2024, Oracle and/or its affiliates.
+// Copyright © 2019, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/DnsSrv.cs b/MySQL.Data/src/common/DnsSrv.cs
index b0539894b..429199688 100644
--- a/MySQL.Data/src/common/DnsSrv.cs
+++ b/MySQL.Data/src/common/DnsSrv.cs
@@ -1,4 +1,4 @@
-// Copyright © 2019, 2024, Oracle and/or its affiliates.
+// Copyright © 2019, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/LowResolutionStopwatch.cs b/MySQL.Data/src/common/LowResolutionStopwatch.cs
index 208ee4669..11cddb077 100644
--- a/MySQL.Data/src/common/LowResolutionStopwatch.cs
+++ b/MySQL.Data/src/common/LowResolutionStopwatch.cs
@@ -1,4 +1,4 @@
-// Copyright © 2009, 2024, Oracle and/or its affiliates.
+// Copyright © 2009, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/MyNetworkStream.cs b/MySQL.Data/src/common/MyNetworkStream.cs
index 6223a5d11..2af7d1c01 100644
--- a/MySQL.Data/src/common/MyNetworkStream.cs
+++ b/MySQL.Data/src/common/MyNetworkStream.cs
@@ -1,4 +1,4 @@
-// Copyright © 2009, 2024, Oracle and/or its affiliates.
+// Copyright © 2009, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/MySqlConnectionStringOption.cs b/MySQL.Data/src/common/MySqlConnectionStringOption.cs
index b05ea84fc..64ec4d6d5 100644
--- a/MySQL.Data/src/common/MySqlConnectionStringOption.cs
+++ b/MySQL.Data/src/common/MySqlConnectionStringOption.cs
@@ -1,4 +1,4 @@
-// Copyright © 2019, 2024, Oracle and/or its affiliates.
+// Copyright © 2019, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/MySqlConnectionStringOptionCollection.cs b/MySQL.Data/src/common/MySqlConnectionStringOptionCollection.cs
index 81ba80bf3..00609df8e 100644
--- a/MySQL.Data/src/common/MySqlConnectionStringOptionCollection.cs
+++ b/MySQL.Data/src/common/MySqlConnectionStringOptionCollection.cs
@@ -1,4 +1,4 @@
-// Copyright © 2019, 2024, Oracle and/or its affiliates.
+// Copyright © 2019, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/MySqlTokenizer.cs b/MySQL.Data/src/common/MySqlTokenizer.cs
index 5191d54b9..6bf9c226c 100644
--- a/MySQL.Data/src/common/MySqlTokenizer.cs
+++ b/MySQL.Data/src/common/MySqlTokenizer.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/NativeMethods.cs b/MySQL.Data/src/common/NativeMethods.cs
index b6fa9fae8..6501e7a41 100644
--- a/MySQL.Data/src/common/NativeMethods.cs
+++ b/MySQL.Data/src/common/NativeMethods.cs
@@ -1,4 +1,4 @@
-// Copyright © 2009, 2024, Oracle and/or its affiliates.
+// Copyright © 2009, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Platform.cs b/MySQL.Data/src/common/Platform.cs
index 49203adbb..c4bed02dc 100644
--- a/MySQL.Data/src/common/Platform.cs
+++ b/MySQL.Data/src/common/Platform.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/QueryNormalizer.cs b/MySQL.Data/src/common/QueryNormalizer.cs
index 881a14874..d99b23224 100644
--- a/MySQL.Data/src/common/QueryNormalizer.cs
+++ b/MySQL.Data/src/common/QueryNormalizer.cs
@@ -1,4 +1,4 @@
-// Copyright © 2009, 2024, Oracle and/or its affiliates.
+// Copyright © 2009, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Ssl.cs b/MySQL.Data/src/common/Ssl.cs
index 00a782459..394a7ac7e 100644
--- a/MySQL.Data/src/common/Ssl.cs
+++ b/MySQL.Data/src/common/Ssl.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/SslPemCertificateValidator.cs b/MySQL.Data/src/common/SslPemCertificateValidator.cs
index d29b26689..8186ea6b6 100644
--- a/MySQL.Data/src/common/SslPemCertificateValidator.cs
+++ b/MySQL.Data/src/common/SslPemCertificateValidator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2019, 2024, Oracle and/or its affiliates.
+// Copyright © 2019, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/StreamCreator.cs b/MySQL.Data/src/common/StreamCreator.cs
index 1305ec867..84f015e87 100644
--- a/MySQL.Data/src/common/StreamCreator.cs
+++ b/MySQL.Data/src/common/StreamCreator.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/StringUtility.cs b/MySQL.Data/src/common/StringUtility.cs
index 8e1359378..041397427 100644
--- a/MySQL.Data/src/common/StringUtility.cs
+++ b/MySQL.Data/src/common/StringUtility.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/UnixEndPoint.cs b/MySQL.Data/src/common/UnixEndPoint.cs
index b05c2baa8..71ea2cba7 100644
--- a/MySQL.Data/src/common/UnixEndPoint.cs
+++ b/MySQL.Data/src/common/UnixEndPoint.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/Version.cs b/MySQL.Data/src/common/Version.cs
index b524e5d2a..e80dd3398 100644
--- a/MySQL.Data/src/common/Version.cs
+++ b/MySQL.Data/src/common/Version.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/netstandard2_0/NamedPipeStream.cs b/MySQL.Data/src/common/netstandard2_0/NamedPipeStream.cs
index 57302c11a..a3698477f 100644
--- a/MySQL.Data/src/common/netstandard2_0/NamedPipeStream.cs
+++ b/MySQL.Data/src/common/netstandard2_0/NamedPipeStream.cs
@@ -1,4 +1,4 @@
-// Copyright © 2009, 2024, Oracle and/or its affiliates.
+// Copyright © 2009, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/src/common/netstandard2_0/SharedMemoryStream.cs b/MySQL.Data/src/common/netstandard2_0/SharedMemoryStream.cs
index 4c4ad2e78..02431ca56 100644
--- a/MySQL.Data/src/common/netstandard2_0/SharedMemoryStream.cs
+++ b/MySQL.Data/src/common/netstandard2_0/SharedMemoryStream.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs
index 3ec9b1aff..c6f69757d 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AttributeTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
index ab6f94bca..cdf8d8971 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2016, 2024, Oracle and/or its affiliates.
+// Copyright © 2016, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs b/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs
index eaba3d20f..31458255e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/BlobTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/BlobTestsCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/BlobTestsCompressed.cs
index fcb85a1f4..b27875d3e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/BlobTestsCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/BlobTestsCompressed.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs b/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs
index d3021e26d..90c0db97c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CharSetTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs b/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs
index 7202be6cf..2e34ef818 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CharSetUTF8Tests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
index e62d39e50..b5b95b247 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ClientSideFailoverTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2019, 2024, Oracle and/or its affiliates.
+// Copyright © 2019, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
index 171d6630e..e932704e3 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CmdTestsCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/CmdTestsCompressed.cs
index d18aecbcb..7ce26eb36 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CmdTestsCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CmdTestsCompressed.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
index 5973f4a9f..e399e076e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
index bb0664c28..3a44eea9a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
index 784409462..e3048f459 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/DataTypeTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs
index 2b48c1816..a2ded784e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/DateTimeTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs b/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs
index 0aa3f84b6..e17739ae7 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/DnsSrvTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2019, 2024, Oracle and/or its affiliates.
+// Copyright © 2019, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/EventTests.cs b/MySQL.Data/tests/MySql.Data.Tests/EventTests.cs
index 78d6e0df9..81e95eb60 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/EventTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/EventTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs
index af753b7da..cd3059b6d 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ExceptionTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipe.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipe.cs
index 36a9281a9..56fd2cee3 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipe.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipe.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipeCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipeCompressed.cs
index bd69d5086..0f9d7fd81 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipeCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsPipeCompressed.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMem.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMem.cs
index c70b45b11..f2f3af134 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMem.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMem.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMemCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMemCompressed.cs
index bd6193578..af916620c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMemCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/BlobTestsSharedMemCompressed.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipe.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipe.cs
index d5e732c1b..d805b0efd 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipe.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipe.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipeCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipeCompressed.cs
index 3e00525f3..98e341eac 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipeCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsPipeCompressed.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedMem.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedMem.cs
index 17945408a..99144722e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedMem.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedMem.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedmemCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedmemCompressed.cs
index f92501fdd..94954727c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedmemCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CmdTestsSharedmemCompressed.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CultureTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CultureTests.cs
index b2b136626..4fde4772e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CultureTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/CultureTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DataTypeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DataTypeTests.cs
index 223ab385a..cf9c4a195 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DataTypeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DataTypeTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DateTimeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DateTimeTests.cs
index cba2a0718..de1d3a3a2 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DateTimeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/DateTimeTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
index c36c31488..0ea3316d0 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/InstallerTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/InstallerTests.cs
index a8fcbe190..06223a189 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/InstallerTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/InstallerTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustDomain.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustDomain.cs
index 614b000b0..7fe63735e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustDomain.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustDomain.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustFixtureAttribute.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustFixtureAttribute.cs
index 8a320dba1..d2c7c873f 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustFixtureAttribute.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustFixtureAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustTestClassCommand.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustTestClassCommand.cs
index 3275ea3b1..da37668da 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustTestClassCommand.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustTestClassCommand.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustTestCommand.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustTestCommand.cs
index 2d8064ae1..79ce8fc83 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustTestCommand.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MediumTrustTestCommand.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MySql.MediumTrustsTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MySql.MediumTrustsTests.cs
index 7c40953bb..a75c63762 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MySql.MediumTrustsTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MySql.MediumTrustsTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MySqlClientPermissionTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MySqlClientPermissionTests.cs
index 6fed750b1..e25a0f97d 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MySqlClientPermissionTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MediumTrust/MySqlClientPermissionTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
index 02ead71d3..31cd89da4 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlCommandBuilderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlCommandBuilderTests.cs
index ae2b38de7..0901d9b69 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlCommandBuilderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlCommandBuilderTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
index 2ecdde630..df80661ab 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataAdapterTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataReaderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataReaderTests.cs
index 0843a85a3..4d738a60c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataReaderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySqlDataReaderTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/NETCore20Tests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/NETCore20Tests.cs
index c559a33e5..43ef07643 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/NETCore20Tests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/NETCore20Tests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2018, 2024, Oracle and/or its affiliates.
+// Copyright © 2018, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
@@ -166,4 +166,4 @@ public void SchemaColumnTest()
       Assert.That(!parentDt.Columns[1].AutoIncrement);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/OutputParametersBatchPrepared.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/OutputParametersBatchPrepared.cs
index 4e2a243c6..144987844 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/OutputParametersBatchPrepared.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/OutputParametersBatchPrepared.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/OutputParametersNoBatch.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/OutputParametersNoBatch.cs
index 16733d657..facd8f010 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/OutputParametersNoBatch.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/OutputParametersNoBatch.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/OutputParametersNoBatchPrepared.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/OutputParametersNoBatchPrepared.cs
index c32f42b8f..664faf15a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/OutputParametersNoBatchPrepared.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/OutputParametersNoBatchPrepared.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipe.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipe.cs
index 310dbc630..fa8d58015 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipe.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipe.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipeCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipeCompressed.cs
index c67b92fe1..a673f8a88 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipeCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSPipeCompressed.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemory.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemory.cs
index 3c9bcb2d6..a0c85b501 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemory.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemoryCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemoryCompressed.cs
index ae6452fb4..adff43f9f 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemoryCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PSSharedMemoryCompressed.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PartialTrustSandbox.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PartialTrustSandbox.cs
index c590ff8cf..b62cbd27d 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PartialTrustSandbox.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PartialTrustSandbox.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PerfMonTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PerfMonTests.cs
index cdb6c0230..248ca2ad3 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PerfMonTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/PerfMonTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ProcedureParameterTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ProcedureParameterTests.cs
index 928091759..d9d74515c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ProcedureParameterTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ProcedureParameterTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ReplicationTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ReplicationTests.cs
index 67c647fa6..c599595f0 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ReplicationTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ReplicationTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipe.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipe.cs
index 0e5345faa..b5f0e5fc0 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipe.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipe.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipeCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipeCompressed.cs
index 5c64fedf6..2642e165b 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipeCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsPipeCompressed.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemory.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemory.cs
index 6944ff02e..533a47399 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemory.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemoryCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemoryCompressed.cs
index 681d90af5..853ee4daa 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemoryCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/StressTestsSharedMemoryCompressed.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs
index 825615432..36fe37067 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
index 5d3fb086b..96cc83ac2 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelCompressed.cs
index 621effb45..3c02ba9af 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelCompressed.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelPipe.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelPipe.cs
index 403617770..00e010872 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelPipe.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelPipe.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelSharedMemory.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelSharedMemory.cs
index eee7c5c24..622a9bf1a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelSharedMemory.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancelSharedMemory.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs
index 290638392..71c861b44 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TypeTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs
index ec5eb62e6..b8d746a6e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/UsageAdvisorTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/GenericListener.cs b/MySQL.Data/tests/MySql.Data.Tests/GenericListener.cs
index ff2f5c444..46fb9a42d 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/GenericListener.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/GenericListener.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs
index 152b6a5a7..691199865 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/LoggingTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index abc240e49..965a80589 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
-    <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
+    <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <Version>9.3.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
@@ -138,4 +138,4 @@
     </None>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs
index 8432c7a44..4eace9b66 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySqlDataReaderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/MySqlDataReaderTests.cs
index 29f4647b5..ec1ca03ed 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySqlDataReaderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySqlDataReaderTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/OutputParametersBatch.cs b/MySQL.Data/tests/MySql.Data.Tests/OutputParametersBatch.cs
index 9fb16057c..9e264e4b6 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/OutputParametersBatch.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/OutputParametersBatch.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs
index bca23970c..c2a6b7d69 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ParameterTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
index 46b466f8d..decb80db6 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/PreparedStatementCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/PreparedStatementCompressed.cs
index 76a937054..049abdd9a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/PreparedStatementCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/PreparedStatementCompressed.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs b/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs
index 53166d748..a58dbeb53 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/PreparedStatements.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Properties/AssemblyInfo.cs b/MySQL.Data/tests/MySql.Data.Tests/Properties/AssemblyInfo.cs
index 24d6ecb8c..9a48da313 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Properties/AssemblyInfo.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
@@ -40,7 +40,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle")]
 [assembly: AssemblyProduct("MySql.Data.Tests")]
-[assembly: AssemblyCopyright("Copyright © 2004, 2024, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2004, 2025, Oracle and/or its affiliates.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs b/MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs
index 2baad18ac..8df02c17a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ScriptExecution.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs b/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs
index f71fce02c..00d1d4148 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SimpleTransactions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs b/MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs
index a6579225c..bbf289029 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SqlServerMode.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SqlTokenizer.cs b/MySQL.Data/tests/MySql.Data.Tests/SqlTokenizer.cs
index 9e0a3e9a8..a512bfb2f 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SqlTokenizer.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SqlTokenizer.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
index 4ff7c7a36..54276c39d 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2018, 2024, Oracle and/or its affiliates.
+// Copyright © 2018, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs b/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs
index bb02fef1a..87bda77c9 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/StoredProcedure.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/StoredProcedureWithAccess.cs b/MySQL.Data/tests/MySql.Data.Tests/StoredProcedureWithAccess.cs
index e0d2b4fa2..6b6d3f171 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/StoredProcedureWithAccess.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/StoredProcedureWithAccess.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs b/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs
index bb46478ba..1746e11bc 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/StressTestsCompressed.cs b/MySQL.Data/tests/MySql.Data.Tests/StressTestsCompressed.cs
index 6bd2d7fcc..15be16ca4 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/StressTestsCompressed.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/StressTestsCompressed.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs b/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs
index 282317497..646cace02 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Syntax.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs b/MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs
index 453e707c5..5f8180d24 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Syntax2.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs b/MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs
index 828a75ef7..656843ff2 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/TableCaching.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs b/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs
index 8e6894567..49109a360 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/TestBase.cs
@@ -1,4 +1,4 @@
-// Copyright © 2016, 2024, Oracle and/or its affiliates.
+// Copyright © 2016, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs b/MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs
index fcaa8b25e..76b01d3cf 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Tokenizer.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs b/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
index 83c264d3b..7b0c331ce 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs b/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs
index 7d70267cd..1ab79fb24 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/UnixSockets.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Utils.cs b/MySQL.Data/tests/MySql.Data.Tests/Utils.cs
index fedcd785b..16b0cc5bc 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Utils.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Utils.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
index 9f2055353..f5fc415f0 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
index 55208117a..89549ee2a 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BasicSelectTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BasicSelectTests.cs
index 20b6a73c0..60709a8b8 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BasicSelectTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BasicSelectTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
index 3bb644245..06bdfd0c1 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
index d66254a17..492b43d00 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
index bc5a2b17c..e0256f29a 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2018, 2024, Oracle and/or its affiliates.
+// Copyright © 2018, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs
index c98ac4f0e..7f906380c 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CloseConnectionTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2020, 2024, Oracle and/or its affiliates.
+// Copyright © 2020, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs
index 4e8fec078..47c992ffc 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
index f8c5f6736..1994f681c 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionIndexTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
index 6a03fdf4b..ba00db91f 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
index 88212c2e3..d0a3df97f 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CompressionTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2019, 2024, Oracle and/or its affiliates.
+// Copyright © 2019, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs
index b849e0bb6..80e1d31ef 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudInsertTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
index 741cb7a92..a35f65908 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudRemoveTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs
index 96aa89cd5..add461b08 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/CrudGCTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs
index b9d5b74d9..1913d0ea9 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudTests/DocBufferingTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
index fab5a0f31..e60869b05 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
 // published by the Free Software Foundation.
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CustomTypeTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CustomTypeTests.cs
index 90cc1ee73..675529fbc 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CustomTypeTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CustomTypeTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2023, 2024, Oracle and/or its affiliates.
+// Copyright © 2023, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs
index 27f54b1d7..05f944bae 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/DbDocTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs
index d6ebc34c8..0dfaee5e2 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/DnsSrvTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2019, 2024, Oracle and/or its affiliates.
+// Copyright © 2019, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ExprParserTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ExprParserTests.cs
index d31c6bfcc..8553d1d55 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ExprParserTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ExprParserTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/GenericListener.cs b/MySQL.Data/tests/MySqlX.Data.Tests/GenericListener.cs
index a359f5455..b12077da7 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/GenericListener.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/GenericListener.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/JsonParserTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/JsonParserTests.cs
index 07fb51ff3..c9ee9d1fb 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/JsonParserTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/JsonParserTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs b/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs
index 85d2f494b..63d3093e9 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MergePatch.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index bda016d41..3475a9104 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
-    <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
+    <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <Version>9.3.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
@@ -117,4 +117,4 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/PerformanceTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/PerformanceTests.cs
index 6390cb8a3..b35491dff 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/PerformanceTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/PerformanceTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2018, 2024, Oracle and/or its affiliates.
+// Copyright © 2018, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
index 56fb53c8b..c33e85059 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2018, 2024, Oracle and/or its affiliates.
+// Copyright © 2018, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/Properties/AssemblyInfo.cs b/MySQL.Data/tests/MySqlX.Data.Tests/Properties/AssemblyInfo.cs
index 7503c029b..20a236993 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/Properties/AssemblyInfo.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
@@ -38,7 +38,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("MySQL Connector/NET")]
-[assembly: AssemblyCopyright("Copyright © 2016, 2024, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2016, 2025, Oracle and/or its affiliates.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ColumnMetadataTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ColumnMetadataTests.cs
index 5d4a7b5eb..aae0a3684 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ColumnMetadataTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ColumnMetadataTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2016, 2024, Oracle and/or its affiliates.
+// Copyright © 2016, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DataTypeTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DataTypeTests.cs
index 81806cf7e..b13a25a79 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DataTypeTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DataTypeTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DateTimeTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DateTimeTests.cs
index cfaefd5f7..fdd9ca112 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DateTimeTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/DateTimeTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RelationalGCTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RelationalGCTests.cs
index f5e731796..553f9ec47 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RelationalGCTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RelationalGCTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RowBufferingTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RowBufferingTests.cs
index 7724b265b..f0d8790a6 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RowBufferingTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/RowBufferingTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs
index 7ce44ed11..3ebe3e995 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/SqlTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableAsyncTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableAsyncTests.cs
index 7cfcd16d1..cc1b90324 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableAsyncTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableAsyncTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableDeleteTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableDeleteTests.cs
index a423a0723..01f4660ce 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableDeleteTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableDeleteTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableInsertTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableInsertTests.cs
index 206563e21..1f9f379ea 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableInsertTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableInsertTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
index 5e26dc418..970cf6090 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableSelectTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs
index b8713cea6..9129143e4 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/TableUpdateTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ViewTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ViewTests.cs
index 9548fdd96..40903ff04 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ViewTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/RelationalTests/ViewTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2016, 2024, Oracle and/or its affiliates.
+// Copyright © 2016, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs
index 07145c044..601db8a74 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SchemaTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
index 2cb9c748b..b8487b464 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
index d8d9f225b..f424c85d4 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2018, 2024, Oracle and/or its affiliates.
+// Copyright © 2018, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs
index 41975b6eb..778a06428 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/TransactionTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2015, 2024, Oracle and/or its affiliates.
+// Copyright © 2015, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs
index 17c083be1..58ff81014 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs b/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
index b9cccf21e..71d5c655f 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
@@ -1,4 +1,4 @@
-// Copyright © 2021, 2024, Oracle and/or its affiliates.
+// Copyright © 2021, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
index 7b949d01c..616f67d33 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2018, 2024, Oracle and/or its affiliates.
+// Copyright © 2018, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/Application.cs b/MySql.Web/src/Application.cs
index 65c923e7a..fcfc033ea 100644
--- a/MySql.Web/src/Application.cs
+++ b/MySql.Web/src/Application.cs
@@ -1,4 +1,4 @@
-// Copyright © 2009, 2024, Oracle and/or its affiliates.
+// Copyright © 2009, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/ConfigUtility.cs b/MySql.Web/src/ConfigUtility.cs
index 5c03f1fa7..6bb236523 100644
--- a/MySql.Web/src/ConfigUtility.cs
+++ b/MySql.Web/src/ConfigUtility.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017, 2024, Oracle and/or its affiliates.
+// Copyright © 2017, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/MembershipProvider.cs b/MySql.Web/src/MembershipProvider.cs
index 3f77544f8..d3b82785a 100644
--- a/MySql.Web/src/MembershipProvider.cs
+++ b/MySql.Web/src/MembershipProvider.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/MySql.Web.csproj b/MySql.Web/src/MySql.Web.csproj
index 78ebb7da5..97f4d0a68 100644
--- a/MySql.Web/src/MySql.Web.csproj
+++ b/MySql.Web/src/MySql.Web.csproj
@@ -86,4 +86,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MySql.Web/src/MySqlDatabaseWrapper.cs b/MySql.Web/src/MySqlDatabaseWrapper.cs
index 99dfadc59..5fa161e80 100644
--- a/MySql.Web/src/MySqlDatabaseWrapper.cs
+++ b/MySql.Web/src/MySqlDatabaseWrapper.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/MySqlWebSecurity.cs b/MySql.Web/src/MySqlWebSecurity.cs
index ced44eeeb..4b5939251 100644
--- a/MySql.Web/src/MySqlWebSecurity.cs
+++ b/MySql.Web/src/MySqlWebSecurity.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/PersonalizationConnectionHelper.cs b/MySql.Web/src/PersonalizationConnectionHelper.cs
index f8363d7bb..027113ded 100644
--- a/MySql.Web/src/PersonalizationConnectionHelper.cs
+++ b/MySql.Web/src/PersonalizationConnectionHelper.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/PersonalizationProvider.cs b/MySql.Web/src/PersonalizationProvider.cs
index f98a96859..6c80f47f4 100644
--- a/MySql.Web/src/PersonalizationProvider.cs
+++ b/MySql.Web/src/PersonalizationProvider.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/PersonalizationProviderProcedures.cs b/MySql.Web/src/PersonalizationProviderProcedures.cs
index 1e5750d18..7a150871a 100644
--- a/MySql.Web/src/PersonalizationProviderProcedures.cs
+++ b/MySql.Web/src/PersonalizationProviderProcedures.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/ProfileProvider.cs b/MySql.Web/src/ProfileProvider.cs
index 25fad6a50..778ae9a5c 100644
--- a/MySql.Web/src/ProfileProvider.cs
+++ b/MySql.Web/src/ProfileProvider.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/Properties/AssemblyInfo.cs b/MySql.Web/src/Properties/AssemblyInfo.cs
index a621f8972..fa38956fc 100644
--- a/MySql.Web/src/Properties/AssemblyInfo.cs
+++ b/MySql.Web/src/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/Properties/VersionInfo.cs b/MySql.Web/src/Properties/VersionInfo.cs
index 0e0ddbb1f..e4c0f01b6 100644
--- a/MySql.Web/src/Properties/VersionInfo.cs
+++ b/MySql.Web/src/Properties/VersionInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2024, Oracle and/or its affiliates.
+// Copyright © 2024, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/RoleProvider.cs b/MySql.Web/src/RoleProvider.cs
index 2cd289d55..ef8177e1d 100644
--- a/MySql.Web/src/RoleProvider.cs
+++ b/MySql.Web/src/RoleProvider.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/Runtime.cs b/MySql.Web/src/Runtime.cs
index 162ef29cf..78214fe94 100644
--- a/MySql.Web/src/Runtime.cs
+++ b/MySql.Web/src/Runtime.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/SchemaManager.cs b/MySql.Web/src/SchemaManager.cs
index d83afbeb2..ed0632e3c 100644
--- a/MySql.Web/src/SchemaManager.cs
+++ b/MySql.Web/src/SchemaManager.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/SessionProvider.cs b/MySql.Web/src/SessionProvider.cs
index 68e140eee..c24f741f1 100644
--- a/MySql.Web/src/SessionProvider.cs
+++ b/MySql.Web/src/SessionProvider.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/SimpleMembershipProvider.cs b/MySql.Web/src/SimpleMembershipProvider.cs
index ff2924ec6..a2d1d6735 100644
--- a/MySql.Web/src/SimpleMembershipProvider.cs
+++ b/MySql.Web/src/SimpleMembershipProvider.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/SimpleRoleProvider.cs b/MySql.Web/src/SimpleRoleProvider.cs
index 649402452..f75e7f193 100644
--- a/MySql.Web/src/SimpleRoleProvider.cs
+++ b/MySql.Web/src/SimpleRoleProvider.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/src/SiteMapProvider.cs b/MySql.Web/src/SiteMapProvider.cs
index 3fdd5a90b..257ad7991 100644
--- a/MySql.Web/src/SiteMapProvider.cs
+++ b/MySql.Web/src/SiteMapProvider.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/MySql.Web.Tests.csproj b/MySql.Web/tests/MySql.Web.Tests.csproj
index aa64682dd..27dcb3dd2 100644
--- a/MySql.Web/tests/MySql.Web.Tests.csproj
+++ b/MySql.Web/tests/MySql.Web.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySql.Web.Tests</Description>
-    <Copyright>Copyright © 2016, 2024, Oracle and/or its affiliates.</Copyright>
+    <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.3.0</Version>
     <Authors>Oracle</Authors>
@@ -64,4 +64,4 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MySql.Web/tests/PersonalizationTests.cs b/MySql.Web/tests/PersonalizationTests.cs
index d90553ce9..1ed8622c8 100644
--- a/MySql.Web/tests/PersonalizationTests.cs
+++ b/MySql.Web/tests/PersonalizationTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/ProfileTests.cs b/MySql.Web/tests/ProfileTests.cs
index 2de577133..dbceae9cb 100644
--- a/MySql.Web/tests/ProfileTests.cs
+++ b/MySql.Web/tests/ProfileTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/Properties/AssemblyInfo.cs b/MySql.Web/tests/Properties/AssemblyInfo.cs
index f492e56f2..e4cc0a0e5 100644
--- a/MySql.Web/tests/Properties/AssemblyInfo.cs
+++ b/MySql.Web/tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
@@ -38,7 +38,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oracle")]
 [assembly: AssemblyProduct("MySql.Web.Tests")]
-[assembly: AssemblyCopyright("Copyright © 2004, 2024, Oracle and/or its affiliates.")]
+[assembly: AssemblyCopyright("Copyright © 2004, 2025, Oracle and/or its affiliates.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NonParallelizable]
diff --git a/MySql.Web/tests/RoleManagement.cs b/MySql.Web/tests/RoleManagement.cs
index 225919241..7a1d56fcc 100644
--- a/MySql.Web/tests/RoleManagement.cs
+++ b/MySql.Web/tests/RoleManagement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/SchemaManagerTests.cs b/MySql.Web/tests/SchemaManagerTests.cs
index a4f1f68d2..2b089c4c3 100644
--- a/MySql.Web/tests/SchemaManagerTests.cs
+++ b/MySql.Web/tests/SchemaManagerTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/SchemaTests.cs b/MySql.Web/tests/SchemaTests.cs
index f1217ae8f..6f8558474 100644
--- a/MySql.Web/tests/SchemaTests.cs
+++ b/MySql.Web/tests/SchemaTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/SessionLocking/Global.asax.cs b/MySql.Web/tests/SessionLocking/Global.asax.cs
index 270c7b09a..934ba143b 100644
--- a/MySql.Web/tests/SessionLocking/Global.asax.cs
+++ b/MySql.Web/tests/SessionLocking/Global.asax.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/SessionLocking/InitSessionLocking.aspx.cs b/MySql.Web/tests/SessionLocking/InitSessionLocking.aspx.cs
index 7760aa845..b4ab197ad 100644
--- a/MySql.Web/tests/SessionLocking/InitSessionLocking.aspx.cs
+++ b/MySql.Web/tests/SessionLocking/InitSessionLocking.aspx.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/SessionLocking/read.aspx.cs b/MySql.Web/tests/SessionLocking/read.aspx.cs
index 890444b96..fe2865af1 100644
--- a/MySql.Web/tests/SessionLocking/read.aspx.cs
+++ b/MySql.Web/tests/SessionLocking/read.aspx.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/SessionLocking/write.aspx.cs b/MySql.Web/tests/SessionLocking/write.aspx.cs
index 1ef9fe54d..0d0b2bc1a 100644
--- a/MySql.Web/tests/SessionLocking/write.aspx.cs
+++ b/MySql.Web/tests/SessionLocking/write.aspx.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/SessionLocking/write2.aspx.cs b/MySql.Web/tests/SessionLocking/write2.aspx.cs
index 9098345f1..54a33c439 100644
--- a/MySql.Web/tests/SessionLocking/write2.aspx.cs
+++ b/MySql.Web/tests/SessionLocking/write2.aspx.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2024, Oracle and/or its affiliates.
+// Copyright © 2004, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/SessionTests.cs b/MySql.Web/tests/SessionTests.cs
index 8ee91b96b..b147fea74 100644
--- a/MySql.Web/tests/SessionTests.cs
+++ b/MySql.Web/tests/SessionTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/SimpleMembership.cs b/MySql.Web/tests/SimpleMembership.cs
index cb13ccc79..da2b09a37 100644
--- a/MySql.Web/tests/SimpleMembership.cs
+++ b/MySql.Web/tests/SimpleMembership.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/SiteMapTests.cs b/MySql.Web/tests/SiteMapTests.cs
index 18e9d94a0..1cde4f895 100644
--- a/MySql.Web/tests/SiteMapTests.cs
+++ b/MySql.Web/tests/SiteMapTests.cs
@@ -1,4 +1,4 @@
-// Copyright © 2014, 2024, Oracle and/or its affiliates.
+// Copyright © 2014, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/TestProfile.cs b/MySql.Web/tests/TestProfile.cs
index 1b2a54a2e..92a352b2b 100644
--- a/MySql.Web/tests/TestProfile.cs
+++ b/MySql.Web/tests/TestProfile.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/UserManagement.cs b/MySql.Web/tests/UserManagement.cs
index a022e2045..cd79da523 100644
--- a/MySql.Web/tests/UserManagement.cs
+++ b/MySql.Web/tests/UserManagement.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as
diff --git a/MySql.Web/tests/WebTestBase.cs b/MySql.Web/tests/WebTestBase.cs
index 9b8d09355..c7e06a723 100644
--- a/MySql.Web/tests/WebTestBase.cs
+++ b/MySql.Web/tests/WebTestBase.cs
@@ -1,4 +1,4 @@
-// Copyright © 2013, 2024, Oracle and/or its affiliates.
+// Copyright © 2013, 2025, Oracle and/or its affiliates.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License, version 2.0, as

From be3e9b6671990dfa7762bd6f653750966ad2d70c Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Tue, 21 Jan 2025 15:07:09 -0700
Subject: [PATCH 63/99] Bug#37503859 [MySql.EntityFrameworkCore.dll in NuGet
 packages is not signed]

Change-Id: I0be1afa8a0b55e457dded79bd86f21e9c5b185d4
---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index 9b519c42d..3319ada4a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 9.3.0
+- Fixed bug MySql.EntityFrameworkCore.dll in NuGet packages is not signed (Oracle Bug #37503859).
 
 
 9.2.0

From 5ebea1e1084d1032b6dc403587e999d935934027 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Thu, 22 Feb 2024 21:09:17 -0700
Subject: [PATCH 64/99] WL#16033 [Fix timeout tests]

Change-Id: I7c6fdf95cb45b32832f01bfa7d04da6b80bac574
---
 CHANGES                                       |   1 +
 MySQL.Data/src/common/MyNetworkStream.cs      |  24 +-
 .../tests/MySql.Data.Tests/ConnectionTests.cs |  16 +-
 .../tests/MySql.Data.Tests/MockServer.cs      | 138 +++++++++
 .../CharsetAndCollationTests.cs               |   2 +-
 .../ClientSideFailoverTests.cs                |   4 +-
 .../tests/MySqlX.Data.Tests/ClientTests.cs    |  24 +-
 .../tests/MySqlX.Data.Tests/MockServer.cs     | 138 +++++++++
 .../tests/MySqlX.Data.Tests/SessionTests.cs   | 265 +++++++++++++-----
 9 files changed, 519 insertions(+), 93 deletions(-)
 create mode 100644 MySQL.Data/tests/MySql.Data.Tests/MockServer.cs
 create mode 100644 MySQL.Data/tests/MySqlX.Data.Tests/MockServer.cs

diff --git a/CHANGES b/CHANGES
index 3319ada4a..410886323 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
 9.3.0
 - Fixed bug MySql.EntityFrameworkCore.dll in NuGet packages is not signed (Oracle Bug #37503859).
+- Fixed some tests due to incorrect implementation (WL16033).
 
 
 9.2.0
diff --git a/MySQL.Data/src/common/MyNetworkStream.cs b/MySQL.Data/src/common/MyNetworkStream.cs
index 2af7d1c01..c8b5e2ed2 100644
--- a/MySQL.Data/src/common/MyNetworkStream.cs
+++ b/MySQL.Data/src/common/MyNetworkStream.cs
@@ -116,8 +116,7 @@ private void HandleOrRethrowException(Exception e)
           }
           if (IsTimeoutException(socketException))
           {
-            return;
-            //throw new TimeoutException(socketException.Message, e);
+            throw new TimeoutException(socketException.Message, e);
           }
         }
         currentException = currentException.InnerException;
@@ -137,16 +136,30 @@ private async Task<int> ReadAsync(byte[] buffer, int offset, int count, Cancella
       {
         try
         {
+          //if (execAsync)
+          //  return await base.ReadAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
+          //else
+          //  return base.Read(buffer, offset, count);
+
           if (execAsync)
-            return await base.ReadAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
+          {
+            int readasync= await base.ReadAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
+            _socket.ReceiveTimeout = 0;
+            return readasync;
+          }
           else
-            return base.Read(buffer, offset, count);
+          {
+            int read = base.Read(buffer, offset, count);
+            _socket.ReceiveTimeout = 0;
+            return read;
+          }
         }
         catch (Exception e)
         {
           exception = e;
           HandleOrRethrowException(e);
         }
+        
       }
       while (++retry < MaxRetryCount);
       if (exception.GetBaseException() is SocketException
@@ -296,6 +309,9 @@ private static MyNetworkStream CreateSocketStream(uint port, uint keepAlive, uin
           new Socket(AddressFamily.Unix, SocketType.Stream, ProtocolType.IP) :
           new Socket(ip.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
 
+      if (connectionTimeout > 0)
+        socket.ReceiveTimeout = (int)connectionTimeout;
+
       socket.NoDelay = true;
 
       if (keepAlive > 0)
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
index 3a44eea9a..c5725768d 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
@@ -27,12 +27,14 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using MySql.Data.Common;
+using MySql.Data.Tests;
 using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Diagnostics;
+using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -553,17 +555,21 @@ public void CloneConnectionDisclosePassword()
     [Property("Category", "Security")]
     public void ConnectionTimeout()
     {
+      MockServer mServer=new MockServer(false);
+      mServer.StartServer();
+
       MySqlConnectionStringBuilder connStr = new MySqlConnectionStringBuilder(Connection.ConnectionString);
-      connStr.Server = "10.20.30.40";
-      connStr.Port = 3000;
+      connStr.Server = mServer.Address.ToString();
+      connStr.Port = (uint)mServer.Port;
       connStr.ConnectionTimeout = 5;
       MySqlConnection c = new MySqlConnection(connStr.GetConnectionString(true));
-
       DateTime start = DateTime.Now;
       var ex = Assert.Throws<MySqlException>(() => c.Open());
-      Assert.That(ex.InnerException.InnerException is TimeoutException);
       TimeSpan diff = DateTime.Now.Subtract(start);
-      Assert.That(diff.TotalSeconds < 6, $"Timeout exceeded: {diff.TotalSeconds}");
+      Assert.That(diff.TotalSeconds < 8, $"Timeout exceeded: {diff.TotalSeconds}");
+
+      mServer.StopServer();
+      mServer.DisposeListener();
     }
 
     [Test]
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MockServer.cs b/MySQL.Data/tests/MySql.Data.Tests/MockServer.cs
new file mode 100644
index 000000000..991052127
--- /dev/null
+++ b/MySQL.Data/tests/MySql.Data.Tests/MockServer.cs
@@ -0,0 +1,138 @@
+// Copyright © 2025, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MySql.Data.Tests
+{
+  public class MockServer
+  {
+    private TcpListener listener;
+
+    private int _port;
+
+    private IPAddress _address;
+
+    private ManualResetEvent _stopserver = new ManualResetEvent(false);
+
+    private CancellationTokenSource cts;
+
+    private bool _usetimeout;
+
+    public int Port
+    {
+      get => _port;
+      set => _port = value;
+    }
+
+    public IPAddress Address
+    {
+      get => _address;
+      set => _address = value;
+    }
+
+    public MockServer(bool usetimeout)
+    {
+      GetMockServerInfo();
+      _stopserver.Reset();
+      _usetimeout = usetimeout;
+      cts = new CancellationTokenSource(TimeSpan.FromSeconds(12));
+    }
+
+    public void GetMockServerInfo()
+    {
+      TcpListener loopback = new TcpListener(IPAddress.Loopback, 0);
+      loopback.Start();
+      _port = ((IPEndPoint)loopback.LocalEndpoint).Port;
+      loopback.Stop();
+      _address = Dns.GetHostEntry("localhost").AddressList[0];
+    }
+
+    public void StopServer()
+    {
+      _stopserver.Set();
+    }
+    public void DisposeListener()
+    {
+      if (listener != null)
+      {
+        listener.Stop();
+      }
+    }
+
+    public async Task ServerWorker(CancellationToken ct)
+    {
+      await Task.Run(() =>
+      {
+        IPEndPoint endpoint = new IPEndPoint(IPAddress.Loopback, Port);
+        listener = new(endpoint);
+
+        try
+        {
+          listener.Start();
+          while (!_stopserver.WaitOne(1))
+          {
+            listener.BeginAcceptSocket(new AsyncCallback(beginConnection), null);
+          }
+        }
+        catch (Exception)
+        {
+        }
+        finally
+        {
+          listener.Stop();
+        }
+      }, ct).ConfigureAwait(false);
+    }
+
+    public void StartServer()
+    {
+      ServerWorker(cts.Token).ConfigureAwait(false);
+    }
+
+    private void beginConnection(IAsyncResult iar)
+    {
+      try
+      {
+        Socket client = listener.EndAcceptSocket(iar);
+        if (_usetimeout)
+        {
+          Task.Delay(500).Wait();
+          client.Close();
+        }
+      }
+      catch (Exception)
+      {
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
index 06bdfd0c1..226d722f5 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CharsetAndCollationTests.cs
@@ -1127,7 +1127,7 @@ public void Utf8mb4BinaryNopadCollationTable()
       mysqlx0.Password = session.Settings.Password;
       mysqlx0.CharacterSet = "utf8mb4";
       mysqlx0.SslMode = MySqlSslMode.Required;
-      mysqlx0.ConnectTimeout = 10;
+      mysqlx0.ConnectTimeout = 1000;
       mysqlx0.Keepalive = 10;
       mysqlx0.CertificateFile = sslCa;
       mysqlx0.CertificatePassword = sslCertificatePassword;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
index 492b43d00..13fb2e74b 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientSideFailoverTests.cs
@@ -466,7 +466,6 @@ public void ManyInvalidHost()
     {
       Assume.That(session.Version.isAtLeast(5, 7, 0), "This test is for MySql 5.7 or higher");
 
-      var connectionTimeout = 1;
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
 
       // Automatically set priority if no priority is given.
@@ -479,8 +478,7 @@ public void ManyInvalidHost()
       }
 
       using (var session1 = MySQLX.GetSession("server=" + hostList + ";port=" + sb.Port + ";uid=" +
-                                              sb.UserID + ";password=" + sb.Password + ";connect-timeout=" +
-                                              connectionTimeout + ";ssl-mode=Required"))
+                                              sb.UserID + ";password=" + sb.Password + ";connect-timeout=1000;ssl-mode=Required"))
       {
         Assert.That(session1.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         var schema = session1.GetSchema("test");
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
index e0256f29a..f50aa09fe 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
@@ -1773,7 +1773,7 @@ public void ConnectionAttributesInvalidCombinations()
           mysqlx0.Database = schemaName;
           mysqlx0.CharacterSet = "utf8mb4";
           mysqlx0.SslMode = MySqlSslMode.Required;
-          mysqlx0.ConnectTimeout = 10;
+          mysqlx0.ConnectTimeout = 1000;
           mysqlx0.Keepalive = 10;
           mysqlx0.CertificateFile = sslCa;
           mysqlx0.CertificatePassword = sslCertificatePassword;
@@ -1801,7 +1801,7 @@ public void ConnectionAttributesInvalidCombinations()
           mysqlx0.Database = schemaName;
           mysqlx0.CharacterSet = "utf8mb4";
           mysqlx0.SslMode = MySqlSslMode.Required;
-          mysqlx0.ConnectTimeout = 10;
+          mysqlx0.ConnectTimeout = 1000;
           mysqlx0.Keepalive = 10;
           mysqlx0.CertificateFile = sslCa;
           mysqlx0.CertificatePassword = sslCertificatePassword;
@@ -1852,7 +1852,7 @@ public void ConnectionAttributesValidCombinations()
         mysqlx0.Database = schemaName;
         mysqlx0.CharacterSet = "utf8mb4";
         mysqlx0.SslMode = MySqlSslMode.Required;
-        mysqlx0.ConnectTimeout = 10;
+        mysqlx0.ConnectTimeout = 1000;
         mysqlx0.Keepalive = 10;
         mysqlx0.CertificateFile = sslCa;
         mysqlx0.CertificatePassword = sslCertificatePassword;
@@ -1887,7 +1887,7 @@ public void ConnectionAttributesValidCombinations()
         mysqlx0.Database = schemaName;
         mysqlx0.CharacterSet = "utf8mb4";
         mysqlx0.SslMode = MySqlSslMode.Required;
-        mysqlx0.ConnectTimeout = 10;
+        mysqlx0.ConnectTimeout = 1000;
         mysqlx0.Keepalive = 10;
         mysqlx0.CertificateFile = sslCa;
         mysqlx0.CertificatePassword = sslCertificatePassword;
@@ -1943,7 +1943,7 @@ public void ConnectionAttributesKeySpecialChars()
       mysqlx0.Database = schemaName;
       mysqlx0.CharacterSet = "utf8mb4";
       mysqlx0.SslMode = MySqlSslMode.Required;
-      mysqlx0.ConnectTimeout = 10;
+      mysqlx0.ConnectTimeout = 1000;
       mysqlx0.Keepalive = 10;
       mysqlx0.CertificateFile = sslCa;
       mysqlx0.CertificatePassword = sslCertificatePassword;
@@ -1972,7 +1972,7 @@ public void ConnectionAttributesKeySpecialChars()
       mysqlx0.Database = schemaName;
       mysqlx0.CharacterSet = "utf8mb4";
       mysqlx0.SslMode = MySqlSslMode.Required;
-      mysqlx0.ConnectTimeout = 10;
+      mysqlx0.ConnectTimeout = 1000;
       mysqlx0.Keepalive = 10;
       mysqlx0.CertificateFile = sslCa;
       mysqlx0.CertificatePassword = sslCertificatePassword;
@@ -2016,7 +2016,7 @@ public void ConnectionAttributesKeyWithUnderLineChars()
       mysqlx0.Database = schemaName;
       mysqlx0.CharacterSet = "utf8mb4";
       mysqlx0.SslMode = MySqlSslMode.Required;
-      mysqlx0.ConnectTimeout = 10;
+      mysqlx0.ConnectTimeout = 1000;
       mysqlx0.Keepalive = 10;
       mysqlx0.CertificateFile = sslCa;
       mysqlx0.CertificatePassword = sslCertificatePassword;
@@ -2043,7 +2043,7 @@ public void ConnectionAttributesKeyWithUnderLineChars()
       mysqlx0.Database = schemaName;
       mysqlx0.CharacterSet = "utf8mb4";
       mysqlx0.SslMode = MySqlSslMode.Required;
-      mysqlx0.ConnectTimeout = 10;
+      mysqlx0.ConnectTimeout = 1000;
       mysqlx0.Keepalive = 10;
       mysqlx0.CertificateFile = sslCa;
       mysqlx0.CertificatePassword = sslCertificatePassword;
@@ -2088,7 +2088,7 @@ public void ConnectionAttributesKeyBlankChars()
       mysqlx0.Database = schemaName;
       mysqlx0.CharacterSet = "utf8mb4";
       mysqlx0.SslMode = MySqlSslMode.Required;
-      mysqlx0.ConnectTimeout = 10;
+      mysqlx0.ConnectTimeout = 1000;
       mysqlx0.Keepalive = 10;
       mysqlx0.CertificateFile = sslCa;
       mysqlx0.CertificatePassword = sslCertificatePassword;
@@ -2115,7 +2115,7 @@ public void ConnectionAttributesKeyBlankChars()
       mysqlx0.Database = schemaName;
       mysqlx0.CharacterSet = "utf8mb4";
       mysqlx0.SslMode = MySqlSslMode.Required;
-      mysqlx0.ConnectTimeout = 10;
+      mysqlx0.ConnectTimeout = 1000;
       mysqlx0.Keepalive = 10;
       mysqlx0.CertificateFile = sslCa;
       mysqlx0.CertificatePassword = sslCertificatePassword;
@@ -2159,7 +2159,7 @@ public void ConnectionAttributesValue1025Chars()
       mysqlx0.Database = schemaName;
       mysqlx0.CharacterSet = "utf8mb4";
       mysqlx0.SslMode = MySqlSslMode.Required;
-      mysqlx0.ConnectTimeout = 10;
+      mysqlx0.ConnectTimeout = 1000;
       mysqlx0.Keepalive = 10;
       mysqlx0.CertificateFile = sslCa;
       mysqlx0.CertificatePassword = sslCertificatePassword;
@@ -2185,7 +2185,7 @@ public void ConnectionAttributesValue1025Chars()
       mysqlx0.Database = schemaName;
       mysqlx0.CharacterSet = "utf8mb4";
       mysqlx0.SslMode = MySqlSslMode.Required;
-      mysqlx0.ConnectTimeout = 10;
+      mysqlx0.ConnectTimeout = 1000;
       mysqlx0.Keepalive = 10;
       mysqlx0.CertificateFile = sslCa;
       mysqlx0.CertificatePassword = sslCertificatePassword;
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MockServer.cs b/MySQL.Data/tests/MySqlX.Data.Tests/MockServer.cs
new file mode 100644
index 000000000..d600576b6
--- /dev/null
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MockServer.cs
@@ -0,0 +1,138 @@
+// Copyright © 2025, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MySqlX.Data.Tests
+{
+  public class MockServer
+  {
+    private TcpListener listener;
+
+    private int _port;
+
+    private IPAddress _address;
+
+    private ManualResetEvent _stopserver = new ManualResetEvent(false);
+
+    private CancellationTokenSource cts;
+
+    private bool _usetimeout;
+
+    public int Port
+    {
+      get => _port;
+      set => _port = value;
+    }
+
+    public IPAddress Address
+    {
+      get => _address;
+      set => _address = value;
+    }
+
+    public MockServer(bool usetimeout)
+    {
+      GetMockServerInfo();
+      _stopserver.Reset();
+      _usetimeout = usetimeout;
+      cts = new CancellationTokenSource(TimeSpan.FromSeconds(12));
+    }
+
+    public void GetMockServerInfo()
+    {
+      TcpListener loopback = new TcpListener(IPAddress.Loopback, 0);
+      loopback.Start();
+      _port = ((IPEndPoint)loopback.LocalEndpoint).Port;
+      loopback.Stop();
+      _address = Dns.GetHostEntry("localhost").AddressList[0];
+    }
+
+    public void StopServer()
+    {
+      _stopserver.Set();
+    }
+    public void DisposeListener()
+    {
+      if (listener != null)
+      {
+        listener.Stop();
+      }
+    }
+
+    public async Task ServerWorker(CancellationToken ct)
+    {
+      await Task.Run(() =>
+      {
+        IPEndPoint endpoint = new IPEndPoint(IPAddress.Loopback, Port);
+        listener = new(endpoint);
+
+        try
+        {
+          listener.Start();
+          while (!_stopserver.WaitOne(1))
+          {
+            listener.BeginAcceptSocket(new AsyncCallback(beginConnection), null);
+          }
+        }
+        catch (Exception)
+        {
+        }
+        finally
+        {
+          listener.Stop();
+        }
+      }, ct).ConfigureAwait(false);
+    }
+
+    public void StartServer()
+    {
+      ServerWorker(cts.Token).ConfigureAwait(false);
+    }
+
+    private void beginConnection(IAsyncResult iar)
+    {
+      try
+      {
+        Socket client = listener.EndAcceptSocket(iar);
+        if (_usetimeout)
+        {
+          Task.Delay(500).Wait();
+          client.Close();
+        }
+      }
+      catch (Exception)
+      {
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
index b8487b464..d4bdfe89a 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
@@ -32,7 +32,6 @@
 using MySqlX.XDevAPI;
 using MySqlX.XDevAPI.Relational;
 using NUnit.Framework;
-using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -476,12 +475,56 @@ public void GetUri()
       }
     }
 
+    /// <summary>
+    /// WL #16033 Fix timeout tests
+    /// </summary>
+    [Test]
+    [Property("Category", "Security")]
+    [TestCase($"server=_server;user=test;password=test;port=_port;connect-timeout=0;", 0, 1000, true, true)]
+    [TestCase($"server=_server;user=test;password=test;port=_port;", 8, 25, true)]
+    [TestCase($"server=_server,server_;port=port_;user=test;password=test;", 0, 25, false)]
+    [TestCase($"server=_server;user=test;password=test;port=_port;connect-timeout=5000;", 3, 15, true)]
+    [TestCase($"mysqlx://test:test@[_server:_port]", 0, 25, true, false, true)]
+    public void ConnectionTimeout(string connstring,int min,int max,bool failure, bool usemockservertimeout=false, bool isUri=false)
+    {
+      MockServer mServer = new MockServer(usemockservertimeout);
+      mServer.StartServer();
+
+      if (failure)
+      {
+        if (isUri)
+        {
+          if (Uri.TryCreate(connstring, UriKind.Absolute, out _))
+          {
+            TestConnectTimeoutFailureTimeout(connstring.Replace("_server", mServer.Address.ToString()).Replace("_port", mServer.Port.ToString()), min, max, "default timeout", usemockservertimeout);
+          }
+          else
+          {
+            mServer.StopServer();
+            mServer.DisposeListener();
+            Assert.Ignore("not parseable Uri: "+ connstring);
+          }
+        }
+        else
+        {
+          TestConnectTimeoutFailureTimeout(connstring.Replace("_server", mServer.Address.ToString()).Replace("_port", mServer.Port.ToString()), min, max, "default timeout", usemockservertimeout);
+        }
+      }  
+      else
+      {
+        connstring = connstring.Replace("_server", mServer.Address.ToString()).Replace("_port", mServer.Port.ToString()).Replace("server_", Host).Replace("port_", XPort);
+        TestConnectTimeoutSuccessTimeout(connstring, min, max, "Fail over success");
+      }
+      mServer.StopServer();
+      mServer.DisposeListener();
+    }
+
     /// <summary>
     /// WL #12177 Implement connect timeout
     /// </summary>
     [Test]
     [Property("Category", "Security")]
-    public void ConnectTimeout()
+    public void ConnectTimeoutParameterValidation()
     {
       Assume.That(!Platform.IsMacOSX(), "Check failure on MacOS: <System.Net.Internals.SocketExceptionFactory+ExtendedSocketException (51): Network is unreachable 143.24.20.36:33060");
 
@@ -517,31 +560,55 @@ public void ConnectTimeout()
       }
 
       // Create a session using the fail over functionality passing two diferrent Server address(one of them is fake host). Must succeed after 2000ms
-      var conn = $"server=143.24.20.36,{Host};user=test;password=test;port={XPort};connecttimeout=2000;";
-      TestConnectTimeoutSuccessTimeout(conn, 0, 5, "Fail over success");
+      MockServer mServer1 = new MockServer(false);
+      mServer1.StartServer();
+      var conn = $"server={mServer1.Address},{Host};user=test;password=test;port={XPort};connecttimeout=2000;";
+      TestConnectTimeoutSuccessTimeout(conn, 0, 10, "Fail over success");
+      mServer1.StopServer();
+      mServer1.DisposeListener();
 
       // Offline (fake)host using default value, 10000ms.
-      conn = $"server=143.24.20.36;user=test;password=test;port={XPort};";
-      TestConnectTimeoutFailureTimeout(conn, 9, 20, "Offline host default value");
+      mServer1 = new MockServer(false);
+      mServer1.StartServer();
+      conn = $"server={mServer1.Address};user=test;password=test;port={mServer1.Port};";
+      TestConnectTimeoutFailureTimeout(conn, 9, 25, "Offline host default value", false);
+      mServer1.StopServer();
+      mServer1.DisposeListener();
 
       // Offline (fake)host using 15000ms.
-      conn = $"server=143.24.20.36;user=test;password=test;port={XPort};connecttimeout=15000";
-      TestConnectTimeoutFailureTimeout(conn, 14, 17, "Offline host 15000ms");
-
-      // Offline (fake)host timeout disabled. Commented due to unexpected behavior
-      //conn = $"server=143.24.20.36;user=test;password=test;port={XPort};connecttimeout=0";
-      //TestConnectTimeoutFailureTimeout(conn, 10, 600, "Offline host timeout disabled");
+      mServer1 = new MockServer(false);
+      mServer1.StartServer();
+      conn = $"server={mServer1.Address} ;user=test;password=test;port= {mServer1.Port};connecttimeout=15000";
+      TestConnectTimeoutFailureTimeout(conn, 14, 35, "Offline host 15000ms", false);
+      mServer1.StopServer();
+      mServer1.DisposeListener();
+
+      //Offline(fake)host timeout disabled.
+      mServer1 =new MockServer(true);
+      mServer1.StartServer();
+      conn = $"server={mServer1.Address};user=test;password=test;port={mServer1.Port};connecttimeout=0";
+      TestConnectTimeoutFailureTimeout(conn, 0, 600, "Offline host timeout disabled", true);
+      mServer1.StopServer();
+      mServer1.DisposeListener();
 
       // Both (fake)servers offline. Connection must time out after 20000ms
-      conn = $"server=143.24.20.36,143.24.20.35;user=test;password=test;port={XPort};";
+      mServer1 = new MockServer(false);
+      MockServer mServer2 = new MockServer(false);
+      mServer1.StartServer();
+      mServer2.StartServer();
+      conn = $"server={mServer1.Address},{mServer2.Address};user=test;password=test;port={mServer1.Port};connecttimeout=2000;";
       DateTime start = DateTime.Now;
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(conn));
       TimeSpan diff = DateTime.Now.Subtract(start);
-      Assert.That(diff.TotalSeconds > 19 && diff.TotalSeconds < 21, String.Format("Timeout exceeded ({0}). Actual time: {1}", "Fail over failure", diff));
+      Assert.That(diff.TotalSeconds > 1 && diff.TotalSeconds < 45, String.Format("Timeout exceeded ({0}). Actual time: {1}", "Fail over failure", diff));
+      mServer1.StopServer();
+      mServer1.DisposeListener();
+      mServer2.StopServer();
+      mServer2.DisposeListener();
 
       // Valid session no time out
       start = DateTime.Now;
-      using (Session session = MySQLX.GetSession(ConnectionStringUri + "?connecttimeout=2000"))
+      using (Session session = MySQLX.GetSession(ConnectionStringUri+ "?connecttimeout=0"))
         session.SQL("SELECT SLEEP(10)").Execute();
       diff = DateTime.Now.Subtract(start);
       Assert.That(diff.TotalSeconds > 10);
@@ -579,10 +646,13 @@ public void ConnectTimeout()
       Assert.That(exception, Is.Not.Null);
     }
 
-    private void TestConnectTimeoutFailureTimeout(String connString, int minTime, int maxTime, string test)
+    private void TestConnectTimeoutFailureTimeout(String connString, int minTime, int maxTime, string test, bool usingmocktimeout)
     {
       DateTime start = DateTime.Now;
-      Assert.Throws<TimeoutException>(() => MySQLX.GetSession(connString));
+      if(usingmocktimeout)
+        Assert.Throws<MySqlException>(() => MySQLX.GetSession(connString));
+      else
+        Assert.Throws<System.TimeoutException>(() => MySQLX.GetSession(connString));
       TimeSpan diff = DateTime.Now.Subtract(start);
       Assert.That(diff.TotalSeconds > minTime && diff.TotalSeconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, diff));
     }
@@ -1572,15 +1642,25 @@ public void TimeoutReachingMaxSizePool()
     [Test, Description("scenario 0(connectionString,connectionUri,Anonymous Object)-Without connect timeout and max timeout should be 10s")]
     public void TimeoutWithWrongHost()
     {
-      string serverName = "vigdis07.no.oracle.com";
-      string connStr = "server=" + serverName + ";user=" + session.Settings.UserID + ";port=" + XPort + ";password="
-           + session.Settings.Password + ";";
-      TestConnectStringTimeoutFailureTimeout(connStr, 0, 11, "Timeout value between 9 and 11 seconds");
-      connStr = "mysqlx://" + session.Settings.UserID + ":" + session.Settings.Password + "@" + serverName + ":" + XPort;
-      TestConnectStringTimeoutFailureTimeout(connStr, 0, 11, "Timeout value between 9 and 11 seconds");
-      var connObj = new { server = serverName, port = XPort, user = session.Settings.UserID, password = session.Settings.Password };
-      TestConnectObjTimeoutFailureTimeout(connObj, 0, 11, "Timeout value between 9 and 11 seconds");
+      MockServer mServer= new MockServer(false);
+      mServer.StartServer();
 
+      string connStr = $"server={mServer.Address.ToString()};user={session.Settings.UserID};port={mServer.Port.ToString()};password={ session.Settings.Password};";
+      TestConnectStringTimeoutFailureTimeout(connStr, 9, 20, "Timeout value between 9 and 20 seconds");
+      mServer.StopServer();
+      mServer.DisposeListener();
+
+      mServer = new MockServer(false);
+      mServer.StartServer();
+      connStr = $"mysqlx://{session.Settings.UserID}:{ session.Settings.Password}@{mServer.Address.ToString()}:{mServer.Port.ToString()}";
+      if(Uri.TryCreate(connStr, UriKind.Absolute, out _))
+        TestConnectStringTimeoutFailureTimeout(connStr, 9, 20, "Timeout value between 9 and 20 seconds");
+      
+        var connObj = new { server = mServer.Address.ToString(), port = mServer.Port.ToString(), user = session.Settings.UserID, password = session.Settings.Password };
+      TestConnectObjTimeoutFailureTimeout(connObj, 9, 20, "Timeout value between 9 and 20 seconds");
+
+      mServer.StopServer();
+      mServer.DisposeListener();
     }
 
     [Test, Description("scenario 1(connectionString,connectionUri,Anonymous Object)")]
@@ -1632,7 +1712,7 @@ public void NoTimeoutWithManyOptions()
     public void TimeoutSuccessWithStringBuilder()
     {
       var connStrBuilder = new MySqlXConnectionStringBuilder();
-      connStrBuilder.ConnectTimeout = 9000;
+      connStrBuilder.ConnectTimeout = 2000;
       connStrBuilder.UserID = session.Settings.UserID;
       connStrBuilder.Password = session.Settings.Password;
       connStrBuilder.Port = Convert.ToUInt32(XPort);
@@ -1689,7 +1769,7 @@ public void TimeoutIncreasingUntilConnect()
               "database=" + schemaName + ";characterset=utf8mb4;sslmode=VerifyCA;ssl-ca="
               + sslCa + $";certificatepassword={sslCertificatePassword};certificatestorelocation=LocalMachine;"
               + ";auth=PLAIN;certificatethumbprint=;"
-              + "connect-timeout=" + i;
+              + "connect-timeout=" + (i * 1000);
         mysqlx0 = new MySqlXConnectionStringBuilder(connStr);
         using (var conn = MySQLX.GetSession(mysqlx0.ConnectionString))
         {
@@ -1714,7 +1794,7 @@ public void TimeoutIncreasingUntilConnect()
         mysqlx0.CertificateStoreLocation = MySqlCertificateStoreLocation.LocalMachine;
         mysqlx0.Auth = MySqlAuthenticationMode.PLAIN;
         mysqlx0.CertificateThumbprint = "";
-        mysqlx0.ConnectTimeout = (uint)i;
+        mysqlx0.ConnectTimeout = (uint)(i * 1000);
 
         using (var conn = MySQLX.GetSession(mysqlx0.ConnectionString))
         {
@@ -1727,7 +1807,7 @@ public void TimeoutIncreasingUntilConnect()
     [Test, Description("scenario 1(connectionString,connectionUri,Anonymous Object with default timeout)")]
     public void ValidateDefaultTimeoutParameter()
     {
-      uint defaultTimeout = 1;
+      uint defaultTimeout = 1000;
       string connStr = ConnectionString + ";" + "connect-timeout=" + defaultTimeout;
       for (int i = 0; i < 10; i++)
       {
@@ -1757,7 +1837,7 @@ public void ValidateDefaultTimeoutParameter()
     [Test, Description("scenario 2(MysqlxStringBuilder with default timeout)")]
     public void ValidateDefaultTimeoutParameterWithStringBuilder()
     {
-      uint defaultTimeout = 1;
+      uint defaultTimeout = 1000;
       var connStrBuilder = new MySqlXConnectionStringBuilder();
       connStrBuilder.ConnectTimeout = defaultTimeout;
       connStrBuilder.UserID = session.Settings.UserID;
@@ -1785,26 +1865,34 @@ public void ValidateDefaultTimeoutParameterWithStringBuilder()
     [Test, Description("scenario 1(MysqlxStringBuilder with connect timeout option for offline server)")]
     public void TimeoutOfflineServerWithStringBuilder()
     {
+      MockServer mServer = new MockServer(false);
+      mServer.StartServer();
+
       int connectionTimeout = 2000;
-      string serverName = "vigdis07.no.oracle.com";
       var connStrBuilder = new MySqlXConnectionStringBuilder();
       connStrBuilder.ConnectTimeout = (uint)connectionTimeout;
       connStrBuilder.UserID = session.Settings.UserID;
       connStrBuilder.Password = session.Settings.Password;
-      connStrBuilder.Port = Convert.ToUInt32(XPort);
-      connStrBuilder.Server = serverName;
+      connStrBuilder.Port = Convert.ToUInt32(mServer.Port);
+      connStrBuilder.Server = mServer.Address.ToString();
       TestConnectStringTimeoutFailureTimeout(connStrBuilder.ConnectionString, 0, 21, "Offline host timeout value in between 1 and 21 seconds");
+      mServer.StopServer();
+      mServer.DisposeListener();
 
-      string connStr = "server=" + serverName + ";user=" + session.Settings.UserID + ";port=" + XPort + ";password="
-          + session.Settings.Password + ";" + "connect-timeout=" + connectionTimeout;
+      mServer = new MockServer(false);
+      mServer.StartServer();
+      string connStr = $"server={mServer.Address.ToString()};user={session.Settings.UserID}; port={mServer.Port.ToString()};password={session.Settings.Password};connect-timeout={connectionTimeout}";
       connStrBuilder = new MySqlXConnectionStringBuilder(connStr);
       TestConnectStringTimeoutFailureTimeout(connStrBuilder.ConnectionString, 0, 21, "Offline host timeout value in between 1 and 21 seconds");
+
+      mServer.StopServer();
+      mServer.DisposeListener();
     }
 
     [Test, Description("scenario 1(connectionString,connectionUri,Anonymous Object,MysqlxStringBuilder with connect timeout option=1 for online server)")]
     public void TimeoutSuccessConnectOptionOne()
     {
-      int connectionTimeout = 1;
+      int connectionTimeout = 2000;
       string connStr = ConnectionString + ";" + "connect-timeout=" + connectionTimeout;
       TestConnectStringTimeoutSuccessTimeout(connStr, 0, 5, "Checking the timeout between 0 to 5 seconds");
       connStr = ConnectionStringUri + "?connect-timeout=" + connectionTimeout;
@@ -1829,32 +1917,52 @@ public void TimeoutSuccessConnectOptionOne()
     [Test, Description("scenario 1(connectionString,connectionUri,Anonymous Object,MysqlxStringBuilder with connect timeout option=0 for offline server)")]
     public void TimeoutOfflineServerConnectOptionZero()
     {
+      //, Ignore("Disabling the connection timeout will wait until the OS closes the socket, which can take several time.")
+      MockServer mServer = new MockServer(true);
+      mServer.StartServer();
       int connectionTimeout = 0;
-      string serverName = "vigdis07.no.oracle.com";
-
-      string connStr = "server=" + serverName + ";user=" + session.Settings.UserID + ";port=" + XPort + ";password="
-            + session.Settings.Password + ";" + "connect-timeout=" + connectionTimeout;
-      TestConnectStringTimeoutFailureTimeout(connStr, 0, 50000, "Checking the timeout between 0 to 50000 milliseconds");
-
-      connStr = "mysqlx://" + session.Settings.UserID + ":" + session.Settings.Password + "@" + serverName + ":" + XPort + "?connect-timeout=" + connectionTimeout;
-      TestConnectStringTimeoutFailureTimeout(connStr, 0, 50000, "Checking the timeout between 0 to 50000 milliseconds");
-
-      var connObj = new { server = serverName, port = XPort, user = session.Settings.UserID, password = session.Settings.Password, connecttimeout = connectionTimeout };
-      TestConnectObjTimeoutFailureTimeout(connObj, 0, 50000, "Checking the timeout between 0 to 50000 milliseconds");
 
+      string connStr = $"server={mServer.Address.ToString()};user={session.Settings.UserID};port={mServer.Port.ToString()};password={session.Settings.Password};connect-timeout={connectionTimeout}";
+      TestConnectStringTimeoutFailureNoConnectTimeout(connStr, 0, 50000, "Checking the timeout between 0 to 50000 milliseconds");
+      mServer.StopServer();
+      mServer.DisposeListener();
+
+      mServer = new MockServer(true);
+      mServer.StartServer();
+      connStr = $"mysqlx://{session.Settings.UserID}:{session.Settings.Password}@[{mServer.Address.ToString()}:{mServer.Port.ToString()}]/?connect-timeout=" + connectionTimeout;
+      if (Uri.TryCreate(connStr,UriKind.Absolute, out _))
+        TestConnectStringTimeoutFailureNoConnectTimeout(connStr, 0, 50000, "Checking the timeout between 0 to 50000 milliseconds");
+ 
+      mServer.StopServer();
+      mServer.DisposeListener();
+
+      mServer = new MockServer(true);
+      mServer.StartServer();
+      var connObj = new { server = mServer.Address.ToString(), port = mServer.Port.ToString(), user = session.Settings.UserID, password = session.Settings.Password, connecttimeout = connectionTimeout };
+      TestConnectObjTimeoutFailureNoTimeout(connObj, 0, 50000, "Checking the timeout between 0 to 50000 milliseconds");
+      mServer.StopServer();
+      mServer.DisposeListener();
+
+      mServer = new MockServer(true);
+      mServer.StartServer();
       var connStrBuilder = new MySqlXConnectionStringBuilder();
       connStrBuilder.ConnectTimeout = (uint)connectionTimeout;
       connStrBuilder.UserID = session.Settings.UserID;
       connStrBuilder.Password = session.Settings.Password;
-      connStrBuilder.Port = Convert.ToUInt32(XPort);
-      connStrBuilder.Server = serverName;
-      TestConnectStringTimeoutFailureTimeout(connStr, 0, 50000, "Checking the timeout between 0 to 50000 milliseconds");
-
-      connStr = "server=" + serverName + ";user=" + session.Settings.UserID + ";port=" + XPort + ";password="
-          + session.Settings.Password + ";" + "connect-timeout=" + connectionTimeout;
+      connStrBuilder.Port = (uint)mServer.Port;
+      connStrBuilder.Server = mServer.Address.ToString();
+      TestConnectStringTimeoutFailureNoConnectTimeout(connStrBuilder.ConnectionString, 0, 50000, "Checking the timeout between 0 to 50000 milliseconds");
+      mServer.StopServer();
+      mServer.DisposeListener();
+
+      mServer = new MockServer(true);
+      mServer.StartServer();
+      connStr = $"server={mServer.Address.ToString()};user={session.Settings.UserID};port={mServer.Port.ToString()};password={session.Settings.Password};connect-timeout={connectionTimeout}";
       connStrBuilder = new MySqlXConnectionStringBuilder(connStr);
-      TestConnectStringTimeoutFailureTimeout(connStr, 0, 50000, "Checking the timeout between 0 to 50000 milliseconds");
+      TestConnectStringTimeoutFailureNoConnectTimeout(connStr, 0, 50000, "Checking the timeout between 0 to 50000 milliseconds");
 
+      mServer.StopServer();
+      mServer.DisposeListener();
     }
 
     [Test, Description("(connectionString,connectionUri,Anonymous Object.Test that the timeout will be reset for each connection attempt in a failover scenario")]
@@ -2093,33 +2201,36 @@ public void WrongPasswordException()
       }
     }
 
-    [Test, Description("Test the default connect timeout with offline server with concurrent connections")]
-    [Ignore("Test its not well implemented")] // TO DO
+    [Test, Description("Test the default connect timeout with mock server with concurrent connections")]
     public async Task ConnectTimeoutConcurrentConnections()
     {
-      await Task.Run(() => SubThread1());
-      await Task.Run(() => SubThread2());
+      MockServer mServer = new MockServer(false);
+      mServer.StartServer();
+      
+      await Task.Run(() => SubThread1(mServer.Address.ToString(), mServer.Port.ToString()));
+      await Task.Run(() => SubThread2(mServer.Address.ToString(), mServer.Port.ToString()));
+
+      mServer.StopServer();
+      mServer.DisposeListener();
     }
 
-    private void SubThread1()
+    private void SubThread1(string address, string port)
     {
-      string serverName = "vigdis07.no.oracle.com";
       for (int i = 0; i < 5; i++)
       {
-        string connStr = "server=" + serverName + ";user=" + session.Settings.UserID + ";port=" + XPort + ";password="
+        string connStr = "server=" + address + ";user=" + session.Settings.UserID + ";port=" + port + ";password="
                   + session.Settings.Password + ";" + "connect-timeout=2000;";
-        TestConnectStringTimeoutFailureTimeout(connStr, 0, 5, "Timeout value between 1 and 3 second");
+        TestConnectStringTimeoutFailureTimeout(connStr, 1, 5, "Timeout value between 1 and 3 second");
       }
     }
 
-    private void SubThread2()
+    private void SubThread2(string address, string port)
     {
-      string serverName = "vigdis07.no.oracle.com";
       for (int i = 0; i < 5; i++)
       {
-        string connStr = "server=" + serverName + ";user=" + session.Settings.UserID + ";port=" + XPort + ";password="
+        string connStr = "server=" + address + ";user=" + session.Settings.UserID + ";port=" + port + ";password="
                   + session.Settings.Password + ";" + "connect-timeout=2000;";
-        TestConnectStringTimeoutFailureTimeout(connStr, 0, 5, "Timeout value between 1 and 3 second");
+        TestConnectStringTimeoutFailureTimeout(connStr, 1, 5, "Timeout value between 1 and 3 second");
       }
     }
 
@@ -2256,7 +2367,16 @@ public void TestConnectObjTimeoutFailureTimeout(object connString, int minTime,
     {
       Stopwatch sw = new Stopwatch();
       sw.Start();
-      Assert.Catch(() => MySQLX.GetSession(connString));
+      Assert.Throws<TimeoutException>(() => MySQLX.GetSession(connString));
+      sw.Stop();
+      Assert.That(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
+    }
+
+    public void TestConnectObjTimeoutFailureNoTimeout(object connString, int minTime, int maxTime, string test)
+    {
+      Stopwatch sw = new Stopwatch();
+      sw.Start();
+      Assert.Throws<MySqlException>(() => MySQLX.GetSession(connString));
       sw.Stop();
       Assert.That(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
     }
@@ -2265,7 +2385,16 @@ public void TestConnectStringTimeoutFailureTimeout(String connString, int minTim
     {
       Stopwatch sw = new Stopwatch();
       sw.Start();
-      Assert.Catch(() => MySQLX.GetSession(connString));
+      Assert.Throws<TimeoutException>(() => MySQLX.GetSession(connString));
+      sw.Stop();
+      Assert.That(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
+    }
+
+    public void TestConnectStringTimeoutFailureNoConnectTimeout(String connString, int minTime, int maxTime, string test)
+    {
+      Stopwatch sw = new Stopwatch();
+      sw.Start();
+      Assert.Throws<MySqlException>(() => MySQLX.GetSession(connString));
       sw.Stop();
       Assert.That(sw.Elapsed.Seconds >= minTime && sw.Elapsed.Seconds < maxTime, String.Format("Timeout exceeded ({0}). Actual time: {1}", test, sw.Elapsed));
     }

From f206d3a55aeabc01cb2a95f01649296028caf0f3 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sat, 8 Mar 2025 14:26:00 -0700
Subject: [PATCH 65/99] WL#16852 [Update 3rd party libraries and remove
 references in Connector/NET bundles]

Change-Id: I9a933ad84826892b1b01d79e0949e62ef3d7cd11
---
 CHANGES                                       |   1 +
 Dependencies/MITLibs/comerr64.dll             | Bin 26184 -> 26176 bytes
 Dependencies/MITLibs/gssapi64.dll             | Bin 400456 -> 403016 bytes
 Dependencies/MITLibs/k5sprt64.dll             | Bin 74312 -> 69184 bytes
 Dependencies/MITLibs/krb5_64.dll              | Bin 1233480 -> 1224256 bytes
 Dependencies/MITLibs/krbcc64.dll              | Bin 122440 -> 121920 bytes
 .../src/MySQL.Data.OpenTelemetry.csproj       |   2 +-
 MySQL.Data/src/MySql.Data.csproj              |   8 +-
 .../src/X/Protocol/X/Protobuf/Mysqlx.cs       |  44 ++++-
 .../X/Protocol/X/Protobuf/MysqlxConnection.cs |  67 ++++++-
 .../src/X/Protocol/X/Protobuf/MysqlxCrud.cs   | 166 ++++++++++++++++--
 .../src/X/Protocol/X/Protobuf/MysqlxCursor.cs |  45 ++++-
 .../X/Protocol/X/Protobuf/MysqlxDatatypes.cs  |  78 +++++++-
 .../src/X/Protocol/X/Protobuf/MysqlxExpect.cs |  34 +++-
 .../src/X/Protocol/X/Protobuf/MysqlxExpr.cs   | 102 +++++++++--
 .../src/X/Protocol/X/Protobuf/MysqlxNotice.cs |  66 ++++++-
 .../X/Protocol/X/Protobuf/MysqlxPrepare.cs    |  45 ++++-
 .../X/Protocol/X/Protobuf/MysqlxResultset.cs  |  67 ++++++-
 .../X/Protocol/X/Protobuf/MysqlxSession.cs    |  56 +++++-
 .../src/X/Protocol/X/Protobuf/MysqlxSql.cs    |  23 ++-
 20 files changed, 727 insertions(+), 77 deletions(-)

diff --git a/CHANGES b/CHANGES
index 410886323..93ada122e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 9.3.0
 - Fixed bug MySql.EntityFrameworkCore.dll in NuGet packages is not signed (Oracle Bug #37503859).
 - Fixed some tests due to incorrect implementation (WL16033).
+- Updated third party dependencies (WL16852).
 
 
 9.2.0
diff --git a/Dependencies/MITLibs/comerr64.dll b/Dependencies/MITLibs/comerr64.dll
index 0a48cb5b62db1a835b18620e3ff69042dc4d5753..70753cc798da972b571d882f069716284d9df20a 100644
GIT binary patch
delta 3282
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

delta 3331
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
EKdDD<2><{9

diff --git a/Dependencies/MITLibs/gssapi64.dll b/Dependencies/MITLibs/gssapi64.dll
index 1628e3842faa02d29fc6e038f8c2d03bf5b53d64..21d6feb388ac6ff5caef6b101a22ac4003d430e0 100644
GIT binary patch
delta 124767
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
LtQ+J<OZ@pC0WW3*

delta 124422
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

diff --git a/Dependencies/MITLibs/k5sprt64.dll b/Dependencies/MITLibs/k5sprt64.dll
index 9237ce9d76f38f00f0a29a308d251ad0a1e61e81..ff77f1a3bca1b66761cc7129dcad5aa59c089d75 100644
GIT binary patch
delta 18952
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
V{rr|$mc7Drze@khnRwFW{{V~>vXcM+

delta 24077
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
LeprgLoAAE?*e5EO

diff --git a/Dependencies/MITLibs/krb5_64.dll b/Dependencies/MITLibs/krb5_64.dll
index 582f680f8ae964fdcf51c9611715855a7575bcf1..42db6f7b1700dc31c7ee051aa85a1d662d1fa374 100644
GIT binary patch
delta 261894
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%0DeCts}HxHWmGYDJp+KU#4
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

delta 270776
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

diff --git a/Dependencies/MITLibs/krbcc64.dll b/Dependencies/MITLibs/krbcc64.dll
index ba5a5190d03163bf27ef08761e816e8f91f872c0..c3891e817a12fc539503c63bb53d02e5e443e5eb 100644
GIT binary patch
delta 31809
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

delta 32142
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

diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index bc38d3e17..766c12ffe 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -37,7 +37,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Api" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Api" Version="1.11.2" />
   </ItemGroup>
 
 </Project>
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index c14166c20..088019be2 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -52,15 +52,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.26.1" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.30.0" />
     <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.8" />
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageReference Include="ZstdSharp.Port" Version="0.8.0" />
+    <PackageReference Include="ZstdSharp.Port" Version="0.8.5" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
-	<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
+	  <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net462' or '$(TargetFramework)'=='net48'">
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/Mysqlx.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/Mysqlx.cs
index 4886b7196..be76ea51a 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/Mysqlx.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/Mysqlx.cs
@@ -264,7 +264,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -281,6 +285,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -486,7 +495,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -503,6 +516,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -742,7 +760,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -763,6 +785,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1143,7 +1170,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1176,6 +1207,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxConnection.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxConnection.cs
index 8a72ed424..b5f4aec39 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxConnection.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxConnection.cs
@@ -325,7 +325,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -353,6 +357,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -551,7 +560,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -572,6 +585,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -742,7 +760,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -759,6 +781,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -967,7 +994,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -991,6 +1022,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1167,7 +1203,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1184,6 +1224,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1548,7 +1593,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1581,6 +1630,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1618,3 +1672,4 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
+
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCrud.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCrud.cs
index 84c2a818e..75e212cd8 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCrud.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCrud.cs
@@ -489,7 +489,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -518,6 +522,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -788,7 +797,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -816,6 +829,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1089,7 +1107,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1114,6 +1136,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1393,7 +1420,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1418,6 +1449,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1676,7 +1712,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1707,6 +1747,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1979,7 +2024,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2007,6 +2056,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -2338,7 +2392,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2373,6 +2431,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -3070,7 +3133,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3150,6 +3217,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -3650,7 +3722,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3694,6 +3770,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -3913,7 +3994,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
                 break;
@@ -3934,6 +4019,11 @@ public void MergeFrom(pb::CodedInputStream input)
           uint tag;
           while ((tag = input.ReadTag()) != 0)
           {
+            if ((tag & 7) == 4)
+            {
+              // Abort on any end group tag.
+              return;
+            }
             switch (tag)
             {
               default:
@@ -4398,7 +4488,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -4459,6 +4553,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -4946,7 +5045,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -5003,6 +5106,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -5595,7 +5703,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -5650,6 +5762,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -6185,7 +6302,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -6236,6 +6357,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -6539,7 +6665,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -6567,6 +6697,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -6598,3 +6733,4 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
+
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCursor.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCursor.cs
index 7bbd2d0fb..235ec14bb 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCursor.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCursor.cs
@@ -393,7 +393,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -425,6 +429,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -698,7 +707,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
                 break;
@@ -726,6 +739,11 @@ public void MergeFrom(pb::CodedInputStream input)
           uint tag;
           while ((tag = input.ReadTag()) != 0)
           {
+            if ((tag & 7) == 4)
+            {
+              // Abort on any end group tag.
+              return;
+            }
             switch (tag)
             {
               default:
@@ -1042,7 +1060,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1067,6 +1089,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1307,7 +1334,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1328,6 +1359,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1350,3 +1386,4 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
+
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxDatatypes.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxDatatypes.cs
index 014465646..bdf38ad39 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxDatatypes.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxDatatypes.cs
@@ -628,7 +628,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -683,6 +687,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1012,7 +1021,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
                 break;
@@ -1037,6 +1050,11 @@ public void MergeFrom(pb::CodedInputStream input)
           uint tag;
           while ((tag = input.ReadTag()) != 0)
           {
+            if ((tag & 7) == 4)
+            {
+              // Abort on any end group tag.
+              return;
+            }
             switch (tag)
             {
               default:
@@ -1313,7 +1331,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
                 break;
@@ -1338,6 +1360,11 @@ public void MergeFrom(pb::CodedInputStream input)
           uint tag;
           while ((tag = input.ReadTag()) != 0)
           {
+            if ((tag & 7) == 4)
+            {
+              // Abort on any end group tag.
+              return;
+            }
             switch (tag)
             {
               default:
@@ -1535,7 +1562,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1556,6 +1587,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1812,7 +1848,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
                 break;
@@ -1840,6 +1880,11 @@ public void MergeFrom(pb::CodedInputStream input)
           uint tag;
           while ((tag = input.ReadTag()) != 0)
           {
+            if ((tag & 7) == 4)
+            {
+              // Abort on any end group tag.
+              return;
+            }
             switch (tag)
             {
               default:
@@ -2041,7 +2086,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2062,6 +2111,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -2397,7 +2451,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2439,6 +2497,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -2504,3 +2567,4 @@ public enum Type
 }
 
 #endregion Designer generated code
+
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpect.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpect.cs
index f94ce7ad9..0c92b140e 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpect.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpect.cs
@@ -309,7 +309,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -334,6 +338,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -673,7 +682,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
                 break;
@@ -702,6 +715,11 @@ public void MergeFrom(pb::CodedInputStream input)
           uint tag;
           while ((tag = input.ReadTag()) != 0)
           {
+            if ((tag & 7) == 4)
+            {
+              // Abort on any end group tag.
+              return;
+            }
             switch (tag)
             {
               default:
@@ -927,7 +945,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -944,6 +966,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -961,3 +988,4 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
+
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpr.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpr.cs
index f3a9d024b..dcb51f823 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpr.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpr.cs
@@ -652,7 +652,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -723,6 +727,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1082,7 +1091,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1107,6 +1120,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1445,7 +1463,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1474,6 +1496,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1540,7 +1567,7 @@ public enum Type
   ///
   ///for table: col\@doc_path, tbl.col\@doc_path col, tbl.col, schema.tbl.col
   ///for document collection: doc_path
-  /////
+  ///&#x2F;/
   ///@par production list
   ///@code{unparsed}
   ///col_identifier: string "." string "." string |
@@ -1884,7 +1911,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1917,6 +1948,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -2168,7 +2204,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2196,6 +2236,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -2444,7 +2489,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2469,6 +2518,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -2664,7 +2718,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2685,6 +2743,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -2947,7 +3010,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
                 break;
@@ -2975,6 +3042,11 @@ public void MergeFrom(pb::CodedInputStream input)
           uint tag;
           while ((tag = input.ReadTag()) != 0)
           {
+            if ((tag & 7) == 4)
+            {
+              // Abort on any end group tag.
+              return;
+            }
             switch (tag)
             {
               default:
@@ -3179,7 +3251,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3200,6 +3276,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -3222,3 +3303,4 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
+
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxNotice.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxNotice.cs
index 887934d05..39a8bdee1 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxNotice.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxNotice.cs
@@ -419,7 +419,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -448,6 +452,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -836,7 +845,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -865,6 +878,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1164,7 +1182,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1192,6 +1214,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1443,7 +1470,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1468,6 +1499,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1782,7 +1818,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1807,6 +1847,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -2002,7 +2047,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2019,6 +2068,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxPrepare.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxPrepare.cs
index ff9dfb598..aec5a7492 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxPrepare.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxPrepare.cs
@@ -345,7 +345,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -373,6 +377,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -793,7 +802,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
                 break;
@@ -849,6 +862,11 @@ public void MergeFrom(pb::CodedInputStream input)
           uint tag;
           while ((tag = input.ReadTag()) != 0)
           {
+            if ((tag & 7) == 4)
+            {
+              // Abort on any end group tag.
+              return;
+            }
             switch (tag)
             {
               default:
@@ -1234,7 +1252,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1263,6 +1285,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1508,7 +1535,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1529,6 +1560,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1551,3 +1587,4 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
+
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxResultset.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxResultset.cs
index be579784d..909bf01e1 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxResultset.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxResultset.cs
@@ -281,7 +281,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -298,6 +302,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -461,7 +470,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -478,6 +491,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -641,7 +659,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -658,6 +680,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -821,7 +848,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -838,6 +869,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1999,7 +2035,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2064,6 +2104,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -2336,7 +2381,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2357,6 +2406,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -2379,3 +2433,4 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
+
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSession.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSession.cs
index d844266ff..6a3c0f640 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSession.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSession.cs
@@ -391,7 +391,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -420,6 +424,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -654,7 +663,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -675,6 +688,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -896,7 +914,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -917,6 +939,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1144,7 +1171,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1165,6 +1196,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1335,7 +1371,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1352,6 +1392,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -1369,3 +1414,4 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
+
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs
index 87ff8feb8..825b21188 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs
@@ -421,7 +421,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -454,6 +458,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -637,7 +646,11 @@ public void MergeFrom(pb::CodedInputStream input)
 #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -654,6 +667,11 @@ public void MergeFrom(pb::CodedInputStream input)
       uint tag;
       while ((tag = input.ReadTag()) != 0)
       {
+        if ((tag & 7) == 4)
+        {
+          // Abort on any end group tag.
+          return;
+        }
         switch (tag)
         {
           default:
@@ -671,3 +689,4 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
+

From 0e32937dfef265fa6fd6d6f615860a98147699ee Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 12 Mar 2025 18:26:50 -0600
Subject: [PATCH 66/99] Updated EFCore dependencies

Change-Id: I6003e5afae5538c62fdb12ccc3b2511fed23baac
---
 EFCore/src/MySql.EntityFrameworkCore.csproj               | 8 ++++----
 .../MySql.EntityFrameworkCore.Basic.Tests.csproj          | 4 ++--
 .../MySql.EntityFrameworkCore.Design.Tests.csproj         | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
index 4c6eb9507..65aadc533 100644
--- a/EFCore/src/MySql.EntityFrameworkCore.csproj
+++ b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -27,13 +27,13 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.14" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index 061239671..b650e7248 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -18,11 +18,11 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.14" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="9.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="9.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index b63438b20..f163da6c3 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -34,11 +34,11 @@
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.14" />
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
   </ItemGroup>
 
   <ItemGroup>

From 1d14eae501085abac5f1a269b28992e27d20d50f Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Thu, 13 Mar 2025 13:05:50 -0600
Subject: [PATCH 67/99] Updated Documentation.

Change-Id: I74756de74018067fc563d8ac36199246f6b29d2e
---
 Documentation/index.md | 4 ++--
 README.md              | 2 ++
 Release Notes.txt      | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Documentation/index.md b/Documentation/index.md
index 2e7520959..36f5c177e 100644
--- a/Documentation/index.md
+++ b/Documentation/index.md
@@ -1,6 +1,6 @@
 ## MySQL Connector/NET and X DevAPI
 
-MySQL Connector/NET 9.2 supports X Protocol, which enables you to use X DevAPI with the .NET language of choice to develop applications that communicate with a MySQL server functioning as a document store, relational database, or both.
+MySQL Connector/NET 9.3 supports X Protocol, which enables you to use X DevAPI with the .NET language of choice to develop applications that communicate with a MySQL server functioning as a document store, relational database, or both.
 
 To get started, review the following main classes:
 
@@ -16,7 +16,7 @@ For an introduction to X DevAPI concepts, see the [X DevAPI User Guide](https://
 
 ## MySQL Connector/NET
 
-MySQL Connector/NET 9.2 also supports the development of .NET, .NET Core and .NET Framework applications that require secure, high-performance data connectivity with MySQL through the classic protocol. It supports ADO.NET, Entity Framework and various web providers.
+MySQL Connector/NET 9.3 also supports the development of .NET, .NET Core and .NET Framework applications that require secure, high-performance data connectivity with MySQL through the classic protocol. It supports ADO.NET, Entity Framework and various web providers.
 
 To get started, review the following main classes:
 
diff --git a/README.md b/README.md
index 8529fdb9a..3be431d7c 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,8 @@ From MySQL Connector/NET 9.2, the driver adds support for [.NET 9](https://learn
 
 From MySQL Connector/NET 9.2, the driver removes support for .NET 6 and EF Core 6.
 
+From MySQL Connector/NET 9.3, the driver adds fixes to test suite and support for newest versions of EF Core 8 and EF Core 9.
+
 For detailed information please visit the official [MySQL Connector/NET documentation](https://dev.mysql.com/doc/connector-net/en/).
 
 ## Licensing
diff --git a/Release Notes.txt b/Release Notes.txt
index 7d478a2ef..ccee1223a 100644
--- a/Release Notes.txt	
+++ b/Release Notes.txt	
@@ -1,9 +1,9 @@
-Connector/NET 9.2 Release Notes
+Connector/NET 9.3 Release Notes
 ------------------------------------
 Welcome to the release notes for Connector/NET 9.1
 
-What's new in 9.2
+What's new in 9.3
 --------------------
 
-Connector/NET adds support for .NET 9 and EF Core 9 GA versions.
-Connector/NET removes support for .NET6 and EFCore 6.
\ No newline at end of file
+Connector/NET now supports the newest version of EFCore 8 and EFCore 9.
+Connector/NET added fixes to testsuite.
\ No newline at end of file

From bd4a3918c23b5dfc9e7e939b2cc26137deb3cbf6 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Thu, 13 Mar 2025 13:09:02 -0600
Subject: [PATCH 68/99] Updated the LICENSE files.

Change-Id: Ifc7000e917ce668b066cd258454465a01ea6f5d9
---
 LICENSE | 1399 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 1323 insertions(+), 76 deletions(-)

diff --git a/LICENSE b/LICENSE
index bebd4dbf0..b1ca05180 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Licensing Information User Manual
 
-MySQL Connector/NET 9.2.0 Community
+MySQL Connector/NET 9.3.0 Community
      __________________________________________________________________
 
 Introduction
@@ -8,18 +8,18 @@ Introduction
    This License Information User Manual contains Oracle's product license
    and other licensing information, including licensing information for
    third-party software which may be included in this distribution of
-   MySQL Connector/NET 9.2.0 Community.
+   MySQL Connector/NET 9.3.0 Community.
 
-   Last updated: November 2024
+   Last updated: March 2025
 
 Licensing Information
 
-   This release of MySQL Connector/NET 9.2.0 Community is brought to you
+   This release of MySQL Connector/NET 9.3.0 Community is brought to you
    by the MySQL team at Oracle. This software is released under version 2
    of the GNU General Public License (GPLv2), as set forth below, with the
    following additional permissions:
 
-   This distribution of MySQL Connector/NET 9.2.0 Community is designed to
+   This distribution of MySQL Connector/NET 9.3.0 Community is designed to
    work with certain software (including but not limited to OpenSSL) that
    is licensed under separate terms, as designated in a particular file or
    component or in the license documentation. Without limiting your rights
@@ -34,7 +34,7 @@ Licensing Information
    a copy of which is reproduced below and can also be found along with
    its FAQ at http://oss.oracle.com/licenses/universal-foss-exception.
 
-   Copyright (c) 2004, 2024, Oracle and/or its affiliates.
+   Copyright (c) 2004, 2025, Oracle and/or its affiliates.
 
 Election of GPLv2
 
@@ -519,58 +519,1333 @@ support library is itself covered by the above license.
    ======================================================================
    ======================================================================
 
-K4os.Compression.LZ4.Streams
+Kerberos5
 
-LICENSE file:
-========
-MIT License
+You may be receiving a copy of the kerberos documentation as part of this
+product. The terms of the Oracle license do NOT apply to Kerberos documentation.
 
-Copyright (c) 2017 Milosz Krajewski
+Kerberos documentation is licensed under the CC-BY-SA 3.0 license, separate from
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+the Oracle product.
+If you do not wish to install this library, you may remove it, but
+the Oracle program might not operate properly or at all without it.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Copyright (C) 1985-2019 by the Massachusetts Institute of Technology.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+All rights reserved.
 
-------------------------------------------------------------------------------
-4th party dependency
-(https://github.com/MiloszKrajewski/K4os.Hash.xxHash/archive/master.zip):
-LICENSE File (same copyright):
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-MIT License
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
 
-Copyright (c) 2017 Milosz Krajewski
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Downloading of this software may constitute an export of cryptographic
+software from the United States of America that is subject to the
+United States Export Administration Regulations (EAR), 15 CFR 730-774.
+Additional laws or regulations may apply.  It is the responsibility of
+the person or entity contemplating export to comply with all
+applicable export laws and regulations, including obtaining any
+required license from the U.S. government.
+
+The U.S. government prohibits export of encryption source code to
+certain countries and individuals, including, but not limited to, the
+countries of Cuba, Iran, North Korea, Sudan, Syria, and residents and
+nationals of those countries.
+
+Documentation components of this software distribution are licensed
+under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
+(http://creativecommons.org/licenses/by-sa/3.0/)
+
+Individual source code files are copyright MIT, Cygnus Support,
+Novell, OpenVision Technologies, Oracle, Red Hat, Sun Microsystems,
+FundsXpress, and others.
+
+Project Athena, Athena, Athena MUSE, Discuss, Hesiod, Kerberos, Moira,
+and Zephyr are trademarks of the Massachusetts Institute of Technology
+(MIT).  No commercial use of these trademarks may be made without
+prior written permission of MIT.
+
+"Commercial use" means use of a name in a product or other for-profit
+manner.  It does NOT prevent a commercial firm from referring to the
+MIT trademarks in order to convey information (although in doing so,
+recognition of their trademark status should be given).
+
+======================================================================
+
+The following copyright and permission notice applies to the
+OpenVision Kerberos Administration system located in "kadmin/create",
+"kadmin/dbutil", "kadmin/passwd", "kadmin/server", "lib/kadm5", and
+portions of "lib/rpc":
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+   Copyright, OpenVision Technologies, Inc., 1993-1996, All Rights
+   Reserved
+
+   WARNING:  Retrieving the OpenVision Kerberos Administration system
+   source code, as described below, indicates your acceptance of the
+   following terms.  If you do not agree to the following terms, do
+   not retrieve the OpenVision Kerberos administration system.
+
+   You may freely use and distribute the Source Code and Object Code
+   compiled from it, with or without modification, but this Source
+   Code is provided to you "AS IS" EXCLUSIVE OF ANY WARRANTY,
+   INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY OR
+   FITNESS FOR A PARTICULAR PURPOSE, OR ANY OTHER WARRANTY, WHETHER
+   EXPRESS OR IMPLIED. IN NO EVENT WILL OPENVISION HAVE ANY LIABILITY
+   FOR ANY LOST PROFITS, LOSS OF DATA OR COSTS OF PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES, OR FOR ANY SPECIAL, INDIRECT, OR
+   CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, INCLUDING,
+   WITHOUT LIMITATION, THOSE RESULTING FROM THE USE OF THE SOURCE
+   CODE, OR THE FAILURE OF THE SOURCE CODE TO PERFORM, OR FOR ANY
+   OTHER REASON.
+
+   OpenVision retains all copyrights in the donated Source Code.
+   OpenVision also retains copyright to derivative works of the Source
+   Code, whether created by OpenVision or by a third party. The
+   OpenVision copyright notice must be preserved if derivative works
+   are made based on the donated Source Code.
+
+   OpenVision Technologies, Inc. has donated this Kerberos
+   Administration system to MIT for inclusion in the standard Kerberos
+   5 distribution. This donation underscores our commitment to
+   continuing Kerberos technology development and our gratitude for
+   the valuable work which has been performed by MIT and the Kerberos
+   community.
+
+======================================================================
+
+   Portions contributed by Matt Crawford "crawdad@fnal.gov" were work
+performed at Fermi National Accelerator Laboratory, which is
+   operated by Universities Research Association, Inc., under contract
+   DE-AC02-76CHO3000 with the U.S. Department of Energy.
+
+======================================================================
+
+Portions of "src/lib/crypto" have the following copyright:
+
+   Copyright (C) 1998 by the FundsXpress, INC.
+
+   All rights reserved.
+
+      Export of this software from the United States of America may
+      require a specific license from the United States Government.
+      It is the responsibility of any person or organization
+      contemplating export to obtain such a license before exporting.
+
+   WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+   distribute this software and its documentation for any purpose and
+   without fee is hereby granted, provided that the above copyright
+   notice appear in all copies and that both that copyright notice and
+   this permission notice appear in supporting documentation, and that
+   the name of FundsXpress. not be used in advertising or publicity
+   pertaining to distribution of the software without specific,
+   written prior permission.  FundsXpress makes no representations
+   about the suitability of this software for any purpose.  It is
+   provided "as is" without express or implied warranty.
+
+   THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+   WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+======================================================================
+
+The implementation of the AES encryption algorithm in
+"src/lib/crypto/builtin/aes" has the following copyright:
+
+   Copyright (C) 2001, Dr Brian Gladman "brg@gladman.uk.net", Worcester, UK.
+   All rights reserved.
+
+   LICENSE TERMS
+
+   The free distribution and use of this software in both source and
+   binary form is allowed (with or without changes) provided that:
+
+   1. distributions of this source code include the above copyright
+      notice, this list of conditions and the following disclaimer;
+
+   2. distributions in binary form include the above copyright notice,
+      this list of conditions and the following disclaimer in the
+      documentation and/or other associated materials;
+
+   3. the copyright holder's name is not used to endorse products
+      built using this software without specific written permission.
+
+   DISCLAIMER
+
+   This software is provided 'as is' with no explcit or implied
+   warranties in respect of any properties, including, but not limited
+   to, correctness and fitness for purpose.
+
+======================================================================
+
+Portions contributed by Red Hat, including the pre-authentication
+plug-in framework and the NSS crypto implementation, contain the
+following copyright:
+
+   Copyright (C) 2006 Red Hat, Inc.
+   Portions copyright (C) 2006 Massachusetts Institute of Technology
+   All Rights Reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+   * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+
+   * Neither the name of Red Hat, Inc., nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+   COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+   OF THE POSSIBILITY OF SUCH DAMAGE.
+
+======================================================================
+
+The bundled verto source code is subject to the following license:
+
+   Copyright 2011 Red Hat, Inc.
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation
+   files (the "Software"), to deal in the Software without
+   restriction, including without limitation the rights to use, copy,
+   modify, merge, publish, distribute, sublicense, and/or sell copies
+   of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+
+======================================================================
+
+The MS-KKDCP client implementation has the following copyright:
+
+   Copyright 2013,2014 Red Hat, Inc.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+      1. Redistributions of source code must retain the above
+         copyright notice, this list of conditions and the following
+         disclaimer.
+
+      2. Redistributions in binary form must reproduce the above
+         copyright notice, this list of conditions and the following
+         disclaimer in the documentation and/or other materials
+         provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+   COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+   OF THE POSSIBILITY OF SUCH DAMAGE.
+
+======================================================================
+
+The implementations of GSSAPI mechglue in GSSAPI-SPNEGO in
+"src/lib/gssapi", including the following files:
+
+   lib/gssapi/generic/gssapi_err_generic.et
+   lib/gssapi/mechglue/g_accept_sec_context.c
+   lib/gssapi/mechglue/g_acquire_cred.c
+   lib/gssapi/mechglue/g_canon_name.c
+   lib/gssapi/mechglue/g_compare_name.c
+   lib/gssapi/mechglue/g_context_time.c
+   lib/gssapi/mechglue/g_delete_sec_context.c
+   lib/gssapi/mechglue/g_dsp_name.c
+   lib/gssapi/mechglue/g_dsp_status.c
+   lib/gssapi/mechglue/g_dup_name.c
+   lib/gssapi/mechglue/g_exp_sec_context.c
+   lib/gssapi/mechglue/g_export_name.c
+   lib/gssapi/mechglue/g_glue.c
+   lib/gssapi/mechglue/g_imp_name.c
+   lib/gssapi/mechglue/g_imp_sec_context.c
+   lib/gssapi/mechglue/g_init_sec_context.c
+   lib/gssapi/mechglue/g_initialize.c
+   lib/gssapi/mechglue/g_inquire_context.c
+   lib/gssapi/mechglue/g_inquire_cred.c
+   lib/gssapi/mechglue/g_inquire_names.c
+   lib/gssapi/mechglue/g_process_context.c
+   lib/gssapi/mechglue/g_rel_buffer.c
+   lib/gssapi/mechglue/g_rel_cred.c
+   lib/gssapi/mechglue/g_rel_name.c
+   lib/gssapi/mechglue/g_rel_oid_set.c
+   lib/gssapi/mechglue/g_seal.c
+   lib/gssapi/mechglue/g_sign.c
+   lib/gssapi/mechglue/g_store_cred.c
+   lib/gssapi/mechglue/g_unseal.c
+   lib/gssapi/mechglue/g_userok.c
+   lib/gssapi/mechglue/g_utils.c
+   lib/gssapi/mechglue/g_verify.c
+   lib/gssapi/mechglue/gssd_pname_to_uid.c
+   lib/gssapi/mechglue/mglueP.h
+   lib/gssapi/mechglue/oid_ops.c
+   lib/gssapi/spnego/gssapiP_spnego.h
+   lib/gssapi/spnego/spnego_mech.c
+
+and the initial implementation of incremental propagation, including
+the following new or changed files:
+
+   include/iprop_hdr.h
+   kadmin/server/ipropd_svc.c
+   lib/kdb/iprop.x
+   lib/kdb/kdb_convert.c
+   lib/kdb/kdb_log.c
+   lib/kdb/kdb_log.h
+   lib/krb5/error_tables/kdb5_err.et
+   slave/kpropd_rpc.c
+   slave/kproplog.c
+
+are subject to the following license:
+
+   Copyright (C) 2004 Sun Microsystems, Inc.
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation
+   files (the "Software"), to deal in the Software without
+   restriction, including without limitation the rights to use, copy,
+   modify, merge, publish, distribute, sublicense, and/or sell copies
+   of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+
+======================================================================
+
+Kerberos V5 includes documentation and software developed at the
+University of California at Berkeley, which includes this copyright
+notice:
+
+   Copyright (C) 1983 Regents of the University of California.
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+   3. Neither the name of the University nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+
+======================================================================
+
+Portions contributed by Novell, Inc., including the LDAP database
+backend, are subject to the following license:
+
+   Copyright (C) 2004-2005, Novell, Inc.
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+   * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+
+   * The copyright holder's name is not used to endorse or promote
+     products derived from this software without specific prior
+     written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+   COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+   OF THE POSSIBILITY OF SUCH DAMAGE.
+
+======================================================================
+
+Portions funded by Sandia National Laboratory and developed by the
+University of Michigan's Center for Information Technology
+Integration, including the PKINIT implementation, are subject to the
+following license:
+
+   COPYRIGHT (C) 2006-2007
+   THE REGENTS OF THE UNIVERSITY OF MICHIGAN
+   ALL RIGHTS RESERVED
+
+   Permission is granted to use, copy, create derivative works and
+   redistribute this software and such derivative works for any
+   purpose, so long as the name of The University of Michigan is not
+   used in any advertising or publicity pertaining to the use of
+   distribution of this software without specific, written prior
+   authorization.  If the above copyright notice or any other
+   identification of the University of Michigan is included in any
+   copy of any portion of this software, then the disclaimer below
+   must also be included.
+
+   THIS SOFTWARE IS PROVIDED AS IS, WITHOUT REPRESENTATION FROM THE
+   UNIVERSITY OF MICHIGAN AS TO ITS FITNESS FOR ANY PURPOSE, AND
+   WITHOUT WARRANTY BY THE UNIVERSITY OF MICHIGAN OF ANY KIND, EITHER
+   EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+   THE REGENTS OF THE UNIVERSITY OF MICHIGAN SHALL NOT BE LIABLE FOR
+   ANY DAMAGES, INCLUDING SPECIAL, INDIRECT, INCIDENTAL, OR
+   CONSEQUENTIAL DAMAGES, WITH RESPECT TO ANY CLAIM ARISING OUT OF OR
+   IN CONNECTION WITH THE USE OF THE SOFTWARE, EVEN IF IT HAS BEEN OR
+   IS HEREAFTER ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+======================================================================
+
+The pkcs11.h file included in the PKINIT code has the following
+license:
+
+   Copyright 2006 g10 Code GmbH
+   Copyright 2006 Andreas Jellinghaus
+
+   This file is free software; as a special exception the author gives
+   unlimited permission to copy and/or distribute it, with or without
+   modifications, as long as this notice is preserved.
+
+   This file is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY, to the extent permitted by law; without even
+   the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+   PURPOSE.
+
+======================================================================
+
+Portions contributed by Apple Inc. are subject to the following
+license:
+
+   Copyright 2004-2008 Apple Inc.  All Rights Reserved.
+
+      Export of this software from the United States of America may
+      require a specific license from the United States Government.
+      It is the responsibility of any person or organization
+      contemplating export to obtain such a license before exporting.
+
+   WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+   distribute this software and its documentation for any purpose and
+   without fee is hereby granted, provided that the above copyright
+   notice appear in all copies and that both that copyright notice and
+   this permission notice appear in supporting documentation, and that
+   the name of Apple Inc. not be used in advertising or publicity
+   pertaining to distribution of the software without specific,
+   written prior permission.  Apple Inc. makes no representations
+   about the suitability of this software for any purpose.  It is
+   provided "as is" without express or implied warranty.
+
+   THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+   WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+======================================================================
+
+The implementations of UTF-8 string handling in src/util/support and
+src/lib/krb5/unicode are subject to the following copyright and
+permission notice:
+
+   The OpenLDAP Public License
+   Version 2.8, 17 August 2003
+
+   Redistribution and use of this software and associated
+   documentation ("Software"), with or without modification, are
+   permitted provided that the following conditions are met:
+
+   1. Redistributions in source form must retain copyright statements
+      and notices,
+
+   2. Redistributions in binary form must reproduce applicable
+      copyright statements and notices, this list of conditions, and
+      the following disclaimer in the documentation and/or other
+      materials provided with the distribution, and
+
+   3. Redistributions must contain a verbatim copy of this document.
+
+   The OpenLDAP Foundation may revise this license from time to time.
+   Each revision is distinguished by a version number.  You may use
+   this Software under terms of this license revision or under the
+   terms of any subsequent revision of the license.
+
+   THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
+   CONTRIBUTORS "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED.  IN NO EVENT SHALL THE OPENLDAP FOUNDATION, ITS
+   CONTRIBUTORS, OR THE AUTHOR(S) OR OWNER(S) OF THE SOFTWARE BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+   OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+   BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+   DAMAGE.
+
+   The names of the authors and copyright holders must not be used in
+   advertising or otherwise to promote the sale, use or other dealing
+   in this Software without specific, written prior permission.  Title
+   to copyright in this Software shall at all times remain with
+   copyright holders.
+
+   OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+
+   Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
+   California, USA.  All Rights Reserved.  Permission to copy and
+   distribute verbatim copies of this document is granted.
+
+Marked test programs in src/lib/krb5/krb have the following copyright:
+
+
+   Copyright (C) 2006 Kungliga Tekniska Högskolan
+   (Royal Institute of Technology, Stockholm, Sweden).
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+   3. Neither the name of KTH nor the names of its contributors may be
+      used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY KTH AND ITS CONTRIBUTORS "AS IS" AND
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KTH OR ITS
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+
+======================================================================
+
+The KCM Mach RPC definition file used on macOS has the following
+copyright:
+
+      Copyright (C) 2009 Kungliga Tekniska Högskolan
+      (Royal Institute of Technology, Stockholm, Sweden).
+      All rights reserved.
+
+   Portions Copyright (C) 2009 Apple Inc. All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above
+      copyright notice, this list of conditions and the following
+      disclaimer.
+
+   2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+   3. Neither the name of the Institute nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+
+======================================================================
+
+Portions of the RPC implementation in src/lib/rpc and
+src/include/gssrpc have the following copyright and permission notice:
+
+   Copyright (C) 2010, Oracle America, Inc.
+
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+   3. Neither the name of the "Oracle America, Inc." nor the names of
+      its contributors may be used to endorse or promote products
+      derived from this software without specific prior written
+      permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+   OF THE POSSIBILITY OF SUCH DAMAGE.
+
+======================================================================
+
+   Copyright (C) 2006,2007,2009 NTT (Nippon Telegraph and Telephone
+   Corporation).  All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer as
+      the first lines of this file unmodified.
+
+   2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY NTT "AS IS" AND ANY EXPRESS OR IMPLIED
+   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED. IN NO EVENT SHALL NTT BE LIABLE FOR ANY DIRECT,
+   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+   OF THE POSSIBILITY OF SUCH DAMAGE.
+
+======================================================================
+
+   Copyright 2000 by Carnegie Mellon University
+
+   All Rights Reserved
+
+   Permission to use, copy, modify, and distribute this software and
+   its documentation for any purpose and without fee is hereby
+   granted, provided that the above copyright notice appear in all
+   copies and that both that copyright notice and this permission
+   notice appear in supporting documentation, and that the name of
+   Carnegie Mellon University not be used in advertising or publicity
+   pertaining to distribution of the software without specific,
+   written prior permission.
+
+   CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+   THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+   AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+   FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+   AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+   OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+   SOFTWARE.
+
+======================================================================
+
+   Copyright (C) 2002 Naval Research Laboratory (NRL/CCS)
+
+   Permission to use, copy, modify and distribute this software and
+   its documentation is hereby granted, provided that both the
+   copyright notice and this permission notice appear in all copies of
+   the software, derivative works or modified versions, and any
+   portions thereof.
+
+   NRL ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION AND
+   DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER
+   RESULTING FROM THE USE OF THIS SOFTWARE.
+
+======================================================================
+
+Portions extracted from Internet RFCs have the following copyright
+notice:
+
+   Copyright (C) The Internet Society (2006).
+
+   This document is subject to the rights, licenses and restrictions
+   contained in BCP 78, and except as set forth therein, the authors
+   retain all their rights.
+
+   This document and the information contained herein are provided on
+   an "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE
+   REPRESENTS OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND
+   THE INTERNET ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT
+   THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR
+   ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A
+   PARTICULAR PURPOSE.
+
+======================================================================
+
+   Copyright (C) 1991, 1992, 1994 by Cygnus Support.
+
+   Permission to use, copy, modify, and distribute this software and
+   its documentation for any purpose and without fee is hereby
+   granted, provided that the above copyright notice appear in all
+   copies and that both that copyright notice and this permission
+   notice appear in supporting documentation. Cygnus Support makes no
+   representations about the suitability of this software for any
+   purpose.  It is provided "as is" without express or implied
+   warranty.
+
+======================================================================
+
+   Copyright (C) 2006 Secure Endpoints Inc.
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation
+   files (the "Software"), to deal in the Software without
+   restriction, including without limitation the rights to use, copy,
+   modify, merge, publish, distribute, sublicense, and/or sell copies
+   of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+
+======================================================================
+
+Portions of the implementation of the Fortuna-like PRNG are subject to
+the following notice:
+
+
+   Copyright (C) 2005 Marko Kreen
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+
+   Copyright (C) 1994 by the University of Southern California
+
+      EXPORT OF THIS SOFTWARE from the United States of America may
+      require a specific license from the United States Government. It
+      is the responsibility of any person or organization
+      contemplating export to obtain such a license before exporting.
+
+   WITHIN THAT CONSTRAINT, permission to copy, modify, and distribute
+   this software and its documentation in source and binary forms is
+   hereby granted, provided that any documentation or other materials
+   related to such distribution or use acknowledge that the software
+   was developed by the University of Southern California.
+
+   DISCLAIMER OF WARRANTY.  THIS SOFTWARE IS PROVIDED "AS IS".  The
+   University of Southern California MAKES NO REPRESENTATIONS OR
+   WARRANTIES, EXPRESS OR IMPLIED.  By way of example, but not
+   limitation, the University of Southern California MAKES NO
+   REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY
+   PARTICULAR PURPOSE. The University of Southern California shall not
+   be held liable for any liability nor for any direct, indirect, or
+   consequential damages with respect to any claim by the user or
+   distributor of the ksu software.
+
+======================================================================
+
+   Copyright (C) 1995
+   The President and Fellows of Harvard University
+
+   This code is derived from software contributed to Harvard by Jeremy
+   Rassen.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+   3. All advertising materials mentioning features or use of this
+      software must display the following acknowledgement:
+
+         This product includes software developed by the University of
+         California, Berkeley and its contributors.
+
+   4. Neither the name of the University nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+
+======================================================================
+
+   Copyright (C) 2008 by the Massachusetts Institute of Technology.
+   Copyright 1995 by Richard P. Basch.  All Rights Reserved.
+   Copyright 1995 by Lehman Brothers, Inc.  All Rights Reserved.
+
+      Export of this software from the United States of America may
+      require a specific license from the United States Government. It
+      is the responsibility of any person or organization
+      contemplating export to obtain such a license before exporting.
+
+   WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+   distribute this software and its documentation for any purpose and
+   without fee is hereby granted, provided that the above copyright
+   notice appear in all copies and that both that copyright notice and
+   this permission notice appear in supporting documentation, and that
+   the name of Richard P. Basch, Lehman Brothers and M.I.T. not be
+   used in advertising or publicity pertaining to distribution of the
+   software without specific, written prior permission.  Richard P.
+   Basch, Lehman Brothers and M.I.T. make no representations about the
+   suitability of this software for any purpose.  It is provided "as
+   is" without express or implied warranty.
+
+======================================================================
+
+The following notice applies to "src/lib/krb5/krb/strptime.c" and
+"src/include/k5-queue.h".
+
+   Copyright (C) 1997, 1998 The NetBSD Foundation, Inc.
+   All rights reserved.
+
+   This code was contributed to The NetBSD Foundation by Klaus Klein.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+   3. All advertising materials mentioning features or use of this
+      software must display the following acknowledgement:
+
+         This product includes software developed by the NetBSD
+         Foundation, Inc. and its contributors.
+
+   4. Neither the name of The NetBSD Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
+   CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+   OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+   BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+   DAMAGE.
+
+======================================================================
+
+The following notice applies to Unicode library files in
+"src/lib/krb5/unicode":
+
+   Copyright 1997, 1998, 1999 Computing Research Labs,
+   New Mexico State University
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation
+   files (the "Software"), to deal in the Software without
+   restriction, including without limitation the rights to use, copy,
+   modify, merge, publish, distribute, sublicense, and/or sell copies
+   of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT.  IN NO EVENT SHALL THE COMPUTING RESEARCH LAB OR
+   NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY CLAIM, DAMAGES OR
+   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+   OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+   OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+======================================================================
+
+The following notice applies to "src/util/support/strlcpy.c":
+
+   Copyright (C) 1998 Todd C. Miller "Todd.Miller@courtesan.com"
+
+   Permission to use, copy, modify, and distribute this software for
+   any purpose with or without fee is hereby granted, provided that
+   the above copyright notice and this permission notice appear in all
+   copies.
+
+   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+   WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+   AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
+   CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+   OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+   NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+   CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+======================================================================
+
+The following notice applies to "src/util/profile/argv_parse.c" and
+"src/util/profile/argv_parse.h":
+
+   Copyright 1999 by Theodore Ts'o.
+
+   Permission to use, copy, modify, and distribute this software for
+   any purpose with or without fee is hereby granted, provided that
+   the above copyright notice and this permission notice appear in all
+   copies.  THE SOFTWARE IS PROVIDED "AS IS" AND THEODORE TS'O (THE
+   AUTHOR) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+   INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
+   NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+   INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+   RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+   OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+   IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  (Isn't
+   it sick that the U.S. culture of lawsuit-happy lawyers requires
+   this kind of disclaimer?)
+
+======================================================================
+
+The following notice applies to SWIG-generated code in
+"src/util/profile/profile_tcl.c":
+
+   Copyright (C) 1999-2000, The University of Chicago
+
+   This file may be freely redistributed without license or fee
+   provided this copyright message remains intact.
+
+======================================================================
+
+The following notice applies to portiions of "src/lib/rpc" and
+"src/include/gssrpc":
+
+   Copyright (C) 2000 The Regents of the University of Michigan. All
+   rights reserved.
+
+   Copyright (C) 2000 Dug Song "dugsong@UMICH.EDU". All rights
+   reserved, all wrongs reversed.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+   3. Neither the name of the University nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+   OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+   BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+   DAMAGE.
+
+Implementations of the MD4 algorithm are subject to the following
+notice:
+
+   Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.
+
+   License to copy and use this software is granted provided that it
+   is identified as the "RSA Data Security, Inc. MD4 Message Digest
+   Algorithm" in all material mentioning or referencing this software
+   or this function.
+
+   License is also granted to make and use derivative works provided
+   that such works are identified as "derived from the RSA Data
+   Security, Inc. MD4 Message Digest Algorithm" in all material
+   mentioning or referencing the derived work.
+
+   RSA Data Security, Inc. makes no representations concerning either
+   the merchantability of this software or the suitability of this
+   software for any particular purpose.  It is provided "as is"
+   without express or implied warranty of any kind.
+
+   These notices must be retained in any copies of any part of this
+   documentation and/or software.
+
+======================================================================
+
+Implementations of the MD5 algorithm are subject to the following
+notice:
+
+   Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.
+
+   License to copy and use this software is granted provided that it
+   is identified as the "RSA Data Security, Inc. MD5 Message- Digest
+   Algorithm" in all material mentioning or referencing this software
+   or this function.
+
+   License is also granted to make and use derivative works provided
+   that such works are identified as "derived from the RSA Data
+   Security, Inc. MD5 Message-Digest Algorithm" in all material
+   mentioning or referencing the derived work.
+
+   RSA Data Security, Inc. makes no representations concerning either
+   the merchantability of this software or the suitability of this
+   software for any particular purpose.  It is provided "as is"
+   without express or implied warranty of any kind.
+
+   These notices must be retained in any copies of any part of this
+   documentation and/or software.
+
+======================================================================
+
+The following notice applies to
+"src/lib/crypto/crypto_tests/t_mddriver.c":
+
+   Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
+   rights reserved.
+
+   RSA Data Security, Inc. makes no representations concerning either
+   the merchantability of this software or the suitability of this
+   software for any particular purpose. It is provided "as is" without
+   express or implied warranty of any kind.
+
+   These notices must be retained in any copies of any part of this
+   documentation and/or software.
+
+======================================================================
+
+Portions of "src/lib/krb5" are subject to the following notice:
+
+   Copyright (C) 1994 CyberSAFE Corporation.
+   Copyright 1990,1991,2007,2008 by the Massachusetts Institute of
+Technology.
+   All Rights Reserved.
+
+      Export of this software from the United States of America may
+      require a specific license from the United States Government. It
+      is the responsibility of any person or organization
+      contemplating export to obtain such a license before exporting.
+
+   WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+   distribute this software and its documentation for any purpose and
+   without fee is hereby granted, provided that the above copyright
+   notice appear in all copies and that both that copyright notice and
+   this permission notice appear in supporting documentation, and that
+   the name of M.I.T. not be used in advertising or publicity
+   pertaining to distribution of the software without specific,
+   written prior permission.  Furthermore if you modify this software
+   you must label your software as modified software and not
+   distribute it in such a fashion that it might be confused with the
+   original M.I.T. software. Neither M.I.T., the Open Computing
+   Security Group, nor CyberSAFE Corporation make any representations
+   about the suitability of this software for any purpose.  It is
+   provided "as is" without express or implied warranty.
+
+======================================================================
+
+Portions contributed by PADL Software are subject to the following
+license:
+
+   Copyright (c) 2011, PADL Software Pty Ltd. All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+   3. Neither the name of PADL Software nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY PADL SOFTWARE AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL PADL SOFTWARE
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+
+======================================================================
+
+The bundled libev source code is subject to the following license:
+
+   All files in libev are Copyright (C)2007,2008,2009 Marc Alexander
+   Lehmann.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+   * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+   COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+   OF THE POSSIBILITY OF SUCH DAMAGE.
+
+   Alternatively, the contents of this package may be used under the
+   terms of the GNU General Public License ("GPL") version 2 or any
+   later version, in which case the provisions of the GPL are
+   applicable instead of the above. If you wish to allow the use of
+   your version of this package only under the terms of the GPL and
+   not to allow others to use your version of this file under the BSD
+   license, indicate your decision by deleting the provisions above
+   and replace them with the notice and other provisions required by
+   the GPL in this and the other files of this package. If you do not
+   delete the provisions above, a recipient may use your version of
+   this file under either the BSD or the GPL.
+
+======================================================================
+
+Files copied from the Intel AESNI Sample Library are subject to the
+following license:
+
+   Copyright (C) 2010, Intel Corporation
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      * Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials
+        provided with the distribution.
+
+      * Neither the name of Intel Corporation nor the names of its
+        contributors may be used to endorse or promote products
+        derived from this software without specific prior written
+        permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+   FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+   COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+   OF THE POSSIBILITY OF SUCH DAMAGE.
+
+======================================================================
+
+The following notice applies to
+"src/ccapi/common/win/OldCC/autolock.hxx":
+
+   Copyright (C) 1998 by Danilo Almeida.  All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+   * Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following
+     disclaimer in the documentation and/or other materials provided
+     with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+   OF THE POSSIBILITY OF SUCH DAMAGE.
 
    ======================================================================
    ======================================================================
@@ -728,34 +2003,6 @@ See Apache License v2.0, January 2004 in the 'Standard Licenses' section.
    ======================================================================
    ======================================================================
 
-ZstdSharp.Port
-
-MIT License
-
-Copyright (c) 2021 Oleg Stepanischev
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-   ======================================================================
-   ======================================================================
-
 Standard Licenses
 
 Apache License v2.0, January 2004
@@ -1017,4 +2264,4 @@ Written Offer for Source Code
        that included the binary that is the subject of your request, or
 
     b. in the case of code licensed under the GPL v3 for as long as Oracle
-       offers spare parts or customer support for that product model.
+       offers spare parts or customer support for that product model.
\ No newline at end of file

From 528449175f6f983fb54d19576f64ec78702eb11a Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 12 Mar 2025 16:54:25 -0600
Subject: [PATCH 69/99] Bug#37513445 [Cannot Perform Database Migration using
 MySql.EntityFrameworkCore 9.0.0]

Change-Id: Iecdde3c6322d169ce74b0d5339dd85813eb14c73
---
 CHANGES                                       |  1 +
 .../Internal/MySQLHistoryRepository.cs        |  8 ++++----
 .../MySQLMigrationsTests.cs                   | 19 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 93ada122e..fb76880a5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 - Fixed bug MySql.EntityFrameworkCore.dll in NuGet packages is not signed (Oracle Bug #37503859).
 - Fixed some tests due to incorrect implementation (WL16033).
 - Updated third party dependencies (WL16852).
+- Fixed bug Cannot Perform Database Migration using MySql.EntityFrameworkCore 9.0.0 (MySQL Bug #117258, Oracle Bug #37513445).
 
 
 9.2.0
diff --git a/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs b/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
index c5c86ebb6..7c7e982a8 100644
--- a/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
+++ b/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
@@ -61,10 +61,10 @@ public override IMigrationsDatabaseLock AcquireDatabaseLock()
       Dependencies.MigrationsLogger.AcquiringMigrationLock();
 
       var dbLock = CreateMigrationDatabaseLock();
-      int result;
+      Int64 result;
       try
       {
-        result = (int)CreateGetLockCommand().ExecuteScalar(CreateRelationalCommandParameters())!;
+        result = (Int64)CreateGetLockCommand().ExecuteScalar(CreateRelationalCommandParameters())!;
       }
       catch
       {
@@ -120,11 +120,11 @@ public override async Task<IMigrationsDatabaseLock> AcquireDatabaseLockAsync(Can
     }
 
     private IRelationalCommand CreateGetLockCommand()
-        => Dependencies.RawSqlCommandBuilder.Build("DECLARE @result int;EXEC @result = sp_getapplock @Resource = '__EFMigrationsLock', @LockOwner = 'Session', @LockMode = 'Exclusive';SELECT @result", []).RelationalCommand;
+        => Dependencies.RawSqlCommandBuilder.Build("SELECT GET_LOCK('__EFMigrationsLock',-1);", []).RelationalCommand;
 
     private MySQLMigrationDatabaseLock CreateMigrationDatabaseLock()
     => new(
-        Dependencies.RawSqlCommandBuilder.Build("DECLARE @result int;EXEC @result = sp_releaseapplock @Resource = '__EFMigrationsLock', @LockOwner = 'Session';SELECT @result"),
+        Dependencies.RawSqlCommandBuilder.Build("SELECT RELEASE_LOCK('__EFMigrationsLock');"),
         CreateRelationalCommandParameters(),
         this);
 
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs
index 204076761..5b9ab9574 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs
@@ -32,7 +32,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using NUnit.Framework;
-using NUnit.Framework.Legacy;
 
 namespace MySql.EntityFrameworkCore.Migrations.Tests
 {
@@ -52,5 +51,23 @@ public void Can_generate_migration_from_initial_database_to_initial()
         migrator.GenerateScript(fromMigration: Migration.InitialDatabase, toMigration: Migration.InitialDatabase);
       }
     }
+
+    //Bug #37513445 Cannot Perform Database Migration using MySql.EntityFrameworkCore 9.0.0
+    [Test]
+    public void TryPerformMigration()
+    {
+      var optionsBuilder = new DbContextOptionsBuilder();
+      optionsBuilder.UseMySQL(MySQLTestStore.RootConnectionString + "database=test;");
+
+      using (var mytestContext = new MyTestContext(optionsBuilder.Options))
+      {
+        mytestContext.Database.EnsureCreated();
+        mytestContext.Database.EnsureDeleted();
+        mytestContext.Database.Migrate();
+
+        Assert.That(mytestContext.Database.CanConnect(), Is.True);
+        mytestContext.Database.EnsureDeleted();
+      }
+    }
   }
 }

From e06e563add3ad67c9288bb3abd93ea9f9a10d9c9 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Thu, 13 Mar 2025 17:02:19 -0600
Subject: [PATCH 70/99] Bug#37705281 [Fix failing tests due to server changes]

Change-Id: I1cae3fc70461cb272efd8629a42dd57bfe25c8e2
---
 CHANGES                                                      | 1 +
 MySQL.Data/src/SchemaProvider.cs                             | 4 +---
 .../Framework/netstandard2_0/GetSchemaTests.cs               | 5 ++++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index fb76880a5..d20a88c34 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@
 - Fixed some tests due to incorrect implementation (WL16033).
 - Updated third party dependencies (WL16852).
 - Fixed bug Cannot Perform Database Migration using MySql.EntityFrameworkCore 9.0.0 (MySQL Bug #117258, Oracle Bug #37513445).
+- Fixed failing tests due to server changes (Oracle Bug #37705281).
 
 
 9.2.0
diff --git a/MySQL.Data/src/SchemaProvider.cs b/MySQL.Data/src/SchemaProvider.cs
index 5141f383e..468521d66 100644
--- a/MySQL.Data/src/SchemaProvider.cs
+++ b/MySQL.Data/src/SchemaProvider.cs
@@ -295,9 +295,7 @@ public virtual async Task<MySqlSchemaCollection> GetIndexesAsync(string[] restri
 
         foreach (MySqlSchemaRow index in indexes.Rows)
         {
-          if (1 != (connection.driver.Version.isAtLeast(8, 0, 1) ?
-            (uint)index["SEQ_IN_INDEX"] :
-            (long)index["SEQ_IN_INDEX"]))
+          if (!index["SEQ_IN_INDEX"].Equals(Convert.ChangeType(1, index["SEQ_IN_INDEX"].GetType())))
             continue;
           if (restrictions != null && restrictions.Length == 4 &&
             restrictions[3] != null &&
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
index 0ea3316d0..d0928792e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/GetSchemaTests.cs
@@ -764,7 +764,10 @@ c2 double GENERATED ALWAYS AS(c1 * 101 / 102) Stored COMMENT 'First Gen Col',
         {
           Assert.That(reader.Read(), "Matching the values");
           Assert.That(reader.GetInt32(0).Equals(1000), "Matching the values");
-          Assert.That(reader.GetDouble(1).Equals(990.196078431), "Matching the values");
+          if (Version >= new Version(9, 3, 0))
+            Assert.That(reader.GetDouble(1).Equals(990.1961), "Matching the values");
+          else
+            Assert.That(reader.GetDouble(1).Equals(990.196078431), "Matching the values");
           Assert.That(reader.GetInt64(2).Equals(10000000), "Matching the values");
         }
 

From 7d3121645784aa316ac1641a9cadf0bee7df90da Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Tue, 25 Mar 2025 11:52:16 -0600
Subject: [PATCH 71/99] Bump Up version to 9.4.0

Change-Id: I145322e5a14a9be801e5b8c628446c9391e88274
---
 CHANGES                                              |  3 +++
 .../custom/partials/class.header.tmpl.partial        |  2 +-
 EFCore/src/Properties/VersionInfo.cs                 | 12 ++++++------
 .../src/MySql.Data.EntityFramework.csproj            |  4 ++--
 EntityFramework/src/Properties/VersionInfo.cs        |  6 +++---
 .../MySql.EntityFramework.Basic.Tests.csproj         |  4 ++--
 .../MySql.EntityFramework.CodeFirst.Tests.csproj     |  4 ++--
 .../MySql.EntityFramework.Migrations.Tests.csproj    |  4 ++--
 .../src/MySQL.Data.OpenTelemetry.csproj              |  4 ++--
 .../src/Properties/VersionInfo.cs                    |  6 +++---
 MySQL.Data/src/MySql.Data.csproj                     |  6 +++---
 MySQL.Data/src/Properties/VersionInfo.cs             |  6 +++---
 .../tests/MySql.Data.Tests/MySql.Data.Tests.csproj   |  6 +++---
 .../tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj |  6 +++---
 MySql.Web/src/MySql.Web.csproj                       |  4 ++--
 MySql.Web/src/Properties/VersionInfo.cs              |  6 +++---
 MySql.Web/tests/MySql.Web.Tests.csproj               |  4 ++--
 17 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/CHANGES b/CHANGES
index d20a88c34..29be8eec6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+9.4.0
+
+
 9.3.0
 - Fixed bug MySql.EntityFrameworkCore.dll in NuGet packages is not signed (Oracle Bug #37503859).
 - Fixed some tests due to incorrect implementation (WL16033).
diff --git a/Documentation/templates/custom/partials/class.header.tmpl.partial b/Documentation/templates/custom/partials/class.header.tmpl.partial
index 15ce5e483..f545c2864 100644
--- a/Documentation/templates/custom/partials/class.header.tmpl.partial
+++ b/Documentation/templates/custom/partials/class.header.tmpl.partial
@@ -25,7 +25,7 @@
 {{/implements.0}}
 <h6><strong>{{__global.namespace}}</strong>: {{{namespace.specName.0.value}}}</h6>
 <h6><strong>{{__global.assembly}}</strong>: {{assemblies.0}}.dll</h6>
-<h6><strong>Version</strong>: 9.3.0</h6>
+<h6><strong>Version</strong>: 9.4.0</h6>
 <h5 id="{{id}}_syntax">{{__global.syntax}}</h5>
 <div class="codewrapper">
   <pre><code class="lang-{{_lang}} hljs">{{syntax.content.0.value}}</code></pre>
diff --git a/EFCore/src/Properties/VersionInfo.cs b/EFCore/src/Properties/VersionInfo.cs
index 9833fee26..b2645c712 100644
--- a/EFCore/src/Properties/VersionInfo.cs
+++ b/EFCore/src/Properties/VersionInfo.cs
@@ -41,13 +41,13 @@
 // by using the '*' as shown below:
 
 #if NET8_0
-[assembly: AssemblyVersion("9.3.0")]
-[assembly: AssemblyInformationalVersion("8.0.11.0+MySQL9.3.0")]
-[assembly: AssemblyFileVersion("9.3.0.0")]
+[assembly: AssemblyVersion("9.4.0")]
+[assembly: AssemblyInformationalVersion("8.0.11.0+MySQL9.4.0")]
+[assembly: AssemblyFileVersion("9.4.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 #elif NET9_0
-[assembly: AssemblyVersion("9.3.0")]
-[assembly: AssemblyInformationalVersion("9.0.0.0-preview+MySQL9.3.0")]
-[assembly: AssemblyFileVersion("9.3.0.0")]
+[assembly: AssemblyVersion("9.4.0")]
+[assembly: AssemblyInformationalVersion("9.0.0.0-preview+MySQL9.4.0")]
+[assembly: AssemblyFileVersion("9.4.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 #endif
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index 5ded04f19..572565996 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework</Description>
     <Copyright>Copyright © 2008, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.3.0</Version>
+    <Version>9.4.0</Version>
     <Authors>Oracle Corporation</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -107,4 +107,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/EntityFramework/src/Properties/VersionInfo.cs b/EntityFramework/src/Properties/VersionInfo.cs
index e4c0f01b6..e577111b1 100644
--- a/EntityFramework/src/Properties/VersionInfo.cs
+++ b/EntityFramework/src/Properties/VersionInfo.cs
@@ -40,7 +40,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.3.0")]
-[assembly: AssemblyInformationalVersion("9.3.0.0")]
-[assembly: AssemblyFileVersion("9.3.0.0")]
+[assembly: AssemblyVersion("9.4.0")]
+[assembly: AssemblyInformationalVersion("9.4.0.0")]
+[assembly: AssemblyFileVersion("9.4.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
index 1434a7522..a30f506f9 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.CodeFirTests</Description>
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.3.0</Version>
+    <Version>9.4.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Basic.Tests</AssemblyName>
@@ -62,4 +62,4 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
index 93bf4c32a..0568555ca 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.CodeFirst.Tests</Description>
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.3.0</Version>
+    <Version>9.4.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.CodeFirst.Tests</AssemblyName>
@@ -89,4 +89,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
index 4aacbcf39..ae0dcd99f 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.Migrations.Tests</Description>
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.3.0</Version>
+    <Version>9.4.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Migrations.Tests</AssemblyName>
@@ -58,4 +58,4 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index 766c12ffe..589d41210 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.OpenTelemetry</Description>
     <Copyright>Copyright © 2023, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.3.0</Version>
+    <Version>9.4.0</Version>
     <Authors>Oracle Corporation</Authors>  
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>MySql.Data.OpenTelemetry</AssemblyName>
@@ -40,4 +40,4 @@
     <PackageReference Include="OpenTelemetry.Api" Version="1.11.2" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs b/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
index 10ed39647..05488fcf7 100644
--- a/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
+++ b/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
@@ -40,8 +40,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.3.0")]
-[assembly: AssemblyInformationalVersion("9.3.0.0")]
-[assembly: AssemblyFileVersion("9.3.0.0")]
+[assembly: AssemblyVersion("9.4.0")]
+[assembly: AssemblyInformationalVersion("9.4.0.0")]
+[assembly: AssemblyFileVersion("9.4.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index 088019be2..99c82ff89 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -5,7 +5,7 @@
     <Description>MySql.Data.MySqlClient .Net Core Class Library</Description>
     <Copyright>Copyright © 2004, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.3.0</Version>
+    <Version>9.4.0</Version>
     <Authors>Oracle Corporation</Authors>
     <AssemblyName>MySql.Data</AssemblyName>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net9.0;net8.0;</TargetFrameworks>
@@ -27,7 +27,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
+    
   </PropertyGroup>
   
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
@@ -128,4 +128,4 @@
   </ItemGroup>
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MySQL.Data/src/Properties/VersionInfo.cs b/MySQL.Data/src/Properties/VersionInfo.cs
index d259e153d..e26c5117d 100644
--- a/MySQL.Data/src/Properties/VersionInfo.cs
+++ b/MySQL.Data/src/Properties/VersionInfo.cs
@@ -40,7 +40,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.3.0")]
-[assembly: AssemblyInformationalVersion("9.3.0.0")]
-[assembly: AssemblyFileVersion("9.3.0.0")]
+[assembly: AssemblyVersion("9.4.0")]
+[assembly: AssemblyInformationalVersion("9.4.0.0")]
+[assembly: AssemblyFileVersion("9.4.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index 965a80589..9455959c7 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -4,7 +4,7 @@
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
-    <Version>9.3.0</Version>
+    <Version>9.4.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
+    
   </PropertyGroup>
   
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
@@ -138,4 +138,4 @@
     </None>
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 3475a9104..111476d40 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -4,7 +4,7 @@
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
-    <Version>9.3.0</Version>
+    <Version>9.4.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
+    
   </PropertyGroup>
   
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
@@ -117,4 +117,4 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MySql.Web/src/MySql.Web.csproj b/MySql.Web/src/MySql.Web.csproj
index 97f4d0a68..ed1ebd6ba 100644
--- a/MySql.Web/src/MySql.Web.csproj
+++ b/MySql.Web/src/MySql.Web.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Web</Description>
     <Copyright>Copyright © 2004, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.3.0</Version>
+    <Version>9.4.0</Version>
     <Authors>Oracle Corporation</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -86,4 +86,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MySql.Web/src/Properties/VersionInfo.cs b/MySql.Web/src/Properties/VersionInfo.cs
index e4c0f01b6..e577111b1 100644
--- a/MySql.Web/src/Properties/VersionInfo.cs
+++ b/MySql.Web/src/Properties/VersionInfo.cs
@@ -40,7 +40,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.3.0")]
-[assembly: AssemblyInformationalVersion("9.3.0.0")]
-[assembly: AssemblyFileVersion("9.3.0.0")]
+[assembly: AssemblyVersion("9.4.0")]
+[assembly: AssemblyInformationalVersion("9.4.0.0")]
+[assembly: AssemblyFileVersion("9.4.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/MySql.Web/tests/MySql.Web.Tests.csproj b/MySql.Web/tests/MySql.Web.Tests.csproj
index 27dcb3dd2..600a45c0d 100644
--- a/MySql.Web/tests/MySql.Web.Tests.csproj
+++ b/MySql.Web/tests/MySql.Web.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Web.Tests</Description>
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.3.0</Version>
+    <Version>9.4.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.Web.Tests</AssemblyName>
@@ -64,4 +64,4 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file

From 44a455eb637167ad311bf008b86308dd21c5ac28 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Tue, 25 Mar 2025 12:12:06 -0600
Subject: [PATCH 72/99] Bug#35474099 [OpenAsync throws unhandled exception from
 thread pool]

Change-Id: I047114a5dddb4c862869d24f2c3e6213b947af4a
---
 CHANGES                                       |  1 +
 MySQL.Data/src/common/StreamCreator.cs        | 22 ++++++++++++++++---
 .../tests/MySql.Data.Tests/ConnectionTests.cs | 13 +++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 29be8eec6..51aa0b7f4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 9.4.0
+- Fixed bug OpenAsync throws unhandled exception from thread pool (MySQL Bug #110789, Oracle Bug #35474099).
 
 
 9.3.0
diff --git a/MySQL.Data/src/common/StreamCreator.cs b/MySQL.Data/src/common/StreamCreator.cs
index 84f015e87..4b77c7c7b 100644
--- a/MySQL.Data/src/common/StreamCreator.cs
+++ b/MySQL.Data/src/common/StreamCreator.cs
@@ -33,6 +33,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -108,11 +109,26 @@ private static async Task<Tuple<Stream, MyNetworkStream>> GetTcpStreamAsync(MySq
       TcpClient tcpClient = new TcpClient(addr.AddressFamily);
 
       if (execAsync)
-        using (cancellationToken.Register(() => throw new MySqlException(Resources.Timeout, new TimeoutException())))
-          await tcpClient.ConnectAsync(settings.Server, (int)settings.Port).ConfigureAwait(false);
+      {
+        try
+        {
+          using (cancellationToken.Register(() => tcpClient.Dispose()))
+          {
+#if NETFRAMEWORK || NETSTANDARD2_1 || NETSTANDARD2_0
+            await tcpClient.ConnectAsync(settings.Server, (int)settings.Port).ConfigureAwait(false);
+#else
+            await tcpClient.ConnectAsync(settings.Server, (int)settings.Port, cancellationToken).ConfigureAwait(false);
+#endif
+          }
+        }
+        catch (Exception ex) when (ex is SocketException or ObjectDisposedException && cancellationToken.IsCancellationRequested)
+        {
+          throw new MySqlException(Resources.Timeout, new TimeoutException());
+        }
+      }
       else
         if (!tcpClient.ConnectAsync(settings.Server, (int)settings.Port).Wait((int)settings.ConnectionTimeout * 1000))
-        throw new MySqlException(Resources.Timeout, new TimeoutException());
+          throw new MySqlException(Resources.Timeout, new TimeoutException());
 
       if (settings.Keepalive > 0)
         SetKeepAlive(tcpClient.Client, settings.Keepalive);
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
index c5725768d..9b5858a5e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
@@ -172,6 +172,19 @@ public void ReOpenDisposedConnection()
       }
     }
 
+    /// <summary>
+    /// Bug#35474099 OpenAsync throws unhandled exception from thread pool.
+    /// </summary>
+    [Test]
+    public async Task OpenAsyncCatchException()
+    {
+      MockServer mockServer = new MockServer(false);
+      mockServer.StartServer();
+      using var connection = new MySqlConnection($"server={mockServer.Address};port={mockServer.Port};user={Settings.UserID};connectiontimeout = 1");
+      Assert.ThrowsAsync<MySqlException>(async () => await connection.OpenAsync());
+      mockServer.StopServer();
+    }
+
     [Test]
     public void ConnectingAsUTF8()
     {

From ddef33f956e1bea321c36c092b1beb061989d664 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Mon, 14 Apr 2025 15:54:35 -0600
Subject: [PATCH 73/99] Bug#37837374 [Entity Framework 6 from NET9 is
 deprecated due to Nunit4 Upgrade]

Change-Id: I41a4ae377c8cc0064b89880b89bd42b85506ae8a
---
 CHANGES                                                         | 1 +
 EntityFramework/src/MySql.Data.EntityFramework.csproj           | 2 +-
 .../MySql.EntityFramework.Basic.Tests.csproj                    | 2 +-
 .../MySql.EntityFramework.CodeFirst.Tests.csproj                | 2 +-
 .../MySql.EntityFramework.Migrations.Tests.csproj               | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 51aa0b7f4..1653bc69e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
 9.4.0
 - Fixed bug OpenAsync throws unhandled exception from thread pool (MySQL Bug #110789, Oracle Bug #35474099).
+- Fixed Entity Framework 6 from NET9 is deprecated due to Nunit4 Upgrade (MySQL Bug #117976, Oracle Bug #37837374).
 
 
 9.3.0
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index 572565996..8f33df2a4 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.4.0</Version>
     <Authors>Oracle Corporation</Authors>
-    <TargetFrameworks>net462;net48;</TargetFrameworks>
+    <TargetFrameworks>net462;net48;netstandard2.1</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <AssemblyName>MySql.Data.EntityFramework</AssemblyName>
     <PackageId>MySql.Data.EntityFramework</PackageId>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
index a30f506f9..74db78daf 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.4.0</Version>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net462;net48;</TargetFrameworks>
+    <TargetFrameworks>net462;net48;net9.0</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Basic.Tests</AssemblyName>
     <PackageId>MySql.EntityFramework.Basic.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
index 0568555ca..f1a6065cc 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.4.0</Version>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net462;net48;</TargetFrameworks>
+    <TargetFrameworks>net462;net48;net9.0</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.CodeFirst.Tests</AssemblyName>
     <PackageId>MySql.EntityFramework.CodeFirst.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
index ae0dcd99f..dacd09bc8 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.4.0</Version>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net462;net48;</TargetFrameworks>
+    <TargetFrameworks>net462;net48;net9.0</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Migrations.Tests</AssemblyName>
     <PackageId>MySql.EntityFramework.Migrations.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>

From 4ca9c603ca024615bb08160e64c4766f20d9d8cf Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 2 Apr 2025 16:44:40 -0600
Subject: [PATCH 74/99] WL#15984 [Support GSSAPI/Kerberos authentication on
 Windows using authentication_ldap_sasl_client plug-in]

Change-Id: I1aa05eb357ab7a66076b2faf5f61df0bbcabc985
---
 CHANGES                                       |   1 +
 .../src/Authentication/MySqlSASLPlugin.cs     |   3 -
 .../tests/MySql.Data.Tests/AuthTests.cs       |  10 +--
 .../Resources/KerberosConfig.txt              |  68 ------------------
 .../MySql.Data.Tests/Resources/mtr.keytab     | Bin 0 -> 407 bytes
 .../tests/MySql.Data.Tests/Resources/my.ini   |   8 +--
 .../MySql.Data.Tests/Resources/mysql.keytab   | Bin 178 -> 0 bytes
 7 files changed, 10 insertions(+), 80 deletions(-)
 delete mode 100644 MySQL.Data/tests/MySql.Data.Tests/Resources/KerberosConfig.txt
 create mode 100644 MySQL.Data/tests/MySql.Data.Tests/Resources/mtr.keytab
 delete mode 100644 MySQL.Data/tests/MySql.Data.Tests/Resources/mysql.keytab

diff --git a/CHANGES b/CHANGES
index 1653bc69e..d98374809 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 9.4.0
 - Fixed bug OpenAsync throws unhandled exception from thread pool (MySQL Bug #110789, Oracle Bug #35474099).
 - Fixed Entity Framework 6 from NET9 is deprecated due to Nunit4 Upgrade (MySQL Bug #117976, Oracle Bug #37837374).
+- Added support for GSSAPI/Kerberos authentication on Windows using authentication_ldap_sasl_client plug-in (WL15984).
 
 
 9.3.0
diff --git a/MySQL.Data/src/Authentication/MySqlSASLPlugin.cs b/MySQL.Data/src/Authentication/MySqlSASLPlugin.cs
index 2b8bf0d41..db8532905 100644
--- a/MySQL.Data/src/Authentication/MySqlSASLPlugin.cs
+++ b/MySQL.Data/src/Authentication/MySqlSASLPlugin.cs
@@ -49,7 +49,6 @@ internal class MySqlSASLPlugin : MySqlAuthenticationPlugin
     protected override void SetAuthData(byte[] data)
     {
       _mechanismName = Encoding.UTF8.GetString(data);
-
       switch (_mechanismName)
       {
         case "SCRAM-SHA-1":
@@ -59,8 +58,6 @@ protected override void SetAuthData(byte[] data)
           scramMechanism = new ScramSha256Mechanism(GetUsername(), GetMFAPassword(), Settings.Server);
           break;
         case "GSSAPI":
-          if (Platform.IsWindows())
-            throw new PlatformNotSupportedException(string.Format(Resources.AuthenticationPluginNotSupported, "GSSAPI/Kerberos"));
           gssapiMechanism = new GssapiMechanism(GetUsername(), GetMFAPassword());
           break;
       }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
index cdf8d8971..c80c4fdea 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
@@ -1167,9 +1167,9 @@ public void AssertScramSha256()
     /// It uses preconfigured LDAP servers present in the labs.
     /// For configuration of the server, theres a quick guide in Resources/KerberosConfig.txt to setup the environment.
     /// </summary>
-    [TestCase("test1@MYSQL.LOCAL", "Testpw1", "authentication_ldap_sasl", true)]
-    [TestCase("invalidUser@MYSQL.LOCAL", "Testpw1", "authentication_ldap_sasl", false)]
-    [TestCase("test1@MYSQL.LOCAL", "wrongPassword", "authentication_ldap_sasl", false)]
+    [TestCase("test1@MTR.LOCAL", "Testpw1", "authentication_ldap_sasl", true)]
+    [TestCase("invalidUser@MTR.LOCAL", "Testpw1", "authentication_ldap_sasl", false)]
+    [TestCase("test1@MTR.LOCAL", "wrongPassword", "authentication_ldap_sasl", false)]
     [Ignore("This test require to start MySQL Commercial Server with the configuration specified in file Resources/my.ini")]
     [Property("Category", "Security")]
     public void ConnectUsingMySqlSASLPluginGSSAPI(string userName, string password, string pluginName, bool shouldPass)
@@ -1182,7 +1182,7 @@ public void ConnectUsingMySqlSASLPluginGSSAPI(string userName, string password,
         SslMode = MySqlSslMode.Disabled
       };
 
-      ExecuteSQL("CREATE USER 'test1@MYSQL.LOCAL' IDENTIFIED WITH authentication_ldap_sasl; GRANT ALL ON *.* to 'test1@MYSQL.LOCAL';", true);
+      ExecuteSQL("CREATE USER 'test1@MTR.LOCAL' IDENTIFIED WITH authentication_ldap_sasl; GRANT ALL ON *.* to 'test1@MTR.LOCAL';", true);
 
       using (MySqlConnection connection = new MySqlConnection(settings.ConnectionString))
       {
@@ -1370,7 +1370,7 @@ public void ConnectUsingMySqlPluginKerberosGSSAPI(bool shouldPass, string userNa
 
     private void TestKerberosConnection(bool shouldPass, string username, MySqlConnectionStringBuilder settings, KerberosAuthMode mode)
     {
-      ExecuteSQL("CREATE USER IF NOT EXISTS 'test1'@'%' IDENTIFIED WITH authentication_kerberos BY 'MYSQL.LOCAL'; " +
+      ExecuteSQL("CREATE USER IF NOT EXISTS 'test1'@'%' IDENTIFIED WITH authentication_kerberos BY 'MTR.LOCAL'; " +
         "GRANT ALL ON *.* to 'test1'@'%';", true);
 
       using (MySqlConnection conn = new MySqlConnection(settings.ConnectionString))
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Resources/KerberosConfig.txt b/MySQL.Data/tests/MySql.Data.Tests/Resources/KerberosConfig.txt
deleted file mode 100644
index d5e2dd534..000000000
--- a/MySQL.Data/tests/MySql.Data.Tests/Resources/KerberosConfig.txt
+++ /dev/null
@@ -1,68 +0,0 @@
- -------- CLIENT --------
-Linux prerequisites:
-libsasl2.4-2
-libsasl2-modules-gssapi-mit
-krb5-config
-krb5-user
-
-Windows prerequisites:
-There's a quick guide to follow: https://confluence.oraclecorp.com/confluence/display/MYSQL/MySQL+windows+client+support+for+kerberos
-Step 3 is really important for this to work.
-
--------- SERVER --------
-krb5.conf structure:
-[libdefaults]
-        default_realm = MYSQL.LOCAL
-		dns_lookup_realm = false
-        dns_lookup_kdc = false
-		dns_fallback = false
-
-[realms]
-  MYSQL.LOCAL = {
-        kdc = ldapauth.appad3iad.mysql2iad.oraclevcn.com
-        admin_server = ldapauth.appad3iad.mysql2iad.oraclevcn.com
-        default_domain = MYSQL.LOCAL
-  }
-
-[domain_realm]
-        .no.oracle.com = MYSQL.LOCAL
-
-
-Add following line to /etc/hosts:
-100.103.18.98   ldapauth        ldapauth.appad3iad.mysql2iad.oraclevcn.com
-
-
--------------------------- GSSAPI --------------------------
-
-In case my.ini is not working, start server as follow:
-sudo ./bin/mysqld --port=3306 --bind-address=localhost --user=mysql --basedir=/usr --datadir=/var/lib/mysql --plugin_dir=/usr/local/mysql/lib/plugin 
---plugin-load=authentication_ldap_sasl.so  --authentication_ldap_sasl_server_host=ldapauth.appad3iad.mysql2iad.oraclevcn.com 
---authentication_ldap_sasl_group_search_attr='cn' --authentication_ldap_sasl_auth_method_name='GSSAPI' --authentication_ldap_sasl_log_status=5  
---log_error_verbosity=3 --authentication_ldap_sasl_bind_root_pwd="Testpw1" --authentication_ldap_sasl_bind_root_dn="CN=test2,CN=Users,DC=mysql,DC=local" 
---authentication_ldap_sasl_bind_base_dn='CN=Users,DC=mysql,DC=local'
-
-
-Create LDAP SASL User:
-INSTALL PLUGIN authentication_ldap_sasl SONAME 'authentication_ldap_sasl.so';
-CREATE USER 'test1@MYSQL.LOCAL' IDENTIFIED WITH authentication_ldap_sasl;
-
-sudo AUTHENTICATION_LDAP_CLIENT_LOG=5 ./bin/mysql --user=test1@MYSQL.LOCAL --password=Testpw1 --port 3306
-
--------------------------- KERBEROS --------------------------
-
-sudo ./bin/mysqld --port=3306 --user=mysql --basedir=/usr --datadir=/var/lib/mysql --plugin_dir=/usr/local/mysql/lib/plugin --log_error_verbosity=3 
---plugin-load=authentication_kerberos.so --authentication_kerberos_service_principal='mysql_service/kerberos_auth_host@MYSQL.LOCAL' 
---authentication_kerberos_service_key_tab=/usr/local/mysql/mysql.keytab
-
-Create the following MySQL accounts:
-
-CREATE USER 'test1'@'%' IDENTIFIED WITH authentication_kerberos BY 'MYSQL.LOCAL';
-GRANT ALL ON *.* to 'test1'@'%';
-
-CREATE USER 'test2'@'%' IDENTIFIED WITH authentication_kerberos BY 'MYSQL.LOCAL';
-GRANT ALL ON *.* to 'test2'@'%';
-
-CREATE USER 'test3'@'%' IDENTIFIED WITH authentication_kerberos BY 'MYSQL.LOCAL';
-GRANT ALL ON *.* to 'test3'@'%';
-
-sudo AUTHENTICATION_KERBEROS_CLIENT_LOG=5 ./bin/mysql --user=test1 --password=Testpw1
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Resources/mtr.keytab b/MySQL.Data/tests/MySql.Data.Tests/Resources/mtr.keytab
new file mode 100644
index 0000000000000000000000000000000000000000..e62515972e0552a5c3143426045e990e98ba5928
GIT binary patch
literal 407
zcmZQ&Vqjo!Wng09^bHBp^YM3f^kLx5tt>9gi7!qqD$7hxWf00vElNr)$}f&jEG@~1
z&&V$>0qS7{Vg_a)#o<#n#qjjOi5Zj`#EfE)FZnJKXApR^H_j|WFY#LK;`Px&k1DnU
zT^38efkF%ly$hMARi$-SKYpw5e#>&MQ(Sfb=Edzu@SDkd{WqItb{x<G3S2D6An?4)
Tw12~W*PY>$6MXmhd~^i>l$d%Y

literal 0
HcmV?d00001

diff --git a/MySQL.Data/tests/MySql.Data.Tests/Resources/my.ini b/MySQL.Data/tests/MySql.Data.Tests/Resources/my.ini
index 82e5f7670..b226f0fe7 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Resources/my.ini
+++ b/MySQL.Data/tests/MySql.Data.Tests/Resources/my.ini
@@ -32,15 +32,15 @@ authentication_ldap_sasl_user_search_attr='cn'
 
 ### GSSAPI
 plugin-load-add=authentication_ldap_sasl.so
-authentication_ldap_sasl_server_host='ldapauth.appad3iad.mysql2iad.oraclevcn.com'
-authentication_ldap_sasl_bind_base_dn='CN=Users,DC=mysql,DC=local'
+authentication_ldap_sasl_server_host='winmtr01.regionaliad02.mysql2iad.oraclevcn.com'
+authentication_ldap_sasl_bind_base_dn='CN=Users,DC=mtr,DC=local'
 authentication_ldap_sasl_auth_method_name='GSSAPI'
-authentication_ldap_sasl_bind_root_dn='CN=test2,CN=Users,DC=mysql,DC=local'
+authentication_ldap_sasl_bind_root_dn='CN=test1,CN=Users,DC=mtr,DC=local'
 authentication_ldap_sasl_log_status=6
 authentication_ldap_sasl_group_search_attr='cn'
 authentication_ldap_sasl_bind_root_pwd='Testpw1'
 
 ### KERBEROS
 plugin-load-add = authentication_kerberos.so
-authentication_kerberos_service_principal = "mysql_service/kerberos_auth_host@MYSQL.LOCAL"
+authentication_kerberos_service_principal = "mysql_service/kerberos_auth_host@MTR.LOCAL"
 authentication_kerberos_service_key_tab = "{full_path_to:mysql.keytab}"
\ No newline at end of file
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Resources/mysql.keytab b/MySQL.Data/tests/MySql.Data.Tests/Resources/mysql.keytab
deleted file mode 100644
index 91ab57a936f3ae1e69034a2bcaaa1ae88c6b0764..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 178
zcmZQ&VqjnhW?*9A_Kge<^wIP2cXsq);LWWpF3gE9PAw|SOipDG%1$jxN-fGSj!!Ht
z$%xO$FD?P<VvJwi#45)i&LHq+Z=6|%UgEXd#p|Pm9#w1yO3DFoC;?+da`Lk?4Gi`2
X^7ZnI5|eXM^^)^*VFt_MFjy7<=}R@i


From bba491124b5508aaff8e9322bf6f4a14fc111a52 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sat, 29 Mar 2025 15:32:40 -0600
Subject: [PATCH 75/99] WL#16900 [Add support for .NET 10 and EF Core 10
 preview versions]

Change-Id: I88fe42227d9485f632706060b0ab2f2329f19550
---
 CHANGES                                       |  1 +
 .../Internal/MySQLHistoryRepository.cs        |  2 +-
 .../Internal/MySQLMigrationDatabaseLockcs.cs  |  2 +-
 .../Internal/MySQLMigrationsModelDiffer.cs    |  2 +-
 .../src/Migrations/Internal/MySQLMigrator.cs  |  2 +-
 EFCore/src/MySql.EntityFrameworkCore.csproj   |  7 +++-
 EFCore/src/Properties/VersionInfo.cs          |  7 +++-
 .../Internal/MySQLBinaryExpression.cs         |  4 +--
 .../Internal/MySQLCollateExpression.cs        |  8 ++---
 .../MySQLColumnAliasReferenceExpression.cs    |  4 +--
 .../MySQLComplexFunctionArgumentExpression.cs |  4 +--
 .../Internal/MySQLJsonArrayIndexExpression.cs |  4 +--
 .../Internal/MySQLJsonTraversalExpression.cs  |  4 +--
 .../Internal/MySQLMatchExpression.cs          |  4 +--
 .../Internal/MySQLRegexpExpression.cs         |  4 +--
 .../Internal/MySQLDateTimeMethodTranslator.cs |  2 +-
 .../MySQLParameterBasedSqlProcessor.cs        |  4 +--
 .../MySQLParameterBasedSqlProcessorFactory.cs |  2 +-
 .../Internal/MySQLSqlExpressionFactory.cs     |  4 +--
 .../Internal/MySQLSqlNullabilityProcessor.cs  |  2 +-
 .../ConnectionTests.cs                        | 34 ++++++++++++++++++-
 ...Sql.EntityFrameworkCore.Basic.Tests.csproj |  6 +++-
 .../Utils/MySqlTestStore.cs                   |  6 ++--
 ...ql.EntityFrameworkCore.Design.Tests.csproj |  6 +++-
 ...ntityFrameworkCore.Migrations.Tests.csproj |  2 +-
 MySQL.Data/src/MySql.Data.csproj              |  4 +--
 .../MySql.Data.Tests/MySql.Data.Tests.csproj  |  2 +-
 .../MySqlX.Data.Tests.csproj                  |  2 +-
 28 files changed, 93 insertions(+), 42 deletions(-)

diff --git a/CHANGES b/CHANGES
index d98374809..3e541c719 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 - Fixed bug OpenAsync throws unhandled exception from thread pool (MySQL Bug #110789, Oracle Bug #35474099).
 - Fixed Entity Framework 6 from NET9 is deprecated due to Nunit4 Upgrade (MySQL Bug #117976, Oracle Bug #37837374).
 - Added support for GSSAPI/Kerberos authentication on Windows using authentication_ldap_sasl_client plug-in (WL15984).
+- Added support for .NET 10 and EF Core 10 preview versions (WL16900).
 
 
 9.3.0
diff --git a/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs b/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
index 7c7e982a8..d155c14be 100644
--- a/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
+++ b/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
@@ -53,7 +53,7 @@ public MySQLHistoryRepository([NotNull] HistoryRepositoryDependencies dependenci
       : base(dependencies)
     {
     }
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override LockReleaseBehavior LockReleaseBehavior => LockReleaseBehavior.Connection;
 
     public override IMigrationsDatabaseLock AcquireDatabaseLock()
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs b/EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs
index ccd651a16..668e43971 100644
--- a/EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs
+++ b/EFCore/src/Migrations/Internal/MySQLMigrationDatabaseLockcs.cs
@@ -33,7 +33,7 @@
 
 namespace MySql.EntityFrameworkCore.Migrations.Internal
 {
-#if NET9_0
+#if NET9_0_OR_GREATER
   internal class MySQLMigrationDatabaseLock(
    IRelationalCommand releaseLockCommand,
     RelationalCommandParameterObject relationalCommandParameters,
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs b/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
index ac7fc3e4f..63ad27fb2 100644
--- a/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
+++ b/EFCore/src/Migrations/Internal/MySQLMigrationsModelDiffer.cs
@@ -79,7 +79,7 @@ protected override IEnumerable<MigrationOperation> Add(IColumn target, DiffConte
       return base.Add(target, diffContext, inline);
     }
 
-#elif NET9_0
+#elif NET9_0_OR_GREATER
     public MySQLMigrationsModelDiffer(
   [NotNull] IRelationalTypeMappingSource typeMappingSource,
   [NotNull] IMigrationsAnnotationProvider migrationsAnnotations,
diff --git a/EFCore/src/Migrations/Internal/MySQLMigrator.cs b/EFCore/src/Migrations/Internal/MySQLMigrator.cs
index 3534d9152..416ba9ef5 100644
--- a/EFCore/src/Migrations/Internal/MySQLMigrator.cs
+++ b/EFCore/src/Migrations/Internal/MySQLMigrator.cs
@@ -47,7 +47,7 @@
 
 namespace MySql.EntityFrameworkCore.Migrations.Internal
 {
-#if NET9_0
+#if NET9_0_OR_GREATER
   public class MySQLMigrator : IMigrator
   {
     private readonly IMigrationsAssembly _migrationsAssembly;
diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
index 65aadc533..5ba39ee3e 100644
--- a/EFCore/src/MySql.EntityFrameworkCore.csproj
+++ b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -23,7 +23,7 @@
   </PropertyGroup>
   
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
+    <TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
@@ -36,6 +36,11 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.3" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0-preview.5.25277.114" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0-preview.5.25277.114" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\MySQL.Data\src\MySql.Data.csproj" />
   </ItemGroup>
diff --git a/EFCore/src/Properties/VersionInfo.cs b/EFCore/src/Properties/VersionInfo.cs
index b2645c712..2613c8c80 100644
--- a/EFCore/src/Properties/VersionInfo.cs
+++ b/EFCore/src/Properties/VersionInfo.cs
@@ -47,7 +47,12 @@
 [assembly: NeutralResourcesLanguage("en-US")]
 #elif NET9_0
 [assembly: AssemblyVersion("9.4.0")]
-[assembly: AssemblyInformationalVersion("9.0.0.0-preview+MySQL9.4.0")]
+[assembly: AssemblyInformationalVersion("9.0.3.0+MySQL9.4.0")]
+[assembly: AssemblyFileVersion("9.4.0.0")]
+[assembly: NeutralResourcesLanguage("en-US")]
+#elif NET10_0
+[assembly: AssemblyVersion("9.4.0")]
+[assembly: AssemblyInformationalVersion("10.0.0.0-preview+MySQL9.4.0")]
 [assembly: AssemblyFileVersion("9.4.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 #endif
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs
index 6b07143ad..9a3e30f10 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLBinaryExpression.cs
@@ -61,7 +61,7 @@ public MySQLBinaryExpression(
       Right = right;
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
     public virtual MySQLBinaryExpressionOperatorType OperatorType { get; }
@@ -81,7 +81,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
       return Update(left, right);
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     /// <inheritdoc />
     public override Expression Quote() => New(
       _quotingConstructor ??= typeof(MySQLBinaryExpression).GetConstructor(
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs
index bbb59165a..123249735 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs
@@ -45,11 +45,11 @@ internal class MySQLCollateExpression : SqlExpression
     private readonly string _charset;
     private readonly string _collation;
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public MySQLCollateExpression(SqlExpression operand, string collation)
     : base(operand.Type, operand.TypeMapping)
     {
@@ -81,7 +81,7 @@ public MySQLCollateExpression(
     /// </summary>
     public virtual string Charset => _charset;
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     /// <summary>
     ///   The expression on which collation is applied.
     /// </summary>
@@ -126,7 +126,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
 
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public virtual MySQLCollateExpression Update(SqlExpression operand)
         => operand != Operand
             ? new MySQLCollateExpression(operand, Collation)
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs
index 269c5386e..50cfadc82 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLColumnAliasReferenceExpression.cs
@@ -40,7 +40,7 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   /// </summary>
   internal class MySQLColumnAliasReferenceExpression : SqlExpression, IEquatable<MySQLColumnAliasReferenceExpression>
   {
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
 
@@ -72,7 +72,7 @@ public virtual MySQLColumnAliasReferenceExpression Update(
     ? this
     : new MySQLColumnAliasReferenceExpression(alias, expression, Type, TypeMapping!);
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override Expression Quote() => New(
     _quotingConstructor ??= typeof(MySQLColumnAliasReferenceExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
     Constant(Alias),
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs
index 37bbf5420..2290f0b86 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLComplexFunctionArgumentExpression.cs
@@ -40,7 +40,7 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   internal class MySQLComplexFunctionArgumentExpression : SqlExpression
   {
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
 
@@ -80,7 +80,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
       return Update(argumentParts, Delimiter);
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override Expression Quote() => New(
     _quotingConstructor ??= typeof(MySQLComplexFunctionArgumentExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
     Constant(ArgumentParts),
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs
index 79ba35577..a1f5f5ba2 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLJsonArrayIndexExpression.cs
@@ -41,7 +41,7 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   internal class MySQLJsonArrayIndexExpression : SqlExpression, IEquatable<MySQLJsonArrayIndexExpression>
   {
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
 
@@ -60,7 +60,7 @@ public MySQLJsonArrayIndexExpression(
     protected override Expression VisitChildren(ExpressionVisitor visitor)
       => Update((SqlExpression)visitor.Visit(Expression));
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override Expression Quote() => New(
     _quotingConstructor ??= typeof(MySQLJsonArrayIndexExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
     Expression.Quote(),
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs
index a2771b34d..2b31cc35a 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs
@@ -44,7 +44,7 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   internal class MySQLJsonTraversalExpression : SqlExpression, IEquatable<MySQLJsonTraversalExpression>
   {
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
     /// <summary>
@@ -96,7 +96,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
     => Update((SqlExpression)visitor.Visit(Expression),
       Path.Select(p => (SqlExpression)visitor.Visit(p)).ToArray());
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override Expression Quote() => New(
     _quotingConstructor ??= typeof(MySQLJsonTraversalExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
     Expression.Quote(),
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs
index 26f177b81..6ada3a8d7 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLMatchExpression.cs
@@ -40,7 +40,7 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   internal class MySQLMatchExpression : SqlExpression
   {
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
 
@@ -81,7 +81,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
       return Update(match, against);
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override Expression Quote() => New(
     _quotingConstructor ??= typeof(MySQLMatchExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
     Match.Quote(),
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs
index 3ecedf787..e0e19feb6 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLRegexpExpression.cs
@@ -38,7 +38,7 @@ namespace MySql.EntityFrameworkCore.Query.Expressions.Internal
   internal class MySQLRegexpExpression : SqlExpression
   {
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private static ConstructorInfo? _quotingConstructor;
 #endif
 
@@ -75,7 +75,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
       return Update(match, pattern);
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override Expression Quote() => New(
     _quotingConstructor ??= typeof(MySQLMatchExpression).GetConstructor([typeof(SqlExpression), typeof(string)])!,
     Match.Quote(),
diff --git a/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs b/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs
index d967aa091..dfb87f08c 100644
--- a/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs
+++ b/EFCore/src/Query/Internal/MySQLDateTimeMethodTranslator.cs
@@ -100,7 +100,7 @@ public MySQLDateTimeMethodTranslator(ISqlExpressionFactory sqlExpressionFactory)
         typeof(string))
             },
             nullable: true,
-#if !NET9_0
+#if !NET9_0_OR_GREATER
             argumentsPropagateNullability: TrueArrays[1],
 #else
             argumentsPropagateNullability: new[] { true, false },
diff --git a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
index e116a3c93..18633c334 100644
--- a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
+++ b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
@@ -39,7 +39,7 @@ internal class MySQLParameterBasedSqlProcessor : RelationalParameterBasedSqlProc
   {
     private readonly IMySQLOptions _options;
 
-#if !NET9_0
+#if !NET9_0_OR_GREATER
     public MySQLParameterBasedSqlProcessor(
       RelationalParameterBasedSqlProcessorDependencies dependencies,
       bool useRelationalNulls,
@@ -69,7 +69,7 @@ protected override Expression ProcessSqlNullability(
 
       return new MySQLSqlNullabilityProcessor(Dependencies, UseRelationalNulls).Process(selectExpression, parametersValues, out canCache);
     }
-#elif NET9_0
+#elif NET9_0_OR_GREATER
     protected override Expression ProcessSqlNullability(
       Expression selectExpression, IReadOnlyDictionary<string, object?> parametersValues, out bool canCache)
     {
diff --git a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs
index 12f709cda..de50f63d1 100644
--- a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs
+++ b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessorFactory.cs
@@ -42,7 +42,7 @@ public MySQLParameterBasedSqlProcessorFactory(RelationalParameterBasedSqlProcess
       _options = options;
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public RelationalParameterBasedSqlProcessor Create(RelationalParameterBasedSqlProcessorParameters parameters)
       => new MySQLParameterBasedSqlProcessor(_dependencies, parameters, _options);
 #else
diff --git a/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs b/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs
index df6173fc6..da1883b17 100644
--- a/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs
+++ b/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs
@@ -141,7 +141,7 @@ public MySQLCollateExpression Collate(
       string charset,
       string collation)
       => (MySQLCollateExpression)ApplyDefaultTypeMapping(
-#if NET9_0
+#if NET9_0_OR_GREATER
         new MySQLCollateExpression(
           valueExpression,
           collation)
@@ -294,7 +294,7 @@ private MySQLCollateExpression ApplyTypeMappingOnCollate(MySQLCollateExpression
       var inferredTypeMapping = ExpressionExtensions.InferTypeMapping(collateExpression.ValueExpression)
         ?? _typeMappingSource.FindMapping(collateExpression.ValueExpression.Type);
 
-#if NET9_0
+#if NET9_0_OR_GREATER
       return new MySQLCollateExpression(collateExpression.ValueExpression, collateExpression.Collation);
 #else
       return new MySQLCollateExpression(
diff --git a/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs b/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs
index 4ecd6edd1..351fba69f 100644
--- a/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs
+++ b/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs
@@ -38,7 +38,7 @@ internal class MySQLSqlNullabilityProcessor : SqlNullabilityProcessor
     private readonly ISqlExpressionFactory _sqlExpressionFactory;
 
 
-#if !NET9_0
+#if !NET9_0_OR_GREATER
     /// <summary>
     /// Creates a new instance of the <see cref="MySQLSqlNullabilityProcessor" />.
     /// </summary>
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
index 1a82a5f62..ef30d7d57 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/ConnectionTests.cs
@@ -85,7 +85,7 @@ public static RelationalConnectionDependencies CreateDependencies(DbContextOptio
               TestServiceFactory.Instance.Create<RelationalTypeMappingSourceDependencies>(),
               new MySQLOptions()))));
     }
-#elif NET8_0_OR_GREATER
+#elif NET8_0 || NET9_0
     public static RelationalConnectionDependencies CreateDependencies(DbContextOptions? options = null)
     {
       options ??= new DbContextOptionsBuilder()
@@ -116,6 +116,38 @@ public static RelationalConnectionDependencies CreateDependencies(DbContextOptio
               TestServiceFactory.Instance.Create<RelationalTypeMappingSourceDependencies>(),
               new MySQLOptions()), new ExceptionDetector())));
     }
+#elif NET10_0_OR_GREATER
+    public static RelationalConnectionDependencies CreateDependencies(DbContextOptions? options = null)
+    {
+      options ??= new DbContextOptionsBuilder()
+          .UseMySQL(MySQLTestStore.BaseConnectionString + "database=test;")
+          .Options;
+
+      return new RelationalConnectionDependencies(
+          options,
+          new DiagnosticsLogger<DbLoggerCategory.Database.Transaction>(
+              new LoggerFactory(),
+              new LoggingOptions(),
+              new DiagnosticListener("FakeDiagnosticListener"),
+              new MySQLLoggingDefinitions(), new NullDbContextLogger()),
+          new RelationalConnectionDiagnosticsLogger(
+                        new LoggerFactory(),
+                        new LoggingOptions(),
+                        new DiagnosticListener("FakeDiagnosticListener"),
+                        new TestRelationalLoggingDefinitions(),
+                        new NullDbContextLogger(),
+                        CreateOptions()),
+          new NamedConnectionStringResolver(options),
+          new RelationalTransactionFactory(new RelationalTransactionFactoryDependencies(
+            new RelationalSqlGenerationHelper(new RelationalSqlGenerationHelperDependencies()))),
+          new CurrentDbContext(new FakeDbContext()),
+          new RelationalCommandBuilderFactory(new RelationalCommandBuilderDependencies(
+            new MySQLTypeMappingSource(
+              TestServiceFactory.Instance.Create<TypeMappingSourceDependencies>(),
+              TestServiceFactory.Instance.Create<RelationalTypeMappingSourceDependencies>(),
+              new MySQLOptions()), new ExceptionDetector(), new LoggingOptions())),
+              new ExceptionDetector());
+    }
 #endif
 
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index b650e7248..f4f0ada6e 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
+    <TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
@@ -25,6 +25,10 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="9.0.3" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="10.0.0-preview.5.25277.114" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs
index 776026ab7..4601e4c5b 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs
@@ -226,7 +226,7 @@ public static void DeleteDatabase(string name)
     public override DbContextOptionsBuilder AddProviderOptions(DbContextOptionsBuilder builder)
       => builder.UseMySQL(GetContextConnectionString<MyTestContext>());
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public virtual void Clean(DbContext context)
       => context.Database.EnsureDeleted();
 #else
@@ -236,7 +236,7 @@ public override void Clean(DbContext context)
 
 
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     private MySQLTestStore(string name, DbConnection connection)
         : base(name, true, connection)
     {
@@ -272,7 +272,7 @@ protected MySQLTestStoreFactory()
     {
     }
 
-#if NET9_0
+#if NET9_0_OR_GREATER
     public override TestStore Create(string storeName)
         => MySQLTestStore.Create(storeName, new MySqlConnection(MySQLTestStore.RootConnectionString));
 
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index f163da6c3..49afddd2f 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
+    <TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
   </PropertyGroup>
   
   <ItemGroup>
@@ -41,6 +41,10 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-preview.5.25277.114" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\MySql.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\MySql.EFCore.Basic.Tests\MySql.EntityFrameworkCore.Basic.Tests.csproj" />
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
index 06039067f..dca0d5bed 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    <!--<TargetFrameworks>net9.0;$(TargetFrameworks)</TargetFrameworks>-->
+    <TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index 99c82ff89..e8d4a0b3c 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -27,7 +27,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    
+    <TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
   </PropertyGroup>
   
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
@@ -72,7 +72,7 @@
     <EmbeddedResource Include="Resources.resx;ResourcesX.resx;Properties\ReservedWords.txt" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netstandard2.1' or '$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0' or '$(TargetFramework)'=='net8.0' or '$(TargetFramework)'=='net9.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netstandard2.1' or '$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0' or '$(TargetFramework)'=='net8.0' or '$(TargetFramework)'=='net9.0' or '$(TargetFramework)'=='net10.0'">
     <Compile Remove="Framework/net462/*" />
     <PackageReference Include="System.Security.Permissions" Version="8.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index 9455959c7..48a44cec0 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    
+    <TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
   </PropertyGroup>
   
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 111476d40..0835199a7 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(allow_prerelease)'=='true'">
-    
+    <TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
   </PropertyGroup>
   
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">

From b0f807545dfdf6a25f41c5c0981af085bb7911f5 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sun, 18 May 2025 18:07:11 -0600
Subject: [PATCH 76/99] Bug#37462099 Bug#38001821 [MySql.EntityFrameworkCore
 8.0.8 rename bug] [Contribution: fix: invalid cast exception]

This patch contains the fix of 2 bugs, one of which is a contribution and also that is partial fix for the other bug.

Change-Id: I85856447880b4f805b136a5fbd696a82c8a3a9a1
---
 CHANGES                                       |  2 +
 .../Internal/MySQLHistoryRepository.cs        |  4 +-
 .../Migrations/MySQLMigrationsSqlGenerator.cs |  2 +-
 .../MySQLMigrationsTests.cs                   | 14 ++++
 .../TestData/Bug37462099Context.cs            | 74 ++++++++++++++++++
 .../Bug37462099ContextModelSnapshot.cs        | 68 ++++++++++++++++
 .../Bug37462099Migrations.Designer.cs         | 71 +++++++++++++++++
 .../TestData/Bug37462099Migrations.cs         | 78 +++++++++++++++++++
 8 files changed, 310 insertions(+), 3 deletions(-)
 create mode 100644 EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099Context.cs
 create mode 100644 EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099ContextModelSnapshot.cs
 create mode 100644 EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099Migrations.Designer.cs
 create mode 100644 EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099Migrations.cs

diff --git a/CHANGES b/CHANGES
index 3e541c719..cf7768e47 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@
 - Fixed Entity Framework 6 from NET9 is deprecated due to Nunit4 Upgrade (MySQL Bug #117976, Oracle Bug #37837374).
 - Added support for GSSAPI/Kerberos authentication on Windows using authentication_ldap_sasl_client plug-in (WL15984).
 - Added support for .NET 10 and EF Core 10 preview versions (WL16900).
+- Fixed MySql.EntityFrameworkCore 8.0.8 rename bug (MySQL Bug #116704, Oracle Bug #37462099).
+- Fixed Invalid cast exception (MySQL Bug #118282, Oracle Bug #38001821). Thanks to Dev Nullinside for the contribution.
 
 
 9.3.0
diff --git a/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs b/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
index d155c14be..ce1c8d1f0 100644
--- a/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
+++ b/EFCore/src/Migrations/Internal/MySQLHistoryRepository.cs
@@ -95,10 +95,10 @@ public override async Task<IMigrationsDatabaseLock> AcquireDatabaseLockAsync(Can
       Dependencies.MigrationsLogger.AcquiringMigrationLock();
 
       var dbLock = CreateMigrationDatabaseLock();
-      int result;
+      Int64 result;
       try
       {
-        result = (int)(await CreateGetLockCommand().ExecuteScalarAsync(CreateRelationalCommandParameters(), cancellationToken)
+        result = (Int64)(await CreateGetLockCommand().ExecuteScalarAsync(CreateRelationalCommandParameters(), cancellationToken)
             .ConfigureAwait(false))!;
       }
       catch
diff --git a/EFCore/src/Migrations/MySQLMigrationsSqlGenerator.cs b/EFCore/src/Migrations/MySQLMigrationsSqlGenerator.cs
index 239ff6753..e8e73db2f 100644
--- a/EFCore/src/Migrations/MySQLMigrationsSqlGenerator.cs
+++ b/EFCore/src/Migrations/MySQLMigrationsSqlGenerator.cs
@@ -128,7 +128,7 @@ protected override void Generate(RenameColumnOperation operation, IModel? model,
 
       var typeMapping = column.PropertyMappings.FirstOrDefault()?.TypeMapping;
       var converter = typeMapping?.Converter;
-      var clrType = (converter!.ProviderClrType ?? typeMapping!.ClrType).UnwrapNullableType();
+      var clrType = (converter?.ProviderClrType ?? typeMapping!.ClrType).UnwrapNullableType();
       var columnType = (string)(operation[RelationalAnnotationNames.ColumnType]
                   ?? column[RelationalAnnotationNames.ColumnType])!;
       var isNullable = column.IsNullable;
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs
index 5b9ab9574..c19d102ca 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySQLMigrationsTests.cs
@@ -31,7 +31,9 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.Extensions.DependencyInjection;
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
+using MySql.EntityFrameworkCore.Migrations.Tests.TestData;
 using NUnit.Framework;
+using System.Threading.Tasks;
 
 namespace MySql.EntityFrameworkCore.Migrations.Tests
 {
@@ -69,5 +71,17 @@ public void TryPerformMigration()
         mytestContext.Database.EnsureDeleted();
       }
     }
+
+    //Bug#37462099 MySql.EntityFrameworkCore 8.0.8 rename bug
+    [Test]
+    public async Task MigrationFailsWIthRenameColumn()
+    {
+      Bug37462099Context context = new Bug37462099Context();
+      
+      context.Database.EnsureCreated();
+      context.Database.EnsureDeleted();
+      await context.Database.MigrateAsync();
+      context.Database.EnsureDeleted();
+    }
   }
 }
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099Context.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099Context.cs
new file mode 100644
index 000000000..f01d4eb3a
--- /dev/null
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099Context.cs
@@ -0,0 +1,74 @@
+// Copyright © 2025, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations;
+using MySql.EntityFrameworkCore.Basic.Tests.Utils;
+
+namespace MySql.EntityFrameworkCore.Migrations.Tests.TestData
+{
+  public class Bug37462099Context : DbContext
+  {
+    public DbSet<Bug37462099> Entity { get; set; }
+
+    public Bug37462099Context() : base()
+    {
+    }
+
+    public Bug37462099Context(DbContextOptions options) : base(options)
+    {
+    }
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+      modelBuilder.Entity<Bug37462099>(builder =>
+      {
+        builder.ToTable("Bug37462099");
+
+        builder.HasKey(p => p.Id);
+
+        builder.Property(p => p.Name);
+
+        builder.Property(p => p.Created);
+      });
+    }
+
+    protected override void OnConfiguring(DbContextOptionsBuilder options)
+    => options.UseMySQL(MySQLTestStore.RootConnectionString + "database=test;");
+  }
+
+  public class Bug37462099
+  {
+    [Key]
+    public int Id { get; set; }
+    public string? Name { get; set; }
+    public DateTimeOffset Created { get; set; }
+
+  }
+}
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099ContextModelSnapshot.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099ContextModelSnapshot.cs
new file mode 100644
index 000000000..41a49b529
--- /dev/null
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099ContextModelSnapshot.cs
@@ -0,0 +1,68 @@
+// Copyright © 2025, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace MySql.EntityFrameworkCore.Migrations.Tests.TestData
+{
+  [DbContext(typeof(Bug37462099Context))]
+  partial class Bug37462099ContextModelSnapshot : ModelSnapshot
+  {
+    protected override void BuildModel(ModelBuilder modelBuilder)
+    {
+#pragma warning disable 612, 618
+      modelBuilder
+        .HasAnnotation("ProductVersion", "9.0.3")
+        .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+      modelBuilder.Entity("MySql.EntityFrameworkCore.Migrations.Tests.TestData.Bug37462099", b =>
+        {
+          b.Property<int>("Id")
+                    .ValueGeneratedOnAdd()
+                    .HasColumnType("int");
+
+          b.Property<DateTimeOffset>("Created")
+                    .HasColumnType("datetime");
+
+          b.Property<string>("Name")
+                    .HasColumnType("longtext");
+
+          b.HasKey("Id");
+
+          b.ToTable("Bug37462099", (string)null);
+        });
+#pragma warning restore 612, 618
+    }
+  }
+}
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099Migrations.Designer.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099Migrations.Designer.cs
new file mode 100644
index 000000000..898193d40
--- /dev/null
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099Migrations.Designer.cs
@@ -0,0 +1,71 @@
+// Copyright © 2025, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace MySql.EntityFrameworkCore.Migrations.Tests.TestData
+{
+  [DbContext(typeof(Bug37462099Context))]
+  [Migration("Bug37462099Migrations")]
+  partial class Bug37462099Migrations
+  {
+    /// <inheritdoc />
+    protected override void BuildTargetModel(ModelBuilder modelBuilder)
+    {
+#pragma warning disable 612, 618
+      modelBuilder
+        .HasAnnotation("ProductVersion", "9.0.3")
+        .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+      modelBuilder.Entity("MySql.EntityFrameworkCore.Migrations.Tests.TestData.Bug37462099", b =>
+      {
+        b.Property<int>("Id")
+                  .ValueGeneratedOnAdd()
+                  .HasColumnType("int");
+
+        b.Property<DateTimeOffset>("Created")
+                  .HasColumnType("datetime");
+
+        b.Property<string>("Name")
+                  .HasColumnType("longtext");
+
+        b.HasKey("Id");
+
+        b.ToTable("Bug37462099", (string)null);
+      });
+#pragma warning restore 612, 618
+    }
+  }
+}
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099Migrations.cs b/EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099Migrations.cs
new file mode 100644
index 000000000..9e85e86ac
--- /dev/null
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/TestData/Bug37462099Migrations.cs
@@ -0,0 +1,78 @@
+// Copyright © 2025, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0, as
+// published by the Free Software Foundation.
+//
+// This program is designed to work with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms, as
+// designated in a particular file or component or in included license
+// documentation. The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have either included with
+// the program or referenced in the documentation.
+//
+// Without limiting anything contained in the foregoing, this file,
+// which is part of MySQL Connector/NET, is also subject to the
+// Universal FOSS Exception, version 1.0, a copy of which can be found at
+// http://oss.oracle.com/licenses/universal-foss-exception.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using MySql.EntityFrameworkCore.Metadata;
+
+#nullable disable
+
+namespace MySql.EntityFrameworkCore.Migrations.Tests.TestData
+{
+  /// <inheritdoc />
+  public partial class Bug37462099Migrations : Migration
+  {
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.AlterDatabase()
+        .Annotation("MySQL:Charset", "utf8mb4");
+
+      migrationBuilder.CreateTable(
+        name: "Bug37462099",
+        columns: table => new
+        {
+          Id = table.Column<int>(type: "int", nullable: false).Annotation("MySQL:ValueGenerationStrategy", MySQLValueGenerationStrategy.IdentityColumn),
+          Name = table.Column<string>(type: "longtext", nullable: true),
+          Created = table.Column<DateTimeOffset>(type: "datetime", nullable: false)
+        },
+        constraints: table =>
+        {
+          table.PrimaryKey("PK_Bug37462099", x => x.Id);
+        })
+        .Annotation("MySQL:Charset", "utf8mb4");
+
+      migrationBuilder.RenameColumn(
+        name: "Name",
+        table: "Bug37462099",
+        newName: "ChangedName").Annotation("Relational:ColumnType", "LONGTEXT;");
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+      migrationBuilder.DropTable(
+        name: "Bug37462099");
+
+      migrationBuilder.RenameColumn(
+        name: "ChangedName",
+        table: "Bug37462099",
+        newName: "Name").Annotation("Relational:ColumnType", "LONGTEXT;");
+    }
+  }
+}

From e59c0ebc8a2332a7b4fc8b64e41f0a0110551532 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Thu, 5 Jun 2025 14:18:47 -0600
Subject: [PATCH 77/99] Bug#36303124 [MySqlHelper.ExecuteReaderAsync causes
 stack overflow]

Change-Id: I852cdeb674af71b84cfc12104f9cacb67237e83f
---
 CHANGES                                       |  1 +
 MySQL.Data/src/MySqlHelper.cs                 |  2 +-
 MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs | 13 +++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index cf7768e47..c5e5d96f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@
 - Added support for .NET 10 and EF Core 10 preview versions (WL16900).
 - Fixed MySql.EntityFrameworkCore 8.0.8 rename bug (MySQL Bug #116704, Oracle Bug #37462099).
 - Fixed Invalid cast exception (MySQL Bug #118282, Oracle Bug #38001821). Thanks to Dev Nullinside for the contribution.
+- Fixed MySqlHelper.ExecuteReaderAsync causes stack overflow (MySQL Bug #114006, Oracle Bug #36303124).
 
 
 9.3.0
diff --git a/MySQL.Data/src/MySqlHelper.cs b/MySQL.Data/src/MySqlHelper.cs
index 06447877c..9d33fa16d 100644
--- a/MySQL.Data/src/MySqlHelper.cs
+++ b/MySQL.Data/src/MySqlHelper.cs
@@ -263,7 +263,7 @@ private static async Task<MySqlDataReader> ExecuteReaderAsync(bool execAsync, st
     /// <param name="commandText">Command text to use.</param>
     /// <param name="commandParameters">An array of <see cref="MySqlParameter"/> objects to use with the command.</param>
     /// <returns><see cref="MySqlDataReader"/> object ready to read the results of the command.</returns>
-    public static Task<MySqlDataReader> ExecuteReaderAsync(string connectionString, string commandText, params MySqlParameter[] commandParameters) => ExecuteReaderAsync(connectionString, commandText, commandParameters: commandParameters);
+    public static Task<MySqlDataReader> ExecuteReaderAsync(string connectionString, string commandText, params MySqlParameter[] commandParameters) => ExecuteReaderAsync(true, connectionString, commandText, commandParameters: commandParameters);
 
     public static Task<MySqlDataReader> ExecuteReaderAsync(string connectionString, string commandText, CancellationToken cancellationToken, params MySqlParameter[] commandParameters) => ExecuteReaderAsync(true, connectionString, commandText, cancellationToken, commandParameters);
 
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
index e932704e3..b90b0d318 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
@@ -529,6 +529,19 @@ public void HelperTest()
       }
     }
 
+    /// <summary>
+    /// Bug #36303124	MySqlHelper.ExecuteReaderAsync causes stack overflow
+    /// </summary>
+    [Test]
+    public async Task MySqlHelper_ExecuteReader()
+    {
+      ExecuteSQL("CREATE TABLE Test (`id` int NOT NULL); INSERT INTO Test (id) VALUES (1);");
+
+      var reader = await MySqlHelper.ExecuteReaderAsync(Connection.ConnectionString, "SELECT * FROM Test WHERE id = @id", new MySqlParameter("@id", 1));
+
+      Assert.DoesNotThrowAsync(async () => await MySqlHelper.ExecuteReaderAsync(Connection.ConnectionString, "SELECT * FROM Test WHERE id = @id", new MySqlParameter("@id", 1)));
+    }
+
     /// <summary>
     /// Bug #58652	ExecuteReader throws NullReferenceException when using CommandBehavior.Close
     /// </summary>

From 7f37ef794e4fc86a3f340662dc2d7439d9d0aa59 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sat, 31 May 2025 20:28:13 -0600
Subject: [PATCH 78/99] Bug#37462116 [Connector/Net Not honouring MinPoolSize
 Configuration]

Change-Id: I90f2d597e4aa28da84c7473eca06efaf7c27cb56
---
 CHANGES                                       |  1 +
 MySQL.Data/src/MySqlPool.cs                   |  4 +-
 .../tests/MySql.Data.Tests/PoolingTests.cs    | 81 +++++++++++++++++++
 3 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index c5e5d96f6..9efb43dc6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@
 - Fixed MySql.EntityFrameworkCore 8.0.8 rename bug (MySQL Bug #116704, Oracle Bug #37462099).
 - Fixed Invalid cast exception (MySQL Bug #118282, Oracle Bug #38001821). Thanks to Dev Nullinside for the contribution.
 - Fixed MySqlHelper.ExecuteReaderAsync causes stack overflow (MySQL Bug #114006, Oracle Bug #36303124).
+- Fixed bug Connector/Net Not honouring MinPoolSize Configuration (MySQL Bug #117020, Oracle Bug #37462116).
 
 
 9.3.0
diff --git a/MySQL.Data/src/MySqlPool.cs b/MySQL.Data/src/MySqlPool.cs
index c8c9b5cec..01826550d 100644
--- a/MySQL.Data/src/MySqlPool.cs
+++ b/MySQL.Data/src/MySqlPool.cs
@@ -132,8 +132,8 @@ private async Task<Driver> GetPooledConnectionAsync(bool execAsync, Cancellation
       {
         if (HasIdleConnections)
         {
-          driver = _idlePool.Last.Value;
-          _idlePool.RemoveLast();
+          driver = _idlePool.First.Value;
+          _idlePool.RemoveFirst();
         }
       }
       finally
diff --git a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
index decb80db6..2db1373ce 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
@@ -35,6 +35,7 @@
 using System.Net.NetworkInformation;
 using System.Reflection;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace MySql.Data.MySqlClient.Tests
 {
@@ -612,6 +613,86 @@ void InsertSmallBlobInTestTableUsingPoolingConnection()
       }
     }
 
+    /// <summary>
+    /// Bug #37462116
+    /// Connector/Net Not honouring MinPoolSize Configuration
+    /// </summary>
+    [Test]
+    public async Task MinPoolSizeNotCorrect()
+    {
+      int minPoolSize = 5;
+      var connectionString = $"server={Host};user={Settings.UserID};password={Settings.Password};port={Port};Max Pool Size=10;Min Pool Size={minPoolSize};sslmode=none;";
+
+      try
+      {
+        //change wait_timeout to force idle connections to close faster
+        using (var connection = new MySqlConnection(connectionString))
+        {
+          connection.Open();
+          using (var command = new MySqlCommand("SET GLOBAL wait_timeout = 10;", connection))
+          {
+            command.ExecuteNonQuery();
+          }
+        }
+
+        //create connection pool using Min Pool Size of 5
+        for (int i = 0; i < minPoolSize; i++) // Match MinPoolSize
+        {
+          using (var connection = new MySqlConnection(connectionString))
+          {
+            connection.Open();
+            using (var command = new MySqlCommand("SELECT CONNECTION_ID();", connection))
+            {
+              command.ExecuteNonQuery();
+            }
+          }
+        }
+
+        //check that connection pool maintains the Min Pool Size
+        int cycleCounter = 0;
+        while (cycleCounter < minPoolSize * 2)
+        {
+          using (var connection = new MySqlConnection(connectionString))
+          {
+            await connection.OpenAsync();
+
+            // Query all active connections
+            using (var command = new MySqlCommand("SHOW PROCESSLIST;", connection))
+            using (var reader = await command.ExecuteReaderAsync())
+            {
+              int connectionCount = 0;
+
+              while (await reader.ReadAsync())
+              {
+                //count the connections tied to the test user
+                string user = reader["User"].ToString();
+                if (user == Settings.UserID)
+                {
+                  connectionCount++;
+                }
+              }
+              // check that the ConnectionCount is equal or greater than the Min Pool Size
+              Assert.That(connectionCount, Is.GreaterThanOrEqualTo(minPoolSize));
+            }
+          }
+          cycleCounter++;
+          await Task.Delay(2000);
+        }
+      }
+      finally
+      {
+        //change wait_timeout to default value;
+        using (var connection = new MySqlConnection(connectionString))
+        {
+          connection.Open();
+          using (var command = new MySqlCommand("SET GLOBAL wait_timeout = 28800;", connection))
+          {
+            command.ExecuteNonQuery();
+          }
+        }
+      }
+    }
+
     #region WL14389
 
     [Test, Description("Check Pooling Connection works correctly")]

From f7bb533887efb1c304b209c9c06f16d5ce7e81bf Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Sat, 28 Sep 2024 17:07:21 -0600
Subject: [PATCH 79/99] Bug#35392218 [bugfix schema name (specially usefull
 when use multiple schema)]

Change-Id: If76fae263de12827bd427c44887447059e46f762
---
 CHANGES                                       |  1 +
 .../Internal/MySQLSqlGenerationHelper.cs      |  2 +-
 .../DbContextClasses/EntitiesClasses.cs       | 14 +++
 .../DbContextClasses/TestsContexts.cs         | 47 ++++++++++
 .../MySql.EFCore.Basic.Tests/EFCoreTests.cs   | 85 ++++++++++++++++++-
 .../Utils/MySqlTestStore.cs                   |  5 ++
 6 files changed, 152 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9efb43dc6..de11be873 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@
 - Fixed Invalid cast exception (MySQL Bug #118282, Oracle Bug #38001821). Thanks to Dev Nullinside for the contribution.
 - Fixed MySqlHelper.ExecuteReaderAsync causes stack overflow (MySQL Bug #114006, Oracle Bug #36303124).
 - Fixed bug Connector/Net Not honouring MinPoolSize Configuration (MySQL Bug #117020, Oracle Bug #37462116).
+- Fixed bug bugfix schema name (specially usefull when use multiple schema) (MySQL Bug #111030, Oracle Bug #35392218). Thanks to Stéphane Graziano for the contribution.
 
 
 9.3.0
diff --git a/EFCore/src/Storage/Internal/MySQLSqlGenerationHelper.cs b/EFCore/src/Storage/Internal/MySQLSqlGenerationHelper.cs
index 44bdba26f..4bcb445f6 100644
--- a/EFCore/src/Storage/Internal/MySQLSqlGenerationHelper.cs
+++ b/EFCore/src/Storage/Internal/MySQLSqlGenerationHelper.cs
@@ -83,6 +83,6 @@ protected virtual string GetObjectName(string name, string schema)
       ? _options.SchemaNameTranslator(schema, name)
       : name;
 
-    protected virtual string? GetSchemaName(string name, string schema) => null;
+    protected virtual string? GetSchemaName(string name, string schema) => schema;
   }
 }
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EntitiesClasses.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EntitiesClasses.cs
index d28d32e81..e63c36c4c 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EntitiesClasses.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/EntitiesClasses.cs
@@ -171,6 +171,20 @@ public class Person
     public string? Name { get; set; }
   }
 
+  public class Bug35392218_1
+  {
+    public int Id { get; set; }
+
+    public string? Name { get; set; }
+  }
+
+  public class Bug35392218_2
+  {
+    public int Id { get; set; }
+
+    public string? Name { get; set; }
+  }
+
   public class Guest
   {
     [Key]
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/TestsContexts.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/TestsContexts.cs
index 156e905be..549919bb0 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/TestsContexts.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/TestsContexts.cs
@@ -57,6 +57,53 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
     }
   }
 
+  public class Bug35392218Context : DbContext
+  {
+    public Bug35392218Context() : base()
+    {
+    }
+
+    public Bug35392218Context(DbContextOptions options) : base(options)
+    {
+    }
+
+    public virtual DbSet<Bug35392218_1> NameList { get; set; }
+
+    private string schemaName = "schemaBug35392218_1";
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+      base.OnModelCreating(modelBuilder);
+
+      modelBuilder.Entity<Bug35392218_1>(entity =>
+      {
+        entity.ToTable("Bug35392218_table1", "schemaBug35392218_1");
+
+        entity.HasKey(e => e.Id).HasName("id");
+
+        entity.Property(e => e.Name)
+            .HasColumnType("varchar(40)")
+            .HasColumnName("name");
+      });
+
+      modelBuilder.Entity<Bug35392218_2>(entity =>
+      {
+        entity.ToTable("Bug35392218_table2", "schemaBug35392218_2");
+
+        entity.HasKey(e => e.Id).HasName("id");
+
+        entity.Property(e => e.Name)
+            .HasColumnType("varchar(40)")
+            .HasColumnName("name");
+      });
+    }
+
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+      optionsBuilder.UseMySQL(MySQLTestStore.GetContextConnectionStringWithName(schemaName));
+    }
+  }
+
   public class NoConfigurationContext : DbContext
   {
     public DbSet<Blog> Blogs { get; set; }
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
index 531dd6025..785c8c665 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
@@ -31,7 +31,6 @@
 using MySql.EntityFrameworkCore.Basic.Tests.DbContextClasses;
 using MySql.EntityFrameworkCore.Basic.Tests.Utils;
 using NUnit.Framework;
-using NUnit.Framework.Legacy;
 using System;
 using System.Linq;
 using System.Transactions;
@@ -201,5 +200,89 @@ public void DateTimeEqualityCheck()
         Assert.That(test.Count, Is.EqualTo(1));
       }
     }
+
+    /// <summary>
+    /// Bug#35392218 [bugfix schema name (specially usefull when use multiple schema..]
+    /// </summary>
+    [Test]
+    public void MultipleSchemaContext()
+    {
+      using (Bug35392218Context context = new Bug35392218Context())
+      {
+        context.Database.EnsureDeleted();
+        context.Database.EnsureCreated();
+
+        using (MySqlConnection connection = new MySqlConnection(MySQLTestStore.BaseConnectionString))
+        {
+          connection.Open();
+
+          MySqlCommand command = connection.CreateCommand();
+          command.CommandText = "SHOW DATABASES LIKE '%bug35392218%';";
+
+          MySqlDataReader reader = command.ExecuteReader();
+          int rowCount = 0;
+          while (reader.Read())
+          {
+            rowCount++;
+          }
+
+          //Checking if 2 databases related to the bug number are created in the server;
+          Assert.That(rowCount, Is.EqualTo(2));
+          reader.Close();
+        }
+
+        context.Add(new Bug35392218_1 { Id = 1, Name = "John Doe" });
+        context.Add(new Bug35392218_2 { Id = 1, Name = "John Doe" });
+        context.SaveChanges();
+
+        using (MySqlConnection connection = new MySqlConnection(MySQLTestStore.BaseConnectionString + "database=schemaBug35392218_1;"))
+        {
+          connection.Open();
+
+          MySqlCommand command = connection.CreateCommand();
+          command.CommandText = "SELECT * FROM Bug35392218_table1";
+
+          MySqlDataReader reader = command.ExecuteReader();
+          int rowCount = 0;
+          while (reader.Read())
+          {
+            rowCount++;
+          }
+
+          //Checking if the data is available in 'schemaBug35392218_1' as its the default database definded in the context configuration.
+          Assert.That(rowCount, Is.EqualTo(1));
+          Assert.That(reader.GetString(1), Is.EqualTo("John Doe"));
+
+          reader.Close();
+
+          command.CommandText = "DROP DATABASE IF EXISTS schemaBug35392218_1;";
+          command.ExecuteNonQuery();
+        }
+
+        using (MySqlConnection connection = new MySqlConnection(MySQLTestStore.BaseConnectionString + "database=schemaBug35392218_2;"))
+        {
+          connection.Open();
+
+          MySqlCommand command = connection.CreateCommand();
+          command.CommandText = "SELECT * FROM Bug35392218_table2";
+
+          MySqlDataReader reader = command.ExecuteReader();
+          int rowCount = 0;
+          while (reader.Read())
+          {
+            rowCount++;
+          }
+
+          //Checking if the same data is also inserted into 'schemaBug35392218_2' which is the other database defined in model creation.
+          Assert.That(rowCount, Is.EqualTo(1));
+          Assert.That(reader.GetString(1), Is.EqualTo("John Doe"));
+
+          reader.Close();
+
+          command.CommandText = "DROP DATABASE IF EXISTS schemaBug35392218_2;";
+          command.ExecuteNonQuery();
+        }
+      }
+    }
   }
 }
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs
index 4601e4c5b..59b4bf5a7 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/Utils/MySqlTestStore.cs
@@ -89,6 +89,11 @@ internal static string GetContextConnectionString(Type type)
       return MySQLTestStore.RootConnectionString + $";database={name};";
     }
 
+    internal static string GetContextConnectionStringWithName(string name)
+    {
+      return MySQLTestStore.RootConnectionString + $";database={name};";
+    }
+
     public static string Port()
     {
       var port = Environment.GetEnvironmentVariable("MYSQL_PORT");

From f2c5fd97df26c2ca25c7e032c1197a8f3f771c41 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 4 Jun 2025 11:15:19 -0600
Subject: [PATCH 80/99] Bug#38029691 [Reorganize Test Suite]

Change-Id: Ib868de3951d12f1acc79eb5825f49cf219006678
---
 CHANGES                                       |   1 +
 .../tests/MySql.Data.Tests/AuthTests.cs       | 157 ------------------
 .../tests/MySql.Data.Tests/Resources/my.ini   |  15 --
 3 files changed, 1 insertion(+), 172 deletions(-)

diff --git a/CHANGES b/CHANGES
index de11be873..5de140640 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@
 - Fixed MySqlHelper.ExecuteReaderAsync causes stack overflow (MySQL Bug #114006, Oracle Bug #36303124).
 - Fixed bug Connector/Net Not honouring MinPoolSize Configuration (MySQL Bug #117020, Oracle Bug #37462116).
 - Fixed bug bugfix schema name (specially usefull when use multiple schema) (MySQL Bug #111030, Oracle Bug #35392218). Thanks to Stéphane Graziano for the contribution.
+- Fixed bug reorganize test suite (Oracle Bug #38029691).
 
 
 9.3.0
diff --git a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
index c80c4fdea..952e044db 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
@@ -1160,49 +1160,6 @@ public void AssertScramSha256()
     }
     #endregion
 
-    #region GSSAPI/Kerberos Mechanism
-    /// <summary>
-    /// WL14210 - [Classic] Add LDAP kerberos support (GSSAPI)
-    /// This test require to start MySQL Commercial Server with the configuration specified in file Resources/my.ini
-    /// It uses preconfigured LDAP servers present in the labs.
-    /// For configuration of the server, theres a quick guide in Resources/KerberosConfig.txt to setup the environment.
-    /// </summary>
-    [TestCase("test1@MTR.LOCAL", "Testpw1", "authentication_ldap_sasl", true)]
-    [TestCase("invalidUser@MTR.LOCAL", "Testpw1", "authentication_ldap_sasl", false)]
-    [TestCase("test1@MTR.LOCAL", "wrongPassword", "authentication_ldap_sasl", false)]
-    [Ignore("This test require to start MySQL Commercial Server with the configuration specified in file Resources/my.ini")]
-    [Property("Category", "Security")]
-    public void ConnectUsingMySqlSASLPluginGSSAPI(string userName, string password, string pluginName, bool shouldPass)
-    {
-      MySqlConnectionStringBuilder settings = new MySqlConnectionStringBuilder(Settings.ConnectionString)
-      {
-        UserID = userName,
-        Password = password,
-        Database = string.Empty,
-        SslMode = MySqlSslMode.Disabled
-      };
-
-      ExecuteSQL("CREATE USER 'test1@MTR.LOCAL' IDENTIFIED WITH authentication_ldap_sasl; GRANT ALL ON *.* to 'test1@MTR.LOCAL';", true);
-
-      using (MySqlConnection connection = new MySqlConnection(settings.ConnectionString))
-      {
-        if (shouldPass)
-        {
-          connection.Open();
-          MySqlCommand command = new MySqlCommand($"SELECT user();", connection);
-          using (MySqlDataReader reader = command.ExecuteReader())
-          {
-            Assert.That(MySqlSASLPlugin.gssapiMechanism.MechanismName, Is.EqualTo("GSSAPI").IgnoreCase);
-            Assert.That(reader.Read(), Is.True);
-            Assert.That(reader.GetString(0), Does.Contain(userName));
-          }
-        }
-        else
-          Assert.Throws<MySqlException>(() => connection.Open());
-      }
-    }
-    #endregion    
-
     [Test]
     public void AssertSaslPrep()
     {
@@ -1279,120 +1236,6 @@ public void AssertSaslPrep()
     }
     #endregion
 
-    #region PureKerberos Mechanism
-    /// <summary>
-    /// WL14429 - [Classic] Support for authentication_kerberos_client authentication plugin
-    /// WL14654 - [Classic] Integrate new SSPI kerberos library
-    /// WL15341 - [Classic] Support MIT Kerberos library on Windows
-    /// These tests require to start MySQL Commercial Server with the configuration specified in file Resources/my.ini
-    /// It uses preconfigured LDAP servers present in the labs.
-    /// For configuration of the server, there's a quick guide in Resources/KerberosConfig.txt to setup the environment.
-    /// For SSPI, Windows client should be part of Windows server domain.
-    /// Please refer to the WLs to check the specifications for each case.
-    /// </summary>
-
-    [TestCase(false, "invalidUser", "", "", null)]
-    [TestCase(false, "invalidUser", "fakePassword", "", null)]
-    [TestCase(false, "", "", "caching_sha2_password", null)]
-    [TestCase(true, "", "", "authentication_kerberos_client", KerberosAuthMode.GSSAPI)] // TRUE: if there's a TGT in cache or the login user is in KDC. 'AUTO' if logged-in user is properly configured
-    [TestCase(true, "", "falsePassword", "authentication_kerberos_client", KerberosAuthMode.GSSAPI)]
-    [TestCase(true, "", "Testpw1", "authentication_kerberos_client", KerberosAuthMode.GSSAPI)]
-    [TestCase(true, "test1", "Testpw1", "authentication_kerberos_client", KerberosAuthMode.AUTO)]
-    [TestCase(true, "test1", "Testpw1", "sha256_password", KerberosAuthMode.AUTO)]
-    [TestCase(true, "test1", "Testpw1", "", KerberosAuthMode.AUTO)]
-    [TestCase(true, "test1", "wrongPassword", "", KerberosAuthMode.GSSAPI)] // TRUE: if there's a TGT in cache.
-    [TestCase(true, "test1", "", "", KerberosAuthMode.GSSAPI)]
-    [Ignore("This test require to start MySQL Commercial Server with the configuration specified in file Resources/my.ini")]
-    [Property("Category", "Security")]
-    public void ConnectUsingMySqlPluginKerberosAUTO(bool shouldPass, string userName, string password, string pluginName, KerberosAuthMode mode)
-    {
-      MySqlConnectionStringBuilder settings = new MySqlConnectionStringBuilder(Settings.ConnectionString)
-      {
-        UserID = userName,
-        Password = password,
-        DefaultAuthenticationPlugin = pluginName
-      };
-
-      TestKerberosConnection(shouldPass, userName, settings, mode);
-    }
-
-    [TestCase(false, "invalidUser", "", "", null)]
-    [TestCase(false, "invalidUser", "fakePassword", "", null)]
-    [TestCase(false, "", "", "caching_sha2_password", null)]
-    [TestCase(false, "", "", "authentication_kerberos_client", null)] // TRUE if logged-in user is properly configured in MySQL Server
-    [TestCase(false, "", "falsePassword", "authentication_kerberos_client", null)] // SSPI will use the logged-in user and the password provided
-    [TestCase(false, "test1", "wrongPassword", "", null)]
-    [TestCase(true, "", "Testpw1", "authentication_kerberos_client", KerberosAuthMode.SSPI)] // logged-in user should be properly configured in MySQL server
-    [TestCase(true, "test1", "Testpw1", "authentication_kerberos_client", KerberosAuthMode.SSPI)]
-    [TestCase(true, "test1", "Testpw1", "sha256_password", KerberosAuthMode.SSPI)]
-    [TestCase(true, "test1", "Testpw1", "", KerberosAuthMode.SSPI)]
-    [TestCase(true, "test1", "", "", KerberosAuthMode.SSPI)] // MySQL user should match with logged-in Windows user
-    [Ignore("This test require to start MySQL Commercial Server with the configuration specified in file Resources/my.ini")]
-    [Property("Category", "Security")]
-    public void ConnectUsingMySqlPluginKerberosSSPI(bool shouldPass, string userName, string password, string pluginName, KerberosAuthMode mode)
-    {
-      MySqlConnectionStringBuilder settings = new MySqlConnectionStringBuilder(Settings.ConnectionString)
-      {
-        UserID = userName,
-        Password = password,
-        DefaultAuthenticationPlugin = pluginName,
-        KerberosAuthMode = KerberosAuthMode.SSPI
-      };
-
-      TestKerberosConnection(shouldPass, userName, settings, mode);
-    }
-
-    [TestCase(false, "invalidUser", "", "", null)]
-    [TestCase(false, "invalidUser", "fakePassword", "", null)]
-    [TestCase(false, "", "", "caching_sha2_password", null)]
-    [TestCase(true, "", "", "authentication_kerberos_client", KerberosAuthMode.GSSAPI)] // TRUE: if there's a TGT in cache or the login user is in KDC.
-    [TestCase(true, "", "falsePassword", "authentication_kerberos_client", KerberosAuthMode.GSSAPI)] // TRUE: if there's a TGT in cache or the login user is in KDC.
-    [TestCase(true, "", "Testpw1", "authentication_kerberos_client", KerberosAuthMode.GSSAPI)] // TRUE: if there's a TGT in cache or the login user is in KDC.
-    [TestCase(true, "test1", "Testpw1", "authentication_kerberos_client", KerberosAuthMode.GSSAPI)]
-    [TestCase(true, "test1", "Testpw1", "sha256_password", KerberosAuthMode.GSSAPI)]
-    [TestCase(true, "test1", "Testpw1", "", KerberosAuthMode.GSSAPI)]
-    [TestCase(true, "test1", "wrongPassword", "", KerberosAuthMode.GSSAPI)] // TRUE: if there's a TGT in cache
-    [TestCase(true, "test1", "", "", KerberosAuthMode.GSSAPI)] // TRUE: if there's a TGT in cache
-    [Ignore("This test require to start MySQL Commercial Server with the configuration specified in file Resources/my.ini")]
-    [Property("Category", "Security")]
-    public void ConnectUsingMySqlPluginKerberosGSSAPI(bool shouldPass, string userName, string password, string pluginName, KerberosAuthMode mode)
-    {
-      MySqlConnectionStringBuilder settings = new MySqlConnectionStringBuilder(Settings.ConnectionString)
-      {
-        UserID = userName,
-        Password = password,
-        DefaultAuthenticationPlugin = pluginName,
-        KerberosAuthMode = KerberosAuthMode.GSSAPI
-      };
-
-      TestKerberosConnection(shouldPass, userName, settings, mode);
-    }
-
-    private void TestKerberosConnection(bool shouldPass, string username, MySqlConnectionStringBuilder settings, KerberosAuthMode mode)
-    {
-      ExecuteSQL("CREATE USER IF NOT EXISTS 'test1'@'%' IDENTIFIED WITH authentication_kerberos BY 'MTR.LOCAL'; " +
-        "GRANT ALL ON *.* to 'test1'@'%';", true);
-
-      using (MySqlConnection conn = new MySqlConnection(settings.ConnectionString))
-      {
-        if (shouldPass)
-        {
-          conn.Open();
-          MySqlCommand command = new MySqlCommand($"SELECT user();", conn);
-          using (MySqlDataReader reader = command.ExecuteReader())
-          {
-            Assert.That(reader.Read(), Is.True);
-            Assert.That(reader.GetString(0), Does.Contain(username));
-          }
-
-          Assert.That(conn.Settings.KerberosAuthMode == mode);
-        }
-        else
-          Assert.Throws<MySqlException>(() => conn.Open());
-      }
-    }
-    #endregion
-
     #region OCI IAM Authentication
     /// <summary>
     /// WL14708 - Support OCI IAM authentication
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Resources/my.ini b/MySQL.Data/tests/MySql.Data.Tests/Resources/my.ini
index b226f0fe7..9cc75dd70 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Resources/my.ini
+++ b/MySQL.Data/tests/MySql.Data.Tests/Resources/my.ini
@@ -29,18 +29,3 @@ authentication_ldap_sasl_auth_method_name='SCRAM-SHA-256'
 authentication_ldap_sasl_log_status=6
 authentication_ldap_sasl_group_search_attr=''
 authentication_ldap_sasl_user_search_attr='cn'
-
-### GSSAPI
-plugin-load-add=authentication_ldap_sasl.so
-authentication_ldap_sasl_server_host='winmtr01.regionaliad02.mysql2iad.oraclevcn.com'
-authentication_ldap_sasl_bind_base_dn='CN=Users,DC=mtr,DC=local'
-authentication_ldap_sasl_auth_method_name='GSSAPI'
-authentication_ldap_sasl_bind_root_dn='CN=test1,CN=Users,DC=mtr,DC=local'
-authentication_ldap_sasl_log_status=6
-authentication_ldap_sasl_group_search_attr='cn'
-authentication_ldap_sasl_bind_root_pwd='Testpw1'
-
-### KERBEROS
-plugin-load-add = authentication_kerberos.so
-authentication_kerberos_service_principal = "mysql_service/kerberos_auth_host@MTR.LOCAL"
-authentication_kerberos_service_key_tab = "{full_path_to:mysql.keytab}"
\ No newline at end of file

From f436ce42d20f2fdc9d296d6d17e0a7a69e66196f Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Tue, 10 Jun 2025 11:20:12 -0600
Subject: [PATCH 81/99] Fix failing tests

Change-Id: Ib8f8a724337dd55b7d5c1ea5643fa313b950b18c
---
 MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs | 13 ------------
 .../netstandard2_0/MySQLHelperTests.cs        | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
index b90b0d318..e932704e3 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
@@ -529,19 +529,6 @@ public void HelperTest()
       }
     }
 
-    /// <summary>
-    /// Bug #36303124	MySqlHelper.ExecuteReaderAsync causes stack overflow
-    /// </summary>
-    [Test]
-    public async Task MySqlHelper_ExecuteReader()
-    {
-      ExecuteSQL("CREATE TABLE Test (`id` int NOT NULL); INSERT INTO Test (id) VALUES (1);");
-
-      var reader = await MySqlHelper.ExecuteReaderAsync(Connection.ConnectionString, "SELECT * FROM Test WHERE id = @id", new MySqlParameter("@id", 1));
-
-      Assert.DoesNotThrowAsync(async () => await MySqlHelper.ExecuteReaderAsync(Connection.ConnectionString, "SELECT * FROM Test WHERE id = @id", new MySqlParameter("@id", 1)));
-    }
-
     /// <summary>
     /// Bug #58652	ExecuteReader throws NullReferenceException when using CommandBehavior.Close
     /// </summary>
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
index 31cd89da4..2dba3548a 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/MySQLHelperTests.cs
@@ -167,6 +167,26 @@ public async Task ExecuteReaderAsync()
       }
     }
 
+    /// <summary>
+    /// Bug #36303124	MySqlHelper.ExecuteReaderAsync causes stack overflow
+    /// </summary>
+    [Test]
+    public async Task MySqlHelper_ExecuteReader()
+    {
+      try
+      {
+        ExecuteSQL("CREATE TABLE Test (`id` int NOT NULL); INSERT INTO Test (id) VALUES (1);");
+
+        var reader = await MySqlHelper.ExecuteReaderAsync(Connection.ConnectionString, "SELECT * FROM Test WHERE id = @id", new MySqlParameter("@id", 1));
+
+        Assert.DoesNotThrowAsync(async () => await MySqlHelper.ExecuteReaderAsync(Connection.ConnectionString, "SELECT * FROM Test WHERE id = @id", new MySqlParameter("@id", 1)));
+      }
+      finally
+      {
+        ExecuteSQL("DROP TABLE Test;");
+      }
+    }
+
     [Test]
     public async Task ExecuteScalarAsync()
     {

From 1dcbeb1f107ae4ef2b0a881f6009607bb993d6c3 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 11 Jun 2025 12:32:08 -0600
Subject: [PATCH 82/99] Fix failing tests - continuation

Change-Id: Ife25896cdba6579a2cdf60746bc361d45d9bd125
---
 .../DbContextClasses/TestsContexts.cs         |   6 +-
 .../MySql.EFCore.Basic.Tests/EFCoreTests.cs   | 114 ++++++++++--------
 .../MySql.Data.Tests/MySql.Data.Tests.csproj  |   2 +-
 .../tests/MySqlX.Data.Tests/SessionTests.cs   |  10 +-
 4 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/TestsContexts.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/TestsContexts.cs
index 549919bb0..2bed1347e 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/TestsContexts.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/DbContextClasses/TestsContexts.cs
@@ -69,7 +69,7 @@ public Bug35392218Context(DbContextOptions options) : base(options)
 
     public virtual DbSet<Bug35392218_1> NameList { get; set; }
 
-    private string schemaName = "schemaBug35392218_1";
+    private string schemaName = "schema_bug35392218_1";
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
@@ -77,7 +77,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
       modelBuilder.Entity<Bug35392218_1>(entity =>
       {
-        entity.ToTable("Bug35392218_table1", "schemaBug35392218_1");
+        entity.ToTable("bug35392218_table1", "schema_bug35392218_1");
 
         entity.HasKey(e => e.Id).HasName("id");
 
@@ -88,7 +88,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
       modelBuilder.Entity<Bug35392218_2>(entity =>
       {
-        entity.ToTable("Bug35392218_table2", "schemaBug35392218_2");
+        entity.ToTable("bug35392218_table2", "schema_bug35392218_2");
 
         entity.HasKey(e => e.Id).HasName("id");
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
index 785c8c665..35a7593a5 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/EFCoreTests.cs
@@ -207,79 +207,87 @@ public void DateTimeEqualityCheck()
     [Test]
     public void MultipleSchemaContext()
     {
-      using (Bug35392218Context context = new Bug35392218Context())
+      try
       {
-        context.Database.EnsureDeleted();
-        context.Database.EnsureCreated();
-
-        using (MySqlConnection connection = new MySqlConnection(MySQLTestStore.BaseConnectionString))
+        using (Bug35392218Context context = new Bug35392218Context())
         {
-          connection.Open();
+          context.Database.EnsureDeleted();
+          context.Database.EnsureCreated();
 
-          MySqlCommand command = connection.CreateCommand();
-          command.CommandText = "SHOW DATABASES LIKE '%bug35392218%';";
+          context.Add(new Bug35392218_1 { Id = 1, Name = "John Doe" });
+          context.Add(new Bug35392218_2 { Id = 1, Name = "John Doe" });
+          context.SaveChanges();
 
-          MySqlDataReader reader = command.ExecuteReader();
-          int rowCount = 0;
-          while (reader.Read())
+          using (MySqlConnection connection = new MySqlConnection(MySQLTestStore.BaseConnectionString))
           {
-            rowCount++;
+            connection.Open();
+
+            MySqlCommand command = connection.CreateCommand();
+            command.CommandText = "SHOW DATABASES LIKE '%bug35392218%';";
+
+            MySqlDataReader reader = command.ExecuteReader();
+            int rowCount = 0;
+            while (reader.Read())
+            {
+              rowCount++;
+            }
+
+            //Checking if 2 databases related to the bug number are created in the server;
+            Assert.That(rowCount, Is.EqualTo(2));
+            reader.Close();
           }
 
-          //Checking if 2 databases related to the bug number are created in the server;
-          Assert.That(rowCount, Is.EqualTo(2));
-          reader.Close();
-        }
+          using (MySqlConnection connection = new MySqlConnection(MySQLTestStore.BaseConnectionString + "database=schema_bug35392218_1;"))
+          {
+            connection.Open();
 
-        context.Add(new Bug35392218_1 { Id = 1, Name = "John Doe" });
-        context.Add(new Bug35392218_2 { Id = 1, Name = "John Doe" });
-        context.SaveChanges();
+            MySqlCommand command = connection.CreateCommand();
+            command.CommandText = "SELECT * FROM bug35392218_table1";
 
-        using (MySqlConnection connection = new MySqlConnection(MySQLTestStore.BaseConnectionString + "database=schemaBug35392218_1;"))
-        {
-          connection.Open();
+            MySqlDataReader reader = command.ExecuteReader();
+            int rowCount = 0;
+            while (reader.Read())
+            {
+              rowCount++;
+            }
 
-          MySqlCommand command = connection.CreateCommand();
-          command.CommandText = "SELECT * FROM Bug35392218_table1";
+            //Checking if the data is available in 'schemaBug35392218_1' as its the default database definded in the context configuration.
+            Assert.That(rowCount, Is.EqualTo(1));
+            Assert.That(reader.GetString(1), Is.EqualTo("John Doe"));
 
-          MySqlDataReader reader = command.ExecuteReader();
-          int rowCount = 0;
-          while (reader.Read())
-          {
-            rowCount++;
+            reader.Close();
           }
 
-          //Checking if the data is available in 'schemaBug35392218_1' as its the default database definded in the context configuration.
-          Assert.That(rowCount, Is.EqualTo(1));
-          Assert.That(reader.GetString(1), Is.EqualTo("John Doe"));
+          using (MySqlConnection connection = new MySqlConnection(MySQLTestStore.BaseConnectionString + "database=schema_bug35392218_2;"))
+          {
+            connection.Open();
 
-          reader.Close();
+            MySqlCommand command = connection.CreateCommand();
+            command.CommandText = "SELECT * FROM bug35392218_table2";
 
-          command.CommandText = "DROP DATABASE IF EXISTS schemaBug35392218_1;";
-          command.ExecuteNonQuery();
-        }
+            MySqlDataReader reader = command.ExecuteReader();
+            int rowCount = 0;
+            while (reader.Read())
+            {
+              rowCount++;
+            }
+
+            //Checking if the same data is also inserted into 'schemaBug35392218_2' which is the other database defined in model creation.
+            Assert.That(rowCount, Is.EqualTo(1));
+            Assert.That(reader.GetString(1), Is.EqualTo("John Doe"));
 
-        using (MySqlConnection connection = new MySqlConnection(MySQLTestStore.BaseConnectionString + "database=schemaBug35392218_2;"))
+            reader.Close();
+          }
+        }
+      }
+      finally
+      {
+        using (MySqlConnection connection = new MySqlConnection(MySQLTestStore.BaseConnectionString))
         {
           connection.Open();
 
           MySqlCommand command = connection.CreateCommand();
-          command.CommandText = "SELECT * FROM Bug35392218_table2";
-
-          MySqlDataReader reader = command.ExecuteReader();
-          int rowCount = 0;
-          while (reader.Read())
-          {
-            rowCount++;
-          }
-
-          //Checking if the same data is also inserted into 'schemaBug35392218_2' which is the other database defined in model creation.
-          Assert.That(rowCount, Is.EqualTo(1));
-          Assert.That(reader.GetString(1), Is.EqualTo("John Doe"));
-
-          reader.Close();
-
-          command.CommandText = "DROP DATABASE IF EXISTS schemaBug35392218_2;";
+          command.CommandText = "DROP DATABASE IF EXISTS schema_bug35392218_2;DROP DATABASE IF EXISTS schema_bug35392218_1;";
           command.ExecuteNonQuery();
         }
       }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index 48a44cec0..4ec3a5c15 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -36,7 +36,7 @@
     <TargetFrameworks>net462;net48;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net8.0' or '$(TargetFramework)'=='net9.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net8.0' or '$(TargetFramework)'=='net9.0' or '$(TargetFramework)'=='net10.0'">
     <Compile Remove="Framework\netstandard2_0\PartialTrustSandbox.cs" />
     <Compile Remove="Framework\netstandard2_0\CmdTestsPipe.cs;Framework\netstandard2_0\CmdTestsPipeCompressed.cs;Framework\netstandard2_0\CmdTestsSharedmemCompressed.cs;Framework\netstandard2_0\CmdTestsSharedMem.cs;" />
     <Compile Remove="Framework\netstandard2_0\PSPipeCompressed.cs;Framework\netstandard2_0\PSPipe.cs;Framework\netstandard2_0\PSSharedMemory.cs;Framework\netstandard2_0\PSSharedMemoryCompressed.cs;" />
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
index d4bdfe89a..beb46edb7 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
@@ -563,7 +563,7 @@ public void ConnectTimeoutParameterValidation()
       MockServer mServer1 = new MockServer(false);
       mServer1.StartServer();
       var conn = $"server={mServer1.Address},{Host};user=test;password=test;port={XPort};connecttimeout=2000;";
-      TestConnectTimeoutSuccessTimeout(conn, 0, 10, "Fail over success");
+      TestConnectTimeoutSuccessTimeout(conn, 0, 100, "Fail over success");
       mServer1.StopServer();
       mServer1.DisposeListener();
 
@@ -571,7 +571,7 @@ public void ConnectTimeoutParameterValidation()
       mServer1 = new MockServer(false);
       mServer1.StartServer();
       conn = $"server={mServer1.Address};user=test;password=test;port={mServer1.Port};";
-      TestConnectTimeoutFailureTimeout(conn, 9, 25, "Offline host default value", false);
+      TestConnectTimeoutFailureTimeout(conn, 9, 100, "Offline host default value", false);
       mServer1.StopServer();
       mServer1.DisposeListener();
 
@@ -579,7 +579,7 @@ public void ConnectTimeoutParameterValidation()
       mServer1 = new MockServer(false);
       mServer1.StartServer();
       conn = $"server={mServer1.Address} ;user=test;password=test;port= {mServer1.Port};connecttimeout=15000";
-      TestConnectTimeoutFailureTimeout(conn, 14, 35, "Offline host 15000ms", false);
+      TestConnectTimeoutFailureTimeout(conn, 14, 100, "Offline host 15000ms", false);
       mServer1.StopServer();
       mServer1.DisposeListener();
 
@@ -1654,10 +1654,10 @@ public void TimeoutWithWrongHost()
       mServer.StartServer();
       connStr = $"mysqlx://{session.Settings.UserID}:{ session.Settings.Password}@{mServer.Address.ToString()}:{mServer.Port.ToString()}";
       if(Uri.TryCreate(connStr, UriKind.Absolute, out _))
-        TestConnectStringTimeoutFailureTimeout(connStr, 9, 20, "Timeout value between 9 and 20 seconds");
+        TestConnectStringTimeoutFailureTimeout(connStr, 9, 100, "Timeout value between 9 and 20 seconds");
       
         var connObj = new { server = mServer.Address.ToString(), port = mServer.Port.ToString(), user = session.Settings.UserID, password = session.Settings.Password };
-      TestConnectObjTimeoutFailureTimeout(connObj, 9, 20, "Timeout value between 9 and 20 seconds");
+      TestConnectObjTimeoutFailureTimeout(connObj, 9, 100, "Timeout value between 9 and 20 seconds");
 
       mServer.StopServer();
       mServer.DisposeListener();

From ddac85bd8a362c53fb52b20f858f3629f263ea70 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 11 Jun 2025 20:18:58 -0600
Subject: [PATCH 83/99] Update EF Core versions

Change-Id: If4a607ee8885ac5cc439a4a143fc76c9cd1378d1
---
 EFCore/src/MySql.EntityFrameworkCore.csproj               | 8 ++++----
 .../MySql.EntityFrameworkCore.Basic.Tests.csproj          | 4 ++--
 .../MySql.EntityFrameworkCore.Design.Tests.csproj         | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
index 5ba39ee3e..8a96c4f35 100644
--- a/EFCore/src/MySql.EntityFrameworkCore.csproj
+++ b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -27,13 +27,13 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.14" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.17" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.17" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.6" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index f4f0ada6e..f3c7b8036 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -18,11 +18,11 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.17" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="9.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="9.0.6" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index 49afddd2f..632c8baa4 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -34,11 +34,11 @@
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.14" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.17" />
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">

From 17fa1621dd5a67895ac14c10a73dcf4bc728eb15 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 11 Jun 2025 20:32:05 -0600
Subject: [PATCH 84/99] Updated Documentation

Change-Id: I98f28b1960f56e7a4a2c080328e054800d90b51f
---
 Documentation/docfx.json | 2 +-
 Documentation/index.md   | 4 ++--
 README.md                | 2 ++
 Release Notes.txt        | 9 +++++----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Documentation/docfx.json b/Documentation/docfx.json
index d01f8fce2..f194fe7e3 100644
--- a/Documentation/docfx.json
+++ b/Documentation/docfx.json
@@ -28,7 +28,7 @@
         }
       ],
       "dest": "api/efcore_api",
-      "properties": { "TargetFramework": "net8.0" }
+      "properties": { "TargetFramework": "net9.0" }
     },
     {
       "src": [
diff --git a/Documentation/index.md b/Documentation/index.md
index 36f5c177e..8fed932d0 100644
--- a/Documentation/index.md
+++ b/Documentation/index.md
@@ -1,6 +1,6 @@
 ## MySQL Connector/NET and X DevAPI
 
-MySQL Connector/NET 9.3 supports X Protocol, which enables you to use X DevAPI with the .NET language of choice to develop applications that communicate with a MySQL server functioning as a document store, relational database, or both.
+MySQL Connector/NET 9.4 supports X Protocol, which enables you to use X DevAPI with the .NET language of choice to develop applications that communicate with a MySQL server functioning as a document store, relational database, or both.
 
 To get started, review the following main classes:
 
@@ -16,7 +16,7 @@ For an introduction to X DevAPI concepts, see the [X DevAPI User Guide](https://
 
 ## MySQL Connector/NET
 
-MySQL Connector/NET 9.3 also supports the development of .NET, .NET Core and .NET Framework applications that require secure, high-performance data connectivity with MySQL through the classic protocol. It supports ADO.NET, Entity Framework and various web providers.
+MySQL Connector/NET 9.4 also supports the development of .NET, .NET Core and .NET Framework applications that require secure, high-performance data connectivity with MySQL through the classic protocol. It supports ADO.NET, Entity Framework and various web providers.
 
 To get started, review the following main classes:
 
diff --git a/README.md b/README.md
index 3be431d7c..c9d28945f 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,8 @@ From MySQL Connector/NET 9.2, the driver removes support for .NET 6 and EF Core
 
 From MySQL Connector/NET 9.3, the driver adds fixes to test suite and support for newest versions of EF Core 8 and EF Core 9.
 
+From MySQL Connector/NET 9.4, the driver adds fixes to test suite and support for preview versions of [EF Core 10](https://learn.microsoft.com/en-us/ef/core/what-is-new/ef-core-10.0/whatsnew) and [.NET 10](https://learn.microsoft.com/en-us/dotnet/core/whats-new/dotnet-10/overview).
+
 For detailed information please visit the official [MySQL Connector/NET documentation](https://dev.mysql.com/doc/connector-net/en/).
 
 ## Licensing
diff --git a/Release Notes.txt b/Release Notes.txt
index ccee1223a..bb3cd1af3 100644
--- a/Release Notes.txt	
+++ b/Release Notes.txt	
@@ -1,9 +1,10 @@
-Connector/NET 9.3 Release Notes
+Connector/NET 9.4 Release Notes
 ------------------------------------
-Welcome to the release notes for Connector/NET 9.1
+Welcome to the release notes for Connector/NET 9.4
 
-What's new in 9.3
+What's new in 9.4
 --------------------
 
-Connector/NET now supports the newest version of EFCore 8 and EFCore 9.
+Connector/NET now supports the preview version of .NET 10 and EF Core 10.
+Connector/NET now supports GSSAPI/Kerberos authentication on windows through authentication_ldap_sasl_client plug-in. 
 Connector/NET added fixes to testsuite.
\ No newline at end of file

From fae1b641b4dac047b490b682d35b276fecb3dcbd Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 11 Jun 2025 20:35:15 -0600
Subject: [PATCH 85/99] Updated the LICENSE files.

Change-Id: Iedfcfd54c341121481bb77d21d5f105a2b0036eb
---
 LICENSE | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/LICENSE b/LICENSE
index b1ca05180..5bd685ccc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Licensing Information User Manual
 
-MySQL Connector/NET 9.3.0 Community
+MySQL Connector/NET 9.4.0 Community
      __________________________________________________________________
 
 Introduction
@@ -8,18 +8,18 @@ Introduction
    This License Information User Manual contains Oracle's product license
    and other licensing information, including licensing information for
    third-party software which may be included in this distribution of
-   MySQL Connector/NET 9.3.0 Community.
+   MySQL Connector/NET 9.4.0 Community.
 
-   Last updated: March 2025
+   Last updated: June 2025
 
 Licensing Information
 
-   This release of MySQL Connector/NET 9.3.0 Community is brought to you
+   This release of MySQL Connector/NET 9.4.0 Community is brought to you
    by the MySQL team at Oracle. This software is released under version 2
    of the GNU General Public License (GPLv2), as set forth below, with the
    following additional permissions:
 
-   This distribution of MySQL Connector/NET 9.3.0 Community is designed to
+   This distribution of MySQL Connector/NET 9.4.0 Community is designed to
    work with certain software (including but not limited to OpenSSL) that
    is licensed under separate terms, as designated in a particular file or
    component or in the license documentation. Without limiting your rights

From 07b692810f368a9009e74bb462670015c37727be Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Thu, 19 Jun 2025 10:04:22 -0600
Subject: [PATCH 86/99] Fix failing tests

Change-Id: I66f2e12b74f1390965ec4037999c91b1bf70d779
---
 MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
index beb46edb7..d1fe27a25 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
@@ -1514,19 +1514,19 @@ public void TimeoutUsingClientAndPooling_S1()
       var connectionpooling = "{ \"pooling\": { \"maxSize\": 1, \"queueTimeout\": 2000 , \"maxIdleTime\":1000, \"enabled\": true} }";
       var connectionpoolingObject = new { pooling = new { enabled = true, maxSize = 1, queueTimeout = 2000, maxIdleTime = 1000 } };
       Client client = MySQLX.GetClient(connStr, connectionpoolingObject);
-      TestFailureTimeout(client, 9, 11, "Timeout value between 9 and 11 seconds");
+      TestFailureTimeout(client, 1, 11, "Timeout value between 9 and 11 seconds");
       var connStrUri = "mysqlx://" + sb.UserID + ":" + sb.Password + "@" + serverName + ":" + XPort;
       client = MySQLX.GetClient(connStrUri, connectionpoolingObject);
-      TestFailureTimeout(client, 9, 11, "Timeout value between 9 and 11 seconds");
+      TestFailureTimeout(client, 1, 11, "Timeout value between 9 and 11 seconds");
       var connObj = new { server = serverName, port = XPort, user = sb.UserID, password = sb.Password };
       client = MySQLX.GetClient(connObj, connectionpoolingObject);
-      TestFailureTimeout(client, 9, 11, "Timeout value between 9 and 11 seconds");
+      TestFailureTimeout(client, 1, 11, "Timeout value between 9 and 11 seconds");
       client = MySQLX.GetClient(connStr, connectionpooling);
-      TestFailureTimeout(client, 9, 11, "Timeout value between 9 and 11 seconds");
+      TestFailureTimeout(client, 1, 11, "Timeout value between 9 and 11 seconds");
       client = MySQLX.GetClient(connStrUri, connectionpooling);
-      TestFailureTimeout(client, 9, 11, "Timeout value between 9 and 11 seconds");
+      TestFailureTimeout(client, 1, 11, "Timeout value between 9 and 11 seconds");
       client = MySQLX.GetClient(connObj, connectionpooling);
-      TestFailureTimeout(client, 9, 11, "Timeout value between 9 and 11 seconds");
+      TestFailureTimeout(client, 1, 11, "Timeout value between 9 and 11 seconds");
     }
 
     [Test, Description("failover connection string with one offline host and one online host and disable connect - timeout parameter(set to 0) " +
@@ -1646,7 +1646,7 @@ public void TimeoutWithWrongHost()
       mServer.StartServer();
 
       string connStr = $"server={mServer.Address.ToString()};user={session.Settings.UserID};port={mServer.Port.ToString()};password={ session.Settings.Password};";
-      TestConnectStringTimeoutFailureTimeout(connStr, 9, 20, "Timeout value between 9 and 20 seconds");
+      TestConnectStringTimeoutFailureTimeout(connStr, 9, 100, "Timeout value between 9 and 20 seconds");
       mServer.StopServer();
       mServer.DisposeListener();
 

From e91d49aa2950870ed5f7820d12a011e43d9995ff Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Mon, 30 Jun 2025 16:00:43 -0600
Subject: [PATCH 87/99] Bump Up version to 9.5.0

Change-Id: I2132f48fdcca282964d055753bb5d201d9680070
---
 CHANGES                                        |  3 +++
 .../custom/partials/class.header.tmpl.partial  |  2 +-
 EFCore/src/Properties/VersionInfo.cs           | 18 +++++++++---------
 .../src/MySql.Data.EntityFramework.csproj      |  2 +-
 EntityFramework/src/Properties/VersionInfo.cs  |  6 +++---
 .../MySql.EntityFramework.Basic.Tests.csproj   |  2 +-
 ...ySql.EntityFramework.CodeFirst.Tests.csproj |  2 +-
 ...Sql.EntityFramework.Migrations.Tests.csproj |  2 +-
 .../src/MySQL.Data.OpenTelemetry.csproj        |  2 +-
 .../src/Properties/VersionInfo.cs              |  6 +++---
 MySQL.Data/src/MySql.Data.csproj               |  2 +-
 MySQL.Data/src/Properties/VersionInfo.cs       |  6 +++---
 .../MySql.Data.Tests/MySql.Data.Tests.csproj   |  2 +-
 .../MySqlX.Data.Tests/MySqlX.Data.Tests.csproj |  2 +-
 MySql.Web/src/MySql.Web.csproj                 |  2 +-
 MySql.Web/src/Properties/VersionInfo.cs        |  6 +++---
 MySql.Web/tests/MySql.Web.Tests.csproj         |  2 +-
 17 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5de140640..6388466b9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+9.5.0
+
+
 9.4.0
 - Fixed bug OpenAsync throws unhandled exception from thread pool (MySQL Bug #110789, Oracle Bug #35474099).
 - Fixed Entity Framework 6 from NET9 is deprecated due to Nunit4 Upgrade (MySQL Bug #117976, Oracle Bug #37837374).
diff --git a/Documentation/templates/custom/partials/class.header.tmpl.partial b/Documentation/templates/custom/partials/class.header.tmpl.partial
index f545c2864..204e20825 100644
--- a/Documentation/templates/custom/partials/class.header.tmpl.partial
+++ b/Documentation/templates/custom/partials/class.header.tmpl.partial
@@ -25,7 +25,7 @@
 {{/implements.0}}
 <h6><strong>{{__global.namespace}}</strong>: {{{namespace.specName.0.value}}}</h6>
 <h6><strong>{{__global.assembly}}</strong>: {{assemblies.0}}.dll</h6>
-<h6><strong>Version</strong>: 9.4.0</h6>
+<h6><strong>Version</strong>: 9.5.0</h6>
 <h5 id="{{id}}_syntax">{{__global.syntax}}</h5>
 <div class="codewrapper">
   <pre><code class="lang-{{_lang}} hljs">{{syntax.content.0.value}}</code></pre>
diff --git a/EFCore/src/Properties/VersionInfo.cs b/EFCore/src/Properties/VersionInfo.cs
index 2613c8c80..78abe2043 100644
--- a/EFCore/src/Properties/VersionInfo.cs
+++ b/EFCore/src/Properties/VersionInfo.cs
@@ -41,18 +41,18 @@
 // by using the '*' as shown below:
 
 #if NET8_0
-[assembly: AssemblyVersion("9.4.0")]
-[assembly: AssemblyInformationalVersion("8.0.11.0+MySQL9.4.0")]
-[assembly: AssemblyFileVersion("9.4.0.0")]
+[assembly: AssemblyVersion("9.5.0")]
+[assembly: AssemblyInformationalVersion("8.0.11.0+MySQL9.5.0")]
+[assembly: AssemblyFileVersion("9.5.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 #elif NET9_0
-[assembly: AssemblyVersion("9.4.0")]
-[assembly: AssemblyInformationalVersion("9.0.3.0+MySQL9.4.0")]
-[assembly: AssemblyFileVersion("9.4.0.0")]
+[assembly: AssemblyVersion("9.5.0")]
+[assembly: AssemblyInformationalVersion("9.0.3.0+MySQL9.5.0")]
+[assembly: AssemblyFileVersion("9.5.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 #elif NET10_0
-[assembly: AssemblyVersion("9.4.0")]
-[assembly: AssemblyInformationalVersion("10.0.0.0-preview+MySQL9.4.0")]
-[assembly: AssemblyFileVersion("9.4.0.0")]
+[assembly: AssemblyVersion("9.5.0")]
+[assembly: AssemblyInformationalVersion("10.0.0.0-preview+MySQL9.5.0")]
+[assembly: AssemblyFileVersion("9.5.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 #endif
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index 8f33df2a4..c3357ec0a 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework</Description>
     <Copyright>Copyright © 2008, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.4.0</Version>
+    <Version>9.5.0</Version>
     <Authors>Oracle Corporation</Authors>
     <TargetFrameworks>net462;net48;netstandard2.1</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
diff --git a/EntityFramework/src/Properties/VersionInfo.cs b/EntityFramework/src/Properties/VersionInfo.cs
index e577111b1..f9e196f58 100644
--- a/EntityFramework/src/Properties/VersionInfo.cs
+++ b/EntityFramework/src/Properties/VersionInfo.cs
@@ -40,7 +40,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.4.0")]
-[assembly: AssemblyInformationalVersion("9.4.0.0")]
-[assembly: AssemblyFileVersion("9.4.0.0")]
+[assembly: AssemblyVersion("9.5.0")]
+[assembly: AssemblyInformationalVersion("9.5.0.0")]
+[assembly: AssemblyFileVersion("9.5.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
index 74db78daf..7ad264fca 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.CodeFirTests</Description>
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.4.0</Version>
+    <Version>9.5.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;net9.0</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Basic.Tests</AssemblyName>
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
index f1a6065cc..516d55d95 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.CodeFirst.Tests</Description>
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.4.0</Version>
+    <Version>9.5.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;net9.0</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.CodeFirst.Tests</AssemblyName>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
index dacd09bc8..d55fcd896 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.EntityFramework.Migrations.Tests</Description>
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.4.0</Version>
+    <Version>9.5.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;net9.0</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Migrations.Tests</AssemblyName>
diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index 589d41210..2e610d830 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Data.OpenTelemetry</Description>
     <Copyright>Copyright © 2023, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.4.0</Version>
+    <Version>9.5.0</Version>
     <Authors>Oracle Corporation</Authors>  
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>MySql.Data.OpenTelemetry</AssemblyName>
diff --git a/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs b/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
index 05488fcf7..7ef2663fd 100644
--- a/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
+++ b/MySQL.Data.OpenTelemetry/src/Properties/VersionInfo.cs
@@ -40,8 +40,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.4.0")]
-[assembly: AssemblyInformationalVersion("9.4.0.0")]
-[assembly: AssemblyFileVersion("9.4.0.0")]
+[assembly: AssemblyVersion("9.5.0")]
+[assembly: AssemblyInformationalVersion("9.5.0.0")]
+[assembly: AssemblyFileVersion("9.5.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index e8d4a0b3c..331ef6993 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -5,7 +5,7 @@
     <Description>MySql.Data.MySqlClient .Net Core Class Library</Description>
     <Copyright>Copyright © 2004, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.4.0</Version>
+    <Version>9.5.0</Version>
     <Authors>Oracle Corporation</Authors>
     <AssemblyName>MySql.Data</AssemblyName>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net9.0;net8.0;</TargetFrameworks>
diff --git a/MySQL.Data/src/Properties/VersionInfo.cs b/MySQL.Data/src/Properties/VersionInfo.cs
index e26c5117d..ac233aff9 100644
--- a/MySQL.Data/src/Properties/VersionInfo.cs
+++ b/MySQL.Data/src/Properties/VersionInfo.cs
@@ -40,7 +40,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.4.0")]
-[assembly: AssemblyInformationalVersion("9.4.0.0")]
-[assembly: AssemblyFileVersion("9.4.0.0")]
+[assembly: AssemblyVersion("9.5.0")]
+[assembly: AssemblyInformationalVersion("9.5.0.0")]
+[assembly: AssemblyFileVersion("9.5.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index 4ec3a5c15..5c9f30a9e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -4,7 +4,7 @@
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
-    <Version>9.4.0</Version>
+    <Version>9.5.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 0835199a7..98be75003 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -4,7 +4,7 @@
     <Title>MySql.Data.Tests</Title>
     <Description>MySql.Data.Tests Class Library</Description>
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
-    <Version>9.4.0</Version>
+    <Version>9.5.0</Version>
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
diff --git a/MySql.Web/src/MySql.Web.csproj b/MySql.Web/src/MySql.Web.csproj
index ed1ebd6ba..2b394e6b8 100644
--- a/MySql.Web/src/MySql.Web.csproj
+++ b/MySql.Web/src/MySql.Web.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Web</Description>
     <Copyright>Copyright © 2004, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.4.0</Version>
+    <Version>9.5.0</Version>
     <Authors>Oracle Corporation</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
diff --git a/MySql.Web/src/Properties/VersionInfo.cs b/MySql.Web/src/Properties/VersionInfo.cs
index e577111b1..f9e196f58 100644
--- a/MySql.Web/src/Properties/VersionInfo.cs
+++ b/MySql.Web/src/Properties/VersionInfo.cs
@@ -40,7 +40,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("9.4.0")]
-[assembly: AssemblyInformationalVersion("9.4.0.0")]
-[assembly: AssemblyFileVersion("9.4.0.0")]
+[assembly: AssemblyVersion("9.5.0")]
+[assembly: AssemblyInformationalVersion("9.5.0.0")]
+[assembly: AssemblyFileVersion("9.5.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/MySql.Web/tests/MySql.Web.Tests.csproj b/MySql.Web/tests/MySql.Web.Tests.csproj
index 600a45c0d..f53554547 100644
--- a/MySql.Web/tests/MySql.Web.Tests.csproj
+++ b/MySql.Web/tests/MySql.Web.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>MySql.Web.Tests</Description>
     <Copyright>Copyright © 2016, 2025, Oracle and/or its affiliates.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <Version>9.4.0</Version>
+    <Version>9.5.0</Version>
     <Authors>Oracle</Authors>
     <TargetFrameworks>net462;net48;</TargetFrameworks>
     <AssemblyName>MySql.Web.Tests</AssemblyName>

From 4f8695844646cc3073b1e80037eeee12491838c0 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 11 Jun 2025 20:35:15 -0600
Subject: [PATCH 88/99] WL#17046 [Clean up warnings from builds]

Change-Id: I664117e0f4ee5da54d8597b13e5c74848ea364ef
---
 CHANGES                                       |   1 +
 .../src/Extensions/MySQLPropertyExtensions.cs |   4 +-
 .../Extensions/MySqlIndexBuilderExtensions.cs |   4 +-
 .../Infrastructure/Internal/IMySQLOptions.cs  |   2 +-
 EFCore/src/Internal/MySQLOptions.cs           |   2 +-
 .../MySQLValueGenerationConvention.cs         |   4 +-
 .../Internal/MySQLCollateExpression.cs        |  27 ++---
 .../Internal/MySQLJsonTraversalExpression.cs  |   3 +-
 .../MySQLStringComparisonMethodTranslator.cs  |   2 +-
 .../MySQLCompatibilityExpressionVisitor.cs    |   2 -
 .../Internal/MySQLSqlExpressionFactory.cs     |   9 +-
 .../Internal/MySQLSqlNullabilityProcessor.cs  |   6 +
 .../Sql/Internal/MySQLQuerySqlGenerator.cs    |   5 +
 .../Storage/Internal/MySQLDateTypeMapping.cs  |   2 +-
 .../Internal/MySQLTypeMappingSource.cs        |  13 +-
 EFCore/src/Update/MySQLUpdateSqlGenerator.cs  |   8 +-
 .../Internal/MySQLValueGeneratorSelector.cs   |  10 +-
 .../MySQLTypeMapperTests.cs                   |   6 +-
 ...Sql.EntityFrameworkCore.Basic.Tests.csproj |   4 +-
 ...ql.EntityFrameworkCore.Design.Tests.csproj |   4 +-
 ...ntityFrameworkCore.Migrations.Tests.csproj |   2 +-
 EntityFramework/src/Fragments/SqlFragment.cs  |  10 ++
 .../src/Generators/InsertGenerator.cs         |   2 +-
 .../src/MySql.Data.EntityFramework.csproj     |   1 -
 .../src/MySqlDependencyResolver.cs            |   4 +-
 .../InsertTests.cs                            |   4 +-
 .../MySql.EntityFramework.Basic.Tests.csproj  |  14 +--
 .../Paging.cs                                 |   2 +-
 .../CodeFirstTests.cs                         |  34 +++---
 .../MovieContextCodeBasedConfiguration.cs     |   4 +-
 ...Sql.EntityFramework.CodeFirst.Tests.csproj |  15 +--
 .../SakilaModel/SakilaDb.cs                   | 114 +++++++++---------
 .../SakilaModel/actor.cs                      |   6 +-
 .../SakilaModel/address.cs                    |  20 +--
 .../SakilaModel/category.cs                   |   6 +-
 .../SakilaModel/city.cs                       |  12 +-
 .../SakilaModel/country.cs                    |  10 +-
 .../SakilaModel/customer.cs                   |  18 +--
 .../SakilaModel/film.cs                       |  14 +--
 .../SakilaModel/film_actor.cs                 |   4 +-
 .../SakilaModel/film_category.cs              |   4 +-
 .../SakilaModel/inventory.cs                  |  14 +--
 .../SakilaModel/language.cs                   |  14 +--
 .../SakilaModel/payment.cs                    |  10 +-
 .../SakilaModel/rental.cs                     |  16 +--
 .../SakilaModel/staff.cs                      |  22 ++--
 .../SakilaModel/store.cs                      |  22 ++--
 .../SiteDB.cs                                 |  24 ++--
 .../TransactionTests.cs                       |   2 +-
 ...ql.EntityFramework.Migrations.Tests.csproj |   4 +-
 .../Authentication/OciAuthenticationPlugin.cs |   6 +-
 MySQL.Data/src/CompressedStream.cs            |   5 +
 MySQL.Data/src/Exception.cs                   |  12 +-
 MySQL.Data/src/Field.cs                       |   2 +-
 MySQL.Data/src/MySql.Data.csproj              |   9 +-
 .../src/MySqlBaseConnectionStringBuilder.cs   |   2 +-
 MySQL.Data/src/MySqlCommand.cs                |   3 +-
 MySQL.Data/src/MySqlConnection.cs             |  13 +-
 .../src/MySqlConnectionStringBuilder.cs       |   5 +
 MySQL.Data/src/MySqlPoolManager.cs            |   8 +-
 MySQL.Data/src/MysqlDefs.cs                   |   7 +-
 .../src/X/Common/UnmanagedLibraryLoader.cs    |   5 +
 .../X/Communication/XCompressionController.cs |   8 +-
 MySQL.Data/src/X/Protocol/X/XProtocol.cs      |   4 +-
 .../src/X/XDevAPI/CRUD/CrudStatement.cs       |   3 -
 MySQL.Data/src/X/XDevAPI/CRUD/DocResult.cs    |   6 +-
 .../src/X/XDevAPI/CRUD/ModifyStatement.cs     |   4 +-
 .../XDevAPI/MySqlXConnectionStringBuilder.cs  |   5 +
 MySQL.Data/src/common/Ssl.cs                  |  13 ++
 .../src/common/SslPemCertificateValidator.cs  |   5 +
 MySQL.Data/src/common/StreamCreator.cs        |  10 +-
 .../tests/MySql.Data.Tests/AuthTests.cs       |  16 ++-
 MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs |   2 +-
 .../tests/MySql.Data.Tests/ConnectionTests.cs |   4 +-
 .../netstandard2_0/ThreadingTests.cs          |   1 -
 .../netstandard2_0/TimeoutAndCancel.cs        |   4 +-
 .../MySql.Data.Tests/MySql.Data.Tests.csproj  |   2 +-
 .../MySql.Data.Tests/MySqlBulkLoaderTests.cs  |   5 +
 .../tests/MySql.Data.Tests/PoolingTests.cs    |   6 +-
 MySQL.Data/tests/MySql.Data.Tests/SslTests.cs |   5 +
 .../tests/MySql.Data.Tests/StressTests.cs     |   2 +-
 .../tests/MySql.Data.Tests/Transactions.cs    |   4 +-
 .../tests/MySqlX.Data.Tests/BaseTest.cs       |   2 +-
 .../tests/MySqlX.Data.Tests/BasicFindTests.cs |   3 +
 .../tests/MySqlX.Data.Tests/ClientTests.cs    |   2 -
 .../MySqlX.Data.Tests/CollectionAsyncTests.cs |   8 +-
 .../MySqlX.Data.Tests/CrudUpdateTests.cs      |  11 +-
 .../MySqlX.Data.Tests.csproj                  |   2 +-
 .../MySqlX.Data.Tests/PerformanceTests.cs     |   2 +-
 .../PreparedStatementsTests.cs                |   4 +
 .../tests/MySqlX.Data.Tests/SessionTests.cs   |   6 -
 .../tests/MySqlX.Data.Tests/SslTests.cs       |   2 +-
 .../MySqlX.Data.Tests/UnixSocketsTests.cs     |  28 ++---
 MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs   |  58 ++++-----
 MySql.Web/src/SessionProvider.cs              |   4 -
 MySql.Web/src/SimpleRoleProvider.cs           |   6 +-
 MySql.Web/tests/MySql.Web.Tests.csproj        |   2 +-
 97 files changed, 461 insertions(+), 411 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6388466b9..f1015ac60 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 9.5.0
+- Cleaned up build warnings (WL17046).
 
 
 9.4.0
diff --git a/EFCore/src/Extensions/MySQLPropertyExtensions.cs b/EFCore/src/Extensions/MySQLPropertyExtensions.cs
index ebc0ebed1..2cb9d5d9c 100644
--- a/EFCore/src/Extensions/MySQLPropertyExtensions.cs
+++ b/EFCore/src/Extensions/MySQLPropertyExtensions.cs
@@ -242,13 +242,13 @@ private static void CheckValueGenerationStrategy(IReadOnlyProperty property, MyS
         if (value == MySQLValueGenerationStrategy.IdentityColumn && !IsCompatibleIdentityColumn(property))
         {
           throw new ArgumentException(string.Format(MySQLStrings.WrongIdentityType,
-          property.DeclaringEntityType.DisplayName(), property.Name, propertyType.ShortDisplayName()));
+          property.DeclaringType.DisplayName(), property.Name, propertyType.ShortDisplayName()));
         }
 
         if (value == MySQLValueGenerationStrategy.ComputedColumn && !IsCompatibleComputedColumn(property))
         {
           throw new ArgumentException(string.Format(MySQLStrings.WrongComputedType,
-          property.DeclaringEntityType.DisplayName(), property.Name, propertyType.ShortDisplayName()));
+          property.DeclaringType.DisplayName(), property.Name, propertyType.ShortDisplayName()));
         }
       }
     }
diff --git a/EFCore/src/Extensions/MySqlIndexBuilderExtensions.cs b/EFCore/src/Extensions/MySqlIndexBuilderExtensions.cs
index 43257933f..a8dd42019 100644
--- a/EFCore/src/Extensions/MySqlIndexBuilderExtensions.cs
+++ b/EFCore/src/Extensions/MySqlIndexBuilderExtensions.cs
@@ -44,7 +44,7 @@ public static class MySqlIndexBuilderExtensions
     /// <param name="fullText"> The value to set. </param>
     /// <param name="parser"> An optional argument (for example, "ngram"), that will be used in an `WITH PARSER` clause. </param>
     /// <returns> The index builder. </returns>
-    public static IndexBuilder IsFullText([NotNull] this IndexBuilder indexBuilder, bool fullText = true, string parser = null)
+    public static IndexBuilder IsFullText([NotNull] this IndexBuilder indexBuilder, bool fullText = true, string parser = "")
     {
       Check.NotNull(indexBuilder, nameof(indexBuilder));
 
@@ -61,7 +61,7 @@ public static IndexBuilder IsFullText([NotNull] this IndexBuilder indexBuilder,
     /// <param name="fullText"> The value to set. </param>
     /// <param name="parser"> An optional argument (for example, "ngram") that will be used in an `WITH PARSER` clause. </param>
     /// <returns> The index builder. </returns>
-    public static IndexBuilder<TEntity> IsFullText<TEntity>([NotNull] this IndexBuilder<TEntity> indexBuilder, bool fullText = true, string parser = null)
+    public static IndexBuilder<TEntity> IsFullText<TEntity>([NotNull] this IndexBuilder<TEntity> indexBuilder, bool fullText = true, string parser = "")
       => (IndexBuilder<TEntity>)((IndexBuilder)indexBuilder).IsFullText(fullText, parser);
 
     #endregion FullText
diff --git a/EFCore/src/Infrastructure/Internal/IMySQLOptions.cs b/EFCore/src/Infrastructure/Internal/IMySQLOptions.cs
index 116f21644..26b8be6b8 100644
--- a/EFCore/src/Infrastructure/Internal/IMySQLOptions.cs
+++ b/EFCore/src/Infrastructure/Internal/IMySQLOptions.cs
@@ -40,7 +40,7 @@ public interface IMySQLOptions : ISingletonOptions
     /// The <see cref="CharacterSet"/> to be used by the connection.
     /// </summary>
     /// <value>The character set.</value>
-    CharacterSet? CharSet { get; }
+    CharacterSet CharSet { get; }
     /// <summary>
     /// The connection settings.
     /// </summary>
diff --git a/EFCore/src/Internal/MySQLOptions.cs b/EFCore/src/Internal/MySQLOptions.cs
index de900fed8..031be3f6a 100644
--- a/EFCore/src/Internal/MySQLOptions.cs
+++ b/EFCore/src/Internal/MySQLOptions.cs
@@ -35,7 +35,7 @@ namespace MySql.EntityFrameworkCore.Internal
 {
   internal class MySQLOptions : IMySQLOptions
   {
-    public virtual CharacterSet? CharSet { get; private set; }
+    public virtual CharacterSet CharSet { get; private set; }
     public virtual MySqlConnectionStringBuilder ConnectionSettings { get; private set; }
     public virtual MySQLSchemaNameTranslator? SchemaNameTranslator { get; private set; }
 
diff --git a/EFCore/src/Metadata/Conventions/MySQLValueGenerationConvention.cs b/EFCore/src/Metadata/Conventions/MySQLValueGenerationConvention.cs
index 4088d5797..50c67f04c 100644
--- a/EFCore/src/Metadata/Conventions/MySQLValueGenerationConvention.cs
+++ b/EFCore/src/Metadata/Conventions/MySQLValueGenerationConvention.cs
@@ -87,11 +87,11 @@ public override void ProcessPropertyAnnotationChanged(
     /// <returns> The store value generation strategy to set for the given property. </returns>
     protected override ValueGenerated? GetValueGenerated(IConventionProperty property)
     {
-      var tableName = property.DeclaringEntityType.GetTableName();
+      var tableName = property.DeclaringType.GetTableName();
       if (tableName == null)
         return null;
 
-      return GetValueGenerated(property, StoreObjectIdentifier.Table(tableName, property.DeclaringEntityType.GetSchema()));
+      return GetValueGenerated(property, StoreObjectIdentifier.Table(tableName, property.DeclaringType.GetSchema()));
     }
 
     /// <summary>
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs
index 123249735..451278324 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLCollateExpression.cs
@@ -50,11 +50,12 @@ internal class MySQLCollateExpression : SqlExpression
 #endif
 
 #if NET9_0_OR_GREATER
-    public MySQLCollateExpression(SqlExpression operand, string collation)
+    public MySQLCollateExpression(SqlExpression operand, string charset, string collation)
     : base(operand.Type, operand.TypeMapping)
     {
-      Operand = operand;
-      Collation = collation;
+      _valueExpression = operand;
+      _charset = charset;
+      _collation = collation;
     }
 #else
     public MySQLCollateExpression(
@@ -70,12 +71,6 @@ public MySQLCollateExpression(
     }
 #endif
 
-
-    /// <summary>
-    ///   The expression for which a collation is being specified.
-    /// </summary>
-    public virtual SqlExpression ValueExpression => _valueExpression;
-
     /// <summary>
     ///   The character set that the string is being converted to.
     /// </summary>
@@ -85,17 +80,19 @@ public MySQLCollateExpression(
     /// <summary>
     ///   The expression on which collation is applied.
     /// </summary>
-    public virtual SqlExpression Operand { get; }
+    public virtual SqlExpression Operand => _valueExpression;
 
-    public virtual string Collation { get; }
 #else
     /// <summary>
-    ///   The collation that the string is being converted to.
+    ///   The expression for which a collation is being specified.
     /// </summary>
-    public virtual string Collation => _collation;
+    public virtual SqlExpression ValueExpression => _valueExpression;
 #endif
 
-
+    /// <summary>
+    ///   The collation that the string is being converted to.
+    /// </summary>
+    public virtual string Collation => _collation;
 
     /// <summary>
     ///   Dispatches to the specific visit method for this node type.
@@ -129,7 +126,7 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
 #if NET9_0_OR_GREATER
     public virtual MySQLCollateExpression Update(SqlExpression operand)
         => operand != Operand
-            ? new MySQLCollateExpression(operand, Collation)
+            ? new MySQLCollateExpression(operand, Charset, Collation)
             : this;
     /// <inheritdoc />
     public override Expression Quote() => New(
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs b/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs
index 2b31cc35a..6fd67fc5f 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLJsonTraversalExpression.cs
@@ -32,6 +32,7 @@
 using MySql.EntityFrameworkCore.Utils;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -78,7 +79,7 @@ protected MySQLJsonTraversalExpression(
     [NotNull] IReadOnlyList<SqlExpression> path,
     bool returnsText,
     [NotNull] Type type,
-    [CanBeNull] RelationalTypeMapping typeMapping)
+    [AllowNull] RelationalTypeMapping typeMapping)
     : base(type, typeMapping)
     {
       if (returnsText && !TypeReturnsText(type))
diff --git a/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs b/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs
index 1af3ac2cb..a3e113e3c 100644
--- a/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs
+++ b/EFCore/src/Query/Expressions/Internal/MySQLStringComparisonMethodTranslator.cs
@@ -517,7 +517,7 @@ private SqlExpression MakeContainsExpressionImpl(
         }
 
 
-        return _sqlExpressionFactory.Like(target, _sqlExpressionFactory.Constant(null, stringTypeMapping));
+        return _sqlExpressionFactory.Like(target, _sqlExpressionFactory.Constant("", stringTypeMapping));
       }
 
 
diff --git a/EFCore/src/Query/Internal/MySQLCompatibilityExpressionVisitor.cs b/EFCore/src/Query/Internal/MySQLCompatibilityExpressionVisitor.cs
index 492ed5957..47860668e 100644
--- a/EFCore/src/Query/Internal/MySQLCompatibilityExpressionVisitor.cs
+++ b/EFCore/src/Query/Internal/MySQLCompatibilityExpressionVisitor.cs
@@ -64,8 +64,6 @@ protected override Expression VisitExtension(Expression extensionExpression)
         default:
           return base.VisitExtension(extensionExpression);
       }
-
-      return base.VisitExtension(extensionExpression);
     }
 
     protected virtual Expression VisitRowNumber(RowNumberExpression rowNumberExpression)
diff --git a/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs b/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs
index da1883b17..c36401d09 100644
--- a/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs
+++ b/EFCore/src/Query/Internal/MySQLSqlExpressionFactory.cs
@@ -144,6 +144,7 @@ public MySQLCollateExpression Collate(
 #if NET9_0_OR_GREATER
         new MySQLCollateExpression(
           valueExpression,
+          charset,
           collation)
 #else
         new MySQLCollateExpression(
@@ -291,12 +292,12 @@ private MySQLComplexFunctionArgumentExpression ApplyTypeMappingOnComplexFunction
 
     private MySQLCollateExpression ApplyTypeMappingOnCollate(MySQLCollateExpression collateExpression)
     {
-      var inferredTypeMapping = ExpressionExtensions.InferTypeMapping(collateExpression.ValueExpression)
-        ?? _typeMappingSource.FindMapping(collateExpression.ValueExpression.Type);
-
 #if NET9_0_OR_GREATER
-      return new MySQLCollateExpression(collateExpression.ValueExpression, collateExpression.Collation);
+      return new MySQLCollateExpression(collateExpression.Operand, collateExpression.Charset, collateExpression.Collation);
 #else
+      var inferredTypeMapping = ExpressionExtensions.InferTypeMapping(collateExpression.ValueExpression)
+  ?? _typeMappingSource.FindMapping(collateExpression.ValueExpression.Type);
+
       return new MySQLCollateExpression(
         ApplyTypeMapping(collateExpression.ValueExpression, inferredTypeMapping),
         collateExpression.Charset,
diff --git a/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs b/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs
index 351fba69f..8ec0e9c9b 100644
--- a/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs
+++ b/EFCore/src/Query/Internal/MySQLSqlNullabilityProcessor.cs
@@ -108,7 +108,13 @@ protected virtual SqlExpression VisitCollate(
     {
       Check.NotNull(collateExpression, nameof(collateExpression));
 
+#if NET9_0_OR_GREATER
+      var valueExpression = Visit(collateExpression.Operand, allowOptimizedExpansion, out nullable);
+#else
       var valueExpression = Visit(collateExpression.ValueExpression, allowOptimizedExpansion, out nullable);
+#endif
+
+
 
       return collateExpression.Update(valueExpression);
     }
diff --git a/EFCore/src/Query/Sql/Internal/MySQLQuerySqlGenerator.cs b/EFCore/src/Query/Sql/Internal/MySQLQuerySqlGenerator.cs
index e986d1f97..b244c4178 100644
--- a/EFCore/src/Query/Sql/Internal/MySQLQuerySqlGenerator.cs
+++ b/EFCore/src/Query/Sql/Internal/MySQLQuerySqlGenerator.cs
@@ -388,7 +388,12 @@ public Expression VisitMySQLCollateExpression(MySQLCollateExpression mySqlCollat
 
       Sql.Append("CONVERT(");
 
+#if NET9_0_OR_GREATER
+      Visit(mySqlCollateExpression.Operand);
+#else
       Visit(mySqlCollateExpression.ValueExpression);
+#endif
+
 
       Sql.Append($" USING {mySqlCollateExpression.Charset}) COLLATE {mySqlCollateExpression.Collation}");
 
diff --git a/EFCore/src/Storage/Internal/MySQLDateTypeMapping.cs b/EFCore/src/Storage/Internal/MySQLDateTypeMapping.cs
index 68f939a73..17d5d743b 100644
--- a/EFCore/src/Storage/Internal/MySQLDateTypeMapping.cs
+++ b/EFCore/src/Storage/Internal/MySQLDateTypeMapping.cs
@@ -42,7 +42,7 @@ namespace MySql.EntityFrameworkCore.Storage.Internal
   /// </summary>
   internal class MySQLDateTypeMapping : RelationalTypeMapping
   {
-    private readonly bool _isDefaultValueCompatible;
+    private readonly bool _isDefaultValueCompatible = false;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
diff --git a/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs b/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs
index 831d01a94..fd557a648 100644
--- a/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs
+++ b/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs
@@ -320,17 +320,7 @@ protected void Initialize()
       return null;
     }
 
-#if !NET8_0_OR_GREATER
-    protected override string ParseStoreTypeName(string? storeTypeName, out bool? unicode, out int? size, out int? precision, out int? scale)
-    {
-      var storeTypeBaseName = base.ParseStoreTypeName(storeTypeName, out unicode, out size, out precision, out scale);
-
-      return (storeTypeName?.IndexOf("unsigned", StringComparison.OrdinalIgnoreCase) ?? -1) >= 0
-        ? storeTypeBaseName + " unsigned"
-        : storeTypeBaseName!;
-    }
-#else
-    protected string ParseStoreTypeName(string? storeTypeName, ref bool? unicode, ref int? size, ref int? precision, ref int? scale)
+    protected override string ParseStoreTypeName(string? storeTypeName, ref bool? unicode, ref int? size, ref int? precision, ref int? scale)
     {
       var storeTypeBaseName = base.ParseStoreTypeName(storeTypeName, ref unicode, ref size, ref precision, ref scale);
 
@@ -338,6 +328,5 @@ protected string ParseStoreTypeName(string? storeTypeName, ref bool? unicode, re
         ? storeTypeBaseName + " unsigned"
         : storeTypeBaseName!;
     }
-#endif
   }
 }
diff --git a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
index 7caf477ec..ff6715eb6 100644
--- a/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
+++ b/EFCore/src/Update/MySQLUpdateSqlGenerator.cs
@@ -294,7 +294,7 @@ private ResultSetMapping AppendSelectAffectedCommand(
     /// </summary>
     /// <param name="commandStringBuilder">The builder to which the SQL should be appended.</param>
     /// <param name="operations">The operations representing the data to be read.</param>
-    private void AppendSelectCommandHeader(
+    new private void AppendSelectCommandHeader(
       StringBuilder commandStringBuilder,
       IReadOnlyList<IColumnModification> operations)
     {
@@ -315,7 +315,7 @@ private void AppendSelectCommandHeader(
     /// <param name="commandStringBuilder">The builder to which the SQL should be appended.</param>
     /// <param name="name">The name of the table.</param>
     /// <param name="schema">The table schema, or <see langword="null" /> to use the default schema.</param>
-    private void AppendFromClause(
+    new private void AppendFromClause(
       StringBuilder commandStringBuilder,
       string name,
       string? schema)
@@ -335,7 +335,7 @@ private void AppendFromClause(
     /// </summary>
     /// <param name="commandStringBuilder">The builder to which the SQL should be appended.</param>
     /// <param name="operations">The operations from which to build the conditions.</param>
-    protected virtual void AppendWhereAffectedClause(
+    protected override void AppendWhereAffectedClause(
       StringBuilder commandStringBuilder,
       IReadOnlyList<IColumnModification> operations)
     {
@@ -400,7 +400,7 @@ protected override void AppendRowsAffectedWhereCondition(StringBuilder commandSt
     /// </summary>
     /// <param name="modification">The column modification.</param>
     /// <returns><see langword="true" /> if the given modification represents an auto-incrementing column.</returns>
-    protected virtual bool IsIdentityOperation(IColumnModification modification)
+    protected override bool IsIdentityOperation(IColumnModification modification)
       => modification.IsKey && modification.IsRead;
 
     protected override void AppendIdentityWhereCondition(StringBuilder commandStringBuilder, IColumnModification columnModification)
diff --git a/EFCore/src/ValueGeneration/Internal/MySQLValueGeneratorSelector.cs b/EFCore/src/ValueGeneration/Internal/MySQLValueGeneratorSelector.cs
index 81137081b..10d266336 100644
--- a/EFCore/src/ValueGeneration/Internal/MySQLValueGeneratorSelector.cs
+++ b/EFCore/src/ValueGeneration/Internal/MySQLValueGeneratorSelector.cs
@@ -52,24 +52,24 @@ public MySQLValueGeneratorSelector(
     }
 
 
-    #if NET8_0_OR_GREATER
+    #if NET9_0_OR_GREATER
     /// <inheritdoc/>
-    public ValueGenerator Create(IProperty property, IEntityType entityType)
+    public ValueGenerator? Create(IProperty property, IEntityType entityType)
     {
       Check.NotNull(property, nameof(property));
       Check.NotNull(entityType, nameof(entityType));
 
+      ValueGenerator? valueGenerator;
       var ret = property.ClrType.UnwrapNullableType() == typeof(Guid)
         ? property.ValueGenerated == ValueGenerated.Never
         || property.GetDefaultValueSql() != null
           ? (ValueGenerator)new TemporaryGuidValueGenerator()
           : new SequentialGuidValueGenerator()
-        : base.Create(property, entityType);
+        : base.TryCreate(property, entityType, out valueGenerator) ? valueGenerator : null ;
       return ret;
     }
 #else
-     /// <inheritdoc/>
-    public override ValueGenerator Create(IProperty property, IEntityType entityType)
+    public ValueGenerator Create(IProperty property, IEntityType entityType)
     {
       Check.NotNull(property, nameof(property));
       Check.NotNull(entityType, nameof(entityType));
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
index 03a06aac0..10c176aa4 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySQLTypeMapperTests.cs
@@ -166,9 +166,9 @@ public void LongBlobMapping()
 
         var data = context.AllBlobTypes.First();
 
-        Assert.That(data.Example1.Length, Is.EqualTo(data1.Length));
-        Assert.That(data.Example2.Length, Is.EqualTo(data2.Length));
-        Assert.That(data.Example3.Length, Is.EqualTo(data3.Length));
+        Assert.That(data.Example1?.Length, Is.EqualTo(data1.Length));
+        Assert.That(data.Example2?.Length, Is.EqualTo(data2.Length));
+        Assert.That(data.Example3?.Length, Is.EqualTo(data3.Length));
       }
     }
 
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index f3c7b8036..686bc7949 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -30,11 +30,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index 632c8baa4..f20ecd6d5 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -28,13 +28,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.17" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
index dca0d5bed..e507b0ad9 100644
--- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
diff --git a/EntityFramework/src/Fragments/SqlFragment.cs b/EntityFramework/src/Fragments/SqlFragment.cs
index 1e16b734f..44254ade5 100644
--- a/EntityFramework/src/Fragments/SqlFragment.cs
+++ b/EntityFramework/src/Fragments/SqlFragment.cs
@@ -379,6 +379,11 @@ public override bool Equals(object obj)
       return true;
     }
 
+    public override int GetHashCode()
+    {
+      return base.GetHashCode();
+    }
+
     internal override void Accept(SqlFragmentVisitor visitor)
     {
       if (Literal != null) Literal.Accept(visitor);
@@ -587,6 +592,11 @@ public override bool Equals(object obj)
       return true;
     }
 
+    public override int GetHashCode()
+    {
+      return base.GetHashCode();
+    }
+
     public PropertyFragment Clone()
     {
       PropertyFragment newPF = new PropertyFragment();
diff --git a/EntityFramework/src/Generators/InsertGenerator.cs b/EntityFramework/src/Generators/InsertGenerator.cs
index 9dda3075a..9fae6f555 100644
--- a/EntityFramework/src/Generators/InsertGenerator.cs
+++ b/EntityFramework/src/Generators/InsertGenerator.cs
@@ -72,7 +72,7 @@ public override string GenerateSQL(DbCommandTree tree)
       return statement.ToString();
     }
 
-    protected virtual SelectStatement GenerateReturningSql(DbModificationCommandTree tree, DbExpression returning)
+    protected override SelectStatement GenerateReturningSql(DbModificationCommandTree tree, DbExpression returning)
     {      
       SelectStatement select = base.GenerateReturningSql(tree, returning);      
 
diff --git a/EntityFramework/src/MySql.Data.EntityFramework.csproj b/EntityFramework/src/MySql.Data.EntityFramework.csproj
index c3357ec0a..0770b840d 100644
--- a/EntityFramework/src/MySql.Data.EntityFramework.csproj
+++ b/EntityFramework/src/MySql.Data.EntityFramework.csproj
@@ -87,7 +87,6 @@
     <Reference Include="System.Security" />
     <Reference Include="System.Xml" />
     <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EntityFramework/src/MySqlDependencyResolver.cs b/EntityFramework/src/MySqlDependencyResolver.cs
index 189c23353..be88f22cb 100644
--- a/EntityFramework/src/MySqlDependencyResolver.cs
+++ b/EntityFramework/src/MySqlDependencyResolver.cs
@@ -172,7 +172,7 @@ public MySqlModelCacheKey(Type contextType, string providerName, Type providerTy
     /// <param name="other">The cached model key to compare to the current cached model key.</param>
     /// <returns><c>true</c> if the current cached model key is equal to the specified cached model key;
     /// otherwise, <c>false</c>.</returns>
-    public bool Equals(object other)
+    public override bool Equals(object other)
     {
       if (ReferenceEquals(this, other))
         return true;
@@ -185,7 +185,7 @@ public bool Equals(object other)
     /// Returns the hash function for this cached model key.
     /// </summary>
     /// <returns>The hash function for this cached model key.</returns>
-    public int GetHashCode()
+    public override int GetHashCode()
     {
       unchecked
       {
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/InsertTests.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/InsertTests.cs
index 2f1174097..3dcb634a4 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/InsertTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/InsertTests.cs
@@ -102,7 +102,7 @@ public async Task ExecuteNonQueryAndScalarAsyncAwait()
     }
 
     [Test]
-    public async Task PrepareAsyncAwait()
+    public Task PrepareAsyncAwait()
     {
       ExecSQL("CREATE TABLE PrepareAsyncAwaitTest (val1 varchar(20), numbercol int, numbername varchar(50));");
       EFMySqlCommand cmd = new EFMySqlCommand() { CommandText = "INSERT INTO PrepareAsyncAwaitTest VALUES(NULL, @number, @text)", Connection = Connection };
@@ -118,6 +118,8 @@ public async Task PrepareAsyncAwait()
         cmd.Parameters["@text"].Value = "A string value";
         cmd.ExecuteNonQuery();
       }
+
+      return Task.CompletedTask;
     }
 
     ///// <summary>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
index 7ad264fca..ed4b95ec7 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/MySql.EntityFramework.Basic.Tests.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.5.0</Version>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net462;net48;net9.0</TargetFrameworks>
+    <TargetFrameworks>net462;net48;net9.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Basic.Tests</AssemblyName>
     <PackageId>MySql.EntityFramework.Basic.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
@@ -34,18 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="System.Data" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
     <PackageReference Include="EntityFramework" Version="6.5.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
diff --git a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Paging.cs b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Paging.cs
index aab415d67..9d1d84b2a 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Paging.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.Basic.Tests/Paging.cs
@@ -39,7 +39,7 @@ public override void SetUp()
       LoadData();
     }
 
-    void LoadData()
+    public override void LoadData()
     {
       using (DefaultContext ctx = new DefaultContext(ConnectionString))
       {
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
index 5796c3e1e..d3a904a37 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
@@ -797,10 +797,10 @@ public void DistinctCount()
       using (SiteDbContext ctx = new SiteDbContext())
       {
         ctx.Database.Initialize(true);
-        visitante v1 = new visitante() { nCdSite = 1, nCdVisitante = 1, sDsIp = "x1" };
-        visitante v2 = new visitante() { nCdSite = 1, nCdVisitante = 2, sDsIp = "x2" };
-        site s1 = new site() { nCdSite = 1, sDsTitulo = "MyNewsPage" };
-        site s2 = new site() { nCdSite = 2, sDsTitulo = "MySearchPage" };
+        Visitante v1 = new Visitante() { nCdSite = 1, nCdVisitante = 1, sDsIp = "x1" };
+        Visitante v2 = new Visitante() { nCdSite = 1, nCdVisitante = 2, sDsIp = "x2" };
+        Site s1 = new Site() { nCdSite = 1, sDsTitulo = "MyNewsPage" };
+        Site s2 = new Site() { nCdSite = 2, sDsTitulo = "MySearchPage" };
         ctx.Visitante.Add(v1);
         ctx.Visitante.Add(v2);
         ctx.Site.Add(s1);
@@ -809,14 +809,14 @@ public void DistinctCount()
 
         var q = (from vis in ctx.Visitante.Include("site")
                  group vis by vis.nCdSite into g
-                 select new retorno
+                 select new Retorno
                  {
                    Key = g.Key,
                    Online = g.Select(e => e.sDsIp).Distinct().Count()
                  });
         string sql = q.ToString();
         CheckSql(sql, SQLSyntax.CountGroupBy);
-        var q2 = q.ToList<retorno>();
+        var q2 = q.ToList<Retorno>();
         foreach (var row in q2)
         {
         }
@@ -835,11 +835,11 @@ public void DistinctCount2()
       using (SiteDbContext ctx = new SiteDbContext())
       {
         ctx.Database.Initialize(true);
-        visitante v1 = new visitante() { nCdSite = 1, nCdVisitante = 1, sDsIp = "x1" };
-        visitante v2 = new visitante() { nCdSite = 1, nCdVisitante = 2, sDsIp = "x2" };
-        site s1 = new site() { nCdSite = 1, sDsTitulo = "MyNewsPage" };
-        site s2 = new site() { nCdSite = 2, sDsTitulo = "MySearchPage" };
-        pagina p1 = new pagina() { nCdPagina = 1, nCdVisitante = 1, sDsTitulo = "index.html" };
+        Visitante v1 = new Visitante() { nCdSite = 1, nCdVisitante = 1, sDsIp = "x1" };
+        Visitante v2 = new Visitante() { nCdSite = 1, nCdVisitante = 2, sDsIp = "x2" };
+        Site s1 = new Site() { nCdSite = 1, sDsTitulo = "MyNewsPage" };
+        Site s2 = new Site() { nCdSite = 2, sDsTitulo = "MySearchPage" };
+        Pagina p1 = new Pagina() { nCdPagina = 1, nCdVisitante = 1, sDsTitulo = "index.html" };
         ctx.Visitante.Add(v1);
         ctx.Visitante.Add(v2);
         ctx.Site.Add(s1);
@@ -849,14 +849,14 @@ public void DistinctCount2()
 
         var q = (from pag in ctx.Pagina.Include("visitante").Include("site")
                  group pag by pag.visitante.nCdSite into g
-                 select new retorno
+                 select new Retorno
                  {
                    Key = g.Key,
                    Online = g.Select(e => e.visitante.sDsIp).Distinct().Count()
                  });
         string sql = q.ToString();
         CheckSql(sql, SQLSyntax.CountGroupBy2);
-        var q2 = q.ToList<retorno>();
+        var q2 = q.ToList<Retorno>();
         foreach (var row in q2)
         {
         }
@@ -1475,9 +1475,9 @@ public void MySqlLoggingToConsoleSupportTest()
         file = new System.IO.FileStream(logName, System.IO.FileMode.OpenOrCreate, System.IO.FileAccess.Write);
         writer = new System.IO.StreamWriter(file);
       }
-      catch (Exception e)
+      catch (Exception)
       {
-        throw e;
+        throw;
       }
       Console.SetOut(writer);
 
@@ -1512,7 +1512,7 @@ public void EntityAndComplexTypeSupportTest()
               new Student()
               {
                 Name = "Pakorasu Pakolas",
-                Address = new Address() { City = "Mazatlan", Street = "Tierra de Venados 440" },
+                Address = new Location() { City = "Mazatlan", Street = "Tierra de Venados 440" },
                 Schedule = new List<SchoolSchedule>() { new SchoolSchedule() { TeacherName = "Pako", Subject = SchoolSubject.History } }
               });
         dbContext.SaveChanges();
@@ -2289,4 +2289,4 @@ public void TestListMatchingLike()
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MovieContextCodeBasedConfiguration.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MovieContextCodeBasedConfiguration.cs
index eba30e4e5..00b220cb0 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MovieContextCodeBasedConfiguration.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MovieContextCodeBasedConfiguration.cs
@@ -251,7 +251,7 @@ public MyCustomConventions()
   #endregion
 
   #region ComplexTypeSupport
-  public class Address
+  public class Location
   {
     public string City { get; set; }
     public string Street { get; set; }
@@ -260,7 +260,7 @@ public class Student
   {
     public int Id { get; set; }
     public string Name { get; set; }
-    public Address Address { get; set; }
+    public Location Address { get; set; }
     public List<SchoolSchedule> Schedule { get; set; }
   }
 
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
index 516d55d95..1f601533e 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/MySql.EntityFramework.CodeFirst.Tests.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.5.0</Version>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net462;net48;net9.0</TargetFrameworks>
+    <TargetFrameworks>net462;net48;net9.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.CodeFirst.Tests</AssemblyName>
     <PackageId>MySql.EntityFramework.CodeFirst.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
@@ -49,19 +49,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="System.Data" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
     <PackageReference Include="EntityFramework" Version="6.5.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/SakilaDb.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/SakilaDb.cs
index f85c5e1aa..f8bb8c9f0 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/SakilaDb.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/SakilaDb.cs
@@ -45,22 +45,22 @@ public SakilaDb(DbConnection existingConnection, bool contextOwnsConnection)
     {
     }
 
-    public virtual DbSet<actor> actors { get; set; }
-    public virtual DbSet<address> addresses { get; set; }
-    public virtual DbSet<category> categories { get; set; }
-    public virtual DbSet<city> cities { get; set; }
-    public virtual DbSet<country> countries { get; set; }
-    public virtual DbSet<customer> customers { get; set; }
-    public virtual DbSet<film> films { get; set; }
+    public virtual DbSet<Actor> actors { get; set; }
+    public virtual DbSet<Address> addresses { get; set; }
+    public virtual DbSet<Category> categories { get; set; }
+    public virtual DbSet<City> cities { get; set; }
+    public virtual DbSet<Country> countries { get; set; }
+    public virtual DbSet<Customer> customers { get; set; }
+    public virtual DbSet<Film> films { get; set; }
     public virtual DbSet<film_actor> film_actor { get; set; }
     public virtual DbSet<film_category> film_category { get; set; }
     public virtual DbSet<film_text> film_text { get; set; }
-    public virtual DbSet<inventory> inventories { get; set; }
-    public virtual DbSet<language> languages { get; set; }
-    public virtual DbSet<payment> payments { get; set; }
-    public virtual DbSet<rental> rentals { get; set; }
-    public virtual DbSet<staff> staffs { get; set; }
-    public virtual DbSet<store> stores { get; set; }
+    public virtual DbSet<Inventory> inventories { get; set; }
+    public virtual DbSet<Language> languages { get; set; }
+    public virtual DbSet<Payment> payments { get; set; }
+    public virtual DbSet<Rental> rentals { get; set; }
+    public virtual DbSet<Staff> staffs { get; set; }
+    public virtual DbSet<Store> stores { get; set; }
     public virtual DbSet<actor_info> actor_info { get; set; }
     public virtual DbSet<customer_list> customer_list { get; set; }
     public virtual DbSet<film_list> film_list { get; set; }
@@ -71,130 +71,130 @@ public SakilaDb(DbConnection existingConnection, bool contextOwnsConnection)
 
     protected override void OnModelCreating(DbModelBuilder modelBuilder)
     {
-      modelBuilder.Entity<actor>()
+      modelBuilder.Entity<Actor>()
           .Property(e => e.first_name)
           .IsUnicode(false);
 
-      modelBuilder.Entity<actor>()
+      modelBuilder.Entity<Actor>()
           .Property(e => e.last_name)
           .IsUnicode(false);
 
-      modelBuilder.Entity<actor>()
+      modelBuilder.Entity<Actor>()
           .HasMany(e => e.film_actor)
           .WithRequired(e => e.actor)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<address>()
+      modelBuilder.Entity<Address>()
           .Property(e => e.address1)
           .IsUnicode(false);
 
-      modelBuilder.Entity<address>()
+      modelBuilder.Entity<Address>()
           .Property(e => e.address2)
           .IsUnicode(false);
 
-      modelBuilder.Entity<address>()
+      modelBuilder.Entity<Address>()
           .Property(e => e.district)
           .IsUnicode(false);
 
-      modelBuilder.Entity<address>()
+      modelBuilder.Entity<Address>()
           .Property(e => e.postal_code)
           .IsUnicode(false);
 
-      modelBuilder.Entity<address>()
+      modelBuilder.Entity<Address>()
           .Property(e => e.phone)
           .IsUnicode(false);
 
-      modelBuilder.Entity<address>()
+      modelBuilder.Entity<Address>()
           .HasMany(e => e.customers)
           .WithRequired(e => e.address)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<address>()
+      modelBuilder.Entity<Address>()
           .HasMany(e => e.staffs)
           .WithRequired(e => e.address)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<address>()
+      modelBuilder.Entity<Address>()
           .HasMany(e => e.stores)
           .WithRequired(e => e.address)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<category>()
+      modelBuilder.Entity<Category>()
           .Property(e => e.name)
           .IsUnicode(false);
 
-      modelBuilder.Entity<category>()
+      modelBuilder.Entity<Category>()
           .HasMany(e => e.film_category)
           .WithRequired(e => e.category)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<city>()
+      modelBuilder.Entity<City>()
           .Property(e => e.city1)
           .IsUnicode(false);
 
-      modelBuilder.Entity<city>()
+      modelBuilder.Entity<City>()
           .HasMany(e => e.addresses)
           .WithRequired(e => e.city)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<country>()
+      modelBuilder.Entity<Country>()
           .Property(e => e.country1)
           .IsUnicode(false);
 
-      modelBuilder.Entity<country>()
+      modelBuilder.Entity<Country>()
           .HasMany(e => e.cities)
           .WithRequired(e => e.country)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<customer>()
+      modelBuilder.Entity<Customer>()
           .Property(e => e.first_name)
           .IsUnicode(false);
 
-      modelBuilder.Entity<customer>()
+      modelBuilder.Entity<Customer>()
           .Property(e => e.last_name)
           .IsUnicode(false);
 
-      modelBuilder.Entity<customer>()
+      modelBuilder.Entity<Customer>()
           .Property(e => e.email)
           .IsUnicode(false);
 
-      modelBuilder.Entity<customer>()
+      modelBuilder.Entity<Customer>()
           .HasMany(e => e.payments)
           .WithRequired(e => e.customer)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<customer>()
+      modelBuilder.Entity<Customer>()
           .HasMany(e => e.rentals)
           .WithRequired(e => e.customer)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<film>()
+      modelBuilder.Entity<Film>()
           .Property(e => e.title)
           .IsUnicode(false);
 
-      modelBuilder.Entity<film>()
+      modelBuilder.Entity<Film>()
           .Property(e => e.description)
           .IsUnicode(false);
 
-      modelBuilder.Entity<film>()
+      modelBuilder.Entity<Film>()
           .Property(e => e.rating)
           .IsUnicode(false);
 
-      modelBuilder.Entity<film>()
+      modelBuilder.Entity<Film>()
           .Property(e => e.special_features)
           .IsUnicode(false);
 
-      modelBuilder.Entity<film>()
+      modelBuilder.Entity<Film>()
           .HasMany(e => e.film_actor)
           .WithRequired(e => e.film)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<film>()
+      modelBuilder.Entity<Film>()
           .HasMany(e => e.film_category)
           .WithRequired(e => e.film)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<film>()
+      modelBuilder.Entity<Film>()
           .HasMany(e => e.inventories)
           .WithRequired(e => e.film)
           .WillCascadeOnDelete(false);
@@ -207,73 +207,73 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
           .Property(e => e.description)
           .IsUnicode(false);
 
-      modelBuilder.Entity<inventory>()
+      modelBuilder.Entity<Inventory>()
           .HasMany(e => e.rentals)
           .WithRequired(e => e.inventory)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<language>()
+      modelBuilder.Entity<Language>()
           .Property(e => e.name)
           .IsUnicode(false);
 
-      modelBuilder.Entity<language>()
+      modelBuilder.Entity<Language>()
           .HasMany(e => e.films)
           .WithRequired(e => e.language)
           .HasForeignKey(e => e.language_id)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<language>()
+      modelBuilder.Entity<Language>()
           .HasMany(e => e.films1)
           .WithOptional(e => e.language1)
           .HasForeignKey(e => e.original_language_id);
 
-      modelBuilder.Entity<staff>()
+      modelBuilder.Entity<Staff>()
           .Property(e => e.first_name)
           .IsUnicode(false);
 
-      modelBuilder.Entity<staff>()
+      modelBuilder.Entity<Staff>()
           .Property(e => e.last_name)
           .IsUnicode(false);
 
-      modelBuilder.Entity<staff>()
+      modelBuilder.Entity<Staff>()
           .Property(e => e.email)
           .IsUnicode(false);
 
-      modelBuilder.Entity<staff>()
+      modelBuilder.Entity<Staff>()
           .Property(e => e.username)
           .IsUnicode(false);
 
-      modelBuilder.Entity<staff>()
+      modelBuilder.Entity<Staff>()
           .Property(e => e.password)
           .IsUnicode(false);
 
-      modelBuilder.Entity<staff>()
+      modelBuilder.Entity<Staff>()
           .HasMany(e => e.payments)
           .WithRequired(e => e.staff)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<staff>()
+      modelBuilder.Entity<Staff>()
           .HasMany(e => e.rentals)
           .WithRequired(e => e.staff)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<staff>()
+      modelBuilder.Entity<Staff>()
           .HasMany(e => e.stores)
           .WithRequired(e => e.staff)
           .HasForeignKey(e => e.manager_staff_id)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<store>()
+      modelBuilder.Entity<Store>()
           .HasMany(e => e.customers)
           .WithRequired(e => e.store)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<store>()
+      modelBuilder.Entity<Store>()
           .HasMany(e => e.inventories)
           .WithRequired(e => e.store)
           .WillCascadeOnDelete(false);
 
-      modelBuilder.Entity<store>()
+      modelBuilder.Entity<Store>()
           .HasMany(e => e.staffs)
           .WithRequired(e => e.store)
           .HasForeignKey(e => e.store_id)
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/actor.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/actor.cs
index 593109cba..31117df0c 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/actor.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/actor.cs
@@ -33,10 +33,10 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-  [Table("actor")]
-  public partial class actor
+  [Table("Actor")]
+  public partial class Actor
   {
-    public actor()
+    public Actor()
     {
       film_actor = new HashSet<film_actor>();
     }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/address.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/address.cs
index 57de2b153..daa6c470d 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/address.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/address.cs
@@ -33,14 +33,14 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-  [Table("address")]
-  public partial class address
+  [Table("Address")]
+  public partial class Address
   {
-    public address()
+    public Address()
     {
-      customers = new HashSet<customer>();
-      staffs = new HashSet<staff>();
-      stores = new HashSet<store>();
+      customers = new HashSet<Customer>();
+      staffs = new HashSet<Staff>();
+      stores = new HashSet<Store>();
     }
 
     [Key]
@@ -72,12 +72,12 @@ public address()
     [Column(TypeName = "timestamp")]
     public DateTime last_update { get; set; }
 
-    public virtual city city { get; set; }
+    public virtual City city { get; set; }
 
-    public virtual ICollection<customer> customers { get; set; }
+    public virtual ICollection<Customer> customers { get; set; }
 
-    public virtual ICollection<staff> staffs { get; set; }
+    public virtual ICollection<Staff> staffs { get; set; }
 
-    public virtual ICollection<store> stores { get; set; }
+    public virtual ICollection<Store> stores { get; set; }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/category.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/category.cs
index ef201da34..09abadac4 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/category.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/category.cs
@@ -33,10 +33,10 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-  [Table("category")]
-  public partial class category
+  [Table("Category")]
+  public partial class Category
   {
-    public category()
+    public Category()
     {
       film_category = new HashSet<film_category>();
     }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/city.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/city.cs
index 6df411949..c727bf334 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/city.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/city.cs
@@ -33,12 +33,12 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-  [Table("city")]
-  public partial class city
+  [Table("City")]
+  public partial class City
   {
-    public city()
+    public City()
     {
-      addresses = new HashSet<address>();
+      addresses = new HashSet<Address>();
     }
 
     [Key]
@@ -56,8 +56,8 @@ public city()
     [Column(TypeName = "timestamp")]
     public DateTime last_update { get; set; }
 
-    public virtual ICollection<address> addresses { get; set; }
+    public virtual ICollection<Address> addresses { get; set; }
 
-    public virtual country country { get; set; }
+    public virtual Country country { get; set; }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/country.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/country.cs
index 85a4613db..5514a00ca 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/country.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/country.cs
@@ -33,12 +33,12 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-  [Table("country")]
-  public partial class country
+  [Table("Country")]
+  public partial class Country
   {
-    public country()
+    public Country()
     {
-      cities = new HashSet<city>();
+      cities = new HashSet<City>();
     }
 
     [Key]
@@ -53,6 +53,6 @@ public country()
     [Column(TypeName = "timestamp")]
     public DateTime last_update { get; set; }
 
-    public virtual ICollection<city> cities { get; set; }
+    public virtual ICollection<City> cities { get; set; }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/customer.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/customer.cs
index 5d6fbbeca..42064deed 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/customer.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/customer.cs
@@ -33,13 +33,13 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-  [Table("customer")]
-  public partial class customer
+  [Table("Customer")]
+  public partial class Customer
   {
-    public customer()
+    public Customer()
     {
-      payments = new HashSet<payment>();
-      rentals = new HashSet<rental>();
+      payments = new HashSet<Payment>();
+      rentals = new HashSet<Rental>();
     }
 
     [Key]
@@ -69,12 +69,12 @@ public customer()
     [Column(TypeName = "timestamp")]
     public DateTime last_update { get; set; }
 
-    public virtual address address { get; set; }
+    public virtual Address address { get; set; }
 
-    public virtual store store { get; set; }
+    public virtual Store store { get; set; }
 
-    public virtual ICollection<payment> payments { get; set; }
+    public virtual ICollection<Payment> payments { get; set; }
 
-    public virtual ICollection<rental> rentals { get; set; }
+    public virtual ICollection<Rental> rentals { get; set; }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film.cs
index 715aa9f60..09caba8fe 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film.cs
@@ -33,14 +33,14 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-  [Table("film")]
-  public partial class film
+  [Table("Film")]
+  public partial class Film
   {
-    public film()
+    public Film()
     {
       film_actor = new HashSet<film_actor>();
       film_category = new HashSet<film_category>();
-      inventories = new HashSet<inventory>();
+      inventories = new HashSet<Inventory>();
     }
 
     [Key]
@@ -86,10 +86,10 @@ public film()
 
     public virtual ICollection<film_category> film_category { get; set; }
 
-    public virtual language language { get; set; }
+    public virtual Language language { get; set; }
 
-    public virtual language language1 { get; set; }
+    public virtual Language language1 { get; set; }
 
-    public virtual ICollection<inventory> inventories { get; set; }
+    public virtual ICollection<Inventory> inventories { get; set; }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_actor.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_actor.cs
index 572dd915f..1f055f57a 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_actor.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_actor.cs
@@ -49,8 +49,8 @@ public partial class film_actor
     [Column(TypeName = "timestamp")]
     public DateTime last_update { get; set; }
 
-    public virtual actor actor { get; set; }
+    public virtual Actor actor { get; set; }
 
-    public virtual film film { get; set; }
+    public virtual Film film { get; set; }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_category.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_category.cs
index f76371277..023e4c065 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_category.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/film_category.cs
@@ -48,8 +48,8 @@ public partial class film_category
     [Column(TypeName = "timestamp")]
     public DateTime last_update { get; set; }
 
-    public virtual category category { get; set; }
+    public virtual Category category { get; set; }
 
-    public virtual film film { get; set; }
+    public virtual Film film { get; set; }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/inventory.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/inventory.cs
index c8506e285..3ae2fcdb1 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/inventory.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/inventory.cs
@@ -33,12 +33,12 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-  [Table("inventory")]
-  public partial class inventory
+  [Table("Inventory")]
+  public partial class Inventory
   {
-    public inventory()
+    public Inventory()
     {
-      rentals = new HashSet<rental>();
+      rentals = new HashSet<Rental>();
     }
 
     [Key]
@@ -53,10 +53,10 @@ public inventory()
     [Column(TypeName = "timestamp")]
     public DateTime last_update { get; set; }
 
-    public virtual film film { get; set; }
+    public virtual Film film { get; set; }
 
-    public virtual store store { get; set; }
+    public virtual Store store { get; set; }
 
-    public virtual ICollection<rental> rentals { get; set; }
+    public virtual ICollection<Rental> rentals { get; set; }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/language.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/language.cs
index f725d5b97..ea7cd3c36 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/language.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/language.cs
@@ -33,13 +33,13 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-  [Table("language")]
-  public partial class language
+  [Table("Language")]
+  public partial class Language
   {
-    public language()
+    public Language()
     {
-      films = new HashSet<film>();
-      films1 = new HashSet<film>();
+      films = new HashSet<Film>();
+      films1 = new HashSet<Film>();
     }
 
     [Key]
@@ -54,8 +54,8 @@ public language()
     [Column(TypeName = "timestamp")]
     public DateTime last_update { get; set; }
 
-    public virtual ICollection<film> films { get; set; }
+    public virtual ICollection<Film> films { get; set; }
 
-    public virtual ICollection<film> films1 { get; set; }
+    public virtual ICollection<Film> films1 { get; set; }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/payment.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/payment.cs
index 5e2f44097..78c70fdb1 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/payment.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/payment.cs
@@ -32,8 +32,8 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-  [Table("payment")]
-  public partial class payment
+  [Table("Payment")]
+  public partial class Payment
   {
     [Key]
     [Column(TypeName = "usmallint")]
@@ -53,10 +53,10 @@ public partial class payment
     [Column(TypeName = "timestamp")]
     public DateTime last_update { get; set; }
 
-    public virtual customer customer { get; set; }
+    public virtual Customer customer { get; set; }
 
-    public virtual rental rental { get; set; }
+    public virtual Rental rental { get; set; }
 
-    public virtual staff staff { get; set; }
+    public virtual Staff staff { get; set; }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/rental.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/rental.cs
index 676725c55..8092734ef 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/rental.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/rental.cs
@@ -33,12 +33,12 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-  [Table("rental")]
-  public partial class rental
+  [Table("Rental")]
+  public partial class Rental
   {
-    public rental()
+    public Rental()
     {
-      payments = new HashSet<payment>();
+      payments = new HashSet<Payment>();
     }
 
     [Key]
@@ -59,12 +59,12 @@ public rental()
     [Column(TypeName = "timestamp")]
     public DateTime last_update { get; set; }
 
-    public virtual customer customer { get; set; }
+    public virtual Customer customer { get; set; }
 
-    public virtual inventory inventory { get; set; }
+    public virtual Inventory inventory { get; set; }
 
-    public virtual ICollection<payment> payments { get; set; }
+    public virtual ICollection<Payment> payments { get; set; }
 
-    public virtual staff staff { get; set; }
+    public virtual Staff staff { get; set; }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/staff.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/staff.cs
index d117df6ff..a35e2dcfa 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/staff.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/staff.cs
@@ -33,14 +33,14 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-  [Table("staff")]
-  public partial class staff
+  [Table("Staff")]
+  public partial class Staff
   {
-    public staff()
+    public Staff()
     {
-      payments = new HashSet<payment>();
-      rentals = new HashSet<rental>();
-      stores = new HashSet<store>();
+      payments = new HashSet<Payment>();
+      rentals = new HashSet<Rental>();
+      stores = new HashSet<Store>();
     }
 
     [Key]
@@ -78,14 +78,14 @@ public staff()
     [Column(TypeName = "timestamp")]
     public DateTime last_update { get; set; }
 
-    public virtual address address { get; set; }
+    public virtual Address address { get; set; }
 
-    public virtual ICollection<payment> payments { get; set; }
+    public virtual ICollection<Payment> payments { get; set; }
 
-    public virtual ICollection<rental> rentals { get; set; }
+    public virtual ICollection<Rental> rentals { get; set; }
 
-    public virtual store store { get; set; }
+    public virtual Store store { get; set; }
 
-    public virtual ICollection<store> stores { get; set; }
+    public virtual ICollection<Store> stores { get; set; }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/store.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/store.cs
index e32a13c0c..bc5fc40be 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/store.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SakilaModel/store.cs
@@ -33,14 +33,14 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-  [Table("store")]
-  public partial class store
+  [Table("Store")]
+  public partial class Store
   {
-    public store()
+    public Store()
     {
-      customers = new HashSet<customer>();
-      inventories = new HashSet<inventory>();
-      staffs = new HashSet<staff>();
+      customers = new HashSet<Customer>();
+      inventories = new HashSet<Inventory>();
+      staffs = new HashSet<Staff>();
     }
 
     [Key]
@@ -55,14 +55,14 @@ public store()
     [Column(TypeName = "timestamp")]
     public DateTime last_update { get; set; }
 
-    public virtual address address { get; set; }
+    public virtual Address address { get; set; }
 
-    public virtual ICollection<customer> customers { get; set; }
+    public virtual ICollection<Customer> customers { get; set; }
 
-    public virtual ICollection<inventory> inventories { get; set; }
+    public virtual ICollection<Inventory> inventories { get; set; }
 
-    public virtual ICollection<staff> staffs { get; set; }
+    public virtual ICollection<Staff> staffs { get; set; }
 
-    public virtual staff staff { get; set; }
+    public virtual Staff staff { get; set; }
   }
 }
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SiteDB.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SiteDB.cs
index 8e30623d4..735fd7333 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SiteDB.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/SiteDB.cs
@@ -37,8 +37,8 @@
 
 namespace MySql.Data.EntityFramework.CodeFirst.Tests
 {
-    [Table("pagina")]
-    public class pagina
+    [Table("Pagina")]
+    public class Pagina
     {
         [Key]
         public long nCdPagina { get; set; }
@@ -48,18 +48,18 @@ public class pagina
         public string sDsTitulo { get; set; }
 
         [ForeignKey("nCdVisitante")]
-        public visitante visitante { get; set; }
+        public Visitante visitante { get; set; }
     }
 
-    public class retorno
+    public class Retorno
     {
         //[Key]
         public long Key { get; set; }
         public int Online { get; set; }
     }
 
-    [Table("site")]
-    public class site
+    [Table("Site")]
+    public class Site
     {
         [Key]
         public long nCdSite { get; set; }
@@ -68,8 +68,8 @@ public class site
         public DateTime tDtCadastro { get; set; }
     }
 
-    [Table("visitante")]
-    public class visitante
+    [Table("Visitante")]
+    public class Visitante
     {
         [Key]
         public long nCdVisitante { get; set; }
@@ -79,16 +79,16 @@ public class visitante
         public DateTime tDtAtualizacao { get; set; }
 
         [ForeignKey("nCdSite")]
-        public site site { get; set; }
+        public Site site { get; set; }
     }
 
   [DbConfigurationType(typeof(MySqlEFConfiguration))]
     public class SiteDbContext : DbContext
     {
-        public DbSet<visitante> Visitante { get; set; }
-        public DbSet<site> Site { get; set; }
+        public DbSet<Visitante> Visitante { get; set; }
+        public DbSet<Site> Site { get; set; }
         //public DbSet<retorno> Retorno { get; set; }
-        public DbSet<pagina> Pagina { get; set; }
+        public DbSet<Pagina> Pagina { get; set; }
 
     public SiteDbContext() : base(CodeFirstFixture.GetEFConnectionString<SiteDbContext>())
         {
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/TransactionTests.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/TransactionTests.cs
index 15be38e01..79845c508 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/TransactionTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/TransactionTests.cs
@@ -60,7 +60,7 @@ public void NestedTransactionsUniqueKey()
     {
       using (SakilaDb context = new SakilaDb())
       {
-        var store = new store
+        var store = new Store
         {
           manager_staff_id = 1
         };
diff --git a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
index d55fcd896..9dac60552 100644
--- a/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
+++ b/EntityFramework/tests/MySql.EntityFramework.Migrations.Tests/MySql.EntityFramework.Migrations.Tests.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>9.5.0</Version>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net462;net48;net9.0</TargetFrameworks>
+    <TargetFrameworks>net462;net48;net9.0;</TargetFrameworks>
     <AssemblyName>MySql.EntityFramework.Migrations.Tests</AssemblyName>
     <PackageId>MySql.EntityFramework.Migrations.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET</PackageTags>
@@ -35,7 +35,7 @@
 
   <ItemGroup>
     <PackageReference Include="EntityFramework" Version="6.5.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
diff --git a/MySQL.Data/src/Authentication/OciAuthenticationPlugin.cs b/MySQL.Data/src/Authentication/OciAuthenticationPlugin.cs
index dc3ade5f0..d0a323197 100644
--- a/MySQL.Data/src/Authentication/OciAuthenticationPlugin.cs
+++ b/MySQL.Data/src/Authentication/OciAuthenticationPlugin.cs
@@ -193,16 +193,16 @@ internal static string LoadSecurityToken(string securityTokenFilePath)
             throw new MySqlException(Resources.OciSecurityTokenFileExceeds10KB);
 
           securityToken = new byte[reader.Length];
-          reader.Read(securityToken, 0, securityToken.Length);
+          _ = reader.Read(securityToken, 0, securityToken.Length);
         }
       }
       catch (FileNotFoundException ex)
       {
         throw new MySqlException(Resources.OciSecurityTokenDoesNotExists, ex);
       }
-      catch (MySqlException ex)
+      catch (MySqlException)
       {
-        throw ex;
+        throw;
       }
 
       return Encoding.UTF8.GetString(securityToken);
diff --git a/MySQL.Data/src/CompressedStream.cs b/MySQL.Data/src/CompressedStream.cs
index 631cbe975..bdf0534c9 100644
--- a/MySQL.Data/src/CompressedStream.cs
+++ b/MySQL.Data/src/CompressedStream.cs
@@ -98,7 +98,12 @@ public override int ReadByte()
     {
       try
       {
+#if NET9_0_OR_GREATER
+        ReadExactly(localByte, 0, 1);
+#else
         Read(localByte, 0, 1);
+#endif
+
         return localByte[0];
       }
       catch (EndOfStreamException)
diff --git a/MySQL.Data/src/Exception.cs b/MySQL.Data/src/Exception.cs
index 701ca4bd0..547392204 100644
--- a/MySQL.Data/src/Exception.cs
+++ b/MySQL.Data/src/Exception.cs
@@ -94,11 +94,6 @@ internal MySqlException(UInt32 code, string sqlState, string msg) : base(msg)
       SqlState = sqlState;
     }
 
-    private MySqlException(SerializationInfo info, StreamingContext context)
-      : base(info, context)
-    {
-    }
-
     /// <summary>
     /// Gets a number that identifies the type of error.
     /// </summary>
@@ -112,10 +107,17 @@ private MySqlException(SerializationInfo info, StreamingContext context)
     internal bool IsQueryAborted => (Number == (int)MySqlErrorCode.QueryInterrupted ||
                                      Number == (int)MySqlErrorCode.FileSortAborted);
 
+#if NET8_0_OR_GREATER
+    /// <summary>
+    /// Gets the SQL state.
+    /// </summary>
+    public override string SqlState { get; }
+#else
     /// <summary>
     /// Gets the SQL state.
     /// </summary>
     public string SqlState { get; private set; }
+#endif
 
     /// <summary>
     /// Gets an integer that representes the MySQL error code.
diff --git a/MySQL.Data/src/Field.cs b/MySQL.Data/src/Field.cs
index 29966d31b..665b6dd82 100644
--- a/MySQL.Data/src/Field.cs
+++ b/MySQL.Data/src/Field.cs
@@ -88,7 +88,7 @@ public MySqlField(Driver driver)
       connVersion = driver.Version;
       MaxLength = 1;
       binaryOk = true;
-#if !NETFRAMEWORK
+#if NET8_0_OR_GREATER
       Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 #endif
     }
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index 331ef6993..5d97fb29b 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -55,11 +55,7 @@
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" />
     <PackageReference Include="Google.Protobuf" Version="3.30.0" />
     <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.8" />
-    <PackageReference Include="System.Buffers" Version="4.5.1" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     <PackageReference Include="ZstdSharp.Port" Version="0.8.5" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
 	  <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
   </ItemGroup>
 
@@ -75,10 +71,9 @@
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netstandard2.1' or '$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0' or '$(TargetFramework)'=='net8.0' or '$(TargetFramework)'=='net9.0' or '$(TargetFramework)'=='net10.0'">
     <Compile Remove="Framework/net462/*" />
     <PackageReference Include="System.Security.Permissions" Version="8.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
-    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-    <PackageReference Include="System.Text.Json" Version="9.0.0" />
   </ItemGroup>
+  
+  
 
   <ItemGroup>
     <Content Include="..\..\Dependencies\MITLibs\comerr64.dll" PackagePath="runtimes\win-x64\native" CopyToOutputDirectory="Always" />
diff --git a/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs b/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
index 278cbcf16..3b5ca0633 100644
--- a/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
+++ b/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
@@ -132,7 +132,7 @@ private static string TlsValidation(object value)
 
         if (Enum.TryParse<SslProtocols>(tls, true, out SslProtocols protocol) && ((int)protocol) >= 3072)
           protocols |= protocol;
-        else if (protocol.HasFlag(SslProtocols.Tls) || protocol.HasFlag(SslProtocols.Tls11))
+        else if (((int)protocol) == 192 || ((int)protocol) == 768)
           unsupported = true;
         else
           nonValid = true;
diff --git a/MySQL.Data/src/MySqlCommand.cs b/MySQL.Data/src/MySqlCommand.cs
index f6f93f415..57f299357 100644
--- a/MySQL.Data/src/MySqlCommand.cs
+++ b/MySQL.Data/src/MySqlCommand.cs
@@ -74,11 +74,10 @@ public sealed class MySqlCommand : DbCommand, IDisposable, ICloneable
     private bool resetSqlSelect;
     CommandTimer commandTimer;
     private bool useDefaultTimeout;
-    private static List<string> keywords = null;
     private bool disposed = false;
     internal const string ParameterPrefix = "_cnet_param_";
 #if NET5_0_OR_GREATER
-    Activity? CurrentActivity;
+    Activity CurrentActivity;
 #endif
 
     /// <summary>
diff --git a/MySQL.Data/src/MySqlConnection.cs b/MySQL.Data/src/MySqlConnection.cs
index e68debbf1..dbe234651 100644
--- a/MySQL.Data/src/MySqlConnection.cs
+++ b/MySQL.Data/src/MySqlConnection.cs
@@ -685,14 +685,21 @@ internal async Task OpenAsync(bool execAsync, CancellationToken cancellationToke
             ProcedureCache = new ProcedureCache((int)Settings.ProcedureCacheSize);
         }
       }
+#if NET5_0_OR_GREATER
       catch (Exception ex)
       {
-#if NET5_0_OR_GREATER              
         MySQLActivitySource.SetException(currentActivity, ex);
-#endif
         SetState(ConnectionState.Closed, true);
         throw;
       }
+#else
+      catch (Exception)
+      {
+        SetState(ConnectionState.Closed, true);
+        throw;
+      }
+#endif
+
 
       SetState(ConnectionState.Open, false);
       await driver.ConfigureAsync(this, execAsync, cancellationToken).ConfigureAwait(false);
@@ -809,7 +816,7 @@ internal async Task CloseFullyAsync(bool execAsync)
     /// </summary>
     internal async Task CloseAsync(bool execAsync)
     {
-#if NET5_0_OR_GREATER              
+#if NET5_0_OR_GREATER
       MySQLActivitySource.CloseConnection(currentActivity);
 #endif
 
diff --git a/MySQL.Data/src/MySqlConnectionStringBuilder.cs b/MySQL.Data/src/MySqlConnectionStringBuilder.cs
index c61949777..814c7315f 100644
--- a/MySQL.Data/src/MySqlConnectionStringBuilder.cs
+++ b/MySQL.Data/src/MySqlConnectionStringBuilder.cs
@@ -1111,6 +1111,11 @@ public override bool Equals(object obj)
       return true;
     }
 
+    public override int GetHashCode()
+    {
+      return base.GetHashCode();
+    }
+
     internal Regex GetBlobAsUTF8IncludeRegex()
     {
       if (String.IsNullOrEmpty(BlobAsUTF8IncludePattern)) return null;
diff --git a/MySQL.Data/src/MySqlPoolManager.cs b/MySQL.Data/src/MySqlPoolManager.cs
index e3dea7676..64642c185 100644
--- a/MySQL.Data/src/MySqlPoolManager.cs
+++ b/MySQL.Data/src/MySqlPoolManager.cs
@@ -33,7 +33,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
-#if !NETFRAMEWORK
+#if NET8_0_OR_GREATER
 using System.Runtime.Loader;
 #endif
 using System.Threading;
@@ -77,12 +77,12 @@ static MySqlPoolManager()
       AppDomain.CurrentDomain.ProcessExit += UnloadAppDomain;
       AppDomain.CurrentDomain.DomainUnload += UnloadAppDomain;
 
-#if !NETFRAMEWORK
+#if NET8_0_OR_GREATER
       AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()).Unloading += UnloadAssemblyLoadContext;
 #endif
     }
 
-#if !NETFRAMEWORK
+#if NET8_0_OR_GREATER
     private static void UnloadAssemblyLoadContext(AssemblyLoadContext obj) => UnloadPoolManager();
 #endif
 
@@ -94,7 +94,7 @@ private static void UnloadPoolManager()
       timer?.Dispose();
       AppDomain.CurrentDomain.ProcessExit -= UnloadAppDomain;
       AppDomain.CurrentDomain.DomainUnload -= UnloadAppDomain;
-#if !NETFRAMEWORK
+#if NET8_0_OR_GREATER
       AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()).Unloading -= UnloadAssemblyLoadContext;
 #endif
     }
diff --git a/MySQL.Data/src/MysqlDefs.cs b/MySQL.Data/src/MysqlDefs.cs
index e2d54081d..9e033f93c 100644
--- a/MySQL.Data/src/MysqlDefs.cs
+++ b/MySQL.Data/src/MysqlDefs.cs
@@ -410,12 +410,7 @@ public enum MySqlSslMode
     /// <summary>
     /// Do not use SSL.
     /// </summary>
-    [Obsolete("Use 'MySqlSslMode.Disabled' instead.")]
-    None,
-    /// <summary>
-    /// Do not use SSL.
-    /// </summary>
-    Disabled = None,
+    Disabled,
     /// <summary>
     /// Use SSL, if server supports it. This option is only available for the classic protocol.
     /// </summary>
diff --git a/MySQL.Data/src/X/Common/UnmanagedLibraryLoader.cs b/MySQL.Data/src/X/Common/UnmanagedLibraryLoader.cs
index a15352bee..2e800a16d 100644
--- a/MySQL.Data/src/X/Common/UnmanagedLibraryLoader.cs
+++ b/MySQL.Data/src/X/Common/UnmanagedLibraryLoader.cs
@@ -53,7 +53,12 @@ internal static bool LoadUnmanagedLibraryFromEmbeddedResources(string applicatio
         using (var stream = executingAssembly.GetManifestResourceStream(resource))
         {
           byteArray = new byte[(int)stream.Length];
+#if NET9_0_OR_GREATER
+          stream.ReadExactly(byteArray, 0, (int)stream.Length);
+#else
           stream.Read(byteArray, 0, (int)stream.Length);
+#endif
+
         }
 
         var tempFile = $"{Path.GetTempPath()}{libraryName}";
diff --git a/MySQL.Data/src/X/Communication/XCompressionController.cs b/MySQL.Data/src/X/Communication/XCompressionController.cs
index 7dc6485f0..b1fdbe139 100644
--- a/MySQL.Data/src/X/Communication/XCompressionController.cs
+++ b/MySQL.Data/src/X/Communication/XCompressionController.cs
@@ -89,7 +89,8 @@ internal class XCompressionController
     /// </summary>
     private MemoryStream _buffer;
 
-    /// <summary>
+#if !NETFRAMEWORK
+       /// <summary>
     /// Deflate stream used for compressing data.
     /// </summary>
     private DeflateStream _deflateCompressStream;
@@ -98,6 +99,7 @@ internal class XCompressionController
     /// Deflate stream used for decompressing data.
     /// </summary>
     private DeflateStream _deflateDecompressStream;
+#endif
 
     /// <summary>
     /// Flag indicating if the initialization is for compression or decompression.
@@ -344,6 +346,7 @@ internal byte[] Decompress(byte[] input, int length)
       }
     }
 
+#if !NETFRAMEWORK
     /// <summary>
     /// Decompresses data using the deflate_stream compression algorithm.
     /// </summary>
@@ -371,6 +374,7 @@ private byte[] DecompressUsingDeflateStream(byte[] input, int length)
 
       return decompressedData;
     }
+#endif
 
     /// <summary>
     /// Decompresses data using the lz4_message compression algorithm.
@@ -420,8 +424,10 @@ private byte[] DecompressUsingZstdStream(byte[] input, int length)
     /// </summary>
     internal void Close()
     {
+#if !NETFRAMEWORK
       _deflateCompressStream?.Dispose();
       _deflateDecompressStream?.Dispose();
+#endif
       _multipleMessagesStream?.Dispose();
       _zstdDecompressStream?.Dispose();
     }
diff --git a/MySQL.Data/src/X/Protocol/X/XProtocol.cs b/MySQL.Data/src/X/Protocol/X/XProtocol.cs
index 4cd9cad42..3b958e991 100644
--- a/MySQL.Data/src/X/Protocol/X/XProtocol.cs
+++ b/MySQL.Data/src/X/Protocol/X/XProtocol.cs
@@ -51,7 +51,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-#if !NETFRAMEWORK
+#if NET8_0_OR_GREATER
 using System.Text.Json;
 #endif
 using static Mysqlx.Datatypes.Object.Types;
@@ -603,7 +603,7 @@ internal Insert CreateInsertMessage(string schema, bool isRelational, string col
               typedRow.Field.Add(ExprUtil.BuildLiteralScalar(Convert.ToString(field)));
             else
             {
-#if !NETFRAMEWORK
+#if NET8_0_OR_GREATER
               string jsonString = JsonSerializer.Serialize(field);
               typedRow.Field.Add(ExprUtil.BuildLiteralScalar(jsonString));
 #else
diff --git a/MySQL.Data/src/X/XDevAPI/CRUD/CrudStatement.cs b/MySQL.Data/src/X/XDevAPI/CRUD/CrudStatement.cs
index df71f408e..f845204d1 100644
--- a/MySQL.Data/src/X/XDevAPI/CRUD/CrudStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/CRUD/CrudStatement.cs
@@ -28,9 +28,6 @@
 
 using System;
 using System.Collections.Generic;
-#if !NETFRAMEWORK
-using System.Text.Json;
-#endif
 using MySqlX.XDevAPI.Common;
 
 namespace MySqlX.XDevAPI.CRUD
diff --git a/MySQL.Data/src/X/XDevAPI/CRUD/DocResult.cs b/MySQL.Data/src/X/XDevAPI/CRUD/DocResult.cs
index 1808659a6..a9fa89b57 100644
--- a/MySQL.Data/src/X/XDevAPI/CRUD/DocResult.cs
+++ b/MySQL.Data/src/X/XDevAPI/CRUD/DocResult.cs
@@ -31,10 +31,10 @@
 using MySqlX.XDevAPI.Common;
 using MySqlX.Sessions;
 using System;
-using MySql.Data.MySqlClient;
-#if !NETFRAMEWORK
+#if NET8_0_OR_GREATER
 using System.Text.Json;
 #endif
+using MySql.Data.MySqlClient;
 
 namespace MySqlX.XDevAPI.CRUD
 {
@@ -63,7 +63,7 @@ protected override T ReadItem(bool dumping)
         return (T)Convert.ChangeType(new DbDoc(_encoding.GetString(values[0]).TrimEnd('\0')), typeof(T));
       else
       {
-#if !NETFRAMEWORK
+#if NET8_0_OR_GREATER
         return JsonSerializer.Deserialize<T>(_encoding.GetString(values[0]).TrimEnd('\0'));
 #else
         throw new MySqlException("Custom type mapping is only supported from .NET Core 3.1.");
diff --git a/MySQL.Data/src/X/XDevAPI/CRUD/ModifyStatement.cs b/MySQL.Data/src/X/XDevAPI/CRUD/ModifyStatement.cs
index 4e6265476..ef6d87367 100644
--- a/MySQL.Data/src/X/XDevAPI/CRUD/ModifyStatement.cs
+++ b/MySQL.Data/src/X/XDevAPI/CRUD/ModifyStatement.cs
@@ -32,7 +32,7 @@
 using MySqlX.XDevAPI.Common;
 using System;
 using System.Collections.Generic;
-#if !NETFRAMEWORK
+#if NET8_0_OR_GREATER
 using System.Text.Json;
 #endif
 
@@ -117,7 +117,7 @@ public ModifyStatement<T> Patch(object document)
 
       if (dbDocument.values.Count == 0)
       {
-#if !NETFRAMEWORK
+#if NET8_0_OR_GREATER
         var customObject = JsonSerializer.Serialize(document);
         Updates.Add(new UpdateSpec(UpdateOperation.Types.UpdateType.MergePatch, string.Empty).SetValue(customObject));
 #else
diff --git a/MySQL.Data/src/X/XDevAPI/MySqlXConnectionStringBuilder.cs b/MySQL.Data/src/X/XDevAPI/MySqlXConnectionStringBuilder.cs
index 7e4177f2f..1b778ab3c 100644
--- a/MySQL.Data/src/X/XDevAPI/MySqlXConnectionStringBuilder.cs
+++ b/MySQL.Data/src/X/XDevAPI/MySqlXConnectionStringBuilder.cs
@@ -289,6 +289,11 @@ public override bool Equals(object obj)
       return true;
     }
 
+    public override int GetHashCode()
+    {
+      return base.GetHashCode();
+    }
+
     internal override MySqlConnectionStringOption GetOption(string key)
     {
       MySqlConnectionStringOption option = Options.Get(key);
diff --git a/MySQL.Data/src/common/Ssl.cs b/MySQL.Data/src/common/Ssl.cs
index 394a7ac7e..7fbf17c0f 100644
--- a/MySQL.Data/src/common/Ssl.cs
+++ b/MySQL.Data/src/common/Ssl.cs
@@ -43,6 +43,8 @@
 using System.Threading.Tasks;
 using Org.BouncyCastle.OpenSsl;
 using Org.BouncyCastle.Utilities.IO.Pem;
+using Org.BouncyCastle.Asn1.X509;
+using System.Runtime.ConstrainedExecution;
 
 namespace MySql.Data.Common
 {
@@ -106,9 +108,15 @@ public Ssl(string server, MySqlSslMode sslMode, string certificateFile, MySqlCer
     /// </summary>
     private X509Certificate2 GetCertificateFromPEM(string certificatePath, string certificatePassword)
     {
+#if NET9_0_OR_GREATER
+      var certParser = new Org.BouncyCastle.X509.X509CertificateParser();
+      var certBytes = certParser.ReadCertificate(File.ReadAllBytes(certificatePath));
+      return X509CertificateLoader.LoadCertificate(certBytes.GetEncoded());
+#else
       var certParser = new Org.BouncyCastle.X509.X509CertificateParser();
       var cert = certParser.ReadCertificate(File.ReadAllBytes(certificatePath));
       return new X509Certificate2(cert.GetEncoded(), certificatePassword);
+#endif
     }
 
 
@@ -131,8 +139,13 @@ private X509CertificateCollection GetPFXClientCertificates()
         }
         else
         {
+#if NET9_0_OR_GREATER
+          X509Certificate2 clientCert = X509CertificateLoader.LoadPkcs12FromFile(_settings.CertificateFile, _settings.CertificatePassword);
+#else
           X509Certificate2 clientCert = new X509Certificate2(_settings.CertificateFile,
             _settings.CertificatePassword);
+#endif
+
           certs.Add(clientCert);
           return certs;
         }
diff --git a/MySQL.Data/src/common/SslPemCertificateValidator.cs b/MySQL.Data/src/common/SslPemCertificateValidator.cs
index 8186ea6b6..cec069159 100644
--- a/MySQL.Data/src/common/SslPemCertificateValidator.cs
+++ b/MySQL.Data/src/common/SslPemCertificateValidator.cs
@@ -34,6 +34,7 @@
 using System;
 using System.IO;
 using System.Net.Security;
+using System.Runtime.ConstrainedExecution;
 using System.Security.Cryptography.X509Certificates;
 
 namespace MySql.Data.common
@@ -268,7 +269,11 @@ private static void VerifyIdentity(SslPolicyErrors sslPolicyErrors)
     /// <param name="serverCertificate">The server certificate.</param>
     private static void VerifyIssuer(Org.BouncyCastle.X509.X509Certificate CACertificate, X509Certificate serverCertificate)
     {
+#if NET9_0_OR_GREATER
+      var certificate = X509CertificateLoader.LoadCertificate(CACertificate.GetEncoded());
+#else
       var certificate = new X509Certificate(CACertificate.GetEncoded());
+#endif
 
       if (certificate.Issuer != serverCertificate.Issuer)
         throw new MySqlException(Resources.SslConnectionError, new Exception(Resources.SslCertificateCAMismatch));
diff --git a/MySQL.Data/src/common/StreamCreator.cs b/MySQL.Data/src/common/StreamCreator.cs
index 4b77c7c7b..9678ab681 100644
--- a/MySQL.Data/src/common/StreamCreator.cs
+++ b/MySQL.Data/src/common/StreamCreator.cs
@@ -175,7 +175,15 @@ internal static async Task<Socket> GetUnixSocketAsync(string server, uint connec
         else
           socket.Connect(endPoint);
 #else
-        socket.Connect(endPoint);
+        if (execAsync)
+        {
+          SocketAsyncEventArgs args = new SocketAsyncEventArgs();
+          args.RemoteEndPoint = endPoint;
+          socket.ConnectAsync(args);
+          await Task.Run(() => socket.ConnectAsync(args));
+        }
+        else
+          socket.Connect(endPoint);
 #endif
         return socket;
       }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
index 952e044db..3d58920b7 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/AuthTests.cs
@@ -57,6 +57,7 @@ public void OneTimeTearDown()
     [Property("Category", "Security")]
     public void TestIntegratedSecurityNoPoolingWithoutUser()
     {
+      Assume.That(Platform.IsWindows);
       TestIntegratedSecurityWithUser(null, false);
     }
 
@@ -64,6 +65,7 @@ public void TestIntegratedSecurityNoPoolingWithoutUser()
     [Property("Category", "Security")]
     public void TestIntegratedSecurityPoolingWithoutUser()
     {
+      Assume.That(Platform.IsWindows);
       TestIntegratedSecurityWithUser(null, true);
     }
 
@@ -71,6 +73,7 @@ public void TestIntegratedSecurityPoolingWithoutUser()
     [Property("Category", "Security")]
     public void TestIntegratedSecurityNoPoolingWithUser()
     {
+      Assume.That(Platform.IsWindows);
       TestIntegratedSecurityWithUser("myuser1", false);
     }
 
@@ -78,6 +81,7 @@ public void TestIntegratedSecurityNoPoolingWithUser()
     [Property("Category", "Security")]
     public void TestIntegratedSecurityPoolingWithUser()
     {
+      Assume.That(Platform.IsWindows);
       TestIntegratedSecurityWithUser("myuser1", true);
     }
 
@@ -85,6 +89,7 @@ public void TestIntegratedSecurityPoolingWithUser()
     [Property("Category", "Security")]
     public void TestWinAuthWithoutProxyNoUserNoPooling()
     {
+      Assume.That(Platform.IsWindows);
       TestIntegratedSecurityWithoutProxy(null, false);
     }
 
@@ -92,6 +97,7 @@ public void TestWinAuthWithoutProxyNoUserNoPooling()
     [Property("Category", "Security")]
     public void TestWinAuthWithoutProxyNoUserPooling()
     {
+      Assume.That(Platform.IsWindows);
       TestIntegratedSecurityWithoutProxy("myuser1", true);
     }
 
@@ -99,6 +105,7 @@ public void TestWinAuthWithoutProxyNoUserPooling()
     [Property("Category", "Security")]
     public void TestWinAuthWithoutProxyAndUser()
     {
+      Assume.That(Platform.IsWindows);
       TestIntegratedSecurityWithoutProxy("myuser1", false);
     }
 
@@ -106,6 +113,7 @@ public void TestWinAuthWithoutProxyAndUser()
     [Property("Category", "Security")]
     public void TestWinAuthWithoutProxyAndUserPooling()
     {
+      Assume.That(Platform.IsWindows);
       TestIntegratedSecurityWithoutProxy("myuser1", true);
     }
 
@@ -157,7 +165,9 @@ private void TestIntegratedSecurityWithoutProxy(string user, bool pooling)
       }
 
       // Create mapping for current Windows user=>foo_user
+#pragma warning disable CS1702, CA1416
       String windowsUser = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
+#pragma warning restore CS1702, CA1416
       windowsUser = windowsUser.Replace("\\", "\\\\");
       string userMapping = "fergs, Administrators";
 
@@ -280,9 +290,9 @@ private void TestIntegratedSecurityWithUser(string user, bool pooling)
       }
 
       // Create mapping for current Windows user=>foo_user
-#pragma warning disable CS1702 // Assuming assembly reference matches identity
+#pragma warning disable CS1702, CA1416 // Assuming assembly reference matches identity
       String windowsUser = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
-#pragma warning restore CS1702 // Assuming assembly reference matches identity
+#pragma warning restore CS1702, CA1416  // Assuming assembly reference matches identity
       windowsUser = windowsUser.Replace("\\", "\\\\");
       string userMapping = windowsUser + "=foo_user";
 
@@ -963,7 +973,7 @@ public void ConnectUsingClearPasswordPlugin()
           Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
         }
 
-        using (MySqlConnection connection = new MySqlConnection(unixConnectionString + "sslmode=none"))
+        using (MySqlConnection connection = new MySqlConnection(unixConnectionString + "sslmode=disabled"))
         {
           connection.Open();
           Assert.That(connection.State, Is.EqualTo(ConnectionState.Open));
diff --git a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
index e932704e3..40eaca0ab 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/CmdTests.cs
@@ -864,7 +864,7 @@ PRIMARY KEY (`inventory_id`)
     [Test, Description("MySQL Reserved Word used")]
     public void ReservedWordUse()
     {
-      var connStr = $"server={Host};user={Settings.UserID};database={Settings.Database};port={Port};password={Settings.Password};logging=true;sslmode=none";
+      var connStr = $"server={Host};user={Settings.UserID};database={Settings.Database};port={Port};password={Settings.Password};logging=true;sslmode=disabled";
       using (var conn = new MySqlConnection(connStr))
       {
         var cmd = new MySqlCommand();
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
index 9b5858a5e..f9a3418cd 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionTests.cs
@@ -176,7 +176,7 @@ public void ReOpenDisposedConnection()
     /// Bug#35474099 OpenAsync throws unhandled exception from thread pool.
     /// </summary>
     [Test]
-    public async Task OpenAsyncCatchException()
+    public void OpenAsyncCatchException()
     {
       MockServer mockServer = new MockServer(false);
       mockServer.StartServer();
@@ -1218,7 +1218,7 @@ public void MediumTextMalformedPkg()
       }
 
       string fullQuery = string.Format(query, sb.ToString(0, sb.Length - 2));
-      var res = MySqlHelper.ExecuteNonQuery(Connection.ConnectionString + ";ssl-mode=none", fullQuery, mySqlParameters.ToArray());
+      var res = MySqlHelper.ExecuteNonQuery(Connection.ConnectionString + ";ssl-mode=disabled", fullQuery, mySqlParameters.ToArray());
       Assert.That(40000, Is.EqualTo(res));
 
       ExecuteSQL("SET GLOBAL max_allowed_packet=1024000");
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs
index 36fe37067..e95dc513c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/ThreadingTests.cs
@@ -122,7 +122,6 @@ public void HardenedThreadAbortException()
       t.Name = "Execute Query";
       t.Start();
       Thread.Sleep(500);
-      t.Abort();
       t.Join();
 
       Assert.That(lastException, Is.Not.Null);
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
index 96cc83ac2..cc094b7a1 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Framework/netstandard2_0/TimeoutAndCancel.cs
@@ -333,11 +333,11 @@ public void NetWriteTimeoutExpiring()
             currentException = currentException.InnerException;
           }
 
-          throw e;
+          throw;
         }
 
         // IT is relatively hard to predict where
-        Console.WriteLine("Warning: all reads completed!");
+        Console.WriteLine("NetWriteTimeoutExpiring: all reads completed!");
         Assert.That(i, Is.EqualTo(rows));
       }
     }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
index 5c9f30a9e..6caa9b039 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySql.Data.Tests.csproj
@@ -68,7 +68,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
diff --git a/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs
index 4eace9b66..1b1a9927f 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/MySqlBulkLoaderTests.cs
@@ -737,7 +737,12 @@ public void InsertFilesInDatabase()
       var fs = new FileStream(imageFile, FileMode.Open, FileAccess.Read);
       long fileSize = fs.Length;
       byte[] rawData = new byte[fs.Length];
+#if NET9_0_OR_GREATER
+      fs.ReadExactly(rawData, 0, (int)fs.Length);
+#else
       fs.Read(rawData, 0, (int)fs.Length);
+#endif
+
       fs.Close();
 
       using (var conn = new MySqlConnection(Connection.ConnectionString))
diff --git a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
index 2db1373ce..cec0f3413 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/PoolingTests.cs
@@ -621,7 +621,7 @@ void InsertSmallBlobInTestTableUsingPoolingConnection()
     public async Task MinPoolSizeNotCorrect()
     {
       int minPoolSize = 5;
-      var connectionString = $"server={Host};user={Settings.UserID};password={Settings.Password};port={Port};Max Pool Size=10;Min Pool Size={minPoolSize};sslmode=none;";
+      var connectionString = $"server={Host};user={Settings.UserID};password={Settings.Password};port={Port};Max Pool Size=10;Min Pool Size={minPoolSize};sslmode=disabled;";
 
       try
       {
@@ -698,7 +698,7 @@ public async Task MinPoolSizeNotCorrect()
     [Test, Description("Check Pooling Connection works correctly")]
     public void MultipleConnectionWithPooling()
     {
-      var connectionString = $"server={Host};user={Settings.UserID};password={Settings.Password};port={Port};Max Pool Size=4;Min Pool Size=0;sslmode=none;connectiontimeout=5;";
+      var connectionString = $"server={Host};user={Settings.UserID};password={Settings.Password};port={Port};Max Pool Size=4;Min Pool Size=0;sslmode=disabled;connectiontimeout=5;";
       var myConnection1 = new MySqlConnection(connectionString);
       var myConnection2 = new MySqlConnection(connectionString);
       var myConnection3 = new MySqlConnection(connectionString);
@@ -742,7 +742,7 @@ public void CloseWaitScenario1()
     {
       Assume.That(Platform.IsWindows(), "This test is only for Windows OS");
       var poolSize = 5;
-      var connectionString = $"server={Host};user={Settings.UserID};database={Settings.Database};port={Port};password={Settings.Password};Pooling=true;Max Pool Size={poolSize};SSL Mode=None;ConnectionTimeout=5";
+      var connectionString = $"server={Host};user={Settings.UserID};database={Settings.Database};port={Port};password={Settings.Password};Pooling=true;Max Pool Size={poolSize};SSL Mode=disabled;ConnectionTimeout=5";
       List<MySqlConnection> connectionList = new();
       using (var con = new MySqlConnection(connectionString))
       {
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
index 54276c39d..f3513c8b1 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
@@ -370,7 +370,12 @@ public void InvalidCertificateThumbprint()
       string assemblyPath = TestContext.CurrentContext.TestDirectory;
       var store = new X509Store(StoreName.My, StoreLocation.CurrentUser);
       store.Open(OpenFlags.ReadWrite);
+#if NET9_0_OR_GREATER
+      var certificate = X509CertificateLoader.LoadPkcs12FromFile(assemblyPath + "\\client.pfx", "pass");
+#else
       var certificate = new X509Certificate2(assemblyPath + "\\client.pfx", "pass");
+#endif
+
       store.Add(certificate);
 
       MySqlConnectionStringBuilder csb = new MySqlConnectionStringBuilder(Settings.ConnectionString);
diff --git a/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs b/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs
index 1746e11bc..388dc7c3f 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/StressTests.cs
@@ -138,7 +138,7 @@ public async Task CommandAsyncStress()
     {
       for (var i = 0; i < 1000; i++)
       {
-        using (var dbConn = new MySqlConnection($"server={Host};user={Settings.UserID};database={Settings.Database};port={Port};password={Settings.Password};sslmode=none"))
+        using (var dbConn = new MySqlConnection($"server={Host};user={Settings.UserID};database={Settings.Database};port={Port};password={Settings.Password};sslmode=disabled"))
         using (var cmd = new MySqlCommand("DROP DATABASE IF EXISTS code_first_2", dbConn))
         {
           await dbConn.OpenAsync();
diff --git a/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs b/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
index 7b0c331ce..c3c93eb79 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/Transactions.cs
@@ -798,7 +798,7 @@ PRIMARY KEY(`id`, name1(10))
         var sql = $"insert into `keyvalue` values ({id}, md5(rand() * 1000000), md5(rand() * 1000000), md5(rand() * 1000000), md5(rand() * 1000000));";
         ExecuteSQL(sql);
       }
-      var cs = $"server={Host};port={Port};Database={Connection.Settings.Database};Uid={Connection.Settings.UserID};password={Connection.Settings.Password};ssl-mode=none; ";
+      var cs = $"server={Host};port={Port};Database={Connection.Settings.Database};Uid={Connection.Settings.UserID};password={Connection.Settings.Password};ssl-mode=disabled; ";
       PerformQueriesAtIntervals(TimeSpan.FromMilliseconds(70),
       connectionString: cs, tableName: "keyvalue")
       .GetAwaiter().GetResult();
@@ -834,7 +834,7 @@ private static async Task PerformQueriesAtIntervals(TimeSpan interval, string co
     {
       for (int i = 0; i < 151; i++)
       {
-        Task.Run(() => PerformQuery(connectionString, tableName));
+        await Task.Run(() => PerformQuery(connectionString, tableName));
         await Task.Delay(interval);
       }
     }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
index f5fc415f0..9836ad381 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BaseTest.cs
@@ -175,7 +175,7 @@ public Session GetSession(bool setCurrentSchema = false)
 
     protected void ExecuteSqlAsRoot(string sql)
     {
-      using (var conn = new MySqlConnection(ConnectionStringRoot + ";ssl mode=none"))
+      using (var conn = new MySqlConnection(ConnectionStringRoot + ";ssl mode=disabled"))
       {
         conn.Open();
         MySqlScript s = new(conn, sql);
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
index 89549ee2a..348930f73 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/BasicFindTests.cs
@@ -2169,8 +2169,11 @@ public void FindWhere()
       var result1 = collection.Add(docs).Execute();
       Assert.That(result1.AffectedItemsCount, Is.EqualTo(4));
 
+      #pragma warning disable
       //Deprecated Find().Where() in 8.0.17
       var result2 = collection.Find("$._id = 1").Where("true").Execute().FetchAll();
+      #pragma warning restore
+
       Assert.That(result2.Count, Is.EqualTo(4));
     }
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
index f50aa09fe..4c3d59164 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
@@ -46,8 +46,6 @@ namespace MySqlX.Data.Tests
 {
   public class ClientTests : BaseTest
   {
-    private static string localServerIpv4 = "localServerIpv4";
-
     public struct ClientOptions
     {
       public object ConnectionOptions { get; set; }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs
index 47c992ffc..ca46a48a3 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CollectionAsyncTests.cs
@@ -99,13 +99,13 @@ public async Task IndexArrayMultiThreading()
         coll.CreateIndex("myIndex", "{\"fields\": [{\"field\": $.myField, \"type\":\"DATE\", \"array\": true}]}");
         return;
       }
-      int v1 = await IndexArrayMultiThreading_T1();
-      int v2 = await IndexArrayMultiThreading_T2();
+      int v1 = await Task.Run(() => IndexArrayMultiThreading_T1());
+      int v2 = await Task.Run(() => IndexArrayMultiThreading_T2());
 
       Assert.That(v1 + v2, Is.EqualTo(2));
     }
 
-    private async Task<int> IndexArrayMultiThreading_T1()
+    private int IndexArrayMultiThreading_T1()
     {
       Schema test = session.GetSchema(schemaName);
       var coll = test.GetCollection("test");
@@ -119,7 +119,7 @@ private async Task<int> IndexArrayMultiThreading_T1()
       return 1;
     }
 
-    private async Task<int> IndexArrayMultiThreading_T2()
+    private int IndexArrayMultiThreading_T2()
     {
       Schema test = session.GetSchema(schemaName);
       var coll = test.GetCollection("test");
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
index e60869b05..fd51f3dfd 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/CrudUpdateTests.cs
@@ -222,13 +222,13 @@ public void ModifyWithInOperator()
       Assert.That(result.AffectedItemsCount, Is.EqualTo(3));
 
       Assert.That(ExecuteModifyStatement(collection.Modify("a IN (1,2)").Set("a", 3)).AffectedItemsCount, Is.EqualTo(3));
-      Assert.That(ExecuteFindStatement(collection.Find().Where("a = 3")).FetchAll().Count, Is.EqualTo(3));
+      Assert.That(collection.Find("a = 3").Execute().FetchAll().Count, Is.EqualTo(3));
 
       Assert.That(ExecuteModifyStatement(collection.Modify("a IN [3]").Set("a", 1)).AffectedItemsCount, Is.EqualTo(3));
-      Assert.That(ExecuteFindStatement(collection.Find().Where("a = 1")).FetchAll().Count, Is.EqualTo(3));
-
+      Assert.That(collection.Find("a = 1").Execute().FetchAll().Count, Is.EqualTo(3));
+      
       Assert.That(ExecuteModifyStatement(collection.Modify("1 IN c.e").Set("c.e", "newValue")).AffectedItemsCount, Is.EqualTo(2));
-      Assert.That(ExecuteFindStatement(collection.Find().Where("c.e = \"newValue\"")).FetchAll().Count, Is.EqualTo(2));
+      Assert.That(collection.Find("c.e = \"newValue\"").Execute().FetchAll().Count, Is.EqualTo(2));
     }
 
     [Test]
@@ -964,6 +964,7 @@ public void ForbidModifyWithNoCondition_S2()
       Assert.That(result.AffectedItemsCount, Is.EqualTo(4));
 
       // Sending an expression that evaluates to true applies changes on all documents.
+      #pragma warning disable
       //Deprecated Modify().Where() in 8.0.17
       result = collection.Modify("true").Where("false").Set("pages", "10").Execute();
       Assert.That(result.AffectedItemsCount, Is.EqualTo(0));
@@ -974,11 +975,13 @@ public void ForbidModifyWithNoCondition_S2()
       Assert.That(result.AffectedItemsCount, Is.EqualTo(4));
       result = collection.Modify("false").Where("false").Set("pages", "40").Execute();
       Assert.That(result.AffectedItemsCount, Is.EqualTo(0));
+      #pragma warning restore
 
       // Condition can't be null or empty.
       Assert.Throws<ArgumentNullException>(() => ExecuteModifyStatement(collection.Modify(" ")));
     }
 
+
     [Test, Description("Test valid modify.patch to change element at Depth n for multiple arrays#Bug))")]
     public void ModifyPatchNDepth()
     {
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
index 98be75003..dbca171c3 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/MySqlX.Data.Tests.csproj
@@ -70,7 +70,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <EmbeddedResource Include="Properties\CreateUsers.sql" />
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/PerformanceTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/PerformanceTests.cs
index b35491dff..486e2c127 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/PerformanceTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/PerformanceTests.cs
@@ -236,7 +236,7 @@ public void DbDocEquals()
 
     public void SessionSSLModeNone()
     {
-      var session = new Session($"mysqlx://{USER}:@{HOST}:{X_DEVAPI_PORT}?auth=SHA256_MEMORY&sslmode=none");
+      var session = new Session($"mysqlx://{USER}:@{HOST}:{X_DEVAPI_PORT}?auth=SHA256_MEMORY&sslmode=disabled");
       session.Close();
     }
   }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
index c33e85059..6199487f8 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/PreparedStatementsTests.cs
@@ -160,7 +160,9 @@ public void FindWithChanges()
 
       for (int i = 1; i <= _docs.Length; i++)
       {
+        #pragma warning disable
         var foundDoc2 = ExecuteFindStatement(findStmt.Where($"_id = {i}"));
+        #pragma warning restore
         Assert.That(foundDoc2.FetchAll()[0]["title"].ToString(), Is.EqualTo($"Book {i}"));
         Assert.That(findStmt._isPrepared, Is.False);
       }
@@ -391,7 +393,9 @@ public void RemoveWithChanges()
 
       for (int i = 3; i <= _docs.Length; i++)
       {
+        #pragma warning disable
         result = ExecuteRemoveStatement(removeStmt.Where($"_id = {i}"));
+        #pragma warning restore
         Assert.That(result.AffectedItemsCount, Is.EqualTo(1ul));
         Assert.That(removeStmt._isPrepared, Is.False);
       }
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
index d1fe27a25..817e1db39 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SessionTests.cs
@@ -254,11 +254,7 @@ public void CheckConnectionUri()
       CheckConnectionData("mysqlx://myuser:password@[(address=[fe80::bd41:e449:45ee:2e1a%17]:3305,priority=100)]", "myuser", "password", "[fe80::bd41:e449:45ee:2e1a]", 3305);
       Assert.Throws<UriFormatException>(() => CheckConnectionData("mysqlx://myuser:password@[(address=fe80::bd41:e449:45ee:2e1a%17,priority=100)]", "myuser", "password", "[fe80::bd41:e449:45ee:2e1a]", 33060));
       CheckConnectionData("mysqlx://myuser@localhost/test", "myuser", "", "localhost", 33060, "database", schemaName);
-#if NET8_0_OR_GREATER
-      CheckConnectionData("mysqlx://myuser@localhost/test?ssl%20mode=disabled&connecttimeout=10", "myuser", "", "localhost", 33060, "database", schemaName, "ssl mode", "None", "connecttimeout", "10");
-#else
       CheckConnectionData("mysqlx://myuser@localhost/test?ssl%20mode=disabled&connecttimeout=10", "myuser", "", "localhost", 33060, "database", schemaName, "ssl mode", "Disabled", "connecttimeout", "10");
-#endif
       CheckConnectionData("mysqlx://_%21%22%23%24s%26%2F%3D-%25r@localhost", "_!\"#$s&/=-%r", "", "localhost", 33060);
       CheckConnectionData("mysql://myuser@localhost", "", "", "", 33060);
       CheckConnectionData("myuser@localhost", "", "", "", 33060);
@@ -1775,7 +1771,6 @@ public void TimeoutIncreasingUntilConnect()
         {
           Assert.That(conn.Uri, Is.Not.Null);
         }
-        break;
       }
 
       for (int i = 1; i < 20; i++)
@@ -1800,7 +1795,6 @@ public void TimeoutIncreasingUntilConnect()
         {
           Assert.That(conn.Uri, Is.Not.Null);
         }
-        break;
       }
     }
 
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
index f424c85d4..40ea368c4 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
@@ -101,7 +101,7 @@ public void SslOptions()
       }
 
       // Duplicate SSL connection options do not send error message.
-      Assert.DoesNotThrow(() => MySQLX.GetSession(connectionUri + "?sslmode=Required&ssl mode=None"));
+      Assert.DoesNotThrow(() => MySQLX.GetSession(connectionUri + "?sslmode=Required&ssl mode=disabled"));
       Assert.DoesNotThrow(() => MySQLX.GetSession(connectionUri + "?ssl-ca-pwd=pass&ssl-ca-pwd=pass"));
       Assert.DoesNotThrow(() => MySQLX.GetSession(connectionUri + "?certificatepassword=pass&certificatepassword=pass"));
       Assert.DoesNotThrow(() => MySQLX.GetSession(connectionUri + "?certificatepassword=pass&ssl-ca-pwd=pass"));
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs
index 58ff81014..6a27e1704 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/UnixSocketsTests.cs
@@ -50,13 +50,13 @@ public void ConnectionWithUriConnectionString()
     {
       if (Platform.IsWindows()) return;
 
-      using (var session = MySQLX.GetSession("mysqlx://root:@" + defaultUnixSocket + "?protocol=unix&sslmode=none"))
+      using (var session = MySQLX.GetSession("mysqlx://root:@" + defaultUnixSocket + "?protocol=unix&sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
-      using (var session = MySQLX.GetSession("mysqlx://root:@" + defaultUnixSocket.Replace("/", "%2F") + "?protocol=unix&sslmode=none"))
+      using (var session = MySQLX.GetSession("mysqlx://root:@" + defaultUnixSocket.Replace("/", "%2F") + "?protocol=unix&sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
@@ -69,7 +69,7 @@ public void ConnectionWithUriConnectionStringIncludingSchema()
     {
       if (Platform.IsWindows()) return;
 
-      using (var session = MySQLX.GetSession($"mysqlx://root:@({defaultUnixSocket})/mysql?protocol=unix&sslmode=none"))
+      using (var session = MySQLX.GetSession($"mysqlx://root:@({defaultUnixSocket})/mysql?protocol=unix&sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
@@ -82,13 +82,13 @@ public void ConnectionWithParenthesisEnclosedSockets()
     {
       if (Platform.IsWindows()) return;
 
-      using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@({defaultUnixSocket})?protocol=unix&sslmode=none"))
+      using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@({defaultUnixSocket})?protocol=unix&sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
-      using (var session = MySQLX.GetSession($"server=({defaultUnixSocket});uid={RootUser};protocol=unix;sslmode=none"))
+      using (var session = MySQLX.GetSession($"server=({defaultUnixSocket});uid={RootUser};protocol=unix;sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
@@ -113,7 +113,7 @@ public void ConnectionWithBasicConnectionString()
     {
       if (Platform.IsWindows()) return;
 
-      using (var session = MySQLX.GetSession($"server={defaultUnixSocket};uid={RootUser};protocol=unixsocket;sslmode=none"))
+      using (var session = MySQLX.GetSession($"server={defaultUnixSocket};uid={RootUser};protocol=unixsocket;sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
@@ -154,49 +154,49 @@ public void Failover()
     {
       if (Platform.IsWindows()) return;
 
-      using (var session = MySQLX.GetSession($"server=/tmp/mysql.sock1, (/tmp/mysql.sock2) ,(%2Ftmp%2Fmysql.sock3) ,{defaultUnixSocket};uid={RootUser};protocol=unix;sslmode=none;"))
+      using (var session = MySQLX.GetSession($"server=/tmp/mysql.sock1, (/tmp/mysql.sock2) ,(%2Ftmp%2Fmysql.sock3) ,{defaultUnixSocket};uid={RootUser};protocol=unix;sslmode=disabled;"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
-      using (var session = MySQLX.GetSession($"server=(address=/tmp/mysql.sock1, priority=100),(address=(/tmp/mysql.sock2),priority=99),(address=(%2tmp%2mysql.sock3),priority=98),(address={defaultUnixSocket},priority=97);uid={RootUser};protocol=unix;sslmode=none;"))
+      using (var session = MySQLX.GetSession($"server=(address=/tmp/mysql.sock1, priority=100),(address=(/tmp/mysql.sock2),priority=99),(address=(%2tmp%2mysql.sock3),priority=98),(address={defaultUnixSocket},priority=97);uid={RootUser};protocol=unix;sslmode=disabled;"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
-      using (var session = MySQLX.GetSession($"server=(address={defaultUnixSocket},priority=100);uid={RootUser};protocol=unix;sslmode=none;"))
+      using (var session = MySQLX.GetSession($"server=(address={defaultUnixSocket},priority=100);uid={RootUser};protocol=unix;sslmode=disabled;"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
-      using (var session = MySQLX.GetSession($"server=(address=({defaultUnixSocket}),priority=100);uid={RootUser};protocol=unix;sslmode=none;"))
+      using (var session = MySQLX.GetSession($"server=(address=({defaultUnixSocket}),priority=100);uid={RootUser};protocol=unix;sslmode=disabled;"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
-      using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@[./tmp/mysql.sock, (../tmp/mysql.sock) ,(%2Ftmpsocket%2Fmysql.sock) , {defaultUnixSocket}]?protocol=unix&sslmode=none"))
+      using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@[./tmp/mysql.sock, (../tmp/mysql.sock) ,(%2Ftmpsocket%2Fmysql.sock) , {defaultUnixSocket}]?protocol=unix&sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
-      using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@[(address=./tmp/mysql.sock,priority=100),(address=(../tmp/mysql.sock),priority=99),(address=(%2tmpsocket%2mysql.sock),priority=98),(address={defaultUnixSocket},priority=97)]?protocol=unix&sslmode=none"))
+      using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@[(address=./tmp/mysql.sock,priority=100),(address=(../tmp/mysql.sock),priority=99),(address=(%2tmpsocket%2mysql.sock),priority=98),(address={defaultUnixSocket},priority=97)]?protocol=unix&sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
-      using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@[(address={defaultUnixSocket},priority=100)]?protocol=unix&sslmode=none"))
+      using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@[(address={defaultUnixSocket},priority=100)]?protocol=unix&sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
       }
 
-      using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@[(address=({defaultUnixSocket}),priority=100)]?protocol=unix&sslmode=none"))
+      using (var session = MySQLX.GetSession($"mysqlx://{RootUser}:@[(address=({defaultUnixSocket}),priority=100)]?protocol=unix&sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Server, Is.EqualTo(defaultUnixSocket));
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs b/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
index 71d5c655f..1a428f2ef 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/XAuth.cs
@@ -62,7 +62,7 @@ public void DefaultAuthNullPlugin()
         Assert.That(result[0][1].ToString().Contains("TLSv1"));
       }
 
-      connectionString = connectionString + ";sslmode=none;";
+      connectionString = connectionString + ";sslmode=disabled;";
       using (var session1 = MySQLX.GetSession(connectionString))
         Assert.That(session1.Settings.Auth, Is.EqualTo(defaultAuthPlugin == "mysql_native_password" ? MySqlAuthenticationMode.MYSQL41 : MySqlAuthenticationMode.SHA256_MEMORY));
 
@@ -84,7 +84,7 @@ public void DefaultAuthNullPlugin()
         Assert.That(result[0][1].ToString().Contains("TLSv1"));
       }
 
-      connectionStringUri = connectionStringUri + "?sslmode=none";
+      connectionStringUri = connectionStringUri + "?sslmode=disabled";
       using (var session1 = MySQLX.GetSession(connectionStringUri))
         Assert.That(session1.Settings.Auth, Is.EqualTo(defaultAuthPlugin == "mysql_native_password" ? MySqlAuthenticationMode.MYSQL41 : MySqlAuthenticationMode.SHA256_MEMORY));
 
@@ -108,14 +108,14 @@ public void DefaultAuthNullPlugin()
         Assert.That(session1.Settings.Auth, Is.EqualTo(defaultAuthPlugin == "mysql_native_password" ? MySqlAuthenticationMode.MYSQL41 : MySqlAuthenticationMode.SHA256_MEMORY));
 
       ExecuteSQL("flush privileges");
-      connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password};ssl-mode=none";
+      connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password};ssl-mode=disabled";
       if (defaultAuthPlugin == "mysql_native_password")
         Assert.That(MySQLX.GetSession(connectionString), Is.Not.Null);
       else
         Assert.Throws<MySqlException>(() => MySQLX.GetSession(connectionString));
 
       //URI
-      connectionStringUri = $"mysqlx://{builder.UserID}:{builder.Password}@{builder.Server}:{XPort}?sslmode=none";
+      connectionStringUri = $"mysqlx://{builder.UserID}:{builder.Password}@{builder.Server}:{XPort}?sslmode=disabled";
       if (defaultAuthPlugin == "mysql_native_password")
         Assert.That(MySQLX.GetSession(connectionStringUri), Is.Not.Null);
       else
@@ -157,19 +157,19 @@ public void DefaultAuthPublicKeyRetrieval()
       //Flush Privileges
       ExecuteSQL("flush privileges");
       connectionString = "server=" + Host + ";user=" + builder.UserID + ";" + "port=" + XPort +
-                         ";password=" + builder.Password + ";ssl-mode=none;allowpublickeyretrieval=true;pooling=false";
+                         ";password=" + builder.Password + ";ssl-mode=disabled;allowpublickeyretrieval=true;pooling=false";
       Assert.Catch(() => MySQLX.GetSession(connectionString));
       connectionString = "server=" + Host + ";user=" + builder.UserID + ";" + "port=" + XPort +
-                         ";password=" + builder.Password + ";ssl-mode=none;AllowPublicKeyRetrieval=true;pooling=false";
+                         ";password=" + builder.Password + ";ssl-mode=disabled;AllowPublicKeyRetrieval=true;pooling=false";
       Assert.Catch(() => MySQLX.GetSession(connectionString));
 
 
       ExecuteSQL("flush privileges");
       connectionStringUri = "mysqlx://" + builder.UserID + ":" + builder.Password + "@" +
-           builder.Server + ":" + XPort + "?sslmode=none&allowpublickeyretrieval=true&pooling=false";
+           builder.Server + ":" + XPort + "?sslmode=disabled&allowpublickeyretrieval=true&pooling=false";
       Assert.Catch(() => MySQLX.GetSession(connectionString));
       connectionStringUri = "mysqlx://" + builder.UserID + ":" + builder.Password + "@" +
-                 builder.Server + ":" + XPort + "?sslmode=none&AllowPublicKeyRetrieval=false&pooling=false";
+                 builder.Server + ":" + XPort + "?sslmode=disabled&AllowPublicKeyRetrieval=false&pooling=false";
       Assert.Catch(() => MySQLX.GetSession(connectionString));
 
       ExecuteSQL("flush privileges");
@@ -217,7 +217,7 @@ public void MySqlNativePlugin()
       using (var session1 = MySQLX.GetSession(connectionString))
         Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
-      connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password};ssl-mode=none";
+      connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password};ssl-mode=disabled";
       using (var session1 = MySQLX.GetSession(connectionString))
         Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
@@ -231,7 +231,7 @@ public void MySqlNativePlugin()
       using (var session1 = MySQLX.GetSession(connectionStringUri))
         Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
-      connectionStringUri = connectionStringUri + "?ssl-mode=none";
+      connectionStringUri = connectionStringUri + "?ssl-mode=disabled";
       using (var session1 = MySQLX.GetSession(connectionStringUri))
         Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
@@ -277,7 +277,7 @@ public void ConnectUsingMySQL41Auth()
         Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
       }
 
-      using (var session = MySQLX.GetSession(connectionStringUri + "?auth=mysql41&sslmode=none"))
+      using (var session = MySQLX.GetSession(connectionStringUri + "?auth=mysql41&sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
@@ -306,7 +306,7 @@ public void DefaultAuth()
       }
 
       // Default to SHA256_MEMORY when TLS is not enabled.
-      using (var session = MySQLX.GetSession(connString + "?sslmode=none"))
+      using (var session = MySQLX.GetSession(connString + "?sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.SHA256_MEMORY));
@@ -327,7 +327,7 @@ public void ConnectUsingSha256Memory()
         Assert.That(result[0][1].ToString().Contains("TLSv1"));
       }
 
-      using (var session = MySQLX.GetSession(ConnectionStringUri + "?auth=SHA256_MEMORY&sslmode=none"))
+      using (var session = MySQLX.GetSession(ConnectionStringUri + "?auth=SHA256_MEMORY&sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.SHA256_MEMORY));
@@ -349,9 +349,9 @@ public void ConnectUsingSha256Memory()
       }
 
       //Exceptions
-      var cs = $"server={Host};user={session.Settings.UserID};port={XPort};password=;ssl-mode=none;auth=SHA256_MEMORY";
+      var cs = $"server={Host};user={session.Settings.UserID};port={XPort};password=;ssl-mode=disabled;auth=SHA256_MEMORY";
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(cs));
-      cs = $"mysqlx://{session.Settings.UserID}:@{Host}:{XPort}?sslmode=none&auth=SHA256_MEMORY";
+      cs = $"mysqlx://{session.Settings.UserID}:@{Host}:{XPort}?sslmode=disabled&auth=SHA256_MEMORY";
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(cs));
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(new
       {
@@ -382,14 +382,14 @@ public void Sha256MemoryAuthWithDifferentPlugin(string pluginName)
       connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password};auth = SHA256_MEMORY";
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(connectionString));
 
-      connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password};sslmode=none;auth=SHA256_MEMORY";
+      connectionString = $"server={Host};user={builder.UserID};port={XPort};password={builder.Password};sslmode=disabled;auth=SHA256_MEMORY";
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(connectionString));
       ExecuteSQL("flush privileges");
       //Uri
       connectionStringUri = $"mysqlx://{builder.UserID}:{builder.Password}@{builder.Server}:{XPort}?auth=SHA256_MEMORY";
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(connectionStringUri));
 
-      connectionStringUri = $"mysqlx://{builder.UserID}:{builder.Password}@{builder.Server}:{XPort}?sslmode=none;auth=SHA256_MEMORY";
+      connectionStringUri = $"mysqlx://{builder.UserID}:{builder.Password}@{builder.Server}:{XPort}?sslmode=disabled;auth=SHA256_MEMORY";
       Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionStringUri));
       ExecuteSQL("flush privileges");
       //Anonymous Object
@@ -432,7 +432,7 @@ public void NativeAuthValidAndInvalidConnection()
       using (var session1 = MySQLX.GetSession(cs + ";auth=mysql41"))
         Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
-      using (var session1 = MySQLX.GetSession(cs + ";auth=mysql41;ssl-mode=none"))
+      using (var session1 = MySQLX.GetSession(cs + ";auth=mysql41;ssl-mode=disabled"))
         Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(cs + ";auth=mysql41;ssl-mode=Required"))
@@ -444,7 +444,7 @@ public void NativeAuthValidAndInvalidConnection()
       using (var session1 = MySQLX.GetSession(ConnectionString + ";auth=plain;ssl-mode=Required"))
         Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
-      using (var session1 = MySQLX.GetSession(cs + ";ssl-mode=none"))
+      using (var session1 = MySQLX.GetSession(cs + ";ssl-mode=disabled"))
         Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(ConnectionString + ";ssl-mode=Required"))
@@ -454,12 +454,12 @@ public void NativeAuthValidAndInvalidConnection()
         Assert.That(result[0][1].ToString().Contains("TLSv1"));
       }
 
-      Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";auth=PLAIN;ssl-mode=none"));
+      Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";auth=PLAIN;ssl-mode=disabled"));
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";auth=EXTERNAL"));
-      Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";auth=EXTERNAL;ssl-mode=none"));
+      Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";auth=EXTERNAL;ssl-mode=disabled"));
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionString + ";auth=EXTERNAL;ssl-mode=Required"));
       Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionString + ";auth=INVALID"));
-      Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionString + ";auth=INVALID;ssl-mode=none"));
+      Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionString + ";auth=INVALID;ssl-mode=disabled"));
       Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionString + ";auth=INVALID;ssl-mode=Required"));
       //Uri
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative))
@@ -468,7 +468,7 @@ public void NativeAuthValidAndInvalidConnection()
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?auth=MySQL41"))
         Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
-      using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?auth=MySQL41&ssl-mode=none"))
+      using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?auth=MySQL41&ssl-mode=disabled"))
         Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?auth=MySQL41&ssl-mode=Required"))
@@ -477,12 +477,12 @@ public void NativeAuthValidAndInvalidConnection()
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?auth=PLAIN"))
         Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
-      Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUriNative + "?auth=PLAIN&ssl-mode=none"));
+      Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUriNative + "?auth=PLAIN&ssl-mode=disabled"));
 
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?auth=PLAIN&ssl-mode=Required"))
         Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.PLAIN));
 
-      using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?ssl-mode=none"))
+      using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?ssl-mode=disabled"))
         Assert.That(session1.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.MYSQL41));
 
       using (var session1 = MySQLX.GetSession(ConnectionStringUriNative + "?ssl-mode=Required"))
@@ -493,10 +493,10 @@ public void NativeAuthValidAndInvalidConnection()
       }
 
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUriNative + "?auth=EXTERNAL"));
-      Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUriNative + "?auth=EXTERNAL&ssl-mode=none"));
+      Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUriNative + "?auth=EXTERNAL&ssl-mode=disabled"));
       Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUriNative + "?auth=EXTERNAL&ssl-mode=Required"));
       Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionStringUriNative + "?auth=INVALID"));
-      Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionStringUriNative + "?auth=INVALID&ssl-mode=none"));
+      Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionStringUriNative + "?auth=INVALID&ssl-mode=disabled"));
       Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionStringUriNative + "?auth=INVALID&ssl-mode=Required"));
       //Anonymous Object
       using (var session1 = MySQLX.GetSession(new
@@ -635,7 +635,7 @@ public void ConnectUsingPlainAuth()
       }
 
       // Should fail since PLAIN requires TLS to be enabled.
-      Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUri + "?auth=PLAIN&sslmode=none"));
+      Assert.Throws<MySqlException>(() => MySQLX.GetSession(ConnectionStringUri + "?auth=PLAIN&sslmode=disabled"));
     }
 
     [Test]
@@ -662,7 +662,7 @@ public void ConnectUsingSha256PasswordPlugin()
       }
 
       // Connect over non-TLS connection.
-      using (var session = MySQLX.GetSession(connectionStringUri + "?sslmode=none"))
+      using (var session = MySQLX.GetSession(connectionStringUri + "?sslmode=disabled"))
       {
         Assert.That(session.InternalSession.SessionState, Is.EqualTo(SessionState.Open));
         Assert.That(session.Settings.Auth, Is.EqualTo(MySqlAuthenticationMode.SHA256_MEMORY));
diff --git a/MySql.Web/src/SessionProvider.cs b/MySql.Web/src/SessionProvider.cs
index c24f741f1..1b0492422 100644
--- a/MySql.Web/src/SessionProvider.cs
+++ b/MySql.Web/src/SessionProvider.cs
@@ -539,8 +539,6 @@ private SessionStateStoreData GetSessionStoreItem(bool lockRecord,
       byte[] serializedItems = null;
       // True if a record is found in the database.
       bool foundRecord = false;
-      // True if the returned session item is expired and needs to be deleted.
-      bool deleteData = false;
       // Timeout value from the data store.
       int timeout = 0;
 
@@ -596,8 +594,6 @@ private SessionStateStoreData GetSessionStoreItem(bool lockRecord,
               {
                 //The record was expired. Mark it as not locked.
                 locked = false;
-                // The session was expired. Mark the data for deletion.
-                deleteData = true;
               }
               else
               {
diff --git a/MySql.Web/src/SimpleRoleProvider.cs b/MySql.Web/src/SimpleRoleProvider.cs
index f75e7f193..0016f28e6 100644
--- a/MySql.Web/src/SimpleRoleProvider.cs
+++ b/MySql.Web/src/SimpleRoleProvider.cs
@@ -399,7 +399,7 @@ public override string ApplicationName
     /// <summary>
     /// Gets the name of the table storing user information.
     /// </summary>
-    public string UserTableName
+    public new string UserTableName
     {
       get
       {
@@ -417,7 +417,7 @@ internal set
     /// <summary>
     /// Gets the name of the column storing the user ids.
     /// </summary>
-    public string UserIdColumn
+    public new string UserIdColumn
     {
       get
       {
@@ -435,7 +435,7 @@ internal set
     /// <summary>
     /// Gets the name of the column storing the user names.
     /// </summary>
-    public string UserNameColumn
+    public new string UserNameColumn
     {
       get
       {
diff --git a/MySql.Web/tests/MySql.Web.Tests.csproj b/MySql.Web/tests/MySql.Web.Tests.csproj
index f53554547..164c97a20 100644
--- a/MySql.Web/tests/MySql.Web.Tests.csproj
+++ b/MySql.Web/tests/MySql.Web.Tests.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <ProjectReference Include="..\..\MySQL.Data\src\MySql.Data.csproj" />

From 709b9c8aca3cea783787f164311958f68a4dfe8b Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Mon, 7 Jul 2025 16:46:20 -0600
Subject: [PATCH 89/99] Bug#38142312 [Incorrect column alias used in CASE-WHEN
 when querying Table-Per-Type inheritance with subclass column name clash]

Change-Id: I22b2f63c80182acab48ee7227088754b56299200
---
 CHANGES                                       |  1 +
 .../src/Statements/SelectStatement.cs         |  2 +-
 .../CodeFirstFixture.cs                       |  1 +
 .../CodeFirstTests.cs                         | 32 +++++++++++++
 .../Vehicle.cs                                | 45 +++++++++++++++++++
 5 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index f1015ac60..6a21308ff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
 9.5.0
 - Cleaned up build warnings (WL17046).
+- Fixed bug Incorrect column alias used in CASE-WHEN when querying Table-Per-Type inheritance with subclass column name clash (MySQL Bug #118572, Oracle Bug #38142312). Thanks to Kristoffer Sjöberg for the contribution.
 
 
 9.4.0
diff --git a/EntityFramework/src/Statements/SelectStatement.cs b/EntityFramework/src/Statements/SelectStatement.cs
index cf355998e..8517b4aeb 100644
--- a/EntityFramework/src/Statements/SelectStatement.cs
+++ b/EntityFramework/src/Statements/SelectStatement.cs
@@ -233,7 +233,7 @@ List<ColumnFragment> GetDefaultColumnsForFragment(InputFragment input)
           {
             newColumn.ColumnAlias = cf.ColumnAlias;
             newColumn.PushInput(cf.ActualColumnName);
-            if (cf.TableName != null)
+            if (cf.TableName != null && !select.From.Scoped)
               newColumn.PushInput(cf.TableName);
           }
           else
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs
index 95fe2c649..96a485eb8 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstFixture.cs
@@ -136,6 +136,7 @@ public CodeFirstFixture()
       DeleteContext<ContextForLongFk>();
       DeleteContext<ContextForTinyPk>();
       DeleteContext<ContextForBigIntPk>();
+      DeleteContext<Bug38142312_DbContext>();
     }
 
     public static string GetEFConnectionString<T>(string database = null) where T : DbContext
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
index d3a904a37..1b61ed4f0 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/CodeFirstTests.cs
@@ -2288,5 +2288,37 @@ public void TestListMatchingLike()
         Assert.That(list.Count(), Is.EqualTo(0));
       }
     }
+
+
+    /// <summary>
+    /// Bug #38142312 [Incorrect column alias used in CASE-WHEN when querying Table-Per-Type inheritance with subclass column name clash]
+    /// </summary>
+    [Test]
+    public void Bug38142312_Test()
+    {
+      using (Bug38142312_DbContext context = new Bug38142312_DbContext())
+      {
+        context.Database.Delete();
+        context.Database.Initialize(true);
+        var manuf = context.Manufacturers.Add(new Manufacturer4 { Name = "ACME" });
+        context.Vehicles.Add(new Car_Bug38142312 { Id = 1, Name = "Mustang", Year = 2012, Status = "stCar", CarProperty = "Car", Manufacturer = manuf });
+        context.Vehicles.Add(new Bike_Bug38142312 { Id = 101, Name = "Mountain", Year = 2011, Status = "stBike", BikeProperty = "Bike", Manufacturer = manuf });
+        context.Vehicles.Add(new Plane_Bug38142312 { Id = 1001, Name = "Air", Year = 2011, Status = "stPlane", PlaneProperty = "Plane", Manufacturer = manuf });
+        context.SaveChanges();
+
+        var vehiclesfromdb = context.Manufacturers.SelectMany(v => v.Vehicles).ToList();
+
+        Assert.That(vehiclesfromdb.Count, Is.EqualTo(3));
+        Assert.That(vehiclesfromdb.OfType<Car_Bug38142312>().Single().Name, Is.EqualTo("Mustang"));
+        Assert.That(vehiclesfromdb.OfType<Car_Bug38142312>().Single().CarProperty, Is.EqualTo("Car"));
+        Assert.That(vehiclesfromdb.OfType<Car_Bug38142312>().Single().Status, Is.EqualTo("stCar"));
+        Assert.That(vehiclesfromdb.OfType<Bike_Bug38142312>().Single().Name, Is.EqualTo("Mountain"));
+        Assert.That(vehiclesfromdb.OfType<Bike_Bug38142312>().Single().BikeProperty, Is.EqualTo("Bike"));
+        Assert.That(vehiclesfromdb.OfType<Bike_Bug38142312>().Single().Status, Is.EqualTo("stBike"));
+        Assert.That(vehiclesfromdb.OfType<Plane_Bug38142312>().Single().Name, Is.EqualTo("Air"));
+        Assert.That(vehiclesfromdb.OfType<Plane_Bug38142312>().Single().PlaneProperty, Is.EqualTo("Plane"));
+        Assert.That(vehiclesfromdb.OfType<Plane_Bug38142312>().Single().Status, Is.EqualTo("stPlane"));
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Vehicle.cs b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Vehicle.cs
index f95bbbfa1..e2ac254e1 100644
--- a/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Vehicle.cs
+++ b/EntityFramework/tests/MySql.EntityFramework.CodeFirst.Tests/Vehicle.cs
@@ -127,6 +127,25 @@ public class Bike4 : Vehicle4
   {
     public string BikeProperty { get; set; }
   }
+
+  public class Car_Bug38142312 : Vehicle4
+  {
+    public string CarProperty { get; set; }
+    public string Status { get; set; }
+  }
+
+  public class Bike_Bug38142312 : Vehicle4
+  {
+    public string BikeProperty { get; set; }
+    public string Status { get; set; }
+  }
+
+  public class Plane_Bug38142312 : Vehicle4
+  {
+    public string PlaneProperty { get; set; }
+    public string Status { get; set; }
+  }
+
   public class Manufacturer4
   {
     [Key]
@@ -148,6 +167,7 @@ public class Vehicle4
     [ForeignKey(nameof(ManufacturerId))]
     public virtual Manufacturer4 Manufacturer { get; set; }
   }
+
   [DbConfigurationType(typeof(MySqlEFConfiguration))]
   public class VehicleDbContext4 : DbContext
   {
@@ -166,10 +186,35 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
       modelBuilder.Entity<Bike4>().ToTable("Bikes");
     }
   }
+
   public class VehicleDBInitializer4 : DropCreateDatabaseReallyAlways<VehicleDbContext4>
   {
   }
 
+  [DbConfigurationType(typeof(MySqlEFConfiguration))]
+  public class Bug38142312_DbContext : DbContext
+  {
+    public DbSet<Vehicle4> Vehicles { get; set; }
+    public DbSet<Manufacturer4> Manufacturers { get; set; }
+
+    public Bug38142312_DbContext() : base(CodeFirstFixture.GetEFConnectionString<Bug38142312_DbContext>())
+    {
+      Database.SetInitializer<Bug38142312_DbContext>(new Bug38142312_DbContextInitializer());
+
+    }
+    protected override void OnModelCreating(DbModelBuilder modelBuilder)
+    {
+      modelBuilder.Entity<Vehicle4>().ToTable("Vehicles");
+      modelBuilder.Entity<Car_Bug38142312>().ToTable("Cars");
+      modelBuilder.Entity<Bike_Bug38142312>().ToTable("Bikes");
+      modelBuilder.Entity<Plane_Bug38142312>().ToTable("Planes");
+    }
+  }
+
+  public class Bug38142312_DbContextInitializer : DropCreateDatabaseReallyAlways<Bug38142312_DbContext>
+  {
+  }
+
   public class Accessory
   {
     [Key]

From 497f0979b5d7d2d70160b9178f61a4629114cd40 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 9 Jul 2025 18:46:06 -0600
Subject: [PATCH 90/99] Bug#36043278 [Certain sequence of special characters
 can break connection string validation.]

Change-Id: Ie34c93919b704465c8d4974055764fe713c379a9
---
 CHANGES                                       |  1 +
 .../src/MySqlBaseConnectionStringBuilder.cs   | 59 +++++++------
 .../src/MySqlConnectionStringBuilder.cs       |  2 +-
 .../ConnectionStringBuilderTests.cs           | 83 +++++++++++++++++++
 4 files changed, 118 insertions(+), 27 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6a21308ff..18e8d5046 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 9.5.0
 - Cleaned up build warnings (WL17046).
 - Fixed bug Incorrect column alias used in CASE-WHEN when querying Table-Per-Type inheritance with subclass column name clash (MySQL Bug #118572, Oracle Bug #38142312). Thanks to Kristoffer Sjöberg for the contribution.
+- Fixed bug Certain sequence of special characters can break connection string validation (MySQL Bug #111797, Oracle Bug #36043278).
 
 
 9.4.0
diff --git a/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs b/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
index 3b5ca0633..7805c5f8e 100644
--- a/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
+++ b/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
@@ -27,8 +27,11 @@
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 using MySql.Data.Common;
+using MySql.Data.Failover;
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Data.Common;
 using System.Globalization;
@@ -439,6 +442,14 @@ public string CharacterSet
 
     #endregion
 
+    private string GetOptionValue(MySqlConnectionStringOption option, DbConnectionStringBuilder connStrBuilder)
+    {
+      return connStrBuilder
+        .Cast<KeyValuePair<string, object>>()
+        .FirstOrDefault(kvp => option.Keyword == kvp.Key || option.Synonyms.Contains(kvp.Key))
+        .Value?.ToString();
+    }
+
     /// <summary>
     /// Analyzes the connection string for potential duplicated or invalid connection options.
     /// </summary>
@@ -450,39 +461,35 @@ internal void AnalyzeConnectionString(string connectionString, bool isXProtocol,
     {
       if (!isAnalyzed && !string.IsNullOrWhiteSpace(connectionString))
       {
-        string[] queries = connectionString.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
-        bool isDnsSrv = false;
+        DbConnectionStringBuilder connStrBuilder = new DbConnectionStringBuilder();
+        connStrBuilder.ConnectionString = connectionString;
 
-        if (queries.FirstOrDefault(q => q.ToLowerInvariant().Contains("dns-srv=true")) != null
-              || queries.FirstOrDefault(q => q.ToLowerInvariant().Contains("dnssrv=true")) != null)
-          isDnsSrv = true;
+        string dnsSrvValue;
+        bool isDnsSrv = false;
+        if ((dnsSrvValue = GetOptionValue(Options["dns-srv"], connStrBuilder)) != null && !bool.TryParse(dnsSrvValue, out isDnsSrv))
+          throw new ArgumentException(string.Format(Resources.InvalidConnectionStringValue, dnsSrvValue, "dns-srv"));
 
-        foreach (string query in queries)
+        // DNS SRV option can't be used if Port, Unix Socket or Multihost are specified
+        if (isDnsSrv)
         {
-          string[] keyValue = query.Split('=');
-          if (keyValue.Length % 2 != 0)
-            continue;
+          if (connStrBuilder.ContainsKey("port")  && !isDefaultPort)
+            throw new ArgumentException(Resources.DnsSrvInvalidConnOptionPort);
 
-          var keyword = keyValue[0].ToLowerInvariant().Trim();
-          var value = query.Contains(",") ? query.Replace(keyword, "") : keyValue[1].ToLowerInvariant();
-          MySqlConnectionStringOption option = Options.Options.Where(o => o.Keyword == keyword || (o.Synonyms != null && o.Synonyms.Contains(keyword))).FirstOrDefault();
+          string serverOptionValue = GetOptionValue( Options["server"], connStrBuilder);
+          if (FailoverManager.ParseHostList(serverOptionValue, false, false) > 1)
+            throw new ArgumentException(Resources.DnsSrvInvalidConnOptionMultihost);
 
-          // DNS SRV option can't be used if Port, Unix Socket or Multihost are specified
-          if (isDnsSrv)
-          {
-            if (option.Keyword == "port" && !isDefaultPort)
-              throw new ArgumentException(Resources.DnsSrvInvalidConnOptionPort);
-            if (option.Keyword == "server" && ((value.Contains("address") && value.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries).Length > 2) || value.Contains(",")))
-              throw new ArgumentException(Resources.DnsSrvInvalidConnOptionMultihost);
-            if (option.Keyword == "protocol" && (value.ToLowerInvariant().Contains("unix") || value.ToLowerInvariant().Contains("unixsocket")))
-              throw new ArgumentException(Resources.DnsSrvInvalidConnOptionUnixSocket);
-          }
-
-          if (option == null) continue;
+          MySqlConnectionProtocol protocolOptionValue;
+          if (Enum.TryParse(GetOptionValue(Options["protocol"], connStrBuilder), true, out protocolOptionValue) && (protocolOptionValue == MySqlConnectionProtocol.Unix || protocolOptionValue == MySqlConnectionProtocol.UnixSocket))
+            throw new ArgumentException(Resources.DnsSrvInvalidConnOptionUnixSocket);
+        }
 
+        if (isXProtocol)
+        {
           // Preferred is not allowed for the X Protocol.
-          if (isXProtocol && option.Keyword == "sslmode" && (value == "preferred" || value == "prefered"))
-            throw new ArgumentException(string.Format(Resources.InvalidSslMode, keyValue[1]));
+          MySqlSslMode sslModeOptionValue;
+          if (Enum.TryParse(GetOptionValue(Options["sslmode"], connStrBuilder), true, out sslModeOptionValue) && (sslModeOptionValue == MySqlSslMode.Preferred || sslModeOptionValue == MySqlSslMode.Prefered))
+            throw new ArgumentException(string.Format(Resources.InvalidSslMode, sslModeOptionValue));
         }
       }
     }
diff --git a/MySQL.Data/src/MySqlConnectionStringBuilder.cs b/MySQL.Data/src/MySqlConnectionStringBuilder.cs
index 814c7315f..0627dd96d 100644
--- a/MySQL.Data/src/MySqlConnectionStringBuilder.cs
+++ b/MySQL.Data/src/MySqlConnectionStringBuilder.cs
@@ -268,7 +268,7 @@ public MySqlConnectionStringBuilder()
     /// <param name="isAnalyzed">Flag that indicates if the connection string has been analyzed.</param>
     public MySqlConnectionStringBuilder(string connectionString, bool isAnalyzed = false) : this()
     {
-      AnalyzeConnectionString(connectionString, false, isAnalyzed: isAnalyzed);
+      AnalyzeConnectionString(connectionString, false, isDefaultPort: false, isAnalyzed: isAnalyzed);
       lock (this)
       {
         ConnectionString = connectionString;
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
index e399e076e..3c0007b1c 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
@@ -464,5 +464,88 @@ public void KerberosAuthModeTest()
       connString = "kerberosauthmode=INVALID";
       Assert.Throws<ArgumentException>(() => conn = new MySqlConnection(connString));
     }
+
+    /// <summary>
+    /// Bug#36043278 - Certain sequence of special characters can break connection string validation.
+    /// </summary>
+    [TestCase("foo;=bar,baz", "", false, false)]
+    [TestCase("foo=bar=baz=qux", "", false, false)]
+    [TestCase(";dnssrv=true;port=123;", "", false, false)]
+    [TestCase("foopass", "(address=myhost),(address=yourhost)", false, false)]
+    [TestCase("foopass", "(address=myhost),(address=yourhost)", true, true)]
+    [TestCase("foopass", "myhost,", false, false)]
+    [TestCase("foopass", "myhost", true, true)]
+    [TestCase("foopass", "(address=myhost,priority=10)", false, false)]
+    [TestCase("foopass", "(address=myhost,priority=10)", true, true)]
+    public void Bug36043278_stringBuilder(string pass, string server, bool dns, bool throws)
+    {
+      var builder = new MySqlConnectionStringBuilder
+      {
+        Server = server != "" ? server : Settings.Server,
+        UserID = Settings.UserID,
+        Password = pass,
+        Port = Settings.Port,
+        DnsSrv = dns
+      };
+
+      if (throws)
+      {
+        Assert.Throws<ArgumentException>(() =>
+        {
+          MySqlConnection conn = new MySqlConnection(builder.GetConnectionString(true));
+        });
+      }
+      else
+      {
+        Assert.DoesNotThrow(() =>
+        {
+          MySqlConnection conn = new MySqlConnection(builder.GetConnectionString(true));
+        });
+      }
+
+      Assert.That(builder.Password, Is.EqualTo(pass));
+      Assert.That(builder.DnsSrv, Is.EqualTo(dns));
+      Assert.That(builder.Port, Is.EqualTo(Settings.Port));
+    }
+
+    [TestCase("server=localhost;uid=dummyuser;port=4823;password=\"';'@dnssrv=true;\"\"port=123;\"", false,  false)]
+    [TestCase("server=localhost;uid=dummyuser;port=4823;dns-srv=foobar;password=\"';'@dnssrv=true;\"\"port=123;\"", false, true)]
+    [TestCase("server=localhost;uid=dummyuser;port=4823;dns-srv=\"foobar;port=12345\";password=\"';'@dnssrv=true;\"\"port=123;\"", false, true)]
+    [TestCase("server=localhost;uid=dummyuser;port=4823;dns-srv=true;password=\"';'@dnssrv=true;\"\"port=123;\"", true, true)]
+    [TestCase("server=localhost;uid=dummyuser;dns-srv=tRue;password=\"';'@dnssrv=true;\"\"port=123;\"", true, false)]
+    [TestCase("server=(address=myhost),(address=yourhost);uid=dummyuser;dns-srv=true;password=\"';'@dnssrv=true;\"\"port=123;\"", true, true)]
+    [TestCase("server=localhost;protocol=uNiX;uid=dummyuser;dns-srv=tRue;password=\"';'@dnssrv=true;\"\"port=123;\"", true, true)]
+    public void Bug36043278_connString(string connString,  bool dns, bool throws)
+    {
+      if (throws)
+      {
+        Assert.Throws<ArgumentException>(() =>
+        {
+          MySqlConnection conn = new MySqlConnection(connString);
+        });
+
+        Assert.Throws<ArgumentException>(() =>
+        {
+          MySqlConnectionStringBuilder builder = new MySqlConnectionStringBuilder(connString);
+        });
+      }
+      else
+      {
+        Assert.DoesNotThrow(() =>
+        {
+          MySqlConnection conn = new MySqlConnection(connString);
+        });
+
+        MySqlConnectionStringBuilder builder = new MySqlConnectionStringBuilder(connString);
+
+        Assert.DoesNotThrow(() =>
+        {
+          MySqlConnection conn = new MySqlConnection(builder.GetConnectionString(true));
+        });
+
+        Assert.That(builder.Password, Is.EqualTo("';'@dnssrv=true;\"port=123;"));
+        Assert.That(builder.DnsSrv, Is.EqualTo(dns));
+      }
+    }
   }
 }

From 0b156431e1e458d1e3b1badf0cfe9dd634b524b7 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Wed, 30 Jul 2025 15:52:14 -0600
Subject: [PATCH 91/99] WL#17115 [Remove 'Prefered' option from MySqlSslMode]

Change-Id: I0fe4744c697aa1ed0e8eb55ae9960d28980589a6
---
 CHANGES                                       |  1 +
 .../src/MySqlBaseConnectionStringBuilder.cs   |  2 +-
 MySQL.Data/src/MysqlDefs.cs                   |  4 --
 MySQL.Data/src/NativeDriver.cs                |  4 +-
 .../ConnectionStringBuilderTests.cs           | 18 ++++++++
 MySQL.Data/tests/MySql.Data.Tests/SslTests.cs |  4 +-
 .../tests/MySqlX.Data.Tests/SslTests.cs       | 45 ++++---------------
 .../XConnectionStringBuilderTests.cs          |  4 +-
 8 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/CHANGES b/CHANGES
index 18e8d5046..6a227b134 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 - Cleaned up build warnings (WL17046).
 - Fixed bug Incorrect column alias used in CASE-WHEN when querying Table-Per-Type inheritance with subclass column name clash (MySQL Bug #118572, Oracle Bug #38142312). Thanks to Kristoffer Sjöberg for the contribution.
 - Fixed bug Certain sequence of special characters can break connection string validation (MySQL Bug #111797, Oracle Bug #36043278).
+- Removed `Prefered' option from MySqlSslMode (WL17115).
 
 
 9.4.0
diff --git a/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs b/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
index 7805c5f8e..b7691847c 100644
--- a/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
+++ b/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
@@ -488,7 +488,7 @@ internal void AnalyzeConnectionString(string connectionString, bool isXProtocol,
         {
           // Preferred is not allowed for the X Protocol.
           MySqlSslMode sslModeOptionValue;
-          if (Enum.TryParse(GetOptionValue(Options["sslmode"], connStrBuilder), true, out sslModeOptionValue) && (sslModeOptionValue == MySqlSslMode.Preferred || sslModeOptionValue == MySqlSslMode.Prefered))
+          if (Enum.TryParse(GetOptionValue(Options["sslmode"], connStrBuilder), true, out sslModeOptionValue) && sslModeOptionValue == MySqlSslMode.Preferred)
             throw new ArgumentException(string.Format(Resources.InvalidSslMode, sslModeOptionValue));
         }
       }
diff --git a/MySQL.Data/src/MysqlDefs.cs b/MySQL.Data/src/MysqlDefs.cs
index 9e033f93c..aff32b556 100644
--- a/MySQL.Data/src/MysqlDefs.cs
+++ b/MySQL.Data/src/MysqlDefs.cs
@@ -416,10 +416,6 @@ public enum MySqlSslMode
     /// </summary>
     Preferred,
     /// <summary>
-    /// Use SSL, if server supports it. This option is only available for the classic protocol.
-    /// </summary>
-    Prefered = Preferred,
-    /// <summary>
     /// Always use SSL. Deny connection if server does not support SSL.
     /// Do not perform server certificate validation.
     /// This is the default SSL mode when the same isn't specified as part of the connection string.
diff --git a/MySQL.Data/src/NativeDriver.cs b/MySQL.Data/src/NativeDriver.cs
index a726c2376..70bcc2f5a 100644
--- a/MySQL.Data/src/NativeDriver.cs
+++ b/MySQL.Data/src/NativeDriver.cs
@@ -275,13 +275,13 @@ public async Task OpenAsync(bool execAsync, CancellationToken cancellationToken)
       // Server doesn't support SSL connections
       if ((serverCaps & ClientFlags.SSL) == 0)
       {
-        if (Settings.SslMode != MySqlSslMode.Disabled && Settings.SslMode != MySqlSslMode.Prefered)
+        if (Settings.SslMode != MySqlSslMode.Disabled && Settings.SslMode != MySqlSslMode.Preferred)
           throw new MySqlException(string.Format(Resources.NoServerSSLSupport, Settings.Server));
       }
       // Current connection doesn't support SSL connections
       else if ((connectionFlags & ClientFlags.SSL) == 0)
       {
-        if (Settings.SslMode != MySqlSslMode.Disabled && Settings.SslMode != MySqlSslMode.Prefered)
+        if (Settings.SslMode != MySqlSslMode.Disabled && Settings.SslMode != MySqlSslMode.Preferred)
           throw new MySqlException(string.Format(Resources.SslNotAllowedForConnectionProtocol, Settings.ConnectionProtocol));
       }
       // Server and connection supports SSL connections and Client are requisting a secure connection
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
index 3c0007b1c..4f8f4d95e 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
@@ -547,5 +547,23 @@ public void Bug36043278_connString(string connString,  bool dns, bool throws)
         Assert.That(builder.DnsSrv, Is.EqualTo(dns));
       }
     }
+
+    /// <summary>
+    /// WL17115 - Remove 'Prefered' option from MySqlSslMode
+    /// </summary>
+    [Test]
+    public void WL17115()
+    {
+      string connString = "server=localhost;uid=dummyuser;port=4823;ssl-mode=prefered";
+      Assert.Throws<ArgumentException>(() =>
+      {
+        MySqlConnectionStringBuilder builder = new MySqlConnectionStringBuilder(connString);
+      });
+
+      Assert.Throws<ArgumentException>(() =>
+      {
+        MySqlConnection conn = new MySqlConnection(connString);
+      });
+    }
   }
 }
diff --git a/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
index f3513c8b1..c10b4bcf6 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/SslTests.cs
@@ -850,7 +850,7 @@ public void CorrectSslcaWrongSslkeySslcertRequiredMode()
         connClassic.SslCert = sslcertlist[i];
         connClassic.SslKey = sslkeylist[i];
         connClassic.SslCa = _sslCa;
-        connClassic.SslMode = MySqlSslMode.Prefered;
+        connClassic.SslMode = MySqlSslMode.Preferred;
         using (var c = new MySqlConnection(connClassic.ConnectionString))
         {
           c.Open();
@@ -924,7 +924,7 @@ public void CorrectSslcaNoSslkeyorCertRequiredMode()
       connClassic.UserID = Settings.UserID;
       connClassic.Password = Settings.Password;
       connClassic.SslCa = _sslCa;
-      connClassic.SslMode = MySqlSslMode.Prefered;
+      connClassic.SslMode = MySqlSslMode.Preferred;
       using (var c = new MySqlConnection(connClassic.ConnectionString))
       {
         c.Open();
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
index 40ea368c4..0254f9ea4 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/SslTests.cs
@@ -122,17 +122,11 @@ public void SslRequiredByDefault()
     [Test]
     public void SslPreferredIsInvalid()
     {
-      string prefered = "Prefered";
-#if NET8_0_OR_GREATER
-      prefered = "Preferred";
-#endif
       var expectedErrorMessage = "Value '{0}' is not of the correct type";
 
       // In connection string.
       var exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionStringUri + "?ssl-mode=Preferred"));
       Assert.That(exception.Message, Is.EqualTo(string.Format(expectedErrorMessage, "Preferred")));
-      exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(ConnectionStringUri + "?ssl-mode=Prefered"));
-      Assert.That(exception.Message, Is.EqualTo(string.Format(expectedErrorMessage, "Prefered")));
 
       // In anonymous object.
       var builder = new MySqlXConnectionStringBuilder(ConnectionString);
@@ -142,21 +136,16 @@ public void SslPreferredIsInvalid()
         port = builder.Port,
         user = builder.UserID,
         password = builder.Password,
-        sslmode = MySqlSslMode.Prefered
+        sslmode = MySqlSslMode.Preferred
       };
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionObject));
-      Assert.That(exception.Message, Is.EqualTo(string.Format(expectedErrorMessage, prefered)));
+      Assert.That(exception.Message, Is.EqualTo(string.Format(expectedErrorMessage, "Preferred")));
 
       // In MySqlXConnectionStringBuilder.
-      builder = new MySqlXConnectionStringBuilder(ConnectionString);
-      builder.SslMode = MySqlSslMode.Prefered;
-      exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionObject));
-      Assert.That(exception.Message, Is.EqualTo(string.Format(expectedErrorMessage, prefered)));
-
       builder = new MySqlXConnectionStringBuilder(ConnectionString);
       builder.SslMode = MySqlSslMode.Preferred;
       exception = Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connectionObject));
-      Assert.That(exception.Message, Is.EqualTo(string.Format(expectedErrorMessage, prefered)));
+      Assert.That(exception.Message, Is.EqualTo(string.Format(expectedErrorMessage, "Preferred")));
     }
 
     [Test]
@@ -766,9 +755,9 @@ public void PemCertDifferentSSLmodes()
       string CommandText2 = "show  status like '%Ssl_version%';";
       string connStr = null;
 
-      string[] sslmodes = { "Disabled", "Prefered", "Preferred", "Required", "VerifyCA" };
+      string[] sslmodes = { "Disabled", "Preferred", "Required", "VerifyCA" };
       MySqlSslMode[] sslmode =
-          { MySqlSslMode.Disabled,MySqlSslMode.Prefered,MySqlSslMode.Preferred,MySqlSslMode.Required,MySqlSslMode.VerifyCA };
+          { MySqlSslMode.Disabled,MySqlSslMode.Preferred,MySqlSslMode.Required,MySqlSslMode.VerifyCA };
       string tls = "TLSv1.2";
 
       for (int i = 0; i < sslmodes.Length; i++)
@@ -785,11 +774,7 @@ public void PemCertDifferentSSLmodes()
         else
         {
           string sslcompare = sslmodes[i];
-          if (i == 2)
-          {
-            sslcompare = "Preferred";
-          }
-          if (i == 1 || i == 2)
+          if (i == 1)
           {
             Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connStr));
           }
@@ -816,13 +801,9 @@ public void PemCertDifferentSSLmodes()
         }
         else
         {
-          if (i == 1 || i == 2)
+          if (i == 1)
           {
             string sslcompare = sslmodes[i];
-            if (i == 2)
-            {
-              sslcompare = "Preferred";
-            }
             Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connStr));
           }
           else
@@ -861,11 +842,7 @@ public void PemCertDifferentSSLmodes()
         else
         {
           string sslcompare = sslmodes[i];
-          if (i == 2)
-          {
-            sslcompare = "Prefered";
-          }
-          if (i == 1 | i == 2)
+          if (i == 1)
           {
             Assert.Throws<ArgumentException>(() => MySQLX.GetSession(connObject));
           }
@@ -888,13 +865,9 @@ public void PemCertDifferentSSLmodes()
         conn.SslCa = sslCa;
         conn.SslMode = sslmode[i];
 
-        if (i == 1 || i == 2)
+        if (i == 1)
         {
           string sslcompare = sslmodes[i];
-          if (i == 2)
-          {
-            sslcompare = "Prefered";
-          }
           Assert.Throws<ArgumentException>(() => MySQLX.GetSession(conn.ConnectionString));
         }
         else if (i != 0)
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
index 616f67d33..5f754f60e 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/XConnectionStringBuilderTests.cs
@@ -105,11 +105,11 @@ public void ValidateTlsVersionOptionAsProperty(string options, string result)
     }
 
 #if !NET452
-    [TestCase(MySqlSslMode.Prefered, "TlSv1.2, tLsV11, TLS13, tls1.0", "Tls12, Tls13")]
+    [TestCase(MySqlSslMode.Preferred, "TlSv1.2, tLsV11, TLS13, tls1.0", "Tls12, Tls13")]
     [TestCase(MySqlSslMode.Disabled, "TlSv1.2, tLsV11, TLS13, tls1.0", "TLS12, TLS13")]
     [TestCase(null, "TlSv1.2, tLsV11, TLS13, tls1.0", "Tls12, Tls13")]
 #endif
-    [TestCase(MySqlSslMode.Prefered, "TlSv1.2, tLsV11, tls1.0", "Tls12")]
+    [TestCase(MySqlSslMode.Preferred, "TlSv1.2, tLsV11, tls1.0", "Tls12")]
     [TestCase(MySqlSslMode.Disabled, "TlSv1.2, tLsV11, tls1.0", "Tls12")]
     [TestCase(null, "TlSv1.2, tLsV11, tls1.0", "Tls12")]
     public void ValidateTlsVersionOptionAndSslMode(MySqlSslMode? sslMode1, string options, string result)

From ac9cfd041b69613ff0298fd17b38a67988fbf2e1 Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Mon, 11 Aug 2025 16:47:46 -0600
Subject: [PATCH 92/99] Bug#36043278 [Certain sequence of special characters
 can break connection string validation.] - continuation.

Change-Id: Ib96920208f0c7a4bda068124f73e147bedbacea3
---
 .../src/MySqlBaseConnectionStringBuilder.cs   | 37 ++++++++++++++++++-
 .../tests/MySqlX.Data.Tests/ClientTests.cs    | 10 ++---
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs b/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
index b7691847c..405835b31 100644
--- a/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
+++ b/MySQL.Data/src/MySqlBaseConnectionStringBuilder.cs
@@ -450,6 +450,24 @@ private string GetOptionValue(MySqlConnectionStringOption option, DbConnectionSt
         .Value?.ToString();
     }
 
+    private bool ParseArgumentException(string exMessage,string connString, out string newExMessage)
+    {
+      string idx = "index";
+      int startIndex = 0;
+      string indexValue = "";
+      if ((startIndex = exMessage.IndexOf(idx)) != -1)
+      {
+        indexValue = exMessage.Substring(startIndex + idx.Length + 1).Trim().Replace(".","");
+        newExMessage = string.Format("Incorrect value in Connection String near '{0}'.", connString.Substring(Int32.Parse(indexValue)).Split('=')[0]);
+        return true;
+      }
+      else
+      {
+        newExMessage = "";
+        return false;
+      }
+    }
+
     /// <summary>
     /// Analyzes the connection string for potential duplicated or invalid connection options.
     /// </summary>
@@ -462,8 +480,23 @@ internal void AnalyzeConnectionString(string connectionString, bool isXProtocol,
       if (!isAnalyzed && !string.IsNullOrWhiteSpace(connectionString))
       {
         DbConnectionStringBuilder connStrBuilder = new DbConnectionStringBuilder();
-        connStrBuilder.ConnectionString = connectionString;
-
+        try
+        {
+          connStrBuilder.ConnectionString = connectionString;
+        }
+        catch (ArgumentException argEx)
+        {
+          string exMessage = "";
+          if(ParseArgumentException(argEx.Message, connectionString, out exMessage))
+          {
+            throw new MySqlException(exMessage);
+          }
+          else
+          {
+            throw;
+          }
+        }
+        
         string dnsSrvValue;
         bool isDnsSrv = false;
         if ((dnsSrvValue = GetOptionValue(Options["dns-srv"], connStrBuilder)) != null && !bool.TryParse(dnsSrvValue, out isDnsSrv))
diff --git a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
index 4c3d59164..e9c49ab30 100644
--- a/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
+++ b/MySQL.Data/tests/MySqlX.Data.Tests/ClientTests.cs
@@ -1473,12 +1473,10 @@ public void GetSessionExceptionWithConnetionAttribute()
     {
       Assume.That(session.Version.isAtLeast(8, 0, 16), "This test is for MySql 8.0.16 or higher");
       MySqlXConnectionStringBuilder sb = new MySqlXConnectionStringBuilder(ConnectionString);
-      using (Client client = MySQLX.GetClient(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = "=" }
-      , "{ \"pooling\": { \"enabled\": true } }"))
-      {
-        Exception ex = Assert.Throws<MySqlException>(() => client.GetSession());
-        Assert.That(ex.Message, Is.EqualTo("The requested value '=' is invalid for the given keyword 'connection-attributes'"));
-      }
+
+      Exception ex = Assert.Throws<MySqlException>(() => 
+      MySQLX.GetClient(new { server = sb.Server, port = XPort, user = sb.UserID, password = sb.Password, ConnectionAttributes = "=" }, "{ \"pooling\": { \"enabled\": true } }"));
+      Assert.That(ex.Message, Is.EqualTo("Incorrect value in Connection String near 'connection-attributes'."));
     }
 
     [Test, Description("Connection Attributes with arrays")]

From 266c1110e7f887fe245d85ff63175fc4f31ad85a Mon Sep 17 00:00:00 2001
From: Omar Chavez <omar.c.chavez@oracle.com>
Date: Thu, 14 Aug 2025 17:40:54 -0600
Subject: [PATCH 93/99] Bug#37651419 [Connectionstrings crafted with
 `dns-srv=true` and (at least) POOLING set break
 MySqlConnectionStringBuilder].

Change-Id: I2a2db03167f9b014e8d5ee374dc8944a4d665a7e
---
 CHANGES                                            |  1 +
 .../ConnectionStringBuilderTests.cs                | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/CHANGES b/CHANGES
index 6a227b134..def7f414f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@
 - Fixed bug Incorrect column alias used in CASE-WHEN when querying Table-Per-Type inheritance with subclass column name clash (MySQL Bug #118572, Oracle Bug #38142312). Thanks to Kristoffer Sjöberg for the contribution.
 - Fixed bug Certain sequence of special characters can break connection string validation (MySQL Bug #111797, Oracle Bug #36043278).
 - Removed `Prefered' option from MySqlSslMode (WL17115).
+- Fixed bug Connectionstrings crafted with `dns-srv=true` and (at least) POOLING set break MySqlConnectionStringBuilder (MySQL Bug #117603, Oracle Bug #37651419).
 
 
 9.4.0
diff --git a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
index 4f8f4d95e..c414307ce 100644
--- a/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
+++ b/MySQL.Data/tests/MySql.Data.Tests/ConnectionStringBuilderTests.cs
@@ -565,5 +565,19 @@ public void WL17115()
         MySqlConnection conn = new MySqlConnection(connString);
       });
     }
+
+    /// <summary>
+    /// Bug#37651419 - Connectionstrings crafted with `dns-srv=true` and (at least) POOLING set break MySqlConnectionStringBuilder.
+    /// </summary>
+    [TestCase("SERVER=localhost; DATABASE=test; UID=test; dns-srv=True; PASSWORD=test; POOLING=true;")]
+    [TestCase("SERVER=localhost; DATABASE=test; UID=test; dns-srv=True; PASSWORD=test; POOLING=true; SSL-MODE=preferred;")]
+    [TestCase("SERVER=localhost; DATABASE=test; UID=test; dns-srv=True; PASSWORD=test; POOLING=true; COMPRESS=true;")]
+    public void Bug37651419(string connString)
+    {
+      Assert.DoesNotThrow(() =>
+      {
+        MySqlConnectionStringBuilder builder = new MySqlConnectionStringBuilder(connString);
+      });
+    }
   }
 }

From e33825a60649ad9becd9b0e979519fd9df85f91a Mon Sep 17 00:00:00 2001
From: Jose Ramirez <jose.m.ramirez@oracle.com>
Date: Mon, 8 Sep 2025 20:01:06 -0600
Subject: [PATCH 94/99] WL#17138 [Update 3rd party components]

Change-Id: Ic9b7934ba04127de24c9cd3f2851642fde95563b
---
 CHANGES                                       |    1 +
 .../src/MySQL.Data.OpenTelemetry.csproj       |    2 +-
 MySQL.Data/src/MySql.Data.csproj              |    8 +-
 .../src/X/Protocol/X/Protobuf/Mysqlx.cs       |  599 ++-
 .../X/Protocol/X/Protobuf/MysqlxConnection.cs |  861 ++---
 .../src/X/Protocol/X/Protobuf/MysqlxCrud.cs   | 3441 +++++++----------
 .../src/X/Protocol/X/Protobuf/MysqlxCursor.cs |  678 ++--
 .../X/Protocol/X/Protobuf/MysqlxDatatypes.cs  | 1330 +++----
 .../src/X/Protocol/X/Protobuf/MysqlxExpect.cs |  476 +--
 .../src/X/Protocol/X/Protobuf/MysqlxExpr.cs   | 1670 +++-----
 .../src/X/Protocol/X/Protobuf/MysqlxNotice.cs | 1009 ++---
 .../X/Protocol/X/Protobuf/MysqlxPrepare.cs    |  790 ++--
 .../X/Protocol/X/Protobuf/MysqlxResultset.cs  | 1017 ++---
 .../X/Protocol/X/Protobuf/MysqlxSession.cs    |  703 ++--
 .../src/X/Protocol/X/Protobuf/MysqlxSql.cs    |  321 +-
 15 files changed, 4889 insertions(+), 8017 deletions(-)

diff --git a/CHANGES b/CHANGES
index def7f414f..2a103530d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@
 - Fixed bug Certain sequence of special characters can break connection string validation (MySQL Bug #111797, Oracle Bug #36043278).
 - Removed `Prefered' option from MySqlSslMode (WL17115).
 - Fixed bug Connectionstrings crafted with `dns-srv=true` and (at least) POOLING set break MySqlConnectionStringBuilder (MySQL Bug #117603, Oracle Bug #37651419).
+- Updated third party dependencies (WL17138).
 
 
 9.4.0
diff --git a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
index 2e610d830..ea26230cf 100644
--- a/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
+++ b/MySQL.Data.OpenTelemetry/src/MySQL.Data.OpenTelemetry.csproj
@@ -37,7 +37,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Api" Version="1.11.2" />
+    <PackageReference Include="OpenTelemetry.Api" Version="1.12.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
index 5d97fb29b..4cece1f8c 100644
--- a/MySQL.Data/src/MySql.Data.csproj
+++ b/MySQL.Data/src/MySql.Data.csproj
@@ -52,11 +52,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.30.0" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
+    <PackageReference Include="Google.Protobuf" Version="3.32.0" />
     <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.8" />
-    <PackageReference Include="ZstdSharp.Port" Version="0.8.5" />
-	  <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
+    <PackageReference Include="ZstdSharp.Port" Version="0.8.6" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net462' or '$(TargetFramework)'=='net48'">
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/Mysqlx.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/Mysqlx.cs
index be76ea51a..df34bbdb5 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/Mysqlx.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/Mysqlx.cs
@@ -37,23 +37,19 @@
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Mysqlx
-{
+namespace Mysqlx {
 
   /// <summary>Holder for reflection information generated from mysqlx.proto</summary>
-  public static partial class MysqlxReflection
-  {
+  public static partial class MysqlxReflection {
 
     #region Descriptor
     /// <summary>File descriptor for mysqlx.proto</summary>
-    public static pbr::FileDescriptor Descriptor
-    {
+    public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static MysqlxReflection()
-    {
+    static MysqlxReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "CgxteXNxbHgucHJvdG8SBk15c3FseBogZ29vZ2xlL3Byb3RvYnVmL2Rlc2Ny",
@@ -99,12 +95,11 @@ static MysqlxReflection()
 
   }
   /// <summary>Holder for extension identifiers generated from the top level of mysqlx.proto</summary>
-  public static partial class MysqlxExtensions
-  {
+  public static partial class MysqlxExtensions {
     public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::Mysqlx.ClientMessages.Types.Type> ClientMessageId =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::Mysqlx.ClientMessages.Types.Type>(100001, pb::FieldCodec.ForEnum(800008, x => (int)x, x => (global::Mysqlx.ClientMessages.Types.Type)x, global::Mysqlx.ClientMessages.Types.Type.ConCapabilitiesGet));
+      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::Mysqlx.ClientMessages.Types.Type>(100001, pb::FieldCodec.ForEnum(800008, x => (int) x, x => (global::Mysqlx.ClientMessages.Types.Type) x, global::Mysqlx.ClientMessages.Types.Type.ConCapabilitiesGet));
     public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::Mysqlx.ServerMessages.Types.Type> ServerMessageId =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::Mysqlx.ServerMessages.Types.Type>(100002, pb::FieldCodec.ForEnum(800016, x => (int)x, x => (global::Mysqlx.ServerMessages.Types.Type)x, global::Mysqlx.ServerMessages.Types.Type.Ok));
+      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::Mysqlx.ServerMessages.Types.Type>(100002, pb::FieldCodec.ForEnum(800016, x => (int) x, x => (global::Mysqlx.ServerMessages.Types.Type) x, global::Mysqlx.ServerMessages.Types.Type.Ok));
   }
 
   #region Messages
@@ -119,9 +114,9 @@ public static partial class MysqlxExtensions
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ClientMessages : pb::IMessage<ClientMessages>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<ClientMessages> _parser = new pb::MessageParser<ClientMessages>(() => new ClientMessages());
     private pb::UnknownFieldSet _unknownFields;
@@ -131,22 +126,19 @@ public sealed partial class ClientMessages : pb::IMessage<ClientMessages>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.MysqlxReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ClientMessages()
-    {
+    public ClientMessages() {
       OnConstruction();
     }
 
@@ -154,35 +146,29 @@ public ClientMessages()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ClientMessages(ClientMessages other) : this()
-    {
+    public ClientMessages(ClientMessages other) : this() {
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ClientMessages Clone()
-    {
+    public ClientMessages Clone() {
       return new ClientMessages(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as ClientMessages);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ClientMessages other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(ClientMessages other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       return Equals(_unknownFields, other._unknownFields);
@@ -190,11 +176,9 @@ public bool Equals(ClientMessages other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -202,43 +186,37 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (_unknownFields != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -246,10 +224,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ClientMessages other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(ClientMessages other) {
+      if (other == null) {
         return;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -257,11 +233,10 @@ public void MergeFrom(ClientMessages other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -274,40 +249,34 @@ public void MergeFrom(pb::CodedInputStream input)
             break;
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the ClientMessages message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum Type
-      {
+    public static partial class Types {
+      public enum Type {
         [pbr::OriginalName("CON_CAPABILITIES_GET")] ConCapabilitiesGet = 1,
         [pbr::OriginalName("CON_CAPABILITIES_SET")] ConCapabilitiesSet = 2,
         [pbr::OriginalName("CON_CLOSE")] ConClose = 3,
@@ -350,9 +319,9 @@ public enum Type
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ServerMessages : pb::IMessage<ServerMessages>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<ServerMessages> _parser = new pb::MessageParser<ServerMessages>(() => new ServerMessages());
     private pb::UnknownFieldSet _unknownFields;
@@ -362,22 +331,19 @@ public sealed partial class ServerMessages : pb::IMessage<ServerMessages>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.MysqlxReflection.Descriptor.MessageTypes[1]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ServerMessages()
-    {
+    public ServerMessages() {
       OnConstruction();
     }
 
@@ -385,35 +351,29 @@ public ServerMessages()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ServerMessages(ServerMessages other) : this()
-    {
+    public ServerMessages(ServerMessages other) : this() {
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ServerMessages Clone()
-    {
+    public ServerMessages Clone() {
       return new ServerMessages(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as ServerMessages);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ServerMessages other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(ServerMessages other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       return Equals(_unknownFields, other._unknownFields);
@@ -421,11 +381,9 @@ public bool Equals(ServerMessages other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -433,43 +391,37 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (_unknownFields != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -477,10 +429,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ServerMessages other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(ServerMessages other) {
+      if (other == null) {
         return;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -488,11 +438,10 @@ public void MergeFrom(ServerMessages other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -505,40 +454,34 @@ public void MergeFrom(pb::CodedInputStream input)
             break;
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the ServerMessages message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum Type
-      {
+    public static partial class Types {
+      public enum Type {
         [pbr::OriginalName("OK")] Ok = 0,
         [pbr::OriginalName("ERROR")] Error = 1,
         [pbr::OriginalName("CONN_CAPABILITIES")] ConnCapabilities = 2,
@@ -565,9 +508,9 @@ public enum Type
 
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Ok : pb::IMessage<Ok>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Ok> _parser = new pb::MessageParser<Ok>(() => new Ok());
     private pb::UnknownFieldSet _unknownFields;
@@ -577,22 +520,19 @@ public sealed partial class Ok : pb::IMessage<Ok>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.MysqlxReflection.Descriptor.MessageTypes[2]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Ok()
-    {
+    public Ok() {
       OnConstruction();
     }
 
@@ -600,16 +540,14 @@ public Ok()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Ok(Ok other) : this()
-    {
+    public Ok(Ok other) : this() {
       msg_ = other.msg_;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Ok Clone()
-    {
+    public Ok Clone() {
       return new Ok(this);
     }
 
@@ -620,46 +558,38 @@ public Ok Clone()
     private string msg_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Msg
-    {
+    public string Msg {
       get { return msg_ ?? MsgDefaultValue; }
-      set
-      {
+      set {
         msg_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "msg" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasMsg
-    {
+    public bool HasMsg {
       get { return msg_ != null; }
     }
     /// <summary>Clears the value of the "msg" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearMsg()
-    {
+    public void ClearMsg() {
       msg_ = null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Ok);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Ok other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Ok other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Msg != other.Msg) return false;
@@ -668,12 +598,10 @@ public bool Equals(Ok other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasMsg) hash ^= Msg.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -681,18 +609,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasMsg) {
         output.WriteRawTag(10);
         output.WriteString(Msg);
@@ -700,37 +626,31 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasMsg)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasMsg) {
         output.WriteRawTag(10);
         output.WriteString(Msg);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasMsg)
-      {
+      if (HasMsg) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Msg);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -738,14 +658,11 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Ok other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Ok other) {
+      if (other == null) {
         return;
       }
-      if (other.HasMsg)
-      {
+      if (other.HasMsg) {
         Msg = other.Msg;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -753,11 +670,10 @@ public void MergeFrom(Ok other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -774,44 +690,39 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              Msg = input.ReadString();
-              break;
-            }
+          case 10: {
+            Msg = input.ReadString();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Error : pb::IMessage<Error>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Error> _parser = new pb::MessageParser<Error>(() => new Error());
     private pb::UnknownFieldSet _unknownFields;
@@ -822,22 +733,19 @@ public sealed partial class Error : pb::IMessage<Error>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.MysqlxReflection.Descriptor.MessageTypes[3]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Error()
-    {
+    public Error() {
       OnConstruction();
     }
 
@@ -845,8 +753,7 @@ public Error()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Error(Error other) : this()
-    {
+    public Error(Error other) : this() {
       _hasBits0 = other._hasBits0;
       severity_ = other.severity_;
       code_ = other.code_;
@@ -857,8 +764,7 @@ public Error(Error other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Error Clone()
-    {
+    public Error Clone() {
       return new Error(this);
     }
 
@@ -872,11 +778,9 @@ public Error Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Error.Types.Severity Severity
-    {
+    public global::Mysqlx.Error.Types.Severity Severity {
       get { if ((_hasBits0 & 1) != 0) { return severity_; } else { return SeverityDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         severity_ = value;
       }
@@ -884,15 +788,13 @@ public Error Clone()
     /// <summary>Gets whether the "severity" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSeverity
-    {
+    public bool HasSeverity {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "severity" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSeverity()
-    {
+    public void ClearSeverity() {
       _hasBits0 &= ~1;
     }
 
@@ -906,11 +808,9 @@ public void ClearSeverity()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint Code
-    {
+    public uint Code {
       get { if ((_hasBits0 & 2) != 0) { return code_; } else { return CodeDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         code_ = value;
       }
@@ -918,15 +818,13 @@ public uint Code
     /// <summary>Gets whether the "code" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCode
-    {
+    public bool HasCode {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "code" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCode()
-    {
+    public void ClearCode() {
       _hasBits0 &= ~2;
     }
 
@@ -940,26 +838,22 @@ public void ClearCode()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string SqlState
-    {
+    public string SqlState {
       get { return sqlState_ ?? SqlStateDefaultValue; }
-      set
-      {
+      set {
         sqlState_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "sql_state" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSqlState
-    {
+    public bool HasSqlState {
       get { return sqlState_ != null; }
     }
     /// <summary>Clears the value of the "sql_state" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSqlState()
-    {
+    public void ClearSqlState() {
       sqlState_ = null;
     }
 
@@ -973,46 +867,38 @@ public void ClearSqlState()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Msg
-    {
+    public string Msg {
       get { return msg_ ?? MsgDefaultValue; }
-      set
-      {
+      set {
         msg_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "msg" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasMsg
-    {
+    public bool HasMsg {
       get { return msg_ != null; }
     }
     /// <summary>Clears the value of the "msg" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearMsg()
-    {
+    public void ClearMsg() {
       msg_ = null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Error);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Error other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Error other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Severity != other.Severity) return false;
@@ -1024,15 +910,13 @@ public bool Equals(Error other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasSeverity) hash ^= Severity.GetHashCode();
       if (HasCode) hash ^= Code.GetHashCode();
       if (HasSqlState) hash ^= SqlState.GetHashCode();
       if (HasMsg) hash ^= Msg.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1040,18 +924,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasSeverity) {
         output.WriteRawTag(8);
         output.WriteEnum((int) Severity);
@@ -1071,64 +953,52 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasSeverity)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasSeverity) {
         output.WriteRawTag(8);
-        output.WriteEnum((int)Severity);
+        output.WriteEnum((int) Severity);
       }
-      if (HasCode)
-      {
+      if (HasCode) {
         output.WriteRawTag(16);
         output.WriteUInt32(Code);
       }
-      if (HasMsg)
-      {
+      if (HasMsg) {
         output.WriteRawTag(26);
         output.WriteString(Msg);
       }
-      if (HasSqlState)
-      {
+      if (HasSqlState) {
         output.WriteRawTag(34);
         output.WriteString(SqlState);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasSeverity)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Severity);
+      if (HasSeverity) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Severity);
       }
-      if (HasCode)
-      {
+      if (HasCode) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Code);
       }
-      if (HasSqlState)
-      {
+      if (HasSqlState) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(SqlState);
       }
-      if (HasMsg)
-      {
+      if (HasMsg) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Msg);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1136,26 +1006,20 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Error other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Error other) {
+      if (other == null) {
         return;
       }
-      if (other.HasSeverity)
-      {
+      if (other.HasSeverity) {
         Severity = other.Severity;
       }
-      if (other.HasCode)
-      {
+      if (other.HasCode) {
         Code = other.Code;
       }
-      if (other.HasSqlState)
-      {
+      if (other.HasSqlState) {
         SqlState = other.SqlState;
       }
-      if (other.HasMsg)
-      {
+      if (other.HasMsg) {
         Msg = other.Msg;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1163,11 +1027,10 @@ public void MergeFrom(Error other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1196,60 +1059,50 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              Severity = (global::Mysqlx.Error.Types.Severity)input.ReadEnum();
-              break;
-            }
-          case 16:
-            {
-              Code = input.ReadUInt32();
-              break;
-            }
-          case 26:
-            {
-              Msg = input.ReadString();
-              break;
-            }
-          case 34:
-            {
-              SqlState = input.ReadString();
-              break;
-            }
+          case 8: {
+            Severity = (global::Mysqlx.Error.Types.Severity) input.ReadEnum();
+            break;
+          }
+          case 16: {
+            Code = input.ReadUInt32();
+            break;
+          }
+          case 26: {
+            Msg = input.ReadString();
+            break;
+          }
+          case 34: {
+            SqlState = input.ReadString();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Error message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum Severity
-      {
+    public static partial class Types {
+      public enum Severity {
         [pbr::OriginalName("ERROR")] Error = 0,
         [pbr::OriginalName("FATAL")] Fatal = 1,
       }
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxConnection.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxConnection.cs
index b5f4aec39..56776efaa 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxConnection.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxConnection.cs
@@ -37,23 +37,19 @@
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Mysqlx.Connection
-{
+namespace Mysqlx.Connection {
 
   /// <summary>Holder for reflection information generated from mysqlx_connection.proto</summary>
-  public static partial class MysqlxConnectionReflection
-  {
+  public static partial class MysqlxConnectionReflection {
 
     #region Descriptor
     /// <summary>File descriptor for mysqlx_connection.proto</summary>
-    public static pbr::FileDescriptor Descriptor
-    {
+    public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static MysqlxConnectionReflection()
-    {
+    static MysqlxConnectionReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChdteXNxbHhfY29ubmVjdGlvbi5wcm90bxIRTXlzcWx4LkNvbm5lY3Rpb24a",
@@ -92,9 +88,9 @@ static MysqlxConnectionReflection()
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Capability : pb::IMessage<Capability>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Capability> _parser = new pb::MessageParser<Capability>(() => new Capability());
     private pb::UnknownFieldSet _unknownFields;
@@ -104,22 +100,19 @@ public sealed partial class Capability : pb::IMessage<Capability>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Connection.MysqlxConnectionReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Capability()
-    {
+    public Capability() {
       OnConstruction();
     }
 
@@ -127,8 +120,7 @@ public Capability()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Capability(Capability other) : this()
-    {
+    public Capability(Capability other) : this() {
       name_ = other.name_;
       value_ = other.value_ != null ? other.value_.Clone() : null;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -136,8 +128,7 @@ public Capability(Capability other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Capability Clone()
-    {
+    public Capability Clone() {
       return new Capability(this);
     }
 
@@ -148,26 +139,22 @@ public Capability Clone()
     private string name_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name
-    {
+    public string Name {
       get { return name_ ?? NameDefaultValue; }
-      set
-      {
+      set {
         name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "name" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName
-    {
+    public bool HasName {
       get { return name_ != null; }
     }
     /// <summary>Clears the value of the "name" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName()
-    {
+    public void ClearName() {
       name_ = null;
     }
 
@@ -176,32 +163,26 @@ public void ClearName()
     private global::Mysqlx.Datatypes.Any value_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Datatypes.Any Value
-    {
+    public global::Mysqlx.Datatypes.Any Value {
       get { return value_; }
-      set
-      {
+      set {
         value_ = value;
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Capability);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Capability other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Capability other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Name != other.Name) return false;
@@ -211,13 +192,11 @@ public bool Equals(Capability other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasName) hash ^= Name.GetHashCode();
       if (value_ != null) hash ^= Value.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -225,18 +204,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasName) {
         output.WriteRawTag(10);
         output.WriteString(Name);
@@ -248,46 +225,38 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasName)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasName) {
         output.WriteRawTag(10);
         output.WriteString(Name);
       }
-      if (value_ != null)
-      {
+      if (value_ != null) {
         output.WriteRawTag(18);
         output.WriteMessage(Value);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasName)
-      {
+      if (HasName) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
       }
-      if (value_ != null)
-      {
+      if (value_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Value);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -295,20 +264,15 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Capability other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Capability other) {
+      if (other == null) {
         return;
       }
-      if (other.HasName)
-      {
+      if (other.HasName) {
         Name = other.Name;
       }
-      if (other.value_ != null)
-      {
-        if (value_ == null)
-        {
+      if (other.value_ != null) {
+        if (value_ == null) {
           Value = new global::Mysqlx.Datatypes.Any();
         }
         Value.MergeFrom(other.Value);
@@ -318,11 +282,10 @@ public void MergeFrom(Capability other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -346,45 +309,38 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              Name = input.ReadString();
-              break;
-            }
-          case 18:
-            {
-              if (value_ == null)
-              {
-                Value = new global::Mysqlx.Datatypes.Any();
-              }
-              input.ReadMessage(Value);
-              break;
+          case 10: {
+            Name = input.ReadString();
+            break;
+          }
+          case 18: {
+            if (value_ == null) {
+              Value = new global::Mysqlx.Datatypes.Any();
             }
+            input.ReadMessage(Value);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -396,9 +352,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Capabilities : pb::IMessage<Capabilities>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Capabilities> _parser = new pb::MessageParser<Capabilities>(() => new Capabilities());
     private pb::UnknownFieldSet _unknownFields;
@@ -408,22 +364,19 @@ public sealed partial class Capabilities : pb::IMessage<Capabilities>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Connection.MysqlxConnectionReflection.Descriptor.MessageTypes[1]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Capabilities()
-    {
+    public Capabilities() {
       OnConstruction();
     }
 
@@ -431,16 +384,14 @@ public Capabilities()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Capabilities(Capabilities other) : this()
-    {
+    public Capabilities(Capabilities other) : this() {
       capabilities_ = other.capabilities_.Clone();
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Capabilities Clone()
-    {
+    public Capabilities Clone() {
       return new Capabilities(this);
     }
 
@@ -451,42 +402,35 @@ public Capabilities Clone()
     private readonly pbc::RepeatedField<global::Mysqlx.Connection.Capability> capabilities_ = new pbc::RepeatedField<global::Mysqlx.Connection.Capability>();
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Connection.Capability> Capabilities_
-    {
+    public pbc::RepeatedField<global::Mysqlx.Connection.Capability> Capabilities_ {
       get { return capabilities_; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Capabilities);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Capabilities other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Capabilities other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (!capabilities_.Equals(other.capabilities_)) return false;
+      if(!capabilities_.Equals(other.capabilities_)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       hash ^= capabilities_.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -494,46 +438,40 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       capabilities_.WriteTo(output, _repeated_capabilities_codec);
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
       capabilities_.WriteTo(ref output, _repeated_capabilities_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
       size += capabilities_.CalculateSize(_repeated_capabilities_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -541,10 +479,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Capabilities other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Capabilities other) {
+      if (other == null) {
         return;
       }
       capabilities_.Add(other.capabilities_);
@@ -553,11 +489,10 @@ public void MergeFrom(Capabilities other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -574,36 +509,31 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              capabilities_.AddEntriesFrom(ref input, _repeated_capabilities_codec);
-              break;
-            }
+          case 10: {
+            capabilities_.AddEntriesFrom(ref input, _repeated_capabilities_codec);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -615,9 +545,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class CapabilitiesGet : pb::IMessage<CapabilitiesGet>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<CapabilitiesGet> _parser = new pb::MessageParser<CapabilitiesGet>(() => new CapabilitiesGet());
     private pb::UnknownFieldSet _unknownFields;
@@ -627,22 +557,19 @@ public sealed partial class CapabilitiesGet : pb::IMessage<CapabilitiesGet>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Connection.MysqlxConnectionReflection.Descriptor.MessageTypes[2]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CapabilitiesGet()
-    {
+    public CapabilitiesGet() {
       OnConstruction();
     }
 
@@ -650,35 +577,29 @@ public CapabilitiesGet()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CapabilitiesGet(CapabilitiesGet other) : this()
-    {
+    public CapabilitiesGet(CapabilitiesGet other) : this() {
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CapabilitiesGet Clone()
-    {
+    public CapabilitiesGet Clone() {
       return new CapabilitiesGet(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as CapabilitiesGet);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(CapabilitiesGet other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(CapabilitiesGet other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       return Equals(_unknownFields, other._unknownFields);
@@ -686,11 +607,9 @@ public bool Equals(CapabilitiesGet other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -698,43 +617,37 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (_unknownFields != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -742,10 +655,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(CapabilitiesGet other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(CapabilitiesGet other) {
+      if (other == null) {
         return;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -753,11 +664,10 @@ public void MergeFrom(CapabilitiesGet other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -770,31 +680,27 @@ public void MergeFrom(pb::CodedInputStream input)
             break;
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -811,9 +717,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class CapabilitiesSet : pb::IMessage<CapabilitiesSet>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<CapabilitiesSet> _parser = new pb::MessageParser<CapabilitiesSet>(() => new CapabilitiesSet());
     private pb::UnknownFieldSet _unknownFields;
@@ -823,22 +729,19 @@ public sealed partial class CapabilitiesSet : pb::IMessage<CapabilitiesSet>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Connection.MysqlxConnectionReflection.Descriptor.MessageTypes[3]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CapabilitiesSet()
-    {
+    public CapabilitiesSet() {
       OnConstruction();
     }
 
@@ -846,16 +749,14 @@ public CapabilitiesSet()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CapabilitiesSet(CapabilitiesSet other) : this()
-    {
+    public CapabilitiesSet(CapabilitiesSet other) : this() {
       capabilities_ = other.capabilities_ != null ? other.capabilities_.Clone() : null;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CapabilitiesSet Clone()
-    {
+    public CapabilitiesSet Clone() {
       return new CapabilitiesSet(this);
     }
 
@@ -864,32 +765,26 @@ public CapabilitiesSet Clone()
     private global::Mysqlx.Connection.Capabilities capabilities_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Connection.Capabilities Capabilities
-    {
+    public global::Mysqlx.Connection.Capabilities Capabilities {
       get { return capabilities_; }
-      set
-      {
+      set {
         capabilities_ = value;
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as CapabilitiesSet);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(CapabilitiesSet other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(CapabilitiesSet other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (!object.Equals(Capabilities, other.Capabilities)) return false;
@@ -898,12 +793,10 @@ public bool Equals(CapabilitiesSet other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (capabilities_ != null) hash ^= Capabilities.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -911,18 +804,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (capabilities_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Capabilities);
@@ -930,37 +821,31 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (capabilities_ != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (capabilities_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Capabilities);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (capabilities_ != null)
-      {
+      if (capabilities_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Capabilities);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -968,16 +853,12 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(CapabilitiesSet other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(CapabilitiesSet other) {
+      if (other == null) {
         return;
       }
-      if (other.capabilities_ != null)
-      {
-        if (capabilities_ == null)
-        {
+      if (other.capabilities_ != null) {
+        if (capabilities_ == null) {
           Capabilities = new global::Mysqlx.Connection.Capabilities();
         }
         Capabilities.MergeFrom(other.Capabilities);
@@ -987,11 +868,10 @@ public void MergeFrom(CapabilitiesSet other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1011,40 +891,34 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              if (capabilities_ == null)
-              {
-                Capabilities = new global::Mysqlx.Connection.Capabilities();
-              }
-              input.ReadMessage(Capabilities);
-              break;
+          case 10: {
+            if (capabilities_ == null) {
+              Capabilities = new global::Mysqlx.Connection.Capabilities();
             }
+            input.ReadMessage(Capabilities);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -1058,9 +932,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Close : pb::IMessage<Close>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Close> _parser = new pb::MessageParser<Close>(() => new Close());
     private pb::UnknownFieldSet _unknownFields;
@@ -1070,22 +944,19 @@ public sealed partial class Close : pb::IMessage<Close>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Connection.MysqlxConnectionReflection.Descriptor.MessageTypes[4]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Close()
-    {
+    public Close() {
       OnConstruction();
     }
 
@@ -1093,35 +964,29 @@ public Close()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Close(Close other) : this()
-    {
+    public Close(Close other) : this() {
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Close Clone()
-    {
+    public Close Clone() {
       return new Close(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Close);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Close other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Close other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       return Equals(_unknownFields, other._unknownFields);
@@ -1129,11 +994,9 @@ public bool Equals(Close other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1141,43 +1004,37 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (_unknownFields != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1185,10 +1042,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Close other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Close other) {
+      if (other == null) {
         return;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1196,11 +1051,10 @@ public void MergeFrom(Close other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1213,39 +1067,35 @@ public void MergeFrom(pb::CodedInputStream input)
             break;
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
         }
       }
     }
-#endif
+    #endif
 
   }
 
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Compression : pb::IMessage<Compression>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Compression> _parser = new pb::MessageParser<Compression>(() => new Compression());
     private pb::UnknownFieldSet _unknownFields;
@@ -1256,22 +1106,19 @@ public sealed partial class Compression : pb::IMessage<Compression>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Connection.MysqlxConnectionReflection.Descriptor.MessageTypes[5]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Compression()
-    {
+    public Compression() {
       OnConstruction();
     }
 
@@ -1279,8 +1126,7 @@ public Compression()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Compression(Compression other) : this()
-    {
+    public Compression(Compression other) : this() {
       _hasBits0 = other._hasBits0;
       uncompressedSize_ = other.uncompressedSize_;
       serverMessages_ = other.serverMessages_;
@@ -1291,8 +1137,7 @@ public Compression(Compression other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Compression Clone()
-    {
+    public Compression Clone() {
       return new Compression(this);
     }
 
@@ -1303,11 +1148,9 @@ public Compression Clone()
     private ulong uncompressedSize_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong UncompressedSize
-    {
+    public ulong UncompressedSize {
       get { if ((_hasBits0 & 1) != 0) { return uncompressedSize_; } else { return UncompressedSizeDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         uncompressedSize_ = value;
       }
@@ -1315,15 +1158,13 @@ public ulong UncompressedSize
     /// <summary>Gets whether the "uncompressed_size" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasUncompressedSize
-    {
+    public bool HasUncompressedSize {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "uncompressed_size" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearUncompressedSize()
-    {
+    public void ClearUncompressedSize() {
       _hasBits0 &= ~1;
     }
 
@@ -1334,11 +1175,9 @@ public void ClearUncompressedSize()
     private global::Mysqlx.ServerMessages.Types.Type serverMessages_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.ServerMessages.Types.Type ServerMessages
-    {
+    public global::Mysqlx.ServerMessages.Types.Type ServerMessages {
       get { if ((_hasBits0 & 2) != 0) { return serverMessages_; } else { return ServerMessagesDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         serverMessages_ = value;
       }
@@ -1346,15 +1185,13 @@ public void ClearUncompressedSize()
     /// <summary>Gets whether the "server_messages" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasServerMessages
-    {
+    public bool HasServerMessages {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "server_messages" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearServerMessages()
-    {
+    public void ClearServerMessages() {
       _hasBits0 &= ~2;
     }
 
@@ -1365,11 +1202,9 @@ public void ClearServerMessages()
     private global::Mysqlx.ClientMessages.Types.Type clientMessages_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.ClientMessages.Types.Type ClientMessages
-    {
+    public global::Mysqlx.ClientMessages.Types.Type ClientMessages {
       get { if ((_hasBits0 & 4) != 0) { return clientMessages_; } else { return ClientMessagesDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 4;
         clientMessages_ = value;
       }
@@ -1377,15 +1212,13 @@ public void ClearServerMessages()
     /// <summary>Gets whether the "client_messages" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasClientMessages
-    {
+    public bool HasClientMessages {
       get { return (_hasBits0 & 4) != 0; }
     }
     /// <summary>Clears the value of the "client_messages" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearClientMessages()
-    {
+    public void ClearClientMessages() {
       _hasBits0 &= ~4;
     }
 
@@ -1396,46 +1229,38 @@ public void ClearClientMessages()
     private pb::ByteString payload_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString Payload
-    {
+    public pb::ByteString Payload {
       get { return payload_ ?? PayloadDefaultValue; }
-      set
-      {
+      set {
         payload_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "payload" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasPayload
-    {
+    public bool HasPayload {
       get { return payload_ != null; }
     }
     /// <summary>Clears the value of the "payload" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearPayload()
-    {
+    public void ClearPayload() {
       payload_ = null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Compression);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Compression other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Compression other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (UncompressedSize != other.UncompressedSize) return false;
@@ -1447,15 +1272,13 @@ public bool Equals(Compression other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasUncompressedSize) hash ^= UncompressedSize.GetHashCode();
       if (HasServerMessages) hash ^= ServerMessages.GetHashCode();
       if (HasClientMessages) hash ^= ClientMessages.GetHashCode();
       if (HasPayload) hash ^= Payload.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1463,18 +1286,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasUncompressedSize) {
         output.WriteRawTag(8);
         output.WriteUInt64(UncompressedSize);
@@ -1494,64 +1315,52 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasUncompressedSize)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasUncompressedSize) {
         output.WriteRawTag(8);
         output.WriteUInt64(UncompressedSize);
       }
-      if (HasServerMessages)
-      {
+      if (HasServerMessages) {
         output.WriteRawTag(16);
-        output.WriteEnum((int)ServerMessages);
+        output.WriteEnum((int) ServerMessages);
       }
-      if (HasClientMessages)
-      {
+      if (HasClientMessages) {
         output.WriteRawTag(24);
-        output.WriteEnum((int)ClientMessages);
+        output.WriteEnum((int) ClientMessages);
       }
-      if (HasPayload)
-      {
+      if (HasPayload) {
         output.WriteRawTag(34);
         output.WriteBytes(Payload);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasUncompressedSize)
-      {
+      if (HasUncompressedSize) {
         size += 1 + pb::CodedOutputStream.ComputeUInt64Size(UncompressedSize);
       }
-      if (HasServerMessages)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)ServerMessages);
+      if (HasServerMessages) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ServerMessages);
       }
-      if (HasClientMessages)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)ClientMessages);
+      if (HasClientMessages) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ClientMessages);
       }
-      if (HasPayload)
-      {
+      if (HasPayload) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(Payload);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1559,26 +1368,20 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Compression other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Compression other) {
+      if (other == null) {
         return;
       }
-      if (other.HasUncompressedSize)
-      {
+      if (other.HasUncompressedSize) {
         UncompressedSize = other.UncompressedSize;
       }
-      if (other.HasServerMessages)
-      {
+      if (other.HasServerMessages) {
         ServerMessages = other.ServerMessages;
       }
-      if (other.HasClientMessages)
-      {
+      if (other.HasClientMessages) {
         ClientMessages = other.ClientMessages;
       }
-      if (other.HasPayload)
-      {
+      if (other.HasPayload) {
         Payload = other.Payload;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1586,11 +1389,10 @@ public void MergeFrom(Compression other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1619,51 +1421,43 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              UncompressedSize = input.ReadUInt64();
-              break;
-            }
-          case 16:
-            {
-              ServerMessages = (global::Mysqlx.ServerMessages.Types.Type)input.ReadEnum();
-              break;
-            }
-          case 24:
-            {
-              ClientMessages = (global::Mysqlx.ClientMessages.Types.Type)input.ReadEnum();
-              break;
-            }
-          case 34:
-            {
-              Payload = input.ReadBytes();
-              break;
-            }
+          case 8: {
+            UncompressedSize = input.ReadUInt64();
+            break;
+          }
+          case 16: {
+            ServerMessages = (global::Mysqlx.ServerMessages.Types.Type) input.ReadEnum();
+            break;
+          }
+          case 24: {
+            ClientMessages = (global::Mysqlx.ClientMessages.Types.Type) input.ReadEnum();
+            break;
+          }
+          case 34: {
+            Payload = input.ReadBytes();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -1672,4 +1466,3 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
-
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCrud.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCrud.cs
index 75e212cd8..f4037a0c6 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCrud.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCrud.cs
@@ -37,23 +37,19 @@
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Mysqlx.Crud
-{
+namespace Mysqlx.Crud {
 
   /// <summary>Holder for reflection information generated from mysqlx_crud.proto</summary>
-  public static partial class MysqlxCrudReflection
-  {
+  public static partial class MysqlxCrudReflection {
 
     #region Descriptor
     /// <summary>File descriptor for mysqlx_crud.proto</summary>
-    public static pbr::FileDescriptor Descriptor
-    {
+    public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static MysqlxCrudReflection()
-    {
+    static MysqlxCrudReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChFteXNxbHhfY3J1ZC5wcm90bxILTXlzcWx4LkNydWQaDG15c3FseC5wcm90",
@@ -132,7 +128,7 @@ static MysqlxCrudReflection()
             "QhkKF2NvbS5teXNxbC5jai54LnByb3RvYnVm"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Mysqlx.MysqlxReflection.Descriptor, global::Mysqlx.Expr.MysqlxExprReflection.Descriptor, global::Mysqlx.Datatypes.MysqlxDatatypesReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(new[] { typeof(global::Mysqlx.Crud.DataModel), typeof(global::Mysqlx.Crud.ViewAlgorithm), typeof(global::Mysqlx.Crud.ViewSqlSecurity), typeof(global::Mysqlx.Crud.ViewCheckOption), }, null, new pbr::GeneratedClrTypeInfo[] {
+          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Mysqlx.Crud.DataModel), typeof(global::Mysqlx.Crud.ViewAlgorithm), typeof(global::Mysqlx.Crud.ViewSqlSecurity), typeof(global::Mysqlx.Crud.ViewCheckOption), }, null, new pbr::GeneratedClrTypeInfo[] {
             new pbr::GeneratedClrTypeInfo(typeof(global::Mysqlx.Crud.Column), global::Mysqlx.Crud.Column.Parser, new[]{ "Name", "Alias", "DocumentPath" }, null, null, null, null),
             new pbr::GeneratedClrTypeInfo(typeof(global::Mysqlx.Crud.Projection), global::Mysqlx.Crud.Projection.Parser, new[]{ "Source", "Alias" }, null, null, null, null),
             new pbr::GeneratedClrTypeInfo(typeof(global::Mysqlx.Crud.Collection), global::Mysqlx.Crud.Collection.Parser, new[]{ "Name", "Schema" }, null, null, null, null),
@@ -157,8 +153,7 @@ static MysqlxCrudReflection()
   ///*
   ///DataModel to use for filters, names, ...
   /// </summary>
-  public enum DataModel
-  {
+  public enum DataModel {
     [pbr::OriginalName("DOCUMENT")] Document = 1,
     [pbr::OriginalName("TABLE")] Table = 2,
   }
@@ -167,8 +162,7 @@ public enum DataModel
   ///*
   ///ViewAlgorithm defines how MySQL Server processes the view
   /// </summary>
-  public enum ViewAlgorithm
-  {
+  public enum ViewAlgorithm {
     /// <summary>
     ///* MySQL chooses which algorithm to use 
     /// </summary>
@@ -190,8 +184,7 @@ public enum ViewAlgorithm
   ///executed; this means that VIEW can be executed with current user permissions or
   ///with permissions of the user who defined the VIEW
   /// </summary>
-  public enum ViewSqlSecurity
-  {
+  public enum ViewSqlSecurity {
     /// <summary>
     ///* use current user permissions 
     /// </summary>
@@ -207,8 +200,7 @@ public enum ViewSqlSecurity
   ///ViewCheckOption limits the write operations done on a `VIEW`
   ///(`INSERT`, `UPDATE`, `DELETE`) to rows in which the `WHERE` clause is `TRUE`
   /// </summary>
-  public enum ViewCheckOption
-  {
+  public enum ViewCheckOption {
     /// <summary>
     ///* the view WHERE clause is checked, but no underlying views are checked 
     /// </summary>
@@ -225,9 +217,9 @@ public enum ViewCheckOption
   #region Messages
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Column : pb::IMessage<Column>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Column> _parser = new pb::MessageParser<Column>(() => new Column());
     private pb::UnknownFieldSet _unknownFields;
@@ -237,22 +229,19 @@ public sealed partial class Column : pb::IMessage<Column>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Column()
-    {
+    public Column() {
       OnConstruction();
     }
 
@@ -260,8 +249,7 @@ public Column()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Column(Column other) : this()
-    {
+    public Column(Column other) : this() {
       name_ = other.name_;
       alias_ = other.alias_;
       documentPath_ = other.documentPath_.Clone();
@@ -270,8 +258,7 @@ public Column(Column other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Column Clone()
-    {
+    public Column Clone() {
       return new Column(this);
     }
 
@@ -282,26 +269,22 @@ public Column Clone()
     private string name_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name
-    {
+    public string Name {
       get { return name_ ?? NameDefaultValue; }
-      set
-      {
+      set {
         name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "name" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName
-    {
+    public bool HasName {
       get { return name_ != null; }
     }
     /// <summary>Clears the value of the "name" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName()
-    {
+    public void ClearName() {
       name_ = null;
     }
 
@@ -312,26 +295,22 @@ public void ClearName()
     private string alias_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Alias
-    {
+    public string Alias {
       get { return alias_ ?? AliasDefaultValue; }
-      set
-      {
+      set {
         alias_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "alias" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasAlias
-    {
+    public bool HasAlias {
       get { return alias_ != null; }
     }
     /// <summary>Clears the value of the "alias" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearAlias()
-    {
+    public void ClearAlias() {
       alias_ = null;
     }
 
@@ -342,46 +321,39 @@ public void ClearAlias()
     private readonly pbc::RepeatedField<global::Mysqlx.Expr.DocumentPathItem> documentPath_ = new pbc::RepeatedField<global::Mysqlx.Expr.DocumentPathItem>();
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Expr.DocumentPathItem> DocumentPath
-    {
+    public pbc::RepeatedField<global::Mysqlx.Expr.DocumentPathItem> DocumentPath {
       get { return documentPath_; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Column);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Column other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Column other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Name != other.Name) return false;
       if (Alias != other.Alias) return false;
-      if (!documentPath_.Equals(other.documentPath_)) return false;
+      if(!documentPath_.Equals(other.documentPath_)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasName) hash ^= Name.GetHashCode();
       if (HasAlias) hash ^= Alias.GetHashCode();
       hash ^= documentPath_.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -389,18 +361,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasName) {
         output.WriteRawTag(10);
         output.WriteString(Name);
@@ -413,48 +383,40 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasName)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasName) {
         output.WriteRawTag(10);
         output.WriteString(Name);
       }
-      if (HasAlias)
-      {
+      if (HasAlias) {
         output.WriteRawTag(18);
         output.WriteString(Alias);
       }
       documentPath_.WriteTo(ref output, _repeated_documentPath_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasName)
-      {
+      if (HasName) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
       }
-      if (HasAlias)
-      {
+      if (HasAlias) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Alias);
       }
       size += documentPath_.CalculateSize(_repeated_documentPath_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -462,18 +424,14 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Column other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Column other) {
+      if (other == null) {
         return;
       }
-      if (other.HasName)
-      {
+      if (other.HasName) {
         Name = other.Name;
       }
-      if (other.HasAlias)
-      {
+      if (other.HasAlias) {
         Alias = other.Alias;
       }
       documentPath_.Add(other.documentPath_);
@@ -482,11 +440,10 @@ public void MergeFrom(Column other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -511,54 +468,47 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              Name = input.ReadString();
-              break;
-            }
-          case 18:
-            {
-              Alias = input.ReadString();
-              break;
-            }
-          case 26:
-            {
-              documentPath_.AddEntriesFrom(ref input, _repeated_documentPath_codec);
-              break;
-            }
+          case 10: {
+            Name = input.ReadString();
+            break;
+          }
+          case 18: {
+            Alias = input.ReadString();
+            break;
+          }
+          case 26: {
+            documentPath_.AddEntriesFrom(ref input, _repeated_documentPath_codec);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Projection : pb::IMessage<Projection>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Projection> _parser = new pb::MessageParser<Projection>(() => new Projection());
     private pb::UnknownFieldSet _unknownFields;
@@ -568,22 +518,19 @@ public sealed partial class Projection : pb::IMessage<Projection>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[1]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Projection()
-    {
+    public Projection() {
       OnConstruction();
     }
 
@@ -591,8 +538,7 @@ public Projection()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Projection(Projection other) : this()
-    {
+    public Projection(Projection other) : this() {
       source_ = other.source_ != null ? other.source_.Clone() : null;
       alias_ = other.alias_;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -600,8 +546,7 @@ public Projection(Projection other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Projection Clone()
-    {
+    public Projection Clone() {
       return new Projection(this);
     }
 
@@ -614,11 +559,9 @@ public Projection Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Expr Source
-    {
+    public global::Mysqlx.Expr.Expr Source {
       get { return source_; }
-      set
-      {
+      set {
         source_ = value;
       }
     }
@@ -634,46 +577,38 @@ public Projection Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Alias
-    {
+    public string Alias {
       get { return alias_ ?? AliasDefaultValue; }
-      set
-      {
+      set {
         alias_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "alias" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasAlias
-    {
+    public bool HasAlias {
       get { return alias_ != null; }
     }
     /// <summary>Clears the value of the "alias" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearAlias()
-    {
+    public void ClearAlias() {
       alias_ = null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Projection);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Projection other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Projection other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (!object.Equals(Source, other.Source)) return false;
@@ -683,13 +618,11 @@ public bool Equals(Projection other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (source_ != null) hash ^= Source.GetHashCode();
       if (HasAlias) hash ^= Alias.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -697,18 +630,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (source_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Source);
@@ -720,46 +651,38 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (source_ != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (source_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Source);
       }
-      if (HasAlias)
-      {
+      if (HasAlias) {
         output.WriteRawTag(18);
         output.WriteString(Alias);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (source_ != null)
-      {
+      if (source_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Source);
       }
-      if (HasAlias)
-      {
+      if (HasAlias) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Alias);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -767,22 +690,17 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Projection other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Projection other) {
+      if (other == null) {
         return;
       }
-      if (other.source_ != null)
-      {
-        if (source_ == null)
-        {
+      if (other.source_ != null) {
+        if (source_ == null) {
           Source = new global::Mysqlx.Expr.Expr();
         }
         Source.MergeFrom(other.Source);
       }
-      if (other.HasAlias)
-      {
+      if (other.HasAlias) {
         Alias = other.Alias;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -790,11 +708,10 @@ public void MergeFrom(Projection other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -818,53 +735,46 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              if (source_ == null)
-              {
-                Source = new global::Mysqlx.Expr.Expr();
-              }
-              input.ReadMessage(Source);
-              break;
-            }
-          case 18:
-            {
-              Alias = input.ReadString();
-              break;
+          case 10: {
+            if (source_ == null) {
+              Source = new global::Mysqlx.Expr.Expr();
             }
+            input.ReadMessage(Source);
+            break;
+          }
+          case 18: {
+            Alias = input.ReadString();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Collection : pb::IMessage<Collection>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Collection> _parser = new pb::MessageParser<Collection>(() => new Collection());
     private pb::UnknownFieldSet _unknownFields;
@@ -874,22 +784,19 @@ public sealed partial class Collection : pb::IMessage<Collection>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[2]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Collection()
-    {
+    public Collection() {
       OnConstruction();
     }
 
@@ -897,8 +804,7 @@ public Collection()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Collection(Collection other) : this()
-    {
+    public Collection(Collection other) : this() {
       name_ = other.name_;
       schema_ = other.schema_;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -906,8 +812,7 @@ public Collection(Collection other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Collection Clone()
-    {
+    public Collection Clone() {
       return new Collection(this);
     }
 
@@ -918,26 +823,22 @@ public Collection Clone()
     private string name_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name
-    {
+    public string Name {
       get { return name_ ?? NameDefaultValue; }
-      set
-      {
+      set {
         name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "name" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName
-    {
+    public bool HasName {
       get { return name_ != null; }
     }
     /// <summary>Clears the value of the "name" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName()
-    {
+    public void ClearName() {
       name_ = null;
     }
 
@@ -948,46 +849,38 @@ public void ClearName()
     private string schema_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Schema
-    {
+    public string Schema {
       get { return schema_ ?? SchemaDefaultValue; }
-      set
-      {
+      set {
         schema_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "schema" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSchema
-    {
+    public bool HasSchema {
       get { return schema_ != null; }
     }
     /// <summary>Clears the value of the "schema" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSchema()
-    {
+    public void ClearSchema() {
       schema_ = null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Collection);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Collection other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Collection other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Name != other.Name) return false;
@@ -997,13 +890,11 @@ public bool Equals(Collection other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasName) hash ^= Name.GetHashCode();
       if (HasSchema) hash ^= Schema.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1011,18 +902,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasName) {
         output.WriteRawTag(10);
         output.WriteString(Name);
@@ -1034,46 +923,38 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasName)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasName) {
         output.WriteRawTag(10);
         output.WriteString(Name);
       }
-      if (HasSchema)
-      {
+      if (HasSchema) {
         output.WriteRawTag(18);
         output.WriteString(Schema);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasName)
-      {
+      if (HasName) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
       }
-      if (HasSchema)
-      {
+      if (HasSchema) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Schema);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1081,18 +962,14 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Collection other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Collection other) {
+      if (other == null) {
         return;
       }
-      if (other.HasName)
-      {
+      if (other.HasName) {
         Name = other.Name;
       }
-      if (other.HasSchema)
-      {
+      if (other.HasSchema) {
         Schema = other.Schema;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1100,11 +977,10 @@ public void MergeFrom(Collection other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1125,49 +1001,43 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              Name = input.ReadString();
-              break;
-            }
-          case 18:
-            {
-              Schema = input.ReadString();
-              break;
-            }
+          case 10: {
+            Name = input.ReadString();
+            break;
+          }
+          case 18: {
+            Schema = input.ReadString();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Limit : pb::IMessage<Limit>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Limit> _parser = new pb::MessageParser<Limit>(() => new Limit());
     private pb::UnknownFieldSet _unknownFields;
@@ -1178,22 +1048,19 @@ public sealed partial class Limit : pb::IMessage<Limit>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[3]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Limit()
-    {
+    public Limit() {
       OnConstruction();
     }
 
@@ -1201,8 +1068,7 @@ public Limit()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Limit(Limit other) : this()
-    {
+    public Limit(Limit other) : this() {
       _hasBits0 = other._hasBits0;
       rowCount_ = other.rowCount_;
       offset_ = other.offset_;
@@ -1211,8 +1077,7 @@ public Limit(Limit other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Limit Clone()
-    {
+    public Limit Clone() {
       return new Limit(this);
     }
 
@@ -1226,11 +1091,9 @@ public Limit Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong RowCount
-    {
+    public ulong RowCount {
       get { if ((_hasBits0 & 1) != 0) { return rowCount_; } else { return RowCountDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         rowCount_ = value;
       }
@@ -1238,15 +1101,13 @@ public ulong RowCount
     /// <summary>Gets whether the "row_count" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasRowCount
-    {
+    public bool HasRowCount {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "row_count" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearRowCount()
-    {
+    public void ClearRowCount() {
       _hasBits0 &= ~1;
     }
 
@@ -1260,11 +1121,9 @@ public void ClearRowCount()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong Offset
-    {
+    public ulong Offset {
       get { if ((_hasBits0 & 2) != 0) { return offset_; } else { return OffsetDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         offset_ = value;
       }
@@ -1272,35 +1131,29 @@ public ulong Offset
     /// <summary>Gets whether the "offset" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOffset
-    {
+    public bool HasOffset {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "offset" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOffset()
-    {
+    public void ClearOffset() {
       _hasBits0 &= ~2;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Limit);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Limit other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Limit other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (RowCount != other.RowCount) return false;
@@ -1310,13 +1163,11 @@ public bool Equals(Limit other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasRowCount) hash ^= RowCount.GetHashCode();
       if (HasOffset) hash ^= Offset.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1324,18 +1175,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasRowCount) {
         output.WriteRawTag(8);
         output.WriteUInt64(RowCount);
@@ -1347,46 +1196,38 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasRowCount)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasRowCount) {
         output.WriteRawTag(8);
         output.WriteUInt64(RowCount);
       }
-      if (HasOffset)
-      {
+      if (HasOffset) {
         output.WriteRawTag(16);
         output.WriteUInt64(Offset);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasRowCount)
-      {
+      if (HasRowCount) {
         size += 1 + pb::CodedOutputStream.ComputeUInt64Size(RowCount);
       }
-      if (HasOffset)
-      {
+      if (HasOffset) {
         size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Offset);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1394,18 +1235,14 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Limit other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Limit other) {
+      if (other == null) {
         return;
       }
-      if (other.HasRowCount)
-      {
+      if (other.HasRowCount) {
         RowCount = other.RowCount;
       }
-      if (other.HasOffset)
-      {
+      if (other.HasOffset) {
         Offset = other.Offset;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1413,11 +1250,10 @@ public void MergeFrom(Limit other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1438,41 +1274,35 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              RowCount = input.ReadUInt64();
-              break;
-            }
-          case 16:
-            {
-              Offset = input.ReadUInt64();
-              break;
-            }
+          case 8: {
+            RowCount = input.ReadUInt64();
+            break;
+          }
+          case 16: {
+            Offset = input.ReadUInt64();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -1485,9 +1315,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class LimitExpr : pb::IMessage<LimitExpr>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<LimitExpr> _parser = new pb::MessageParser<LimitExpr>(() => new LimitExpr());
     private pb::UnknownFieldSet _unknownFields;
@@ -1497,22 +1327,19 @@ public sealed partial class LimitExpr : pb::IMessage<LimitExpr>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[4]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public LimitExpr()
-    {
+    public LimitExpr() {
       OnConstruction();
     }
 
@@ -1520,8 +1347,7 @@ public LimitExpr()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public LimitExpr(LimitExpr other) : this()
-    {
+    public LimitExpr(LimitExpr other) : this() {
       rowCount_ = other.rowCount_ != null ? other.rowCount_.Clone() : null;
       offset_ = other.offset_ != null ? other.offset_.Clone() : null;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -1529,8 +1355,7 @@ public LimitExpr(LimitExpr other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public LimitExpr Clone()
-    {
+    public LimitExpr Clone() {
       return new LimitExpr(this);
     }
 
@@ -1542,11 +1367,9 @@ public LimitExpr Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Expr RowCount
-    {
+    public global::Mysqlx.Expr.Expr RowCount {
       get { return rowCount_; }
-      set
-      {
+      set {
         rowCount_ = value;
       }
     }
@@ -1559,32 +1382,26 @@ public LimitExpr Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Expr Offset
-    {
+    public global::Mysqlx.Expr.Expr Offset {
       get { return offset_; }
-      set
-      {
+      set {
         offset_ = value;
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as LimitExpr);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(LimitExpr other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(LimitExpr other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (!object.Equals(RowCount, other.RowCount)) return false;
@@ -1594,13 +1411,11 @@ public bool Equals(LimitExpr other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (rowCount_ != null) hash ^= RowCount.GetHashCode();
       if (offset_ != null) hash ^= Offset.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1608,18 +1423,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (rowCount_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(RowCount);
@@ -1631,46 +1444,38 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (rowCount_ != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (rowCount_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(RowCount);
       }
-      if (offset_ != null)
-      {
+      if (offset_ != null) {
         output.WriteRawTag(18);
         output.WriteMessage(Offset);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (rowCount_ != null)
-      {
+      if (rowCount_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(RowCount);
       }
-      if (offset_ != null)
-      {
+      if (offset_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Offset);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1678,24 +1483,18 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(LimitExpr other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(LimitExpr other) {
+      if (other == null) {
         return;
       }
-      if (other.rowCount_ != null)
-      {
-        if (rowCount_ == null)
-        {
+      if (other.rowCount_ != null) {
+        if (rowCount_ == null) {
           RowCount = new global::Mysqlx.Expr.Expr();
         }
         RowCount.MergeFrom(other.RowCount);
       }
-      if (other.offset_ != null)
-      {
-        if (offset_ == null)
-        {
+      if (other.offset_ != null) {
+        if (offset_ == null) {
           Offset = new global::Mysqlx.Expr.Expr();
         }
         Offset.MergeFrom(other.Offset);
@@ -1705,11 +1504,10 @@ public void MergeFrom(LimitExpr other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1736,49 +1534,41 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              if (rowCount_ == null)
-              {
-                RowCount = new global::Mysqlx.Expr.Expr();
-              }
-              input.ReadMessage(RowCount);
-              break;
+          case 10: {
+            if (rowCount_ == null) {
+              RowCount = new global::Mysqlx.Expr.Expr();
             }
-          case 18:
-            {
-              if (offset_ == null)
-              {
-                Offset = new global::Mysqlx.Expr.Expr();
-              }
-              input.ReadMessage(Offset);
-              break;
+            input.ReadMessage(RowCount);
+            break;
+          }
+          case 18: {
+            if (offset_ == null) {
+              Offset = new global::Mysqlx.Expr.Expr();
             }
+            input.ReadMessage(Offset);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -1788,9 +1578,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Order : pb::IMessage<Order>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Order> _parser = new pb::MessageParser<Order>(() => new Order());
     private pb::UnknownFieldSet _unknownFields;
@@ -1801,22 +1591,19 @@ public sealed partial class Order : pb::IMessage<Order>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[5]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Order()
-    {
+    public Order() {
       OnConstruction();
     }
 
@@ -1824,8 +1611,7 @@ public Order()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Order(Order other) : this()
-    {
+    public Order(Order other) : this() {
       _hasBits0 = other._hasBits0;
       expr_ = other.expr_ != null ? other.expr_.Clone() : null;
       direction_ = other.direction_;
@@ -1834,8 +1620,7 @@ public Order(Order other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Order Clone()
-    {
+    public Order Clone() {
       return new Order(this);
     }
 
@@ -1844,11 +1629,9 @@ public Order Clone()
     private global::Mysqlx.Expr.Expr expr_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Expr Expr
-    {
+    public global::Mysqlx.Expr.Expr Expr {
       get { return expr_; }
-      set
-      {
+      set {
         expr_ = value;
       }
     }
@@ -1860,11 +1643,9 @@ public Order Clone()
     private global::Mysqlx.Crud.Order.Types.Direction direction_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Order.Types.Direction Direction
-    {
+    public global::Mysqlx.Crud.Order.Types.Direction Direction {
       get { if ((_hasBits0 & 1) != 0) { return direction_; } else { return DirectionDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         direction_ = value;
       }
@@ -1872,35 +1653,29 @@ public Order Clone()
     /// <summary>Gets whether the "direction" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDirection
-    {
+    public bool HasDirection {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "direction" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDirection()
-    {
+    public void ClearDirection() {
       _hasBits0 &= ~1;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Order);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Order other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Order other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (!object.Equals(Expr, other.Expr)) return false;
@@ -1910,13 +1685,11 @@ public bool Equals(Order other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (expr_ != null) hash ^= Expr.GetHashCode();
       if (HasDirection) hash ^= Direction.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1924,18 +1697,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (expr_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Expr);
@@ -1947,46 +1718,38 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (expr_ != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (expr_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Expr);
       }
-      if (HasDirection)
-      {
+      if (HasDirection) {
         output.WriteRawTag(16);
-        output.WriteEnum((int)Direction);
+        output.WriteEnum((int) Direction);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (expr_ != null)
-      {
+      if (expr_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Expr);
       }
-      if (HasDirection)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Direction);
+      if (HasDirection) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Direction);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1994,22 +1757,17 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Order other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Order other) {
+      if (other == null) {
         return;
       }
-      if (other.expr_ != null)
-      {
-        if (expr_ == null)
-        {
+      if (other.expr_ != null) {
+        if (expr_ == null) {
           Expr = new global::Mysqlx.Expr.Expr();
         }
         Expr.MergeFrom(other.Expr);
       }
-      if (other.HasDirection)
-      {
+      if (other.HasDirection) {
         Direction = other.Direction;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -2017,11 +1775,10 @@ public void MergeFrom(Order other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -2045,54 +1802,45 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              if (expr_ == null)
-              {
-                Expr = new global::Mysqlx.Expr.Expr();
-              }
-              input.ReadMessage(Expr);
-              break;
-            }
-          case 16:
-            {
-              Direction = (global::Mysqlx.Crud.Order.Types.Direction)input.ReadEnum();
-              break;
+          case 10: {
+            if (expr_ == null) {
+              Expr = new global::Mysqlx.Expr.Expr();
             }
+            input.ReadMessage(Expr);
+            break;
+          }
+          case 16: {
+            Direction = (global::Mysqlx.Crud.Order.Types.Direction) input.ReadEnum();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Order message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum Direction
-      {
+    public static partial class Types {
+      public enum Direction {
         [pbr::OriginalName("ASC")] Asc = 1,
         [pbr::OriginalName("DESC")] Desc = 2,
       }
@@ -2104,9 +1852,9 @@ public enum Direction
 
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class UpdateOperation : pb::IMessage<UpdateOperation>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<UpdateOperation> _parser = new pb::MessageParser<UpdateOperation>(() => new UpdateOperation());
     private pb::UnknownFieldSet _unknownFields;
@@ -2117,22 +1865,19 @@ public sealed partial class UpdateOperation : pb::IMessage<UpdateOperation>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[6]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UpdateOperation()
-    {
+    public UpdateOperation() {
       OnConstruction();
     }
 
@@ -2140,8 +1885,7 @@ public UpdateOperation()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UpdateOperation(UpdateOperation other) : this()
-    {
+    public UpdateOperation(UpdateOperation other) : this() {
       _hasBits0 = other._hasBits0;
       source_ = other.source_ != null ? other.source_.Clone() : null;
       operation_ = other.operation_;
@@ -2151,8 +1895,7 @@ public UpdateOperation(UpdateOperation other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UpdateOperation Clone()
-    {
+    public UpdateOperation Clone() {
       return new UpdateOperation(this);
     }
 
@@ -2169,11 +1912,9 @@ public UpdateOperation Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.ColumnIdentifier Source
-    {
+    public global::Mysqlx.Expr.ColumnIdentifier Source {
       get { return source_; }
-      set
-      {
+      set {
         source_ = value;
       }
     }
@@ -2188,11 +1929,9 @@ public UpdateOperation Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.UpdateOperation.Types.UpdateType Operation
-    {
+    public global::Mysqlx.Crud.UpdateOperation.Types.UpdateType Operation {
       get { if ((_hasBits0 & 1) != 0) { return operation_; } else { return OperationDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         operation_ = value;
       }
@@ -2200,15 +1939,13 @@ public UpdateOperation Clone()
     /// <summary>Gets whether the "operation" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOperation
-    {
+    public bool HasOperation {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "operation" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOperation()
-    {
+    public void ClearOperation() {
       _hasBits0 &= ~1;
     }
 
@@ -2220,32 +1957,26 @@ public void ClearOperation()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Expr Value
-    {
+    public global::Mysqlx.Expr.Expr Value {
       get { return value_; }
-      set
-      {
+      set {
         value_ = value;
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as UpdateOperation);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(UpdateOperation other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(UpdateOperation other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (!object.Equals(Source, other.Source)) return false;
@@ -2256,14 +1987,12 @@ public bool Equals(UpdateOperation other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (source_ != null) hash ^= Source.GetHashCode();
       if (HasOperation) hash ^= Operation.GetHashCode();
       if (value_ != null) hash ^= Value.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -2271,18 +2000,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (source_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Source);
@@ -2298,55 +2025,45 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (source_ != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (source_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Source);
       }
-      if (HasOperation)
-      {
+      if (HasOperation) {
         output.WriteRawTag(16);
-        output.WriteEnum((int)Operation);
+        output.WriteEnum((int) Operation);
       }
-      if (value_ != null)
-      {
+      if (value_ != null) {
         output.WriteRawTag(26);
         output.WriteMessage(Value);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (source_ != null)
-      {
+      if (source_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Source);
       }
-      if (HasOperation)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Operation);
+      if (HasOperation) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Operation);
       }
-      if (value_ != null)
-      {
+      if (value_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Value);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -2354,28 +2071,21 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(UpdateOperation other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(UpdateOperation other) {
+      if (other == null) {
         return;
       }
-      if (other.source_ != null)
-      {
-        if (source_ == null)
-        {
+      if (other.source_ != null) {
+        if (source_ == null) {
           Source = new global::Mysqlx.Expr.ColumnIdentifier();
         }
         Source.MergeFrom(other.Source);
       }
-      if (other.HasOperation)
-      {
+      if (other.HasOperation) {
         Operation = other.Operation;
       }
-      if (other.value_ != null)
-      {
-        if (value_ == null)
-        {
+      if (other.value_ != null) {
+        if (value_ == null) {
           Value = new global::Mysqlx.Expr.Expr();
         }
         Value.MergeFrom(other.Value);
@@ -2385,11 +2095,10 @@ public void MergeFrom(UpdateOperation other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -2420,63 +2129,52 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              if (source_ == null)
-              {
-                Source = new global::Mysqlx.Expr.ColumnIdentifier();
-              }
-              input.ReadMessage(Source);
-              break;
-            }
-          case 16:
-            {
-              Operation = (global::Mysqlx.Crud.UpdateOperation.Types.UpdateType)input.ReadEnum();
-              break;
+          case 10: {
+            if (source_ == null) {
+              Source = new global::Mysqlx.Expr.ColumnIdentifier();
             }
-          case 26:
-            {
-              if (value_ == null)
-              {
-                Value = new global::Mysqlx.Expr.Expr();
-              }
-              input.ReadMessage(Value);
-              break;
+            input.ReadMessage(Source);
+            break;
+          }
+          case 16: {
+            Operation = (global::Mysqlx.Crud.UpdateOperation.Types.UpdateType) input.ReadEnum();
+            break;
+          }
+          case 26: {
+            if (value_ == null) {
+              Value = new global::Mysqlx.Expr.Expr();
             }
+            input.ReadMessage(Value);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the UpdateOperation message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum UpdateType
-      {
+    public static partial class Types {
+      public enum UpdateType {
         /// <summary>
         ///* only allowed for TABLE 
         /// </summary>
@@ -2529,9 +2227,9 @@ public enum UpdateType
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Find : pb::IMessage<Find>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Find> _parser = new pb::MessageParser<Find>(() => new Find());
     private pb::UnknownFieldSet _unknownFields;
@@ -2542,22 +2240,19 @@ public sealed partial class Find : pb::IMessage<Find>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[7]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Find()
-    {
+    public Find() {
       OnConstruction();
     }
 
@@ -2565,8 +2260,7 @@ public Find()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Find(Find other) : this()
-    {
+    public Find(Find other) : this() {
       _hasBits0 = other._hasBits0;
       collection_ = other.collection_ != null ? other.collection_.Clone() : null;
       dataModel_ = other.dataModel_;
@@ -2585,8 +2279,7 @@ public Find(Find other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Find Clone()
-    {
+    public Find Clone() {
       return new Find(this);
     }
 
@@ -2598,11 +2291,9 @@ public Find Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Collection Collection
-    {
+    public global::Mysqlx.Crud.Collection Collection {
       get { return collection_; }
-      set
-      {
+      set {
         collection_ = value;
       }
     }
@@ -2617,11 +2308,9 @@ public Find Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.DataModel DataModel
-    {
+    public global::Mysqlx.Crud.DataModel DataModel {
       get { if ((_hasBits0 & 1) != 0) { return dataModel_; } else { return DataModelDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         dataModel_ = value;
       }
@@ -2629,15 +2318,13 @@ public Find Clone()
     /// <summary>Gets whether the "data_model" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDataModel
-    {
+    public bool HasDataModel {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "data_model" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDataModel()
-    {
+    public void ClearDataModel() {
       _hasBits0 &= ~1;
     }
 
@@ -2651,8 +2338,7 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Crud.Projection> Projection
-    {
+    public pbc::RepeatedField<global::Mysqlx.Crud.Projection> Projection {
       get { return projection_; }
     }
 
@@ -2666,8 +2352,7 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Datatypes.Scalar> Args
-    {
+    public pbc::RepeatedField<global::Mysqlx.Datatypes.Scalar> Args {
       get { return args_; }
     }
 
@@ -2679,11 +2364,9 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Expr Criteria
-    {
+    public global::Mysqlx.Expr.Expr Criteria {
       get { return criteria_; }
-      set
-      {
+      set {
         criteria_ = value;
       }
     }
@@ -2697,11 +2380,9 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Limit Limit
-    {
+    public global::Mysqlx.Crud.Limit Limit {
       get { return limit_; }
-      set
-      {
+      set {
         limit_ = value;
       }
     }
@@ -2716,8 +2397,7 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Crud.Order> Order
-    {
+    public pbc::RepeatedField<global::Mysqlx.Crud.Order> Order {
       get { return order_; }
     }
 
@@ -2731,8 +2411,7 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Expr.Expr> Grouping
-    {
+    public pbc::RepeatedField<global::Mysqlx.Expr.Expr> Grouping {
       get { return grouping_; }
     }
 
@@ -2744,11 +2423,9 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Expr GroupingCriteria
-    {
+    public global::Mysqlx.Expr.Expr GroupingCriteria {
       get { return groupingCriteria_; }
-      set
-      {
+      set {
         groupingCriteria_ = value;
       }
     }
@@ -2763,11 +2440,9 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Find.Types.RowLock Locking
-    {
+    public global::Mysqlx.Crud.Find.Types.RowLock Locking {
       get { if ((_hasBits0 & 2) != 0) { return locking_; } else { return LockingDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         locking_ = value;
       }
@@ -2775,15 +2450,13 @@ public void ClearDataModel()
     /// <summary>Gets whether the "locking" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasLocking
-    {
+    public bool HasLocking {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "locking" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearLocking()
-    {
+    public void ClearLocking() {
       _hasBits0 &= ~2;
     }
 
@@ -2797,11 +2470,9 @@ public void ClearLocking()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Find.Types.RowLockOptions LockingOptions
-    {
+    public global::Mysqlx.Crud.Find.Types.RowLockOptions LockingOptions {
       get { if ((_hasBits0 & 4) != 0) { return lockingOptions_; } else { return LockingOptionsDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 4;
         lockingOptions_ = value;
       }
@@ -2809,15 +2480,13 @@ public void ClearLocking()
     /// <summary>Gets whether the "locking_options" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasLockingOptions
-    {
+    public bool HasLockingOptions {
       get { return (_hasBits0 & 4) != 0; }
     }
     /// <summary>Clears the value of the "locking_options" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearLockingOptions()
-    {
+    public void ClearLockingOptions() {
       _hasBits0 &= ~4;
     }
 
@@ -2830,42 +2499,36 @@ public void ClearLockingOptions()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.LimitExpr LimitExpr
-    {
+    public global::Mysqlx.Crud.LimitExpr LimitExpr {
       get { return limitExpr_; }
-      set
-      {
+      set {
         limitExpr_ = value;
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Find);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Find other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Find other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (!object.Equals(Collection, other.Collection)) return false;
       if (DataModel != other.DataModel) return false;
-      if (!projection_.Equals(other.projection_)) return false;
-      if (!args_.Equals(other.args_)) return false;
+      if(!projection_.Equals(other.projection_)) return false;
+      if(!args_.Equals(other.args_)) return false;
       if (!object.Equals(Criteria, other.Criteria)) return false;
       if (!object.Equals(Limit, other.Limit)) return false;
-      if (!order_.Equals(other.order_)) return false;
-      if (!grouping_.Equals(other.grouping_)) return false;
+      if(!order_.Equals(other.order_)) return false;
+      if(!grouping_.Equals(other.grouping_)) return false;
       if (!object.Equals(GroupingCriteria, other.GroupingCriteria)) return false;
       if (Locking != other.Locking) return false;
       if (LockingOptions != other.LockingOptions) return false;
@@ -2875,8 +2538,7 @@ public bool Equals(Find other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (collection_ != null) hash ^= Collection.GetHashCode();
       if (HasDataModel) hash ^= DataModel.GetHashCode();
@@ -2890,8 +2552,7 @@ public override int GetHashCode()
       if (HasLocking) hash ^= Locking.GetHashCode();
       if (HasLockingOptions) hash ^= LockingOptions.GetHashCode();
       if (limitExpr_ != null) hash ^= LimitExpr.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -2899,18 +2560,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (collection_ != null) {
         output.WriteRawTag(18);
         output.WriteMessage(Collection);
@@ -2950,108 +2609,88 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (collection_ != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (collection_ != null) {
         output.WriteRawTag(18);
         output.WriteMessage(Collection);
       }
-      if (HasDataModel)
-      {
+      if (HasDataModel) {
         output.WriteRawTag(24);
-        output.WriteEnum((int)DataModel);
+        output.WriteEnum((int) DataModel);
       }
       projection_.WriteTo(ref output, _repeated_projection_codec);
-      if (criteria_ != null)
-      {
+      if (criteria_ != null) {
         output.WriteRawTag(42);
         output.WriteMessage(Criteria);
       }
-      if (limit_ != null)
-      {
+      if (limit_ != null) {
         output.WriteRawTag(50);
         output.WriteMessage(Limit);
       }
       order_.WriteTo(ref output, _repeated_order_codec);
       grouping_.WriteTo(ref output, _repeated_grouping_codec);
-      if (groupingCriteria_ != null)
-      {
+      if (groupingCriteria_ != null) {
         output.WriteRawTag(74);
         output.WriteMessage(GroupingCriteria);
       }
       args_.WriteTo(ref output, _repeated_args_codec);
-      if (HasLocking)
-      {
+      if (HasLocking) {
         output.WriteRawTag(96);
-        output.WriteEnum((int)Locking);
+        output.WriteEnum((int) Locking);
       }
-      if (HasLockingOptions)
-      {
+      if (HasLockingOptions) {
         output.WriteRawTag(104);
-        output.WriteEnum((int)LockingOptions);
+        output.WriteEnum((int) LockingOptions);
       }
-      if (limitExpr_ != null)
-      {
+      if (limitExpr_ != null) {
         output.WriteRawTag(114);
         output.WriteMessage(LimitExpr);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (collection_ != null)
-      {
+      if (collection_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Collection);
       }
-      if (HasDataModel)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)DataModel);
+      if (HasDataModel) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) DataModel);
       }
       size += projection_.CalculateSize(_repeated_projection_codec);
       size += args_.CalculateSize(_repeated_args_codec);
-      if (criteria_ != null)
-      {
+      if (criteria_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Criteria);
       }
-      if (limit_ != null)
-      {
+      if (limit_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Limit);
       }
       size += order_.CalculateSize(_repeated_order_codec);
       size += grouping_.CalculateSize(_repeated_grouping_codec);
-      if (groupingCriteria_ != null)
-      {
+      if (groupingCriteria_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(GroupingCriteria);
       }
-      if (HasLocking)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Locking);
+      if (HasLocking) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Locking);
       }
-      if (HasLockingOptions)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)LockingOptions);
+      if (HasLockingOptions) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) LockingOptions);
       }
-      if (limitExpr_ != null)
-      {
+      if (limitExpr_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(LimitExpr);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -3059,64 +2698,49 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Find other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Find other) {
+      if (other == null) {
         return;
       }
-      if (other.collection_ != null)
-      {
-        if (collection_ == null)
-        {
+      if (other.collection_ != null) {
+        if (collection_ == null) {
           Collection = new global::Mysqlx.Crud.Collection();
         }
         Collection.MergeFrom(other.Collection);
       }
-      if (other.HasDataModel)
-      {
+      if (other.HasDataModel) {
         DataModel = other.DataModel;
       }
       projection_.Add(other.projection_);
       args_.Add(other.args_);
-      if (other.criteria_ != null)
-      {
-        if (criteria_ == null)
-        {
+      if (other.criteria_ != null) {
+        if (criteria_ == null) {
           Criteria = new global::Mysqlx.Expr.Expr();
         }
         Criteria.MergeFrom(other.Criteria);
       }
-      if (other.limit_ != null)
-      {
-        if (limit_ == null)
-        {
+      if (other.limit_ != null) {
+        if (limit_ == null) {
           Limit = new global::Mysqlx.Crud.Limit();
         }
         Limit.MergeFrom(other.Limit);
       }
       order_.Add(other.order_);
       grouping_.Add(other.grouping_);
-      if (other.groupingCriteria_ != null)
-      {
-        if (groupingCriteria_ == null)
-        {
+      if (other.groupingCriteria_ != null) {
+        if (groupingCriteria_ == null) {
           GroupingCriteria = new global::Mysqlx.Expr.Expr();
         }
         GroupingCriteria.MergeFrom(other.GroupingCriteria);
       }
-      if (other.HasLocking)
-      {
+      if (other.HasLocking) {
         Locking = other.Locking;
       }
-      if (other.HasLockingOptions)
-      {
+      if (other.HasLockingOptions) {
         LockingOptions = other.LockingOptions;
       }
-      if (other.limitExpr_ != null)
-      {
-        if (limitExpr_ == null)
-        {
+      if (other.limitExpr_ != null) {
+        if (limitExpr_ == null) {
           LimitExpr = new global::Mysqlx.Crud.LimitExpr();
         }
         LimitExpr.MergeFrom(other.LimitExpr);
@@ -3126,11 +2750,10 @@ public void MergeFrom(Find other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -3206,120 +2829,97 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 18:
-            {
-              if (collection_ == null)
-              {
-                Collection = new global::Mysqlx.Crud.Collection();
-              }
-              input.ReadMessage(Collection);
-              break;
-            }
-          case 24:
-            {
-              DataModel = (global::Mysqlx.Crud.DataModel)input.ReadEnum();
-              break;
-            }
-          case 34:
-            {
-              projection_.AddEntriesFrom(ref input, _repeated_projection_codec);
-              break;
-            }
-          case 42:
-            {
-              if (criteria_ == null)
-              {
-                Criteria = new global::Mysqlx.Expr.Expr();
-              }
-              input.ReadMessage(Criteria);
-              break;
-            }
-          case 50:
-            {
-              if (limit_ == null)
-              {
-                Limit = new global::Mysqlx.Crud.Limit();
-              }
-              input.ReadMessage(Limit);
-              break;
-            }
-          case 58:
-            {
-              order_.AddEntriesFrom(ref input, _repeated_order_codec);
-              break;
-            }
-          case 66:
-            {
-              grouping_.AddEntriesFrom(ref input, _repeated_grouping_codec);
-              break;
-            }
-          case 74:
-            {
-              if (groupingCriteria_ == null)
-              {
-                GroupingCriteria = new global::Mysqlx.Expr.Expr();
-              }
-              input.ReadMessage(GroupingCriteria);
-              break;
+          case 18: {
+            if (collection_ == null) {
+              Collection = new global::Mysqlx.Crud.Collection();
             }
-          case 90:
-            {
-              args_.AddEntriesFrom(ref input, _repeated_args_codec);
-              break;
+            input.ReadMessage(Collection);
+            break;
+          }
+          case 24: {
+            DataModel = (global::Mysqlx.Crud.DataModel) input.ReadEnum();
+            break;
+          }
+          case 34: {
+            projection_.AddEntriesFrom(ref input, _repeated_projection_codec);
+            break;
+          }
+          case 42: {
+            if (criteria_ == null) {
+              Criteria = new global::Mysqlx.Expr.Expr();
             }
-          case 96:
-            {
-              Locking = (global::Mysqlx.Crud.Find.Types.RowLock)input.ReadEnum();
-              break;
+            input.ReadMessage(Criteria);
+            break;
+          }
+          case 50: {
+            if (limit_ == null) {
+              Limit = new global::Mysqlx.Crud.Limit();
             }
-          case 104:
-            {
-              LockingOptions = (global::Mysqlx.Crud.Find.Types.RowLockOptions)input.ReadEnum();
-              break;
+            input.ReadMessage(Limit);
+            break;
+          }
+          case 58: {
+            order_.AddEntriesFrom(ref input, _repeated_order_codec);
+            break;
+          }
+          case 66: {
+            grouping_.AddEntriesFrom(ref input, _repeated_grouping_codec);
+            break;
+          }
+          case 74: {
+            if (groupingCriteria_ == null) {
+              GroupingCriteria = new global::Mysqlx.Expr.Expr();
             }
-          case 114:
-            {
-              if (limitExpr_ == null)
-              {
-                LimitExpr = new global::Mysqlx.Crud.LimitExpr();
-              }
-              input.ReadMessage(LimitExpr);
-              break;
+            input.ReadMessage(GroupingCriteria);
+            break;
+          }
+          case 90: {
+            args_.AddEntriesFrom(ref input, _repeated_args_codec);
+            break;
+          }
+          case 96: {
+            Locking = (global::Mysqlx.Crud.Find.Types.RowLock) input.ReadEnum();
+            break;
+          }
+          case 104: {
+            LockingOptions = (global::Mysqlx.Crud.Find.Types.RowLockOptions) input.ReadEnum();
+            break;
+          }
+          case 114: {
+            if (limitExpr_ == null) {
+              LimitExpr = new global::Mysqlx.Crud.LimitExpr();
             }
+            input.ReadMessage(LimitExpr);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Find message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum RowLock
-      {
+    public static partial class Types {
+      public enum RowLock {
         /// <summary>
         ///* Lock matching rows against updates 
         /// </summary>
@@ -3330,8 +2930,7 @@ public enum RowLock
         [pbr::OriginalName("EXCLUSIVE_LOCK")] ExclusiveLock = 2,
       }
 
-      public enum RowLockOptions
-      {
+      public enum RowLockOptions {
         /// <summary>
         ///* Do not wait to acquire row lock, fail with an error
         ///if a requested row is locked 
@@ -3357,9 +2956,9 @@ public enum RowLockOptions
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Insert : pb::IMessage<Insert>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Insert> _parser = new pb::MessageParser<Insert>(() => new Insert());
     private pb::UnknownFieldSet _unknownFields;
@@ -3370,22 +2969,19 @@ public sealed partial class Insert : pb::IMessage<Insert>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[8]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Insert()
-    {
+    public Insert() {
       OnConstruction();
     }
 
@@ -3393,8 +2989,7 @@ public Insert()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Insert(Insert other) : this()
-    {
+    public Insert(Insert other) : this() {
       _hasBits0 = other._hasBits0;
       collection_ = other.collection_ != null ? other.collection_.Clone() : null;
       dataModel_ = other.dataModel_;
@@ -3407,8 +3002,7 @@ public Insert(Insert other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Insert Clone()
-    {
+    public Insert Clone() {
       return new Insert(this);
     }
 
@@ -3420,11 +3014,9 @@ public Insert Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Collection Collection
-    {
+    public global::Mysqlx.Crud.Collection Collection {
       get { return collection_; }
-      set
-      {
+      set {
         collection_ = value;
       }
     }
@@ -3439,11 +3031,9 @@ public Insert Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.DataModel DataModel
-    {
+    public global::Mysqlx.Crud.DataModel DataModel {
       get { if ((_hasBits0 & 1) != 0) { return dataModel_; } else { return DataModelDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         dataModel_ = value;
       }
@@ -3451,15 +3041,13 @@ public Insert Clone()
     /// <summary>Gets whether the "data_model" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDataModel
-    {
+    public bool HasDataModel {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "data_model" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDataModel()
-    {
+    public void ClearDataModel() {
       _hasBits0 &= ~1;
     }
 
@@ -3474,8 +3062,7 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Crud.Column> Projection
-    {
+    public pbc::RepeatedField<global::Mysqlx.Crud.Column> Projection {
       get { return projection_; }
     }
 
@@ -3490,8 +3077,7 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Crud.Insert.Types.TypedRow> Row
-    {
+    public pbc::RepeatedField<global::Mysqlx.Crud.Insert.Types.TypedRow> Row {
       get { return row_; }
     }
 
@@ -3505,8 +3091,7 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Datatypes.Scalar> Args
-    {
+    public pbc::RepeatedField<global::Mysqlx.Datatypes.Scalar> Args {
       get { return args_; }
     }
 
@@ -3521,11 +3106,9 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Upsert
-    {
+    public bool Upsert {
       get { if ((_hasBits0 & 2) != 0) { return upsert_; } else { return UpsertDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         upsert_ = value;
       }
@@ -3533,50 +3116,43 @@ public bool Upsert
     /// <summary>Gets whether the "upsert" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasUpsert
-    {
+    public bool HasUpsert {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "upsert" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearUpsert()
-    {
+    public void ClearUpsert() {
       _hasBits0 &= ~2;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Insert);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Insert other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Insert other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (!object.Equals(Collection, other.Collection)) return false;
       if (DataModel != other.DataModel) return false;
-      if (!projection_.Equals(other.projection_)) return false;
-      if (!row_.Equals(other.row_)) return false;
-      if (!args_.Equals(other.args_)) return false;
+      if(!projection_.Equals(other.projection_)) return false;
+      if(!row_.Equals(other.row_)) return false;
+      if(!args_.Equals(other.args_)) return false;
       if (Upsert != other.Upsert) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (collection_ != null) hash ^= Collection.GetHashCode();
       if (HasDataModel) hash ^= DataModel.GetHashCode();
@@ -3584,8 +3160,7 @@ public override int GetHashCode()
       hash ^= row_.GetHashCode();
       hash ^= args_.GetHashCode();
       if (HasUpsert) hash ^= Upsert.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -3593,18 +3168,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (collection_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Collection);
@@ -3623,61 +3196,51 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (collection_ != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (collection_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Collection);
       }
-      if (HasDataModel)
-      {
+      if (HasDataModel) {
         output.WriteRawTag(16);
-        output.WriteEnum((int)DataModel);
+        output.WriteEnum((int) DataModel);
       }
       projection_.WriteTo(ref output, _repeated_projection_codec);
       row_.WriteTo(ref output, _repeated_row_codec);
       args_.WriteTo(ref output, _repeated_args_codec);
-      if (HasUpsert)
-      {
+      if (HasUpsert) {
         output.WriteRawTag(48);
         output.WriteBool(Upsert);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (collection_ != null)
-      {
+      if (collection_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Collection);
       }
-      if (HasDataModel)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)DataModel);
+      if (HasDataModel) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) DataModel);
       }
       size += projection_.CalculateSize(_repeated_projection_codec);
       size += row_.CalculateSize(_repeated_row_codec);
       size += args_.CalculateSize(_repeated_args_codec);
-      if (HasUpsert)
-      {
+      if (HasUpsert) {
         size += 1 + 1;
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -3685,29 +3248,23 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Insert other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Insert other) {
+      if (other == null) {
         return;
       }
-      if (other.collection_ != null)
-      {
-        if (collection_ == null)
-        {
+      if (other.collection_ != null) {
+        if (collection_ == null) {
           Collection = new global::Mysqlx.Crud.Collection();
         }
         Collection.MergeFrom(other.Collection);
       }
-      if (other.HasDataModel)
-      {
+      if (other.HasDataModel) {
         DataModel = other.DataModel;
       }
       projection_.Add(other.projection_);
       row_.Add(other.row_);
       args_.Add(other.args_);
-      if (other.HasUpsert)
-      {
+      if (other.HasUpsert) {
         Upsert = other.Upsert;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -3715,11 +3272,10 @@ public void MergeFrom(Insert other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -3759,80 +3315,68 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              if (collection_ == null)
-              {
-                Collection = new global::Mysqlx.Crud.Collection();
-              }
-              input.ReadMessage(Collection);
-              break;
-            }
-          case 16:
-            {
-              DataModel = (global::Mysqlx.Crud.DataModel)input.ReadEnum();
-              break;
-            }
-          case 26:
-            {
-              projection_.AddEntriesFrom(ref input, _repeated_projection_codec);
-              break;
-            }
-          case 34:
-            {
-              row_.AddEntriesFrom(ref input, _repeated_row_codec);
-              break;
-            }
-          case 42:
-            {
-              args_.AddEntriesFrom(ref input, _repeated_args_codec);
-              break;
-            }
-          case 48:
-            {
-              Upsert = input.ReadBool();
-              break;
+          case 10: {
+            if (collection_ == null) {
+              Collection = new global::Mysqlx.Crud.Collection();
             }
+            input.ReadMessage(Collection);
+            break;
+          }
+          case 16: {
+            DataModel = (global::Mysqlx.Crud.DataModel) input.ReadEnum();
+            break;
+          }
+          case 26: {
+            projection_.AddEntriesFrom(ref input, _repeated_projection_codec);
+            break;
+          }
+          case 34: {
+            row_.AddEntriesFrom(ref input, _repeated_row_codec);
+            break;
+          }
+          case 42: {
+            args_.AddEntriesFrom(ref input, _repeated_args_codec);
+            break;
+          }
+          case 48: {
+            Upsert = input.ReadBool();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Insert message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
+    public static partial class Types {
       /// <summary>
       ///* set of fields to insert as a one row 
       /// </summary>
       [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class TypedRow : pb::IMessage<TypedRow>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
-#endif
+      #endif
       {
         private static readonly pb::MessageParser<TypedRow> _parser = new pb::MessageParser<TypedRow>(() => new TypedRow());
         private pb::UnknownFieldSet _unknownFields;
@@ -3842,22 +3386,19 @@ public sealed partial class TypedRow : pb::IMessage<TypedRow>
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor
-        {
+        public static pbr::MessageDescriptor Descriptor {
           get { return global::Mysqlx.Crud.Insert.Descriptor.NestedTypes[0]; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor
-        {
+        pbr::MessageDescriptor pb::IMessage.Descriptor {
           get { return Descriptor; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public TypedRow()
-        {
+        public TypedRow() {
           OnConstruction();
         }
 
@@ -3865,16 +3406,14 @@ public TypedRow()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public TypedRow(TypedRow other) : this()
-        {
+        public TypedRow(TypedRow other) : this() {
           field_ = other.field_.Clone();
           _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public TypedRow Clone()
-        {
+        public TypedRow Clone() {
           return new TypedRow(this);
         }
 
@@ -3885,42 +3424,35 @@ public TypedRow Clone()
         private readonly pbc::RepeatedField<global::Mysqlx.Expr.Expr> field_ = new pbc::RepeatedField<global::Mysqlx.Expr.Expr>();
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<global::Mysqlx.Expr.Expr> Field
-        {
+        public pbc::RepeatedField<global::Mysqlx.Expr.Expr> Field {
           get { return field_; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other)
-        {
+        public override bool Equals(object other) {
           return Equals(other as TypedRow);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(TypedRow other)
-        {
-          if (ReferenceEquals(other, null))
-          {
+        public bool Equals(TypedRow other) {
+          if (ReferenceEquals(other, null)) {
             return false;
           }
-          if (ReferenceEquals(other, this))
-          {
+          if (ReferenceEquals(other, this)) {
             return true;
           }
-          if (!field_.Equals(other.field_)) return false;
+          if(!field_.Equals(other.field_)) return false;
           return Equals(_unknownFields, other._unknownFields);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode()
-        {
+        public override int GetHashCode() {
           int hash = 1;
           hash ^= field_.GetHashCode();
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             hash ^= _unknownFields.GetHashCode();
           }
           return hash;
@@ -3928,46 +3460,40 @@ public override int GetHashCode()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString()
-        {
+        public override string ToString() {
           return pb::JsonFormatter.ToDiagnosticString(this);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void WriteTo(pb::CodedOutputStream output) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           output.WriteRawMessage(this);
-#else
+        #else
           field_.WriteTo(output, _repeated_field_codec);
           if (_unknownFields != null) {
             _unknownFields.WriteTo(output);
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-        {
+        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
           field_.WriteTo(ref output, _repeated_field_codec);
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             _unknownFields.WriteTo(ref output);
           }
         }
-#endif
+        #endif
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize()
-        {
+        public int CalculateSize() {
           int size = 0;
           size += field_.CalculateSize(_repeated_field_codec);
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             size += _unknownFields.CalculateSize();
           }
           return size;
@@ -3975,10 +3501,8 @@ public int CalculateSize()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(TypedRow other)
-        {
-          if (other == null)
-          {
+        public void MergeFrom(TypedRow other) {
+          if (other == null) {
             return;
           }
           field_.Add(other.field_);
@@ -3987,11 +3511,10 @@ public void MergeFrom(TypedRow other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void MergeFrom(pb::CodedInputStream input) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           input.ReadRawMessage(this);
-#else
+        #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
           if ((tag & 7) == 4) {
@@ -4008,36 +3531,31 @@ public void MergeFrom(pb::CodedInputStream input)
               }
             }
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-        {
+        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
           uint tag;
-          while ((tag = input.ReadTag()) != 0)
-          {
-            if ((tag & 7) == 4)
-            {
-              // Abort on any end group tag.
-              return;
-            }
-            switch (tag)
-            {
+          while ((tag = input.ReadTag()) != 0) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
                 break;
-              case 10:
-                {
-                  field_.AddEntriesFrom(ref input, _repeated_field_codec);
-                  break;
-                }
+              case 10: {
+                field_.AddEntriesFrom(ref input, _repeated_field_codec);
+                break;
+              }
             }
           }
         }
-#endif
+        #endif
 
       }
 
@@ -4054,9 +3572,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Update : pb::IMessage<Update>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Update> _parser = new pb::MessageParser<Update>(() => new Update());
     private pb::UnknownFieldSet _unknownFields;
@@ -4067,22 +3585,19 @@ public sealed partial class Update : pb::IMessage<Update>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[9]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Update()
-    {
+    public Update() {
       OnConstruction();
     }
 
@@ -4090,8 +3605,7 @@ public Update()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Update(Update other) : this()
-    {
+    public Update(Update other) : this() {
       _hasBits0 = other._hasBits0;
       collection_ = other.collection_ != null ? other.collection_.Clone() : null;
       dataModel_ = other.dataModel_;
@@ -4106,8 +3620,7 @@ public Update(Update other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Update Clone()
-    {
+    public Update Clone() {
       return new Update(this);
     }
 
@@ -4119,11 +3632,9 @@ public Update Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Collection Collection
-    {
+    public global::Mysqlx.Crud.Collection Collection {
       get { return collection_; }
-      set
-      {
+      set {
         collection_ = value;
       }
     }
@@ -4138,11 +3649,9 @@ public Update Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.DataModel DataModel
-    {
+    public global::Mysqlx.Crud.DataModel DataModel {
       get { if ((_hasBits0 & 1) != 0) { return dataModel_; } else { return DataModelDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         dataModel_ = value;
       }
@@ -4150,15 +3659,13 @@ public Update Clone()
     /// <summary>Gets whether the "data_model" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDataModel
-    {
+    public bool HasDataModel {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "data_model" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDataModel()
-    {
+    public void ClearDataModel() {
       _hasBits0 &= ~1;
     }
 
@@ -4170,11 +3677,9 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Expr Criteria
-    {
+    public global::Mysqlx.Expr.Expr Criteria {
       get { return criteria_; }
-      set
-      {
+      set {
         criteria_ = value;
       }
     }
@@ -4188,11 +3693,9 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Limit Limit
-    {
+    public global::Mysqlx.Crud.Limit Limit {
       get { return limit_; }
-      set
-      {
+      set {
         limit_ = value;
       }
     }
@@ -4207,8 +3710,7 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Crud.Order> Order
-    {
+    public pbc::RepeatedField<global::Mysqlx.Crud.Order> Order {
       get { return order_; }
     }
 
@@ -4223,8 +3725,7 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Crud.UpdateOperation> Operation
-    {
+    public pbc::RepeatedField<global::Mysqlx.Crud.UpdateOperation> Operation {
       get { return operation_; }
     }
 
@@ -4238,8 +3739,7 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Datatypes.Scalar> Args
-    {
+    public pbc::RepeatedField<global::Mysqlx.Datatypes.Scalar> Args {
       get { return args_; }
     }
 
@@ -4252,49 +3752,42 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.LimitExpr LimitExpr
-    {
+    public global::Mysqlx.Crud.LimitExpr LimitExpr {
       get { return limitExpr_; }
-      set
-      {
+      set {
         limitExpr_ = value;
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Update);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Update other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Update other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (!object.Equals(Collection, other.Collection)) return false;
       if (DataModel != other.DataModel) return false;
       if (!object.Equals(Criteria, other.Criteria)) return false;
       if (!object.Equals(Limit, other.Limit)) return false;
-      if (!order_.Equals(other.order_)) return false;
-      if (!operation_.Equals(other.operation_)) return false;
-      if (!args_.Equals(other.args_)) return false;
+      if(!order_.Equals(other.order_)) return false;
+      if(!operation_.Equals(other.operation_)) return false;
+      if(!args_.Equals(other.args_)) return false;
       if (!object.Equals(LimitExpr, other.LimitExpr)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (collection_ != null) hash ^= Collection.GetHashCode();
       if (HasDataModel) hash ^= DataModel.GetHashCode();
@@ -4304,8 +3797,7 @@ public override int GetHashCode()
       hash ^= operation_.GetHashCode();
       hash ^= args_.GetHashCode();
       if (limitExpr_ != null) hash ^= LimitExpr.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -4313,18 +3805,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (collection_ != null) {
         output.WriteRawTag(18);
         output.WriteMessage(Collection);
@@ -4351,79 +3841,65 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (collection_ != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (collection_ != null) {
         output.WriteRawTag(18);
         output.WriteMessage(Collection);
       }
-      if (HasDataModel)
-      {
+      if (HasDataModel) {
         output.WriteRawTag(24);
-        output.WriteEnum((int)DataModel);
+        output.WriteEnum((int) DataModel);
       }
-      if (criteria_ != null)
-      {
+      if (criteria_ != null) {
         output.WriteRawTag(34);
         output.WriteMessage(Criteria);
       }
-      if (limit_ != null)
-      {
+      if (limit_ != null) {
         output.WriteRawTag(42);
         output.WriteMessage(Limit);
       }
       order_.WriteTo(ref output, _repeated_order_codec);
       operation_.WriteTo(ref output, _repeated_operation_codec);
       args_.WriteTo(ref output, _repeated_args_codec);
-      if (limitExpr_ != null)
-      {
+      if (limitExpr_ != null) {
         output.WriteRawTag(74);
         output.WriteMessage(LimitExpr);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (collection_ != null)
-      {
+      if (collection_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Collection);
       }
-      if (HasDataModel)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)DataModel);
+      if (HasDataModel) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) DataModel);
       }
-      if (criteria_ != null)
-      {
+      if (criteria_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Criteria);
       }
-      if (limit_ != null)
-      {
+      if (limit_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Limit);
       }
       size += order_.CalculateSize(_repeated_order_codec);
       size += operation_.CalculateSize(_repeated_operation_codec);
       size += args_.CalculateSize(_repeated_args_codec);
-      if (limitExpr_ != null)
-      {
+      if (limitExpr_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(LimitExpr);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -4431,36 +3907,27 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Update other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Update other) {
+      if (other == null) {
         return;
       }
-      if (other.collection_ != null)
-      {
-        if (collection_ == null)
-        {
+      if (other.collection_ != null) {
+        if (collection_ == null) {
           Collection = new global::Mysqlx.Crud.Collection();
         }
         Collection.MergeFrom(other.Collection);
       }
-      if (other.HasDataModel)
-      {
+      if (other.HasDataModel) {
         DataModel = other.DataModel;
       }
-      if (other.criteria_ != null)
-      {
-        if (criteria_ == null)
-        {
+      if (other.criteria_ != null) {
+        if (criteria_ == null) {
           Criteria = new global::Mysqlx.Expr.Expr();
         }
         Criteria.MergeFrom(other.Criteria);
       }
-      if (other.limit_ != null)
-      {
-        if (limit_ == null)
-        {
+      if (other.limit_ != null) {
+        if (limit_ == null) {
           Limit = new global::Mysqlx.Crud.Limit();
         }
         Limit.MergeFrom(other.Limit);
@@ -4468,10 +3935,8 @@ public void MergeFrom(Update other)
       order_.Add(other.order_);
       operation_.Add(other.operation_);
       args_.Add(other.args_);
-      if (other.limitExpr_ != null)
-      {
-        if (limitExpr_ == null)
-        {
+      if (other.limitExpr_ != null) {
+        if (limitExpr_ == null) {
           LimitExpr = new global::Mysqlx.Crud.LimitExpr();
         }
         LimitExpr.MergeFrom(other.LimitExpr);
@@ -4481,11 +3946,10 @@ public void MergeFrom(Update other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -4542,87 +4006,71 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 18:
-            {
-              if (collection_ == null)
-              {
-                Collection = new global::Mysqlx.Crud.Collection();
-              }
-              input.ReadMessage(Collection);
-              break;
-            }
-          case 24:
-            {
-              DataModel = (global::Mysqlx.Crud.DataModel)input.ReadEnum();
-              break;
-            }
-          case 34:
-            {
-              if (criteria_ == null)
-              {
-                Criteria = new global::Mysqlx.Expr.Expr();
-              }
-              input.ReadMessage(Criteria);
-              break;
-            }
-          case 42:
-            {
-              if (limit_ == null)
-              {
-                Limit = new global::Mysqlx.Crud.Limit();
-              }
-              input.ReadMessage(Limit);
-              break;
-            }
-          case 50:
-            {
-              order_.AddEntriesFrom(ref input, _repeated_order_codec);
-              break;
+          case 18: {
+            if (collection_ == null) {
+              Collection = new global::Mysqlx.Crud.Collection();
             }
-          case 58:
-            {
-              operation_.AddEntriesFrom(ref input, _repeated_operation_codec);
-              break;
+            input.ReadMessage(Collection);
+            break;
+          }
+          case 24: {
+            DataModel = (global::Mysqlx.Crud.DataModel) input.ReadEnum();
+            break;
+          }
+          case 34: {
+            if (criteria_ == null) {
+              Criteria = new global::Mysqlx.Expr.Expr();
             }
-          case 66:
-            {
-              args_.AddEntriesFrom(ref input, _repeated_args_codec);
-              break;
+            input.ReadMessage(Criteria);
+            break;
+          }
+          case 42: {
+            if (limit_ == null) {
+              Limit = new global::Mysqlx.Crud.Limit();
             }
-          case 74:
-            {
-              if (limitExpr_ == null)
-              {
-                LimitExpr = new global::Mysqlx.Crud.LimitExpr();
-              }
-              input.ReadMessage(LimitExpr);
-              break;
+            input.ReadMessage(Limit);
+            break;
+          }
+          case 50: {
+            order_.AddEntriesFrom(ref input, _repeated_order_codec);
+            break;
+          }
+          case 58: {
+            operation_.AddEntriesFrom(ref input, _repeated_operation_codec);
+            break;
+          }
+          case 66: {
+            args_.AddEntriesFrom(ref input, _repeated_args_codec);
+            break;
+          }
+          case 74: {
+            if (limitExpr_ == null) {
+              LimitExpr = new global::Mysqlx.Crud.LimitExpr();
             }
+            input.ReadMessage(LimitExpr);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -4634,9 +4082,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Delete : pb::IMessage<Delete>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Delete> _parser = new pb::MessageParser<Delete>(() => new Delete());
     private pb::UnknownFieldSet _unknownFields;
@@ -4647,22 +4095,19 @@ public sealed partial class Delete : pb::IMessage<Delete>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[10]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Delete()
-    {
+    public Delete() {
       OnConstruction();
     }
 
@@ -4670,8 +4115,7 @@ public Delete()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Delete(Delete other) : this()
-    {
+    public Delete(Delete other) : this() {
       _hasBits0 = other._hasBits0;
       collection_ = other.collection_ != null ? other.collection_.Clone() : null;
       dataModel_ = other.dataModel_;
@@ -4685,8 +4129,7 @@ public Delete(Delete other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Delete Clone()
-    {
+    public Delete Clone() {
       return new Delete(this);
     }
 
@@ -4698,11 +4141,9 @@ public Delete Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Collection Collection
-    {
+    public global::Mysqlx.Crud.Collection Collection {
       get { return collection_; }
-      set
-      {
+      set {
         collection_ = value;
       }
     }
@@ -4717,11 +4158,9 @@ public Delete Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.DataModel DataModel
-    {
+    public global::Mysqlx.Crud.DataModel DataModel {
       get { if ((_hasBits0 & 1) != 0) { return dataModel_; } else { return DataModelDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         dataModel_ = value;
       }
@@ -4729,15 +4168,13 @@ public Delete Clone()
     /// <summary>Gets whether the "data_model" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDataModel
-    {
+    public bool HasDataModel {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "data_model" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDataModel()
-    {
+    public void ClearDataModel() {
       _hasBits0 &= ~1;
     }
 
@@ -4749,11 +4186,9 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Expr Criteria
-    {
+    public global::Mysqlx.Expr.Expr Criteria {
       get { return criteria_; }
-      set
-      {
+      set {
         criteria_ = value;
       }
     }
@@ -4767,11 +4202,9 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Limit Limit
-    {
+    public global::Mysqlx.Crud.Limit Limit {
       get { return limit_; }
-      set
-      {
+      set {
         limit_ = value;
       }
     }
@@ -4786,8 +4219,7 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Crud.Order> Order
-    {
+    public pbc::RepeatedField<global::Mysqlx.Crud.Order> Order {
       get { return order_; }
     }
 
@@ -4801,8 +4233,7 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Datatypes.Scalar> Args
-    {
+    public pbc::RepeatedField<global::Mysqlx.Datatypes.Scalar> Args {
       get { return args_; }
     }
 
@@ -4815,48 +4246,41 @@ public void ClearDataModel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.LimitExpr LimitExpr
-    {
+    public global::Mysqlx.Crud.LimitExpr LimitExpr {
       get { return limitExpr_; }
-      set
-      {
+      set {
         limitExpr_ = value;
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Delete);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Delete other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Delete other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (!object.Equals(Collection, other.Collection)) return false;
       if (DataModel != other.DataModel) return false;
       if (!object.Equals(Criteria, other.Criteria)) return false;
       if (!object.Equals(Limit, other.Limit)) return false;
-      if (!order_.Equals(other.order_)) return false;
-      if (!args_.Equals(other.args_)) return false;
+      if(!order_.Equals(other.order_)) return false;
+      if(!args_.Equals(other.args_)) return false;
       if (!object.Equals(LimitExpr, other.LimitExpr)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (collection_ != null) hash ^= Collection.GetHashCode();
       if (HasDataModel) hash ^= DataModel.GetHashCode();
@@ -4865,8 +4289,7 @@ public override int GetHashCode()
       hash ^= order_.GetHashCode();
       hash ^= args_.GetHashCode();
       if (limitExpr_ != null) hash ^= LimitExpr.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -4874,18 +4297,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (collection_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Collection);
@@ -4911,77 +4332,63 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (collection_ != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (collection_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Collection);
       }
-      if (HasDataModel)
-      {
+      if (HasDataModel) {
         output.WriteRawTag(16);
-        output.WriteEnum((int)DataModel);
+        output.WriteEnum((int) DataModel);
       }
-      if (criteria_ != null)
-      {
+      if (criteria_ != null) {
         output.WriteRawTag(26);
         output.WriteMessage(Criteria);
       }
-      if (limit_ != null)
-      {
+      if (limit_ != null) {
         output.WriteRawTag(34);
         output.WriteMessage(Limit);
       }
       order_.WriteTo(ref output, _repeated_order_codec);
       args_.WriteTo(ref output, _repeated_args_codec);
-      if (limitExpr_ != null)
-      {
+      if (limitExpr_ != null) {
         output.WriteRawTag(58);
         output.WriteMessage(LimitExpr);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (collection_ != null)
-      {
+      if (collection_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Collection);
       }
-      if (HasDataModel)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)DataModel);
+      if (HasDataModel) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) DataModel);
       }
-      if (criteria_ != null)
-      {
+      if (criteria_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Criteria);
       }
-      if (limit_ != null)
-      {
+      if (limit_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Limit);
       }
       size += order_.CalculateSize(_repeated_order_codec);
       size += args_.CalculateSize(_repeated_args_codec);
-      if (limitExpr_ != null)
-      {
+      if (limitExpr_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(LimitExpr);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -4989,46 +4396,35 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Delete other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Delete other) {
+      if (other == null) {
         return;
       }
-      if (other.collection_ != null)
-      {
-        if (collection_ == null)
-        {
+      if (other.collection_ != null) {
+        if (collection_ == null) {
           Collection = new global::Mysqlx.Crud.Collection();
         }
         Collection.MergeFrom(other.Collection);
       }
-      if (other.HasDataModel)
-      {
+      if (other.HasDataModel) {
         DataModel = other.DataModel;
       }
-      if (other.criteria_ != null)
-      {
-        if (criteria_ == null)
-        {
+      if (other.criteria_ != null) {
+        if (criteria_ == null) {
           Criteria = new global::Mysqlx.Expr.Expr();
         }
         Criteria.MergeFrom(other.Criteria);
       }
-      if (other.limit_ != null)
-      {
-        if (limit_ == null)
-        {
+      if (other.limit_ != null) {
+        if (limit_ == null) {
           Limit = new global::Mysqlx.Crud.Limit();
         }
         Limit.MergeFrom(other.Limit);
       }
       order_.Add(other.order_);
       args_.Add(other.args_);
-      if (other.limitExpr_ != null)
-      {
-        if (limitExpr_ == null)
-        {
+      if (other.limitExpr_ != null) {
+        if (limitExpr_ == null) {
           LimitExpr = new global::Mysqlx.Crud.LimitExpr();
         }
         LimitExpr.MergeFrom(other.LimitExpr);
@@ -5038,11 +4434,10 @@ public void MergeFrom(Delete other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -5095,82 +4490,67 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              if (collection_ == null)
-              {
-                Collection = new global::Mysqlx.Crud.Collection();
-              }
-              input.ReadMessage(Collection);
-              break;
-            }
-          case 16:
-            {
-              DataModel = (global::Mysqlx.Crud.DataModel)input.ReadEnum();
-              break;
-            }
-          case 26:
-            {
-              if (criteria_ == null)
-              {
-                Criteria = new global::Mysqlx.Expr.Expr();
-              }
-              input.ReadMessage(Criteria);
-              break;
-            }
-          case 34:
-            {
-              if (limit_ == null)
-              {
-                Limit = new global::Mysqlx.Crud.Limit();
-              }
-              input.ReadMessage(Limit);
-              break;
+          case 10: {
+            if (collection_ == null) {
+              Collection = new global::Mysqlx.Crud.Collection();
             }
-          case 42:
-            {
-              order_.AddEntriesFrom(ref input, _repeated_order_codec);
-              break;
+            input.ReadMessage(Collection);
+            break;
+          }
+          case 16: {
+            DataModel = (global::Mysqlx.Crud.DataModel) input.ReadEnum();
+            break;
+          }
+          case 26: {
+            if (criteria_ == null) {
+              Criteria = new global::Mysqlx.Expr.Expr();
             }
-          case 50:
-            {
-              args_.AddEntriesFrom(ref input, _repeated_args_codec);
-              break;
+            input.ReadMessage(Criteria);
+            break;
+          }
+          case 34: {
+            if (limit_ == null) {
+              Limit = new global::Mysqlx.Crud.Limit();
             }
-          case 58:
-            {
-              if (limitExpr_ == null)
-              {
-                LimitExpr = new global::Mysqlx.Crud.LimitExpr();
-              }
-              input.ReadMessage(LimitExpr);
-              break;
+            input.ReadMessage(Limit);
+            break;
+          }
+          case 42: {
+            order_.AddEntriesFrom(ref input, _repeated_order_codec);
+            break;
+          }
+          case 50: {
+            args_.AddEntriesFrom(ref input, _repeated_args_codec);
+            break;
+          }
+          case 58: {
+            if (limitExpr_ == null) {
+              LimitExpr = new global::Mysqlx.Crud.LimitExpr();
             }
+            input.ReadMessage(LimitExpr);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -5180,9 +4560,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class CreateView : pb::IMessage<CreateView>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<CreateView> _parser = new pb::MessageParser<CreateView>(() => new CreateView());
     private pb::UnknownFieldSet _unknownFields;
@@ -5193,22 +4573,19 @@ public sealed partial class CreateView : pb::IMessage<CreateView>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[11]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CreateView()
-    {
+    public CreateView() {
       OnConstruction();
     }
 
@@ -5216,8 +4593,7 @@ public CreateView()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CreateView(CreateView other) : this()
-    {
+    public CreateView(CreateView other) : this() {
       _hasBits0 = other._hasBits0;
       collection_ = other.collection_ != null ? other.collection_.Clone() : null;
       definer_ = other.definer_;
@@ -5232,8 +4608,7 @@ public CreateView(CreateView other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CreateView Clone()
-    {
+    public CreateView Clone() {
       return new CreateView(this);
     }
 
@@ -5245,11 +4620,9 @@ public CreateView Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Collection Collection
-    {
+    public global::Mysqlx.Crud.Collection Collection {
       get { return collection_; }
-      set
-      {
+      set {
         collection_ = value;
       }
     }
@@ -5265,26 +4638,22 @@ public CreateView Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Definer
-    {
+    public string Definer {
       get { return definer_ ?? DefinerDefaultValue; }
-      set
-      {
+      set {
         definer_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "definer" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefiner
-    {
+    public bool HasDefiner {
       get { return definer_ != null; }
     }
     /// <summary>Clears the value of the "definer" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefiner()
-    {
+    public void ClearDefiner() {
       definer_ = null;
     }
 
@@ -5298,11 +4667,9 @@ public void ClearDefiner()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.ViewAlgorithm Algorithm
-    {
+    public global::Mysqlx.Crud.ViewAlgorithm Algorithm {
       get { if ((_hasBits0 & 1) != 0) { return algorithm_; } else { return AlgorithmDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         algorithm_ = value;
       }
@@ -5310,15 +4677,13 @@ public void ClearDefiner()
     /// <summary>Gets whether the "algorithm" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasAlgorithm
-    {
+    public bool HasAlgorithm {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "algorithm" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearAlgorithm()
-    {
+    public void ClearAlgorithm() {
       _hasBits0 &= ~1;
     }
 
@@ -5332,11 +4697,9 @@ public void ClearAlgorithm()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.ViewSqlSecurity Security
-    {
+    public global::Mysqlx.Crud.ViewSqlSecurity Security {
       get { if ((_hasBits0 & 2) != 0) { return security_; } else { return SecurityDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         security_ = value;
       }
@@ -5344,15 +4707,13 @@ public void ClearAlgorithm()
     /// <summary>Gets whether the "security" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSecurity
-    {
+    public bool HasSecurity {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "security" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSecurity()
-    {
+    public void ClearSecurity() {
       _hasBits0 &= ~2;
     }
 
@@ -5366,11 +4727,9 @@ public void ClearSecurity()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.ViewCheckOption Check
-    {
+    public global::Mysqlx.Crud.ViewCheckOption Check {
       get { if ((_hasBits0 & 4) != 0) { return check_; } else { return CheckDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 4;
         check_ = value;
       }
@@ -5378,15 +4737,13 @@ public void ClearSecurity()
     /// <summary>Gets whether the "check" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCheck
-    {
+    public bool HasCheck {
       get { return (_hasBits0 & 4) != 0; }
     }
     /// <summary>Clears the value of the "check" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCheck()
-    {
+    public void ClearCheck() {
       _hasBits0 &= ~4;
     }
 
@@ -5400,8 +4757,7 @@ public void ClearCheck()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> Column
-    {
+    public pbc::RepeatedField<string> Column {
       get { return column_; }
     }
 
@@ -5414,11 +4770,9 @@ public void ClearCheck()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Find Stmt
-    {
+    public global::Mysqlx.Crud.Find Stmt {
       get { return stmt_; }
-      set
-      {
+      set {
         stmt_ = value;
       }
     }
@@ -5434,11 +4788,9 @@ public void ClearCheck()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool ReplaceExisting
-    {
+    public bool ReplaceExisting {
       get { if ((_hasBits0 & 8) != 0) { return replaceExisting_; } else { return ReplaceExistingDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 8;
         replaceExisting_ = value;
       }
@@ -5446,35 +4798,29 @@ public bool ReplaceExisting
     /// <summary>Gets whether the "replace_existing" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasReplaceExisting
-    {
+    public bool HasReplaceExisting {
       get { return (_hasBits0 & 8) != 0; }
     }
     /// <summary>Clears the value of the "replace_existing" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearReplaceExisting()
-    {
+    public void ClearReplaceExisting() {
       _hasBits0 &= ~8;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as CreateView);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(CreateView other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(CreateView other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (!object.Equals(Collection, other.Collection)) return false;
@@ -5482,7 +4828,7 @@ public bool Equals(CreateView other)
       if (Algorithm != other.Algorithm) return false;
       if (Security != other.Security) return false;
       if (Check != other.Check) return false;
-      if (!column_.Equals(other.column_)) return false;
+      if(!column_.Equals(other.column_)) return false;
       if (!object.Equals(Stmt, other.Stmt)) return false;
       if (ReplaceExisting != other.ReplaceExisting) return false;
       return Equals(_unknownFields, other._unknownFields);
@@ -5490,8 +4836,7 @@ public bool Equals(CreateView other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (collection_ != null) hash ^= Collection.GetHashCode();
       if (HasDefiner) hash ^= Definer.GetHashCode();
@@ -5501,8 +4846,7 @@ public override int GetHashCode()
       hash ^= column_.GetHashCode();
       if (stmt_ != null) hash ^= Stmt.GetHashCode();
       if (HasReplaceExisting) hash ^= ReplaceExisting.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -5510,18 +4854,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (collection_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Collection);
@@ -5554,93 +4896,75 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (collection_ != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (collection_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Collection);
       }
-      if (HasDefiner)
-      {
+      if (HasDefiner) {
         output.WriteRawTag(18);
         output.WriteString(Definer);
       }
-      if (HasAlgorithm)
-      {
+      if (HasAlgorithm) {
         output.WriteRawTag(24);
-        output.WriteEnum((int)Algorithm);
+        output.WriteEnum((int) Algorithm);
       }
-      if (HasSecurity)
-      {
+      if (HasSecurity) {
         output.WriteRawTag(32);
-        output.WriteEnum((int)Security);
+        output.WriteEnum((int) Security);
       }
-      if (HasCheck)
-      {
+      if (HasCheck) {
         output.WriteRawTag(40);
-        output.WriteEnum((int)Check);
+        output.WriteEnum((int) Check);
       }
       column_.WriteTo(ref output, _repeated_column_codec);
-      if (stmt_ != null)
-      {
+      if (stmt_ != null) {
         output.WriteRawTag(58);
         output.WriteMessage(Stmt);
       }
-      if (HasReplaceExisting)
-      {
+      if (HasReplaceExisting) {
         output.WriteRawTag(64);
         output.WriteBool(ReplaceExisting);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (collection_ != null)
-      {
+      if (collection_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Collection);
       }
-      if (HasDefiner)
-      {
+      if (HasDefiner) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Definer);
       }
-      if (HasAlgorithm)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Algorithm);
+      if (HasAlgorithm) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Algorithm);
       }
-      if (HasSecurity)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Security);
+      if (HasSecurity) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Security);
       }
-      if (HasCheck)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Check);
+      if (HasCheck) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Check);
       }
       size += column_.CalculateSize(_repeated_column_codec);
-      if (stmt_ != null)
-      {
+      if (stmt_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Stmt);
       }
-      if (HasReplaceExisting)
-      {
+      if (HasReplaceExisting) {
         size += 1 + 1;
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -5648,47 +4972,36 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(CreateView other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(CreateView other) {
+      if (other == null) {
         return;
       }
-      if (other.collection_ != null)
-      {
-        if (collection_ == null)
-        {
+      if (other.collection_ != null) {
+        if (collection_ == null) {
           Collection = new global::Mysqlx.Crud.Collection();
         }
         Collection.MergeFrom(other.Collection);
       }
-      if (other.HasDefiner)
-      {
+      if (other.HasDefiner) {
         Definer = other.Definer;
       }
-      if (other.HasAlgorithm)
-      {
+      if (other.HasAlgorithm) {
         Algorithm = other.Algorithm;
       }
-      if (other.HasSecurity)
-      {
+      if (other.HasSecurity) {
         Security = other.Security;
       }
-      if (other.HasCheck)
-      {
+      if (other.HasCheck) {
         Check = other.Check;
       }
       column_.Add(other.column_);
-      if (other.stmt_ != null)
-      {
-        if (stmt_ == null)
-        {
+      if (other.stmt_ != null) {
+        if (stmt_ == null) {
           Stmt = new global::Mysqlx.Crud.Find();
         }
         Stmt.MergeFrom(other.Stmt);
       }
-      if (other.HasReplaceExisting)
-      {
+      if (other.HasReplaceExisting) {
         ReplaceExisting = other.ReplaceExisting;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -5696,11 +5009,10 @@ public void MergeFrom(CreateView other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -5751,79 +5063,65 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              if (collection_ == null)
-              {
-                Collection = new global::Mysqlx.Crud.Collection();
-              }
-              input.ReadMessage(Collection);
-              break;
-            }
-          case 18:
-            {
-              Definer = input.ReadString();
-              break;
-            }
-          case 24:
-            {
-              Algorithm = (global::Mysqlx.Crud.ViewAlgorithm)input.ReadEnum();
-              break;
-            }
-          case 32:
-            {
-              Security = (global::Mysqlx.Crud.ViewSqlSecurity)input.ReadEnum();
-              break;
-            }
-          case 40:
-            {
-              Check = (global::Mysqlx.Crud.ViewCheckOption)input.ReadEnum();
-              break;
-            }
-          case 50:
-            {
-              column_.AddEntriesFrom(ref input, _repeated_column_codec);
-              break;
-            }
-          case 58:
-            {
-              if (stmt_ == null)
-              {
-                Stmt = new global::Mysqlx.Crud.Find();
-              }
-              input.ReadMessage(Stmt);
-              break;
+          case 10: {
+            if (collection_ == null) {
+              Collection = new global::Mysqlx.Crud.Collection();
             }
-          case 64:
-            {
-              ReplaceExisting = input.ReadBool();
-              break;
+            input.ReadMessage(Collection);
+            break;
+          }
+          case 18: {
+            Definer = input.ReadString();
+            break;
+          }
+          case 24: {
+            Algorithm = (global::Mysqlx.Crud.ViewAlgorithm) input.ReadEnum();
+            break;
+          }
+          case 32: {
+            Security = (global::Mysqlx.Crud.ViewSqlSecurity) input.ReadEnum();
+            break;
+          }
+          case 40: {
+            Check = (global::Mysqlx.Crud.ViewCheckOption) input.ReadEnum();
+            break;
+          }
+          case 50: {
+            column_.AddEntriesFrom(ref input, _repeated_column_codec);
+            break;
+          }
+          case 58: {
+            if (stmt_ == null) {
+              Stmt = new global::Mysqlx.Crud.Find();
             }
+            input.ReadMessage(Stmt);
+            break;
+          }
+          case 64: {
+            ReplaceExisting = input.ReadBool();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -5834,9 +5132,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ModifyView : pb::IMessage<ModifyView>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<ModifyView> _parser = new pb::MessageParser<ModifyView>(() => new ModifyView());
     private pb::UnknownFieldSet _unknownFields;
@@ -5847,22 +5145,19 @@ public sealed partial class ModifyView : pb::IMessage<ModifyView>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[12]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ModifyView()
-    {
+    public ModifyView() {
       OnConstruction();
     }
 
@@ -5870,8 +5165,7 @@ public ModifyView()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ModifyView(ModifyView other) : this()
-    {
+    public ModifyView(ModifyView other) : this() {
       _hasBits0 = other._hasBits0;
       collection_ = other.collection_ != null ? other.collection_.Clone() : null;
       definer_ = other.definer_;
@@ -5885,8 +5179,7 @@ public ModifyView(ModifyView other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ModifyView Clone()
-    {
+    public ModifyView Clone() {
       return new ModifyView(this);
     }
 
@@ -5898,11 +5191,9 @@ public ModifyView Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Collection Collection
-    {
+    public global::Mysqlx.Crud.Collection Collection {
       get { return collection_; }
-      set
-      {
+      set {
         collection_ = value;
       }
     }
@@ -5918,26 +5209,22 @@ public ModifyView Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Definer
-    {
+    public string Definer {
       get { return definer_ ?? DefinerDefaultValue; }
-      set
-      {
+      set {
         definer_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "definer" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefiner
-    {
+    public bool HasDefiner {
       get { return definer_ != null; }
     }
     /// <summary>Clears the value of the "definer" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefiner()
-    {
+    public void ClearDefiner() {
       definer_ = null;
     }
 
@@ -5951,11 +5238,9 @@ public void ClearDefiner()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.ViewAlgorithm Algorithm
-    {
+    public global::Mysqlx.Crud.ViewAlgorithm Algorithm {
       get { if ((_hasBits0 & 1) != 0) { return algorithm_; } else { return AlgorithmDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         algorithm_ = value;
       }
@@ -5963,15 +5248,13 @@ public void ClearDefiner()
     /// <summary>Gets whether the "algorithm" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasAlgorithm
-    {
+    public bool HasAlgorithm {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "algorithm" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearAlgorithm()
-    {
+    public void ClearAlgorithm() {
       _hasBits0 &= ~1;
     }
 
@@ -5985,11 +5268,9 @@ public void ClearAlgorithm()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.ViewSqlSecurity Security
-    {
+    public global::Mysqlx.Crud.ViewSqlSecurity Security {
       get { if ((_hasBits0 & 2) != 0) { return security_; } else { return SecurityDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         security_ = value;
       }
@@ -5997,15 +5278,13 @@ public void ClearAlgorithm()
     /// <summary>Gets whether the "security" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSecurity
-    {
+    public bool HasSecurity {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "security" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSecurity()
-    {
+    public void ClearSecurity() {
       _hasBits0 &= ~2;
     }
 
@@ -6019,11 +5298,9 @@ public void ClearSecurity()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.ViewCheckOption Check
-    {
+    public global::Mysqlx.Crud.ViewCheckOption Check {
       get { if ((_hasBits0 & 4) != 0) { return check_; } else { return CheckDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 4;
         check_ = value;
       }
@@ -6031,15 +5308,13 @@ public void ClearSecurity()
     /// <summary>Gets whether the "check" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCheck
-    {
+    public bool HasCheck {
       get { return (_hasBits0 & 4) != 0; }
     }
     /// <summary>Clears the value of the "check" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCheck()
-    {
+    public void ClearCheck() {
       _hasBits0 &= ~4;
     }
 
@@ -6053,8 +5328,7 @@ public void ClearCheck()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> Column
-    {
+    public pbc::RepeatedField<string> Column {
       get { return column_; }
     }
 
@@ -6067,32 +5341,26 @@ public void ClearCheck()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Find Stmt
-    {
+    public global::Mysqlx.Crud.Find Stmt {
       get { return stmt_; }
-      set
-      {
+      set {
         stmt_ = value;
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as ModifyView);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ModifyView other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(ModifyView other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (!object.Equals(Collection, other.Collection)) return false;
@@ -6100,15 +5368,14 @@ public bool Equals(ModifyView other)
       if (Algorithm != other.Algorithm) return false;
       if (Security != other.Security) return false;
       if (Check != other.Check) return false;
-      if (!column_.Equals(other.column_)) return false;
+      if(!column_.Equals(other.column_)) return false;
       if (!object.Equals(Stmt, other.Stmt)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (collection_ != null) hash ^= Collection.GetHashCode();
       if (HasDefiner) hash ^= Definer.GetHashCode();
@@ -6117,8 +5384,7 @@ public override int GetHashCode()
       if (HasCheck) hash ^= Check.GetHashCode();
       hash ^= column_.GetHashCode();
       if (stmt_ != null) hash ^= Stmt.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -6126,18 +5392,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (collection_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Collection);
@@ -6166,84 +5430,68 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (collection_ != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (collection_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Collection);
       }
-      if (HasDefiner)
-      {
+      if (HasDefiner) {
         output.WriteRawTag(18);
         output.WriteString(Definer);
       }
-      if (HasAlgorithm)
-      {
+      if (HasAlgorithm) {
         output.WriteRawTag(24);
-        output.WriteEnum((int)Algorithm);
+        output.WriteEnum((int) Algorithm);
       }
-      if (HasSecurity)
-      {
+      if (HasSecurity) {
         output.WriteRawTag(32);
-        output.WriteEnum((int)Security);
+        output.WriteEnum((int) Security);
       }
-      if (HasCheck)
-      {
+      if (HasCheck) {
         output.WriteRawTag(40);
-        output.WriteEnum((int)Check);
+        output.WriteEnum((int) Check);
       }
       column_.WriteTo(ref output, _repeated_column_codec);
-      if (stmt_ != null)
-      {
+      if (stmt_ != null) {
         output.WriteRawTag(58);
         output.WriteMessage(Stmt);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (collection_ != null)
-      {
+      if (collection_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Collection);
       }
-      if (HasDefiner)
-      {
+      if (HasDefiner) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Definer);
       }
-      if (HasAlgorithm)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Algorithm);
+      if (HasAlgorithm) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Algorithm);
       }
-      if (HasSecurity)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Security);
+      if (HasSecurity) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Security);
       }
-      if (HasCheck)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Check);
+      if (HasCheck) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Check);
       }
       size += column_.CalculateSize(_repeated_column_codec);
-      if (stmt_ != null)
-      {
+      if (stmt_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Stmt);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -6251,41 +5499,31 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ModifyView other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(ModifyView other) {
+      if (other == null) {
         return;
       }
-      if (other.collection_ != null)
-      {
-        if (collection_ == null)
-        {
+      if (other.collection_ != null) {
+        if (collection_ == null) {
           Collection = new global::Mysqlx.Crud.Collection();
         }
         Collection.MergeFrom(other.Collection);
       }
-      if (other.HasDefiner)
-      {
+      if (other.HasDefiner) {
         Definer = other.Definer;
       }
-      if (other.HasAlgorithm)
-      {
+      if (other.HasAlgorithm) {
         Algorithm = other.Algorithm;
       }
-      if (other.HasSecurity)
-      {
+      if (other.HasSecurity) {
         Security = other.Security;
       }
-      if (other.HasCheck)
-      {
+      if (other.HasCheck) {
         Check = other.Check;
       }
       column_.Add(other.column_);
-      if (other.stmt_ != null)
-      {
-        if (stmt_ == null)
-        {
+      if (other.stmt_ != null) {
+        if (stmt_ == null) {
           Stmt = new global::Mysqlx.Crud.Find();
         }
         Stmt.MergeFrom(other.Stmt);
@@ -6295,11 +5533,10 @@ public void MergeFrom(ModifyView other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -6346,74 +5583,61 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              if (collection_ == null)
-              {
-                Collection = new global::Mysqlx.Crud.Collection();
-              }
-              input.ReadMessage(Collection);
-              break;
-            }
-          case 18:
-            {
-              Definer = input.ReadString();
-              break;
-            }
-          case 24:
-            {
-              Algorithm = (global::Mysqlx.Crud.ViewAlgorithm)input.ReadEnum();
-              break;
-            }
-          case 32:
-            {
-              Security = (global::Mysqlx.Crud.ViewSqlSecurity)input.ReadEnum();
-              break;
-            }
-          case 40:
-            {
-              Check = (global::Mysqlx.Crud.ViewCheckOption)input.ReadEnum();
-              break;
-            }
-          case 50:
-            {
-              column_.AddEntriesFrom(ref input, _repeated_column_codec);
-              break;
+          case 10: {
+            if (collection_ == null) {
+              Collection = new global::Mysqlx.Crud.Collection();
             }
-          case 58:
-            {
-              if (stmt_ == null)
-              {
-                Stmt = new global::Mysqlx.Crud.Find();
-              }
-              input.ReadMessage(Stmt);
-              break;
+            input.ReadMessage(Collection);
+            break;
+          }
+          case 18: {
+            Definer = input.ReadString();
+            break;
+          }
+          case 24: {
+            Algorithm = (global::Mysqlx.Crud.ViewAlgorithm) input.ReadEnum();
+            break;
+          }
+          case 32: {
+            Security = (global::Mysqlx.Crud.ViewSqlSecurity) input.ReadEnum();
+            break;
+          }
+          case 40: {
+            Check = (global::Mysqlx.Crud.ViewCheckOption) input.ReadEnum();
+            break;
+          }
+          case 50: {
+            column_.AddEntriesFrom(ref input, _repeated_column_codec);
+            break;
+          }
+          case 58: {
+            if (stmt_ == null) {
+              Stmt = new global::Mysqlx.Crud.Find();
             }
+            input.ReadMessage(Stmt);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -6423,9 +5647,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class DropView : pb::IMessage<DropView>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<DropView> _parser = new pb::MessageParser<DropView>(() => new DropView());
     private pb::UnknownFieldSet _unknownFields;
@@ -6436,22 +5660,19 @@ public sealed partial class DropView : pb::IMessage<DropView>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Crud.MysqlxCrudReflection.Descriptor.MessageTypes[13]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DropView()
-    {
+    public DropView() {
       OnConstruction();
     }
 
@@ -6459,8 +5680,7 @@ public DropView()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DropView(DropView other) : this()
-    {
+    public DropView(DropView other) : this() {
       _hasBits0 = other._hasBits0;
       collection_ = other.collection_ != null ? other.collection_.Clone() : null;
       ifExists_ = other.ifExists_;
@@ -6469,8 +5689,7 @@ public DropView(DropView other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DropView Clone()
-    {
+    public DropView Clone() {
       return new DropView(this);
     }
 
@@ -6482,11 +5701,9 @@ public DropView Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Crud.Collection Collection
-    {
+    public global::Mysqlx.Crud.Collection Collection {
       get { return collection_; }
-      set
-      {
+      set {
         collection_ = value;
       }
     }
@@ -6501,11 +5718,9 @@ public DropView Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool IfExists
-    {
+    public bool IfExists {
       get { if ((_hasBits0 & 1) != 0) { return ifExists_; } else { return IfExistsDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         ifExists_ = value;
       }
@@ -6513,35 +5728,29 @@ public bool IfExists
     /// <summary>Gets whether the "if_exists" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasIfExists
-    {
+    public bool HasIfExists {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "if_exists" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearIfExists()
-    {
+    public void ClearIfExists() {
       _hasBits0 &= ~1;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as DropView);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(DropView other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(DropView other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (!object.Equals(Collection, other.Collection)) return false;
@@ -6551,13 +5760,11 @@ public bool Equals(DropView other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (collection_ != null) hash ^= Collection.GetHashCode();
       if (HasIfExists) hash ^= IfExists.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -6565,18 +5772,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (collection_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Collection);
@@ -6588,46 +5793,38 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (collection_ != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (collection_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Collection);
       }
-      if (HasIfExists)
-      {
+      if (HasIfExists) {
         output.WriteRawTag(16);
         output.WriteBool(IfExists);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (collection_ != null)
-      {
+      if (collection_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Collection);
       }
-      if (HasIfExists)
-      {
+      if (HasIfExists) {
         size += 1 + 1;
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -6635,22 +5832,17 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(DropView other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(DropView other) {
+      if (other == null) {
         return;
       }
-      if (other.collection_ != null)
-      {
-        if (collection_ == null)
-        {
+      if (other.collection_ != null) {
+        if (collection_ == null) {
           Collection = new global::Mysqlx.Crud.Collection();
         }
         Collection.MergeFrom(other.Collection);
       }
-      if (other.HasIfExists)
-      {
+      if (other.HasIfExists) {
         IfExists = other.IfExists;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -6658,11 +5850,10 @@ public void MergeFrom(DropView other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -6686,45 +5877,38 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              if (collection_ == null)
-              {
-                Collection = new global::Mysqlx.Crud.Collection();
-              }
-              input.ReadMessage(Collection);
-              break;
-            }
-          case 16:
-            {
-              IfExists = input.ReadBool();
-              break;
+          case 10: {
+            if (collection_ == null) {
+              Collection = new global::Mysqlx.Crud.Collection();
             }
+            input.ReadMessage(Collection);
+            break;
+          }
+          case 16: {
+            IfExists = input.ReadBool();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -6733,4 +5917,3 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
-
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCursor.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCursor.cs
index 235ec14bb..618cc195a 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCursor.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxCursor.cs
@@ -37,23 +37,19 @@
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Mysqlx.Cursor
-{
+namespace Mysqlx.Cursor {
 
   /// <summary>Holder for reflection information generated from mysqlx_cursor.proto</summary>
-  public static partial class MysqlxCursorReflection
-  {
+  public static partial class MysqlxCursorReflection {
 
     #region Descriptor
     /// <summary>File descriptor for mysqlx_cursor.proto</summary>
-    public static pbr::FileDescriptor Descriptor
-    {
+    public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static MysqlxCursorReflection()
-    {
+    static MysqlxCursorReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChNteXNxbHhfY3Vyc29yLnByb3RvEg1NeXNxbHguQ3Vyc29yGgxteXNxbHgu",
@@ -96,9 +92,9 @@ static MysqlxCursorReflection()
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Open : pb::IMessage<Open>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Open> _parser = new pb::MessageParser<Open>(() => new Open());
     private pb::UnknownFieldSet _unknownFields;
@@ -109,22 +105,19 @@ public sealed partial class Open : pb::IMessage<Open>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Cursor.MysqlxCursorReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Open()
-    {
+    public Open() {
       OnConstruction();
     }
 
@@ -132,8 +125,7 @@ public Open()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Open(Open other) : this()
-    {
+    public Open(Open other) : this() {
       _hasBits0 = other._hasBits0;
       cursorId_ = other.cursorId_;
       stmt_ = other.stmt_ != null ? other.stmt_.Clone() : null;
@@ -143,8 +135,7 @@ public Open(Open other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Open Clone()
-    {
+    public Open Clone() {
       return new Open(this);
     }
 
@@ -159,11 +150,9 @@ public Open Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint CursorId
-    {
+    public uint CursorId {
       get { if ((_hasBits0 & 1) != 0) { return cursorId_; } else { return CursorIdDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         cursorId_ = value;
       }
@@ -171,15 +160,13 @@ public uint CursorId
     /// <summary>Gets whether the "cursor_id" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCursorId
-    {
+    public bool HasCursorId {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "cursor_id" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCursorId()
-    {
+    public void ClearCursorId() {
       _hasBits0 &= ~1;
     }
 
@@ -191,11 +178,9 @@ public void ClearCursorId()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Cursor.Open.Types.OneOfMessage Stmt
-    {
+    public global::Mysqlx.Cursor.Open.Types.OneOfMessage Stmt {
       get { return stmt_; }
-      set
-      {
+      set {
         stmt_ = value;
       }
     }
@@ -210,11 +195,9 @@ public void ClearCursorId()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong FetchRows
-    {
+    public ulong FetchRows {
       get { if ((_hasBits0 & 2) != 0) { return fetchRows_; } else { return FetchRowsDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         fetchRows_ = value;
       }
@@ -222,35 +205,29 @@ public ulong FetchRows
     /// <summary>Gets whether the "fetch_rows" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFetchRows
-    {
+    public bool HasFetchRows {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "fetch_rows" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFetchRows()
-    {
+    public void ClearFetchRows() {
       _hasBits0 &= ~2;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Open);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Open other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Open other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (CursorId != other.CursorId) return false;
@@ -261,14 +238,12 @@ public bool Equals(Open other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasCursorId) hash ^= CursorId.GetHashCode();
       if (stmt_ != null) hash ^= Stmt.GetHashCode();
       if (HasFetchRows) hash ^= FetchRows.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -276,18 +251,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasCursorId) {
         output.WriteRawTag(8);
         output.WriteUInt32(CursorId);
@@ -303,55 +276,45 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasCursorId)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasCursorId) {
         output.WriteRawTag(8);
         output.WriteUInt32(CursorId);
       }
-      if (stmt_ != null)
-      {
+      if (stmt_ != null) {
         output.WriteRawTag(34);
         output.WriteMessage(Stmt);
       }
-      if (HasFetchRows)
-      {
+      if (HasFetchRows) {
         output.WriteRawTag(40);
         output.WriteUInt64(FetchRows);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasCursorId)
-      {
+      if (HasCursorId) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CursorId);
       }
-      if (stmt_ != null)
-      {
+      if (stmt_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Stmt);
       }
-      if (HasFetchRows)
-      {
+      if (HasFetchRows) {
         size += 1 + pb::CodedOutputStream.ComputeUInt64Size(FetchRows);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -359,26 +322,20 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Open other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Open other) {
+      if (other == null) {
         return;
       }
-      if (other.HasCursorId)
-      {
+      if (other.HasCursorId) {
         CursorId = other.CursorId;
       }
-      if (other.stmt_ != null)
-      {
-        if (stmt_ == null)
-        {
+      if (other.stmt_ != null) {
+        if (stmt_ == null) {
           Stmt = new global::Mysqlx.Cursor.Open.Types.OneOfMessage();
         }
         Stmt.MergeFrom(other.Stmt);
       }
-      if (other.HasFetchRows)
-      {
+      if (other.HasFetchRows) {
         FetchRows = other.FetchRows;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -386,11 +343,10 @@ public void MergeFrom(Open other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -418,62 +374,53 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              CursorId = input.ReadUInt32();
-              break;
-            }
-          case 34:
-            {
-              if (stmt_ == null)
-              {
-                Stmt = new global::Mysqlx.Cursor.Open.Types.OneOfMessage();
-              }
-              input.ReadMessage(Stmt);
-              break;
-            }
-          case 40:
-            {
-              FetchRows = input.ReadUInt64();
-              break;
+          case 8: {
+            CursorId = input.ReadUInt32();
+            break;
+          }
+          case 34: {
+            if (stmt_ == null) {
+              Stmt = new global::Mysqlx.Cursor.Open.Types.OneOfMessage();
             }
+            input.ReadMessage(Stmt);
+            break;
+          }
+          case 40: {
+            FetchRows = input.ReadUInt64();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Open message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
+    public static partial class Types {
       [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class OneOfMessage : pb::IMessage<OneOfMessage>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
-#endif
+      #endif
       {
         private static readonly pb::MessageParser<OneOfMessage> _parser = new pb::MessageParser<OneOfMessage>(() => new OneOfMessage());
         private pb::UnknownFieldSet _unknownFields;
@@ -484,22 +431,19 @@ public sealed partial class OneOfMessage : pb::IMessage<OneOfMessage>
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor
-        {
+        public static pbr::MessageDescriptor Descriptor {
           get { return global::Mysqlx.Cursor.Open.Descriptor.NestedTypes[0]; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor
-        {
+        pbr::MessageDescriptor pb::IMessage.Descriptor {
           get { return Descriptor; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OneOfMessage()
-        {
+        public OneOfMessage() {
           OnConstruction();
         }
 
@@ -507,8 +451,7 @@ public OneOfMessage()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OneOfMessage(OneOfMessage other) : this()
-        {
+        public OneOfMessage(OneOfMessage other) : this() {
           _hasBits0 = other._hasBits0;
           type_ = other.type_;
           prepareExecute_ = other.prepareExecute_ != null ? other.prepareExecute_.Clone() : null;
@@ -517,8 +460,7 @@ public OneOfMessage(OneOfMessage other) : this()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OneOfMessage Clone()
-        {
+        public OneOfMessage Clone() {
           return new OneOfMessage(this);
         }
 
@@ -529,11 +471,9 @@ public OneOfMessage Clone()
         private global::Mysqlx.Cursor.Open.Types.OneOfMessage.Types.Type type_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Mysqlx.Cursor.Open.Types.OneOfMessage.Types.Type Type
-        {
+        public global::Mysqlx.Cursor.Open.Types.OneOfMessage.Types.Type Type {
           get { if ((_hasBits0 & 1) != 0) { return type_; } else { return TypeDefaultValue; } }
-          set
-          {
+          set {
             _hasBits0 |= 1;
             type_ = value;
           }
@@ -541,15 +481,13 @@ public OneOfMessage Clone()
         /// <summary>Gets whether the "type" field is set</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasType
-        {
+        public bool HasType {
           get { return (_hasBits0 & 1) != 0; }
         }
         /// <summary>Clears the value of the "type" field</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearType()
-        {
+        public void ClearType() {
           _hasBits0 &= ~1;
         }
 
@@ -558,32 +496,26 @@ public void ClearType()
         private global::Mysqlx.Prepare.Execute prepareExecute_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Mysqlx.Prepare.Execute PrepareExecute
-        {
+        public global::Mysqlx.Prepare.Execute PrepareExecute {
           get { return prepareExecute_; }
-          set
-          {
+          set {
             prepareExecute_ = value;
           }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other)
-        {
+        public override bool Equals(object other) {
           return Equals(other as OneOfMessage);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(OneOfMessage other)
-        {
-          if (ReferenceEquals(other, null))
-          {
+        public bool Equals(OneOfMessage other) {
+          if (ReferenceEquals(other, null)) {
             return false;
           }
-          if (ReferenceEquals(other, this))
-          {
+          if (ReferenceEquals(other, this)) {
             return true;
           }
           if (Type != other.Type) return false;
@@ -593,13 +525,11 @@ public bool Equals(OneOfMessage other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode()
-        {
+        public override int GetHashCode() {
           int hash = 1;
           if (HasType) hash ^= Type.GetHashCode();
           if (prepareExecute_ != null) hash ^= PrepareExecute.GetHashCode();
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             hash ^= _unknownFields.GetHashCode();
           }
           return hash;
@@ -607,18 +537,16 @@ public override int GetHashCode()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString()
-        {
+        public override string ToString() {
           return pb::JsonFormatter.ToDiagnosticString(this);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void WriteTo(pb::CodedOutputStream output) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           output.WriteRawMessage(this);
-#else
+        #else
           if (HasType) {
             output.WriteRawTag(8);
             output.WriteEnum((int) Type);
@@ -630,46 +558,38 @@ public void WriteTo(pb::CodedOutputStream output)
           if (_unknownFields != null) {
             _unknownFields.WriteTo(output);
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-        {
-          if (HasType)
-          {
+        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+          if (HasType) {
             output.WriteRawTag(8);
-            output.WriteEnum((int)Type);
+            output.WriteEnum((int) Type);
           }
-          if (prepareExecute_ != null)
-          {
+          if (prepareExecute_ != null) {
             output.WriteRawTag(18);
             output.WriteMessage(PrepareExecute);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             _unknownFields.WriteTo(ref output);
           }
         }
-#endif
+        #endif
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize()
-        {
+        public int CalculateSize() {
           int size = 0;
-          if (HasType)
-          {
-            size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Type);
+          if (HasType) {
+            size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
           }
-          if (prepareExecute_ != null)
-          {
+          if (prepareExecute_ != null) {
             size += 1 + pb::CodedOutputStream.ComputeMessageSize(PrepareExecute);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             size += _unknownFields.CalculateSize();
           }
           return size;
@@ -677,20 +597,15 @@ public int CalculateSize()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(OneOfMessage other)
-        {
-          if (other == null)
-          {
+        public void MergeFrom(OneOfMessage other) {
+          if (other == null) {
             return;
           }
-          if (other.HasType)
-          {
+          if (other.HasType) {
             Type = other.Type;
           }
-          if (other.prepareExecute_ != null)
-          {
-            if (prepareExecute_ == null)
-            {
+          if (other.prepareExecute_ != null) {
+            if (prepareExecute_ == null) {
               PrepareExecute = new global::Mysqlx.Prepare.Execute();
             }
             PrepareExecute.MergeFrom(other.PrepareExecute);
@@ -700,11 +615,10 @@ public void MergeFrom(OneOfMessage other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void MergeFrom(pb::CodedInputStream input) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           input.ReadRawMessage(this);
-#else
+        #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
           if ((tag & 7) == 4) {
@@ -728,54 +642,45 @@ public void MergeFrom(pb::CodedInputStream input)
               }
             }
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-        {
+        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
           uint tag;
-          while ((tag = input.ReadTag()) != 0)
-          {
-            if ((tag & 7) == 4)
-            {
-              // Abort on any end group tag.
-              return;
-            }
-            switch (tag)
-            {
+          while ((tag = input.ReadTag()) != 0) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
                 break;
-              case 8:
-                {
-                  Type = (global::Mysqlx.Cursor.Open.Types.OneOfMessage.Types.Type)input.ReadEnum();
-                  break;
-                }
-              case 18:
-                {
-                  if (prepareExecute_ == null)
-                  {
-                    PrepareExecute = new global::Mysqlx.Prepare.Execute();
-                  }
-                  input.ReadMessage(PrepareExecute);
-                  break;
+              case 8: {
+                Type = (global::Mysqlx.Cursor.Open.Types.OneOfMessage.Types.Type) input.ReadEnum();
+                break;
+              }
+              case 18: {
+                if (prepareExecute_ == null) {
+                  PrepareExecute = new global::Mysqlx.Prepare.Execute();
                 }
+                input.ReadMessage(PrepareExecute);
+                break;
+              }
             }
           }
         }
-#endif
+        #endif
 
         #region Nested types
         /// <summary>Container for nested types declared in the OneOfMessage message type.</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static partial class Types
-        {
-          public enum Type
-          {
+        public static partial class Types {
+          public enum Type {
             [pbr::OriginalName("PREPARE_EXECUTE")] PrepareExecute = 0,
           }
 
@@ -805,9 +710,9 @@ public enum Type
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Fetch : pb::IMessage<Fetch>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Fetch> _parser = new pb::MessageParser<Fetch>(() => new Fetch());
     private pb::UnknownFieldSet _unknownFields;
@@ -818,22 +723,19 @@ public sealed partial class Fetch : pb::IMessage<Fetch>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Cursor.MysqlxCursorReflection.Descriptor.MessageTypes[1]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Fetch()
-    {
+    public Fetch() {
       OnConstruction();
     }
 
@@ -841,8 +743,7 @@ public Fetch()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Fetch(Fetch other) : this()
-    {
+    public Fetch(Fetch other) : this() {
       _hasBits0 = other._hasBits0;
       cursorId_ = other.cursorId_;
       fetchRows_ = other.fetchRows_;
@@ -851,8 +752,7 @@ public Fetch(Fetch other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Fetch Clone()
-    {
+    public Fetch Clone() {
       return new Fetch(this);
     }
 
@@ -866,11 +766,9 @@ public Fetch Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint CursorId
-    {
+    public uint CursorId {
       get { if ((_hasBits0 & 1) != 0) { return cursorId_; } else { return CursorIdDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         cursorId_ = value;
       }
@@ -878,15 +776,13 @@ public uint CursorId
     /// <summary>Gets whether the "cursor_id" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCursorId
-    {
+    public bool HasCursorId {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "cursor_id" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCursorId()
-    {
+    public void ClearCursorId() {
       _hasBits0 &= ~1;
     }
 
@@ -900,11 +796,9 @@ public void ClearCursorId()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong FetchRows
-    {
+    public ulong FetchRows {
       get { if ((_hasBits0 & 2) != 0) { return fetchRows_; } else { return FetchRowsDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         fetchRows_ = value;
       }
@@ -912,35 +806,29 @@ public ulong FetchRows
     /// <summary>Gets whether the "fetch_rows" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFetchRows
-    {
+    public bool HasFetchRows {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "fetch_rows" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFetchRows()
-    {
+    public void ClearFetchRows() {
       _hasBits0 &= ~2;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Fetch);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Fetch other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Fetch other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (CursorId != other.CursorId) return false;
@@ -950,13 +838,11 @@ public bool Equals(Fetch other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasCursorId) hash ^= CursorId.GetHashCode();
       if (HasFetchRows) hash ^= FetchRows.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -964,18 +850,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasCursorId) {
         output.WriteRawTag(8);
         output.WriteUInt32(CursorId);
@@ -987,46 +871,38 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasCursorId)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasCursorId) {
         output.WriteRawTag(8);
         output.WriteUInt32(CursorId);
       }
-      if (HasFetchRows)
-      {
+      if (HasFetchRows) {
         output.WriteRawTag(40);
         output.WriteUInt64(FetchRows);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasCursorId)
-      {
+      if (HasCursorId) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CursorId);
       }
-      if (HasFetchRows)
-      {
+      if (HasFetchRows) {
         size += 1 + pb::CodedOutputStream.ComputeUInt64Size(FetchRows);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1034,18 +910,14 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Fetch other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Fetch other) {
+      if (other == null) {
         return;
       }
-      if (other.HasCursorId)
-      {
+      if (other.HasCursorId) {
         CursorId = other.CursorId;
       }
-      if (other.HasFetchRows)
-      {
+      if (other.HasFetchRows) {
         FetchRows = other.FetchRows;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1053,11 +925,10 @@ public void MergeFrom(Fetch other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1078,41 +949,35 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              CursorId = input.ReadUInt32();
-              break;
-            }
-          case 40:
-            {
-              FetchRows = input.ReadUInt64();
-              break;
-            }
+          case 8: {
+            CursorId = input.ReadUInt32();
+            break;
+          }
+          case 40: {
+            FetchRows = input.ReadUInt64();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -1133,9 +998,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Close : pb::IMessage<Close>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Close> _parser = new pb::MessageParser<Close>(() => new Close());
     private pb::UnknownFieldSet _unknownFields;
@@ -1146,22 +1011,19 @@ public sealed partial class Close : pb::IMessage<Close>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Cursor.MysqlxCursorReflection.Descriptor.MessageTypes[2]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Close()
-    {
+    public Close() {
       OnConstruction();
     }
 
@@ -1169,8 +1031,7 @@ public Close()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Close(Close other) : this()
-    {
+    public Close(Close other) : this() {
       _hasBits0 = other._hasBits0;
       cursorId_ = other.cursorId_;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -1178,8 +1039,7 @@ public Close(Close other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Close Clone()
-    {
+    public Close Clone() {
       return new Close(this);
     }
 
@@ -1193,11 +1053,9 @@ public Close Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint CursorId
-    {
+    public uint CursorId {
       get { if ((_hasBits0 & 1) != 0) { return cursorId_; } else { return CursorIdDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         cursorId_ = value;
       }
@@ -1205,35 +1063,29 @@ public uint CursorId
     /// <summary>Gets whether the "cursor_id" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCursorId
-    {
+    public bool HasCursorId {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "cursor_id" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCursorId()
-    {
+    public void ClearCursorId() {
       _hasBits0 &= ~1;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Close);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Close other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Close other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (CursorId != other.CursorId) return false;
@@ -1242,12 +1094,10 @@ public bool Equals(Close other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasCursorId) hash ^= CursorId.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1255,18 +1105,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasCursorId) {
         output.WriteRawTag(8);
         output.WriteUInt32(CursorId);
@@ -1274,37 +1122,31 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasCursorId)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasCursorId) {
         output.WriteRawTag(8);
         output.WriteUInt32(CursorId);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasCursorId)
-      {
+      if (HasCursorId) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CursorId);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1312,14 +1154,11 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Close other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Close other) {
+      if (other == null) {
         return;
       }
-      if (other.HasCursorId)
-      {
+      if (other.HasCursorId) {
         CursorId = other.CursorId;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1327,11 +1166,10 @@ public void MergeFrom(Close other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1348,36 +1186,31 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              CursorId = input.ReadUInt32();
-              break;
-            }
+          case 8: {
+            CursorId = input.ReadUInt32();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -1386,4 +1219,3 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
-
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxDatatypes.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxDatatypes.cs
index bdf38ad39..9aac40eb6 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxDatatypes.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxDatatypes.cs
@@ -37,23 +37,19 @@
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Mysqlx.Datatypes
-{
+namespace Mysqlx.Datatypes {
 
   /// <summary>Holder for reflection information generated from mysqlx_datatypes.proto</summary>
-  public static partial class MysqlxDatatypesReflection
-  {
+  public static partial class MysqlxDatatypesReflection {
 
     #region Descriptor
     /// <summary>File descriptor for mysqlx_datatypes.proto</summary>
-    public static pbr::FileDescriptor Descriptor
-    {
+    public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static MysqlxDatatypesReflection()
-    {
+    static MysqlxDatatypesReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChZteXNxbHhfZGF0YXR5cGVzLnByb3RvEhBNeXNxbHguRGF0YXR5cGVzIsYD",
@@ -96,9 +92,9 @@ static MysqlxDatatypesReflection()
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Scalar : pb::IMessage<Scalar>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Scalar> _parser = new pb::MessageParser<Scalar>(() => new Scalar());
     private pb::UnknownFieldSet _unknownFields;
@@ -109,22 +105,19 @@ public sealed partial class Scalar : pb::IMessage<Scalar>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Datatypes.MysqlxDatatypesReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Scalar()
-    {
+    public Scalar() {
       OnConstruction();
     }
 
@@ -132,8 +125,7 @@ public Scalar()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Scalar(Scalar other) : this()
-    {
+    public Scalar(Scalar other) : this() {
       _hasBits0 = other._hasBits0;
       type_ = other.type_;
       vSignedInt_ = other.vSignedInt_;
@@ -148,8 +140,7 @@ public Scalar(Scalar other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Scalar Clone()
-    {
+    public Scalar Clone() {
       return new Scalar(this);
     }
 
@@ -160,11 +151,9 @@ public Scalar Clone()
     private global::Mysqlx.Datatypes.Scalar.Types.Type type_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Datatypes.Scalar.Types.Type Type
-    {
+    public global::Mysqlx.Datatypes.Scalar.Types.Type Type {
       get { if ((_hasBits0 & 1) != 0) { return type_; } else { return TypeDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         type_ = value;
       }
@@ -172,15 +161,13 @@ public Scalar Clone()
     /// <summary>Gets whether the "type" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasType
-    {
+    public bool HasType {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "type" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearType()
-    {
+    public void ClearType() {
       _hasBits0 &= ~1;
     }
 
@@ -191,11 +178,9 @@ public void ClearType()
     private long vSignedInt_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long VSignedInt
-    {
+    public long VSignedInt {
       get { if ((_hasBits0 & 2) != 0) { return vSignedInt_; } else { return VSignedIntDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         vSignedInt_ = value;
       }
@@ -203,15 +188,13 @@ public long VSignedInt
     /// <summary>Gets whether the "v_signed_int" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasVSignedInt
-    {
+    public bool HasVSignedInt {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "v_signed_int" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearVSignedInt()
-    {
+    public void ClearVSignedInt() {
       _hasBits0 &= ~2;
     }
 
@@ -222,11 +205,9 @@ public void ClearVSignedInt()
     private ulong vUnsignedInt_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong VUnsignedInt
-    {
+    public ulong VUnsignedInt {
       get { if ((_hasBits0 & 4) != 0) { return vUnsignedInt_; } else { return VUnsignedIntDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 4;
         vUnsignedInt_ = value;
       }
@@ -234,15 +215,13 @@ public ulong VUnsignedInt
     /// <summary>Gets whether the "v_unsigned_int" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasVUnsignedInt
-    {
+    public bool HasVUnsignedInt {
       get { return (_hasBits0 & 4) != 0; }
     }
     /// <summary>Clears the value of the "v_unsigned_int" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearVUnsignedInt()
-    {
+    public void ClearVUnsignedInt() {
       _hasBits0 &= ~4;
     }
 
@@ -254,11 +233,9 @@ public void ClearVUnsignedInt()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Datatypes.Scalar.Types.Octets VOctets
-    {
+    public global::Mysqlx.Datatypes.Scalar.Types.Octets VOctets {
       get { return vOctets_; }
-      set
-      {
+      set {
         vOctets_ = value;
       }
     }
@@ -270,11 +247,9 @@ public void ClearVUnsignedInt()
     private double vDouble_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double VDouble
-    {
+    public double VDouble {
       get { if ((_hasBits0 & 8) != 0) { return vDouble_; } else { return VDoubleDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 8;
         vDouble_ = value;
       }
@@ -282,15 +257,13 @@ public double VDouble
     /// <summary>Gets whether the "v_double" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasVDouble
-    {
+    public bool HasVDouble {
       get { return (_hasBits0 & 8) != 0; }
     }
     /// <summary>Clears the value of the "v_double" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearVDouble()
-    {
+    public void ClearVDouble() {
       _hasBits0 &= ~8;
     }
 
@@ -301,11 +274,9 @@ public void ClearVDouble()
     private float vFloat_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float VFloat
-    {
+    public float VFloat {
       get { if ((_hasBits0 & 16) != 0) { return vFloat_; } else { return VFloatDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 16;
         vFloat_ = value;
       }
@@ -313,15 +284,13 @@ public float VFloat
     /// <summary>Gets whether the "v_float" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasVFloat
-    {
+    public bool HasVFloat {
       get { return (_hasBits0 & 16) != 0; }
     }
     /// <summary>Clears the value of the "v_float" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearVFloat()
-    {
+    public void ClearVFloat() {
       _hasBits0 &= ~16;
     }
 
@@ -332,11 +301,9 @@ public void ClearVFloat()
     private bool vBool_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool VBool
-    {
+    public bool VBool {
       get { if ((_hasBits0 & 32) != 0) { return vBool_; } else { return VBoolDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 32;
         vBool_ = value;
       }
@@ -344,15 +311,13 @@ public bool VBool
     /// <summary>Gets whether the "v_bool" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasVBool
-    {
+    public bool HasVBool {
       get { return (_hasBits0 & 32) != 0; }
     }
     /// <summary>Clears the value of the "v_bool" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearVBool()
-    {
+    public void ClearVBool() {
       _hasBits0 &= ~32;
     }
 
@@ -361,32 +326,26 @@ public void ClearVBool()
     private global::Mysqlx.Datatypes.Scalar.Types.String vString_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Datatypes.Scalar.Types.String VString
-    {
+    public global::Mysqlx.Datatypes.Scalar.Types.String VString {
       get { return vString_; }
-      set
-      {
+      set {
         vString_ = value;
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Scalar);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Scalar other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Scalar other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Type != other.Type) return false;
@@ -402,8 +361,7 @@ public bool Equals(Scalar other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasType) hash ^= Type.GetHashCode();
       if (HasVSignedInt) hash ^= VSignedInt.GetHashCode();
@@ -413,8 +371,7 @@ public override int GetHashCode()
       if (HasVFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(VFloat);
       if (HasVBool) hash ^= VBool.GetHashCode();
       if (vString_ != null) hash ^= VString.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -422,18 +379,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasType) {
         output.WriteRawTag(8);
         output.WriteEnum((int) Type);
@@ -469,100 +424,80 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasType)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasType) {
         output.WriteRawTag(8);
-        output.WriteEnum((int)Type);
+        output.WriteEnum((int) Type);
       }
-      if (HasVSignedInt)
-      {
+      if (HasVSignedInt) {
         output.WriteRawTag(16);
         output.WriteSInt64(VSignedInt);
       }
-      if (HasVUnsignedInt)
-      {
+      if (HasVUnsignedInt) {
         output.WriteRawTag(24);
         output.WriteUInt64(VUnsignedInt);
       }
-      if (vOctets_ != null)
-      {
+      if (vOctets_ != null) {
         output.WriteRawTag(42);
         output.WriteMessage(VOctets);
       }
-      if (HasVDouble)
-      {
+      if (HasVDouble) {
         output.WriteRawTag(49);
         output.WriteDouble(VDouble);
       }
-      if (HasVFloat)
-      {
+      if (HasVFloat) {
         output.WriteRawTag(61);
         output.WriteFloat(VFloat);
       }
-      if (HasVBool)
-      {
+      if (HasVBool) {
         output.WriteRawTag(64);
         output.WriteBool(VBool);
       }
-      if (vString_ != null)
-      {
+      if (vString_ != null) {
         output.WriteRawTag(74);
         output.WriteMessage(VString);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasType)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Type);
+      if (HasType) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
       }
-      if (HasVSignedInt)
-      {
+      if (HasVSignedInt) {
         size += 1 + pb::CodedOutputStream.ComputeSInt64Size(VSignedInt);
       }
-      if (HasVUnsignedInt)
-      {
+      if (HasVUnsignedInt) {
         size += 1 + pb::CodedOutputStream.ComputeUInt64Size(VUnsignedInt);
       }
-      if (vOctets_ != null)
-      {
+      if (vOctets_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(VOctets);
       }
-      if (HasVDouble)
-      {
+      if (HasVDouble) {
         size += 1 + 8;
       }
-      if (HasVFloat)
-      {
+      if (HasVFloat) {
         size += 1 + 4;
       }
-      if (HasVBool)
-      {
+      if (HasVBool) {
         size += 1 + 1;
       }
-      if (vString_ != null)
-      {
+      if (vString_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(VString);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -570,48 +505,36 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Scalar other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Scalar other) {
+      if (other == null) {
         return;
       }
-      if (other.HasType)
-      {
+      if (other.HasType) {
         Type = other.Type;
       }
-      if (other.HasVSignedInt)
-      {
+      if (other.HasVSignedInt) {
         VSignedInt = other.VSignedInt;
       }
-      if (other.HasVUnsignedInt)
-      {
+      if (other.HasVUnsignedInt) {
         VUnsignedInt = other.VUnsignedInt;
       }
-      if (other.vOctets_ != null)
-      {
-        if (vOctets_ == null)
-        {
+      if (other.vOctets_ != null) {
+        if (vOctets_ == null) {
           VOctets = new global::Mysqlx.Datatypes.Scalar.Types.Octets();
         }
         VOctets.MergeFrom(other.VOctets);
       }
-      if (other.HasVDouble)
-      {
+      if (other.HasVDouble) {
         VDouble = other.VDouble;
       }
-      if (other.HasVFloat)
-      {
+      if (other.HasVFloat) {
         VFloat = other.VFloat;
       }
-      if (other.HasVBool)
-      {
+      if (other.HasVBool) {
         VBool = other.VBool;
       }
-      if (other.vString_ != null)
-      {
-        if (vString_ == null)
-        {
+      if (other.vString_ != null) {
+        if (vString_ == null) {
           VString = new global::Mysqlx.Datatypes.Scalar.Types.String();
         }
         VString.MergeFrom(other.VString);
@@ -621,11 +544,10 @@ public void MergeFrom(Scalar other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -676,88 +598,72 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              Type = (global::Mysqlx.Datatypes.Scalar.Types.Type)input.ReadEnum();
-              break;
-            }
-          case 16:
-            {
-              VSignedInt = input.ReadSInt64();
-              break;
-            }
-          case 24:
-            {
-              VUnsignedInt = input.ReadUInt64();
-              break;
-            }
-          case 42:
-            {
-              if (vOctets_ == null)
-              {
-                VOctets = new global::Mysqlx.Datatypes.Scalar.Types.Octets();
-              }
-              input.ReadMessage(VOctets);
-              break;
-            }
-          case 49:
-            {
-              VDouble = input.ReadDouble();
-              break;
-            }
-          case 61:
-            {
-              VFloat = input.ReadFloat();
-              break;
-            }
-          case 64:
-            {
-              VBool = input.ReadBool();
-              break;
+          case 8: {
+            Type = (global::Mysqlx.Datatypes.Scalar.Types.Type) input.ReadEnum();
+            break;
+          }
+          case 16: {
+            VSignedInt = input.ReadSInt64();
+            break;
+          }
+          case 24: {
+            VUnsignedInt = input.ReadUInt64();
+            break;
+          }
+          case 42: {
+            if (vOctets_ == null) {
+              VOctets = new global::Mysqlx.Datatypes.Scalar.Types.Octets();
             }
-          case 74:
-            {
-              if (vString_ == null)
-              {
-                VString = new global::Mysqlx.Datatypes.Scalar.Types.String();
-              }
-              input.ReadMessage(VString);
-              break;
+            input.ReadMessage(VOctets);
+            break;
+          }
+          case 49: {
+            VDouble = input.ReadDouble();
+            break;
+          }
+          case 61: {
+            VFloat = input.ReadFloat();
+            break;
+          }
+          case 64: {
+            VBool = input.ReadBool();
+            break;
+          }
+          case 74: {
+            if (vString_ == null) {
+              VString = new global::Mysqlx.Datatypes.Scalar.Types.String();
             }
+            input.ReadMessage(VString);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Scalar message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum Type
-      {
+    public static partial class Types {
+      public enum Type {
         [pbr::OriginalName("V_SINT")] VSint = 1,
         [pbr::OriginalName("V_UINT")] VUint = 2,
         [pbr::OriginalName("V_NULL")] VNull = 3,
@@ -773,9 +679,9 @@ public enum Type
       /// </summary>
       [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class String : pb::IMessage<String>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
-#endif
+      #endif
       {
         private static readonly pb::MessageParser<String> _parser = new pb::MessageParser<String>(() => new String());
         private pb::UnknownFieldSet _unknownFields;
@@ -786,22 +692,19 @@ public sealed partial class String : pb::IMessage<String>
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor
-        {
+        public static pbr::MessageDescriptor Descriptor {
           get { return global::Mysqlx.Datatypes.Scalar.Descriptor.NestedTypes[0]; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor
-        {
+        pbr::MessageDescriptor pb::IMessage.Descriptor {
           get { return Descriptor; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public String()
-        {
+        public String() {
           OnConstruction();
         }
 
@@ -809,8 +712,7 @@ public String()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public String(String other) : this()
-        {
+        public String(String other) : this() {
           _hasBits0 = other._hasBits0;
           value_ = other.value_;
           collation_ = other.collation_;
@@ -819,8 +721,7 @@ public String(String other) : this()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public String Clone()
-        {
+        public String Clone() {
           return new String(this);
         }
 
@@ -831,26 +732,22 @@ public String Clone()
         private pb::ByteString value_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pb::ByteString Value
-        {
+        public pb::ByteString Value {
           get { return value_ ?? ValueDefaultValue; }
-          set
-          {
+          set {
             value_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
           }
         }
         /// <summary>Gets whether the "value" field is set</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasValue
-        {
+        public bool HasValue {
           get { return value_ != null; }
         }
         /// <summary>Clears the value of the "value" field</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearValue()
-        {
+        public void ClearValue() {
           value_ = null;
         }
 
@@ -861,11 +758,9 @@ public void ClearValue()
         private ulong collation_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ulong Collation
-        {
+        public ulong Collation {
           get { if ((_hasBits0 & 1) != 0) { return collation_; } else { return CollationDefaultValue; } }
-          set
-          {
+          set {
             _hasBits0 |= 1;
             collation_ = value;
           }
@@ -873,35 +768,29 @@ public ulong Collation
         /// <summary>Gets whether the "collation" field is set</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasCollation
-        {
+        public bool HasCollation {
           get { return (_hasBits0 & 1) != 0; }
         }
         /// <summary>Clears the value of the "collation" field</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearCollation()
-        {
+        public void ClearCollation() {
           _hasBits0 &= ~1;
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other)
-        {
+        public override bool Equals(object other) {
           return Equals(other as String);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(String other)
-        {
-          if (ReferenceEquals(other, null))
-          {
+        public bool Equals(String other) {
+          if (ReferenceEquals(other, null)) {
             return false;
           }
-          if (ReferenceEquals(other, this))
-          {
+          if (ReferenceEquals(other, this)) {
             return true;
           }
           if (Value != other.Value) return false;
@@ -911,13 +800,11 @@ public bool Equals(String other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode()
-        {
+        public override int GetHashCode() {
           int hash = 1;
           if (HasValue) hash ^= Value.GetHashCode();
           if (HasCollation) hash ^= Collation.GetHashCode();
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             hash ^= _unknownFields.GetHashCode();
           }
           return hash;
@@ -925,18 +812,16 @@ public override int GetHashCode()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString()
-        {
+        public override string ToString() {
           return pb::JsonFormatter.ToDiagnosticString(this);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void WriteTo(pb::CodedOutputStream output) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           output.WriteRawMessage(this);
-#else
+        #else
           if (HasValue) {
             output.WriteRawTag(10);
             output.WriteBytes(Value);
@@ -948,46 +833,38 @@ public void WriteTo(pb::CodedOutputStream output)
           if (_unknownFields != null) {
             _unknownFields.WriteTo(output);
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-        {
-          if (HasValue)
-          {
+        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+          if (HasValue) {
             output.WriteRawTag(10);
             output.WriteBytes(Value);
           }
-          if (HasCollation)
-          {
+          if (HasCollation) {
             output.WriteRawTag(16);
             output.WriteUInt64(Collation);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             _unknownFields.WriteTo(ref output);
           }
         }
-#endif
+        #endif
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize()
-        {
+        public int CalculateSize() {
           int size = 0;
-          if (HasValue)
-          {
+          if (HasValue) {
             size += 1 + pb::CodedOutputStream.ComputeBytesSize(Value);
           }
-          if (HasCollation)
-          {
+          if (HasCollation) {
             size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Collation);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             size += _unknownFields.CalculateSize();
           }
           return size;
@@ -995,18 +872,14 @@ public int CalculateSize()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(String other)
-        {
-          if (other == null)
-          {
+        public void MergeFrom(String other) {
+          if (other == null) {
             return;
           }
-          if (other.HasValue)
-          {
+          if (other.HasValue) {
             Value = other.Value;
           }
-          if (other.HasCollation)
-          {
+          if (other.HasCollation) {
             Collation = other.Collation;
           }
           _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1014,11 +887,10 @@ public void MergeFrom(String other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void MergeFrom(pb::CodedInputStream input) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           input.ReadRawMessage(this);
-#else
+        #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
           if ((tag & 7) == 4) {
@@ -1039,41 +911,35 @@ public void MergeFrom(pb::CodedInputStream input)
               }
             }
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-        {
+        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
           uint tag;
-          while ((tag = input.ReadTag()) != 0)
-          {
-            if ((tag & 7) == 4)
-            {
-              // Abort on any end group tag.
-              return;
-            }
-            switch (tag)
-            {
+          while ((tag = input.ReadTag()) != 0) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
                 break;
-              case 10:
-                {
-                  Value = input.ReadBytes();
-                  break;
-                }
-              case 16:
-                {
-                  Collation = input.ReadUInt64();
-                  break;
-                }
+              case 10: {
+                Value = input.ReadBytes();
+                break;
+              }
+              case 16: {
+                Collation = input.ReadUInt64();
+                break;
+              }
             }
           }
         }
-#endif
+        #endif
 
       }
 
@@ -1083,9 +949,9 @@ public void MergeFrom(pb::CodedInputStream input)
       /// </summary>
       [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Octets : pb::IMessage<Octets>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
-#endif
+      #endif
       {
         private static readonly pb::MessageParser<Octets> _parser = new pb::MessageParser<Octets>(() => new Octets());
         private pb::UnknownFieldSet _unknownFields;
@@ -1096,22 +962,19 @@ public sealed partial class Octets : pb::IMessage<Octets>
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor
-        {
+        public static pbr::MessageDescriptor Descriptor {
           get { return global::Mysqlx.Datatypes.Scalar.Descriptor.NestedTypes[1]; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor
-        {
+        pbr::MessageDescriptor pb::IMessage.Descriptor {
           get { return Descriptor; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Octets()
-        {
+        public Octets() {
           OnConstruction();
         }
 
@@ -1119,8 +982,7 @@ public Octets()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Octets(Octets other) : this()
-        {
+        public Octets(Octets other) : this() {
           _hasBits0 = other._hasBits0;
           value_ = other.value_;
           contentType_ = other.contentType_;
@@ -1129,8 +991,7 @@ public Octets(Octets other) : this()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Octets Clone()
-        {
+        public Octets Clone() {
           return new Octets(this);
         }
 
@@ -1141,26 +1002,22 @@ public Octets Clone()
         private pb::ByteString value_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pb::ByteString Value
-        {
+        public pb::ByteString Value {
           get { return value_ ?? ValueDefaultValue; }
-          set
-          {
+          set {
             value_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
           }
         }
         /// <summary>Gets whether the "value" field is set</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasValue
-        {
+        public bool HasValue {
           get { return value_ != null; }
         }
         /// <summary>Clears the value of the "value" field</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearValue()
-        {
+        public void ClearValue() {
           value_ = null;
         }
 
@@ -1171,11 +1028,9 @@ public void ClearValue()
         private uint contentType_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public uint ContentType
-        {
+        public uint ContentType {
           get { if ((_hasBits0 & 1) != 0) { return contentType_; } else { return ContentTypeDefaultValue; } }
-          set
-          {
+          set {
             _hasBits0 |= 1;
             contentType_ = value;
           }
@@ -1183,35 +1038,29 @@ public uint ContentType
         /// <summary>Gets whether the "content_type" field is set</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasContentType
-        {
+        public bool HasContentType {
           get { return (_hasBits0 & 1) != 0; }
         }
         /// <summary>Clears the value of the "content_type" field</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearContentType()
-        {
+        public void ClearContentType() {
           _hasBits0 &= ~1;
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other)
-        {
+        public override bool Equals(object other) {
           return Equals(other as Octets);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(Octets other)
-        {
-          if (ReferenceEquals(other, null))
-          {
+        public bool Equals(Octets other) {
+          if (ReferenceEquals(other, null)) {
             return false;
           }
-          if (ReferenceEquals(other, this))
-          {
+          if (ReferenceEquals(other, this)) {
             return true;
           }
           if (Value != other.Value) return false;
@@ -1221,13 +1070,11 @@ public bool Equals(Octets other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode()
-        {
+        public override int GetHashCode() {
           int hash = 1;
           if (HasValue) hash ^= Value.GetHashCode();
           if (HasContentType) hash ^= ContentType.GetHashCode();
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             hash ^= _unknownFields.GetHashCode();
           }
           return hash;
@@ -1235,18 +1082,16 @@ public override int GetHashCode()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString()
-        {
+        public override string ToString() {
           return pb::JsonFormatter.ToDiagnosticString(this);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void WriteTo(pb::CodedOutputStream output) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           output.WriteRawMessage(this);
-#else
+        #else
           if (HasValue) {
             output.WriteRawTag(10);
             output.WriteBytes(Value);
@@ -1258,46 +1103,38 @@ public void WriteTo(pb::CodedOutputStream output)
           if (_unknownFields != null) {
             _unknownFields.WriteTo(output);
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-        {
-          if (HasValue)
-          {
+        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+          if (HasValue) {
             output.WriteRawTag(10);
             output.WriteBytes(Value);
           }
-          if (HasContentType)
-          {
+          if (HasContentType) {
             output.WriteRawTag(16);
             output.WriteUInt32(ContentType);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             _unknownFields.WriteTo(ref output);
           }
         }
-#endif
+        #endif
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize()
-        {
+        public int CalculateSize() {
           int size = 0;
-          if (HasValue)
-          {
+          if (HasValue) {
             size += 1 + pb::CodedOutputStream.ComputeBytesSize(Value);
           }
-          if (HasContentType)
-          {
+          if (HasContentType) {
             size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ContentType);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             size += _unknownFields.CalculateSize();
           }
           return size;
@@ -1305,18 +1142,14 @@ public int CalculateSize()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(Octets other)
-        {
-          if (other == null)
-          {
+        public void MergeFrom(Octets other) {
+          if (other == null) {
             return;
           }
-          if (other.HasValue)
-          {
+          if (other.HasValue) {
             Value = other.Value;
           }
-          if (other.HasContentType)
-          {
+          if (other.HasContentType) {
             ContentType = other.ContentType;
           }
           _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1324,11 +1157,10 @@ public void MergeFrom(Octets other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void MergeFrom(pb::CodedInputStream input) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           input.ReadRawMessage(this);
-#else
+        #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
           if ((tag & 7) == 4) {
@@ -1349,41 +1181,35 @@ public void MergeFrom(pb::CodedInputStream input)
               }
             }
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-        {
+        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
           uint tag;
-          while ((tag = input.ReadTag()) != 0)
-          {
-            if ((tag & 7) == 4)
-            {
-              // Abort on any end group tag.
-              return;
-            }
-            switch (tag)
-            {
+          while ((tag = input.ReadTag()) != 0) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
                 break;
-              case 10:
-                {
-                  Value = input.ReadBytes();
-                  break;
-                }
-              case 16:
-                {
-                  ContentType = input.ReadUInt32();
-                  break;
-                }
+              case 10: {
+                Value = input.ReadBytes();
+                break;
+              }
+              case 16: {
+                ContentType = input.ReadUInt32();
+                break;
+              }
             }
           }
         }
-#endif
+        #endif
 
       }
 
@@ -1398,9 +1224,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Object : pb::IMessage<Object>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Object> _parser = new pb::MessageParser<Object>(() => new Object());
     private pb::UnknownFieldSet _unknownFields;
@@ -1410,22 +1236,19 @@ public sealed partial class Object : pb::IMessage<Object>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Datatypes.MysqlxDatatypesReflection.Descriptor.MessageTypes[1]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Object()
-    {
+    public Object() {
       OnConstruction();
     }
 
@@ -1433,16 +1256,14 @@ public Object()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Object(Object other) : this()
-    {
+    public Object(Object other) : this() {
       fld_ = other.fld_.Clone();
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Object Clone()
-    {
+    public Object Clone() {
       return new Object(this);
     }
 
@@ -1453,42 +1274,35 @@ public Object Clone()
     private readonly pbc::RepeatedField<global::Mysqlx.Datatypes.Object.Types.ObjectField> fld_ = new pbc::RepeatedField<global::Mysqlx.Datatypes.Object.Types.ObjectField>();
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Datatypes.Object.Types.ObjectField> Fld
-    {
+    public pbc::RepeatedField<global::Mysqlx.Datatypes.Object.Types.ObjectField> Fld {
       get { return fld_; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Object);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Object other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Object other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (!fld_.Equals(other.fld_)) return false;
+      if(!fld_.Equals(other.fld_)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       hash ^= fld_.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1496,46 +1310,40 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       fld_.WriteTo(output, _repeated_fld_codec);
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
       fld_.WriteTo(ref output, _repeated_fld_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
       size += fld_.CalculateSize(_repeated_fld_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1543,10 +1351,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Object other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Object other) {
+      if (other == null) {
         return;
       }
       fld_.Add(other.fld_);
@@ -1555,11 +1361,10 @@ public void MergeFrom(Object other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1576,48 +1381,42 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              fld_.AddEntriesFrom(ref input, _repeated_fld_codec);
-              break;
-            }
+          case 10: {
+            fld_.AddEntriesFrom(ref input, _repeated_fld_codec);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Object message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
+    public static partial class Types {
       [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class ObjectField : pb::IMessage<ObjectField>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
-#endif
+      #endif
       {
         private static readonly pb::MessageParser<ObjectField> _parser = new pb::MessageParser<ObjectField>(() => new ObjectField());
         private pb::UnknownFieldSet _unknownFields;
@@ -1627,22 +1426,19 @@ public sealed partial class ObjectField : pb::IMessage<ObjectField>
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor
-        {
+        public static pbr::MessageDescriptor Descriptor {
           get { return global::Mysqlx.Datatypes.Object.Descriptor.NestedTypes[0]; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor
-        {
+        pbr::MessageDescriptor pb::IMessage.Descriptor {
           get { return Descriptor; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ObjectField()
-        {
+        public ObjectField() {
           OnConstruction();
         }
 
@@ -1650,8 +1446,7 @@ public ObjectField()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ObjectField(ObjectField other) : this()
-        {
+        public ObjectField(ObjectField other) : this() {
           key_ = other.key_;
           value_ = other.value_ != null ? other.value_.Clone() : null;
           _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -1659,8 +1454,7 @@ public ObjectField(ObjectField other) : this()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ObjectField Clone()
-        {
+        public ObjectField Clone() {
           return new ObjectField(this);
         }
 
@@ -1671,26 +1465,22 @@ public ObjectField Clone()
         private string key_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string Key
-        {
+        public string Key {
           get { return key_ ?? KeyDefaultValue; }
-          set
-          {
+          set {
             key_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
           }
         }
         /// <summary>Gets whether the "key" field is set</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasKey
-        {
+        public bool HasKey {
           get { return key_ != null; }
         }
         /// <summary>Clears the value of the "key" field</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearKey()
-        {
+        public void ClearKey() {
           key_ = null;
         }
 
@@ -1699,32 +1489,26 @@ public void ClearKey()
         private global::Mysqlx.Datatypes.Any value_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Mysqlx.Datatypes.Any Value
-        {
+        public global::Mysqlx.Datatypes.Any Value {
           get { return value_; }
-          set
-          {
+          set {
             value_ = value;
           }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other)
-        {
+        public override bool Equals(object other) {
           return Equals(other as ObjectField);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(ObjectField other)
-        {
-          if (ReferenceEquals(other, null))
-          {
+        public bool Equals(ObjectField other) {
+          if (ReferenceEquals(other, null)) {
             return false;
           }
-          if (ReferenceEquals(other, this))
-          {
+          if (ReferenceEquals(other, this)) {
             return true;
           }
           if (Key != other.Key) return false;
@@ -1734,13 +1518,11 @@ public bool Equals(ObjectField other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode()
-        {
+        public override int GetHashCode() {
           int hash = 1;
           if (HasKey) hash ^= Key.GetHashCode();
           if (value_ != null) hash ^= Value.GetHashCode();
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             hash ^= _unknownFields.GetHashCode();
           }
           return hash;
@@ -1748,18 +1530,16 @@ public override int GetHashCode()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString()
-        {
+        public override string ToString() {
           return pb::JsonFormatter.ToDiagnosticString(this);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void WriteTo(pb::CodedOutputStream output) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           output.WriteRawMessage(this);
-#else
+        #else
           if (HasKey) {
             output.WriteRawTag(10);
             output.WriteString(Key);
@@ -1771,46 +1551,38 @@ public void WriteTo(pb::CodedOutputStream output)
           if (_unknownFields != null) {
             _unknownFields.WriteTo(output);
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-        {
-          if (HasKey)
-          {
+        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+          if (HasKey) {
             output.WriteRawTag(10);
             output.WriteString(Key);
           }
-          if (value_ != null)
-          {
+          if (value_ != null) {
             output.WriteRawTag(18);
             output.WriteMessage(Value);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             _unknownFields.WriteTo(ref output);
           }
         }
-#endif
+        #endif
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize()
-        {
+        public int CalculateSize() {
           int size = 0;
-          if (HasKey)
-          {
+          if (HasKey) {
             size += 1 + pb::CodedOutputStream.ComputeStringSize(Key);
           }
-          if (value_ != null)
-          {
+          if (value_ != null) {
             size += 1 + pb::CodedOutputStream.ComputeMessageSize(Value);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             size += _unknownFields.CalculateSize();
           }
           return size;
@@ -1818,20 +1590,15 @@ public int CalculateSize()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(ObjectField other)
-        {
-          if (other == null)
-          {
+        public void MergeFrom(ObjectField other) {
+          if (other == null) {
             return;
           }
-          if (other.HasKey)
-          {
+          if (other.HasKey) {
             Key = other.Key;
           }
-          if (other.value_ != null)
-          {
-            if (value_ == null)
-            {
+          if (other.value_ != null) {
+            if (value_ == null) {
               Value = new global::Mysqlx.Datatypes.Any();
             }
             Value.MergeFrom(other.Value);
@@ -1841,11 +1608,10 @@ public void MergeFrom(ObjectField other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void MergeFrom(pb::CodedInputStream input) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           input.ReadRawMessage(this);
-#else
+        #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
           if ((tag & 7) == 4) {
@@ -1869,45 +1635,38 @@ public void MergeFrom(pb::CodedInputStream input)
               }
             }
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-        {
+        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
           uint tag;
-          while ((tag = input.ReadTag()) != 0)
-          {
-            if ((tag & 7) == 4)
-            {
-              // Abort on any end group tag.
-              return;
-            }
-            switch (tag)
-            {
+          while ((tag = input.ReadTag()) != 0) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
                 break;
-              case 10:
-                {
-                  Key = input.ReadString();
-                  break;
-                }
-              case 18:
-                {
-                  if (value_ == null)
-                  {
-                    Value = new global::Mysqlx.Datatypes.Any();
-                  }
-                  input.ReadMessage(Value);
-                  break;
+              case 10: {
+                Key = input.ReadString();
+                break;
+              }
+              case 18: {
+                if (value_ == null) {
+                  Value = new global::Mysqlx.Datatypes.Any();
                 }
+                input.ReadMessage(Value);
+                break;
+              }
             }
           }
         }
-#endif
+        #endif
 
       }
 
@@ -1922,9 +1681,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Array : pb::IMessage<Array>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Array> _parser = new pb::MessageParser<Array>(() => new Array());
     private pb::UnknownFieldSet _unknownFields;
@@ -1934,22 +1693,19 @@ public sealed partial class Array : pb::IMessage<Array>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Datatypes.MysqlxDatatypesReflection.Descriptor.MessageTypes[2]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Array()
-    {
+    public Array() {
       OnConstruction();
     }
 
@@ -1957,16 +1713,14 @@ public Array()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Array(Array other) : this()
-    {
+    public Array(Array other) : this() {
       value_ = other.value_.Clone();
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Array Clone()
-    {
+    public Array Clone() {
       return new Array(this);
     }
 
@@ -1977,42 +1731,35 @@ public Array Clone()
     private readonly pbc::RepeatedField<global::Mysqlx.Datatypes.Any> value_ = new pbc::RepeatedField<global::Mysqlx.Datatypes.Any>();
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Datatypes.Any> Value
-    {
+    public pbc::RepeatedField<global::Mysqlx.Datatypes.Any> Value {
       get { return value_; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Array);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Array other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Array other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (!value_.Equals(other.value_)) return false;
+      if(!value_.Equals(other.value_)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       hash ^= value_.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -2020,46 +1767,40 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       value_.WriteTo(output, _repeated_value_codec);
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
       value_.WriteTo(ref output, _repeated_value_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
       size += value_.CalculateSize(_repeated_value_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -2067,10 +1808,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Array other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Array other) {
+      if (other == null) {
         return;
       }
       value_.Add(other.value_);
@@ -2079,11 +1818,10 @@ public void MergeFrom(Array other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -2100,36 +1838,31 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              value_.AddEntriesFrom(ref input, _repeated_value_codec);
-              break;
-            }
+          case 10: {
+            value_.AddEntriesFrom(ref input, _repeated_value_codec);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -2139,9 +1872,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Any : pb::IMessage<Any>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Any> _parser = new pb::MessageParser<Any>(() => new Any());
     private pb::UnknownFieldSet _unknownFields;
@@ -2152,22 +1885,19 @@ public sealed partial class Any : pb::IMessage<Any>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Datatypes.MysqlxDatatypesReflection.Descriptor.MessageTypes[3]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Any()
-    {
+    public Any() {
       OnConstruction();
     }
 
@@ -2175,8 +1905,7 @@ public Any()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Any(Any other) : this()
-    {
+    public Any(Any other) : this() {
       _hasBits0 = other._hasBits0;
       type_ = other.type_;
       scalar_ = other.scalar_ != null ? other.scalar_.Clone() : null;
@@ -2187,8 +1916,7 @@ public Any(Any other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Any Clone()
-    {
+    public Any Clone() {
       return new Any(this);
     }
 
@@ -2199,11 +1927,9 @@ public Any Clone()
     private global::Mysqlx.Datatypes.Any.Types.Type type_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Datatypes.Any.Types.Type Type
-    {
+    public global::Mysqlx.Datatypes.Any.Types.Type Type {
       get { if ((_hasBits0 & 1) != 0) { return type_; } else { return TypeDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         type_ = value;
       }
@@ -2211,15 +1937,13 @@ public Any Clone()
     /// <summary>Gets whether the "type" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasType
-    {
+    public bool HasType {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "type" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearType()
-    {
+    public void ClearType() {
       _hasBits0 &= ~1;
     }
 
@@ -2228,11 +1952,9 @@ public void ClearType()
     private global::Mysqlx.Datatypes.Scalar scalar_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Datatypes.Scalar Scalar
-    {
+    public global::Mysqlx.Datatypes.Scalar Scalar {
       get { return scalar_; }
-      set
-      {
+      set {
         scalar_ = value;
       }
     }
@@ -2242,11 +1964,9 @@ public void ClearType()
     private global::Mysqlx.Datatypes.Object obj_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Datatypes.Object Obj
-    {
+    public global::Mysqlx.Datatypes.Object Obj {
       get { return obj_; }
-      set
-      {
+      set {
         obj_ = value;
       }
     }
@@ -2256,32 +1976,26 @@ public void ClearType()
     private global::Mysqlx.Datatypes.Array array_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Datatypes.Array Array
-    {
+    public global::Mysqlx.Datatypes.Array Array {
       get { return array_; }
-      set
-      {
+      set {
         array_ = value;
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Any);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Any other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Any other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Type != other.Type) return false;
@@ -2293,15 +2007,13 @@ public bool Equals(Any other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasType) hash ^= Type.GetHashCode();
       if (scalar_ != null) hash ^= Scalar.GetHashCode();
       if (obj_ != null) hash ^= Obj.GetHashCode();
       if (array_ != null) hash ^= Array.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -2309,18 +2021,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasType) {
         output.WriteRawTag(8);
         output.WriteEnum((int) Type);
@@ -2340,64 +2050,52 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasType)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasType) {
         output.WriteRawTag(8);
-        output.WriteEnum((int)Type);
+        output.WriteEnum((int) Type);
       }
-      if (scalar_ != null)
-      {
+      if (scalar_ != null) {
         output.WriteRawTag(18);
         output.WriteMessage(Scalar);
       }
-      if (obj_ != null)
-      {
+      if (obj_ != null) {
         output.WriteRawTag(26);
         output.WriteMessage(Obj);
       }
-      if (array_ != null)
-      {
+      if (array_ != null) {
         output.WriteRawTag(34);
         output.WriteMessage(Array);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasType)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Type);
+      if (HasType) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
       }
-      if (scalar_ != null)
-      {
+      if (scalar_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Scalar);
       }
-      if (obj_ != null)
-      {
+      if (obj_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Obj);
       }
-      if (array_ != null)
-      {
+      if (array_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Array);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -2405,36 +2103,27 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Any other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Any other) {
+      if (other == null) {
         return;
       }
-      if (other.HasType)
-      {
+      if (other.HasType) {
         Type = other.Type;
       }
-      if (other.scalar_ != null)
-      {
-        if (scalar_ == null)
-        {
+      if (other.scalar_ != null) {
+        if (scalar_ == null) {
           Scalar = new global::Mysqlx.Datatypes.Scalar();
         }
         Scalar.MergeFrom(other.Scalar);
       }
-      if (other.obj_ != null)
-      {
-        if (obj_ == null)
-        {
+      if (other.obj_ != null) {
+        if (obj_ == null) {
           Obj = new global::Mysqlx.Datatypes.Object();
         }
         Obj.MergeFrom(other.Obj);
       }
-      if (other.array_ != null)
-      {
-        if (array_ == null)
-        {
+      if (other.array_ != null) {
+        if (array_ == null) {
           Array = new global::Mysqlx.Datatypes.Array();
         }
         Array.MergeFrom(other.Array);
@@ -2444,11 +2133,10 @@ public void MergeFrom(Any other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -2486,72 +2174,59 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              Type = (global::Mysqlx.Datatypes.Any.Types.Type)input.ReadEnum();
-              break;
-            }
-          case 18:
-            {
-              if (scalar_ == null)
-              {
-                Scalar = new global::Mysqlx.Datatypes.Scalar();
-              }
-              input.ReadMessage(Scalar);
-              break;
+          case 8: {
+            Type = (global::Mysqlx.Datatypes.Any.Types.Type) input.ReadEnum();
+            break;
+          }
+          case 18: {
+            if (scalar_ == null) {
+              Scalar = new global::Mysqlx.Datatypes.Scalar();
             }
-          case 26:
-            {
-              if (obj_ == null)
-              {
-                Obj = new global::Mysqlx.Datatypes.Object();
-              }
-              input.ReadMessage(Obj);
-              break;
+            input.ReadMessage(Scalar);
+            break;
+          }
+          case 26: {
+            if (obj_ == null) {
+              Obj = new global::Mysqlx.Datatypes.Object();
             }
-          case 34:
-            {
-              if (array_ == null)
-              {
-                Array = new global::Mysqlx.Datatypes.Array();
-              }
-              input.ReadMessage(Array);
-              break;
+            input.ReadMessage(Obj);
+            break;
+          }
+          case 34: {
+            if (array_ == null) {
+              Array = new global::Mysqlx.Datatypes.Array();
             }
+            input.ReadMessage(Array);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Any message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum Type
-      {
+    public static partial class Types {
+      public enum Type {
         [pbr::OriginalName("SCALAR")] Scalar = 1,
         [pbr::OriginalName("OBJECT")] Object = 2,
         [pbr::OriginalName("ARRAY")] Array = 3,
@@ -2567,4 +2242,3 @@ public enum Type
 }
 
 #endregion Designer generated code
-
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpect.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpect.cs
index 0c92b140e..e548bf39f 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpect.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpect.cs
@@ -37,23 +37,19 @@
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Mysqlx.Expect
-{
+namespace Mysqlx.Expect {
 
   /// <summary>Holder for reflection information generated from mysqlx_expect.proto</summary>
-  public static partial class MysqlxExpectReflection
-  {
+  public static partial class MysqlxExpectReflection {
 
     #region Descriptor
     /// <summary>File descriptor for mysqlx_expect.proto</summary>
-    public static pbr::FileDescriptor Descriptor
-    {
+    public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static MysqlxExpectReflection()
-    {
+    static MysqlxExpectReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChNteXNxbHhfZXhwZWN0LnByb3RvEg1NeXNxbHguRXhwZWN0GgxteXNxbHgu",
@@ -92,9 +88,9 @@ static MysqlxExpectReflection()
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Open : pb::IMessage<Open>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Open> _parser = new pb::MessageParser<Open>(() => new Open());
     private pb::UnknownFieldSet _unknownFields;
@@ -105,22 +101,19 @@ public sealed partial class Open : pb::IMessage<Open>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Expect.MysqlxExpectReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Open()
-    {
+    public Open() {
       OnConstruction();
     }
 
@@ -128,8 +121,7 @@ public Open()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Open(Open other) : this()
-    {
+    public Open(Open other) : this() {
       _hasBits0 = other._hasBits0;
       op_ = other.op_;
       cond_ = other.cond_.Clone();
@@ -138,8 +130,7 @@ public Open(Open other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Open Clone()
-    {
+    public Open Clone() {
       return new Open(this);
     }
 
@@ -150,11 +141,9 @@ public Open Clone()
     private global::Mysqlx.Expect.Open.Types.CtxOperation op_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expect.Open.Types.CtxOperation Op
-    {
+    public global::Mysqlx.Expect.Open.Types.CtxOperation Op {
       get { if ((_hasBits0 & 1) != 0) { return op_; } else { return OpDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         op_ = value;
       }
@@ -162,15 +151,13 @@ public Open Clone()
     /// <summary>Gets whether the "op" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOp
-    {
+    public bool HasOp {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "op" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOp()
-    {
+    public void ClearOp() {
       _hasBits0 &= ~1;
     }
 
@@ -181,44 +168,37 @@ public void ClearOp()
     private readonly pbc::RepeatedField<global::Mysqlx.Expect.Open.Types.Condition> cond_ = new pbc::RepeatedField<global::Mysqlx.Expect.Open.Types.Condition>();
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Expect.Open.Types.Condition> Cond
-    {
+    public pbc::RepeatedField<global::Mysqlx.Expect.Open.Types.Condition> Cond {
       get { return cond_; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Open);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Open other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Open other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Op != other.Op) return false;
-      if (!cond_.Equals(other.cond_)) return false;
+      if(!cond_.Equals(other.cond_)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasOp) hash ^= Op.GetHashCode();
       hash ^= cond_.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -226,18 +206,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasOp) {
         output.WriteRawTag(8);
         output.WriteEnum((int) Op);
@@ -246,39 +224,33 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasOp)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasOp) {
         output.WriteRawTag(8);
-        output.WriteEnum((int)Op);
+        output.WriteEnum((int) Op);
       }
       cond_.WriteTo(ref output, _repeated_cond_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasOp)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Op);
+      if (HasOp) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Op);
       }
       size += cond_.CalculateSize(_repeated_cond_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -286,14 +258,11 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Open other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Open other) {
+      if (other == null) {
         return;
       }
-      if (other.HasOp)
-      {
+      if (other.HasOp) {
         Op = other.Op;
       }
       cond_.Add(other.cond_);
@@ -302,11 +271,10 @@ public void MergeFrom(Open other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -327,50 +295,42 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              Op = (global::Mysqlx.Expect.Open.Types.CtxOperation)input.ReadEnum();
-              break;
-            }
-          case 18:
-            {
-              cond_.AddEntriesFrom(ref input, _repeated_cond_codec);
-              break;
-            }
+          case 8: {
+            Op = (global::Mysqlx.Expect.Open.Types.CtxOperation) input.ReadEnum();
+            break;
+          }
+          case 18: {
+            cond_.AddEntriesFrom(ref input, _repeated_cond_codec);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Open message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum CtxOperation
-      {
+    public static partial class Types {
+      public enum CtxOperation {
         /// <summary>
         ///* copy the operations from the parent Expect-block 
         /// </summary>
@@ -383,9 +343,9 @@ public enum CtxOperation
 
       [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Condition : pb::IMessage<Condition>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
-#endif
+      #endif
       {
         private static readonly pb::MessageParser<Condition> _parser = new pb::MessageParser<Condition>(() => new Condition());
         private pb::UnknownFieldSet _unknownFields;
@@ -396,22 +356,19 @@ public sealed partial class Condition : pb::IMessage<Condition>
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor
-        {
+        public static pbr::MessageDescriptor Descriptor {
           get { return global::Mysqlx.Expect.Open.Descriptor.NestedTypes[0]; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor
-        {
+        pbr::MessageDescriptor pb::IMessage.Descriptor {
           get { return Descriptor; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Condition()
-        {
+        public Condition() {
           OnConstruction();
         }
 
@@ -419,8 +376,7 @@ public Condition()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Condition(Condition other) : this()
-        {
+        public Condition(Condition other) : this() {
           _hasBits0 = other._hasBits0;
           conditionKey_ = other.conditionKey_;
           conditionValue_ = other.conditionValue_;
@@ -430,8 +386,7 @@ public Condition(Condition other) : this()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Condition Clone()
-        {
+        public Condition Clone() {
           return new Condition(this);
         }
 
@@ -442,11 +397,9 @@ public Condition Clone()
         private uint conditionKey_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public uint ConditionKey
-        {
+        public uint ConditionKey {
           get { if ((_hasBits0 & 1) != 0) { return conditionKey_; } else { return ConditionKeyDefaultValue; } }
-          set
-          {
+          set {
             _hasBits0 |= 1;
             conditionKey_ = value;
           }
@@ -454,15 +407,13 @@ public uint ConditionKey
         /// <summary>Gets whether the "condition_key" field is set</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasConditionKey
-        {
+        public bool HasConditionKey {
           get { return (_hasBits0 & 1) != 0; }
         }
         /// <summary>Clears the value of the "condition_key" field</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearConditionKey()
-        {
+        public void ClearConditionKey() {
           _hasBits0 &= ~1;
         }
 
@@ -473,26 +424,22 @@ public void ClearConditionKey()
         private pb::ByteString conditionValue_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pb::ByteString ConditionValue
-        {
+        public pb::ByteString ConditionValue {
           get { return conditionValue_ ?? ConditionValueDefaultValue; }
-          set
-          {
+          set {
             conditionValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
           }
         }
         /// <summary>Gets whether the "condition_value" field is set</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasConditionValue
-        {
+        public bool HasConditionValue {
           get { return conditionValue_ != null; }
         }
         /// <summary>Clears the value of the "condition_value" field</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearConditionValue()
-        {
+        public void ClearConditionValue() {
           conditionValue_ = null;
         }
 
@@ -503,11 +450,9 @@ public void ClearConditionValue()
         private global::Mysqlx.Expect.Open.Types.Condition.Types.ConditionOperation op_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Mysqlx.Expect.Open.Types.Condition.Types.ConditionOperation Op
-        {
+        public global::Mysqlx.Expect.Open.Types.Condition.Types.ConditionOperation Op {
           get { if ((_hasBits0 & 2) != 0) { return op_; } else { return OpDefaultValue; } }
-          set
-          {
+          set {
             _hasBits0 |= 2;
             op_ = value;
           }
@@ -515,35 +460,29 @@ public void ClearConditionValue()
         /// <summary>Gets whether the "op" field is set</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasOp
-        {
+        public bool HasOp {
           get { return (_hasBits0 & 2) != 0; }
         }
         /// <summary>Clears the value of the "op" field</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearOp()
-        {
+        public void ClearOp() {
           _hasBits0 &= ~2;
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other)
-        {
+        public override bool Equals(object other) {
           return Equals(other as Condition);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(Condition other)
-        {
-          if (ReferenceEquals(other, null))
-          {
+        public bool Equals(Condition other) {
+          if (ReferenceEquals(other, null)) {
             return false;
           }
-          if (ReferenceEquals(other, this))
-          {
+          if (ReferenceEquals(other, this)) {
             return true;
           }
           if (ConditionKey != other.ConditionKey) return false;
@@ -554,14 +493,12 @@ public bool Equals(Condition other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode()
-        {
+        public override int GetHashCode() {
           int hash = 1;
           if (HasConditionKey) hash ^= ConditionKey.GetHashCode();
           if (HasConditionValue) hash ^= ConditionValue.GetHashCode();
           if (HasOp) hash ^= Op.GetHashCode();
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             hash ^= _unknownFields.GetHashCode();
           }
           return hash;
@@ -569,18 +506,16 @@ public override int GetHashCode()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString()
-        {
+        public override string ToString() {
           return pb::JsonFormatter.ToDiagnosticString(this);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void WriteTo(pb::CodedOutputStream output) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           output.WriteRawMessage(this);
-#else
+        #else
           if (HasConditionKey) {
             output.WriteRawTag(8);
             output.WriteUInt32(ConditionKey);
@@ -596,55 +531,45 @@ public void WriteTo(pb::CodedOutputStream output)
           if (_unknownFields != null) {
             _unknownFields.WriteTo(output);
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-        {
-          if (HasConditionKey)
-          {
+        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+          if (HasConditionKey) {
             output.WriteRawTag(8);
             output.WriteUInt32(ConditionKey);
           }
-          if (HasConditionValue)
-          {
+          if (HasConditionValue) {
             output.WriteRawTag(18);
             output.WriteBytes(ConditionValue);
           }
-          if (HasOp)
-          {
+          if (HasOp) {
             output.WriteRawTag(24);
-            output.WriteEnum((int)Op);
+            output.WriteEnum((int) Op);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             _unknownFields.WriteTo(ref output);
           }
         }
-#endif
+        #endif
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize()
-        {
+        public int CalculateSize() {
           int size = 0;
-          if (HasConditionKey)
-          {
+          if (HasConditionKey) {
             size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ConditionKey);
           }
-          if (HasConditionValue)
-          {
+          if (HasConditionValue) {
             size += 1 + pb::CodedOutputStream.ComputeBytesSize(ConditionValue);
           }
-          if (HasOp)
-          {
-            size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Op);
+          if (HasOp) {
+            size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Op);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             size += _unknownFields.CalculateSize();
           }
           return size;
@@ -652,22 +577,17 @@ public int CalculateSize()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(Condition other)
-        {
-          if (other == null)
-          {
+        public void MergeFrom(Condition other) {
+          if (other == null) {
             return;
           }
-          if (other.HasConditionKey)
-          {
+          if (other.HasConditionKey) {
             ConditionKey = other.ConditionKey;
           }
-          if (other.HasConditionValue)
-          {
+          if (other.HasConditionValue) {
             ConditionValue = other.ConditionValue;
           }
-          if (other.HasOp)
-          {
+          if (other.HasOp) {
             Op = other.Op;
           }
           _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -675,11 +595,10 @@ public void MergeFrom(Condition other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void MergeFrom(pb::CodedInputStream input) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           input.ReadRawMessage(this);
-#else
+        #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
           if ((tag & 7) == 4) {
@@ -704,55 +623,46 @@ public void MergeFrom(pb::CodedInputStream input)
               }
             }
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-        {
+        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
           uint tag;
-          while ((tag = input.ReadTag()) != 0)
-          {
-            if ((tag & 7) == 4)
-            {
-              // Abort on any end group tag.
-              return;
-            }
-            switch (tag)
-            {
+          while ((tag = input.ReadTag()) != 0) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
                 break;
-              case 8:
-                {
-                  ConditionKey = input.ReadUInt32();
-                  break;
-                }
-              case 18:
-                {
-                  ConditionValue = input.ReadBytes();
-                  break;
-                }
-              case 24:
-                {
-                  Op = (global::Mysqlx.Expect.Open.Types.Condition.Types.ConditionOperation)input.ReadEnum();
-                  break;
-                }
+              case 8: {
+                ConditionKey = input.ReadUInt32();
+                break;
+              }
+              case 18: {
+                ConditionValue = input.ReadBytes();
+                break;
+              }
+              case 24: {
+                Op = (global::Mysqlx.Expect.Open.Types.Condition.Types.ConditionOperation) input.ReadEnum();
+                break;
+              }
             }
           }
         }
-#endif
+        #endif
 
         #region Nested types
         /// <summary>Container for nested types declared in the Condition message type.</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static partial class Types
-        {
-          public enum Key
-          {
+        public static partial class Types {
+          public enum Key {
             /// <summary>
             ///* Change error propagation behaviour 
             /// </summary>
@@ -767,8 +677,7 @@ public enum Key
             [pbr::OriginalName("EXPECT_DOCID_GENERATED")] ExpectDocidGenerated = 3,
           }
 
-          public enum ConditionOperation
-          {
+          public enum ConditionOperation {
             /// <summary>
             ///* set the condition; set, if not set; overwrite, if set 
             /// </summary>
@@ -800,9 +709,9 @@ public enum ConditionOperation
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Close : pb::IMessage<Close>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Close> _parser = new pb::MessageParser<Close>(() => new Close());
     private pb::UnknownFieldSet _unknownFields;
@@ -812,22 +721,19 @@ public sealed partial class Close : pb::IMessage<Close>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Expect.MysqlxExpectReflection.Descriptor.MessageTypes[1]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Close()
-    {
+    public Close() {
       OnConstruction();
     }
 
@@ -835,35 +741,29 @@ public Close()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Close(Close other) : this()
-    {
+    public Close(Close other) : this() {
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Close Clone()
-    {
+    public Close Clone() {
       return new Close(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Close);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Close other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Close other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       return Equals(_unknownFields, other._unknownFields);
@@ -871,11 +771,9 @@ public bool Equals(Close other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -883,43 +781,37 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (_unknownFields != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -927,10 +819,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Close other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Close other) {
+      if (other == null) {
         return;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -938,11 +828,10 @@ public void MergeFrom(Close other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -955,31 +844,27 @@ public void MergeFrom(pb::CodedInputStream input)
             break;
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -988,4 +873,3 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
-
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpr.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpr.cs
index dcb51f823..4846c1bfc 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpr.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxExpr.cs
@@ -37,23 +37,19 @@
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Mysqlx.Expr
-{
+namespace Mysqlx.Expr {
 
   /// <summary>Holder for reflection information generated from mysqlx_expr.proto</summary>
-  public static partial class MysqlxExprReflection
-  {
+  public static partial class MysqlxExprReflection {
 
     #region Descriptor
     /// <summary>File descriptor for mysqlx_expr.proto</summary>
-    public static pbr::FileDescriptor Descriptor
-    {
+    public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static MysqlxExprReflection()
-    {
+    static MysqlxExprReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChFteXNxbHhfZXhwci5wcm90bxILTXlzcWx4LkV4cHIaFm15c3FseF9kYXRh",
@@ -125,9 +121,9 @@ static MysqlxExprReflection()
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Expr : pb::IMessage<Expr>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Expr> _parser = new pb::MessageParser<Expr>(() => new Expr());
     private pb::UnknownFieldSet _unknownFields;
@@ -138,22 +134,19 @@ public sealed partial class Expr : pb::IMessage<Expr>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Expr.MysqlxExprReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Expr()
-    {
+    public Expr() {
       OnConstruction();
     }
 
@@ -161,8 +154,7 @@ public Expr()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Expr(Expr other) : this()
-    {
+    public Expr(Expr other) : this() {
       _hasBits0 = other._hasBits0;
       type_ = other.type_;
       identifier_ = other.identifier_ != null ? other.identifier_.Clone() : null;
@@ -178,8 +170,7 @@ public Expr(Expr other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Expr Clone()
-    {
+    public Expr Clone() {
       return new Expr(this);
     }
 
@@ -190,11 +181,9 @@ public Expr Clone()
     private global::Mysqlx.Expr.Expr.Types.Type type_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Expr.Types.Type Type
-    {
+    public global::Mysqlx.Expr.Expr.Types.Type Type {
       get { if ((_hasBits0 & 1) != 0) { return type_; } else { return TypeDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         type_ = value;
       }
@@ -202,15 +191,13 @@ public Expr Clone()
     /// <summary>Gets whether the "type" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasType
-    {
+    public bool HasType {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "type" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearType()
-    {
+    public void ClearType() {
       _hasBits0 &= ~1;
     }
 
@@ -219,11 +206,9 @@ public void ClearType()
     private global::Mysqlx.Expr.ColumnIdentifier identifier_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.ColumnIdentifier Identifier
-    {
+    public global::Mysqlx.Expr.ColumnIdentifier Identifier {
       get { return identifier_; }
-      set
-      {
+      set {
         identifier_ = value;
       }
     }
@@ -235,26 +220,22 @@ public void ClearType()
     private string variable_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Variable
-    {
+    public string Variable {
       get { return variable_ ?? VariableDefaultValue; }
-      set
-      {
+      set {
         variable_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "variable" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasVariable
-    {
+    public bool HasVariable {
       get { return variable_ != null; }
     }
     /// <summary>Clears the value of the "variable" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearVariable()
-    {
+    public void ClearVariable() {
       variable_ = null;
     }
 
@@ -263,11 +244,9 @@ public void ClearVariable()
     private global::Mysqlx.Datatypes.Scalar literal_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Datatypes.Scalar Literal
-    {
+    public global::Mysqlx.Datatypes.Scalar Literal {
       get { return literal_; }
-      set
-      {
+      set {
         literal_ = value;
       }
     }
@@ -277,11 +256,9 @@ public void ClearVariable()
     private global::Mysqlx.Expr.FunctionCall functionCall_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.FunctionCall FunctionCall
-    {
+    public global::Mysqlx.Expr.FunctionCall FunctionCall {
       get { return functionCall_; }
-      set
-      {
+      set {
         functionCall_ = value;
       }
     }
@@ -291,11 +268,9 @@ public void ClearVariable()
     private global::Mysqlx.Expr.Operator operator_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Operator Operator
-    {
+    public global::Mysqlx.Expr.Operator Operator {
       get { return operator_; }
-      set
-      {
+      set {
         operator_ = value;
       }
     }
@@ -307,11 +282,9 @@ public void ClearVariable()
     private uint position_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint Position
-    {
+    public uint Position {
       get { if ((_hasBits0 & 2) != 0) { return position_; } else { return PositionDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         position_ = value;
       }
@@ -319,15 +292,13 @@ public uint Position
     /// <summary>Gets whether the "position" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasPosition
-    {
+    public bool HasPosition {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "position" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearPosition()
-    {
+    public void ClearPosition() {
       _hasBits0 &= ~2;
     }
 
@@ -336,11 +307,9 @@ public void ClearPosition()
     private global::Mysqlx.Expr.Object object_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Object Object
-    {
+    public global::Mysqlx.Expr.Object Object {
       get { return object_; }
-      set
-      {
+      set {
         object_ = value;
       }
     }
@@ -350,32 +319,26 @@ public void ClearPosition()
     private global::Mysqlx.Expr.Array array_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Array Array
-    {
+    public global::Mysqlx.Expr.Array Array {
       get { return array_; }
-      set
-      {
+      set {
         array_ = value;
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Expr);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Expr other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Expr other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Type != other.Type) return false;
@@ -392,8 +355,7 @@ public bool Equals(Expr other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasType) hash ^= Type.GetHashCode();
       if (identifier_ != null) hash ^= Identifier.GetHashCode();
@@ -404,8 +366,7 @@ public override int GetHashCode()
       if (HasPosition) hash ^= Position.GetHashCode();
       if (object_ != null) hash ^= Object.GetHashCode();
       if (array_ != null) hash ^= Array.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -413,18 +374,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasType) {
         output.WriteRawTag(8);
         output.WriteEnum((int) Type);
@@ -464,109 +423,87 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasType)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasType) {
         output.WriteRawTag(8);
-        output.WriteEnum((int)Type);
+        output.WriteEnum((int) Type);
       }
-      if (identifier_ != null)
-      {
+      if (identifier_ != null) {
         output.WriteRawTag(18);
         output.WriteMessage(Identifier);
       }
-      if (HasVariable)
-      {
+      if (HasVariable) {
         output.WriteRawTag(26);
         output.WriteString(Variable);
       }
-      if (literal_ != null)
-      {
+      if (literal_ != null) {
         output.WriteRawTag(34);
         output.WriteMessage(Literal);
       }
-      if (functionCall_ != null)
-      {
+      if (functionCall_ != null) {
         output.WriteRawTag(42);
         output.WriteMessage(FunctionCall);
       }
-      if (operator_ != null)
-      {
+      if (operator_ != null) {
         output.WriteRawTag(50);
         output.WriteMessage(Operator);
       }
-      if (HasPosition)
-      {
+      if (HasPosition) {
         output.WriteRawTag(56);
         output.WriteUInt32(Position);
       }
-      if (object_ != null)
-      {
+      if (object_ != null) {
         output.WriteRawTag(66);
         output.WriteMessage(Object);
       }
-      if (array_ != null)
-      {
+      if (array_ != null) {
         output.WriteRawTag(74);
         output.WriteMessage(Array);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasType)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Type);
+      if (HasType) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
       }
-      if (identifier_ != null)
-      {
+      if (identifier_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Identifier);
       }
-      if (HasVariable)
-      {
+      if (HasVariable) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Variable);
       }
-      if (literal_ != null)
-      {
+      if (literal_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Literal);
       }
-      if (functionCall_ != null)
-      {
+      if (functionCall_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(FunctionCall);
       }
-      if (operator_ != null)
-      {
+      if (operator_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Operator);
       }
-      if (HasPosition)
-      {
+      if (HasPosition) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Position);
       }
-      if (object_ != null)
-      {
+      if (object_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Object);
       }
-      if (array_ != null)
-      {
+      if (array_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Array);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -574,68 +511,51 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Expr other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Expr other) {
+      if (other == null) {
         return;
       }
-      if (other.HasType)
-      {
+      if (other.HasType) {
         Type = other.Type;
       }
-      if (other.identifier_ != null)
-      {
-        if (identifier_ == null)
-        {
+      if (other.identifier_ != null) {
+        if (identifier_ == null) {
           Identifier = new global::Mysqlx.Expr.ColumnIdentifier();
         }
         Identifier.MergeFrom(other.Identifier);
       }
-      if (other.HasVariable)
-      {
+      if (other.HasVariable) {
         Variable = other.Variable;
       }
-      if (other.literal_ != null)
-      {
-        if (literal_ == null)
-        {
+      if (other.literal_ != null) {
+        if (literal_ == null) {
           Literal = new global::Mysqlx.Datatypes.Scalar();
         }
         Literal.MergeFrom(other.Literal);
       }
-      if (other.functionCall_ != null)
-      {
-        if (functionCall_ == null)
-        {
+      if (other.functionCall_ != null) {
+        if (functionCall_ == null) {
           FunctionCall = new global::Mysqlx.Expr.FunctionCall();
         }
         FunctionCall.MergeFrom(other.FunctionCall);
       }
-      if (other.operator_ != null)
-      {
-        if (operator_ == null)
-        {
+      if (other.operator_ != null) {
+        if (operator_ == null) {
           Operator = new global::Mysqlx.Expr.Operator();
         }
         Operator.MergeFrom(other.Operator);
       }
-      if (other.HasPosition)
-      {
+      if (other.HasPosition) {
         Position = other.Position;
       }
-      if (other.object_ != null)
-      {
-        if (object_ == null)
-        {
+      if (other.object_ != null) {
+        if (object_ == null) {
           Object = new global::Mysqlx.Expr.Object();
         }
         Object.MergeFrom(other.Object);
       }
-      if (other.array_ != null)
-      {
-        if (array_ == null)
-        {
+      if (other.array_ != null) {
+        if (array_ == null) {
           Array = new global::Mysqlx.Expr.Array();
         }
         Array.MergeFrom(other.Array);
@@ -645,11 +565,10 @@ public void MergeFrom(Expr other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -716,109 +635,88 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              Type = (global::Mysqlx.Expr.Expr.Types.Type)input.ReadEnum();
-              break;
-            }
-          case 18:
-            {
-              if (identifier_ == null)
-              {
-                Identifier = new global::Mysqlx.Expr.ColumnIdentifier();
-              }
-              input.ReadMessage(Identifier);
-              break;
-            }
-          case 26:
-            {
-              Variable = input.ReadString();
-              break;
-            }
-          case 34:
-            {
-              if (literal_ == null)
-              {
-                Literal = new global::Mysqlx.Datatypes.Scalar();
-              }
-              input.ReadMessage(Literal);
-              break;
+          case 8: {
+            Type = (global::Mysqlx.Expr.Expr.Types.Type) input.ReadEnum();
+            break;
+          }
+          case 18: {
+            if (identifier_ == null) {
+              Identifier = new global::Mysqlx.Expr.ColumnIdentifier();
             }
-          case 42:
-            {
-              if (functionCall_ == null)
-              {
-                FunctionCall = new global::Mysqlx.Expr.FunctionCall();
-              }
-              input.ReadMessage(FunctionCall);
-              break;
+            input.ReadMessage(Identifier);
+            break;
+          }
+          case 26: {
+            Variable = input.ReadString();
+            break;
+          }
+          case 34: {
+            if (literal_ == null) {
+              Literal = new global::Mysqlx.Datatypes.Scalar();
             }
-          case 50:
-            {
-              if (operator_ == null)
-              {
-                Operator = new global::Mysqlx.Expr.Operator();
-              }
-              input.ReadMessage(Operator);
-              break;
+            input.ReadMessage(Literal);
+            break;
+          }
+          case 42: {
+            if (functionCall_ == null) {
+              FunctionCall = new global::Mysqlx.Expr.FunctionCall();
             }
-          case 56:
-            {
-              Position = input.ReadUInt32();
-              break;
+            input.ReadMessage(FunctionCall);
+            break;
+          }
+          case 50: {
+            if (operator_ == null) {
+              Operator = new global::Mysqlx.Expr.Operator();
             }
-          case 66:
-            {
-              if (object_ == null)
-              {
-                Object = new global::Mysqlx.Expr.Object();
-              }
-              input.ReadMessage(Object);
-              break;
+            input.ReadMessage(Operator);
+            break;
+          }
+          case 56: {
+            Position = input.ReadUInt32();
+            break;
+          }
+          case 66: {
+            if (object_ == null) {
+              Object = new global::Mysqlx.Expr.Object();
             }
-          case 74:
-            {
-              if (array_ == null)
-              {
-                Array = new global::Mysqlx.Expr.Array();
-              }
-              input.ReadMessage(Array);
-              break;
+            input.ReadMessage(Object);
+            break;
+          }
+          case 74: {
+            if (array_ == null) {
+              Array = new global::Mysqlx.Expr.Array();
             }
+            input.ReadMessage(Array);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Expr message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum Type
-      {
+    public static partial class Types {
+      public enum Type {
         [pbr::OriginalName("IDENT")] Ident = 1,
         [pbr::OriginalName("LITERAL")] Literal = 2,
         [pbr::OriginalName("VARIABLE")] Variable = 3,
@@ -846,9 +744,9 @@ public enum Type
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Identifier : pb::IMessage<Identifier>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Identifier> _parser = new pb::MessageParser<Identifier>(() => new Identifier());
     private pb::UnknownFieldSet _unknownFields;
@@ -858,22 +756,19 @@ public sealed partial class Identifier : pb::IMessage<Identifier>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Expr.MysqlxExprReflection.Descriptor.MessageTypes[1]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Identifier()
-    {
+    public Identifier() {
       OnConstruction();
     }
 
@@ -881,8 +776,7 @@ public Identifier()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Identifier(Identifier other) : this()
-    {
+    public Identifier(Identifier other) : this() {
       name_ = other.name_;
       schemaName_ = other.schemaName_;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -890,8 +784,7 @@ public Identifier(Identifier other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Identifier Clone()
-    {
+    public Identifier Clone() {
       return new Identifier(this);
     }
 
@@ -902,26 +795,22 @@ public Identifier Clone()
     private string name_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name
-    {
+    public string Name {
       get { return name_ ?? NameDefaultValue; }
-      set
-      {
+      set {
         name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "name" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName
-    {
+    public bool HasName {
       get { return name_ != null; }
     }
     /// <summary>Clears the value of the "name" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName()
-    {
+    public void ClearName() {
       name_ = null;
     }
 
@@ -932,46 +821,38 @@ public void ClearName()
     private string schemaName_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string SchemaName
-    {
+    public string SchemaName {
       get { return schemaName_ ?? SchemaNameDefaultValue; }
-      set
-      {
+      set {
         schemaName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "schema_name" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSchemaName
-    {
+    public bool HasSchemaName {
       get { return schemaName_ != null; }
     }
     /// <summary>Clears the value of the "schema_name" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSchemaName()
-    {
+    public void ClearSchemaName() {
       schemaName_ = null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Identifier);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Identifier other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Identifier other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Name != other.Name) return false;
@@ -981,13 +862,11 @@ public bool Equals(Identifier other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasName) hash ^= Name.GetHashCode();
       if (HasSchemaName) hash ^= SchemaName.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -995,18 +874,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasName) {
         output.WriteRawTag(10);
         output.WriteString(Name);
@@ -1018,46 +895,38 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasName)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasName) {
         output.WriteRawTag(10);
         output.WriteString(Name);
       }
-      if (HasSchemaName)
-      {
+      if (HasSchemaName) {
         output.WriteRawTag(18);
         output.WriteString(SchemaName);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasName)
-      {
+      if (HasName) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
       }
-      if (HasSchemaName)
-      {
+      if (HasSchemaName) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(SchemaName);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1065,18 +934,14 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Identifier other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Identifier other) {
+      if (other == null) {
         return;
       }
-      if (other.HasName)
-      {
+      if (other.HasName) {
         Name = other.Name;
       }
-      if (other.HasSchemaName)
-      {
+      if (other.HasSchemaName) {
         SchemaName = other.SchemaName;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1084,11 +949,10 @@ public void MergeFrom(Identifier other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1109,41 +973,35 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              Name = input.ReadString();
-              break;
-            }
-          case 18:
-            {
-              SchemaName = input.ReadString();
-              break;
-            }
+          case 10: {
+            Name = input.ReadString();
+            break;
+          }
+          case 18: {
+            SchemaName = input.ReadString();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -1161,9 +1019,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class DocumentPathItem : pb::IMessage<DocumentPathItem>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<DocumentPathItem> _parser = new pb::MessageParser<DocumentPathItem>(() => new DocumentPathItem());
     private pb::UnknownFieldSet _unknownFields;
@@ -1174,22 +1032,19 @@ public sealed partial class DocumentPathItem : pb::IMessage<DocumentPathItem>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Expr.MysqlxExprReflection.Descriptor.MessageTypes[2]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DocumentPathItem()
-    {
+    public DocumentPathItem() {
       OnConstruction();
     }
 
@@ -1197,8 +1052,7 @@ public DocumentPathItem()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DocumentPathItem(DocumentPathItem other) : this()
-    {
+    public DocumentPathItem(DocumentPathItem other) : this() {
       _hasBits0 = other._hasBits0;
       type_ = other.type_;
       value_ = other.value_;
@@ -1208,8 +1062,7 @@ public DocumentPathItem(DocumentPathItem other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DocumentPathItem Clone()
-    {
+    public DocumentPathItem Clone() {
       return new DocumentPathItem(this);
     }
 
@@ -1220,11 +1073,9 @@ public DocumentPathItem Clone()
     private global::Mysqlx.Expr.DocumentPathItem.Types.Type type_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.DocumentPathItem.Types.Type Type
-    {
+    public global::Mysqlx.Expr.DocumentPathItem.Types.Type Type {
       get { if ((_hasBits0 & 1) != 0) { return type_; } else { return TypeDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         type_ = value;
       }
@@ -1232,15 +1083,13 @@ public DocumentPathItem Clone()
     /// <summary>Gets whether the "type" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasType
-    {
+    public bool HasType {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "type" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearType()
-    {
+    public void ClearType() {
       _hasBits0 &= ~1;
     }
 
@@ -1251,26 +1100,22 @@ public void ClearType()
     private string value_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Value
-    {
+    public string Value {
       get { return value_ ?? ValueDefaultValue; }
-      set
-      {
+      set {
         value_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "value" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasValue
-    {
+    public bool HasValue {
       get { return value_ != null; }
     }
     /// <summary>Clears the value of the "value" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearValue()
-    {
+    public void ClearValue() {
       value_ = null;
     }
 
@@ -1284,11 +1129,9 @@ public void ClearValue()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint Index
-    {
+    public uint Index {
       get { if ((_hasBits0 & 2) != 0) { return index_; } else { return IndexDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         index_ = value;
       }
@@ -1296,35 +1139,29 @@ public uint Index
     /// <summary>Gets whether the "index" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasIndex
-    {
+    public bool HasIndex {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "index" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearIndex()
-    {
+    public void ClearIndex() {
       _hasBits0 &= ~2;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as DocumentPathItem);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(DocumentPathItem other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(DocumentPathItem other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Type != other.Type) return false;
@@ -1335,14 +1172,12 @@ public bool Equals(DocumentPathItem other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasType) hash ^= Type.GetHashCode();
       if (HasValue) hash ^= Value.GetHashCode();
       if (HasIndex) hash ^= Index.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1350,18 +1185,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasType) {
         output.WriteRawTag(8);
         output.WriteEnum((int) Type);
@@ -1377,55 +1210,45 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasType)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasType) {
         output.WriteRawTag(8);
-        output.WriteEnum((int)Type);
+        output.WriteEnum((int) Type);
       }
-      if (HasValue)
-      {
+      if (HasValue) {
         output.WriteRawTag(18);
         output.WriteString(Value);
       }
-      if (HasIndex)
-      {
+      if (HasIndex) {
         output.WriteRawTag(24);
         output.WriteUInt32(Index);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasType)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Type);
+      if (HasType) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
       }
-      if (HasValue)
-      {
+      if (HasValue) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Value);
       }
-      if (HasIndex)
-      {
+      if (HasIndex) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Index);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1433,22 +1256,17 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(DocumentPathItem other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(DocumentPathItem other) {
+      if (other == null) {
         return;
       }
-      if (other.HasType)
-      {
+      if (other.HasType) {
         Type = other.Type;
       }
-      if (other.HasValue)
-      {
+      if (other.HasValue) {
         Value = other.Value;
       }
-      if (other.HasIndex)
-      {
+      if (other.HasIndex) {
         Index = other.Index;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1456,11 +1274,10 @@ public void MergeFrom(DocumentPathItem other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1485,55 +1302,46 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              Type = (global::Mysqlx.Expr.DocumentPathItem.Types.Type)input.ReadEnum();
-              break;
-            }
-          case 18:
-            {
-              Value = input.ReadString();
-              break;
-            }
-          case 24:
-            {
-              Index = input.ReadUInt32();
-              break;
-            }
+          case 8: {
+            Type = (global::Mysqlx.Expr.DocumentPathItem.Types.Type) input.ReadEnum();
+            break;
+          }
+          case 18: {
+            Value = input.ReadString();
+            break;
+          }
+          case 24: {
+            Index = input.ReadUInt32();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the DocumentPathItem message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum Type
-      {
+    public static partial class Types {
+      public enum Type {
         /// <summary>
         ///*  .member 
         /// </summary>
@@ -1585,9 +1393,9 @@ public enum Type
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ColumnIdentifier : pb::IMessage<ColumnIdentifier>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<ColumnIdentifier> _parser = new pb::MessageParser<ColumnIdentifier>(() => new ColumnIdentifier());
     private pb::UnknownFieldSet _unknownFields;
@@ -1597,22 +1405,19 @@ public sealed partial class ColumnIdentifier : pb::IMessage<ColumnIdentifier>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Expr.MysqlxExprReflection.Descriptor.MessageTypes[3]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ColumnIdentifier()
-    {
+    public ColumnIdentifier() {
       OnConstruction();
     }
 
@@ -1620,8 +1425,7 @@ public ColumnIdentifier()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ColumnIdentifier(ColumnIdentifier other) : this()
-    {
+    public ColumnIdentifier(ColumnIdentifier other) : this() {
       documentPath_ = other.documentPath_.Clone();
       name_ = other.name_;
       tableName_ = other.tableName_;
@@ -1631,8 +1435,7 @@ public ColumnIdentifier(ColumnIdentifier other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ColumnIdentifier Clone()
-    {
+    public ColumnIdentifier Clone() {
       return new ColumnIdentifier(this);
     }
 
@@ -1646,8 +1449,7 @@ public ColumnIdentifier Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Expr.DocumentPathItem> DocumentPath
-    {
+    public pbc::RepeatedField<global::Mysqlx.Expr.DocumentPathItem> DocumentPath {
       get { return documentPath_; }
     }
 
@@ -1661,26 +1463,22 @@ public ColumnIdentifier Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name
-    {
+    public string Name {
       get { return name_ ?? NameDefaultValue; }
-      set
-      {
+      set {
         name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "name" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName
-    {
+    public bool HasName {
       get { return name_ != null; }
     }
     /// <summary>Clears the value of the "name" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName()
-    {
+    public void ClearName() {
       name_ = null;
     }
 
@@ -1694,26 +1492,22 @@ public void ClearName()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string TableName
-    {
+    public string TableName {
       get { return tableName_ ?? TableNameDefaultValue; }
-      set
-      {
+      set {
         tableName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "table_name" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasTableName
-    {
+    public bool HasTableName {
       get { return tableName_ != null; }
     }
     /// <summary>Clears the value of the "table_name" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearTableName()
-    {
+    public void ClearTableName() {
       tableName_ = null;
     }
 
@@ -1727,49 +1521,41 @@ public void ClearTableName()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string SchemaName
-    {
+    public string SchemaName {
       get { return schemaName_ ?? SchemaNameDefaultValue; }
-      set
-      {
+      set {
         schemaName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "schema_name" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSchemaName
-    {
+    public bool HasSchemaName {
       get { return schemaName_ != null; }
     }
     /// <summary>Clears the value of the "schema_name" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSchemaName()
-    {
+    public void ClearSchemaName() {
       schemaName_ = null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as ColumnIdentifier);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ColumnIdentifier other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(ColumnIdentifier other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (!documentPath_.Equals(other.documentPath_)) return false;
+      if(!documentPath_.Equals(other.documentPath_)) return false;
       if (Name != other.Name) return false;
       if (TableName != other.TableName) return false;
       if (SchemaName != other.SchemaName) return false;
@@ -1778,15 +1564,13 @@ public bool Equals(ColumnIdentifier other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       hash ^= documentPath_.GetHashCode();
       if (HasName) hash ^= Name.GetHashCode();
       if (HasTableName) hash ^= TableName.GetHashCode();
       if (HasSchemaName) hash ^= SchemaName.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1794,18 +1578,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       documentPath_.WriteTo(output, _repeated_documentPath_codec);
       if (HasName) {
         output.WriteRawTag(18);
@@ -1822,57 +1604,47 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
       documentPath_.WriteTo(ref output, _repeated_documentPath_codec);
-      if (HasName)
-      {
+      if (HasName) {
         output.WriteRawTag(18);
         output.WriteString(Name);
       }
-      if (HasTableName)
-      {
+      if (HasTableName) {
         output.WriteRawTag(26);
         output.WriteString(TableName);
       }
-      if (HasSchemaName)
-      {
+      if (HasSchemaName) {
         output.WriteRawTag(34);
         output.WriteString(SchemaName);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
       size += documentPath_.CalculateSize(_repeated_documentPath_codec);
-      if (HasName)
-      {
+      if (HasName) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
       }
-      if (HasTableName)
-      {
+      if (HasTableName) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(TableName);
       }
-      if (HasSchemaName)
-      {
+      if (HasSchemaName) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(SchemaName);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1880,23 +1652,18 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ColumnIdentifier other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(ColumnIdentifier other) {
+      if (other == null) {
         return;
       }
       documentPath_.Add(other.documentPath_);
-      if (other.HasName)
-      {
+      if (other.HasName) {
         Name = other.Name;
       }
-      if (other.HasTableName)
-      {
+      if (other.HasTableName) {
         TableName = other.TableName;
       }
-      if (other.HasSchemaName)
-      {
+      if (other.HasSchemaName) {
         SchemaName = other.SchemaName;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1904,11 +1671,10 @@ public void MergeFrom(ColumnIdentifier other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1937,51 +1703,43 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              documentPath_.AddEntriesFrom(ref input, _repeated_documentPath_codec);
-              break;
-            }
-          case 18:
-            {
-              Name = input.ReadString();
-              break;
-            }
-          case 26:
-            {
-              TableName = input.ReadString();
-              break;
-            }
-          case 34:
-            {
-              SchemaName = input.ReadString();
-              break;
-            }
+          case 10: {
+            documentPath_.AddEntriesFrom(ref input, _repeated_documentPath_codec);
+            break;
+          }
+          case 18: {
+            Name = input.ReadString();
+            break;
+          }
+          case 26: {
+            TableName = input.ReadString();
+            break;
+          }
+          case 34: {
+            SchemaName = input.ReadString();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -1996,9 +1754,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class FunctionCall : pb::IMessage<FunctionCall>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<FunctionCall> _parser = new pb::MessageParser<FunctionCall>(() => new FunctionCall());
     private pb::UnknownFieldSet _unknownFields;
@@ -2008,22 +1766,19 @@ public sealed partial class FunctionCall : pb::IMessage<FunctionCall>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Expr.MysqlxExprReflection.Descriptor.MessageTypes[4]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FunctionCall()
-    {
+    public FunctionCall() {
       OnConstruction();
     }
 
@@ -2031,8 +1786,7 @@ public FunctionCall()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FunctionCall(FunctionCall other) : this()
-    {
+    public FunctionCall(FunctionCall other) : this() {
       name_ = other.name_ != null ? other.name_.Clone() : null;
       param_ = other.param_.Clone();
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -2040,8 +1794,7 @@ public FunctionCall(FunctionCall other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FunctionCall Clone()
-    {
+    public FunctionCall Clone() {
       return new FunctionCall(this);
     }
 
@@ -2053,11 +1806,9 @@ public FunctionCall Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Expr.Identifier Name
-    {
+    public global::Mysqlx.Expr.Identifier Name {
       get { return name_; }
-      set
-      {
+      set {
         name_ = value;
       }
     }
@@ -2072,44 +1823,37 @@ public FunctionCall Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Expr.Expr> Param
-    {
+    public pbc::RepeatedField<global::Mysqlx.Expr.Expr> Param {
       get { return param_; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as FunctionCall);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FunctionCall other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(FunctionCall other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (!object.Equals(Name, other.Name)) return false;
-      if (!param_.Equals(other.param_)) return false;
+      if(!param_.Equals(other.param_)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (name_ != null) hash ^= Name.GetHashCode();
       hash ^= param_.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -2117,18 +1861,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (name_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Name);
@@ -2137,39 +1879,33 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (name_ != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (name_ != null) {
         output.WriteRawTag(10);
         output.WriteMessage(Name);
       }
       param_.WriteTo(ref output, _repeated_param_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (name_ != null)
-      {
+      if (name_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Name);
       }
       size += param_.CalculateSize(_repeated_param_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -2177,16 +1913,12 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FunctionCall other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(FunctionCall other) {
+      if (other == null) {
         return;
       }
-      if (other.name_ != null)
-      {
-        if (name_ == null)
-        {
+      if (other.name_ != null) {
+        if (name_ == null) {
           Name = new global::Mysqlx.Expr.Identifier();
         }
         Name.MergeFrom(other.Name);
@@ -2197,11 +1929,10 @@ public void MergeFrom(FunctionCall other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -2225,53 +1956,46 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              if (name_ == null)
-              {
-                Name = new global::Mysqlx.Expr.Identifier();
-              }
-              input.ReadMessage(Name);
-              break;
-            }
-          case 18:
-            {
-              param_.AddEntriesFrom(ref input, _repeated_param_codec);
-              break;
+          case 10: {
+            if (name_ == null) {
+              Name = new global::Mysqlx.Expr.Identifier();
             }
+            input.ReadMessage(Name);
+            break;
+          }
+          case 18: {
+            param_.AddEntriesFrom(ref input, _repeated_param_codec);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Operator : pb::IMessage<Operator>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Operator> _parser = new pb::MessageParser<Operator>(() => new Operator());
     private pb::UnknownFieldSet _unknownFields;
@@ -2281,22 +2005,19 @@ public sealed partial class Operator : pb::IMessage<Operator>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Expr.MysqlxExprReflection.Descriptor.MessageTypes[5]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Operator()
-    {
+    public Operator() {
       OnConstruction();
     }
 
@@ -2304,8 +2025,7 @@ public Operator()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Operator(Operator other) : this()
-    {
+    public Operator(Operator other) : this() {
       name_ = other.name_;
       param_ = other.param_.Clone();
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -2313,8 +2033,7 @@ public Operator(Operator other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Operator Clone()
-    {
+    public Operator Clone() {
       return new Operator(this);
     }
 
@@ -2328,26 +2047,22 @@ public Operator Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name
-    {
+    public string Name {
       get { return name_ ?? NameDefaultValue; }
-      set
-      {
+      set {
         name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "name" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName
-    {
+    public bool HasName {
       get { return name_ != null; }
     }
     /// <summary>Clears the value of the "name" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName()
-    {
+    public void ClearName() {
       name_ = null;
     }
 
@@ -2361,44 +2076,37 @@ public void ClearName()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Expr.Expr> Param
-    {
+    public pbc::RepeatedField<global::Mysqlx.Expr.Expr> Param {
       get { return param_; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Operator);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Operator other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Operator other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Name != other.Name) return false;
-      if (!param_.Equals(other.param_)) return false;
+      if(!param_.Equals(other.param_)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasName) hash ^= Name.GetHashCode();
       hash ^= param_.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -2406,18 +2114,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasName) {
         output.WriteRawTag(10);
         output.WriteString(Name);
@@ -2426,39 +2132,33 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasName)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasName) {
         output.WriteRawTag(10);
         output.WriteString(Name);
       }
       param_.WriteTo(ref output, _repeated_param_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasName)
-      {
+      if (HasName) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
       }
       size += param_.CalculateSize(_repeated_param_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -2466,14 +2166,11 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Operator other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Operator other) {
+      if (other == null) {
         return;
       }
-      if (other.HasName)
-      {
+      if (other.HasName) {
         Name = other.Name;
       }
       param_.Add(other.param_);
@@ -2482,11 +2179,10 @@ public void MergeFrom(Operator other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -2507,41 +2203,35 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              Name = input.ReadString();
-              break;
-            }
-          case 18:
-            {
-              param_.AddEntriesFrom(ref input, _repeated_param_codec);
-              break;
-            }
+          case 10: {
+            Name = input.ReadString();
+            break;
+          }
+          case 18: {
+            param_.AddEntriesFrom(ref input, _repeated_param_codec);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -2551,9 +2241,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Object : pb::IMessage<Object>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Object> _parser = new pb::MessageParser<Object>(() => new Object());
     private pb::UnknownFieldSet _unknownFields;
@@ -2563,22 +2253,19 @@ public sealed partial class Object : pb::IMessage<Object>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Expr.MysqlxExprReflection.Descriptor.MessageTypes[6]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Object()
-    {
+    public Object() {
       OnConstruction();
     }
 
@@ -2586,16 +2273,14 @@ public Object()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Object(Object other) : this()
-    {
+    public Object(Object other) : this() {
       fld_ = other.fld_.Clone();
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Object Clone()
-    {
+    public Object Clone() {
       return new Object(this);
     }
 
@@ -2609,42 +2294,35 @@ public Object Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Expr.Object.Types.ObjectField> Fld
-    {
+    public pbc::RepeatedField<global::Mysqlx.Expr.Object.Types.ObjectField> Fld {
       get { return fld_; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Object);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Object other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Object other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (!fld_.Equals(other.fld_)) return false;
+      if(!fld_.Equals(other.fld_)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       hash ^= fld_.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -2652,46 +2330,40 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       fld_.WriteTo(output, _repeated_fld_codec);
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
       fld_.WriteTo(ref output, _repeated_fld_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
       size += fld_.CalculateSize(_repeated_fld_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -2699,10 +2371,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Object other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Object other) {
+      if (other == null) {
         return;
       }
       fld_.Add(other.fld_);
@@ -2711,11 +2381,10 @@ public void MergeFrom(Object other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -2732,48 +2401,42 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              fld_.AddEntriesFrom(ref input, _repeated_fld_codec);
-              break;
-            }
+          case 10: {
+            fld_.AddEntriesFrom(ref input, _repeated_fld_codec);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Object message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
+    public static partial class Types {
       [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class ObjectField : pb::IMessage<ObjectField>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
-#endif
+      #endif
       {
         private static readonly pb::MessageParser<ObjectField> _parser = new pb::MessageParser<ObjectField>(() => new ObjectField());
         private pb::UnknownFieldSet _unknownFields;
@@ -2783,22 +2446,19 @@ public sealed partial class ObjectField : pb::IMessage<ObjectField>
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor
-        {
+        public static pbr::MessageDescriptor Descriptor {
           get { return global::Mysqlx.Expr.Object.Descriptor.NestedTypes[0]; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor
-        {
+        pbr::MessageDescriptor pb::IMessage.Descriptor {
           get { return Descriptor; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ObjectField()
-        {
+        public ObjectField() {
           OnConstruction();
         }
 
@@ -2806,8 +2466,7 @@ public ObjectField()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ObjectField(ObjectField other) : this()
-        {
+        public ObjectField(ObjectField other) : this() {
           key_ = other.key_;
           value_ = other.value_ != null ? other.value_.Clone() : null;
           _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -2815,8 +2474,7 @@ public ObjectField(ObjectField other) : this()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ObjectField Clone()
-        {
+        public ObjectField Clone() {
           return new ObjectField(this);
         }
 
@@ -2830,26 +2488,22 @@ public ObjectField Clone()
         /// </summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string Key
-        {
+        public string Key {
           get { return key_ ?? KeyDefaultValue; }
-          set
-          {
+          set {
             key_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
           }
         }
         /// <summary>Gets whether the "key" field is set</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasKey
-        {
+        public bool HasKey {
           get { return key_ != null; }
         }
         /// <summary>Clears the value of the "key" field</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearKey()
-        {
+        public void ClearKey() {
           key_ = null;
         }
 
@@ -2861,32 +2515,26 @@ public void ClearKey()
         /// </summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Mysqlx.Expr.Expr Value
-        {
+        public global::Mysqlx.Expr.Expr Value {
           get { return value_; }
-          set
-          {
+          set {
             value_ = value;
           }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other)
-        {
+        public override bool Equals(object other) {
           return Equals(other as ObjectField);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(ObjectField other)
-        {
-          if (ReferenceEquals(other, null))
-          {
+        public bool Equals(ObjectField other) {
+          if (ReferenceEquals(other, null)) {
             return false;
           }
-          if (ReferenceEquals(other, this))
-          {
+          if (ReferenceEquals(other, this)) {
             return true;
           }
           if (Key != other.Key) return false;
@@ -2896,13 +2544,11 @@ public bool Equals(ObjectField other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode()
-        {
+        public override int GetHashCode() {
           int hash = 1;
           if (HasKey) hash ^= Key.GetHashCode();
           if (value_ != null) hash ^= Value.GetHashCode();
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             hash ^= _unknownFields.GetHashCode();
           }
           return hash;
@@ -2910,18 +2556,16 @@ public override int GetHashCode()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString()
-        {
+        public override string ToString() {
           return pb::JsonFormatter.ToDiagnosticString(this);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void WriteTo(pb::CodedOutputStream output) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           output.WriteRawMessage(this);
-#else
+        #else
           if (HasKey) {
             output.WriteRawTag(10);
             output.WriteString(Key);
@@ -2933,46 +2577,38 @@ public void WriteTo(pb::CodedOutputStream output)
           if (_unknownFields != null) {
             _unknownFields.WriteTo(output);
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-        {
-          if (HasKey)
-          {
+        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+          if (HasKey) {
             output.WriteRawTag(10);
             output.WriteString(Key);
           }
-          if (value_ != null)
-          {
+          if (value_ != null) {
             output.WriteRawTag(18);
             output.WriteMessage(Value);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             _unknownFields.WriteTo(ref output);
           }
         }
-#endif
+        #endif
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize()
-        {
+        public int CalculateSize() {
           int size = 0;
-          if (HasKey)
-          {
+          if (HasKey) {
             size += 1 + pb::CodedOutputStream.ComputeStringSize(Key);
           }
-          if (value_ != null)
-          {
+          if (value_ != null) {
             size += 1 + pb::CodedOutputStream.ComputeMessageSize(Value);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             size += _unknownFields.CalculateSize();
           }
           return size;
@@ -2980,20 +2616,15 @@ public int CalculateSize()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(ObjectField other)
-        {
-          if (other == null)
-          {
+        public void MergeFrom(ObjectField other) {
+          if (other == null) {
             return;
           }
-          if (other.HasKey)
-          {
+          if (other.HasKey) {
             Key = other.Key;
           }
-          if (other.value_ != null)
-          {
-            if (value_ == null)
-            {
+          if (other.value_ != null) {
+            if (value_ == null) {
               Value = new global::Mysqlx.Expr.Expr();
             }
             Value.MergeFrom(other.Value);
@@ -3003,11 +2634,10 @@ public void MergeFrom(ObjectField other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void MergeFrom(pb::CodedInputStream input) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           input.ReadRawMessage(this);
-#else
+        #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
           if ((tag & 7) == 4) {
@@ -3031,45 +2661,38 @@ public void MergeFrom(pb::CodedInputStream input)
               }
             }
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-        {
+        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
           uint tag;
-          while ((tag = input.ReadTag()) != 0)
-          {
-            if ((tag & 7) == 4)
-            {
-              // Abort on any end group tag.
-              return;
-            }
-            switch (tag)
-            {
+          while ((tag = input.ReadTag()) != 0) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
                 break;
-              case 10:
-                {
-                  Key = input.ReadString();
-                  break;
-                }
-              case 18:
-                {
-                  if (value_ == null)
-                  {
-                    Value = new global::Mysqlx.Expr.Expr();
-                  }
-                  input.ReadMessage(Value);
-                  break;
+              case 10: {
+                Key = input.ReadString();
+                break;
+              }
+              case 18: {
+                if (value_ == null) {
+                  Value = new global::Mysqlx.Expr.Expr();
                 }
+                input.ReadMessage(Value);
+                break;
+              }
             }
           }
         }
-#endif
+        #endif
 
       }
 
@@ -3084,9 +2707,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Array : pb::IMessage<Array>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Array> _parser = new pb::MessageParser<Array>(() => new Array());
     private pb::UnknownFieldSet _unknownFields;
@@ -3096,22 +2719,19 @@ public sealed partial class Array : pb::IMessage<Array>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Expr.MysqlxExprReflection.Descriptor.MessageTypes[7]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Array()
-    {
+    public Array() {
       OnConstruction();
     }
 
@@ -3119,16 +2739,14 @@ public Array()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Array(Array other) : this()
-    {
+    public Array(Array other) : this() {
       value_ = other.value_.Clone();
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Array Clone()
-    {
+    public Array Clone() {
       return new Array(this);
     }
 
@@ -3142,42 +2760,35 @@ public Array Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Expr.Expr> Value
-    {
+    public pbc::RepeatedField<global::Mysqlx.Expr.Expr> Value {
       get { return value_; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Array);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Array other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Array other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (!value_.Equals(other.value_)) return false;
+      if(!value_.Equals(other.value_)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       hash ^= value_.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -3185,46 +2796,40 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       value_.WriteTo(output, _repeated_value_codec);
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
       value_.WriteTo(ref output, _repeated_value_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
       size += value_.CalculateSize(_repeated_value_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -3232,10 +2837,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Array other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Array other) {
+      if (other == null) {
         return;
       }
       value_.Add(other.value_);
@@ -3244,11 +2847,10 @@ public void MergeFrom(Array other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -3265,36 +2867,31 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              value_.AddEntriesFrom(ref input, _repeated_value_codec);
-              break;
-            }
+          case 10: {
+            value_.AddEntriesFrom(ref input, _repeated_value_codec);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -3303,4 +2900,3 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
-
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxNotice.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxNotice.cs
index 39a8bdee1..804ce034f 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxNotice.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxNotice.cs
@@ -37,23 +37,19 @@
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Mysqlx.Notice
-{
+namespace Mysqlx.Notice {
 
   /// <summary>Holder for reflection information generated from mysqlx_notice.proto</summary>
-  public static partial class MysqlxNoticeReflection
-  {
+  public static partial class MysqlxNoticeReflection {
 
     #region Descriptor
     /// <summary>File descriptor for mysqlx_notice.proto</summary>
-    public static pbr::FileDescriptor Descriptor
-    {
+    public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static MysqlxNoticeReflection()
-    {
+    static MysqlxNoticeReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChNteXNxbHhfbm90aWNlLnByb3RvEg1NeXNxbHguTm90aWNlGgxteXNxbHgu",
@@ -111,9 +107,9 @@ static MysqlxNoticeReflection()
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Frame : pb::IMessage<Frame>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Frame> _parser = new pb::MessageParser<Frame>(() => new Frame());
     private pb::UnknownFieldSet _unknownFields;
@@ -124,22 +120,19 @@ public sealed partial class Frame : pb::IMessage<Frame>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Notice.MysqlxNoticeReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Frame()
-    {
+    public Frame() {
       OnConstruction();
     }
 
@@ -147,8 +140,7 @@ public Frame()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Frame(Frame other) : this()
-    {
+    public Frame(Frame other) : this() {
       _hasBits0 = other._hasBits0;
       type_ = other.type_;
       scope_ = other.scope_;
@@ -158,8 +150,7 @@ public Frame(Frame other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Frame Clone()
-    {
+    public Frame Clone() {
       return new Frame(this);
     }
 
@@ -173,11 +164,9 @@ public Frame Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint Type
-    {
+    public uint Type {
       get { if ((_hasBits0 & 1) != 0) { return type_; } else { return TypeDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         type_ = value;
       }
@@ -185,15 +174,13 @@ public uint Type
     /// <summary>Gets whether the "type" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasType
-    {
+    public bool HasType {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "type" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearType()
-    {
+    public void ClearType() {
       _hasBits0 &= ~1;
     }
 
@@ -207,11 +194,9 @@ public void ClearType()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Notice.Frame.Types.Scope Scope
-    {
+    public global::Mysqlx.Notice.Frame.Types.Scope Scope {
       get { if ((_hasBits0 & 2) != 0) { return scope_; } else { return ScopeDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         scope_ = value;
       }
@@ -219,15 +204,13 @@ public void ClearType()
     /// <summary>Gets whether the "scope" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasScope
-    {
+    public bool HasScope {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "scope" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearScope()
-    {
+    public void ClearScope() {
       _hasBits0 &= ~2;
     }
 
@@ -241,46 +224,38 @@ public void ClearScope()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString Payload
-    {
+    public pb::ByteString Payload {
       get { return payload_ ?? PayloadDefaultValue; }
-      set
-      {
+      set {
         payload_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "payload" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasPayload
-    {
+    public bool HasPayload {
       get { return payload_ != null; }
     }
     /// <summary>Clears the value of the "payload" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearPayload()
-    {
+    public void ClearPayload() {
       payload_ = null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Frame);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Frame other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Frame other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Type != other.Type) return false;
@@ -291,14 +266,12 @@ public bool Equals(Frame other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasType) hash ^= Type.GetHashCode();
       if (HasScope) hash ^= Scope.GetHashCode();
       if (HasPayload) hash ^= Payload.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -306,18 +279,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasType) {
         output.WriteRawTag(8);
         output.WriteUInt32(Type);
@@ -333,55 +304,45 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasType)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasType) {
         output.WriteRawTag(8);
         output.WriteUInt32(Type);
       }
-      if (HasScope)
-      {
+      if (HasScope) {
         output.WriteRawTag(16);
-        output.WriteEnum((int)Scope);
+        output.WriteEnum((int) Scope);
       }
-      if (HasPayload)
-      {
+      if (HasPayload) {
         output.WriteRawTag(26);
         output.WriteBytes(Payload);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasType)
-      {
+      if (HasType) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Type);
       }
-      if (HasScope)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Scope);
+      if (HasScope) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Scope);
       }
-      if (HasPayload)
-      {
+      if (HasPayload) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(Payload);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -389,22 +350,17 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Frame other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Frame other) {
+      if (other == null) {
         return;
       }
-      if (other.HasType)
-      {
+      if (other.HasType) {
         Type = other.Type;
       }
-      if (other.HasScope)
-      {
+      if (other.HasScope) {
         Scope = other.Scope;
       }
-      if (other.HasPayload)
-      {
+      if (other.HasPayload) {
         Payload = other.Payload;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -412,11 +368,10 @@ public void MergeFrom(Frame other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -441,58 +396,49 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              Type = input.ReadUInt32();
-              break;
-            }
-          case 16:
-            {
-              Scope = (global::Mysqlx.Notice.Frame.Types.Scope)input.ReadEnum();
-              break;
-            }
-          case 26:
-            {
-              Payload = input.ReadBytes();
-              break;
-            }
+          case 8: {
+            Type = input.ReadUInt32();
+            break;
+          }
+          case 16: {
+            Scope = (global::Mysqlx.Notice.Frame.Types.Scope) input.ReadEnum();
+            break;
+          }
+          case 26: {
+            Payload = input.ReadBytes();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Frame message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
+    public static partial class Types {
       /// <summary>
       ///* scope of notice 
       /// </summary>
-      public enum Scope
-      {
+      public enum Scope {
         [pbr::OriginalName("GLOBAL")] Global = 1,
         [pbr::OriginalName("LOCAL")] Local = 2,
       }
@@ -500,8 +446,7 @@ public enum Scope
       /// <summary>
       ///* type of notice payload
       /// </summary>
-      public enum Type
-      {
+      public enum Type {
         [pbr::OriginalName("WARNING")] Warning = 1,
         [pbr::OriginalName("SESSION_VARIABLE_CHANGED")] SessionVariableChanged = 2,
         [pbr::OriginalName("SESSION_STATE_CHANGED")] SessionStateChanged = 3,
@@ -537,9 +482,9 @@ public enum Type
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Warning : pb::IMessage<Warning>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Warning> _parser = new pb::MessageParser<Warning>(() => new Warning());
     private pb::UnknownFieldSet _unknownFields;
@@ -550,22 +495,19 @@ public sealed partial class Warning : pb::IMessage<Warning>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Notice.MysqlxNoticeReflection.Descriptor.MessageTypes[1]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Warning()
-    {
+    public Warning() {
       OnConstruction();
     }
 
@@ -573,8 +515,7 @@ public Warning()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Warning(Warning other) : this()
-    {
+    public Warning(Warning other) : this() {
       _hasBits0 = other._hasBits0;
       level_ = other.level_;
       code_ = other.code_;
@@ -584,8 +525,7 @@ public Warning(Warning other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Warning Clone()
-    {
+    public Warning Clone() {
       return new Warning(this);
     }
 
@@ -599,11 +539,9 @@ public Warning Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Notice.Warning.Types.Level Level
-    {
+    public global::Mysqlx.Notice.Warning.Types.Level Level {
       get { if ((_hasBits0 & 1) != 0) { return level_; } else { return LevelDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         level_ = value;
       }
@@ -611,15 +549,13 @@ public Warning Clone()
     /// <summary>Gets whether the "level" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasLevel
-    {
+    public bool HasLevel {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "level" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearLevel()
-    {
+    public void ClearLevel() {
       _hasBits0 &= ~1;
     }
 
@@ -633,11 +569,9 @@ public void ClearLevel()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint Code
-    {
+    public uint Code {
       get { if ((_hasBits0 & 2) != 0) { return code_; } else { return CodeDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         code_ = value;
       }
@@ -645,15 +579,13 @@ public uint Code
     /// <summary>Gets whether the "code" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCode
-    {
+    public bool HasCode {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "code" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCode()
-    {
+    public void ClearCode() {
       _hasBits0 &= ~2;
     }
 
@@ -667,46 +599,38 @@ public void ClearCode()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Msg
-    {
+    public string Msg {
       get { return msg_ ?? MsgDefaultValue; }
-      set
-      {
+      set {
         msg_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "msg" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasMsg
-    {
+    public bool HasMsg {
       get { return msg_ != null; }
     }
     /// <summary>Clears the value of the "msg" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearMsg()
-    {
+    public void ClearMsg() {
       msg_ = null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Warning);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Warning other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Warning other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Level != other.Level) return false;
@@ -717,14 +641,12 @@ public bool Equals(Warning other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasLevel) hash ^= Level.GetHashCode();
       if (HasCode) hash ^= Code.GetHashCode();
       if (HasMsg) hash ^= Msg.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -732,18 +654,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasLevel) {
         output.WriteRawTag(8);
         output.WriteEnum((int) Level);
@@ -759,55 +679,45 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasLevel)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasLevel) {
         output.WriteRawTag(8);
-        output.WriteEnum((int)Level);
+        output.WriteEnum((int) Level);
       }
-      if (HasCode)
-      {
+      if (HasCode) {
         output.WriteRawTag(16);
         output.WriteUInt32(Code);
       }
-      if (HasMsg)
-      {
+      if (HasMsg) {
         output.WriteRawTag(26);
         output.WriteString(Msg);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasLevel)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Level);
+      if (HasLevel) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Level);
       }
-      if (HasCode)
-      {
+      if (HasCode) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Code);
       }
-      if (HasMsg)
-      {
+      if (HasMsg) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Msg);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -815,22 +725,17 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Warning other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Warning other) {
+      if (other == null) {
         return;
       }
-      if (other.HasLevel)
-      {
+      if (other.HasLevel) {
         Level = other.Level;
       }
-      if (other.HasCode)
-      {
+      if (other.HasCode) {
         Code = other.Code;
       }
-      if (other.HasMsg)
-      {
+      if (other.HasMsg) {
         Msg = other.Msg;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -838,11 +743,10 @@ public void MergeFrom(Warning other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -867,55 +771,46 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              Level = (global::Mysqlx.Notice.Warning.Types.Level)input.ReadEnum();
-              break;
-            }
-          case 16:
-            {
-              Code = input.ReadUInt32();
-              break;
-            }
-          case 26:
-            {
-              Msg = input.ReadString();
-              break;
-            }
+          case 8: {
+            Level = (global::Mysqlx.Notice.Warning.Types.Level) input.ReadEnum();
+            break;
+          }
+          case 16: {
+            Code = input.ReadUInt32();
+            break;
+          }
+          case 26: {
+            Msg = input.ReadString();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Warning message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum Level
-      {
+    public static partial class Types {
+      public enum Level {
         [pbr::OriginalName("NOTE")] Note = 1,
         [pbr::OriginalName("WARNING")] Warning = 2,
         [pbr::OriginalName("ERROR")] Error = 3,
@@ -943,9 +838,9 @@ public enum Level
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SessionVariableChanged : pb::IMessage<SessionVariableChanged>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<SessionVariableChanged> _parser = new pb::MessageParser<SessionVariableChanged>(() => new SessionVariableChanged());
     private pb::UnknownFieldSet _unknownFields;
@@ -955,22 +850,19 @@ public sealed partial class SessionVariableChanged : pb::IMessage<SessionVariabl
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Notice.MysqlxNoticeReflection.Descriptor.MessageTypes[2]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SessionVariableChanged()
-    {
+    public SessionVariableChanged() {
       OnConstruction();
     }
 
@@ -978,8 +870,7 @@ public SessionVariableChanged()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SessionVariableChanged(SessionVariableChanged other) : this()
-    {
+    public SessionVariableChanged(SessionVariableChanged other) : this() {
       param_ = other.param_;
       value_ = other.value_ != null ? other.value_.Clone() : null;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -987,8 +878,7 @@ public SessionVariableChanged(SessionVariableChanged other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SessionVariableChanged Clone()
-    {
+    public SessionVariableChanged Clone() {
       return new SessionVariableChanged(this);
     }
 
@@ -1002,26 +892,22 @@ public SessionVariableChanged Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Param
-    {
+    public string Param {
       get { return param_ ?? ParamDefaultValue; }
-      set
-      {
+      set {
         param_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "param" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasParam
-    {
+    public bool HasParam {
       get { return param_ != null; }
     }
     /// <summary>Clears the value of the "param" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearParam()
-    {
+    public void ClearParam() {
       param_ = null;
     }
 
@@ -1033,32 +919,26 @@ public void ClearParam()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Datatypes.Scalar Value
-    {
+    public global::Mysqlx.Datatypes.Scalar Value {
       get { return value_; }
-      set
-      {
+      set {
         value_ = value;
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as SessionVariableChanged);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(SessionVariableChanged other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(SessionVariableChanged other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Param != other.Param) return false;
@@ -1068,13 +948,11 @@ public bool Equals(SessionVariableChanged other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasParam) hash ^= Param.GetHashCode();
       if (value_ != null) hash ^= Value.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1082,18 +960,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasParam) {
         output.WriteRawTag(10);
         output.WriteString(Param);
@@ -1105,46 +981,38 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasParam)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasParam) {
         output.WriteRawTag(10);
         output.WriteString(Param);
       }
-      if (value_ != null)
-      {
+      if (value_ != null) {
         output.WriteRawTag(18);
         output.WriteMessage(Value);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasParam)
-      {
+      if (HasParam) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Param);
       }
-      if (value_ != null)
-      {
+      if (value_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Value);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1152,20 +1020,15 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(SessionVariableChanged other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(SessionVariableChanged other) {
+      if (other == null) {
         return;
       }
-      if (other.HasParam)
-      {
+      if (other.HasParam) {
         Param = other.Param;
       }
-      if (other.value_ != null)
-      {
-        if (value_ == null)
-        {
+      if (other.value_ != null) {
+        if (value_ == null) {
           Value = new global::Mysqlx.Datatypes.Scalar();
         }
         Value.MergeFrom(other.Value);
@@ -1175,11 +1038,10 @@ public void MergeFrom(SessionVariableChanged other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1203,53 +1065,46 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              Param = input.ReadString();
-              break;
-            }
-          case 18:
-            {
-              if (value_ == null)
-              {
-                Value = new global::Mysqlx.Datatypes.Scalar();
-              }
-              input.ReadMessage(Value);
-              break;
+          case 10: {
+            Param = input.ReadString();
+            break;
+          }
+          case 18: {
+            if (value_ == null) {
+              Value = new global::Mysqlx.Datatypes.Scalar();
             }
+            input.ReadMessage(Value);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SessionStateChanged : pb::IMessage<SessionStateChanged>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<SessionStateChanged> _parser = new pb::MessageParser<SessionStateChanged>(() => new SessionStateChanged());
     private pb::UnknownFieldSet _unknownFields;
@@ -1260,22 +1115,19 @@ public sealed partial class SessionStateChanged : pb::IMessage<SessionStateChang
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Notice.MysqlxNoticeReflection.Descriptor.MessageTypes[3]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SessionStateChanged()
-    {
+    public SessionStateChanged() {
       OnConstruction();
     }
 
@@ -1283,8 +1135,7 @@ public SessionStateChanged()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SessionStateChanged(SessionStateChanged other) : this()
-    {
+    public SessionStateChanged(SessionStateChanged other) : this() {
       _hasBits0 = other._hasBits0;
       param_ = other.param_;
       value_ = other.value_.Clone();
@@ -1293,8 +1144,7 @@ public SessionStateChanged(SessionStateChanged other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SessionStateChanged Clone()
-    {
+    public SessionStateChanged Clone() {
       return new SessionStateChanged(this);
     }
 
@@ -1308,11 +1158,9 @@ public SessionStateChanged Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Notice.SessionStateChanged.Types.Parameter Param
-    {
+    public global::Mysqlx.Notice.SessionStateChanged.Types.Parameter Param {
       get { if ((_hasBits0 & 1) != 0) { return param_; } else { return ParamDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         param_ = value;
       }
@@ -1320,15 +1168,13 @@ public SessionStateChanged Clone()
     /// <summary>Gets whether the "param" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasParam
-    {
+    public bool HasParam {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "param" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearParam()
-    {
+    public void ClearParam() {
       _hasBits0 &= ~1;
     }
 
@@ -1342,44 +1188,37 @@ public void ClearParam()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Datatypes.Scalar> Value
-    {
+    public pbc::RepeatedField<global::Mysqlx.Datatypes.Scalar> Value {
       get { return value_; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as SessionStateChanged);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(SessionStateChanged other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(SessionStateChanged other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Param != other.Param) return false;
-      if (!value_.Equals(other.value_)) return false;
+      if(!value_.Equals(other.value_)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasParam) hash ^= Param.GetHashCode();
       hash ^= value_.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1387,18 +1226,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasParam) {
         output.WriteRawTag(8);
         output.WriteEnum((int) Param);
@@ -1407,39 +1244,33 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasParam)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasParam) {
         output.WriteRawTag(8);
-        output.WriteEnum((int)Param);
+        output.WriteEnum((int) Param);
       }
       value_.WriteTo(ref output, _repeated_value_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasParam)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Param);
+      if (HasParam) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Param);
       }
       size += value_.CalculateSize(_repeated_value_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1447,14 +1278,11 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(SessionStateChanged other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(SessionStateChanged other) {
+      if (other == null) {
         return;
       }
-      if (other.HasParam)
-      {
+      if (other.HasParam) {
         Param = other.Param;
       }
       value_.Add(other.value_);
@@ -1463,11 +1291,10 @@ public void MergeFrom(SessionStateChanged other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1488,50 +1315,42 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              Param = (global::Mysqlx.Notice.SessionStateChanged.Types.Parameter)input.ReadEnum();
-              break;
-            }
-          case 18:
-            {
-              value_.AddEntriesFrom(ref input, _repeated_value_codec);
-              break;
-            }
+          case 8: {
+            Param = (global::Mysqlx.Notice.SessionStateChanged.Types.Parameter) input.ReadEnum();
+            break;
+          }
+          case 18: {
+            value_.AddEntriesFrom(ref input, _repeated_value_codec);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the SessionStateChanged message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum Parameter
-      {
+    public static partial class Types {
+      public enum Parameter {
         [pbr::OriginalName("CURRENT_SCHEMA")] CurrentSchema = 1,
         [pbr::OriginalName("ACCOUNT_EXPIRED")] AccountExpired = 2,
         [pbr::OriginalName("GENERATED_INSERT_ID")] GeneratedInsertId = 3,
@@ -1564,9 +1383,9 @@ public enum Parameter
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class GroupReplicationStateChanged : pb::IMessage<GroupReplicationStateChanged>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<GroupReplicationStateChanged> _parser = new pb::MessageParser<GroupReplicationStateChanged>(() => new GroupReplicationStateChanged());
     private pb::UnknownFieldSet _unknownFields;
@@ -1577,22 +1396,19 @@ public sealed partial class GroupReplicationStateChanged : pb::IMessage<GroupRep
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Notice.MysqlxNoticeReflection.Descriptor.MessageTypes[4]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public GroupReplicationStateChanged()
-    {
+    public GroupReplicationStateChanged() {
       OnConstruction();
     }
 
@@ -1600,8 +1416,7 @@ public GroupReplicationStateChanged()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public GroupReplicationStateChanged(GroupReplicationStateChanged other) : this()
-    {
+    public GroupReplicationStateChanged(GroupReplicationStateChanged other) : this() {
       _hasBits0 = other._hasBits0;
       type_ = other.type_;
       viewId_ = other.viewId_;
@@ -1610,8 +1425,7 @@ public GroupReplicationStateChanged(GroupReplicationStateChanged other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public GroupReplicationStateChanged Clone()
-    {
+    public GroupReplicationStateChanged Clone() {
       return new GroupReplicationStateChanged(this);
     }
 
@@ -1625,11 +1439,9 @@ public GroupReplicationStateChanged Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint Type
-    {
+    public uint Type {
       get { if ((_hasBits0 & 1) != 0) { return type_; } else { return TypeDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         type_ = value;
       }
@@ -1637,15 +1449,13 @@ public uint Type
     /// <summary>Gets whether the "type" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasType
-    {
+    public bool HasType {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "type" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearType()
-    {
+    public void ClearType() {
       _hasBits0 &= ~1;
     }
 
@@ -1659,46 +1469,38 @@ public void ClearType()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string ViewId
-    {
+    public string ViewId {
       get { return viewId_ ?? ViewIdDefaultValue; }
-      set
-      {
+      set {
         viewId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "view_id" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasViewId
-    {
+    public bool HasViewId {
       get { return viewId_ != null; }
     }
     /// <summary>Clears the value of the "view_id" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearViewId()
-    {
+    public void ClearViewId() {
       viewId_ = null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as GroupReplicationStateChanged);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(GroupReplicationStateChanged other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(GroupReplicationStateChanged other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Type != other.Type) return false;
@@ -1708,13 +1510,11 @@ public bool Equals(GroupReplicationStateChanged other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasType) hash ^= Type.GetHashCode();
       if (HasViewId) hash ^= ViewId.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1722,18 +1522,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasType) {
         output.WriteRawTag(8);
         output.WriteUInt32(Type);
@@ -1745,46 +1543,38 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasType)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasType) {
         output.WriteRawTag(8);
         output.WriteUInt32(Type);
       }
-      if (HasViewId)
-      {
+      if (HasViewId) {
         output.WriteRawTag(18);
         output.WriteString(ViewId);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasType)
-      {
+      if (HasType) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Type);
       }
-      if (HasViewId)
-      {
+      if (HasViewId) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(ViewId);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1792,18 +1582,14 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(GroupReplicationStateChanged other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(GroupReplicationStateChanged other) {
+      if (other == null) {
         return;
       }
-      if (other.HasType)
-      {
+      if (other.HasType) {
         Type = other.Type;
       }
-      if (other.HasViewId)
-      {
+      if (other.HasViewId) {
         ViewId = other.ViewId;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1811,11 +1597,10 @@ public void MergeFrom(GroupReplicationStateChanged other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1836,50 +1621,42 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              Type = input.ReadUInt32();
-              break;
-            }
-          case 18:
-            {
-              ViewId = input.ReadString();
-              break;
-            }
+          case 8: {
+            Type = input.ReadUInt32();
+            break;
+          }
+          case 18: {
+            ViewId = input.ReadString();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the GroupReplicationStateChanged message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum Type
-      {
+    public static partial class Types {
+      public enum Type {
         [pbr::OriginalName("MEMBERSHIP_QUORUM_LOSS")] MembershipQuorumLoss = 1,
         [pbr::OriginalName("MEMBERSHIP_VIEW_CHANGE")] MembershipViewChange = 2,
         [pbr::OriginalName("MEMBER_ROLE_CHANGE")] MemberRoleChange = 3,
@@ -1902,9 +1679,9 @@ public enum Type
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ServerHello : pb::IMessage<ServerHello>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<ServerHello> _parser = new pb::MessageParser<ServerHello>(() => new ServerHello());
     private pb::UnknownFieldSet _unknownFields;
@@ -1914,22 +1691,19 @@ public sealed partial class ServerHello : pb::IMessage<ServerHello>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Notice.MysqlxNoticeReflection.Descriptor.MessageTypes[5]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ServerHello()
-    {
+    public ServerHello() {
       OnConstruction();
     }
 
@@ -1937,35 +1711,29 @@ public ServerHello()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ServerHello(ServerHello other) : this()
-    {
+    public ServerHello(ServerHello other) : this() {
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ServerHello Clone()
-    {
+    public ServerHello Clone() {
       return new ServerHello(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as ServerHello);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ServerHello other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(ServerHello other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       return Equals(_unknownFields, other._unknownFields);
@@ -1973,11 +1741,9 @@ public bool Equals(ServerHello other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1985,43 +1751,37 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (_unknownFields != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -2029,10 +1789,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ServerHello other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(ServerHello other) {
+      if (other == null) {
         return;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -2040,11 +1798,10 @@ public void MergeFrom(ServerHello other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -2057,31 +1814,27 @@ public void MergeFrom(pb::CodedInputStream input)
             break;
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
         }
       }
     }
-#endif
+    #endif
 
   }
 
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxPrepare.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxPrepare.cs
index aec5a7492..51a46c66d 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxPrepare.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxPrepare.cs
@@ -37,23 +37,19 @@
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Mysqlx.Prepare
-{
+namespace Mysqlx.Prepare {
 
   /// <summary>Holder for reflection information generated from mysqlx_prepare.proto</summary>
-  public static partial class MysqlxPrepareReflection
-  {
+  public static partial class MysqlxPrepareReflection {
 
     #region Descriptor
     /// <summary>File descriptor for mysqlx_prepare.proto</summary>
-    public static pbr::FileDescriptor Descriptor
-    {
+    public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static MysqlxPrepareReflection()
-    {
+    static MysqlxPrepareReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChRteXNxbHhfcHJlcGFyZS5wcm90bxIOTXlzcWx4LlByZXBhcmUaDG15c3Fs",
@@ -101,9 +97,9 @@ static MysqlxPrepareReflection()
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Prepare : pb::IMessage<Prepare>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Prepare> _parser = new pb::MessageParser<Prepare>(() => new Prepare());
     private pb::UnknownFieldSet _unknownFields;
@@ -114,22 +110,19 @@ public sealed partial class Prepare : pb::IMessage<Prepare>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Prepare.MysqlxPrepareReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Prepare()
-    {
+    public Prepare() {
       OnConstruction();
     }
 
@@ -137,8 +130,7 @@ public Prepare()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Prepare(Prepare other) : this()
-    {
+    public Prepare(Prepare other) : this() {
       _hasBits0 = other._hasBits0;
       stmtId_ = other.stmtId_;
       stmt_ = other.stmt_ != null ? other.stmt_.Clone() : null;
@@ -147,8 +139,7 @@ public Prepare(Prepare other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Prepare Clone()
-    {
+    public Prepare Clone() {
       return new Prepare(this);
     }
 
@@ -163,11 +154,9 @@ public Prepare Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint StmtId
-    {
+    public uint StmtId {
       get { if ((_hasBits0 & 1) != 0) { return stmtId_; } else { return StmtIdDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         stmtId_ = value;
       }
@@ -175,15 +164,13 @@ public uint StmtId
     /// <summary>Gets whether the "stmt_id" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasStmtId
-    {
+    public bool HasStmtId {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "stmt_id" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearStmtId()
-    {
+    public void ClearStmtId() {
       _hasBits0 &= ~1;
     }
 
@@ -196,32 +183,26 @@ public void ClearStmtId()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Prepare.Prepare.Types.OneOfMessage Stmt
-    {
+    public global::Mysqlx.Prepare.Prepare.Types.OneOfMessage Stmt {
       get { return stmt_; }
-      set
-      {
+      set {
         stmt_ = value;
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Prepare);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Prepare other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Prepare other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (StmtId != other.StmtId) return false;
@@ -231,13 +212,11 @@ public bool Equals(Prepare other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasStmtId) hash ^= StmtId.GetHashCode();
       if (stmt_ != null) hash ^= Stmt.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -245,18 +224,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasStmtId) {
         output.WriteRawTag(8);
         output.WriteUInt32(StmtId);
@@ -268,46 +245,38 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasStmtId)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasStmtId) {
         output.WriteRawTag(8);
         output.WriteUInt32(StmtId);
       }
-      if (stmt_ != null)
-      {
+      if (stmt_ != null) {
         output.WriteRawTag(18);
         output.WriteMessage(Stmt);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasStmtId)
-      {
+      if (HasStmtId) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(StmtId);
       }
-      if (stmt_ != null)
-      {
+      if (stmt_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Stmt);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -315,20 +284,15 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Prepare other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Prepare other) {
+      if (other == null) {
         return;
       }
-      if (other.HasStmtId)
-      {
+      if (other.HasStmtId) {
         StmtId = other.StmtId;
       }
-      if (other.stmt_ != null)
-      {
-        if (stmt_ == null)
-        {
+      if (other.stmt_ != null) {
+        if (stmt_ == null) {
           Stmt = new global::Mysqlx.Prepare.Prepare.Types.OneOfMessage();
         }
         Stmt.MergeFrom(other.Stmt);
@@ -338,11 +302,10 @@ public void MergeFrom(Prepare other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -366,57 +329,49 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              StmtId = input.ReadUInt32();
-              break;
-            }
-          case 18:
-            {
-              if (stmt_ == null)
-              {
-                Stmt = new global::Mysqlx.Prepare.Prepare.Types.OneOfMessage();
-              }
-              input.ReadMessage(Stmt);
-              break;
+          case 8: {
+            StmtId = input.ReadUInt32();
+            break;
+          }
+          case 18: {
+            if (stmt_ == null) {
+              Stmt = new global::Mysqlx.Prepare.Prepare.Types.OneOfMessage();
             }
+            input.ReadMessage(Stmt);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the Prepare message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
+    public static partial class Types {
       [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class OneOfMessage : pb::IMessage<OneOfMessage>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
-#endif
+      #endif
       {
         private static readonly pb::MessageParser<OneOfMessage> _parser = new pb::MessageParser<OneOfMessage>(() => new OneOfMessage());
         private pb::UnknownFieldSet _unknownFields;
@@ -427,22 +382,19 @@ public sealed partial class OneOfMessage : pb::IMessage<OneOfMessage>
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor
-        {
+        public static pbr::MessageDescriptor Descriptor {
           get { return global::Mysqlx.Prepare.Prepare.Descriptor.NestedTypes[0]; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor
-        {
+        pbr::MessageDescriptor pb::IMessage.Descriptor {
           get { return Descriptor; }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OneOfMessage()
-        {
+        public OneOfMessage() {
           OnConstruction();
         }
 
@@ -450,8 +402,7 @@ public OneOfMessage()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OneOfMessage(OneOfMessage other) : this()
-        {
+        public OneOfMessage(OneOfMessage other) : this() {
           _hasBits0 = other._hasBits0;
           type_ = other.type_;
           find_ = other.find_ != null ? other.find_.Clone() : null;
@@ -464,8 +415,7 @@ public OneOfMessage(OneOfMessage other) : this()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OneOfMessage Clone()
-        {
+        public OneOfMessage Clone() {
           return new OneOfMessage(this);
         }
 
@@ -476,11 +426,9 @@ public OneOfMessage Clone()
         private global::Mysqlx.Prepare.Prepare.Types.OneOfMessage.Types.Type type_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Mysqlx.Prepare.Prepare.Types.OneOfMessage.Types.Type Type
-        {
+        public global::Mysqlx.Prepare.Prepare.Types.OneOfMessage.Types.Type Type {
           get { if ((_hasBits0 & 1) != 0) { return type_; } else { return TypeDefaultValue; } }
-          set
-          {
+          set {
             _hasBits0 |= 1;
             type_ = value;
           }
@@ -488,15 +436,13 @@ public OneOfMessage Clone()
         /// <summary>Gets whether the "type" field is set</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasType
-        {
+        public bool HasType {
           get { return (_hasBits0 & 1) != 0; }
         }
         /// <summary>Clears the value of the "type" field</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearType()
-        {
+        public void ClearType() {
           _hasBits0 &= ~1;
         }
 
@@ -505,11 +451,9 @@ public void ClearType()
         private global::Mysqlx.Crud.Find find_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Mysqlx.Crud.Find Find
-        {
+        public global::Mysqlx.Crud.Find Find {
           get { return find_; }
-          set
-          {
+          set {
             find_ = value;
           }
         }
@@ -519,11 +463,9 @@ public void ClearType()
         private global::Mysqlx.Crud.Insert insert_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Mysqlx.Crud.Insert Insert
-        {
+        public global::Mysqlx.Crud.Insert Insert {
           get { return insert_; }
-          set
-          {
+          set {
             insert_ = value;
           }
         }
@@ -533,11 +475,9 @@ public void ClearType()
         private global::Mysqlx.Crud.Update update_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Mysqlx.Crud.Update Update
-        {
+        public global::Mysqlx.Crud.Update Update {
           get { return update_; }
-          set
-          {
+          set {
             update_ = value;
           }
         }
@@ -547,11 +487,9 @@ public void ClearType()
         private global::Mysqlx.Crud.Delete delete_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Mysqlx.Crud.Delete Delete
-        {
+        public global::Mysqlx.Crud.Delete Delete {
           get { return delete_; }
-          set
-          {
+          set {
             delete_ = value;
           }
         }
@@ -561,32 +499,26 @@ public void ClearType()
         private global::Mysqlx.Sql.StmtExecute stmtExecute_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Mysqlx.Sql.StmtExecute StmtExecute
-        {
+        public global::Mysqlx.Sql.StmtExecute StmtExecute {
           get { return stmtExecute_; }
-          set
-          {
+          set {
             stmtExecute_ = value;
           }
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other)
-        {
+        public override bool Equals(object other) {
           return Equals(other as OneOfMessage);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(OneOfMessage other)
-        {
-          if (ReferenceEquals(other, null))
-          {
+        public bool Equals(OneOfMessage other) {
+          if (ReferenceEquals(other, null)) {
             return false;
           }
-          if (ReferenceEquals(other, this))
-          {
+          if (ReferenceEquals(other, this)) {
             return true;
           }
           if (Type != other.Type) return false;
@@ -600,8 +532,7 @@ public bool Equals(OneOfMessage other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode()
-        {
+        public override int GetHashCode() {
           int hash = 1;
           if (HasType) hash ^= Type.GetHashCode();
           if (find_ != null) hash ^= Find.GetHashCode();
@@ -609,8 +540,7 @@ public override int GetHashCode()
           if (update_ != null) hash ^= Update.GetHashCode();
           if (delete_ != null) hash ^= Delete.GetHashCode();
           if (stmtExecute_ != null) hash ^= StmtExecute.GetHashCode();
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             hash ^= _unknownFields.GetHashCode();
           }
           return hash;
@@ -618,18 +548,16 @@ public override int GetHashCode()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString()
-        {
+        public override string ToString() {
           return pb::JsonFormatter.ToDiagnosticString(this);
         }
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void WriteTo(pb::CodedOutputStream output) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           output.WriteRawMessage(this);
-#else
+        #else
           if (HasType) {
             output.WriteRawTag(8);
             output.WriteEnum((int) Type);
@@ -657,82 +585,66 @@ public void WriteTo(pb::CodedOutputStream output)
           if (_unknownFields != null) {
             _unknownFields.WriteTo(output);
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-        {
-          if (HasType)
-          {
+        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+          if (HasType) {
             output.WriteRawTag(8);
-            output.WriteEnum((int)Type);
+            output.WriteEnum((int) Type);
           }
-          if (find_ != null)
-          {
+          if (find_ != null) {
             output.WriteRawTag(18);
             output.WriteMessage(Find);
           }
-          if (insert_ != null)
-          {
+          if (insert_ != null) {
             output.WriteRawTag(26);
             output.WriteMessage(Insert);
           }
-          if (update_ != null)
-          {
+          if (update_ != null) {
             output.WriteRawTag(34);
             output.WriteMessage(Update);
           }
-          if (delete_ != null)
-          {
+          if (delete_ != null) {
             output.WriteRawTag(42);
             output.WriteMessage(Delete);
           }
-          if (stmtExecute_ != null)
-          {
+          if (stmtExecute_ != null) {
             output.WriteRawTag(50);
             output.WriteMessage(StmtExecute);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             _unknownFields.WriteTo(ref output);
           }
         }
-#endif
+        #endif
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize()
-        {
+        public int CalculateSize() {
           int size = 0;
-          if (HasType)
-          {
-            size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Type);
+          if (HasType) {
+            size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
           }
-          if (find_ != null)
-          {
+          if (find_ != null) {
             size += 1 + pb::CodedOutputStream.ComputeMessageSize(Find);
           }
-          if (insert_ != null)
-          {
+          if (insert_ != null) {
             size += 1 + pb::CodedOutputStream.ComputeMessageSize(Insert);
           }
-          if (update_ != null)
-          {
+          if (update_ != null) {
             size += 1 + pb::CodedOutputStream.ComputeMessageSize(Update);
           }
-          if (delete_ != null)
-          {
+          if (delete_ != null) {
             size += 1 + pb::CodedOutputStream.ComputeMessageSize(Delete);
           }
-          if (stmtExecute_ != null)
-          {
+          if (stmtExecute_ != null) {
             size += 1 + pb::CodedOutputStream.ComputeMessageSize(StmtExecute);
           }
-          if (_unknownFields != null)
-          {
+          if (_unknownFields != null) {
             size += _unknownFields.CalculateSize();
           }
           return size;
@@ -740,52 +652,39 @@ public int CalculateSize()
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(OneOfMessage other)
-        {
-          if (other == null)
-          {
+        public void MergeFrom(OneOfMessage other) {
+          if (other == null) {
             return;
           }
-          if (other.HasType)
-          {
+          if (other.HasType) {
             Type = other.Type;
           }
-          if (other.find_ != null)
-          {
-            if (find_ == null)
-            {
+          if (other.find_ != null) {
+            if (find_ == null) {
               Find = new global::Mysqlx.Crud.Find();
             }
             Find.MergeFrom(other.Find);
           }
-          if (other.insert_ != null)
-          {
-            if (insert_ == null)
-            {
+          if (other.insert_ != null) {
+            if (insert_ == null) {
               Insert = new global::Mysqlx.Crud.Insert();
             }
             Insert.MergeFrom(other.Insert);
           }
-          if (other.update_ != null)
-          {
-            if (update_ == null)
-            {
+          if (other.update_ != null) {
+            if (update_ == null) {
               Update = new global::Mysqlx.Crud.Update();
             }
             Update.MergeFrom(other.Update);
           }
-          if (other.delete_ != null)
-          {
-            if (delete_ == null)
-            {
+          if (other.delete_ != null) {
+            if (delete_ == null) {
               Delete = new global::Mysqlx.Crud.Delete();
             }
             Delete.MergeFrom(other.Delete);
           }
-          if (other.stmtExecute_ != null)
-          {
-            if (stmtExecute_ == null)
-            {
+          if (other.stmtExecute_ != null) {
+            if (stmtExecute_ == null) {
               StmtExecute = new global::Mysqlx.Sql.StmtExecute();
             }
             StmtExecute.MergeFrom(other.StmtExecute);
@@ -795,11 +694,10 @@ public void MergeFrom(OneOfMessage other)
 
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input)
-        {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        public void MergeFrom(pb::CodedInputStream input) {
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           input.ReadRawMessage(this);
-#else
+        #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
           if ((tag & 7) == 4) {
@@ -851,94 +749,77 @@ public void MergeFrom(pb::CodedInputStream input)
               }
             }
           }
-#endif
+        #endif
         }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-        {
+        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
           uint tag;
-          while ((tag = input.ReadTag()) != 0)
-          {
-            if ((tag & 7) == 4)
-            {
-              // Abort on any end group tag.
-              return;
-            }
-            switch (tag)
-            {
+          while ((tag = input.ReadTag()) != 0) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
                 break;
-              case 8:
-                {
-                  Type = (global::Mysqlx.Prepare.Prepare.Types.OneOfMessage.Types.Type)input.ReadEnum();
-                  break;
-                }
-              case 18:
-                {
-                  if (find_ == null)
-                  {
-                    Find = new global::Mysqlx.Crud.Find();
-                  }
-                  input.ReadMessage(Find);
-                  break;
+              case 8: {
+                Type = (global::Mysqlx.Prepare.Prepare.Types.OneOfMessage.Types.Type) input.ReadEnum();
+                break;
+              }
+              case 18: {
+                if (find_ == null) {
+                  Find = new global::Mysqlx.Crud.Find();
                 }
-              case 26:
-                {
-                  if (insert_ == null)
-                  {
-                    Insert = new global::Mysqlx.Crud.Insert();
-                  }
-                  input.ReadMessage(Insert);
-                  break;
+                input.ReadMessage(Find);
+                break;
+              }
+              case 26: {
+                if (insert_ == null) {
+                  Insert = new global::Mysqlx.Crud.Insert();
                 }
-              case 34:
-                {
-                  if (update_ == null)
-                  {
-                    Update = new global::Mysqlx.Crud.Update();
-                  }
-                  input.ReadMessage(Update);
-                  break;
+                input.ReadMessage(Insert);
+                break;
+              }
+              case 34: {
+                if (update_ == null) {
+                  Update = new global::Mysqlx.Crud.Update();
                 }
-              case 42:
-                {
-                  if (delete_ == null)
-                  {
-                    Delete = new global::Mysqlx.Crud.Delete();
-                  }
-                  input.ReadMessage(Delete);
-                  break;
+                input.ReadMessage(Update);
+                break;
+              }
+              case 42: {
+                if (delete_ == null) {
+                  Delete = new global::Mysqlx.Crud.Delete();
                 }
-              case 50:
-                {
-                  if (stmtExecute_ == null)
-                  {
-                    StmtExecute = new global::Mysqlx.Sql.StmtExecute();
-                  }
-                  input.ReadMessage(StmtExecute);
-                  break;
+                input.ReadMessage(Delete);
+                break;
+              }
+              case 50: {
+                if (stmtExecute_ == null) {
+                  StmtExecute = new global::Mysqlx.Sql.StmtExecute();
                 }
+                input.ReadMessage(StmtExecute);
+                break;
+              }
             }
           }
         }
-#endif
+        #endif
 
         #region Nested types
         /// <summary>Container for nested types declared in the OneOfMessage message type.</summary>
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
         [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static partial class Types
-        {
+        public static partial class Types {
           /// <summary>
           /// Determine which of optional fields was set by the client
           /// (Workaround for missing "oneof" keyword in pb2.5)
           /// </summary>
-          public enum Type
-          {
+          public enum Type {
             [pbr::OriginalName("FIND")] Find = 0,
             [pbr::OriginalName("INSERT")] Insert = 1,
             [pbr::OriginalName("UPDATE")] Update = 2,
@@ -974,9 +855,9 @@ public enum Type
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Execute : pb::IMessage<Execute>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Execute> _parser = new pb::MessageParser<Execute>(() => new Execute());
     private pb::UnknownFieldSet _unknownFields;
@@ -987,22 +868,19 @@ public sealed partial class Execute : pb::IMessage<Execute>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Prepare.MysqlxPrepareReflection.Descriptor.MessageTypes[1]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Execute()
-    {
+    public Execute() {
       OnConstruction();
     }
 
@@ -1010,8 +888,7 @@ public Execute()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Execute(Execute other) : this()
-    {
+    public Execute(Execute other) : this() {
       _hasBits0 = other._hasBits0;
       stmtId_ = other.stmtId_;
       args_ = other.args_.Clone();
@@ -1021,8 +898,7 @@ public Execute(Execute other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Execute Clone()
-    {
+    public Execute Clone() {
       return new Execute(this);
     }
 
@@ -1036,11 +912,9 @@ public Execute Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint StmtId
-    {
+    public uint StmtId {
       get { if ((_hasBits0 & 1) != 0) { return stmtId_; } else { return StmtIdDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         stmtId_ = value;
       }
@@ -1048,15 +922,13 @@ public uint StmtId
     /// <summary>Gets whether the "stmt_id" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasStmtId
-    {
+    public bool HasStmtId {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "stmt_id" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearStmtId()
-    {
+    public void ClearStmtId() {
       _hasBits0 &= ~1;
     }
 
@@ -1070,8 +942,7 @@ public void ClearStmtId()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Datatypes.Any> Args
-    {
+    public pbc::RepeatedField<global::Mysqlx.Datatypes.Any> Args {
       get { return args_; }
     }
 
@@ -1086,11 +957,9 @@ public void ClearStmtId()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool CompactMetadata
-    {
+    public bool CompactMetadata {
       get { if ((_hasBits0 & 2) != 0) { return compactMetadata_; } else { return CompactMetadataDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         compactMetadata_ = value;
       }
@@ -1098,53 +967,45 @@ public bool CompactMetadata
     /// <summary>Gets whether the "compact_metadata" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCompactMetadata
-    {
+    public bool HasCompactMetadata {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "compact_metadata" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCompactMetadata()
-    {
+    public void ClearCompactMetadata() {
       _hasBits0 &= ~2;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Execute);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Execute other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Execute other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (StmtId != other.StmtId) return false;
-      if (!args_.Equals(other.args_)) return false;
+      if(!args_.Equals(other.args_)) return false;
       if (CompactMetadata != other.CompactMetadata) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasStmtId) hash ^= StmtId.GetHashCode();
       hash ^= args_.GetHashCode();
       if (HasCompactMetadata) hash ^= CompactMetadata.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1152,18 +1013,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasStmtId) {
         output.WriteRawTag(8);
         output.WriteUInt32(StmtId);
@@ -1176,48 +1035,40 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasStmtId)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasStmtId) {
         output.WriteRawTag(8);
         output.WriteUInt32(StmtId);
       }
       args_.WriteTo(ref output, _repeated_args_codec);
-      if (HasCompactMetadata)
-      {
+      if (HasCompactMetadata) {
         output.WriteRawTag(24);
         output.WriteBool(CompactMetadata);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasStmtId)
-      {
+      if (HasStmtId) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(StmtId);
       }
       size += args_.CalculateSize(_repeated_args_codec);
-      if (HasCompactMetadata)
-      {
+      if (HasCompactMetadata) {
         size += 1 + 1;
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1225,19 +1076,15 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Execute other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Execute other) {
+      if (other == null) {
         return;
       }
-      if (other.HasStmtId)
-      {
+      if (other.HasStmtId) {
         StmtId = other.StmtId;
       }
       args_.Add(other.args_);
-      if (other.HasCompactMetadata)
-      {
+      if (other.HasCompactMetadata) {
         CompactMetadata = other.CompactMetadata;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1245,11 +1092,10 @@ public void MergeFrom(Execute other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1274,46 +1120,39 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              StmtId = input.ReadUInt32();
-              break;
-            }
-          case 18:
-            {
-              args_.AddEntriesFrom(ref input, _repeated_args_codec);
-              break;
-            }
-          case 24:
-            {
-              CompactMetadata = input.ReadBool();
-              break;
-            }
+          case 8: {
+            StmtId = input.ReadUInt32();
+            break;
+          }
+          case 18: {
+            args_.AddEntriesFrom(ref input, _repeated_args_codec);
+            break;
+          }
+          case 24: {
+            CompactMetadata = input.ReadBool();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -1334,9 +1173,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Deallocate : pb::IMessage<Deallocate>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Deallocate> _parser = new pb::MessageParser<Deallocate>(() => new Deallocate());
     private pb::UnknownFieldSet _unknownFields;
@@ -1347,22 +1186,19 @@ public sealed partial class Deallocate : pb::IMessage<Deallocate>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Prepare.MysqlxPrepareReflection.Descriptor.MessageTypes[2]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Deallocate()
-    {
+    public Deallocate() {
       OnConstruction();
     }
 
@@ -1370,8 +1206,7 @@ public Deallocate()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Deallocate(Deallocate other) : this()
-    {
+    public Deallocate(Deallocate other) : this() {
       _hasBits0 = other._hasBits0;
       stmtId_ = other.stmtId_;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -1379,8 +1214,7 @@ public Deallocate(Deallocate other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Deallocate Clone()
-    {
+    public Deallocate Clone() {
       return new Deallocate(this);
     }
 
@@ -1394,11 +1228,9 @@ public Deallocate Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint StmtId
-    {
+    public uint StmtId {
       get { if ((_hasBits0 & 1) != 0) { return stmtId_; } else { return StmtIdDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         stmtId_ = value;
       }
@@ -1406,35 +1238,29 @@ public uint StmtId
     /// <summary>Gets whether the "stmt_id" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasStmtId
-    {
+    public bool HasStmtId {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "stmt_id" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearStmtId()
-    {
+    public void ClearStmtId() {
       _hasBits0 &= ~1;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Deallocate);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Deallocate other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Deallocate other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (StmtId != other.StmtId) return false;
@@ -1443,12 +1269,10 @@ public bool Equals(Deallocate other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasStmtId) hash ^= StmtId.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1456,18 +1280,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasStmtId) {
         output.WriteRawTag(8);
         output.WriteUInt32(StmtId);
@@ -1475,37 +1297,31 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasStmtId)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasStmtId) {
         output.WriteRawTag(8);
         output.WriteUInt32(StmtId);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasStmtId)
-      {
+      if (HasStmtId) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(StmtId);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1513,14 +1329,11 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Deallocate other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Deallocate other) {
+      if (other == null) {
         return;
       }
-      if (other.HasStmtId)
-      {
+      if (other.HasStmtId) {
         StmtId = other.StmtId;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1528,11 +1341,10 @@ public void MergeFrom(Deallocate other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1549,36 +1361,31 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              StmtId = input.ReadUInt32();
-              break;
-            }
+          case 8: {
+            StmtId = input.ReadUInt32();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -1587,4 +1394,3 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
-
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxResultset.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxResultset.cs
index 909bf01e1..db2a32dd7 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxResultset.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxResultset.cs
@@ -37,23 +37,19 @@
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Mysqlx.Resultset
-{
+namespace Mysqlx.Resultset {
 
   /// <summary>Holder for reflection information generated from mysqlx_resultset.proto</summary>
-  public static partial class MysqlxResultsetReflection
-  {
+  public static partial class MysqlxResultsetReflection {
 
     #region Descriptor
     /// <summary>File descriptor for mysqlx_resultset.proto</summary>
-    public static pbr::FileDescriptor Descriptor
-    {
+    public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static MysqlxResultsetReflection()
-    {
+    static MysqlxResultsetReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChZteXNxbHhfcmVzdWx0c2V0LnByb3RvEhBNeXNxbHguUmVzdWx0c2V0Ggxt",
@@ -75,7 +71,7 @@ static MysqlxResultsetReflection()
             "Chdjb20ubXlzcWwuY2oueC5wcm90b2J1Zg=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Mysqlx.MysqlxReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(new[] { typeof(global::Mysqlx.Resultset.ContentType_BYTES), typeof(global::Mysqlx.Resultset.ContentType_DATETIME), }, null, new pbr::GeneratedClrTypeInfo[] {
+          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Mysqlx.Resultset.ContentType_BYTES), typeof(global::Mysqlx.Resultset.ContentType_DATETIME), }, null, new pbr::GeneratedClrTypeInfo[] {
             new pbr::GeneratedClrTypeInfo(typeof(global::Mysqlx.Resultset.FetchDoneMoreOutParams), global::Mysqlx.Resultset.FetchDoneMoreOutParams.Parser, null, null, null, null, null),
             new pbr::GeneratedClrTypeInfo(typeof(global::Mysqlx.Resultset.FetchDoneMoreResultsets), global::Mysqlx.Resultset.FetchDoneMoreResultsets.Parser, null, null, null, null, null),
             new pbr::GeneratedClrTypeInfo(typeof(global::Mysqlx.Resultset.FetchDone), global::Mysqlx.Resultset.FetchDone.Parser, null, null, null, null, null),
@@ -105,8 +101,7 @@ static MysqlxResultsetReflection()
   ///like image manipulation, seeking into complex types in BLOBs, ... more
   ///types will be added.
   /// </summary>
-  public enum ContentType_BYTES
-  {
+  public enum ContentType_BYTES {
     [pbr::OriginalName("GEOMETRY")] Geometry = 1,
     [pbr::OriginalName("JSON")] Json = 2,
     [pbr::OriginalName("XML")] Xml = 3,
@@ -121,8 +116,7 @@ public enum ContentType_BYTES
   ///|DATE     |0x0001 |DATETIME contains only date part           |
   ///|DATETIME |0x0002 |DATETIME contains both date and time parts |
   /// </summary>
-  public enum ContentType_DATETIME
-  {
+  public enum ContentType_DATETIME {
     [pbr::OriginalName("DATE")] Date = 1,
     [pbr::OriginalName("DATETIME")] Datetime = 2,
   }
@@ -136,9 +130,9 @@ public enum ContentType_DATETIME
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class FetchDoneMoreOutParams : pb::IMessage<FetchDoneMoreOutParams>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<FetchDoneMoreOutParams> _parser = new pb::MessageParser<FetchDoneMoreOutParams>(() => new FetchDoneMoreOutParams());
     private pb::UnknownFieldSet _unknownFields;
@@ -148,22 +142,19 @@ public sealed partial class FetchDoneMoreOutParams : pb::IMessage<FetchDoneMoreO
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Resultset.MysqlxResultsetReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FetchDoneMoreOutParams()
-    {
+    public FetchDoneMoreOutParams() {
       OnConstruction();
     }
 
@@ -171,35 +162,29 @@ public FetchDoneMoreOutParams()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FetchDoneMoreOutParams(FetchDoneMoreOutParams other) : this()
-    {
+    public FetchDoneMoreOutParams(FetchDoneMoreOutParams other) : this() {
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FetchDoneMoreOutParams Clone()
-    {
+    public FetchDoneMoreOutParams Clone() {
       return new FetchDoneMoreOutParams(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as FetchDoneMoreOutParams);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FetchDoneMoreOutParams other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(FetchDoneMoreOutParams other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       return Equals(_unknownFields, other._unknownFields);
@@ -207,11 +192,9 @@ public bool Equals(FetchDoneMoreOutParams other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -219,43 +202,37 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (_unknownFields != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -263,10 +240,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FetchDoneMoreOutParams other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(FetchDoneMoreOutParams other) {
+      if (other == null) {
         return;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -274,11 +249,10 @@ public void MergeFrom(FetchDoneMoreOutParams other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -291,31 +265,27 @@ public void MergeFrom(pb::CodedInputStream input)
             break;
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -325,9 +295,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class FetchDoneMoreResultsets : pb::IMessage<FetchDoneMoreResultsets>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<FetchDoneMoreResultsets> _parser = new pb::MessageParser<FetchDoneMoreResultsets>(() => new FetchDoneMoreResultsets());
     private pb::UnknownFieldSet _unknownFields;
@@ -337,22 +307,19 @@ public sealed partial class FetchDoneMoreResultsets : pb::IMessage<FetchDoneMore
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Resultset.MysqlxResultsetReflection.Descriptor.MessageTypes[1]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FetchDoneMoreResultsets()
-    {
+    public FetchDoneMoreResultsets() {
       OnConstruction();
     }
 
@@ -360,35 +327,29 @@ public FetchDoneMoreResultsets()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FetchDoneMoreResultsets(FetchDoneMoreResultsets other) : this()
-    {
+    public FetchDoneMoreResultsets(FetchDoneMoreResultsets other) : this() {
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FetchDoneMoreResultsets Clone()
-    {
+    public FetchDoneMoreResultsets Clone() {
       return new FetchDoneMoreResultsets(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as FetchDoneMoreResultsets);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FetchDoneMoreResultsets other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(FetchDoneMoreResultsets other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       return Equals(_unknownFields, other._unknownFields);
@@ -396,11 +357,9 @@ public bool Equals(FetchDoneMoreResultsets other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -408,43 +367,37 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (_unknownFields != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -452,10 +405,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FetchDoneMoreResultsets other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(FetchDoneMoreResultsets other) {
+      if (other == null) {
         return;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -463,11 +414,10 @@ public void MergeFrom(FetchDoneMoreResultsets other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -480,31 +430,27 @@ public void MergeFrom(pb::CodedInputStream input)
             break;
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -514,9 +460,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class FetchDone : pb::IMessage<FetchDone>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<FetchDone> _parser = new pb::MessageParser<FetchDone>(() => new FetchDone());
     private pb::UnknownFieldSet _unknownFields;
@@ -526,22 +472,19 @@ public sealed partial class FetchDone : pb::IMessage<FetchDone>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Resultset.MysqlxResultsetReflection.Descriptor.MessageTypes[2]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FetchDone()
-    {
+    public FetchDone() {
       OnConstruction();
     }
 
@@ -549,35 +492,29 @@ public FetchDone()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FetchDone(FetchDone other) : this()
-    {
+    public FetchDone(FetchDone other) : this() {
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FetchDone Clone()
-    {
+    public FetchDone Clone() {
       return new FetchDone(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as FetchDone);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FetchDone other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(FetchDone other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       return Equals(_unknownFields, other._unknownFields);
@@ -585,11 +522,9 @@ public bool Equals(FetchDone other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -597,43 +532,37 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (_unknownFields != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -641,10 +570,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FetchDone other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(FetchDone other) {
+      if (other == null) {
         return;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -652,11 +579,10 @@ public void MergeFrom(FetchDone other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -669,31 +595,27 @@ public void MergeFrom(pb::CodedInputStream input)
             break;
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -703,9 +625,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class FetchSuspended : pb::IMessage<FetchSuspended>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<FetchSuspended> _parser = new pb::MessageParser<FetchSuspended>(() => new FetchSuspended());
     private pb::UnknownFieldSet _unknownFields;
@@ -715,22 +637,19 @@ public sealed partial class FetchSuspended : pb::IMessage<FetchSuspended>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Resultset.MysqlxResultsetReflection.Descriptor.MessageTypes[3]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FetchSuspended()
-    {
+    public FetchSuspended() {
       OnConstruction();
     }
 
@@ -738,35 +657,29 @@ public FetchSuspended()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FetchSuspended(FetchSuspended other) : this()
-    {
+    public FetchSuspended(FetchSuspended other) : this() {
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FetchSuspended Clone()
-    {
+    public FetchSuspended Clone() {
       return new FetchSuspended(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as FetchSuspended);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FetchSuspended other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(FetchSuspended other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       return Equals(_unknownFields, other._unknownFields);
@@ -774,11 +687,9 @@ public bool Equals(FetchSuspended other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -786,43 +697,37 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (_unknownFields != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -830,10 +735,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FetchSuspended other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(FetchSuspended other) {
+      if (other == null) {
         return;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -841,11 +744,10 @@ public void MergeFrom(FetchSuspended other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -858,31 +760,27 @@ public void MergeFrom(pb::CodedInputStream input)
             break;
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -1215,9 +1113,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ColumnMetaData : pb::IMessage<ColumnMetaData>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<ColumnMetaData> _parser = new pb::MessageParser<ColumnMetaData>(() => new ColumnMetaData());
     private pb::UnknownFieldSet _unknownFields;
@@ -1228,22 +1126,19 @@ public sealed partial class ColumnMetaData : pb::IMessage<ColumnMetaData>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Resultset.MysqlxResultsetReflection.Descriptor.MessageTypes[4]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ColumnMetaData()
-    {
+    public ColumnMetaData() {
       OnConstruction();
     }
 
@@ -1251,8 +1146,7 @@ public ColumnMetaData()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ColumnMetaData(ColumnMetaData other) : this()
-    {
+    public ColumnMetaData(ColumnMetaData other) : this() {
       _hasBits0 = other._hasBits0;
       type_ = other.type_;
       name_ = other.name_;
@@ -1271,8 +1165,7 @@ public ColumnMetaData(ColumnMetaData other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ColumnMetaData Clone()
-    {
+    public ColumnMetaData Clone() {
       return new ColumnMetaData(this);
     }
 
@@ -1286,11 +1179,9 @@ public ColumnMetaData Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Mysqlx.Resultset.ColumnMetaData.Types.FieldType Type
-    {
+    public global::Mysqlx.Resultset.ColumnMetaData.Types.FieldType Type {
       get { if ((_hasBits0 & 1) != 0) { return type_; } else { return TypeDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         type_ = value;
       }
@@ -1298,15 +1189,13 @@ public ColumnMetaData Clone()
     /// <summary>Gets whether the "type" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasType
-    {
+    public bool HasType {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "type" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearType()
-    {
+    public void ClearType() {
       _hasBits0 &= ~1;
     }
 
@@ -1320,26 +1209,22 @@ public void ClearType()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString Name
-    {
+    public pb::ByteString Name {
       get { return name_ ?? NameDefaultValue; }
-      set
-      {
+      set {
         name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "name" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName
-    {
+    public bool HasName {
       get { return name_ != null; }
     }
     /// <summary>Clears the value of the "name" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName()
-    {
+    public void ClearName() {
       name_ = null;
     }
 
@@ -1353,26 +1238,22 @@ public void ClearName()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString OriginalName
-    {
+    public pb::ByteString OriginalName {
       get { return originalName_ ?? OriginalNameDefaultValue; }
-      set
-      {
+      set {
         originalName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "original_name" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOriginalName
-    {
+    public bool HasOriginalName {
       get { return originalName_ != null; }
     }
     /// <summary>Clears the value of the "original_name" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOriginalName()
-    {
+    public void ClearOriginalName() {
       originalName_ = null;
     }
 
@@ -1386,26 +1267,22 @@ public void ClearOriginalName()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString Table
-    {
+    public pb::ByteString Table {
       get { return table_ ?? TableDefaultValue; }
-      set
-      {
+      set {
         table_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "table" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasTable
-    {
+    public bool HasTable {
       get { return table_ != null; }
     }
     /// <summary>Clears the value of the "table" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearTable()
-    {
+    public void ClearTable() {
       table_ = null;
     }
 
@@ -1419,26 +1296,22 @@ public void ClearTable()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString OriginalTable
-    {
+    public pb::ByteString OriginalTable {
       get { return originalTable_ ?? OriginalTableDefaultValue; }
-      set
-      {
+      set {
         originalTable_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "original_table" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOriginalTable
-    {
+    public bool HasOriginalTable {
       get { return originalTable_ != null; }
     }
     /// <summary>Clears the value of the "original_table" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOriginalTable()
-    {
+    public void ClearOriginalTable() {
       originalTable_ = null;
     }
 
@@ -1452,26 +1325,22 @@ public void ClearOriginalTable()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString Schema
-    {
+    public pb::ByteString Schema {
       get { return schema_ ?? SchemaDefaultValue; }
-      set
-      {
+      set {
         schema_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "schema" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSchema
-    {
+    public bool HasSchema {
       get { return schema_ != null; }
     }
     /// <summary>Clears the value of the "schema" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSchema()
-    {
+    public void ClearSchema() {
       schema_ = null;
     }
 
@@ -1489,26 +1358,22 @@ public void ClearSchema()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString Catalog
-    {
+    public pb::ByteString Catalog {
       get { return catalog_ ?? CatalogDefaultValue; }
-      set
-      {
+      set {
         catalog_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "catalog" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCatalog
-    {
+    public bool HasCatalog {
       get { return catalog_ != null; }
     }
     /// <summary>Clears the value of the "catalog" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCatalog()
-    {
+    public void ClearCatalog() {
       catalog_ = null;
     }
 
@@ -1519,11 +1384,9 @@ public void ClearCatalog()
     private ulong collation_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong Collation
-    {
+    public ulong Collation {
       get { if ((_hasBits0 & 2) != 0) { return collation_; } else { return CollationDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 2;
         collation_ = value;
       }
@@ -1531,15 +1394,13 @@ public ulong Collation
     /// <summary>Gets whether the "collation" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCollation
-    {
+    public bool HasCollation {
       get { return (_hasBits0 & 2) != 0; }
     }
     /// <summary>Clears the value of the "collation" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCollation()
-    {
+    public void ClearCollation() {
       _hasBits0 &= ~2;
     }
 
@@ -1554,11 +1415,9 @@ public void ClearCollation()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint FractionalDigits
-    {
+    public uint FractionalDigits {
       get { if ((_hasBits0 & 4) != 0) { return fractionalDigits_; } else { return FractionalDigitsDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 4;
         fractionalDigits_ = value;
       }
@@ -1566,15 +1425,13 @@ public uint FractionalDigits
     /// <summary>Gets whether the "fractional_digits" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFractionalDigits
-    {
+    public bool HasFractionalDigits {
       get { return (_hasBits0 & 4) != 0; }
     }
     /// <summary>Clears the value of the "fractional_digits" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFractionalDigits()
-    {
+    public void ClearFractionalDigits() {
       _hasBits0 &= ~4;
     }
 
@@ -1588,11 +1445,9 @@ public void ClearFractionalDigits()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint Length
-    {
+    public uint Length {
       get { if ((_hasBits0 & 8) != 0) { return length_; } else { return LengthDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 8;
         length_ = value;
       }
@@ -1600,15 +1455,13 @@ public uint Length
     /// <summary>Gets whether the "length" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasLength
-    {
+    public bool HasLength {
       get { return (_hasBits0 & 8) != 0; }
     }
     /// <summary>Clears the value of the "length" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearLength()
-    {
+    public void ClearLength() {
       _hasBits0 &= ~8;
     }
 
@@ -1639,11 +1492,9 @@ public void ClearLength()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint Flags
-    {
+    public uint Flags {
       get { if ((_hasBits0 & 16) != 0) { return flags_; } else { return FlagsDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 16;
         flags_ = value;
       }
@@ -1651,15 +1502,13 @@ public uint Flags
     /// <summary>Gets whether the "flags" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFlags
-    {
+    public bool HasFlags {
       get { return (_hasBits0 & 16) != 0; }
     }
     /// <summary>Clears the value of the "flags" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFlags()
-    {
+    public void ClearFlags() {
       _hasBits0 &= ~16;
     }
 
@@ -1685,11 +1534,9 @@ public void ClearFlags()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint ContentType
-    {
+    public uint ContentType {
       get { if ((_hasBits0 & 32) != 0) { return contentType_; } else { return ContentTypeDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 32;
         contentType_ = value;
       }
@@ -1697,35 +1544,29 @@ public uint ContentType
     /// <summary>Gets whether the "content_type" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasContentType
-    {
+    public bool HasContentType {
       get { return (_hasBits0 & 32) != 0; }
     }
     /// <summary>Clears the value of the "content_type" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearContentType()
-    {
+    public void ClearContentType() {
       _hasBits0 &= ~32;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as ColumnMetaData);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ColumnMetaData other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(ColumnMetaData other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Type != other.Type) return false;
@@ -1745,8 +1586,7 @@ public bool Equals(ColumnMetaData other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasType) hash ^= Type.GetHashCode();
       if (HasName) hash ^= Name.GetHashCode();
@@ -1760,8 +1600,7 @@ public override int GetHashCode()
       if (HasLength) hash ^= Length.GetHashCode();
       if (HasFlags) hash ^= Flags.GetHashCode();
       if (HasContentType) hash ^= ContentType.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1769,18 +1608,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasType) {
         output.WriteRawTag(8);
         output.WriteEnum((int) Type);
@@ -1832,136 +1669,108 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasType)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasType) {
         output.WriteRawTag(8);
-        output.WriteEnum((int)Type);
+        output.WriteEnum((int) Type);
       }
-      if (HasName)
-      {
+      if (HasName) {
         output.WriteRawTag(18);
         output.WriteBytes(Name);
       }
-      if (HasOriginalName)
-      {
+      if (HasOriginalName) {
         output.WriteRawTag(26);
         output.WriteBytes(OriginalName);
       }
-      if (HasTable)
-      {
+      if (HasTable) {
         output.WriteRawTag(34);
         output.WriteBytes(Table);
       }
-      if (HasOriginalTable)
-      {
+      if (HasOriginalTable) {
         output.WriteRawTag(42);
         output.WriteBytes(OriginalTable);
       }
-      if (HasSchema)
-      {
+      if (HasSchema) {
         output.WriteRawTag(50);
         output.WriteBytes(Schema);
       }
-      if (HasCatalog)
-      {
+      if (HasCatalog) {
         output.WriteRawTag(58);
         output.WriteBytes(Catalog);
       }
-      if (HasCollation)
-      {
+      if (HasCollation) {
         output.WriteRawTag(64);
         output.WriteUInt64(Collation);
       }
-      if (HasFractionalDigits)
-      {
+      if (HasFractionalDigits) {
         output.WriteRawTag(72);
         output.WriteUInt32(FractionalDigits);
       }
-      if (HasLength)
-      {
+      if (HasLength) {
         output.WriteRawTag(80);
         output.WriteUInt32(Length);
       }
-      if (HasFlags)
-      {
+      if (HasFlags) {
         output.WriteRawTag(88);
         output.WriteUInt32(Flags);
       }
-      if (HasContentType)
-      {
+      if (HasContentType) {
         output.WriteRawTag(96);
         output.WriteUInt32(ContentType);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasType)
-      {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int)Type);
+      if (HasType) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
       }
-      if (HasName)
-      {
+      if (HasName) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(Name);
       }
-      if (HasOriginalName)
-      {
+      if (HasOriginalName) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(OriginalName);
       }
-      if (HasTable)
-      {
+      if (HasTable) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(Table);
       }
-      if (HasOriginalTable)
-      {
+      if (HasOriginalTable) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(OriginalTable);
       }
-      if (HasSchema)
-      {
+      if (HasSchema) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(Schema);
       }
-      if (HasCatalog)
-      {
+      if (HasCatalog) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(Catalog);
       }
-      if (HasCollation)
-      {
+      if (HasCollation) {
         size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Collation);
       }
-      if (HasFractionalDigits)
-      {
+      if (HasFractionalDigits) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(FractionalDigits);
       }
-      if (HasLength)
-      {
+      if (HasLength) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Length);
       }
-      if (HasFlags)
-      {
+      if (HasFlags) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Flags);
       }
-      if (HasContentType)
-      {
+      if (HasContentType) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ContentType);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1969,58 +1778,44 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ColumnMetaData other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(ColumnMetaData other) {
+      if (other == null) {
         return;
       }
-      if (other.HasType)
-      {
+      if (other.HasType) {
         Type = other.Type;
       }
-      if (other.HasName)
-      {
+      if (other.HasName) {
         Name = other.Name;
       }
-      if (other.HasOriginalName)
-      {
+      if (other.HasOriginalName) {
         OriginalName = other.OriginalName;
       }
-      if (other.HasTable)
-      {
+      if (other.HasTable) {
         Table = other.Table;
       }
-      if (other.HasOriginalTable)
-      {
+      if (other.HasOriginalTable) {
         OriginalTable = other.OriginalTable;
       }
-      if (other.HasSchema)
-      {
+      if (other.HasSchema) {
         Schema = other.Schema;
       }
-      if (other.HasCatalog)
-      {
+      if (other.HasCatalog) {
         Catalog = other.Catalog;
       }
-      if (other.HasCollation)
-      {
+      if (other.HasCollation) {
         Collation = other.Collation;
       }
-      if (other.HasFractionalDigits)
-      {
+      if (other.HasFractionalDigits) {
         FractionalDigits = other.FractionalDigits;
       }
-      if (other.HasLength)
-      {
+      if (other.HasLength) {
         Length = other.Length;
       }
-      if (other.HasFlags)
-      {
+      if (other.HasFlags) {
         Flags = other.Flags;
       }
-      if (other.HasContentType)
-      {
+      if (other.HasContentType) {
         ContentType = other.ContentType;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -2028,11 +1823,10 @@ public void MergeFrom(ColumnMetaData other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -2093,100 +1887,82 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              Type = (global::Mysqlx.Resultset.ColumnMetaData.Types.FieldType)input.ReadEnum();
-              break;
-            }
-          case 18:
-            {
-              Name = input.ReadBytes();
-              break;
-            }
-          case 26:
-            {
-              OriginalName = input.ReadBytes();
-              break;
-            }
-          case 34:
-            {
-              Table = input.ReadBytes();
-              break;
-            }
-          case 42:
-            {
-              OriginalTable = input.ReadBytes();
-              break;
-            }
-          case 50:
-            {
-              Schema = input.ReadBytes();
-              break;
-            }
-          case 58:
-            {
-              Catalog = input.ReadBytes();
-              break;
-            }
-          case 64:
-            {
-              Collation = input.ReadUInt64();
-              break;
-            }
-          case 72:
-            {
-              FractionalDigits = input.ReadUInt32();
-              break;
-            }
-          case 80:
-            {
-              Length = input.ReadUInt32();
-              break;
-            }
-          case 88:
-            {
-              Flags = input.ReadUInt32();
-              break;
-            }
-          case 96:
-            {
-              ContentType = input.ReadUInt32();
-              break;
-            }
+          case 8: {
+            Type = (global::Mysqlx.Resultset.ColumnMetaData.Types.FieldType) input.ReadEnum();
+            break;
+          }
+          case 18: {
+            Name = input.ReadBytes();
+            break;
+          }
+          case 26: {
+            OriginalName = input.ReadBytes();
+            break;
+          }
+          case 34: {
+            Table = input.ReadBytes();
+            break;
+          }
+          case 42: {
+            OriginalTable = input.ReadBytes();
+            break;
+          }
+          case 50: {
+            Schema = input.ReadBytes();
+            break;
+          }
+          case 58: {
+            Catalog = input.ReadBytes();
+            break;
+          }
+          case 64: {
+            Collation = input.ReadUInt64();
+            break;
+          }
+          case 72: {
+            FractionalDigits = input.ReadUInt32();
+            break;
+          }
+          case 80: {
+            Length = input.ReadUInt32();
+            break;
+          }
+          case 88: {
+            Flags = input.ReadUInt32();
+            break;
+          }
+          case 96: {
+            ContentType = input.ReadUInt32();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
     #region Nested types
     /// <summary>Container for nested types declared in the ColumnMetaData message type.</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types
-    {
-      public enum FieldType
-      {
+    public static partial class Types {
+      public enum FieldType {
         [pbr::OriginalName("SINT")] Sint = 1,
         [pbr::OriginalName("UINT")] Uint = 2,
         [pbr::OriginalName("DOUBLE")] Double = 5,
@@ -2217,9 +1993,9 @@ public enum FieldType
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Row : pb::IMessage<Row>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Row> _parser = new pb::MessageParser<Row>(() => new Row());
     private pb::UnknownFieldSet _unknownFields;
@@ -2229,22 +2005,19 @@ public sealed partial class Row : pb::IMessage<Row>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Resultset.MysqlxResultsetReflection.Descriptor.MessageTypes[5]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Row()
-    {
+    public Row() {
       OnConstruction();
     }
 
@@ -2252,16 +2025,14 @@ public Row()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Row(Row other) : this()
-    {
+    public Row(Row other) : this() {
       field_ = other.field_.Clone();
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Row Clone()
-    {
+    public Row Clone() {
       return new Row(this);
     }
 
@@ -2272,42 +2043,35 @@ public Row Clone()
     private readonly pbc::RepeatedField<pb::ByteString> field_ = new pbc::RepeatedField<pb::ByteString>();
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<pb::ByteString> Field
-    {
+    public pbc::RepeatedField<pb::ByteString> Field {
       get { return field_; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Row);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Row other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Row other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (!field_.Equals(other.field_)) return false;
+      if(!field_.Equals(other.field_)) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       hash ^= field_.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -2315,46 +2079,40 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       field_.WriteTo(output, _repeated_field_codec);
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
       field_.WriteTo(ref output, _repeated_field_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
       size += field_.CalculateSize(_repeated_field_codec);
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -2362,10 +2120,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Row other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Row other) {
+      if (other == null) {
         return;
       }
       field_.Add(other.field_);
@@ -2374,11 +2130,10 @@ public void MergeFrom(Row other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -2395,36 +2150,31 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              field_.AddEntriesFrom(ref input, _repeated_field_codec);
-              break;
-            }
+          case 10: {
+            field_.AddEntriesFrom(ref input, _repeated_field_codec);
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -2433,4 +2183,3 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
-
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSession.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSession.cs
index 6a3c0f640..2a41a63a4 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSession.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSession.cs
@@ -37,23 +37,19 @@
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Mysqlx.Session
-{
+namespace Mysqlx.Session {
 
   /// <summary>Holder for reflection information generated from mysqlx_session.proto</summary>
-  public static partial class MysqlxSessionReflection
-  {
+  public static partial class MysqlxSessionReflection {
 
     #region Descriptor
     /// <summary>File descriptor for mysqlx_session.proto</summary>
-    public static pbr::FileDescriptor Descriptor
-    {
+    public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static MysqlxSessionReflection()
-    {
+    static MysqlxSessionReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChRteXNxbHhfc2Vzc2lvbi5wcm90bxIOTXlzcWx4LlNlc3Npb24aDG15c3Fs",
@@ -87,9 +83,9 @@ static MysqlxSessionReflection()
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class AuthenticateStart : pb::IMessage<AuthenticateStart>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<AuthenticateStart> _parser = new pb::MessageParser<AuthenticateStart>(() => new AuthenticateStart());
     private pb::UnknownFieldSet _unknownFields;
@@ -99,22 +95,19 @@ public sealed partial class AuthenticateStart : pb::IMessage<AuthenticateStart>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Session.MysqlxSessionReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AuthenticateStart()
-    {
+    public AuthenticateStart() {
       OnConstruction();
     }
 
@@ -122,8 +115,7 @@ public AuthenticateStart()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AuthenticateStart(AuthenticateStart other) : this()
-    {
+    public AuthenticateStart(AuthenticateStart other) : this() {
       mechName_ = other.mechName_;
       authData_ = other.authData_;
       initialResponse_ = other.initialResponse_;
@@ -132,8 +124,7 @@ public AuthenticateStart(AuthenticateStart other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AuthenticateStart Clone()
-    {
+    public AuthenticateStart Clone() {
       return new AuthenticateStart(this);
     }
 
@@ -147,26 +138,22 @@ public AuthenticateStart Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string MechName
-    {
+    public string MechName {
       get { return mechName_ ?? MechNameDefaultValue; }
-      set
-      {
+      set {
         mechName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "mech_name" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasMechName
-    {
+    public bool HasMechName {
       get { return mechName_ != null; }
     }
     /// <summary>Clears the value of the "mech_name" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearMechName()
-    {
+    public void ClearMechName() {
       mechName_ = null;
     }
 
@@ -180,26 +167,22 @@ public void ClearMechName()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString AuthData
-    {
+    public pb::ByteString AuthData {
       get { return authData_ ?? AuthDataDefaultValue; }
-      set
-      {
+      set {
         authData_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "auth_data" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasAuthData
-    {
+    public bool HasAuthData {
       get { return authData_ != null; }
     }
     /// <summary>Clears the value of the "auth_data" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearAuthData()
-    {
+    public void ClearAuthData() {
       authData_ = null;
     }
 
@@ -213,46 +196,38 @@ public void ClearAuthData()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString InitialResponse
-    {
+    public pb::ByteString InitialResponse {
       get { return initialResponse_ ?? InitialResponseDefaultValue; }
-      set
-      {
+      set {
         initialResponse_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "initial_response" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasInitialResponse
-    {
+    public bool HasInitialResponse {
       get { return initialResponse_ != null; }
     }
     /// <summary>Clears the value of the "initial_response" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearInitialResponse()
-    {
+    public void ClearInitialResponse() {
       initialResponse_ = null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as AuthenticateStart);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(AuthenticateStart other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(AuthenticateStart other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (MechName != other.MechName) return false;
@@ -263,14 +238,12 @@ public bool Equals(AuthenticateStart other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasMechName) hash ^= MechName.GetHashCode();
       if (HasAuthData) hash ^= AuthData.GetHashCode();
       if (HasInitialResponse) hash ^= InitialResponse.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -278,18 +251,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasMechName) {
         output.WriteRawTag(10);
         output.WriteString(MechName);
@@ -305,55 +276,45 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasMechName)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasMechName) {
         output.WriteRawTag(10);
         output.WriteString(MechName);
       }
-      if (HasAuthData)
-      {
+      if (HasAuthData) {
         output.WriteRawTag(18);
         output.WriteBytes(AuthData);
       }
-      if (HasInitialResponse)
-      {
+      if (HasInitialResponse) {
         output.WriteRawTag(26);
         output.WriteBytes(InitialResponse);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasMechName)
-      {
+      if (HasMechName) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(MechName);
       }
-      if (HasAuthData)
-      {
+      if (HasAuthData) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(AuthData);
       }
-      if (HasInitialResponse)
-      {
+      if (HasInitialResponse) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(InitialResponse);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -361,22 +322,17 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(AuthenticateStart other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(AuthenticateStart other) {
+      if (other == null) {
         return;
       }
-      if (other.HasMechName)
-      {
+      if (other.HasMechName) {
         MechName = other.MechName;
       }
-      if (other.HasAuthData)
-      {
+      if (other.HasAuthData) {
         AuthData = other.AuthData;
       }
-      if (other.HasInitialResponse)
-      {
+      if (other.HasInitialResponse) {
         InitialResponse = other.InitialResponse;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -384,11 +340,10 @@ public void MergeFrom(AuthenticateStart other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -413,46 +368,39 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              MechName = input.ReadString();
-              break;
-            }
-          case 18:
-            {
-              AuthData = input.ReadBytes();
-              break;
-            }
-          case 26:
-            {
-              InitialResponse = input.ReadBytes();
-              break;
-            }
+          case 10: {
+            MechName = input.ReadString();
+            break;
+          }
+          case 18: {
+            AuthData = input.ReadBytes();
+            break;
+          }
+          case 26: {
+            InitialResponse = input.ReadBytes();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -465,9 +413,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class AuthenticateContinue : pb::IMessage<AuthenticateContinue>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<AuthenticateContinue> _parser = new pb::MessageParser<AuthenticateContinue>(() => new AuthenticateContinue());
     private pb::UnknownFieldSet _unknownFields;
@@ -477,22 +425,19 @@ public sealed partial class AuthenticateContinue : pb::IMessage<AuthenticateCont
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Session.MysqlxSessionReflection.Descriptor.MessageTypes[1]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AuthenticateContinue()
-    {
+    public AuthenticateContinue() {
       OnConstruction();
     }
 
@@ -500,16 +445,14 @@ public AuthenticateContinue()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AuthenticateContinue(AuthenticateContinue other) : this()
-    {
+    public AuthenticateContinue(AuthenticateContinue other) : this() {
       authData_ = other.authData_;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AuthenticateContinue Clone()
-    {
+    public AuthenticateContinue Clone() {
       return new AuthenticateContinue(this);
     }
 
@@ -523,46 +466,38 @@ public AuthenticateContinue Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString AuthData
-    {
+    public pb::ByteString AuthData {
       get { return authData_ ?? AuthDataDefaultValue; }
-      set
-      {
+      set {
         authData_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "auth_data" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasAuthData
-    {
+    public bool HasAuthData {
       get { return authData_ != null; }
     }
     /// <summary>Clears the value of the "auth_data" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearAuthData()
-    {
+    public void ClearAuthData() {
       authData_ = null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as AuthenticateContinue);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(AuthenticateContinue other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(AuthenticateContinue other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (AuthData != other.AuthData) return false;
@@ -571,12 +506,10 @@ public bool Equals(AuthenticateContinue other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasAuthData) hash ^= AuthData.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -584,18 +517,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasAuthData) {
         output.WriteRawTag(10);
         output.WriteBytes(AuthData);
@@ -603,37 +534,31 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasAuthData)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasAuthData) {
         output.WriteRawTag(10);
         output.WriteBytes(AuthData);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasAuthData)
-      {
+      if (HasAuthData) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(AuthData);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -641,14 +566,11 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(AuthenticateContinue other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(AuthenticateContinue other) {
+      if (other == null) {
         return;
       }
-      if (other.HasAuthData)
-      {
+      if (other.HasAuthData) {
         AuthData = other.AuthData;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -656,11 +578,10 @@ public void MergeFrom(AuthenticateContinue other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -677,36 +598,31 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              AuthData = input.ReadBytes();
-              break;
-            }
+          case 10: {
+            AuthData = input.ReadBytes();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -716,9 +632,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class AuthenticateOk : pb::IMessage<AuthenticateOk>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<AuthenticateOk> _parser = new pb::MessageParser<AuthenticateOk>(() => new AuthenticateOk());
     private pb::UnknownFieldSet _unknownFields;
@@ -728,22 +644,19 @@ public sealed partial class AuthenticateOk : pb::IMessage<AuthenticateOk>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Session.MysqlxSessionReflection.Descriptor.MessageTypes[2]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AuthenticateOk()
-    {
+    public AuthenticateOk() {
       OnConstruction();
     }
 
@@ -751,16 +664,14 @@ public AuthenticateOk()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AuthenticateOk(AuthenticateOk other) : this()
-    {
+    public AuthenticateOk(AuthenticateOk other) : this() {
       authData_ = other.authData_;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AuthenticateOk Clone()
-    {
+    public AuthenticateOk Clone() {
       return new AuthenticateOk(this);
     }
 
@@ -774,46 +685,38 @@ public AuthenticateOk Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString AuthData
-    {
+    public pb::ByteString AuthData {
       get { return authData_ ?? AuthDataDefaultValue; }
-      set
-      {
+      set {
         authData_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "auth_data" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasAuthData
-    {
+    public bool HasAuthData {
       get { return authData_ != null; }
     }
     /// <summary>Clears the value of the "auth_data" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearAuthData()
-    {
+    public void ClearAuthData() {
       authData_ = null;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as AuthenticateOk);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(AuthenticateOk other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(AuthenticateOk other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (AuthData != other.AuthData) return false;
@@ -822,12 +725,10 @@ public bool Equals(AuthenticateOk other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasAuthData) hash ^= AuthData.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -835,18 +736,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasAuthData) {
         output.WriteRawTag(10);
         output.WriteBytes(AuthData);
@@ -854,37 +753,31 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasAuthData)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasAuthData) {
         output.WriteRawTag(10);
         output.WriteBytes(AuthData);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasAuthData)
-      {
+      if (HasAuthData) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(AuthData);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -892,14 +785,11 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(AuthenticateOk other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(AuthenticateOk other) {
+      if (other == null) {
         return;
       }
-      if (other.HasAuthData)
-      {
+      if (other.HasAuthData) {
         AuthData = other.AuthData;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -907,11 +797,10 @@ public void MergeFrom(AuthenticateOk other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -928,36 +817,31 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              AuthData = input.ReadBytes();
-              break;
-            }
+          case 10: {
+            AuthData = input.ReadBytes();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -969,9 +853,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Reset : pb::IMessage<Reset>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Reset> _parser = new pb::MessageParser<Reset>(() => new Reset());
     private pb::UnknownFieldSet _unknownFields;
@@ -982,22 +866,19 @@ public sealed partial class Reset : pb::IMessage<Reset>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Session.MysqlxSessionReflection.Descriptor.MessageTypes[3]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Reset()
-    {
+    public Reset() {
       OnConstruction();
     }
 
@@ -1005,8 +886,7 @@ public Reset()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Reset(Reset other) : this()
-    {
+    public Reset(Reset other) : this() {
       _hasBits0 = other._hasBits0;
       keepOpen_ = other.keepOpen_;
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -1014,8 +894,7 @@ public Reset(Reset other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Reset Clone()
-    {
+    public Reset Clone() {
       return new Reset(this);
     }
 
@@ -1030,11 +909,9 @@ public Reset Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool KeepOpen
-    {
+    public bool KeepOpen {
       get { if ((_hasBits0 & 1) != 0) { return keepOpen_; } else { return KeepOpenDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         keepOpen_ = value;
       }
@@ -1042,35 +919,29 @@ public bool KeepOpen
     /// <summary>Gets whether the "keep_open" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasKeepOpen
-    {
+    public bool HasKeepOpen {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "keep_open" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearKeepOpen()
-    {
+    public void ClearKeepOpen() {
       _hasBits0 &= ~1;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Reset);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Reset other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Reset other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (KeepOpen != other.KeepOpen) return false;
@@ -1079,12 +950,10 @@ public bool Equals(Reset other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasKeepOpen) hash ^= KeepOpen.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1092,18 +961,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasKeepOpen) {
         output.WriteRawTag(8);
         output.WriteBool(KeepOpen);
@@ -1111,37 +978,31 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasKeepOpen)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasKeepOpen) {
         output.WriteRawTag(8);
         output.WriteBool(KeepOpen);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasKeepOpen)
-      {
+      if (HasKeepOpen) {
         size += 1 + 1;
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1149,14 +1010,11 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Reset other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Reset other) {
+      if (other == null) {
         return;
       }
-      if (other.HasKeepOpen)
-      {
+      if (other.HasKeepOpen) {
         KeepOpen = other.KeepOpen;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1164,11 +1022,10 @@ public void MergeFrom(Reset other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1185,36 +1042,31 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 8:
-            {
-              KeepOpen = input.ReadBool();
-              break;
-            }
+          case 8: {
+            KeepOpen = input.ReadBool();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -1226,9 +1078,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Close : pb::IMessage<Close>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<Close> _parser = new pb::MessageParser<Close>(() => new Close());
     private pb::UnknownFieldSet _unknownFields;
@@ -1238,22 +1090,19 @@ public sealed partial class Close : pb::IMessage<Close>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Session.MysqlxSessionReflection.Descriptor.MessageTypes[4]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Close()
-    {
+    public Close() {
       OnConstruction();
     }
 
@@ -1261,35 +1110,29 @@ public Close()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Close(Close other) : this()
-    {
+    public Close(Close other) : this() {
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Close Clone()
-    {
+    public Close Clone() {
       return new Close(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as Close);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Close other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(Close other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       return Equals(_unknownFields, other._unknownFields);
@@ -1297,11 +1140,9 @@ public bool Equals(Close other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -1309,43 +1150,37 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (_unknownFields != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -1353,10 +1188,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Close other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(Close other) {
+      if (other == null) {
         return;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -1364,11 +1197,10 @@ public void MergeFrom(Close other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -1381,31 +1213,27 @@ public void MergeFrom(pb::CodedInputStream input)
             break;
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -1414,4 +1242,3 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
-
diff --git a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs
index 825b21188..cb711465f 100644
--- a/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs
+++ b/MySQL.Data/src/X/Protocol/X/Protobuf/MysqlxSql.cs
@@ -37,23 +37,19 @@
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Mysqlx.Sql
-{
+namespace Mysqlx.Sql {
 
   /// <summary>Holder for reflection information generated from mysqlx_sql.proto</summary>
-  public static partial class MysqlxSqlReflection
-  {
+  public static partial class MysqlxSqlReflection {
 
     #region Descriptor
     /// <summary>File descriptor for mysqlx_sql.proto</summary>
-    public static pbr::FileDescriptor Descriptor
-    {
+    public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static MysqlxSqlReflection()
-    {
+    static MysqlxSqlReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChBteXNxbHhfc3FsLnByb3RvEgpNeXNxbHguU3FsGgxteXNxbHgucHJvdG8a",
@@ -91,9 +87,9 @@ static MysqlxSqlReflection()
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class StmtExecute : pb::IMessage<StmtExecute>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<StmtExecute> _parser = new pb::MessageParser<StmtExecute>(() => new StmtExecute());
     private pb::UnknownFieldSet _unknownFields;
@@ -104,22 +100,19 @@ public sealed partial class StmtExecute : pb::IMessage<StmtExecute>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Sql.MysqlxSqlReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public StmtExecute()
-    {
+    public StmtExecute() {
       OnConstruction();
     }
 
@@ -127,8 +120,7 @@ public StmtExecute()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public StmtExecute(StmtExecute other) : this()
-    {
+    public StmtExecute(StmtExecute other) : this() {
       _hasBits0 = other._hasBits0;
       namespace_ = other.namespace_;
       stmt_ = other.stmt_;
@@ -139,8 +131,7 @@ public StmtExecute(StmtExecute other) : this()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public StmtExecute Clone()
-    {
+    public StmtExecute Clone() {
       return new StmtExecute(this);
     }
 
@@ -154,26 +145,22 @@ public StmtExecute Clone()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Namespace
-    {
+    public string Namespace {
       get { return namespace_ ?? NamespaceDefaultValue; }
-      set
-      {
+      set {
         namespace_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "namespace" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasNamespace
-    {
+    public bool HasNamespace {
       get { return namespace_ != null; }
     }
     /// <summary>Clears the value of the "namespace" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearNamespace()
-    {
+    public void ClearNamespace() {
       namespace_ = null;
     }
 
@@ -187,26 +174,22 @@ public void ClearNamespace()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString Stmt
-    {
+    public pb::ByteString Stmt {
       get { return stmt_ ?? StmtDefaultValue; }
-      set
-      {
+      set {
         stmt_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
     /// <summary>Gets whether the "stmt" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasStmt
-    {
+    public bool HasStmt {
       get { return stmt_ != null; }
     }
     /// <summary>Clears the value of the "stmt" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearStmt()
-    {
+    public void ClearStmt() {
       stmt_ = null;
     }
 
@@ -220,8 +203,7 @@ public void ClearStmt()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Mysqlx.Datatypes.Any> Args
-    {
+    public pbc::RepeatedField<global::Mysqlx.Datatypes.Any> Args {
       get { return args_; }
     }
 
@@ -236,11 +218,9 @@ public void ClearStmt()
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool CompactMetadata
-    {
+    public bool CompactMetadata {
       get { if ((_hasBits0 & 1) != 0) { return compactMetadata_; } else { return CompactMetadataDefaultValue; } }
-      set
-      {
+      set {
         _hasBits0 |= 1;
         compactMetadata_ = value;
       }
@@ -248,55 +228,47 @@ public bool CompactMetadata
     /// <summary>Gets whether the "compact_metadata" field is set</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCompactMetadata
-    {
+    public bool HasCompactMetadata {
       get { return (_hasBits0 & 1) != 0; }
     }
     /// <summary>Clears the value of the "compact_metadata" field</summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCompactMetadata()
-    {
+    public void ClearCompactMetadata() {
       _hasBits0 &= ~1;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as StmtExecute);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(StmtExecute other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(StmtExecute other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       if (Namespace != other.Namespace) return false;
       if (Stmt != other.Stmt) return false;
-      if (!args_.Equals(other.args_)) return false;
+      if(!args_.Equals(other.args_)) return false;
       if (CompactMetadata != other.CompactMetadata) return false;
       return Equals(_unknownFields, other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
       if (HasNamespace) hash ^= Namespace.GetHashCode();
       if (HasStmt) hash ^= Stmt.GetHashCode();
       hash ^= args_.GetHashCode();
       if (HasCompactMetadata) hash ^= CompactMetadata.GetHashCode();
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -304,18 +276,16 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (HasStmt) {
         output.WriteRawTag(10);
         output.WriteBytes(Stmt);
@@ -332,57 +302,47 @@ public void WriteTo(pb::CodedOutputStream output)
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (HasStmt)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (HasStmt) {
         output.WriteRawTag(10);
         output.WriteBytes(Stmt);
       }
       args_.WriteTo(ref output, _repeated_args_codec);
-      if (HasNamespace)
-      {
+      if (HasNamespace) {
         output.WriteRawTag(26);
         output.WriteString(Namespace);
       }
-      if (HasCompactMetadata)
-      {
+      if (HasCompactMetadata) {
         output.WriteRawTag(32);
         output.WriteBool(CompactMetadata);
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (HasNamespace)
-      {
+      if (HasNamespace) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Namespace);
       }
-      if (HasStmt)
-      {
+      if (HasStmt) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(Stmt);
       }
       size += args_.CalculateSize(_repeated_args_codec);
-      if (HasCompactMetadata)
-      {
+      if (HasCompactMetadata) {
         size += 1 + 1;
       }
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -390,23 +350,18 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(StmtExecute other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(StmtExecute other) {
+      if (other == null) {
         return;
       }
-      if (other.HasNamespace)
-      {
+      if (other.HasNamespace) {
         Namespace = other.Namespace;
       }
-      if (other.HasStmt)
-      {
+      if (other.HasStmt) {
         Stmt = other.Stmt;
       }
       args_.Add(other.args_);
-      if (other.HasCompactMetadata)
-      {
+      if (other.HasCompactMetadata) {
         CompactMetadata = other.CompactMetadata;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -414,11 +369,10 @@ public void MergeFrom(StmtExecute other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -447,51 +401,43 @@ public void MergeFrom(pb::CodedInputStream input)
           }
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
-          case 10:
-            {
-              Stmt = input.ReadBytes();
-              break;
-            }
-          case 18:
-            {
-              args_.AddEntriesFrom(ref input, _repeated_args_codec);
-              break;
-            }
-          case 26:
-            {
-              Namespace = input.ReadString();
-              break;
-            }
-          case 32:
-            {
-              CompactMetadata = input.ReadBool();
-              break;
-            }
+          case 10: {
+            Stmt = input.ReadBytes();
+            break;
+          }
+          case 18: {
+            args_.AddEntriesFrom(ref input, _repeated_args_codec);
+            break;
+          }
+          case 26: {
+            Namespace = input.ReadString();
+            break;
+          }
+          case 32: {
+            CompactMetadata = input.ReadBool();
+            break;
+          }
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -501,9 +447,9 @@ public void MergeFrom(pb::CodedInputStream input)
   /// </summary>
   [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class StmtExecuteOk : pb::IMessage<StmtExecuteOk>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
-#endif
+  #endif
   {
     private static readonly pb::MessageParser<StmtExecuteOk> _parser = new pb::MessageParser<StmtExecuteOk>(() => new StmtExecuteOk());
     private pb::UnknownFieldSet _unknownFields;
@@ -513,22 +459,19 @@ public sealed partial class StmtExecuteOk : pb::IMessage<StmtExecuteOk>
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor
-    {
+    public static pbr::MessageDescriptor Descriptor {
       get { return global::Mysqlx.Sql.MysqlxSqlReflection.Descriptor.MessageTypes[1]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor
-    {
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
       get { return Descriptor; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public StmtExecuteOk()
-    {
+    public StmtExecuteOk() {
       OnConstruction();
     }
 
@@ -536,35 +479,29 @@ public StmtExecuteOk()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public StmtExecuteOk(StmtExecuteOk other) : this()
-    {
+    public StmtExecuteOk(StmtExecuteOk other) : this() {
       _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public StmtExecuteOk Clone()
-    {
+    public StmtExecuteOk Clone() {
       return new StmtExecuteOk(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other)
-    {
+    public override bool Equals(object other) {
       return Equals(other as StmtExecuteOk);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(StmtExecuteOk other)
-    {
-      if (ReferenceEquals(other, null))
-      {
+    public bool Equals(StmtExecuteOk other) {
+      if (ReferenceEquals(other, null)) {
         return false;
       }
-      if (ReferenceEquals(other, this))
-      {
+      if (ReferenceEquals(other, this)) {
         return true;
       }
       return Equals(_unknownFields, other._unknownFields);
@@ -572,11 +509,9 @@ public bool Equals(StmtExecuteOk other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode()
-    {
+    public override int GetHashCode() {
       int hash = 1;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         hash ^= _unknownFields.GetHashCode();
       }
       return hash;
@@ -584,43 +519,37 @@ public override int GetHashCode()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString()
-    {
+    public override string ToString() {
       return pb::JsonFormatter.ToDiagnosticString(this);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       output.WriteRawMessage(this);
-#else
+    #else
       if (_unknownFields != null) {
         _unknownFields.WriteTo(output);
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-    {
-      if (_unknownFields != null)
-      {
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (_unknownFields != null) {
         _unknownFields.WriteTo(ref output);
       }
     }
-#endif
+    #endif
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize()
-    {
+    public int CalculateSize() {
       int size = 0;
-      if (_unknownFields != null)
-      {
+      if (_unknownFields != null) {
         size += _unknownFields.CalculateSize();
       }
       return size;
@@ -628,10 +557,8 @@ public int CalculateSize()
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(StmtExecuteOk other)
-    {
-      if (other == null)
-      {
+    public void MergeFrom(StmtExecuteOk other) {
+      if (other == null) {
         return;
       }
       _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -639,11 +566,10 @@ public void MergeFrom(StmtExecuteOk other)
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input)
-    {
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       input.ReadRawMessage(this);
-#else
+    #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
       if ((tag & 7) == 4) {
@@ -656,31 +582,27 @@ public void MergeFrom(pb::CodedInputStream input)
             break;
         }
       }
-#endif
+    #endif
     }
 
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
-    {
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
-      while ((tag = input.ReadTag()) != 0)
-      {
-        if ((tag & 7) == 4)
-        {
-          // Abort on any end group tag.
-          return;
-        }
-        switch (tag)
-        {
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
         }
       }
     }
-#endif
+    #endif
 
   }
 
@@ -689,4 +611,3 @@ public void MergeFrom(pb::CodedInputStream input)
 }
 
 #endregion Designer generated code
-

From 8e2316ef655820fd20b84d064db25fdbedfdef5b Mon Sep 17 00:00:00 2001
From: Jose Ramirez <jose.m.ramirez@oracle.com>
Date: Wed, 17 Sep 2025 13:11:53 -0600
Subject: [PATCH 95/99] Update EF Core versions

Change-Id: Ie54e4e9612e2efe4933c989197eb26657619b47b
---
 EFCore/src/MySql.EntityFrameworkCore.csproj          | 12 ++++++------
 EFCore/src/Properties/VersionInfo.cs                 |  6 +++---
 .../MySql.EntityFrameworkCore.Basic.Tests.csproj     |  6 +++---
 .../MySql.EntityFrameworkCore.Design.Tests.csproj    |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/EFCore/src/MySql.EntityFrameworkCore.csproj b/EFCore/src/MySql.EntityFrameworkCore.csproj
index 8a96c4f35..b57b92475 100644
--- a/EFCore/src/MySql.EntityFrameworkCore.csproj
+++ b/EFCore/src/MySql.EntityFrameworkCore.csproj
@@ -27,18 +27,18 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.17" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.20" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.20" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0-preview.5.25277.114" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0-preview.5.25277.114" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0-rc.1.25451.107" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0-rc.1.25451.107" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/src/Properties/VersionInfo.cs b/EFCore/src/Properties/VersionInfo.cs
index 78abe2043..649b0811b 100644
--- a/EFCore/src/Properties/VersionInfo.cs
+++ b/EFCore/src/Properties/VersionInfo.cs
@@ -42,17 +42,17 @@
 
 #if NET8_0
 [assembly: AssemblyVersion("9.5.0")]
-[assembly: AssemblyInformationalVersion("8.0.11.0+MySQL9.5.0")]
+[assembly: AssemblyInformationalVersion("8.0.20.0+MySQL9.5.0")]
 [assembly: AssemblyFileVersion("9.5.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 #elif NET9_0
 [assembly: AssemblyVersion("9.5.0")]
-[assembly: AssemblyInformationalVersion("9.0.3.0+MySQL9.5.0")]
+[assembly: AssemblyInformationalVersion("9.0.6.0+MySQL9.5.0")]
 [assembly: AssemblyFileVersion("9.5.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 #elif NET10_0
 [assembly: AssemblyVersion("9.5.0")]
-[assembly: AssemblyInformationalVersion("10.0.0.0-preview+MySQL9.5.0")]
+[assembly: AssemblyInformationalVersion("10.0.0.0-rc+MySQL9.5.0")]
 [assembly: AssemblyFileVersion("9.5.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 #endif
diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
index 686bc7949..7519f9308 100644
--- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj
@@ -18,15 +18,15 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.17" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="8.0.20" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="9.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="9.0.9" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="10.0.0-preview.5.25277.114" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="10.0.0-rc.1.25451.107" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
index f20ecd6d5..38cd82898 100644
--- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
+++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj
@@ -38,11 +38,11 @@
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-preview.5.25277.114" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-rc.1.25451.107" />
   </ItemGroup>
 
   <ItemGroup>

From ec85d8ddd7bf8657b48050d823006310a8369f3d Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipe.silva@oracle.com>
Date: Thu, 18 Sep 2025 22:46:43 +0100
Subject: [PATCH 96/99] Updated the LICENSE files.

Change-Id: Ic886f9aaa2e17e14f8bda76d121abe43bcb97534
---
 LICENSE | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/LICENSE b/LICENSE
index 5bd685ccc..3e201c9b3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Licensing Information User Manual
 
-MySQL Connector/NET 9.4.0 Community
+MySQL Connector/NET 9.5.0 Community
      __________________________________________________________________
 
 Introduction
@@ -8,18 +8,18 @@ Introduction
    This License Information User Manual contains Oracle's product license
    and other licensing information, including licensing information for
    third-party software which may be included in this distribution of
-   MySQL Connector/NET 9.4.0 Community.
+   MySQL Connector/NET 9.5.0 Community.
 
-   Last updated: June 2025
+   Last updated: September 2025
 
 Licensing Information
 
-   This release of MySQL Connector/NET 9.4.0 Community is brought to you
+   This release of MySQL Connector/NET 9.5.0 Community is brought to you
    by the MySQL team at Oracle. This software is released under version 2
    of the GNU General Public License (GPLv2), as set forth below, with the
    following additional permissions:
 
-   This distribution of MySQL Connector/NET 9.4.0 Community is designed to
+   This distribution of MySQL Connector/NET 9.5.0 Community is designed to
    work with certain software (including but not limited to OpenSSL) that
    is licensed under separate terms, as designated in a particular file or
    component or in the license documentation. Without limiting your rights
@@ -2264,4 +2264,4 @@ Written Offer for Source Code
        that included the binary that is the subject of your request, or
 
     b. in the case of code licensed under the GPL v3 for as long as Oracle
-       offers spare parts or customer support for that product model.
\ No newline at end of file
+       offers spare parts or customer support for that product model.

From 907254e11f7c0e0be0057b207d6e738b827368ac Mon Sep 17 00:00:00 2001
From: Jose Ramirez <jose.m.ramirez@oracle.com>
Date: Thu, 18 Sep 2025 16:48:40 -0600
Subject: [PATCH 97/99] Updated Documentation

Change-Id: I2e039948dd063655b4d8b10eb50035bb40e650db
---
 Documentation/index.md |  4 ++--
 README.md              |  2 ++
 Release Notes.txt      | 12 ++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Documentation/index.md b/Documentation/index.md
index 8fed932d0..ff41bd05d 100644
--- a/Documentation/index.md
+++ b/Documentation/index.md
@@ -1,6 +1,6 @@
 ## MySQL Connector/NET and X DevAPI
 
-MySQL Connector/NET 9.4 supports X Protocol, which enables you to use X DevAPI with the .NET language of choice to develop applications that communicate with a MySQL server functioning as a document store, relational database, or both.
+MySQL Connector/NET 9.5 supports X Protocol, which enables you to use X DevAPI with the .NET language of choice to develop applications that communicate with a MySQL server functioning as a document store, relational database, or both.
 
 To get started, review the following main classes:
 
@@ -16,7 +16,7 @@ For an introduction to X DevAPI concepts, see the [X DevAPI User Guide](https://
 
 ## MySQL Connector/NET
 
-MySQL Connector/NET 9.4 also supports the development of .NET, .NET Core and .NET Framework applications that require secure, high-performance data connectivity with MySQL through the classic protocol. It supports ADO.NET, Entity Framework and various web providers.
+MySQL Connector/NET 9.5 also supports the development of .NET, .NET Core and .NET Framework applications that require secure, high-performance data connectivity with MySQL through the classic protocol. It supports ADO.NET, Entity Framework and various web providers.
 
 To get started, review the following main classes:
 
diff --git a/README.md b/README.md
index c9d28945f..13c99f289 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,8 @@ From MySQL Connector/NET 9.3, the driver adds fixes to test suite and support fo
 
 From MySQL Connector/NET 9.4, the driver adds fixes to test suite and support for preview versions of [EF Core 10](https://learn.microsoft.com/en-us/ef/core/what-is-new/ef-core-10.0/whatsnew) and [.NET 10](https://learn.microsoft.com/en-us/dotnet/core/whats-new/dotnet-10/overview).
 
+From MySQL Connector/NET 9.5, the driver adds support for rc versions of [EF Core 10](https://learn.microsoft.com/en-us/ef/core/what-is-new/ef-core-10.0/whatsnew) and [.NET 10](https://learn.microsoft.com/en-us/dotnet/core/whats-new/dotnet-10/overview).
+
 For detailed information please visit the official [MySQL Connector/NET documentation](https://dev.mysql.com/doc/connector-net/en/).
 
 ## Licensing
diff --git a/Release Notes.txt b/Release Notes.txt
index bb3cd1af3..cc10cd5ef 100644
--- a/Release Notes.txt	
+++ b/Release Notes.txt	
@@ -1,10 +1,10 @@
-Connector/NET 9.4 Release Notes
+Connector/NET 9.5 Release Notes
 ------------------------------------
-Welcome to the release notes for Connector/NET 9.4
+Welcome to the release notes for Connector/NET 9.5
 
-What's new in 9.4
+What's new in 9.5
 --------------------
 
-Connector/NET now supports the preview version of .NET 10 and EF Core 10.
-Connector/NET now supports GSSAPI/Kerberos authentication on windows through authentication_ldap_sasl_client plug-in. 
-Connector/NET added fixes to testsuite.
\ No newline at end of file
+Connector/NET now supports the rc version of .NET 10 and EF Core 10.
+Connector/NET has updated the list of supported SSL modes by removing "Prefered" and keeping "Preferred" as the expected option.
+Connector/NET now supports the latest GA versions of the OpenTelemtry.Api(1.12.0), BouncyCastle.Cryptography(2.6.2), Google.Protobuf(3.32.0) and ZstdSharp.Port(0.8.6) NuGet packages.
\ No newline at end of file

From d3415eed434341a4385af0176f459aa2afec7d7b Mon Sep 17 00:00:00 2001
From: Jose Ramirez <jose.m.ramirez@oracle.com>
Date: Tue, 23 Sep 2025 14:37:00 -0600
Subject: [PATCH 98/99] Update EF Core versions (Continuation)

Change-Id: I5f3b204b30226157aea02a8faefdaf9b2b020a5d
---
 .../Query/Internal/MySQLParameterBasedSqlProcessor.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
index 18633c334..f7853f7f8 100644
--- a/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
+++ b/EFCore/src/Query/Internal/MySQLParameterBasedSqlProcessor.cs
@@ -69,7 +69,7 @@ protected override Expression ProcessSqlNullability(
 
       return new MySQLSqlNullabilityProcessor(Dependencies, UseRelationalNulls).Process(selectExpression, parametersValues, out canCache);
     }
-#elif NET9_0_OR_GREATER
+#elif NET9_0
     protected override Expression ProcessSqlNullability(
       Expression selectExpression, IReadOnlyDictionary<string, object?> parametersValues, out bool canCache)
     {
@@ -78,6 +78,15 @@ protected override Expression ProcessSqlNullability(
 
       return new MySQLSqlNullabilityProcessor(Dependencies, Parameters).Process(selectExpression, parametersValues, out canCache);
     }
+#elif NET10_0_OR_GREATER
+    protected override Expression ProcessSqlNullability(
+      Expression selectExpression, ParametersCacheDecorator parametersDecorator)
+    {
+      Check.NotNull(selectExpression, nameof(selectExpression));
+      Check.NotNull(parametersDecorator, nameof(parametersDecorator));
+
+      return new MySQLSqlNullabilityProcessor(Dependencies, Parameters).Process(selectExpression, parametersDecorator);
+    }
 #endif
   }
 }

From ba8e9489e663c13f1841a06ce79c8c55e84a9022 Mon Sep 17 00:00:00 2001
From: Jose Ramirez <jose.m.ramirez@oracle.com>
Date: Tue, 30 Sep 2025 13:57:01 -0600
Subject: [PATCH 99/99] Bug#38490623 [Unable to map GUID data types in EF Core
 10 when used as collections]

Change-Id: I8cee9678e9eecb397d54f5f2e89eb4282278fed0
---
 EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs b/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs
index fd557a648..69860b562 100644
--- a/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs
+++ b/EFCore/src/Storage/Internal/MySQLTypeMappingSource.cs
@@ -315,6 +315,10 @@ protected void Initialize()
                 size: size,
                 fixedLength: isFixedLength);
         }
+        else if (clrType == typeof(Guid[]))
+        {
+          return _clrTypeMappings.FirstOrDefault(t => t.Value.GetType() == typeof(MySQLGuidTypeMapping)).Value;
+        }
       }
 
       return null;