diff --git a/src/ImageProcessor.Web/Caching/SQLContext.cs b/src/ImageProcessor.Web/Caching/SQLContext.cs index 70d62c1cd..22c2c70d6 100644 --- a/src/ImageProcessor.Web/Caching/SQLContext.cs +++ b/src/ImageProcessor.Web/Caching/SQLContext.cs @@ -16,7 +16,6 @@ namespace ImageProcessor.Web.Caching using System.Web.Hosting; using ImageProcessor.Web.Config; using ImageProcessor.Web.Helpers; - #endregion /// @@ -38,7 +37,7 @@ namespace ImageProcessor.Web.Caching /// /// The connection string. /// - private static readonly string ConnectionString = string.Format("Data Source={0};Version=3;", IndexLocation); + private static readonly string ConnectionString = string.Format("Data Source={0};Version=3;", IndexLocation); #endregion #region Methods @@ -62,7 +61,7 @@ namespace ImageProcessor.Web.Caching Directory.CreateDirectory(absolutePath); } } - + SQLiteConnection.CreateFile(IndexLocation); using (SQLiteConnection connection = new SQLiteConnection(ConnectionString)) @@ -258,7 +257,7 @@ namespace ImageProcessor.Web.Caching return false; } } - #endregion + #endregion #endregion } } diff --git a/src/ImageProcessor.Web/Config/ImageProcessorConfig.cs b/src/ImageProcessor.Web/Config/ImageProcessorConfig.cs index 5b2b2c87e..dca89893b 100644 --- a/src/ImageProcessor.Web/Config/ImageProcessorConfig.cs +++ b/src/ImageProcessor.Web/Config/ImageProcessorConfig.cs @@ -16,6 +16,8 @@ namespace ImageProcessor.Web.Config using System.Text; using ImageProcessor.Processors; + using ImageProcessor.Web.Helpers; + #endregion /// diff --git a/src/ImageProcessor.Web/HttpModules/ImageProcessingModule.cs b/src/ImageProcessor.Web/HttpModules/ImageProcessingModule.cs index 59e85afa8..b116f0909 100644 --- a/src/ImageProcessor.Web/HttpModules/ImageProcessingModule.cs +++ b/src/ImageProcessor.Web/HttpModules/ImageProcessingModule.cs @@ -69,7 +69,6 @@ namespace ImageProcessor.Web.HttpModules if (!this.hasModuleInitialized) { Interlocked.CompareExchange(ref initCheck, 1, 0); - DiskCache.CreateDirectories(); } diff --git a/src/ImageProcessor.Web/ImageProcessor.Web.csproj b/src/ImageProcessor.Web/ImageProcessor.Web.csproj index b6a4d53d4..21ce0661c 100644 --- a/src/ImageProcessor.Web/ImageProcessor.Web.csproj +++ b/src/ImageProcessor.Web/ImageProcessor.Web.csproj @@ -66,28 +66,29 @@ MinimumRecommendedRules.ruleset - - False + ..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.dll - - False + ..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.Extensions.dll + + ..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + - + False - ..\packages\System.Data.SQLite.x86.1.0.84.0\lib\net40\System.Data.SQLite.dll + ..\packages\SQLitex64.1.0.66\lib\32\System.Data.SQLite.DLL - bin\x86\Release\System.Runtime.dll + ..\packages\Microsoft.Bcl.1.0.16-rc\lib\net40\System.Runtime.dll - bin\x86\Release\System.Threading.Tasks.dll + ..\packages\Microsoft.Bcl.1.0.16-rc\lib\net40\System.Threading.Tasks.dll @@ -115,16 +116,17 @@ - + + Designer + - - xcopy /y "$(TargetPath)" "$(SolutionDir)\Test\Test\bin" xcopy /y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)\Test\Test\bin" + - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/packages/SQLitex64.1.0.66/SQLitex64.1.0.66.nupkg.REMOVED.git-id b/src/packages/SQLitex64.1.0.66/SQLitex64.1.0.66.nupkg.REMOVED.git-id new file mode 100644 index 000000000..6e8c802e1 --- /dev/null +++ b/src/packages/SQLitex64.1.0.66/SQLitex64.1.0.66.nupkg.REMOVED.git-id @@ -0,0 +1 @@ +aff828512d1afca48fa5d6824429359562199078 \ No newline at end of file diff --git a/src/packages/SQLitex64.1.0.66/SQLitex64.1.0.66.nuspec b/src/packages/SQLitex64.1.0.66/SQLitex64.1.0.66.nuspec new file mode 100644 index 000000000..2275c52d5 --- /dev/null +++ b/src/packages/SQLitex64.1.0.66/SQLitex64.1.0.66.nuspec @@ -0,0 +1,23 @@ + + + + SQLitex64 + 1.0.66 + SQLitex64 + Amir Barylko + Amir Barylko + http://www.sqlite.org/ + http://www.sqlite.org/images/sqlite370_banner.gif + false + Provides both (32 and 64 bit) assemblies needed to use SQLite. +The current package only provides 32 bit. + SQLite 64 bit and 32 bit assemblies + + + + SQLite + + + + + \ No newline at end of file diff --git a/src/packages/SQLitex64.1.0.66/lib/32/System.Data.SQLite.DLL.REMOVED.git-id b/src/packages/SQLitex64.1.0.66/lib/32/System.Data.SQLite.DLL.REMOVED.git-id new file mode 100644 index 000000000..f6116a77c --- /dev/null +++ b/src/packages/SQLitex64.1.0.66/lib/32/System.Data.SQLite.DLL.REMOVED.git-id @@ -0,0 +1 @@ +aa398bbec1a567de55f984959d200900b794372a \ No newline at end of file diff --git a/src/packages/SQLitex64.1.0.66/lib/64/System.Data.SQLite.DLL.REMOVED.git-id b/src/packages/SQLitex64.1.0.66/lib/64/System.Data.SQLite.DLL.REMOVED.git-id new file mode 100644 index 000000000..acf4e1240 --- /dev/null +++ b/src/packages/SQLitex64.1.0.66/lib/64/System.Data.SQLite.DLL.REMOVED.git-id @@ -0,0 +1 @@ +6f07d5e7ab41a0f791f07d5407f10edb4b716a02 \ No newline at end of file diff --git a/src/packages/SQLitex64.1.0.66/lib/System.Data.SQLite.DLL.REMOVED.git-id b/src/packages/SQLitex64.1.0.66/lib/System.Data.SQLite.DLL.REMOVED.git-id new file mode 100644 index 000000000..f6116a77c --- /dev/null +++ b/src/packages/SQLitex64.1.0.66/lib/System.Data.SQLite.DLL.REMOVED.git-id @@ -0,0 +1 @@ +aa398bbec1a567de55f984959d200900b794372a \ No newline at end of file diff --git a/src/packages/System.Data.SQLite.x86.1.0.84.0/System.Data.SQLite.x86.1.0.84.0.nupkg.REMOVED.git-id b/src/packages/System.Data.SQLite.x86.1.0.84.0/System.Data.SQLite.x86.1.0.84.0.nupkg.REMOVED.git-id deleted file mode 100644 index 71abe40ba..000000000 --- a/src/packages/System.Data.SQLite.x86.1.0.84.0/System.Data.SQLite.x86.1.0.84.0.nupkg.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -2db1579b36b2d81adf041533845e9a72ea6c2393 \ No newline at end of file diff --git a/src/packages/System.Data.SQLite.x86.1.0.84.0/System.Data.SQLite.x86.1.0.84.0.nuspec b/src/packages/System.Data.SQLite.x86.1.0.84.0/System.Data.SQLite.x86.1.0.84.0.nuspec deleted file mode 100644 index 702500c2b..000000000 --- a/src/packages/System.Data.SQLite.x86.1.0.84.0/System.Data.SQLite.x86.1.0.84.0.nuspec +++ /dev/null @@ -1,23 +0,0 @@ - - - - System.Data.SQLite.x86 - 1.0.84.0 - System.Data.SQLite.x86 - SQLite Development Team - SQLite Development Team - http://www.sqlite.org/copyright.html - http://system.data.sqlite.org/ - http://system.data.sqlite.org/images/sqlite32.png - false - The official SQLite database engine combined with a complete ADO.NET provider all rolled into a single mixed-mode assembly for x86. - - Public Domain - en-US - sqlite database ado.net provider interop - - - - - - \ No newline at end of file diff --git a/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net20/System.Data.SQLite.Linq.dll.REMOVED.git-id b/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net20/System.Data.SQLite.Linq.dll.REMOVED.git-id deleted file mode 100644 index 2f5b5e9c9..000000000 --- a/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net20/System.Data.SQLite.Linq.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -91d583cc0540c5252c68278bea13a48045548a20 \ No newline at end of file diff --git a/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net20/System.Data.SQLite.dll.REMOVED.git-id b/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net20/System.Data.SQLite.dll.REMOVED.git-id deleted file mode 100644 index 466be2a95..000000000 --- a/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net20/System.Data.SQLite.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -168e4329b21098e36b1c1af6e0c8728d5e9c589e \ No newline at end of file diff --git a/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net40/System.Data.SQLite.Linq.dll.REMOVED.git-id b/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net40/System.Data.SQLite.Linq.dll.REMOVED.git-id deleted file mode 100644 index d046ee944..000000000 --- a/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net40/System.Data.SQLite.Linq.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -31c463596b575043d8559b8a10cb25ad3bc15090 \ No newline at end of file diff --git a/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net40/System.Data.SQLite.dll.REMOVED.git-id b/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net40/System.Data.SQLite.dll.REMOVED.git-id deleted file mode 100644 index d022f1d1f..000000000 --- a/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net40/System.Data.SQLite.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -f60b588d3ff22ae8b1f51d710a44a037683ce81d \ No newline at end of file diff --git a/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net45/System.Data.SQLite.Linq.dll.REMOVED.git-id b/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net45/System.Data.SQLite.Linq.dll.REMOVED.git-id deleted file mode 100644 index 4cbdb1870..000000000 --- a/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net45/System.Data.SQLite.Linq.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -71a4551ce7011a6caeeadb73aea687ec586a5d87 \ No newline at end of file diff --git a/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net45/System.Data.SQLite.dll.REMOVED.git-id b/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net45/System.Data.SQLite.dll.REMOVED.git-id deleted file mode 100644 index fb102879e..000000000 --- a/src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net45/System.Data.SQLite.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -c62d000052745e37933833a3b764eb47ece9673f \ No newline at end of file