Skip to content
This repository has been archived by the owner on Sep 6, 2023. It is now read-only.

Commit

Permalink
Version Bump
Browse files Browse the repository at this point in the history
ImageProcessor 2.5.5
ImageProcessor.Web 4.8.6
  • Loading branch information
JimBobSquarePants committed Sep 12, 2017
1 parent ee7c430 commit 29ab88c
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 37 deletions.
5 changes: 3 additions & 2 deletions build/NuSpecs/ImageProcessor.Web.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@ Feedback is always welcome</description>
<tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff ASP Cache EXIF</tags>
<dependencies>
<group targetFramework=".NETFramework4.5">
<dependency id="ImageProcessor" version="2.5.4.0" />
<dependency id="ImageProcessor" version="2.5.5.0" />
<dependency id="Microsoft.IO.RecyclableMemoryStream" version="1.2.2" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\content\ImageProcessor.Web\web.config.transform" target="content\web.config.transform" />
<file src="..\_BuildOutput\ImageProcessor.Web\lib\net45\ImageProcessor.Web.dll" target="lib\net45\ImageProcessor.Web.dll" />
<file src="..\_BuildOutput\ImageProcessor.Web\lib\net45\ImageProcessor.Web.dll" target="lib\net45" />
<file src="..\_BuildOutput\ImageProcessor.Web\lib\net45\ImageProcessor.Web.xml" target="lib\net45" />
</files>
</package>
50 changes: 27 additions & 23 deletions build/NuSpecs/ImageProcessor.nuspec
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>ImageProcessor</id>
<version>$version$</version>
<title>ImageProcessor</title>
<authors>James Jackson-South</authors>
<owners>James Jackson-South</owners>
<projectUrl>http://imageprocessor.org</projectUrl>
<iconUrl>https://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/develop/build/icons/imageprocessor-logo-128.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>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.
<metadata>
<id>ImageProcessor</id>
<version>$version$</version>
<title>ImageProcessor</title>
<authors>James Jackson-South</authors>
<owners>James Jackson-South</owners>
<projectUrl>http://imageprocessor.org</projectUrl>
<iconUrl>https://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/develop/build/icons/imageprocessor-logo-128.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>
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.</description>
<summary>A library for manipulating image files written in C#.</summary>
<releaseNotes />
<copyright>James Jackson-South</copyright>
<language>en-GB</language>
<tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff Fluent Animated EXIF</tags>
</metadata>
<files>
<file src="..\_BuildOutput\ImageProcessor\lib\net40\ImageProcessor.dll" target="lib\net40\ImageProcessor.dll" />
<file src="..\_BuildOutput\ImageProcessor\lib\net45\ImageProcessor.dll" target="lib\net45\ImageProcessor.dll" />
</files>
Feedback is always welcome.
</description>
<summary>A library for manipulating image files written in C#.</summary>
<releaseNotes />
<copyright>James Jackson-South</copyright>
<language>en-GB</language>
<tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff Fluent Animated EXIF</tags>
</metadata>
<files>
<file src="..\_BuildOutput\ImageProcessor\lib\net40\ImageProcessor.dll" target="lib\net40" />
<file src="..\_BuildOutput\ImageProcessor\lib\net40\ImageProcessor.xml" target="lib\net40" />
<file src="..\_BuildOutput\ImageProcessor\lib\net45\ImageProcessor.dll" target="lib\net45" />
<file src="..\_BuildOutput\ImageProcessor\lib\net45\ImageProcessor.xml" target="lib\net45" />
</files>
</package>
4 changes: 2 additions & 2 deletions build/build.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<projects>
<project>
<name>ImageProcessor</name>
<version>2.5.4.0</version>
<version>2.5.5.0</version>
<!--<prerelease>-beta</prerelease>-->
<folder>..\src\ImageProcessor</folder>
<projfile>ImageProcessor.csproj</projfile>
Expand All @@ -15,7 +15,7 @@
<project>
<name>ImageProcessor Web</name>
<!--<prerelease>-beta</prerelease>-->
<version>4.8.5.0</version>
<version>4.8.6.0</version>
<folder>..\src\ImageProcessor.Web</folder>
<projfile>ImageProcessor.Web.csproj</projfile>
<outputs>
Expand Down
10 changes: 5 additions & 5 deletions src/ImageProcessor.Web/Caching/ImageCacheBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,11 @@ protected virtual void AugmentSettings(Dictionary<string, string> settings)
{
}

/// <summary>
/// Debounces the trimming function
/// </summary>
/// <param name="trimmer">The trimming function</param>
/// <returns>The <see cref="Task"/></returns>
[EditorBrowsable(EditorBrowsableState.Never)]
[Obsolete("Use ScheduleCacheTrimmer instead")]
protected virtual Task DebounceTrimmerAsync(Func<Task> trimmer)
Expand Down Expand Up @@ -221,11 +226,6 @@ private class CacheTrimmer : IRegisteredObject
/// </summary>
private static bool trim;

/// <summary>
/// The asynchronous trimmer task
/// </summary>
// private static Task task;

/// <summary>
/// The cancellation token source
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

using ImageProcessor.Web.Caching;

namespace ImageProcessor.Web.Configuration
{
using System;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private QueryParamParser()
/// The <see cref="Type"/> to convert the string to.
/// </typeparam>
/// <returns>
/// The <see cref="T"/>.
/// The <typeparamref name="T"/>.
/// </returns>
public T ParseValue<T>(string value, CultureInfo culture = null)
{
Expand Down
2 changes: 2 additions & 0 deletions src/ImageProcessor.Web/Helpers/RemoteFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

using System.Collections.Generic;

namespace ImageProcessor.Web.Helpers
{
using System;
Expand Down
2 changes: 2 additions & 0 deletions src/ImageProcessor.Web/ImageProcessor.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<DefineConstants>TRACE;DEBUG;USE_CSHARP_SQLITE, NET45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\ImageProcessor.Web.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -30,6 +31,7 @@
<DefineConstants>TRACE;USE_CSHARP_SQLITE, NET45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\ImageProcessor.Web.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions src/ImageProcessor.Web/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
4 changes: 2 additions & 2 deletions src/ImageProcessor/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]

0 comments on commit 29ab88c

Please sign in to comment.