diff --git a/osu.Framework.Desktop/Platform/DesktopStorage.cs b/osu.Framework.Desktop/Platform/DesktopStorage.cs
index 5fcd4d0992..88fdd0b29c 100644
--- a/osu.Framework.Desktop/Platform/DesktopStorage.cs
+++ b/osu.Framework.Desktop/Platform/DesktopStorage.cs
@@ -2,12 +2,9 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
using System;
-using SQLite.Net;
+using SQLite;
using System.IO;
using osu.Framework.Platform;
-using SQLite.Net.Platform.Generic;
-using SQLite.Net.Interop;
-using SQLite.Net.Platform.Win32;
using System.Diagnostics;
namespace osu.Framework.Desktop.Platform
@@ -72,12 +69,7 @@ public override Stream GetStream(string path, FileAccess access = FileAccess.Rea
public override SQLiteConnection GetDatabase(string name)
{
Directory.CreateDirectory(BasePath);
- ISQLitePlatform platform;
- if (RuntimeInfo.IsWindows)
- platform = new SQLitePlatformWin32(Architecture.NativeIncludePath);
- else
- platform = new SQLitePlatformGeneric();
- return new SQLiteConnection(platform, GetUsablePathFor($@"{name}.db"));
+ return new SQLiteConnection(GetUsablePathFor($@"{name}.db"));
}
public override void DeleteDatabase(string name) => Delete($@"{name}.db");
diff --git a/osu.Framework.Desktop/osu.Framework.Desktop.csproj b/osu.Framework.Desktop/osu.Framework.Desktop.csproj
index 267bbdca28..9c09912ad9 100644
--- a/osu.Framework.Desktop/osu.Framework.Desktop.csproj
+++ b/osu.Framework.Desktop/osu.Framework.Desktop.csproj
@@ -12,6 +12,8 @@
v4.6.1
512
+
+
true
@@ -42,24 +44,27 @@
$(SolutionDir)\packages\OpenTK.3.0.0-git00009\lib\net20\OpenTK.dll
True
-
- $(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll
- True
+
+ $(SolutionDir)\packages\sqlite-net-pcl.1.5.166-beta\lib\netstandard1.1\SQLite-net.dll
-
- $(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll
- True
+
+ $(SolutionDir)\packages\SQLiteNetExtensions.2.0.0-alpha2\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll
-
- $(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net4\SQLite.Net.Platform.Win32.dll
- True
+
+ $(SolutionDir)\packages\SQLitePCLRaw.bundle_green.1.1.8\lib\net45\SQLitePCLRaw.batteries_green.dll
+
+
+ $(SolutionDir)\packages\SQLitePCLRaw.bundle_green.1.1.8\lib\net45\SQLitePCLRaw.batteries_v2.dll
+
+
+ $(SolutionDir)\packages\SQLitePCLRaw.core.1.1.8\lib\net45\SQLitePCLRaw.core.dll
+
+
+ $(SolutionDir)\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.8\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll
-
- $(SolutionDir)\packages\SQLiteNetExtensions.1.3.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll
-
@@ -199,7 +204,15 @@
-->
-
-
-
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/osu.Framework.Desktop/packages.config b/osu.Framework.Desktop/packages.config
index c8fe84ffa1..f2a98f845c 100644
--- a/osu.Framework.Desktop/packages.config
+++ b/osu.Framework.Desktop/packages.config
@@ -6,7 +6,12 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-frame
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/osu.Framework/Platform/Storage.cs b/osu.Framework/Platform/Storage.cs
index a980db4910..50c3671ff5 100644
--- a/osu.Framework/Platform/Storage.cs
+++ b/osu.Framework/Platform/Storage.cs
@@ -4,7 +4,7 @@
using System;
using System.IO;
using osu.Framework.IO.File;
-using SQLite.Net;
+using SQLite;
namespace osu.Framework.Platform
{
diff --git a/osu.Framework/osu.Framework.csproj b/osu.Framework/osu.Framework.csproj
index 2eda83cb3f..a85dbb665f 100644
--- a/osu.Framework/osu.Framework.csproj
+++ b/osu.Framework/osu.Framework.csproj
@@ -56,25 +56,28 @@
$(SolutionDir)\packages\OpenTK.3.0.0-git00009\lib\net20\OpenTK.dll
True
-
- $(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll
- True
+
+ $(SolutionDir)\packages\sqlite-net-pcl.1.5.166-beta\lib\netstandard1.1\SQLite-net.dll
-
- $(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll
- True
+
+ $(SolutionDir)\packages\SQLiteNetExtensions.2.0.0-alpha2\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll
-
- $(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net4\SQLite.Net.Platform.Win32.dll
- True
+
+ $(SolutionDir)\packages\SQLitePCLRaw.bundle_green.1.1.8\lib\net45\SQLitePCLRaw.batteries_green.dll
+
+
+ $(SolutionDir)\packages\SQLitePCLRaw.bundle_green.1.1.8\lib\net45\SQLitePCLRaw.batteries_v2.dll
+
+
+ $(SolutionDir)\packages\SQLitePCLRaw.core.1.1.8\lib\net45\SQLitePCLRaw.core.dll
+
+
+ $(SolutionDir)\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.8\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll
-
- $(SolutionDir)\packages\SQLiteNetExtensions.1.3.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll
-
@@ -407,7 +410,15 @@
-->
-
-
-
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/osu.Framework/packages.config b/osu.Framework/packages.config
index f70431ef4c..296e44a8e7 100644
--- a/osu.Framework/packages.config
+++ b/osu.Framework/packages.config
@@ -9,7 +9,12 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-frame
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file