From 0f93bed1bbba019e7e87f21e377be3fd9e8353ba Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 31 May 2013 14:57:13 -0400 Subject: [PATCH] switch to sqlite x86 package --- .../MediaBrowser.Server.Implementations.csproj | 17 +++++++---------- .../packages.config | 3 ++- MediaBrowser.ServerApplication/App.config | 4 ++++ .../MediaBrowser.ServerApplication.csproj | 12 +----------- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 8799f4db3e..61e44f7a55 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -64,9 +64,12 @@ False ..\packages\ServiceStack.Common.3.9.46\lib\net35\ServiceStack.Interfaces.dll - + False - ..\packages\ServiceStack.OrmLite.SqlServer.3.9.43\lib\ServiceStack.OrmLite.dll + ..\packages\ServiceStack.OrmLite.Sqlite32.3.9.48\lib\net40\ServiceStack.OrmLite.dll + + + ..\packages\ServiceStack.OrmLite.Sqlite32.3.9.48\lib\net40\ServiceStack.OrmLite.SqliteNET.dll False @@ -88,11 +91,11 @@ False - ..\packages\System.Data.SQLite.1.0.86.0\lib\net45\System.Data.SQLite.dll + ..\packages\System.Data.SQLite.x86.1.0.86.0\lib\net45\System.Data.SQLite.dll False - ..\packages\System.Data.SQLite.1.0.86.0\lib\net45\System.Data.SQLite.Linq.dll + ..\packages\System.Data.SQLite.x86.1.0.86.0\lib\net45\System.Data.SQLite.Linq.dll ..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll @@ -261,12 +264,6 @@ PreserveNewest - - Always - - - Always - diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index 8af3d27cd6..8230143d4f 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -10,9 +10,10 @@ + - + \ No newline at end of file diff --git a/MediaBrowser.ServerApplication/App.config b/MediaBrowser.ServerApplication/App.config index ca35b353c6..36292f9671 100644 --- a/MediaBrowser.ServerApplication/App.config +++ b/MediaBrowser.ServerApplication/App.config @@ -33,6 +33,10 @@ + + + + diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 4e3c1be330..77e896dfab 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -154,9 +154,6 @@ False ..\packages\ServiceStack.Common.3.9.46\lib\net35\ServiceStack.Interfaces.dll - - ..\packages\ServiceStack.OrmLite.SqlServer.3.9.44\lib\ServiceStack.OrmLite.dll - ..\packages\ServiceStack.OrmLite.SqlServer.3.9.44\lib\ServiceStack.OrmLite.SqlServer.dll @@ -381,9 +378,7 @@ - xcopy "$(SolutionDir)\packages\System.Data.SQLite.1.0.86.0\content\net40\x86\SQLite.Interop.dll" "$(TargetDir)" /y - -if $(ConfigurationName) == Release ( + if $(ConfigurationName) == Release ( rmdir "$(SolutionDir)..\Deploy\Server\System" /s /q mkdir "$(SolutionDir)..\Deploy\Server\System" rmdir "$(SolutionDir)..\Deploy\Server\Pismo" /s /q @@ -403,11 +398,6 @@ xcopy "$(TargetDir)swagger-ui" "$(SolutionDir)..\Deploy\Server\System\swagger-ui xcopy "$(TargetDir)$(TargetFileName).config" "$(SolutionDir)..\Deploy\Server\System\" /y xcopy "$(TargetDir)*.dll" "$(SolutionDir)..\Deploy\Server\System" /y -mkdir "$(SolutionDir)..\Deploy\Server\System\x64" -xcopy "$(TargetDir)x64" "$(SolutionDir)..\Deploy\Server\System\x64" /y - -mkdir "$(SolutionDir)..\Deploy\Server\System\x86" -xcopy "$(TargetDir)x86" "$(SolutionDir)..\Deploy\Server\System\x86" /y mkdir "$(SolutionDir)..\Deploy\Server\System\CorePlugins" xcopy "$(TargetDir)CorePlugins" "$(SolutionDir)..\Deploy\Server\System\CorePlugins" /y