From 5ce6df36675fbe5a758ce3a9031cbdfc8213bad7 Mon Sep 17 00:00:00 2001
From: twerthi <twerthi@hotmail.com>
Date: Tue, 13 Feb 2024 15:30:01 -0800
Subject: [PATCH 1/3] Converting to mysqlconnector

---
 src/dbup-mysql/MySqlConnectionManager.cs |  3 ++-
 src/dbup-mysql/MySqlExtensions.cs        |  2 +-
 src/dbup-mysql/MySqlScriptExecutor.cs    |  6 +-----
 src/dbup-mysql/dbup-mysql.csproj         | 22 ++++++++++++----------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/dbup-mysql/MySqlConnectionManager.cs b/src/dbup-mysql/MySqlConnectionManager.cs
index dde8b6d..5f25c63 100644
--- a/src/dbup-mysql/MySqlConnectionManager.cs
+++ b/src/dbup-mysql/MySqlConnectionManager.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using DbUp.Engine.Transactions;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
+
 
 namespace DbUp.MySql
 {
diff --git a/src/dbup-mysql/MySqlExtensions.cs b/src/dbup-mysql/MySqlExtensions.cs
index 478c6e9..1ce967e 100644
--- a/src/dbup-mysql/MySqlExtensions.cs
+++ b/src/dbup-mysql/MySqlExtensions.cs
@@ -6,7 +6,7 @@
 using DbUp.Engine.Output;
 using DbUp.Engine.Transactions;
 using DbUp.MySql;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 
 /// <summary>
 /// Configuration extension methods for MySql.
diff --git a/src/dbup-mysql/MySqlScriptExecutor.cs b/src/dbup-mysql/MySqlScriptExecutor.cs
index 5e221a6..4d01964 100644
--- a/src/dbup-mysql/MySqlScriptExecutor.cs
+++ b/src/dbup-mysql/MySqlScriptExecutor.cs
@@ -4,7 +4,7 @@
 using DbUp.Engine.Output;
 using DbUp.Engine.Transactions;
 using DbUp.Support;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 
 namespace DbUp.MySql
 {
@@ -41,11 +41,7 @@ protected override void ExecuteCommandsWithinExceptionHandler(int index, SqlScri
             }
             catch (MySqlException exception)
             {
-#if MY_SQL_DATA_6_9_5
                 var code = exception.ErrorCode;
-#else
-                var code = exception.Code;
-#endif
                 Log().WriteInformation("MySql exception has occurred in script: '{0}'", script.Name);
                 Log().WriteError("Script block number: {0}; MySql error code: {1}; Number {2}; Message: {3}", index, code, exception.Number, exception.Message);
                 Log().WriteError(exception.ToString());
diff --git a/src/dbup-mysql/dbup-mysql.csproj b/src/dbup-mysql/dbup-mysql.csproj
index 46809e4..c0e0d15 100644
--- a/src/dbup-mysql/dbup-mysql.csproj
+++ b/src/dbup-mysql/dbup-mysql.csproj
@@ -6,7 +6,7 @@
     <Company>DbUp Contributors</Company>
     <Product>DbUp</Product>
     <Copyright>Copyright © DbUp Contributors 2015</Copyright>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <AssemblyName>dbup-mysql</AssemblyName>
     <RootNamespace>DbUp.MySql</RootNamespace>
     <PackageId>dbup-mysql</PackageId>
@@ -14,6 +14,7 @@
     <SignAssembly>true</SignAssembly>
     <RepositoryUrl>https://github.com/DbUp/dbup-mysql.git</RepositoryUrl>
     <PackageIcon>dbup-icon.png</PackageIcon>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
@@ -21,25 +22,26 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="dbup-core" Version="5.0.37"/>
+    <PackageReference Include="dbup-core" Version="5.0.37" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-    <Reference Include="System"/>
-    <PackageReference Include="MySql.Data" Version="6.9.5"/>
+    <PackageReference Include="MySqlConnector">
+      <Version>2.3.5</Version>
+    </PackageReference>
+    <Reference Include="System" />
+    <PackageReference Include="MySql.Data" Version="6.9.5" />
     <!-- last version to support < .NET 4.5.2. -->
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
-    <PackageReference Include="MySql.Data" Version="6.10.9"/>
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="MySql.Data" Version="8.0.33"/>
+    <PackageReference Include="MySqlConnector">
+      <Version>2.3.5</Version>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <None Visible="false" Include="../dbup-icon.png" Pack="True" PackagePath=""/>
+    <None Visible="false" Include="../dbup-icon.png" Pack="True" PackagePath="" />
   </ItemGroup>
 </Project>

From 7851709bdee6a304c3d6d88dd573d0d4ccf51586 Mon Sep 17 00:00:00 2001
From: Shawn Sesna <shawn.sesna@octopus.com>
Date: Mon, 18 Mar 2024 08:58:23 -0700
Subject: [PATCH 2/3] Update dbup-mysql.csproj

---
 src/dbup-mysql/dbup-mysql.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/dbup-mysql/dbup-mysql.csproj b/src/dbup-mysql/dbup-mysql.csproj
index 36b45b3..1d3a39f 100644
--- a/src/dbup-mysql/dbup-mysql.csproj
+++ b/src/dbup-mysql/dbup-mysql.csproj
@@ -14,7 +14,6 @@
     <SignAssembly>true</SignAssembly>
     <RepositoryUrl>https://github.com/DbUp/dbup-mysql.git</RepositoryUrl>
     <PackageIcon>dbup-icon.png</PackageIcon>
-    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(CI)' == 'true'">

From 7227e8ad4c1b7222b9986a97470b9d9e5153eba2 Mon Sep 17 00:00:00 2001
From: Robert Wagner <robert.wagner@octopus.com>
Date: Tue, 19 Mar 2024 13:18:41 +1000
Subject: [PATCH 3/3] Referenced MySqlConnector

---
 src/dbup-mysql/MySqlScriptExecutor.cs | 4 ++--
 src/dbup-mysql/dbup-mysql.csproj      | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/dbup-mysql/MySqlScriptExecutor.cs b/src/dbup-mysql/MySqlScriptExecutor.cs
index eebc547..8fff2f5 100644
--- a/src/dbup-mysql/MySqlScriptExecutor.cs
+++ b/src/dbup-mysql/MySqlScriptExecutor.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using DbUp.Engine;
 using DbUp.Engine.Output;
@@ -41,7 +41,7 @@ protected override void ExecuteCommandsWithinExceptionHandler(int index, SqlScri
             }
             catch (MySqlException exception)
             {
-                var code = exception.Code;
+                var code = exception.ErrorCode;
                 Log().LogInformation("MySql exception has occurred in script: '{0}'", script.Name);
                 Log().LogError("Script block number: {0}; MySql error code: {1}; Number {2}; Message: {3}", index, code, exception.Number, exception.Message);
                 Log().LogError(exception.ToString());
diff --git a/src/dbup-mysql/dbup-mysql.csproj b/src/dbup-mysql/dbup-mysql.csproj
index 1d3a39f..7815340 100644
--- a/src/dbup-mysql/dbup-mysql.csproj
+++ b/src/dbup-mysql/dbup-mysql.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>DbUp makes it easy to deploy and upgrade SQL Server databases. This package adds MySql support.</Description>
@@ -21,14 +21,13 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources> <!-- Embed source files that are not tracked by the source control manager in the PDB -->
     <DebugType>embedded</DebugType> <!-- Recommended: Embed symbols containing Source Link in the main file (exe/dll) -->
   </PropertyGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="dbup-core" Version="6.0.0-beta.108"/>
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
-    <PackageReference Include="MySql.Data" Version="8.3.0" />
+    <PackageReference Include="MySqlConnector" Version="2.3.5"/>
   </ItemGroup>
 
   <ItemGroup>
-    <None Visible="false" Include="../dbup-icon.png" Pack="True" PackagePath="" />
+    <None Visible="false" Include="../dbup-icon.png" Pack="True" PackagePath=""/>
   </ItemGroup>
 </Project>