From 9ebd4836743dce6612a460610ce20686f143eead Mon Sep 17 00:00:00 2001 From: James South Date: Mon, 14 Apr 2014 14:25:21 +0100 Subject: [PATCH] v1.8.8 & v3.2.2 Fix issue #41 Former-commit-id: 5b99a5bb08498ae31a2fa1a0b2ee75aa0743ddaa --- .../NET4/ImageProcessor.Web_NET4.csproj | 27 +++--- src/ImageProcessor.Web/NET4/app.config | 4 +- src/ImageProcessor.Web/NET4/packages.config | 6 +- .../NET45/Helpers/RemoteFile.cs | 10 ++- .../NET45/Properties/AssemblyInfo.cs | 4 +- src/ImageProcessor.sln | 17 ---- src/ImageProcessor/Processors/Resize.cs | 80 ++++++++++++------ src/ImageProcessor/Properties/AssemblyInfo.cs | 4 +- ...mageProcessor.1.8.6.0.nupkg.REMOVED.git-id | 1 - ...mageProcessor.1.8.6.1.nupkg.REMOVED.git-id | 1 - src/Nuget/ImageProcessor.1.8.8.0.nupkg | Bin 0 -> 37012 bytes src/Nuget/ImageProcessor.Web.3.1.1.0.nupkg | Bin 48413 -> 0 bytes src/Nuget/ImageProcessor.Web.3.2.0.0.nupkg | Bin 48329 -> 0 bytes src/Nuget/ImageProcessor.Web.3.2.2.0.nupkg | Bin 0 -> 48539 bytes .../NET4/Test_Website_MVC_NET4.csproj | 31 ++++--- src/TestWebsites/NET4/Web.config | 6 +- src/TestWebsites/NET4/packages.config | 6 +- 17 files changed, 109 insertions(+), 88 deletions(-) delete mode 100644 src/Nuget/ImageProcessor.1.8.6.0.nupkg.REMOVED.git-id delete mode 100644 src/Nuget/ImageProcessor.1.8.6.1.nupkg.REMOVED.git-id create mode 100644 src/Nuget/ImageProcessor.1.8.8.0.nupkg delete mode 100644 src/Nuget/ImageProcessor.Web.3.1.1.0.nupkg delete mode 100644 src/Nuget/ImageProcessor.Web.3.2.0.0.nupkg create mode 100644 src/Nuget/ImageProcessor.Web.3.2.2.0.nupkg diff --git a/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj b/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj index 047451f26..a42a129ed 100644 --- a/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj +++ b/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj @@ -42,14 +42,17 @@ - - ..\..\packages\Microsoft.Bcl.Async.1.0.165\lib\net40\Microsoft.Threading.Tasks.dll + + False + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - - ..\..\packages\Microsoft.Bcl.Async.1.0.165\lib\net40\Microsoft.Threading.Tasks.Extensions.dll + + False + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - - ..\..\packages\Microsoft.Bcl.Async.1.0.165\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + + False + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll True @@ -60,15 +63,15 @@ - ..\..\packages\Microsoft.Bcl.1.1.6\lib\net40\System.IO.dll + ..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll - ..\..\packages\Microsoft.Bcl.1.1.6\lib\net40\System.Runtime.dll + ..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll - ..\..\packages\Microsoft.Bcl.1.1.6\lib\net40\System.Threading.Tasks.dll + ..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll @@ -131,10 +134,10 @@ - + - - + +