Switch to MySqlConnector and bundle dependencies where possible

ads102003 · ads102003 · commit fce895e4cc85 · 2026-01-08T01:59:31.000Z
diff --git a/.editorconfig b/.editorconfig
@@ -1,6 +1,9 @@
 # EditorConfig is awesome: http://editorconfig.org
 root = true
 
+[*.*]
+indent_size = 2
+
 [*.cs]
 end_of_line = lf
 insert_final_newline = true
diff --git a/src/Connection.cs b/src/Connection.cs
@@ -1,7 +1,11 @@
-﻿#if NET35
+#if NET35
 using System.Security.Permissions;
 #endif
+#if USE_MYSQLCONNECTOR
+using MySqlConnector;
+#else
 using MySql.Data.MySqlClient;
+#endif
 using Oxide.Core.Plugins;
 
 namespace Oxide.Ext.MySql
diff --git a/src/ILRepack.Exclude.txt b/src/ILRepack.Exclude.txt
@@ -0,0 +1,3 @@
+^MySqlConnector
+^Oxide\.MySql
+^Oxide\.Core\.MySql
diff --git a/src/Libraries/MySql.cs b/src/Libraries/MySql.cs
@@ -1,4 +1,8 @@
-﻿﻿using MySql.Data.MySqlClient;
+#if USE_MYSQLCONNECTOR
+using MySqlConnector;
+#else
+using MySql.Data.MySqlClient;
+#endif
 using Oxide.Core.Database;
 using Oxide.Core.Libraries;
 using Oxide.Core.Plugins;
@@ -17,10 +21,10 @@ public class MySql : Library, IDatabaseProvider
         private readonly object _syncroot = new object();
         private readonly AutoResetEvent _workevent = new AutoResetEvent(false);
         private readonly HashSet<Connection> _runningConnections = new HashSet<Connection>();
-        private bool _running = true;
         private readonly Dictionary<string, Dictionary<string, Connection>> _connections = new Dictionary<string, Dictionary<string, Connection>>();
         private readonly Thread _worker;
         private readonly Dictionary<Plugin, Event.Callback<Plugin, PluginManager>> _pluginRemovedFromManager;
+        private bool _running = true;
 
         /// <summary>
         /// Represents a single MySqlQuery instance
@@ -54,7 +58,6 @@ public class MySqlQuery
 
             private MySqlCommand _cmd;
             private MySqlConnection _connection;
-            private IAsyncResult _result;
 
             private void Cleanup()
             {
@@ -77,8 +80,7 @@ public bool Handle()
                     {
                         throw new Exception("Connection is null");
                     }
-                    //if (_result == null)
-                    //{
+
                     _connection = (MySqlConnection)Connection.Con;
                     if (_connection.State == ConnectionState.Closed)
                     {
@@ -89,17 +91,14 @@ public bool Handle()
                     _cmd.CommandTimeout = 120;
                     _cmd.CommandText = Sql.SQL;
                     Sql.AddParams(_cmd, Sql.Arguments, "@");
-                    _result = NonQuery ? _cmd.BeginExecuteNonQuery() : _cmd.BeginExecuteReader();
-                    //}
-                    _result.AsyncWaitHandle.WaitOne();
-                    //if (!_result.IsCompleted) return false;
+
                     if (NonQuery)
                     {
-                        nonQueryResult = _cmd.EndExecuteNonQuery(_result);
+                        nonQueryResult = _cmd.ExecuteNonQuery();
                     }
                     else
                     {
-                        using (MySqlDataReader reader = _cmd.EndExecuteReader(_result))
+                        using (MySqlDataReader reader = _cmd.ExecuteReader())
                         {
                             list = new List<Dictionary<string, object>>();
                             while (reader.Read())
@@ -108,15 +107,18 @@ public bool Handle()
                                 {
                                     break;
                                 }
+
                                 var dict = new Dictionary<string, object>();
                                 for (int i = 0; i < reader.FieldCount; i++)
                                 {
                                     dict.Add(reader.GetName(i), reader.GetValue(i));
                                 }
+
                                 list.Add(dict);
                             }
                         }
                     }
+
                     lastInsertRowId = _cmd.LastInsertedId;
                     Cleanup();
                 }
@@ -131,6 +133,7 @@ public bool Handle()
                     Interface.Oxide.LogException(message, ex);
                     Cleanup();
                 }
+
                 Interface.Oxide.NextTick(() =>
                 {
                     Connection?.Plugin?.TrackStart();
@@ -160,6 +163,7 @@ public bool Handle()
 
                         Interface.Oxide.LogException(message, ex);
                     }
+
                     Connection?.Plugin?.TrackEnd();
                 });
                 return true;
@@ -200,6 +204,7 @@ private void Worker()
                         _runningConnections.Clear();
                     }
                 }
+
                 if (query != null)
                 {
                     query.Handle();
@@ -251,6 +256,7 @@ public Connection OpenDb(string conStr, Plugin plugin, bool persistent = false)
                 };
                 connections[conStr] = connection;
             }
+
             if (plugin != null && !_pluginRemovedFromManager.ContainsKey(plugin))
             {
                 _pluginRemovedFromManager[plugin] = plugin.OnRemovedFromManager.Add(OnRemovedFromManager);
@@ -279,8 +285,10 @@ private void OnRemovedFromManager(Plugin sender, PluginManager manager)
                     connection.Value.Con?.Close();
                     connection.Value.Plugin = null;
                 }
+
                 _connections.Remove(sender.Name);
             }
+
             Event.Callback<Plugin, PluginManager> event_callback;
             if (_pluginRemovedFromManager.TryGetValue(sender, out event_callback))
             {
@@ -315,6 +323,7 @@ public void CloseDb(Connection db)
                     }
                 }
             }
+
             db.Con?.Close();
             db.Plugin = null;
         }
diff --git a/src/Oxide.MySql.csproj b/src/Oxide.MySql.csproj
@@ -1,4 +1,4 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <Import Project="..\netfx.props" />
@@ -16,29 +16,43 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <NoWarn>NU1701;NU5128</NoWarn>
   </PropertyGroup>
+  <PropertyGroup>
+    <UseMySqlData>false</UseMySqlData>
+    <UseMySqlData Condition="'$(TargetFramework)' == 'net35' Or '$(TargetFramework)' == 'net40' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net46'">true</UseMySqlData>
+    <UseMySqlConnector>false</UseMySqlConnector>
+    <UseMySqlConnector Condition="'$(TargetFramework)' == 'net48' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1'">true</UseMySqlConnector>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(UseMySqlConnector)' == 'true'">
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <DefineConstants>$(DefineConstants);USE_MYSQLCONNECTOR</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Oxide.Core" Version="2.0.*" />
-    <Content Include="Dependencies\*.*" Exclude="Dependencies\MySql.Data.dll" PackagePath="lib\any" />
     <None Include="..\resources\icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net35'">
-    <Reference Include="MySql.Data">
-      <HintPath>Dependencies\MySql.Data.dll</HintPath>
-    </Reference>
+    <Reference Include="MySql.Data" HintPath="Dependencies\MySql.Data.dll" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(UseMySqlData)' == 'true' And '$(TargetFramework)' != 'net35'">
+    <PackageReference Include="MySql.Data" Version="6.9.12" PrivateAssets="all" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net40' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net46'">
-    <PackageReference Include="MySql.Data" Version="6.9.12" />
+  <ItemGroup Condition="'$(UseMySqlConnector)' == 'true'">
+    <PackageReference Include="MySqlConnector" Version="2.3.7" PrivateAssets="all" />
+    <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.18.1" PrivateAssets="all" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net48' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="MySql.Data" Version="9.5.0" />
+  <ItemGroup Condition="Exists('Dependencies\MySql.Data.dll')">
+    <None Include="Dependencies\MySql.Data.dll" Pack="true" PackagePath="lib\net35" />
+    <None Include="$(NuGetPackageRoot)mysql.data\6.9.12\lib\net40\MySql.Data.dll" Pack="true" PackagePath="lib\net40" />
+    <None Include="$(NuGetPackageRoot)mysql.data\6.9.12\lib\net45\MySql.Data.dll" Pack="true" PackagePath="lib\net45;lib\net46" />
+    <None Include="Dependencies\I18N*.dll" Pack="true" PackagePath="lib\net35;lib\net40;lib\net45;lib\net46" />
+    <None Include="Dependencies\System.Configuration.Install.dll" Pack="true" PackagePath="lib\net35;lib\net40;lib\net45;lib\net46" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Dependencies\MySql.Data.dll" Condition="Exists('Dependencies\MySql.Data.dll')">
-      <Pack>true</Pack>
-      <PackagePath>lib\net35</PackagePath>
-    </None>
+    <None Include="$(NuGetPackageRoot)microsoft.extensions.logging.abstractions\7.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll" Pack="true" PackagePath="lib\net48" />
+    <None Include="$(NuGetPackageRoot)microsoft.extensions.logging.abstractions\7.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll" Pack="true" PackagePath="lib\netstandard2.0;lib\netstandard2.1" />
   </ItemGroup>
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+  <Import Project="OxideILRepack.targets" Condition="Exists('OxideILRepack.targets')" />
   <Target Name="ChangeAliasesOfStrongNameAssemblies" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
     <ItemGroup>
       <ReferencePath Condition="'%(FileName)' == 'Oxide.References'">
diff --git a/src/OxideILRepack.targets b/src/OxideILRepack.targets
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShouldILRepack>false</ShouldILRepack>
+    <ShouldILRepack Condition="'$(TargetFramework)' == 'net48' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1'">true</ShouldILRepack>
+  </PropertyGroup>
+  <Target Name="ILRepack" AfterTargets="Build" Condition="'$(ShouldILRepack)' == 'true'">
+    <Message Text="[ILRepack] Starting merge for $(TargetFramework)..." Importance="high" />
+    <PropertyGroup>
+      <PrimaryAssembly>$(OutputPath)$(TargetName)$(TargetExt)</PrimaryAssembly>
+      <MergedOutputPath>$(OutputPath)merged\$(TargetName)$(TargetExt)</MergedOutputPath>
+      <InternalizeExcludeFile>$(ProjectDir)ILRepack.Exclude.txt</InternalizeExcludeFile>
+      <ILRepackExe>$(NuGetPackageRoot)ilrepack\2.0.18\tools\ILRepack.exe</ILRepackExe>
+      <ILRepackExe Condition="!Exists('$(ILRepackExe)')">$(USERPROFILE)\.nuget\packages\ilrepack\2.0.18\tools\ILRepack.exe</ILRepackExe>
+    </PropertyGroup>
+    <ItemGroup>
+      <DependencyToMerge Include="MySqlConnector" />
+      <DependencyToMerge Include="System.Buffers" />
+      <DependencyToMerge Include="System.Diagnostics.DiagnosticSource" />
+      <DependencyToMerge Include="System.Memory" />
+      <DependencyToMerge Include="System.Numerics.Vectors" />
+      <DependencyToMerge Include="System.Runtime.CompilerServices.Unsafe" />
+      <DependencyToMerge Include="System.Threading.Tasks.Extensions" />
+    </ItemGroup>
+    <ItemGroup>
+      <MergeAssemblies Include="$(PrimaryAssembly)" />
+      <MergeAssemblies Include="$(OutputPath)%(DependencyToMerge.Identity).dll" Condition="Exists('$(OutputPath)%(DependencyToMerge.Identity).dll')" />
+    </ItemGroup>
+    <PropertyGroup>
+      <ILRepackArgs>/parallel /internalize:$(InternalizeExcludeFile) /copyattrs /allowMultiple /allowDup /union /target:library /out:$(MergedOutputPath) /lib:$(OutputPath) @(MergeAssemblies, ' ')</ILRepackArgs>
+    </PropertyGroup>
+    <MakeDir Directories="$(OutputPath)merged" />
+    <Exec Command="&quot;$(ILRepackExe)&quot; $(ILRepackArgs)" WorkingDirectory="$(ProjectDir)" />
+    <Message Text="[ILRepack] Merge completed, replacing original assembly..." Importance="high" />
+    <Copy SourceFiles="$(MergedOutputPath)" DestinationFiles="$(PrimaryAssembly)" />
+    <Copy SourceFiles="$(OutputPath)merged\$(TargetName).pdb" DestinationFiles="$(OutputPath)$(TargetName).pdb" Condition="Exists('$(OutputPath)merged\$(TargetName).pdb')" />
+    <RemoveDir Directories="$(OutputPath)merged" />
+    <ItemGroup>
+      <FilesToDelete Include="$(OutputPath)%(DependencyToMerge.Identity).dll" />
+      <FilesToDelete Include="$(OutputPath)%(DependencyToMerge.Identity).xml" />
+      <FilesToDelete Include="$(OutputPath)$(TargetName).deps.json" />
+    </ItemGroup>
+    <Delete Files="@(FilesToDelete)" ContinueOnError="true" />
+    <Message Text="[ILRepack] Cleanup completed successfully!" Importance="high" />
+  </Target>
+
+</Project>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+^MySqlConnector`
	`2`	`+^Oxide\.MySql`
	`3`	`+^Oxide\.Core\.MySql`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`		`-using MySql.Data.MySqlClient;`
	`1`	`+#if USE_MYSQLCONNECTOR`
	`2`	`+using MySqlConnector;`
	`3`	`+#else`
	`4`	`+using MySql.Data.MySqlClient;`
	`5`	`+#endif`
`2`	`6`	`using Oxide.Core.Database;`
`3`	`7`	`using Oxide.Core.Libraries;`
`4`	`8`	`using Oxide.Core.Plugins;`
`@@ -17,10 +21,10 @@ public class MySql : Library, IDatabaseProvider`
`17`	`21`	`private readonly object _syncroot = new object();`
`18`	`22`	`private readonly AutoResetEvent _workevent = new AutoResetEvent(false);`
`19`	`23`	`private readonly HashSet<Connection> _runningConnections = new HashSet<Connection>();`
`20`		`- private bool _running = true;`
`21`	`24`	`private readonly Dictionary<string, Dictionary<string, Connection>> _connections = new Dictionary<string, Dictionary<string, Connection>>();`
`22`	`25`	`private readonly Thread _worker;`
`23`	`26`	`private readonly Dictionary<Plugin, Event.Callback<Plugin, PluginManager>> _pluginRemovedFromManager;`
	`27`	`+ private bool _running = true;`
`24`	`28`
`25`	`29`	`/// <summary>`
`26`	`30`	`/// Represents a single MySqlQuery instance`
`@@ -54,7 +58,6 @@ public class MySqlQuery`
`54`	`58`
`55`	`59`	`private MySqlCommand _cmd;`
`56`	`60`	`private MySqlConnection _connection;`
`57`		`- private IAsyncResult _result;`
`58`	`61`
`59`	`62`	`private void Cleanup()`
`60`	`63`	`{`
`@@ -77,8 +80,7 @@ public bool Handle()`
`77`	`80`	`{`
`78`	`81`	`throw new Exception("Connection is null");`
`79`	`82`	`}`
`80`		`- //if (_result == null)`
`81`		`- //{`
	`83`	`+`
`82`	`84`	`_connection = (MySqlConnection)Connection.Con;`
`83`	`85`	`if (_connection.State == ConnectionState.Closed)`
`84`	`86`	`{`
`@@ -89,17 +91,14 @@ public bool Handle()`
`89`	`91`	`_cmd.CommandTimeout = 120;`
`90`	`92`	`_cmd.CommandText = Sql.SQL;`
`91`	`93`	`Sql.AddParams(_cmd, Sql.Arguments, "@");`
`92`		`- _result = NonQuery ? _cmd.BeginExecuteNonQuery() : _cmd.BeginExecuteReader();`
`93`		`- //}`
`94`		`- _result.AsyncWaitHandle.WaitOne();`
`95`		`- //if (!_result.IsCompleted) return false;`
	`94`	`+`
`96`	`95`	`if (NonQuery)`
`97`	`96`	`{`
`98`		`- nonQueryResult = _cmd.EndExecuteNonQuery(_result);`
	`97`	`+ nonQueryResult = _cmd.ExecuteNonQuery();`
`99`	`98`	`}`
`100`	`99`	`else`
`101`	`100`	`{`
`102`		`- using (MySqlDataReader reader = _cmd.EndExecuteReader(_result))`
	`101`	`+ using (MySqlDataReader reader = _cmd.ExecuteReader())`
`103`	`102`	`{`
`104`	`103`	`list = new List<Dictionary<string, object>>();`
`105`	`104`	`while (reader.Read())`
`@@ -108,15 +107,18 @@ public bool Handle()`
`108`	`107`	`{`
`109`	`108`	`break;`
`110`	`109`	`}`
	`110`	`+`
`111`	`111`	`var dict = new Dictionary<string, object>();`
`112`	`112`	`for (int i = 0; i < reader.FieldCount; i++)`
`113`	`113`	`{`
`114`	`114`	`dict.Add(reader.GetName(i), reader.GetValue(i));`
`115`	`115`	`}`
	`116`	`+`
`116`	`117`	`list.Add(dict);`
`117`	`118`	`}`
`118`	`119`	`}`
`119`	`120`	`}`
	`121`	`+`
`120`	`122`	`lastInsertRowId = _cmd.LastInsertedId;`
`121`	`123`	`Cleanup();`
`122`	`124`	`}`
`@@ -131,6 +133,7 @@ public bool Handle()`
`131`	`133`	`Interface.Oxide.LogException(message, ex);`
`132`	`134`	`Cleanup();`
`133`	`135`	`}`
	`136`	`+`
`134`	`137`	`Interface.Oxide.NextTick(() =>`
`135`	`138`	`{`
`136`	`139`	`Connection?.Plugin?.TrackStart();`
`@@ -160,6 +163,7 @@ public bool Handle()`
`160`	`163`
`161`	`164`	`Interface.Oxide.LogException(message, ex);`
`162`	`165`	`}`
	`166`	`+`
`163`	`167`	`Connection?.Plugin?.TrackEnd();`
`164`	`168`	`});`
`165`	`169`	`return true;`
`@@ -200,6 +204,7 @@ private void Worker()`
`200`	`204`	`_runningConnections.Clear();`
`201`	`205`	`}`
`202`	`206`	`}`
	`207`	`+`
`203`	`208`	`if (query != null)`
`204`	`209`	`{`
`205`	`210`	`query.Handle();`
`@@ -251,6 +256,7 @@ public Connection OpenDb(string conStr, Plugin plugin, bool persistent = false)`
`251`	`256`	`};`
`252`	`257`	`connections[conStr] = connection;`
`253`	`258`	`}`
	`259`	`+`
`254`	`260`	`if (plugin != null && !_pluginRemovedFromManager.ContainsKey(plugin))`
`255`	`261`	`{`
`256`	`262`	`_pluginRemovedFromManager[plugin] = plugin.OnRemovedFromManager.Add(OnRemovedFromManager);`
`@@ -279,8 +285,10 @@ private void OnRemovedFromManager(Plugin sender, PluginManager manager)`
`279`	`285`	`connection.Value.Con?.Close();`
`280`	`286`	`connection.Value.Plugin = null;`
`281`	`287`	`}`
	`288`	`+`
`282`	`289`	`_connections.Remove(sender.Name);`
`283`	`290`	`}`
	`291`	`+`
`284`	`292`	`Event.Callback<Plugin, PluginManager> event_callback;`
`285`	`293`	`if (_pluginRemovedFromManager.TryGetValue(sender, out event_callback))`
`286`	`294`	`{`
`@@ -315,6 +323,7 @@ public void CloseDb(Connection db)`
`315`	`323`	`}`
`316`	`324`	`}`
`317`	`325`	`}`
	`326`	`+`
`318`	`327`	`db.Con?.Close();`
`319`	`328`	`db.Plugin = null;`
`320`	`329`	`}`