Fixed NET4.5 Async Bug

Former-commit-id: db934d2655ba868117a4a4e93c8ede87a3024692

src/ImageProcessor.Tests/RegularExpressionUnitTests.cs

@@ -176,7 +176,6 @@ namespace ImageProcessor.Tests
             Assert.AreEqual(expected, actual);
         }
 
-
         /// <summary>
         /// The rounded corners regex unit test.
         /// </summary>

src/ImageProcessor.Web/HttpModules/ImageProcessingModule.cs

@@ -72,7 +72,18 @@ namespace ImageProcessor.Web.HttpModules
                 DiskCache.CreateDirectories();
             }
 
+#if NET45
+
+            EventHandlerTaskAsyncHelper wrapper = new EventHandlerTaskAsyncHelper(this.ContextBeginRequest);
+            context.AddOnBeginRequestAsync(wrapper.BeginEventHandler, wrapper.EndEventHandler);
+
+#else
+
             context.BeginRequest += this.ContextBeginRequest;
+
+#endif
+
+
             context.PreSendRequestHeaders += this.ContextPreSendRequestHeaders;
         }
 
@@ -85,6 +96,28 @@ namespace ImageProcessor.Web.HttpModules
         }
         #endregion
 
+#if NET45
+
+        /// <summary>
+        /// Occurs as the first event in the HTTP pipeline chain of execution when ASP.NET responds to a request.
+        /// </summary>
+        /// <param name="sender">
+        /// The source of the event.
+        /// </param>
+        /// <param name="e">
+        /// An <see cref="T:System.EventArgs">EventArgs</see> that contains the event data.
+        /// </param>
+        /// <returns>
+        /// The <see cref="T:System.Threading.Tasks.Task"/>.
+        /// </returns>
+        private Task ContextBeginRequest(object sender, EventArgs e)
+        {
+            HttpContext context = ((HttpApplication)sender).Context;
+            return this.ProcessImageAsync(context);
+        }
+
+#else
+
         /// <summary>
         /// Occurs as the first event in the HTTP pipeline chain of execution when ASP.NET responds to a request.
         /// </summary>
@@ -96,6 +129,8 @@ namespace ImageProcessor.Web.HttpModules
             await this.ProcessImageAsync(context);
         }
 
+#endif
+
         /// <summary>
         /// Occurs just before ASP.NET send HttpHeaders to the client.
         /// </summary>

src/ImageProcessor.Web/ImageProcessor.Web.csproj

@@ -103,8 +103,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy /y "$(TargetPath)" "$(SolutionDir)\Test\Test\bin"
-xcopy /y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)\Test\Test\bin"</PostBuildEvent>
+    <PostBuildEvent>xcopy /y "$(TargetPath)" "$(SolutionDir)\TestWebsites\NET4\bin"
+xcopy /y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)\TestWebsites\NET4\bin"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.6\tools\Microsoft.Bcl.Build.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/ImageProcessor.Web/ImageProcessor.Web_NET45.csproj

@@ -17,7 +17,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\NET45\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;USE_CSHARP_SQLITE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;USE_CSHARP_SQLITE, NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -25,7 +25,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\NET45\</OutputPath>
-    <DefineConstants>TRACE;USE_CSHARP_SQLITE</DefineConstants>
+    <DefineConstants>TRACE;USE_CSHARP_SQLITE, NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

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.2.3.1")]
-[assembly: AssemblyFileVersion("2.2.3.1")]
+[assembly: AssemblyVersion("2.2.3.3")]
+[assembly: AssemblyFileVersion("2.2.3.3")]

src/ImageProcessor.sln

@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor", "ImageProcessor\ImageProcessor.csproj", "{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test\Test.csproj", "{30327C08-7574-4D7E-AC95-6A58753C6855}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Web", "ImageProcessor.Web\ImageProcessor.Web.csproj", "{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Tests", "ImageProcessor.Tests\ImageProcessor.Tests.csproj", "{39911A38-CA06-413C-80AA-39EF60CE984F}"
@@ -19,6 +17,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Web_NET45", "ImageProcessor.Web\ImageProcessor.Web_NET45.csproj", "{D011A778-59C8-4BFA-A770-C350216BF161}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Website", "TestWebsites\NET4\Test_Website.csproj", "{30327C08-7574-4D7E-AC95-6A58753C6855}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Website_NET45", "TestWebsites\NET45\Test_Website_NET45.csproj", "{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}"
+EndProject
 Global
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = ImageProcessor.vsmdi
@@ -50,24 +52,6 @@ Global
 		{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Release|x86.ActiveCfg = Release|Any CPU
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.All|Any CPU.ActiveCfg = All|Any CPU
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.All|Any CPU.Build.0 = All|Any CPU
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.All|Mixed Platforms.ActiveCfg = All|x86
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.All|Mixed Platforms.Build.0 = All|x86
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.All|x86.ActiveCfg = All|x86
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.All|x86.Build.0 = All|x86
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|x86.ActiveCfg = Debug|x86
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|x86.Build.0 = Debug|x86
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.Release|Any CPU.Build.0 = Release|Any CPU
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.Release|Mixed Platforms.Build.0 = Release|x86
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.Release|x86.ActiveCfg = Release|x86
-		{30327C08-7574-4D7E-AC95-6A58753C6855}.Release|x86.Build.0 = Release|x86
 		{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|Any CPU.ActiveCfg = All|Any CPU
 		{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|Any CPU.Build.0 = All|Any CPU
 		{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|Mixed Platforms.ActiveCfg = All|Any CPU
@@ -131,6 +115,42 @@ Global
 		{D011A778-59C8-4BFA-A770-C350216BF161}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D011A778-59C8-4BFA-A770-C350216BF161}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D011A778-59C8-4BFA-A770-C350216BF161}.Release|x86.ActiveCfg = Release|Any CPU
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.All|Any CPU.ActiveCfg = All|Any CPU
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.All|Any CPU.Build.0 = All|Any CPU
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.All|Mixed Platforms.ActiveCfg = All|x86
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.All|Mixed Platforms.Build.0 = All|x86
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.All|x86.ActiveCfg = All|x86
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.All|x86.Build.0 = All|x86
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|x86.ActiveCfg = Debug|x86
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|x86.Build.0 = Debug|x86
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.Release|Mixed Platforms.Build.0 = Release|x86
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.Release|x86.ActiveCfg = Release|x86
+		{30327C08-7574-4D7E-AC95-6A58753C6855}.Release|x86.Build.0 = Release|x86
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.All|Any CPU.ActiveCfg = All|Any CPU
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.All|Any CPU.Build.0 = All|Any CPU
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.All|Mixed Platforms.ActiveCfg = All|x86
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.All|Mixed Platforms.Build.0 = All|x86
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.All|x86.ActiveCfg = All|x86
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.All|x86.Build.0 = All|x86
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Debug|x86.ActiveCfg = Debug|x86
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Debug|x86.Build.0 = Debug|x86
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Release|Mixed Platforms.Build.0 = Release|x86
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Release|x86.ActiveCfg = Release|x86
+		{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

@@ -0,0 +1 @@
+01e1999a7804bb48ba37f247dfdb1bf01f05fa62

src/Test/Test/Content/style.css → src/TestWebsites/NET4/Content/style.css

@@ -19,12 +19,7 @@ section section {
 }
 
     section section:nth-child(2n) {
-        background-color: #00a9ec;
-        color: #fff;
-    }
-
-    section section:nth-child(4n) {
-        background-color: #ED1C24;
+        background-color: #f3f3f3;
     }
 
 .no-bullets {

src/Test/Test/Test.csproj → src/TestWebsites/NET4/Test_Website.csproj

@@ -188,7 +188,7 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>14238</DevelopmentServerPort>
+          <DevelopmentServerPort>21961</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>
           </IISUrl>

src/Test/Test/Views/Home/Responsive.cshtml → src/TestWebsites/NET4/Views/Home/Responsive.cshtml

@@ -1,18 +1,18 @@
-@{
-    ViewBag.Title = "Responsive";
-}
-<style type="text/css">
-    img
-    {
-        max-width: 100%;
-    }
-</style>
-<h2>
-    Responsive</h2>
-<img src="/Images/desert.jpg?width=480" srcset="/Images/desert.jpg?width=768 480w, /Images/penguins.jpg?width=979 640w 2x,  /Images/jellyfish.jpg?width=480 2x"
-    alt="desert" />
-@*<img src="/Images/desert.jpg?width=480" srcset="/Images/desert.jpg?width=768 480w, /Images/jellyfish.jpg?width=480 2x, /Images/penguins.jpg?width=979 640w 2x"
-    alt="desert" />*@ @*<img src="/Images/desert.jpg?width=480" srcset="/Images/desert.jpg?width=768 480w, /Images/desert.jpg?width=979 768w"
-    alt="desert" />*@
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-<script src="/Scripts/img.srcsect.pollyfill.js" type="text/javascript"></script>
+@{
+    ViewBag.Title = "Responsive";
+}
+<style type="text/css">
+    img
+    {
+        max-width: 100%;
+    }
+</style>
+<h2>
+    Responsive</h2>
+<img src="/Images/desert.jpg?width=480" srcset="/Images/desert.jpg?width=768 480w, /Images/penguins.jpg?width=979 640w 2x,  /Images/jellyfish.jpg?width=480 2x"
+    alt="desert" />
+@*<img src="/Images/desert.jpg?width=480" srcset="/Images/desert.jpg?width=768 480w, /Images/jellyfish.jpg?width=480 2x, /Images/penguins.jpg?width=979 640w 2x"
+    alt="desert" />*@ @*<img src="/Images/desert.jpg?width=480" srcset="/Images/desert.jpg?width=768 480w, /Images/desert.jpg?width=979 768w"
+    alt="desert" />*@
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+<script src="/Scripts/img.srcsect.pollyfill.js" type="text/javascript"></script>

src/Test/Test/Views/Shared/_Layout.cshtml → src/TestWebsites/NET4/Views/Shared/_Layout.cshtml

@@ -10,7 +10,7 @@
     <div class="page">
         <header>
             <div class="container">
-                <h1>ImageProcessor Test Website</h1>
+                <h1>ImageProcessor NET4.0</h1>
             </div>
         </header>
         <section id="main">

src/TestWebsites/NET4/cache/0/3/0ed1b21b56f58f1cc566014f5f5cf5e3.bmp.REMOVED.git-id

@@ -0,0 +1 @@
+f4e00752418f01964b99ce300d96c16a9aa8d239

src/TestWebsites/NET4/cache/0/4/0b64a147662ae5f841029e61c5e88984.png.REMOVED.git-id

@@ -0,0 +1 @@
+fd46e83948190f508b8906f0822eca8dd4eda2ef

src/TestWebsites/NET4/cache/0/7/09f4cdcadedc15e2bb3fb3647d6e4a87.bmp.REMOVED.git-id

@@ -0,0 +1 @@
+aa7c907774ef5492ae25ffb7e3ff9755257731bd

src/TestWebsites/NET4/cache/0/c/016bbd2c44ab6af915e4dc26a715d5ec.bmp.REMOVED.git-id

@@ -0,0 +1 @@
+1038ebe89d7cfb28ec96a421867a2b0efc6dfdb4

src/TestWebsites/NET4/cache/0/e/0b24c3d312abd3bfcc04452e8eaca81e.bmp.REMOVED.git-id

@@ -0,0 +1 @@
+1456713687c96cd486c4ec8e57d3c4f6f6437f10

src/TestWebsites/NET4/cache/0/f/07d78f73ba8fe89fe3197254c394da4f.bmp.REMOVED.git-id

@@ -0,0 +1 @@
+4c16fd6b5b6b8cc426bc290d15ab41523be29403

src/TestWebsites/NET4/cache/1/3/1de0e9e101bdd9bc8122039f22bcc073.bmp.REMOVED.git-id

@@ -0,0 +1 @@
+bbf8bc24452deb732adf66ef3488793859f4f5b7

src/TestWebsites/NET4/cache/3/9/3b901eb58e88f80197a0cd5716f876f9.bmp.REMOVED.git-id

@@ -0,0 +1 @@
+bbfe7d237dcb52af2e60d5a73b33b15d1bded363

src/TestWebsites/NET4/cache/4/4/44f7fdae94c317963c821dd5c969d624.bmp.REMOVED.git-id

@@ -0,0 +1 @@
+4c16fd6b5b6b8cc426bc290d15ab41523be29403

src/TestWebsites/NET4/cache/5/2/5489562d92f5b5323aa3d1707abcf952.bmp.REMOVED.git-id

@@ -0,0 +1 @@
+4c16fd6b5b6b8cc426bc290d15ab41523be29403

src/TestWebsites/NET4/cache/5/2/554da7a7a2d1076bcce748c5ec0fc0a2.png.REMOVED.git-id

@@ -0,0 +1 @@
+17b206e295bd3f2b5011bca3bc2eee4b3dda2f2e

src/TestWebsites/NET4/cache/5/e/51e17f5818f8c822dfabc9198a3216ee.bmp.REMOVED.git-id

@@ -0,0 +1 @@
+a8c63bdc1f6505040493f130938a64e19015d0ad

src/TestWebsites/NET4/cache/5/f/5cda624f35edfa92546beb9ab3071d4f.png.REMOVED.git-id

@@ -0,0 +1 @@
+5962e6fb383cf50a75414809b60cfada65f35cae

src/TestWebsites/NET4/cache/6/9/6595555394314c844af4f8eb778a53f9.png.REMOVED.git-id

@@ -0,0 +1 @@
+ece2bf873103b341b318b90a799041c298e3b5be

src/TestWebsites/NET4/cache/6/a/60bc3881aa326b2d130ed6b1a069526a.png.REMOVED.git-id

@@ -0,0 +1 @@
+fc4ec6a6d16131cb9ea9ab6c0921bcf5766f254d

src/TestWebsites/NET4/cache/6/a/6a335df182dfb45716f1f4cf9043725a.png.REMOVED.git-id

@@ -0,0 +1 @@
+70138b9cd6ff7405f96cef6008536f7a0edeb826

src/TestWebsites/NET4/cache/6/c/6be53cafb3b8cadd048ed55ebcb9f50c.png.REMOVED.git-id

@@ -0,0 +1 @@
+1c9ffb3ff2f1881dce011636c38c18684c610d55

src/TestWebsites/NET4/cache/7/2/766873ca1d339e7a8f318fdea4517e52.png.REMOVED.git-id

@@ -0,0 +1 @@
+5612964523fbf81c63bafa27deb3e64e9ce07340

src/TestWebsites/NET4/cache/7/f/7dd5e20ac02737ffe98d89cc06e9fd1f.bmp.REMOVED.git-id

@@ -0,0 +1 @@
+01a2b2fc1f3686f3d1b244b6e9d4619ad0591d22