diff --git a/build/Build.bat b/build/Build.bat index 274d2741db..93e60ce612 100644 --- a/build/Build.bat +++ b/build/Build.bat @@ -1,6 +1,6 @@ @ECHO OFF SET version=1.9.2.0 -SET webversion=3.2.5.0 +SET webversion=3.2.6.0 SET webconfigversion=1.1.1.0 ECHO Building ImageProcessor %version%, ImageProcess.Web %webversion% and ImageProcess.Web.Config %webconfigversion% diff --git a/build/NuSpecs/ImageProcessor.Web.Config.nuspec b/build/NuSpecs/ImageProcessor.Web.Config.nuspec index 5b0f123655..d20d8fc73b 100644 --- a/build/NuSpecs/ImageProcessor.Web.Config.nuspec +++ b/build/NuSpecs/ImageProcessor.Web.Config.nuspec @@ -6,7 +6,7 @@ ImageProcessor.Web.Config James South James South - http://jimbobsquarepants.github.com/ImageProcessor/ + http://imageprocessor.org http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png false Adds configuration to your ImageProcessor.Web solution to allow you to override the default settings. diff --git a/build/NuSpecs/ImageProcessor.Web.nuspec b/build/NuSpecs/ImageProcessor.Web.nuspec index d64b9e126d..78dec17d9b 100644 --- a/build/NuSpecs/ImageProcessor.Web.nuspec +++ b/build/NuSpecs/ImageProcessor.Web.nuspec @@ -6,7 +6,7 @@ ImageProcessor.Web James South James South - http://jimbobsquarepants.github.com/ImageProcessor/ + http://imageprocessor.org http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png false 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 millions of images, increasing your processing output and saving precious server memory. @@ -27,11 +27,9 @@ Feedback is always welcome - - diff --git a/build/NuSpecs/ImageProcessor.nuspec b/build/NuSpecs/ImageProcessor.nuspec index 7c5fe668d7..757d7a76cd 100644 --- a/build/NuSpecs/ImageProcessor.nuspec +++ b/build/NuSpecs/ImageProcessor.nuspec @@ -6,7 +6,7 @@ ImageProcessor James South James South - http://jimbobsquarepants.github.com/ImageProcessor/ + http://imageprocessor.org http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png false Image Processor is an easy to use and extend processing library written in C#. Its fluent API makes common imaging tasks very simple to perform. diff --git a/build/content/ImageProcessor.Web/web.config.transform b/build/content/ImageProcessor.Web/web.config.transform index 6d29542b8c..a541ff10e2 100644 --- a/build/content/ImageProcessor.Web/web.config.transform +++ b/build/content/ImageProcessor.Web/web.config.transform @@ -1,6 +1,14 @@  - + + + + + + - + + + + - + \ No newline at end of file diff --git a/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj b/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj index a42a129ed0..4432f1f257 100644 --- a/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj +++ b/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj @@ -54,10 +54,6 @@ False ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - @@ -97,9 +93,6 @@ ResourceHelpers.cs - - StartUp.cs - diff --git a/src/ImageProcessor.Web/NET4/packages.config b/src/ImageProcessor.Web/NET4/packages.config index a4d062b2a3..fd0874c230 100644 --- a/src/ImageProcessor.Web/NET4/packages.config +++ b/src/ImageProcessor.Web/NET4/packages.config @@ -3,5 +3,4 @@ - \ No newline at end of file diff --git a/src/ImageProcessor.Web/NET45/Helpers/StartUp.cs b/src/ImageProcessor.Web/NET45/Helpers/StartUp.cs deleted file mode 100644 index 81310e6200..0000000000 --- a/src/ImageProcessor.Web/NET45/Helpers/StartUp.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -------------------------------------------------------------------------------------------------------------------- -// -// Copyright (c) James South. -// Licensed under the Apache License, Version 2.0. -// -// -// Provides methods to handle startup events. -// -// -------------------------------------------------------------------------------------------------------------------- - -[assembly: System.Web.PreApplicationStartMethod(typeof(ImageProcessor.Web.Helpers.StartUp), "PreApplicationStart")] - -namespace ImageProcessor.Web.Helpers -{ - using ImageProcessor.Web.HttpModules; - using Microsoft.Web.Infrastructure.DynamicModuleHelper; - - /// - /// Provides methods to handle startup events. - /// - public static class StartUp - { - /// - /// The pre application start. - /// - public static void PreApplicationStart() - { - DynamicModuleUtility.RegisterModule(typeof(ImageProcessingModule)); - } - } -} diff --git a/src/ImageProcessor.Web/NET45/ImageProcessor.Web_NET45.csproj b/src/ImageProcessor.Web/NET45/ImageProcessor.Web_NET45.csproj index 10b2f0923d..23cc45e967 100644 --- a/src/ImageProcessor.Web/NET45/ImageProcessor.Web_NET45.csproj +++ b/src/ImageProcessor.Web/NET45/ImageProcessor.Web_NET45.csproj @@ -32,10 +32,6 @@ 4 - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - @@ -58,7 +54,6 @@ - @@ -80,7 +75,6 @@ Designer - diff --git a/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs b/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs index d5904d37b6..39c9a7e949 100644 --- a/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs +++ b/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ using ImageProcessor.Web.HttpModules; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.2.5.0")] -[assembly: AssemblyFileVersion("3.2.5.0")] \ No newline at end of file +[assembly: AssemblyVersion("3.2.6.0")] +[assembly: AssemblyFileVersion("3.2.6.0")] \ No newline at end of file diff --git a/src/ImageProcessor.Web/NET45/packages.config b/src/ImageProcessor.Web/NET45/packages.config deleted file mode 100644 index 21007718ee..0000000000 --- a/src/ImageProcessor.Web/NET45/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/TestWebsites/NET4/Web.config b/src/TestWebsites/NET4/Web.config index 015f2c612c..f1a0ba606b 100644 --- a/src/TestWebsites/NET4/Web.config +++ b/src/TestWebsites/NET4/Web.config @@ -45,12 +45,17 @@ + + + - + + + diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Web.config b/src/TestWebsites/NET45/Test_Website_NET45/Web.config index 229b4f6d24..a11127feed 100644 --- a/src/TestWebsites/NET45/Test_Website_NET45/Web.config +++ b/src/TestWebsites/NET45/Test_Website_NET45/Web.config @@ -41,9 +41,13 @@ + + + + @@ -52,7 +56,9 @@ + + + - diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.config b/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.config index 82587616f0..5a11c17836 100644 --- a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.config +++ b/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.config @@ -62,9 +62,9 @@ - + diff --git a/src/packages/repositories.config b/src/packages/repositories.config index a6a409bc3a..458c0f4aad 100644 --- a/src/packages/repositories.config +++ b/src/packages/repositories.config @@ -1,9 +1,7 @@  - - \ No newline at end of file