Skip to content

Commit 8369231

Browse files
SkyTech6SkyTech6
committed
Swap to MySqlConnector
1 parent e2435f5 commit 8369231

File tree

3 files changed

+33
-27
lines changed

3 files changed

+33
-27
lines changed

‎CrimsonSQL.csproj‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
4-
<AssemblyName>CrimsonSQL</AssemblyName>
5-
<Description>A V Rising Framework for using MySQL</Description>
6-
<Version>0.1.10</Version>
7-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
8-
<LangVersion>latest</LangVersion>
9-
<RootNamespace>CrimsonSQL</RootNamespace>
10-
<AssemblyVersion>0.1.10.0</AssemblyVersion>
11-
<FileVersion>0.1.10.0</FileVersion>
12-
<InformationalVersion>0.1.10+1.Branch.main.Sha.c33d0879382e1a0da34861ec55914ba7e637a80e</InformationalVersion>
13-
</PropertyGroup>
14-
<Target Name="Thunderstore Copy to Dist" AfterTargets="AfterBuild" Condition=" '$(Configuration' == 'Release'">
2+
<PropertyGroup>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<AssemblyName>CrimsonSQL</AssemblyName>
5+
<Description>A V Rising Framework for using MySQL</Description>
6+
<Version>0.1.10</Version>
7+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
8+
<LangVersion>latest</LangVersion>
9+
<RootNamespace>CrimsonSQL</RootNamespace>
10+
<AssemblyVersion>0.1.10.0</AssemblyVersion>
11+
<FileVersion>0.1.10.0</FileVersion>
12+
<InformationalVersion>0.1.10+1.Branch.main.Sha.c33d0879382e1a0da34861ec55914ba7e637a80e</InformationalVersion>
13+
</PropertyGroup>
14+
<Target Name="Thunderstore Copy to Dist" AfterTargets="AfterBuild"
15+
Condition=" '$(Configuration' == 'Release'">
1516
<Copy SourceFiles="$(OutDir)\CrimsonSQL.dll" DestinationFolder="$(SolutionDir)/dist" />
1617
</Target>
1718
<ItemGroup>
18-
<PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.721" IncludeAssets="compile" />
19+
<PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.721"
20+
IncludeAssets="compile" />
1921
<PackageReference Include="BepInEx.Core" Version="6.0.0-be.721" IncludeAssets="compile" />
2022
<PackageReference Include="BepInEx.PluginInfoProps" Version="2.*" />
2123
<PackageReference Include="Costura.Fody" Version="5.7.0">
@@ -24,7 +26,6 @@
2426
<PackageReference Include="Fody" Version="6.9.1">
2527
<PrivateAssets>all</PrivateAssets>
2628
</PackageReference>
27-
<PackageReference Include="MySql.Data" Version="8.0.22" />
2829
<PackageReference Include="MySqlConnector" Version="2.4.0" />
2930
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
3031
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
@@ -35,13 +36,19 @@
3536
<Folder Include="images\" />
3637
</ItemGroup>
3738
<ItemGroup>
38-
<EmbeddedResource Include="$(NuGetPackageRoot)mysql.data\8.0.22\lib\net5.0\MySql.Data.dll" />
39-
<EmbeddedResource Include="$(NuGetPackageRoot)system.diagnostics.diagnosticsource\8.0.1\lib\net6.0\System.Diagnostics.DiagnosticSource.dll" />
40-
<EmbeddedResource Include="$(NuGetPackageRoot)system.security.permissions\4.7.0\lib\netcoreapp3.0\System.Security.Permissions.dll" />
41-
<EmbeddedResource Include="$(NuGetPackageRoot)system.configuration.configurationmanager\4.7.0\lib\netstandard2.0\System.Configuration.ConfigurationManager.dll" />
42-
<EmbeddedResource Include="$(NuGetPackageRoot)system.text.encoding.codepages\4.7.0\lib\netstandard2.0\System.Text.Encoding.CodePages.dll" />
43-
</ItemGroup> <ItemGroup>
44-
<None Include=".github\FUNDING.yml" />
45-
<None Include=".github\workflows\build.yml" />
39+
<EmbeddedResource
40+
Include="$(NuGetPackageRoot)mysqlconnector\2.4.0\lib\net6.0\MySqlConnector.dll" />
41+
<EmbeddedResource
42+
Include="$(NuGetPackageRoot)system.diagnostics.diagnosticsource\8.0.1\lib\net6.0\System.Diagnostics.DiagnosticSource.dll" />
43+
<EmbeddedResource
44+
Include="$(NuGetPackageRoot)system.security.permissions\4.7.0\lib\netcoreapp3.0\System.Security.Permissions.dll" />
45+
<EmbeddedResource
46+
Include="$(NuGetPackageRoot)system.configuration.configurationmanager\4.7.0\lib\netstandard2.0\System.Configuration.ConfigurationManager.dll" />
47+
<EmbeddedResource
48+
Include="$(NuGetPackageRoot)system.text.encoding.codepages\4.7.0\lib\netstandard2.0\System.Text.Encoding.CodePages.dll" />
49+
</ItemGroup>
50+
<ItemGroup>
51+
<None Include=".github\FUNDING.yml" />
52+
<None Include=".github\workflows\build.yml" />
4653
</ItemGroup>
4754
</Project>

‎Services/SQLService.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using CrimsonSQL.API;
22
using CrimsonSQL.Structs;
3-
using CrimsonSQL.Utility;
4-
using MySql.Data.MySqlClient;
3+
using MySqlConnector;
54
using System;
65
using System.Collections.Generic;
76
using System.Data;

‎Utility/AssemblyResolver.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public static void Resolve()
1414

1515
string resourceName = args.Name switch
1616
{
17-
string name when name.StartsWith("MySql.Data") => "CrimsonSQL.MySql.Data.dll",
18-
string name when name.StartsWith("System.Diagnostics.DiagnosticSource") => "CrimsonSQL._8._0._1.lib.net6._0.System.Diagnostics.DiagnosticSource.dll",
17+
string name when name.StartsWith("MySqlConnector") => "CrimsonSQL.MySqlConnector.dll",
18+
string name when name.StartsWith("System.Diagnostics.DiagnosticSource") => "CrimsonSQL.System.Diagnostics.DiagnosticSource.dll",
1919
string name when name.StartsWith("System.Security.Permissions") => "CrimsonSQL.System.Security.Permissions.dll",
2020
string name when name.StartsWith("System.Configuration.ConfigurationManager") => "CrimsonSQL.System.Configuration.ConfigurationManager.dll",
2121
string name when name.StartsWith("System.Text.Encoding.CodePages") => "CrimsonSQL.System.Text.Encoding.CodePages.dll",

0 commit comments

Comments
 (0)