diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index 337d37c61b..f0d3b76e5a 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs @@ -1027,7 +1027,7 @@ namespace MediaBrowser.Server.Implementations.Connect { var user = e.Argument; - //await TryUploadUserPreferences(user, CancellationToken.None).ConfigureAwait(false); + await TryUploadUserPreferences(user, CancellationToken.None).ConfigureAwait(false); } private async Task TryUploadUserPreferences(User user, CancellationToken cancellationToken) @@ -1046,9 +1046,6 @@ namespace MediaBrowser.Server.Implementations.Connect return; } - var obj = ConnectUserPreferences.FromUserConfiguration(user.Configuration); - var json = _json.SerializeToString(new UserPreferencesDto { data = obj }); - var url = GetConnectUrl("user/preferences"); url += "?userId=" + user.ConnectUserId; url += "&key=userpreferences"; @@ -1056,11 +1053,13 @@ namespace MediaBrowser.Server.Implementations.Connect var options = new HttpRequestOptions { Url = url, - CancellationToken = cancellationToken, - RequestContent = json, - RequestContentType = "application/json" + CancellationToken = cancellationToken }; + var postData = new Dictionary(); + postData["data"] = _json.SerializeToString(ConnectUserPreferences.FromUserConfiguration(user.Configuration)); + options.SetPostData(postData); + SetServerAccessToken(options); try diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index c7a9446a6f..ed46ad4a41 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -62,7 +62,7 @@ - ..\packages\System.Data.SQLite.Core.MSIL.1.0.94.0\lib\net45\System.Data.SQLite.dll + ..\ThirdParty\System.Data.SQLite.ManagedOnly\1.0.94.0\System.Data.SQLite.dll diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs index 6e484413a1..d67c1894d8 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs @@ -1,10 +1,10 @@ using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Serialization; using System; using System.Data; using System.Data.SQLite; using System.IO; using System.Threading.Tasks; -using MediaBrowser.Model.Serialization; namespace MediaBrowser.Server.Implementations.Persistence { @@ -135,7 +135,7 @@ namespace MediaBrowser.Server.Implementations.Persistence throw new ArgumentNullException("dbPath"); } - logger.Info("Opening {0}", dbPath); + logger.Info("Sqlite {0} opening {1}", SQLiteConnection.SQLiteVersion, dbPath); var connectionstr = new SQLiteConnectionStringBuilder { diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index f6a6c2af62..2200af8e86 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -2,5 +2,4 @@ - \ No newline at end of file diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index 6dd04e438e..3bc663df77 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -31,8 +31,9 @@ bin\Release prompt 4 - x86 + AnyCPU true + false false @@ -44,6 +45,9 @@ bin\Release Mono 4 + + false + False @@ -141,16 +145,6 @@ MediaBrowser.XbmcMetadata - - - System.Data.SQLite.dll - Always - - - System.Data.SQLite.Linq.dll - PreserveNewest - - libwebp\linux\lib\libwebp.so