From 9b47ae2530e7f98791b2428da9de17d52496fa93 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 7 Nov 2014 20:15:30 -0500 Subject: [PATCH] 3.0.5424.1 --- .../Configuration/UserConfiguration.cs | 1 - .../Connect/ConnectManager.cs | 2 +- .../MediaBrowser.Server.Mono.csproj | 19 ++++++++++++++++++- SharedVersion.cs | 4 ++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs index 838f659c40..51802a0fc6 100644 --- a/MediaBrowser.Model/Configuration/UserConfiguration.cs +++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs @@ -105,7 +105,6 @@ namespace MediaBrowser.Model.Configuration ExcludeFoldersFromGrouping = new string[] { }; DisplayCollectionsView = true; - DisplayFoldersView = true; SyncConnectName = true; SyncConnectImage = true; diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index f0d3b76e5a..f2ab64a52a 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) diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index 3bc663df77..3d18340027 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -39,11 +39,15 @@ false bin\Release 4 + AnyCPU + false false bin\Release Mono 4 + AnyCPU + false false @@ -162,8 +166,20 @@ MediaInfo\osx\libmediainfo.dylib PreserveNewest + + sqlite3\linux\lib\libsqlite3.so.0.8.6 + PreserveNewest + + + sqlite3\linux\lib64\libsqlite3.so.0.8.6 + PreserveNewest + - sqlite3\osx\libsqlite3.0.dylib + libsqlite3.0.dylib + PreserveNewest + + + libsqlite3.dylib PreserveNewest @@ -179,4 +195,5 @@ Designer + \ No newline at end of file diff --git a/SharedVersion.cs b/SharedVersion.cs index 2f7e11202d..f0fc757e7f 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -3,6 +3,6 @@ #if (DEBUG) [assembly: AssemblyVersion("3.0.*")] #else -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5424.0")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5424.1")] #endif