浏览代码

3.0.5424.1

Luke Pulverenti 10 年之前
父节点
当前提交
9b47ae2530

+ 0 - 1
MediaBrowser.Model/Configuration/UserConfiguration.cs

@@ -105,7 +105,6 @@ namespace MediaBrowser.Model.Configuration
 
             ExcludeFoldersFromGrouping = new string[] { };
             DisplayCollectionsView = true;
-            DisplayFoldersView = true;
 
             SyncConnectName = true;
             SyncConnectImage = true;

+ 1 - 1
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)

+ 18 - 1
MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj

@@ -39,11 +39,15 @@
     <Optimize>false</Optimize>
     <OutputPath>bin\Release</OutputPath>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Mono|AnyCPU' ">
     <Optimize>false</Optimize>
     <OutputPath>bin\Release Mono</OutputPath>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Mono|x86'">
     <Prefer32Bit>false</Prefer32Bit>
@@ -162,8 +166,20 @@
       <Link>MediaInfo\osx\libmediainfo.dylib</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="..\ThirdParty\SQLite3\linux\x86\3.8.2\libsqlite3.so.0.8.6">
+      <Link>sqlite3\linux\lib\libsqlite3.so.0.8.6</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="..\ThirdParty\SQLite3\linux\x86_64\3.8.2\libsqlite3.so.0.8.6">
+      <Link>sqlite3\linux\lib64\libsqlite3.so.0.8.6</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="..\ThirdParty\SQLite3\osx\libsqlite3.0.dylib">
-      <Link>sqlite3\osx\libsqlite3.0.dylib</Link>
+      <Link>libsqlite3.0.dylib</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="..\ThirdParty\SQLite3\osx\libsqlite3.dylib">
+      <Link>libsqlite3.dylib</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="app.config" />
@@ -179,4 +195,5 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup />
 </Project>

+ 2 - 2
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