Getting ready for 1.7 and 2.3 release

Former-commit-id: 2872f128571d73fa4aa9648432dc56784615babf

src/ImageProcessor/Properties/AssemblyInfo.cs

@@ -32,6 +32,6 @@ using System.Security;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.7.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]
 

src/Nuget/ImageProcessor.Web.2.1.0.4.nupkg.REMOVED.git-id

@@ -1 +0,0 @@
-eaff612b7db9e40f185c91161fd9c977faec69bb

src/Nuget/ImageProcessor.Web.2.1.1.0.nupkg.REMOVED.git-id

@@ -1 +0,0 @@
-2af35ccdf0476cbe432b2440be45ffd0f6c414f4

src/Nuget/ImageProcessor.Web.2.1.2.0.nupkg.REMOVED.git-id

@@ -1 +0,0 @@
-1ac41e14e3ae5f8ac9b06bcfbbacc6c4a9841863

src/Nuget/ImageProcessor.Web.2.2.0.0.nupkg.REMOVED.git-id

@@ -1 +0,0 @@
-13403db94dce99fd4e73114b3334d4ef0c2b4ae5

src/Nuget/ImageProcessor.Web.2.2.0.1.nupkg.REMOVED.git-id

@@ -1 +0,0 @@
-8a3fd4491298fec4626034f03e534caac7f22941

src/Nuget/ImageProcessor.Web.2.2.0.1.nuspec

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-    <metadata>
-        <id>ImageProcessor.Web</id>
-        <version>2.2.0.1</version>
-        <title>ImageProcessor.Web</title>
-        <authors>James South</authors>
-        <owners>James South</owners>
-        <projectUrl>http://jimbobsquarepants.github.com/ImageProcessor/</projectUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>ImageProcessor.Web adds a configurable HttpModule to your website which allows on-the-fly processing of image files. The module also comes with a file and browser based cache that can handle up to 12,960,000 images increasing your processing output and saving precious server memory.
-
-Methods include; Resize, Rotate, Flip, Crop, Watermark, Filter, Saturation, Brightness, Contrast, Quality, Format, Vignette, and Transparency.
-
-This package also requires Microsoft.Bcl.Async -pre on .NET 4.0 which will be added in the background on install if applicable.
-
-If you use ImageProcessor please get in touch via my twitter @james_m_south
-
-
-Feedback is always welcome.</description>
-        <summary>An extension to ImageProcessor that allows on-the-fly processing of image files in an ASP.NET website</summary>
-        <releaseNotes>Fixed cache bug which caused unneccessary processing of images.
-
-If upgrading from &lt; 2.2.0.0 You will have to delete your cache if upgrading to this version as the database differs.</releaseNotes>
-        <copyright>James South</copyright>
-        <language>en-GB</language>
-        <tags>Image, Imaging, ASP, Performance, Processing, HttpModule, Cache, Resize, Rotate, Flip, Crop, Filter, Effects, Quality, Watermark, Alpha, Vignette, Saturation, Brightness, Contrast, Gif, Jpeg, Bitmap, Png, Fluent</tags>
-        <dependencies>
-            <dependency id="ImageProcessor" version="1.5.0.0" />
-            <dependency id="Csharp-Sqlite" version="3.7.7.1" />
-        </dependencies>
-    </metadata>
-    <files>
-        <file src="content\net40\web.config.transform" target="content\net40\web.config.transform" />
-        <file src="content\net45\web.config.transform" target="content\net45\web.config.transform" />
-        <file src="..\ImageProcessor.Web\bin\Release\ImageProcessor.Web.dll" target="lib\net40\ImageProcessor.Web.dll" />
-        <file src="lib\net40\System.Runtime.dll" target="lib\net40\System.Runtime.dll" />
-        <file src="lib\net40\System.Threading.Tasks.dll" target="lib\net40\System.Threading.Tasks.dll" />
-        <file src="..\ImageProcessor.Web\bin\Release\ImageProcessor.Web.dll" target="lib\net45\ImageProcessor.Web.dll" />
-        <file src="tools\net40\install.ps1" target="tools\net40\install.ps1" />
-        <file src="tools\net45\install.ps1" target="tools\net45\install.ps1" />
-    </files>
-</package>

src/Nuget/ImageProcessor.Web.2.2.1.0.nupkg.REMOVED.git-id

@@ -1 +0,0 @@
-46b009d93ab9f1ea75f1ea1efb0073b3d369d3e5

src/Nuget/ImageProcessor.Web.2.2.2.0.nupkg.REMOVED.git-id

@@ -1 +0,0 @@
-50dc5dc47c964ccc80bb8abb22650a579ae796c3

src/Nuget/ImageProcessor.Web.2.2.3.0.nupkg.REMOVED.git-id

@@ -1 +0,0 @@
-9142f8cdad57d5c52d8721112c18a8d26c6f9817

src/Nuget/ImageProcessor.Web.2.2.3.1.nupkg.REMOVED.git-id

@@ -1 +0,0 @@
-24114542de37d7b4463b56749e64e34b0d43a9cc

src/Nuget/ImageProcessor.Web.2.2.3.2.nupkg.REMOVED.git-id

@@ -1 +0,0 @@
-3de0aa82f042cfdda2764554fb34e686b401df85

src/packages/sqlite-net.1.0.7/content/SQLite.cs.REMOVED.git-id

@@ -1 +1 @@
-d2856e3733eb6c7d85057c37ae415e54c8bf2386
+86139d135bd91c43d8ffe8808f0f04975fd22a82

src/packages/sqlite-net.1.0.7/content/SQLiteAsync.cs

@@ -86,11 +86,14 @@ namespace SQLite
 
         public Task<CreateTablesResult> CreateTablesAsync(params Type[] types)
         {
-			return Task.Factory.StartNew (() => {
+            return Task.Factory.StartNew(() =>
+            {
                 CreateTablesResult result = new CreateTablesResult();
                 var conn = GetConnection();
-				using (conn.Lock ()) {
+                using (conn.Lock())
-					foreach (Type type in types) {
+                {
+                    foreach (Type type in types)
+                    {
                         int aResult = conn.CreateTable(type);
                         result.Results[type] = aResult;
                     }
@@ -102,9 +105,11 @@ namespace SQLite
         public Task<int> DropTableAsync<T>()
             where T : new()
         {
-			return Task.Factory.StartNew (() => {
+            return Task.Factory.StartNew(() =>
+            {
                 var conn = GetConnection();
-				using (conn.Lock ()) {
+                using (conn.Lock())
+                {
                     return conn.DropTable<T>();
                 }
             });
@@ -112,9 +117,11 @@ namespace SQLite
 
         public Task<int> InsertAsync(object item)
         {
-			return Task.Factory.StartNew (() => {
+            return Task.Factory.StartNew(() =>
+            {
                 var conn = GetConnection();
-				using (conn.Lock ()) {
+                using (conn.Lock())
+                {
                     return conn.Insert(item);
                 }
             });
@@ -122,9 +129,11 @@ namespace SQLite
 
         public Task<int> UpdateAsync(object item)
         {
-			return Task.Factory.StartNew (() => {
+            return Task.Factory.StartNew(() =>
+            {
                 var conn = GetConnection();
-				using (conn.Lock ()) {
+                using (conn.Lock())
+                {
                     return conn.Update(item);
                 }
             });
@@ -132,9 +141,11 @@ namespace SQLite
 
         public Task<int> DeleteAsync(object item)
         {
-			return Task.Factory.StartNew (() => {
+            return Task.Factory.StartNew(() =>
+            {
                 var conn = GetConnection();
-				using (conn.Lock ()) {
+                using (conn.Lock())
+                {
                     return conn.Delete(item);
                 }
             });
@@ -156,9 +167,11 @@ namespace SQLite
         public Task<T> FindAsync<T>(object pk)
             where T : new()
         {
-			return Task.Factory.StartNew (() => {
+            return Task.Factory.StartNew(() =>
+            {
                 var conn = GetConnection();
-				using (conn.Lock ()) {
+                using (conn.Lock())
+                {
                     return conn.Find<T>(pk);
                 }
             });
@@ -180,9 +193,11 @@ namespace SQLite
         public Task<T> FindAsync<T>(Expression<Func<T, bool>> predicate)
             where T : new()
         {
-			return Task.Factory.StartNew (() => {
+            return Task.Factory.StartNew(() =>
+            {
                 var conn = GetConnection();
-				using (conn.Lock ()) {
+                using (conn.Lock())
+                {
                     return conn.Find<T>(predicate);
                 }
             });
@@ -190,9 +205,11 @@ namespace SQLite
 
         public Task<int> ExecuteAsync(string query, params object[] args)
         {
-			return Task<int>.Factory.StartNew (() => {
+            return Task<int>.Factory.StartNew(() =>
+            {
                 var conn = GetConnection();
-				using (conn.Lock ()) {
+                using (conn.Lock())
+                {
                     return conn.Execute(query, args);
                 }
             });
@@ -200,9 +217,11 @@ namespace SQLite
 
         public Task<int> InsertAllAsync(IEnumerable items)
         {
-			return Task.Factory.StartNew (() => {
+            return Task.Factory.StartNew(() =>
+            {
                 var conn = GetConnection();
-				using (conn.Lock ()) {
+                using (conn.Lock())
+                {
                     return conn.InsertAll(items);
                 }
             });
@@ -211,15 +230,19 @@ namespace SQLite
         [Obsolete("Will cause a deadlock if any call in action ends up in a different thread. Use RunInTransactionAsync(Action<SQLiteConnection>) instead.")]
         public Task RunInTransactionAsync(Action<SQLiteAsyncConnection> action)
         {
-			return Task.Factory.StartNew (() => {
+            return Task.Factory.StartNew(() =>
+            {
                 var conn = this.GetConnection();
-				using (conn.Lock ()) {
+                using (conn.Lock())
+                {
                     conn.BeginTransaction();
-					try {
+                    try
+                    {
                         action(this);
                         conn.Commit();
                     }
-					catch (Exception) {
+                    catch (Exception)
+                    {
                         conn.Rollback();
                         throw;
                     }
@@ -262,9 +285,11 @@ namespace SQLite
 
         public Task<T> ExecuteScalarAsync<T>(string sql, params object[] args)
         {
-			return Task<T>.Factory.StartNew (() => {
+            return Task<T>.Factory.StartNew(() =>
+            {
                 var conn = GetConnection();
-				using (conn.Lock ()) {
+                using (conn.Lock())
+                {
                     var command = conn.CreateCommand(sql, args);
                     return command.ExecuteScalar<T>();
                 }
@@ -274,9 +299,11 @@ namespace SQLite
         public Task<List<T>> QueryAsync<T>(string sql, params object[] args)
             where T : new()
         {
-			return Task<List<T>>.Factory.StartNew (() => {
+            return Task<List<T>>.Factory.StartNew(() =>
+            {
                 var conn = GetConnection();
-				using (conn.Lock ()) {
+                using (conn.Lock())
+                {
                     return conn.Query<T>(sql, args);
                 }
             });
@@ -324,8 +351,10 @@ namespace SQLite
 
         public Task<List<T>> ToListAsync()
         {
-			return Task.Factory.StartNew (() => {
+            return Task.Factory.StartNew(() =>
-				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
+            {
+                using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock())
+                {
                     return _innerQuery.ToList();
                 }
             });
@@ -333,8 +362,10 @@ namespace SQLite
 
         public Task<int> CountAsync()
         {
-			return Task.Factory.StartNew (() => {
+            return Task.Factory.StartNew(() =>
-				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
+            {
+                using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock())
+                {
                     return _innerQuery.Count();
                 }
             });
@@ -342,8 +373,10 @@ namespace SQLite
 
         public Task<T> ElementAtAsync(int index)
         {
-			return Task.Factory.StartNew (() => {
+            return Task.Factory.StartNew(() =>
-				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
+            {
+                using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock())
+                {
                     return _innerQuery.ElementAt(index);
                 }
             });
@@ -351,8 +384,10 @@ namespace SQLite
 
         public Task<T> FirstAsync()
         {
-			return Task<T>.Factory.StartNew(() => {
+            return Task<T>.Factory.StartNew(() =>
-				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
+            {
+                using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock())
+                {
                     return _innerQuery.First();
                 }
             });
@@ -360,8 +395,10 @@ namespace SQLite
 
         public Task<T> FirstOrDefaultAsync()
         {
-			return Task<T>.Factory.StartNew(() => {
+            return Task<T>.Factory.StartNew(() =>
-				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
+            {
+                using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock())
+                {
                     return _innerQuery.FirstOrDefault();
                 }
             });
@@ -416,11 +453,13 @@ namespace SQLite
 
         public SQLiteConnectionWithLock GetConnection(SQLiteConnectionString connectionString)
         {
-			lock (_entriesLock) {
+            lock (_entriesLock)
+            {
                 Entry entry;
                 string key = connectionString.ConnectionString;
 
-				if (!_entries.TryGetValue (key, out entry)) {
+                if (!_entries.TryGetValue(key, out entry))
+                {
                     entry = new Entry(connectionString);
                     _entries[key] = entry;
                 }
@@ -434,8 +473,10 @@ namespace SQLite
         /// </summary>
         public void Reset()
         {
-			lock (_entriesLock) {
+            lock (_entriesLock)
-				foreach (var entry in _entries.Values) {
+            {
+                foreach (var entry in _entries.Values)
+                {
                     entry.OnApplicationSuspended();
                 }
                 _entries.Clear();