From 29ab88c2bbbcfdb2757a7f84c34637883626eea1 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Tue, 12 Sep 2017 21:42:28 +1000 Subject: [PATCH] Version Bump ImageProcessor 2.5.5 ImageProcessor.Web 4.8.6 --- build/NuSpecs/ImageProcessor.Web.nuspec | 5 +- build/NuSpecs/ImageProcessor.nuspec | 50 ++++++++++--------- build/build.xml | 4 +- .../Caching/ImageCacheBase.cs | 10 ++-- .../ImageProcessorConfiguration.cs | 2 + .../QuerystringParser/QueryParamParser.cs | 2 +- src/ImageProcessor.Web/Helpers/RemoteFile.cs | 2 + .../ImageProcessor.Web.csproj | 2 + .../Properties/AssemblyInfo.cs | 4 +- src/ImageProcessor/Properties/AssemblyInfo.cs | 4 +- 10 files changed, 48 insertions(+), 37 deletions(-) diff --git a/build/NuSpecs/ImageProcessor.Web.nuspec b/build/NuSpecs/ImageProcessor.Web.nuspec index 700bffa73..6d18b5361 100644 --- a/build/NuSpecs/ImageProcessor.Web.nuspec +++ b/build/NuSpecs/ImageProcessor.Web.nuspec @@ -23,13 +23,14 @@ Feedback is always welcome Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff ASP Cache EXIF - + - + + diff --git a/build/NuSpecs/ImageProcessor.nuspec b/build/NuSpecs/ImageProcessor.nuspec index d43ea6dac..d8c514609 100644 --- a/build/NuSpecs/ImageProcessor.nuspec +++ b/build/NuSpecs/ImageProcessor.nuspec @@ -1,29 +1,33 @@  - - ImageProcessor - $version$ - ImageProcessor - James Jackson-South - James Jackson-South - http://imageprocessor.org - https://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/develop/build/icons/imageprocessor-logo-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. + + ImageProcessor + $version$ + ImageProcessor + James Jackson-South + James Jackson-South + http://imageprocessor.org + https://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/develop/build/icons/imageprocessor-logo-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. -Methods include; Resize, Rotate, Rounded Corners, Flip, Crop, Watermark, Filter, Saturation, Brightness, Contrast, Quality, Format, Vignette, Gaussian Blur, Gaussian Sharpen, and Transparency. + Methods include; Resize, Rotate, Rounded Corners, Flip, Crop, Watermark, Filter, Saturation, Brightness, Contrast, Quality, Format, Vignette, Gaussian Blur, Gaussian Sharpen, and Transparency. -If you use ImageProcessor please get in touch on my twitter @james_m_south. + If you use ImageProcessor please get in touch on my twitter @james_m_south. -Feedback is always welcome. - A library for manipulating image files written in C#. - - James Jackson-South - en-GB - Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff Fluent Animated EXIF - - - - - + Feedback is always welcome. + + A library for manipulating image files written in C#. + + James Jackson-South + en-GB + Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff Fluent Animated EXIF + + + + + + + \ No newline at end of file diff --git a/build/build.xml b/build/build.xml index 822cf0a4c..d3091d2b9 100644 --- a/build/build.xml +++ b/build/build.xml @@ -1,7 +1,7 @@ ImageProcessor - 2.5.4.0 + 2.5.5.0 ..\src\ImageProcessor ImageProcessor.csproj @@ -15,7 +15,7 @@ ImageProcessor Web - 4.8.5.0 + 4.8.6.0 ..\src\ImageProcessor.Web ImageProcessor.Web.csproj diff --git a/src/ImageProcessor.Web/Caching/ImageCacheBase.cs b/src/ImageProcessor.Web/Caching/ImageCacheBase.cs index df40876d7..e3d291e75 100644 --- a/src/ImageProcessor.Web/Caching/ImageCacheBase.cs +++ b/src/ImageProcessor.Web/Caching/ImageCacheBase.cs @@ -174,6 +174,11 @@ protected virtual void AugmentSettings(Dictionary settings) { } + /// + /// Debounces the trimming function + /// + /// The trimming function + /// The [EditorBrowsable(EditorBrowsableState.Never)] [Obsolete("Use ScheduleCacheTrimmer instead")] protected virtual Task DebounceTrimmerAsync(Func trimmer) @@ -221,11 +226,6 @@ private class CacheTrimmer : IRegisteredObject /// private static bool trim; - /// - /// The asynchronous trimmer task - /// - // private static Task task; - /// /// The cancellation token source /// diff --git a/src/ImageProcessor.Web/Configuration/ImageProcessorConfiguration.cs b/src/ImageProcessor.Web/Configuration/ImageProcessorConfiguration.cs index 039bb6222..6e30c10c6 100644 --- a/src/ImageProcessor.Web/Configuration/ImageProcessorConfiguration.cs +++ b/src/ImageProcessor.Web/Configuration/ImageProcessorConfiguration.cs @@ -8,6 +8,8 @@ // // -------------------------------------------------------------------------------------------------------------------- +using ImageProcessor.Web.Caching; + namespace ImageProcessor.Web.Configuration { using System; diff --git a/src/ImageProcessor.Web/Helpers/QuerystringParser/QueryParamParser.cs b/src/ImageProcessor.Web/Helpers/QuerystringParser/QueryParamParser.cs index 295b6b655..5d9f8c643 100644 --- a/src/ImageProcessor.Web/Helpers/QuerystringParser/QueryParamParser.cs +++ b/src/ImageProcessor.Web/Helpers/QuerystringParser/QueryParamParser.cs @@ -67,7 +67,7 @@ private QueryParamParser() /// The to convert the string to. /// /// - /// The . + /// The . /// public T ParseValue(string value, CultureInfo culture = null) { diff --git a/src/ImageProcessor.Web/Helpers/RemoteFile.cs b/src/ImageProcessor.Web/Helpers/RemoteFile.cs index 840d8b9c0..b0d6478fd 100644 --- a/src/ImageProcessor.Web/Helpers/RemoteFile.cs +++ b/src/ImageProcessor.Web/Helpers/RemoteFile.cs @@ -8,6 +8,8 @@ // // -------------------------------------------------------------------------------------------------------------------- +using System.Collections.Generic; + namespace ImageProcessor.Web.Helpers { using System; diff --git a/src/ImageProcessor.Web/ImageProcessor.Web.csproj b/src/ImageProcessor.Web/ImageProcessor.Web.csproj index ee7f53474..0c438aba5 100644 --- a/src/ImageProcessor.Web/ImageProcessor.Web.csproj +++ b/src/ImageProcessor.Web/ImageProcessor.Web.csproj @@ -22,6 +22,7 @@ TRACE;DEBUG;USE_CSHARP_SQLITE, NET45 prompt 4 + bin\Debug\ImageProcessor.Web.xml pdbonly @@ -30,6 +31,7 @@ TRACE;USE_CSHARP_SQLITE, NET45 prompt 4 + bin\Release\ImageProcessor.Web.xml diff --git a/src/ImageProcessor.Web/Properties/AssemblyInfo.cs b/src/ImageProcessor.Web/Properties/AssemblyInfo.cs index acfda2944..b15f592c1 100644 --- a/src/ImageProcessor.Web/Properties/AssemblyInfo.cs +++ b/src/ImageProcessor.Web/Properties/AssemblyInfo.cs @@ -41,7 +41,7 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("4.8.5.0")] -[assembly: AssemblyFileVersion("4.8.5.0")] +[assembly: AssemblyVersion("4.8.6.0")] +[assembly: AssemblyFileVersion("4.8.6.0")] [assembly:InternalsVisibleTo("ImageProcessor.UnitTests")] diff --git a/src/ImageProcessor/Properties/AssemblyInfo.cs b/src/ImageProcessor/Properties/AssemblyInfo.cs index 6814eaa9c..214fc2673 100644 --- a/src/ImageProcessor/Properties/AssemblyInfo.cs +++ b/src/ImageProcessor/Properties/AssemblyInfo.cs @@ -41,8 +41,8 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.5.4.0")] -[assembly: AssemblyFileVersion("2.5.4.0")] +[assembly: AssemblyVersion("2.5.5.0")] +[assembly: AssemblyFileVersion("2.5.5.0")] [assembly: InternalsVisibleTo("ImageProcessor.UnitTests")] [assembly: InternalsVisibleTo("ImageProcessor.Web")]