Revert "Update Microsoft.Data.Sqlite to 6.0.5" (#392)

This reverts commit 93a3d8b. This fixes startup on Windows with SQLite DB
Dawn-of-Light · Jun 21, 2022 · 32001b1 · 32001b1
1 parent cc8c773
commit 32001b1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/DOLDatabase/DOLDatabase.csproj b/DOLDatabase/DOLDatabase.csproj
@@ -59,8 +59,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.14" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.5" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.0.7" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.17" />
     <PackageReference Include="MySqlConnector" Version="2.1.10" PrivateAssets="all" />
   </ItemGroup>
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

diff --git a/DOLDatabase/Handlers/SQLiteObjectDatabase.cs b/DOLDatabase/Handlers/SQLiteObjectDatabase.cs
@@ -49,7 +49,7 @@ public SQLiteObjectDatabase(string ConnectionString)
 			Config.AddDefaultOption("Synchronous", "Off");
 			Config.AddDefaultOption("Foreign Keys", "True");
 			Config.AddDefaultOption("Default Timeout", "60");
-			Config.SuppressFromConnectionString("Version", "Cache Size", "Journal Mode", "Synchronous", "Default Timeout");
+			Config.SuppressFromConnectionString("Version", "Pooling", "Cache Size", "Journal Mode", "Synchronous", "Default Timeout");
 			this.ConnectionString = Config.ConnectionString;
 		}
 

diff --git a/NetCore/DOLDatabase/DOLDatabase.csproj b/NetCore/DOLDatabase/DOLDatabase.csproj
@@ -39,7 +39,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.14" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.5" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.17" />
     <PackageReference Include="MySqlConnector" Version="2.1.10" />
   </ItemGroup>
   <ItemGroup>