Replaced SQLite package with SQL Compact. Still need to update or remove direct state...
authorpkanavos <pkanavos@gmail.com>
Wed, 19 Sep 2012 13:41:39 +0000 (16:41 +0300)
committerpkanavos <pkanavos@gmail.com>
Wed, 19 Sep 2012 13:41:39 +0000 (16:41 +0300)
19 files changed:
trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
trunk/Pithos.Client.WPF/packages.config
trunk/Pithos.Client.WPF/x64/SQLite.Interop.dll [deleted file]
trunk/Pithos.Client.WPF/x86/SQLite.Interop.dll [deleted file]
trunk/Pithos.Core/Agents/StatusAgent.cs
trunk/Pithos.Core/Pithos.Core.csproj
trunk/Pithos.Core/packages.config
trunk/Pithos.Core/x64/SQLite.Interop.dll [deleted file]
trunk/Pithos.Core/x86/SQLite.Interop.dll [deleted file]
trunk/packages/System.Data.SQLite.1.0.81.1/System.Data.SQLite.1.0.81.1.nupkg [deleted file]
trunk/packages/System.Data.SQLite.1.0.81.1/content/net20/x64/SQLite.Interop.dll [deleted file]
trunk/packages/System.Data.SQLite.1.0.81.1/content/net20/x86/SQLite.Interop.dll [deleted file]
trunk/packages/System.Data.SQLite.1.0.81.1/content/net40/x64/SQLite.Interop.dll [deleted file]
trunk/packages/System.Data.SQLite.1.0.81.1/content/net40/x86/SQLite.Interop.dll [deleted file]
trunk/packages/System.Data.SQLite.1.0.81.1/lib/net20/System.Data.SQLite.Linq.dll [deleted file]
trunk/packages/System.Data.SQLite.1.0.81.1/lib/net20/System.Data.SQLite.dll [deleted file]
trunk/packages/System.Data.SQLite.1.0.81.1/lib/net40/System.Data.SQLite.Linq.dll [deleted file]
trunk/packages/System.Data.SQLite.1.0.81.1/lib/net40/System.Data.SQLite.dll [deleted file]
trunk/packages/System.Data.SQLite.1.0.81.1/tools/install.ps1 [deleted file]

index 585bd58..7930c8d 100644 (file)
     <Reference Include="System.ComponentModel.Composition" />\r
     <Reference Include="System.Configuration.Install" />\r
     <Reference Include="System.Data" />\r
-    <Reference Include="System.Data.SQLite, Version=1.0.81.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>..\packages\System.Data.SQLite.1.0.81.1\lib\net40\System.Data.SQLite.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="System.Data.SQLite.Linq, Version=1.0.81.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>..\packages\System.Data.SQLite.1.0.81.1\lib\net40\System.Data.SQLite.Linq.dll</HintPath>\r
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">\r
+      <Private>True</Private>\r
+      <HintPath>..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll</HintPath>\r
     </Reference>\r
     <Reference Include="System.Drawing" />\r
     <Reference Include="System.Runtime.Serialization" />\r
   <ItemGroup>\r
     <Resource Include="Images\Plugins.png" />\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <Content Include="x64\SQLite.Interop.dll">\r
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
-    </Content>\r
-    <Content Include="x86\SQLite.Interop.dll">\r
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
-    </Content>\r
-  </ItemGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
+  <PropertyGroup>\r
+    <PostBuildEvent>\r
+    if not exist "$(TargetDir)x86" md "$(TargetDir)x86"\r
+    xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8876.1\NativeBinaries\x86\*.*" "$(TargetDir)x86"\r
+    if not exist "$(TargetDir)amd64" md "$(TargetDir)amd64"\r
+    xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8876.1\NativeBinaries\amd64\*.*" "$(TargetDir)amd64"</PostBuildEvent>\r
+  </PropertyGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r
index bf74d8c..0aad700 100644 (file)
@@ -4,5 +4,5 @@
   <package id="Caliburn.Micro.Logging" version="1.3.0" targetFramework="net40-Client" />\r
   <package id="Extended.Wpf.Toolkit" version="1.5.0" />\r
   <package id="Microsoft.CompilerServices.AsyncTargetingPack" version="1.0.0" />\r
-  <package id="System.Data.SQLite" version="1.0.81.1" targetFramework="net40-Client" />\r
+  <package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net40-Client" />\r
 </packages>
\ No newline at end of file
diff --git a/trunk/Pithos.Client.WPF/x64/SQLite.Interop.dll b/trunk/Pithos.Client.WPF/x64/SQLite.Interop.dll
deleted file mode 100644 (file)
index 01d8a65..0000000
Binary files a/trunk/Pithos.Client.WPF/x64/SQLite.Interop.dll and /dev/null differ
diff --git a/trunk/Pithos.Client.WPF/x86/SQLite.Interop.dll b/trunk/Pithos.Client.WPF/x86/SQLite.Interop.dll
deleted file mode 100644 (file)
index 06ad158..0000000
Binary files a/trunk/Pithos.Client.WPF/x86/SQLite.Interop.dll and /dev/null differ
index d827921..371a66e 100644 (file)
@@ -43,7 +43,7 @@ using System;
 using System.Collections.Generic;\r
 using System.ComponentModel.Composition;\r
 using System.Data;\r
-using System.Data.SQLite;\r
+using System.Data.SqlServerCe;\r
 using System.Diagnostics;\r
 using System.Diagnostics.Contracts;\r
 using System.IO;\r
@@ -67,6 +67,8 @@ using Pithos.Interfaces;
 using Pithos.Network;\r
 using log4net;\r
 using Environment = System.Environment;\r
+using System.Data.SqlClient;\r
+using System.Data.SqlServerCe;\r
 \r
 namespace Pithos.Core.Agents\r
 {\r
@@ -93,20 +95,21 @@ namespace Pithos.Core.Agents
             if (!Directory.Exists(_pithosDataPath))\r
                 Directory.CreateDirectory(_pithosDataPath);\r
 \r
-            var dbPath = Path.Combine(_pithosDataPath, "pithos.db");\r
+            var dbPath = Path.Combine(_pithosDataPath, "pithos.sdf");\r
+\r
 \r
             MigrateOldDb(dbPath, appDataPath);\r
 \r
 \r
             var source = GetConfiguration(_pithosDataPath);\r
             ActiveRecordStarter.Initialize(source,typeof(FileState),typeof(FileTag));\r
+            if (!File.Exists(dbPath))\r
+                ActiveRecordStarter.CreateSchema();\r
 \r
             UpgradeDatabase();\r
 \r
 \r
 \r
-            if (!File.Exists(dbPath))\r
-                ActiveRecordStarter.CreateSchema();\r
 \r
             CreateTrigger();\r
 \r
@@ -121,7 +124,7 @@ namespace Pithos.Core.Agents
                 throw new ArgumentNullException("appDataPath");\r
             Contract.EndContractBlock();\r
 \r
-            var oldDbPath = Path.Combine(appDataPath, "Pithos", "pithos.db");\r
+            var oldDbPath = Path.Combine(appDataPath, "Pithos", "pithos.sdf");\r
             var oldDbInfo = new FileInfo(oldDbPath);\r
             if (oldDbInfo.Exists && !File.Exists(dbPath))\r
             {\r
@@ -136,9 +139,9 @@ namespace Pithos.Core.Agents
             }\r
         }\r
 \r
-        private T? GetNull<T>(string commandText,SQLiteConnection connection) where T:struct \r
+        private T? GetNull<T>(string commandText, SqlCeConnection connection) where T:struct \r
         {\r
-            using (var command= new SQLiteCommand(commandText, connection))\r
+            using (var command= new SqlCeCommand(commandText, connection))\r
             {\r
                 var result = command.ExecuteScalar();\r
                 if (result == null)\r
@@ -147,9 +150,9 @@ namespace Pithos.Core.Agents
             }\r
         }\r
 \r
-        private T Get<T>(string commandText,SQLiteConnection connection) \r
+        private T Get<T>(string commandText,SqlCeConnection connection) \r
         {\r
-            using (var command= new SQLiteCommand(commandText, connection))\r
+            using (var command= new SqlCeCommand(commandText, connection))\r
             {\r
                 var result = command.ExecuteScalar();\r
                 if (result == null)\r
@@ -158,9 +161,9 @@ namespace Pithos.Core.Agents
             }\r
         }\r
 \r
-        private int Run(string commandText,SQLiteConnection connection)\r
+        private int Run(string commandText,SqlCeConnection connection)\r
         {\r
-            using (var command= new SQLiteCommand(commandText, connection))\r
+            using (var command= new SqlCeCommand(commandText, connection))\r
             {\r
                 var result=command.ExecuteNonQuery();\r
                 return result;\r
@@ -169,20 +172,22 @@ namespace Pithos.Core.Agents
 \r
         private void UpgradeDatabase()\r
         {\r
-            const string hasVersionText = "select 1 from sqlite_master where name='Version'";\r
+            const string hasVersionText = "select 1 from information_schema.tables where table_name='Version'";\r
 \r
-            const string hasFilestateText = "select 1 from sqlite_master where name='FileState'";\r
+            const string hasFilestateText = "select 1 from information_schema.tables where table_name='FileState'";\r
 \r
             const string getVersionCmd = "select Version from version where Id=1";\r
 \r
-            const string createVersionCmd = "create table Version(Id integer,Version TEXT);\n" +\r
+            const string createVersionCmd = "create table Version(Id integer,Version nvarchar(15));" +\r
                                             "INSERT INTO VERSION (Id,Version) VALUES(1,'0.0.0.0');";\r
+/*\r
             const string createFileStateCmd =\r
                 "CREATE TABLE FileState (Id UNIQUEIDENTIFIER not null, ObjectID TEXT COLLATE NOCASE, FilePath TEXT unique COLLATE NOCASE, OverlayStatus INTEGER, FileStatus INTEGER, ConflictReason TEXT, Checksum TEXT COLLATE NOCASE, ETag TEXT not null COLLATE NOCASE, LastMD5 TEXT not null COLLATE NOCASE,LastWriteDate DATETIME, LastLength INTEGER, Version INTEGER, VersionTimeStamp DATETIME, IsShared INTEGER, SharedBy TEXT, ShareWrite INTEGER, IsFolder INTEGER, Modified DATETIME,Hashes TEXT null COLLATE NOCASE, primary key (Id),unique (FilePath))";\r
             const string upgradeText = "PRAGMA writable_schema = 1;\n" +\r
                                    "UPDATE SQLITE_MASTER SET SQL = 'CREATE TABLE FileState (Id UNIQUEIDENTIFIER not null, ObjectID TEXT COLLATE NOCASE, FilePath TEXT unique COLLATE NOCASE, OverlayStatus INTEGER, FileStatus INTEGER, ConflictReason TEXT, Checksum TEXT COLLATE NOCASE, ETag TEXT not null COLLATE NOCASE, LastMD5 TEXT not null COLLATE NOCASE,LastWriteDate DATETIME, LastLength INTEGER, Version INTEGER, VersionTimeStamp DATETIME, IsShared INTEGER, SharedBy TEXT, ShareWrite INTEGER, IsFolder INTEGER, Modified DATETIME, Hashes TEXT null COLLATE NOCASE, primary key (Id),unique (FilePath))' WHERE NAME = 'FileState';\n" +\r
                                    "PRAGMA writable_schema = 0;\n" +\r
                                    "VACUUM;";\r
+*/\r
 \r
             using (var connection = GetConnection())\r
             {\r
@@ -199,22 +204,26 @@ namespace Pithos.Core.Agents
                 else\r
                     Run(createVersionCmd, connection);\r
 \r
+/*\r
                 var hasFileState = false;\r
                 hasFileState = GetNull<long>(hasFilestateText, connection).HasValue;\r
                 if (!hasFileState)\r
                 {\r
                     Run(createFileStateCmd, connection);\r
                 }\r
+*/\r
 \r
                 var actualVersion = Assembly.GetEntryAssembly().GetName().Version;\r
+/*\r
                 if (!hasVersion || actualVersion > storedVersion)\r
                     Run(upgradeText, connection);\r
+*/\r
 \r
                 if (actualVersion != storedVersion)\r
-                    using (var updateVersionCmd = new SQLiteCommand("UPDATE VERSION SET Version=:version where ID=1",\r
+                    using (var updateVersionCmd = new SqlCeCommand("UPDATE VERSION SET Version=@version where ID=1",\r
                                                                  connection))\r
                     {\r
-                        updateVersionCmd.Parameters.AddWithValue(":version", actualVersion.ToString());\r
+                        updateVersionCmd.Parameters.AddWithValue("@version", actualVersion.ToString());\r
                         var result = updateVersionCmd.ExecuteNonQuery();\r
                         Debug.Assert(result > 0);\r
                     }\r
@@ -252,8 +261,8 @@ namespace Pithos.Core.Agents
 \r
             var properties = new Dictionary<string, string>\r
                                  {\r
-                                     {"connection.driver_class", "NHibernate.Driver.SQLite20Driver"},\r
-                                     {"dialect", "NHibernate.Dialect.SQLiteDialect"},\r
+                                     {"connection.driver_class", "NHibernate.Driver.SqlServerCeDriver"},\r
+                                     {"dialect", "NHibernate.Dialect.MsSqlCeDialect"},\r
                                      {"connection.provider", "NHibernate.Connection.DriverConnectionProvider"},\r
                                      {\r
                                          "proxyfactory.factory_class",\r
@@ -261,7 +270,7 @@ namespace Pithos.Core.Agents
                                          },\r
                                  };\r
 \r
-            var connectionString = String.Format(@"Data Source={0}\pithos.db;Version=3;Enlist=N", pithosDbPath);\r
+            var connectionString = String.Format(@"Data Source={0}\pithos.sdf", pithosDbPath);\r
             properties.Add("connection.connection_string", connectionString);\r
 \r
             var source = new InPlaceConfigurationSource();                        \r
@@ -285,7 +294,7 @@ namespace Pithos.Core.Agents
                         {\r
                             action();\r
                         }\r
-                        catch (SQLiteException ex)\r
+                        catch (SqlException ex)\r
                         {\r
                             Log.ErrorFormat("[ERROR] SQL \n{0}", ex);\r
                         }\r
@@ -406,8 +415,6 @@ namespace Pithos.Core.Agents
                 {\r
                     using (var session = ActiveRecordMediator.GetSessionFactoryHolder().CreateSession(typeof(FileState)))\r
                     {\r
-                        var walquery = session.CreateSQLQuery("PRAGMA journal_mode=WAL");\r
-                        walquery.List();\r
 \r
                           //var updatecmd = session.CreateSQLQuery(\r
                         var updatecmd = session.CreateQuery(\r
@@ -439,9 +446,6 @@ namespace Pithos.Core.Agents
                     using (var tx=session.BeginTransaction(IsolationLevel.ReadCommitted))\r
                     {\r
 \r
-                        //var walquery = session.CreateSQLQuery("PRAGMA journal_mode=WAL");\r
-                        var walquery = session.CreateQuery("PRAGMA journal_mode=WAL");\r
-                        walquery.List();\r
 \r
                         //var updatecmd = session.CreateSQLQuery(\r
                         var updatecmd = session.CreateQuery(\r
@@ -480,11 +484,6 @@ namespace Pithos.Core.Agents
                     using (var tx=session.BeginTransaction(IsolationLevel.ReadCommitted))\r
                     {\r
 \r
-                        //var walquery = session.CreateSQLQuery("PRAGMA journal_mode=WAL");\r
-                        var walquery = session.CreateSQLQuery("PRAGMA journal_mode=WAL");\r
-                        walquery.List();\r
-\r
-\r
                         //var updatecmd = session.CreateSQLQuery("update FileState set OverlayStatus= :overlayStatus, FileStatus= :fileStatus,ConflictReason= :conflictReason where FilePath = :path COLLATE NOCASE")\r
                         var updatecmd = session.CreateQuery("update FileState set OverlayStatus= :overlayStatus, FileStatus= :fileStatus,ConflictReason= :conflictReason where FilePath = :path")\r
                                                 .SetString("path", absolutePath)\r
@@ -553,7 +552,7 @@ namespace Pithos.Core.Agents
             {\r
                 \r
                 using (var connection = GetConnection())\r
-                using (var command = new SQLiteCommand("select Id, FilePath, OverlayStatus,FileStatus ,Checksum ,ETag,Version    ,VersionTimeStamp,IsShared   ,SharedBy   ,ShareWrite, LastMD5,LastLength,LastWriteDate  from FileState where FilePath=:path COLLATE NOCASE", connection))\r
+                using (var command = new SqlCeCommand("select Id, FilePath, OverlayStatus,FileStatus ,Checksum ,ETag,Version    ,VersionTimeStamp,IsShared   ,SharedBy   ,ShareWrite, LastMD5,LastLength,LastWriteDate  from FileState where FilePath=:path COLLATE NOCASE", connection))\r
                 {\r
                     \r
                     command.Parameters.AddWithValue("path", path);\r
@@ -611,7 +610,7 @@ namespace Pithos.Core.Agents
             {\r
                 \r
                 using (var connection = GetConnection())\r
-                using (var command = new SQLiteCommand("select OverlayStatus from FileState where FilePath=:path  COLLATE NOCASE", connection))\r
+                using (var command = new SqlCeCommand("select OverlayStatus from FileState where FilePath=:path  COLLATE NOCASE", connection))\r
                 {\r
                     \r
                     command.Parameters.AddWithValue("path", path);\r
@@ -629,20 +628,15 @@ namespace Pithos.Core.Agents
 \r
         private string GetConnectionString()\r
         {\r
-            var connectionString = String.Format(@"Data Source={0}\pithos.db;Version=3;Enlist=N;Pooling=True", _pithosDataPath);\r
+            var connectionString = String.Format(@"Data Source={0}\pithos.sdf", _pithosDataPath);\r
             return connectionString;\r
         }\r
 \r
-        private SQLiteConnection GetConnection()\r
+        private SqlCeConnection GetConnection()\r
         {\r
             var connectionString = GetConnectionString();\r
-            var connection = new SQLiteConnection(connectionString);\r
+            var connection = new SqlCeConnection(connectionString);\r
             connection.Open();\r
-            using(var cmd =connection.CreateCommand())\r
-            {\r
-                cmd.CommandText = "PRAGMA journal_mode=WAL";\r
-                cmd.ExecuteNonQuery();\r
-            }\r
             return connection;\r
         }\r
 \r
@@ -736,10 +730,6 @@ namespace Pithos.Core.Agents
                     using (var tx=session.BeginTransaction(IsolationLevel.ReadCommitted))\r
                     {\r
                         \r
-                        //var walquery = session.CreateSQLQuery("PRAGMA journal_mode=WAL");\r
-                        var walquery = session.CreateSQLQuery("PRAGMA journal_mode=WAL");\r
-                        walquery.List();\r
-\r
                         //An entry for the new path may exist, \r
                         IQuery deletecmd = session.CreateQuery(\r
                            "delete from FileState where FilePath=:path and ObjectID is null")\r
@@ -815,9 +805,9 @@ namespace Pithos.Core.Agents
             }\r
         }\r
 \r
-        private bool StateExists(string filePath,SQLiteConnection connection)\r
+        private bool StateExists(string filePath,SqlCeConnection connection)\r
         {\r
-            using (var command = new SQLiteCommand("Select count(*) from FileState where FilePath=:path  COLLATE NOCASE", connection))\r
+            using (var command = new SqlCeCommand("Select count(*) from FileState where FilePath=:path  COLLATE NOCASE", connection))\r
             {\r
                 command.Parameters.AddWithValue("path", filePath);\r
                 var result = command.ExecuteScalar();\r
@@ -826,9 +816,9 @@ namespace Pithos.Core.Agents
 \r
         }\r
 \r
-        private bool StateExistsByID(string objectId,SQLiteConnection connection)\r
+        private bool StateExistsByID(string objectId,SqlCeConnection connection)\r
         {\r
-            using (var command = new SQLiteCommand("Select count(*) from FileState where ObjectId=:id", connection))\r
+            using (var command = new SqlCeCommand("Select count(*) from FileState where ObjectId=:id", connection))\r
             {\r
                 command.Parameters.AddWithValue("id", objectId);\r
                 var result = command.ExecuteScalar();\r
@@ -859,7 +849,7 @@ namespace Pithos.Core.Agents
             \r
             using (var connection = GetConnection())\r
             {\r
-                var command = new SQLiteCommand("select FileStatus from FileState where FilePath=:path  COLLATE NOCASE", connection);\r
+                var command = new SqlCeCommand("select FileStatus from FileState where FilePath=:path  COLLATE NOCASE", connection);\r
                 command.Parameters.AddWithValue("path", path);\r
                 \r
                 var statusValue = command.ExecuteScalar();\r
@@ -942,7 +932,7 @@ namespace Pithos.Core.Agents
                     \r
                     using (var connection = GetConnection())\r
                     {\r
-                        var command = new SQLiteCommand("delete from FileState where FilePath = :path  COLLATE NOCASE",\r
+                        var command = new SqlCeCommand("delete from FileState where FilePath = :path  COLLATE NOCASE",\r
                                                         connection);\r
 \r
                         command.Parameters.AddWithValue("path", filePath);\r
@@ -970,7 +960,7 @@ namespace Pithos.Core.Agents
                     \r
                     using (var connection = GetConnection())\r
                     {\r
-                        var command = new SQLiteCommand(@"delete from FileState where FilePath = :path or FilePath like :path || '\%'  COLLATE NOCASE",\r
+                        var command = new SqlCeCommand(@"delete from FileState where FilePath = :path or FilePath like :path || '\%'  COLLATE NOCASE",\r
                                                         connection);\r
 \r
                         command.Parameters.AddWithValue("path", filePath);\r
index 24b1906..2077783 100644 (file)
     <Reference Include="System" />\r
     <Reference Include="System.ComponentModel.Composition" />\r
     <Reference Include="System.Core" />\r
-    <Reference Include="System.Data.SQLite, Version=1.0.81.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>..\packages\System.Data.SQLite.1.0.81.1\lib\net40\System.Data.SQLite.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="System.Data.SQLite.Linq, Version=1.0.81.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>..\packages\System.Data.SQLite.1.0.81.1\lib\net40\System.Data.SQLite.Linq.dll</HintPath>\r
-    </Reference>\r
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">\r
       <Private>True</Private>\r
       <HintPath>..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll</HintPath>\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
       <SubType>Designer</SubType>\r
     </Content>\r
-    <Content Include="x64\SQLite.Interop.dll">\r
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
-    </Content>\r
-    <Content Include="x86\SQLite.Interop.dll">\r
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
-    </Content>\r
   </ItemGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <PropertyGroup>\r
index e7fcd59..33670ae 100644 (file)
@@ -9,6 +9,5 @@
   <package id="NHibernate" version="3.1.0.4000" />\r
   <package id="NHibernate.Castle" version="3.1.0.4000" />\r
   <package id="ServiceStack.Text" version="2.27" />\r
-  <package id="System.Data.SQLite" version="1.0.81.1" targetFramework="net40-Client" />\r
   <package id="Windows7APICodePack" version="1.0.0.0" />\r
 </packages>
\ No newline at end of file
diff --git a/trunk/Pithos.Core/x64/SQLite.Interop.dll b/trunk/Pithos.Core/x64/SQLite.Interop.dll
deleted file mode 100644 (file)
index 01d8a65..0000000
Binary files a/trunk/Pithos.Core/x64/SQLite.Interop.dll and /dev/null differ
diff --git a/trunk/Pithos.Core/x86/SQLite.Interop.dll b/trunk/Pithos.Core/x86/SQLite.Interop.dll
deleted file mode 100644 (file)
index 06ad158..0000000
Binary files a/trunk/Pithos.Core/x86/SQLite.Interop.dll and /dev/null differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.81.1/System.Data.SQLite.1.0.81.1.nupkg b/trunk/packages/System.Data.SQLite.1.0.81.1/System.Data.SQLite.1.0.81.1.nupkg
deleted file mode 100644 (file)
index 1c69e2e..0000000
Binary files a/trunk/packages/System.Data.SQLite.1.0.81.1/System.Data.SQLite.1.0.81.1.nupkg and /dev/null differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.81.1/content/net20/x64/SQLite.Interop.dll b/trunk/packages/System.Data.SQLite.1.0.81.1/content/net20/x64/SQLite.Interop.dll
deleted file mode 100644 (file)
index 4a1da23..0000000
Binary files a/trunk/packages/System.Data.SQLite.1.0.81.1/content/net20/x64/SQLite.Interop.dll and /dev/null differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.81.1/content/net20/x86/SQLite.Interop.dll b/trunk/packages/System.Data.SQLite.1.0.81.1/content/net20/x86/SQLite.Interop.dll
deleted file mode 100644 (file)
index 69a7561..0000000
Binary files a/trunk/packages/System.Data.SQLite.1.0.81.1/content/net20/x86/SQLite.Interop.dll and /dev/null differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.81.1/content/net40/x64/SQLite.Interop.dll b/trunk/packages/System.Data.SQLite.1.0.81.1/content/net40/x64/SQLite.Interop.dll
deleted file mode 100644 (file)
index 01d8a65..0000000
Binary files a/trunk/packages/System.Data.SQLite.1.0.81.1/content/net40/x64/SQLite.Interop.dll and /dev/null differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.81.1/content/net40/x86/SQLite.Interop.dll b/trunk/packages/System.Data.SQLite.1.0.81.1/content/net40/x86/SQLite.Interop.dll
deleted file mode 100644 (file)
index 06ad158..0000000
Binary files a/trunk/packages/System.Data.SQLite.1.0.81.1/content/net40/x86/SQLite.Interop.dll and /dev/null differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.81.1/lib/net20/System.Data.SQLite.Linq.dll b/trunk/packages/System.Data.SQLite.1.0.81.1/lib/net20/System.Data.SQLite.Linq.dll
deleted file mode 100644 (file)
index 96e9478..0000000
Binary files a/trunk/packages/System.Data.SQLite.1.0.81.1/lib/net20/System.Data.SQLite.Linq.dll and /dev/null differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.81.1/lib/net20/System.Data.SQLite.dll b/trunk/packages/System.Data.SQLite.1.0.81.1/lib/net20/System.Data.SQLite.dll
deleted file mode 100644 (file)
index a696d6d..0000000
Binary files a/trunk/packages/System.Data.SQLite.1.0.81.1/lib/net20/System.Data.SQLite.dll and /dev/null differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.81.1/lib/net40/System.Data.SQLite.Linq.dll b/trunk/packages/System.Data.SQLite.1.0.81.1/lib/net40/System.Data.SQLite.Linq.dll
deleted file mode 100644 (file)
index b749f2a..0000000
Binary files a/trunk/packages/System.Data.SQLite.1.0.81.1/lib/net40/System.Data.SQLite.Linq.dll and /dev/null differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.81.1/lib/net40/System.Data.SQLite.dll b/trunk/packages/System.Data.SQLite.1.0.81.1/lib/net40/System.Data.SQLite.dll
deleted file mode 100644 (file)
index 3b272bd..0000000
Binary files a/trunk/packages/System.Data.SQLite.1.0.81.1/lib/net40/System.Data.SQLite.dll and /dev/null differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.81.1/tools/install.ps1 b/trunk/packages/System.Data.SQLite.1.0.81.1/tools/install.ps1
deleted file mode 100644 (file)
index 2eed002..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################\r
-#\r
-# install.ps1 --\r
-#\r
-# Written by Joe Mistachkin.\r
-# Released to the public domain, use at your own risk!\r
-#\r
-###############################################################################\r
-\r
-param($installPath, $toolsPath, $package, $project)\r
-\r
-$platformNames = "x86", "x64"\r
-$fileName = "SQLite.Interop.dll"\r
-$propertyName = "CopyToOutputDirectory"\r
-\r
-foreach($platformName in $platformNames) {\r
-  $folder = $project.ProjectItems.Item($platformName)\r
-\r
-  if ($folder -eq $null) {\r
-    continue\r
-  }\r
-\r
-  $item = $folder.ProjectItems.Item($fileName)\r
-\r
-  if ($item -eq $null) {\r
-    continue\r
-  }\r
-\r
-  $property = $item.Properties.Item($propertyName)\r
-\r
-  if ($property -eq $null) {\r
-    continue\r
-  }\r
-\r
-  $property.Value = 1\r
-}\r