Implement System.Data.SQLite

TODO: determine if we can do something better than a resolver

TShockAPI/TShock.cs

@@ -28,7 +28,7 @@ You should have received a copy of the GNU General Public License
 using System.Net;
 using System.Reflection;
 using MaxMind;
-using Mono.Data.Sqlite;
+using System.Data.SQLite;
 using MySql.Data.MySqlClient;
 using Newtonsoft.Json;
 using Rests;
@@ -45,6 +45,7 @@ You should have received a copy of the GNU General Public License
 using TShockAPI.Localization;
 using TShockAPI.Configuration;
 using Terraria.GameContent.Creative;
+using System.Runtime.InteropServices;
 
 namespace TShockAPI
 {
@@ -190,6 +191,50 @@ public TShock(Main game)
 			instance = this;
 		}
 
+
+		static Dictionary<string, IntPtr> _nativeCache = new Dictionary<string, IntPtr>();
+		static IntPtr ResolveNativeDep(string libraryName, Assembly assembly, DllImportSearchPath? searchPath)
+		{
+			if (_nativeCache.TryGetValue(libraryName, out IntPtr cached))
+				return cached;
+
+			IEnumerable<string> matches = Enumerable.Empty<string>();
+
+			if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+			{
+				var osx = Path.Combine(Environment.CurrentDirectory, "runtimes", "osx-x64");
+				matches = Directory.GetFiles(osx, "*" + libraryName + "*", SearchOption.AllDirectories);
+			}
+			else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+			{
+				var lib64 = Path.Combine(Environment.CurrentDirectory, "runtimes", "linux-x64");
+				matches = Directory.GetFiles(lib64, "*" + libraryName + "*", SearchOption.AllDirectories);
+			}
+			else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+			{
+				var x64 = Path.Combine(Environment.CurrentDirectory, "runtimes", "win-x64");
+				matches = Directory.GetFiles(x64, "*" + libraryName + "*", SearchOption.AllDirectories);
+			}
+
+			if (matches.Count() == 0)
+			{
+				matches = Directory.GetFiles(Environment.CurrentDirectory, "*" + libraryName + "*");
+			}
+
+			var handle = IntPtr.Zero;
+
+			if (matches.Count() == 1)
+			{
+				var match = matches.Single();
+				handle = NativeLibrary.Load(match);
+			}
+
+			// cache either way. if zero, no point calling IO if we've checked this assembly before.
+			_nativeCache.Add(libraryName, handle);
+
+			return handle;
+		}
+
 		/// <summary>Initialize - Called by the TerrariaServerAPI during initialization.</summary>
 		[SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
 		public override void Initialize()
@@ -206,6 +251,9 @@ public override void Initialize()
 				//TShock handles this
 				args.Result = OTAPI.HookResult.Cancel;
 			};
+			// if sqlite.interop cannot be found, try and search the runtimes folder. this usually happens when debugging tsapi
+			// since it does not have the dependency installed directly
+			NativeLibrary.SetDllImportResolver(typeof(SQLiteConnection).Assembly, ResolveNativeDep);
 
 			Main.SettingsUnlock_WorldEvil = true;
 
@@ -266,7 +314,7 @@ public override void Initialize()
 				{
 					string sql = Path.Combine(SavePath, Config.Settings.SqliteDBPath);
 					Directory.CreateDirectory(Path.GetDirectoryName(sql));
-					DB = new SqliteConnection(string.Format("uri=file://{0},Version=3", sql));
+					DB = new SQLiteConnection(string.Format("Data Source={0},Version=3", sql));
 				}
 				else if (Config.Settings.StorageType.ToLower() == "mysql")
 				{

TShockAPI/TShockAPI.csproj

@@ -35,6 +35,7 @@
     <PackageReference Include="BCrypt.Net-Next" Version="4.0.2" />
     <PackageReference Include="MySql.Data" Version="8.0.27" />
     <PackageReference Include="SQLite" Version="3.13.0" />
+    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
   </ItemGroup>
 
   <ItemGroup>
@@ -45,9 +46,6 @@
     <Reference Include="HttpServer">
       <HintPath>..\prebuilts\HttpServer.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Data.Sqlite">
-      <HintPath>..\prebuilts\Mono.Data.Sqlite.dll</HintPath>
-    </Reference>
   </ItemGroup>
 
   <ItemGroup>
@@ -64,7 +62,7 @@
     <Copy SourceFiles="$(OutputPath)\TShockAPI.deps.json" DestinationFolder="$(SolutionDir)\TerrariaServerAPI\TerrariaServerAPI\bin\$(ConfigurationName)\net5.0\ServerPlugins" SkipUnchangedFiles="false" />
     <Copy SourceFiles="$(OutputPath)\TShockAPI.pdb" DestinationFolder="$(SolutionDir)\TerrariaServerAPI\TerrariaServerAPI\bin\$(ConfigurationName)\net5.0\ServerPlugins" SkipUnchangedFiles="false" />
     <Copy SourceFiles="$(OutputPath)\TShockAPI.xml" DestinationFolder="$(SolutionDir)\TerrariaServerAPI\TerrariaServerAPI\bin\$(ConfigurationName)\net5.0\ServerPlugins" SkipUnchangedFiles="false" />
-    <Copy SourceFiles="$(OutputPath)\Mono.Data.Sqlite.dll" DestinationFolder="$(SolutionDir)\TerrariaServerAPI\TerrariaServerAPI\bin\$(ConfigurationName)\net5.0\ServerPlugins" SkipUnchangedFiles="false" />
+    <Copy SourceFiles="$(OutputPath)\System.Data.SQLite.dll" DestinationFolder="$(SolutionDir)\TerrariaServerAPI\TerrariaServerAPI\bin\$(ConfigurationName)\net5.0\ServerPlugins" SkipUnchangedFiles="false" />
     <Copy SourceFiles="$(OutputPath)\HttpServer.dll" DestinationFolder="$(SolutionDir)\TerrariaServerAPI\TerrariaServerAPI\bin\$(ConfigurationName)\net5.0\ServerPlugins" SkipUnchangedFiles="false" />
     <Copy SourceFiles="$(OutputPath)\MySql.Data.dll" DestinationFolder="$(SolutionDir)\TerrariaServerAPI\TerrariaServerAPI\bin\$(ConfigurationName)\net5.0\ServerPlugins" SkipUnchangedFiles="false" />
     <Copy SourceFiles="@(DebugRuntimes)" DestinationFolder="$(SolutionDir)\TerrariaServerAPI\TerrariaServerAPI\bin\$(ConfigurationName)\net5.0\runtimes\%(RecursiveDir)" SkipUnchangedFiles="false" />