v 2.1.0.4

Former-commit-id: 8f49c40cda4ebf9cbbd4f8467a452e8e3aad6b0d

README.md

@@ -52,7 +52,7 @@ e.g.
 
 Using the HttpModule requires no code writing at all. Just reference the binaries and add the relevant sections to the web.config
 
-Image requests suffixed with querystring parameters will then be processed and **cached to the server - up to 360,000 images** allowing for easy and efficient parsing of following requests.
+Image requests suffixed with querystring parameters will then be processed and **cached to the server - up to 12,960,000 images** allowing for easy and efficient parsing of following requests.
 
 The parsing engine for the HttpModule is incredibly flexible and will **allow you to add querystring parameters in any order.**
 

src/ImageProcessor.Web/Config/ImageProcessorConfig.cs

@@ -10,7 +10,11 @@ namespace ImageProcessor.Web.Config
     #region Using
     using System;
     using System.Collections.Generic;
+    using System.IO;
     using System.Linq;
+    using System.Reflection;
+    using System.Text;
+
     using ImageProcessor.Processors;
     #endregion
 
@@ -233,12 +237,16 @@ namespace ImageProcessor.Web.Config
         private void LoadGraphicsProcessors()
         {
             if (this.GraphicsProcessors == null)
+            {
+                try
                 {
                     // Build a list of native IGraphicsProcessor instances.
                     Type type = typeof(IGraphicsProcessor);
                     IEnumerable<Type> types =
-                    AppDomain.CurrentDomain.GetAssemblies().SelectMany(s => s.GetTypes()).Where(
+                        AppDomain.CurrentDomain.GetAssemblies()
-                        p => type.IsAssignableFrom(p) && p.IsClass && !p.IsAbstract).ToList();
+                                 .SelectMany(s => s.GetTypes())
+                                 .Where(p => type.IsAssignableFrom(p) && p.IsClass && !p.IsAbstract)
+                                 .ToList();
 
                     // Create them and add.
                     this.GraphicsProcessors =
@@ -250,6 +258,31 @@ namespace ImageProcessor.Web.Config
                         processor.Settings = this.GetPluginSettings(processor.Name);
                     }
                 }
+                catch (ReflectionTypeLoadException ex)
+                {
+                    StringBuilder sb = new StringBuilder();
+                    foreach (Exception exception in ex.LoaderExceptions)
+                    {
+                        sb.AppendLine(exception.Message);
+                        if (exception is FileNotFoundException)
+                        {
+                            FileNotFoundException fileNotFoundException = exception as FileNotFoundException;
+                            if (!string.IsNullOrEmpty(fileNotFoundException.FusionLog))
+                            {
+                                sb.AppendLine("Fusion Log:");
+                                sb.AppendLine(fileNotFoundException.FusionLog);
+                            }
+                        }
+
+                        sb.AppendLine();
+                    }
+
+                    string errorMessage = sb.ToString();
+
+                    // Display or log the error based on your application.
+                    throw new Exception(errorMessage);
+                }
+            }
         }
         #endregion
     }

src/ImageProcessor.Web/ImageProcessor.Web.csproj

@@ -74,10 +74,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.14.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -85,25 +81,16 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\System.Data.SQLite.x86.1.0.84.0\lib\net40\System.Data.SQLite.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SQLite.Linq, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\System.Data.SQLite.x86.1.0.84.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
-    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net" />
     <Reference Include="System.Runtime">
-      <HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\net40\System.Runtime.dll</HintPath>
+      <HintPath>bin\x86\Release\System.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks, Version=2.5.16.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Threading.Tasks">
-      <HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\net40\System.Threading.Tasks.dll</HintPath>
+      <HintPath>bin\x86\Release\System.Threading.Tasks.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Caching\CachedImage.cs" />

src/ImageProcessor.Web/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.0.4")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.4")]

src/ImageProcessor.Web/app.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
-    <assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
+    <assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl">
       <dependentAssembly bcl:name="System.Runtime">
         <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />

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

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

src/Test/Test/Images/Thumbs.db.REMOVED.git-id

@@ -1 +1 @@
-df51932368e72ec3c9b9897d29e27dcf20af7395
+32c1c68dd25fc55293b1a21c1ea25002c53f984b

src/Test/Test/Web.config

@@ -51,7 +51,7 @@
         <modules runAllManagedModulesForAllRequests="true" />
     </system.webServer>
     <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+        <assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
                 <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />