Browse Source

Merge remote-tracking branch 'origin/dev'

Conflicts:
	src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs

Former-commit-id: ecbe1e3bec56a3761a5b62136318ecf93de40646
pull/17/head
James South 12 years ago
parent
commit
2761bfd76d
  1. 20
      src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj
  2. 1
      src/ImageProcessor.Web/NET4/packages.config
  3. 25
      src/ImageProcessor.Web/NET45/Config/ImageCacheSection.cs
  4. 10
      src/ImageProcessor.Web/NET45/Config/ImageProcessingSection.cs
  5. 9
      src/ImageProcessor.Web/NET45/Config/ImageProcessorConfig.cs
  6. 16
      src/ImageProcessor.Web/NET45/Config/ImageSecuritySection.cs
  7. 1
      src/ImageProcessor.Web/NET45/Config/Resources/cache.config
  8. 39
      src/ImageProcessor.Web/NET45/Config/Resources/processing.config
  9. 4
      src/ImageProcessor.Web/NET45/Config/Resources/security.config
  10. 56
      src/ImageProcessor.Web/NET45/Helpers/ResourceHelpers.cs
  11. 31
      src/ImageProcessor.Web/NET45/Helpers/StartUp.cs
  12. 25
      src/ImageProcessor.Web/NET45/HttpModules/ImageProcessingModule.cs
  13. 16
      src/ImageProcessor.Web/NET45/ImageProcessor.Web_NET45.csproj
  14. 8
      src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
  15. 4
      src/ImageProcessor.Web/NET45/packages.config
  16. 15
      src/ImageProcessor/Processors/Resize.cs
  17. 4
      src/ImageProcessor/Properties/AssemblyInfo.cs
  18. 1
      src/Nuget/ImageProcessor.1.8.2.0.nupkg.REMOVED.git-id
  19. 1
      src/Nuget/ImageProcessor.1.8.3.0.nupkg.REMOVED.git-id
  20. 1
      src/Nuget/ImageProcessor.1.8.4.0.nupkg.REMOVED.git-id
  21. 1
      src/Nuget/ImageProcessor.1.8.6.0.nupkg.REMOVED.git-id
  22. BIN
      src/Nuget/ImageProcessor.Web.3.0.1.0.nupkg
  23. BIN
      src/Nuget/ImageProcessor.Web.3.1.0.0.nupkg
  24. BIN
      src/Nuget/ImageProcessor.Web.3.2.0.0.nupkg
  25. BIN
      src/Nuget/ImageProcessor.Web.Config.1.0.0.0.nupkg
  26. 4
      src/TestWebsites/NET45/Test_Website_NET45/Test_Website_MVC_NET45.csproj
  27. 25
      src/TestWebsites/NET45/Test_Website_NET45/Web.config
  28. 1
      src/packages/repositories.config

20
src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj

@ -51,6 +51,10 @@
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.165\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
@ -68,6 +72,7 @@
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Data" />
<Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\NET45\Caching\CachedImage.cs" />
@ -86,6 +91,12 @@
<Link>ImageHelpers.cs</Link>
</Compile>
<Compile Include="..\NET45\Helpers\RemoteFile.cs" />
<Compile Include="..\NET45\Helpers\ResourceHelpers.cs">
<Link>ResourceHelpers.cs</Link>
</Compile>
<Compile Include="..\NET45\Helpers\StartUp.cs">
<Link>StartUp.cs</Link>
</Compile>
<Compile Include="..\NET45\Helpers\TaskHelpers.cs" />
<Compile Include="..\NET45\HttpModules\ImageProcessingModule.cs" />
<Compile Include="..\NET45\ImageFactoryExtensions.cs" />
@ -98,6 +109,15 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\NET45\Config\Resources\cache.config">
<Link>Config\Resources\cache.config</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\NET45\Config\Resources\processing.config">
<Link>Config\Resources\processing.config</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\NET45\Config\Resources\security.config">
<Link>Config\Resources\security.config</Link>
</EmbeddedResource>
<None Include="app.config">
<SubType>Designer</SubType>
</None>

1
src/ImageProcessor.Web/NET4/packages.config

@ -3,4 +3,5 @@
<package id="Microsoft.Bcl" version="1.1.6" targetFramework="net40" />
<package id="Microsoft.Bcl.Async" version="1.0.165" targetFramework="net40" />
<package id="Microsoft.Bcl.Build" version="1.0.13" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
</packages>

25
src/ImageProcessor.Web/NET45/Config/ImageCacheSection.cs

@ -1,16 +1,22 @@
// -----------------------------------------------------------------------
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ImageCacheSection.cs" company="James South">
// Copyright (c) James South.
// Licensed under the Apache License, Version 2.0.
// Copyright (c) James South.
// Licensed under the Apache License, Version 2.0.
// </copyright>
// -----------------------------------------------------------------------
// <summary>
// Represents an image cache section within a configuration file.
// </summary>
// --------------------------------------------------------------------------------------------------------------------
namespace ImageProcessor.Web.Config
{
#region Using
using System.Configuration;
using System.IO;
using System.Xml;
using ImageProcessor.Extensions;
using ImageProcessor.Web.Helpers;
#endregion
@ -24,7 +30,7 @@ namespace ImageProcessor.Web.Config
/// </summary>
/// <value>The name of the cache folder.</value>
[ConfigurationProperty("virtualPath", DefaultValue = "~/app_data/cache", IsRequired = true)]
[StringValidator(MinLength = 3, MaxLength = 200)]
[StringValidator(MinLength = 3, MaxLength = 256)]
public string VirtualPath
{
get
@ -45,7 +51,7 @@ namespace ImageProcessor.Web.Config
/// </summary>
/// <value>The maximum number of days to store an image in the cache.</value>
/// <remarks>Defaults to 28 if not set.</remarks>
[ConfigurationProperty("maxDays", DefaultValue = "28", IsRequired = false)]
[ConfigurationProperty("maxDays", DefaultValue = "365", IsRequired = false)]
[IntegerValidator(ExcludeRange = false, MinValue = 0)]
public int MaxDays
{
@ -73,7 +79,12 @@ namespace ImageProcessor.Web.Config
return imageCacheSection;
}
return new ImageCacheSection();
string section = ResourceHelpers.ResourceAsString("ImageProcessor.Web.Config.Resources.cache.config");
XmlReader reader = new XmlTextReader(new StringReader(section));
imageCacheSection = new ImageCacheSection();
imageCacheSection.DeserializeSection(reader);
return imageCacheSection;
}
}
}

10
src/ImageProcessor.Web/NET45/Config/ImageProcessingSection.cs

@ -13,7 +13,10 @@ namespace ImageProcessor.Web.Config
{
#region Using
using System.Configuration;
using System.IO;
using System.Linq;
using System.Xml;
using ImageProcessor.Web.Helpers;
#endregion
/// <summary>
@ -69,7 +72,12 @@ namespace ImageProcessor.Web.Config
return imageProcessingSection;
}
return new ImageProcessingSection();
string section = ResourceHelpers.ResourceAsString("ImageProcessor.Web.Config.Resources.processing.config");
XmlReader reader = new XmlTextReader(new StringReader(section));
imageProcessingSection = new ImageProcessingSection();
imageProcessingSection.DeserializeSection(reader);
return imageProcessingSection;
}
#endregion

9
src/ImageProcessor.Web/NET45/Config/ImageProcessorConfig.cs

@ -13,12 +13,9 @@ 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 System.Web.Compilation;
using ImageProcessor.Processors;
#endregion
@ -300,7 +297,7 @@ namespace ImageProcessor.Web.Config
.SelectMany(s => s.GetTypes())
.Where(t => t != null && type.IsAssignableFrom(t) && t.IsClass && !t.IsAbstract)
.ToList();
// Create them and add.
this.GraphicsProcessors = availableTypes.Select(x => (Activator.CreateInstance(x) as IGraphicsProcessor)).ToList();
@ -310,7 +307,7 @@ namespace ImageProcessor.Web.Config
processor.Settings = this.GetPluginSettings(processor.GetType().Name);
}
}
catch (ReflectionTypeLoadException ex)
catch (ReflectionTypeLoadException)
{
this.LoadGraphicsProcessorsFromConfiguration();
}
@ -352,4 +349,4 @@ namespace ImageProcessor.Web.Config
}
#endregion
}
}
}

16
src/ImageProcessor.Web/NET45/Config/ImageSecuritySection.cs

@ -13,6 +13,11 @@ namespace ImageProcessor.Web.Config
#region Using
using System;
using System.Configuration;
using System.IO;
using System.Xml;
using ImageProcessor.Web.Helpers;
#endregion
/// <summary>
@ -55,8 +60,8 @@ namespace ImageProcessor.Web.Config
/// Gets or sets the maximum allowed remote file size in bytes for the application.
/// </summary>
/// <value>The maximum number of days to store an image in the cache.</value>
/// <remarks>Defaults to 524288 (512kb) if not set.</remarks>
[ConfigurationProperty("maxBytes", DefaultValue = "524288", IsRequired = true)]
/// <remarks>Defaults to 4194304 (4Mb) if not set.</remarks>
[ConfigurationProperty("maxBytes", DefaultValue = "4194304", IsRequired = true)]
public int MaxBytes
{
get
@ -111,7 +116,12 @@ namespace ImageProcessor.Web.Config
return imageSecuritySection;
}
return new ImageSecuritySection();
string section = ResourceHelpers.ResourceAsString("ImageProcessor.Web.Config.Resources.security.config");
XmlReader reader = new XmlTextReader(new StringReader(section));
imageSecuritySection = new ImageSecuritySection();
imageSecuritySection.DeserializeSection(reader);
return imageSecuritySection;
}
#endregion

1
src/ImageProcessor.Web/NET45/Config/Resources/cache.config

@ -0,0 +1 @@
<cache virtualPath="~/app_data/cache" maxDays="356"/>

39
src/ImageProcessor.Web/NET45/Config/Resources/processing.config

@ -0,0 +1,39 @@
<processing>
<presets>
</presets>
<plugins autoLoadPlugins="true">
<plugin name="Alpha" type="ImageProcessor.Processors.Alpha, ImageProcessor"/>
<plugin name="Brightness" type="ImageProcessor.Processors.Brightness, ImageProcessor"/>
<plugin name="Contrast" type="ImageProcessor.Processors.Contrast, ImageProcessor"/>
<plugin name="Crop" type="ImageProcessor.Processors.Crop, ImageProcessor"/>
<plugin name="Filter" type="ImageProcessor.Processors.Filter, ImageProcessor"/>
<plugin name="Flip" type="ImageProcessor.Processors.Flip, ImageProcessor"/>
<plugin name="Format" type="ImageProcessor.Processors.Format, ImageProcessor"/>
<plugin name="GaussianBlur" type="ImageProcessor.Processors.GaussianBlur, ImageProcessor">
<settings>
<setting key="MaxSize" value="22"/>
<setting key="MaxSigma" value="5.1"/>
<setting key="MaxThreshold" value="100"/>
</settings>
</plugin>
<plugin name="GaussianSharpen" type="ImageProcessor.Processors.GaussianSharpen, ImageProcessor">
<settings>
<setting key="MaxSize" value="22"/>
<setting key="MaxSigma" value="5.1"/>
<setting key="MaxThreshold" value="100"/>
</settings>
</plugin>
<plugin name="Quality" type="ImageProcessor.Processors.Quality, ImageProcessor"/>
<plugin name="Resize" type="ImageProcessor.Processors.Resize, ImageProcessor">
<settings>
<setting key="MaxWidth" value="5000"/>
<setting key="MaxHeight" value="5000"/>
</settings>
</plugin>
<plugin name="Rotate" type="ImageProcessor.Processors.Rotate, ImageProcessor"/>
<plugin name="RoundedCorners" type="ImageProcessor.Processors.RoundedCorners, ImageProcessor"/>
<plugin name="Saturation" type="ImageProcessor.Processors.Saturation, ImageProcessor"/>
<plugin name="Vignette" type="ImageProcessor.Processors.Vignette, ImageProcessor"/>
<plugin name="Watermark" type="ImageProcessor.Processors.Watermark, ImageProcessor"/>
</plugins>
</processing>

4
src/ImageProcessor.Web/NET45/Config/Resources/security.config

@ -0,0 +1,4 @@
<security allowRemoteDownloads="true" timeout="300000" maxBytes="4194304" remotePrefix="/remote.axd">
<whiteList>
</whiteList>
</security>

56
src/ImageProcessor.Web/NET45/Helpers/ResourceHelpers.cs

@ -0,0 +1,56 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ResourceHelpers.cs" company="James South">
// Copyright (c) James South.
// Licensed under the Apache License, Version 2.0.
// </copyright>
// <summary>
// Provides helper methods for working with resources.
// </summary>
// --------------------------------------------------------------------------------------------------------------------
namespace ImageProcessor.Web.Helpers
{
using System.IO;
using System.Reflection;
using System.Text;
/// <summary>
/// Provides helper methods for working with resources.
/// </summary>
public class ResourceHelpers
{
/// <summary>
/// Converts an assembly resource into a string.
/// </summary>
/// <param name="resource">
/// The resource.
/// </param>
/// <param name="assembly">
/// The assembly.
/// </param>
/// <param name="encoding">
/// The character encoding to return the resource in.
/// </param>
/// <returns>
/// The <see cref="string"/>.
/// </returns>
public static string ResourceAsString(string resource, Assembly assembly = null, Encoding encoding = null)
{
assembly = assembly ?? Assembly.GetExecutingAssembly();
encoding = encoding ?? Encoding.UTF8;
using (MemoryStream ms = new MemoryStream())
{
using (Stream manifestResourceStream = assembly.GetManifestResourceStream(resource))
{
if (manifestResourceStream != null)
{
manifestResourceStream.CopyTo(ms);
}
}
return encoding.GetString(ms.GetBuffer()).Replace('\0', ' ').Trim();
}
}
}
}

31
src/ImageProcessor.Web/NET45/Helpers/StartUp.cs

@ -0,0 +1,31 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="StartUp.cs" company="James South">
// Copyright (c) James South.
// Licensed under the Apache License, Version 2.0.
// </copyright>
// <summary>
// Provides methods to handle startup events.
// </summary>
// --------------------------------------------------------------------------------------------------------------------
[assembly: System.Web.PreApplicationStartMethod(typeof(ImageProcessor.Web.Helpers.StartUp), "PreApplicationStart")]
namespace ImageProcessor.Web.Helpers
{
using ImageProcessor.Web.HttpModules;
using Microsoft.Web.Infrastructure.DynamicModuleHelper;
/// <summary>
/// Provides methods to handle startup events.
/// </summary>
public static class StartUp
{
/// <summary>
/// The pre application start.
/// </summary>
public static void PreApplicationStart()
{
DynamicModuleUtility.RegisterModule(typeof(ImageProcessingModule));
}
}
}

25
src/ImageProcessor.Web/NET45/HttpModules/ImageProcessingModule.cs

@ -31,6 +31,9 @@ namespace ImageProcessor.Web.HttpModules
using ImageProcessor.Web.Caching;
using ImageProcessor.Web.Config;
using ImageProcessor.Web.Helpers;
using Microsoft.Web.Infrastructure.DynamicModuleHelper;
#endregion
/// <summary>
@ -49,11 +52,6 @@ namespace ImageProcessor.Web.HttpModules
/// </summary>
private static readonly Regex PresetRegex = new Regex(@"preset=[^&]*", RegexOptions.Compiled);
/// <summary>
/// The value to prefix any remote image requests with to ensure they get captured.
/// </summary>
private static readonly string RemotePrefix = ImageProcessorConfig.Instance.RemotePrefix;
/// <summary>
/// The assembly version.
/// </summary>
@ -64,6 +62,11 @@ namespace ImageProcessor.Web.HttpModules
/// </summary>
private static readonly Dictionary<string, SemaphoreSlim> SemaphoreSlims = new Dictionary<string, SemaphoreSlim>();
/// <summary>
/// The value to prefix any remote image requests with to ensure they get captured.
/// </summary>
private static string remotePrefix;
/// <summary>
/// A value indicating whether this instance of the given entity has been disposed.
/// </summary>
@ -109,17 +112,17 @@ namespace ImageProcessor.Web.HttpModules
/// </param>
public void Init(HttpApplication context)
{
#if NET45
if (remotePrefix == null)
{
remotePrefix = ImageProcessorConfig.Instance.RemotePrefix;
}
#if NET45
EventHandlerTaskAsyncHelper wrapper = new EventHandlerTaskAsyncHelper(this.PostAuthorizeRequest);
context.AddOnPostAuthorizeRequestAsync(wrapper.BeginEventHandler, wrapper.EndEventHandler);
#else
context.PostAuthorizeRequest += this.PostAuthorizeRequest;
#endif
context.PreSendRequestHeaders += this.ContextPreSendRequestHeaders;
}
@ -264,7 +267,7 @@ namespace ImageProcessor.Web.HttpModules
HttpRequest request = context.Request;
// Fixes issue 10.
bool isRemote = request.Path.EndsWith(RemotePrefix, StringComparison.OrdinalIgnoreCase);
bool isRemote = request.Path.EndsWith(remotePrefix, StringComparison.OrdinalIgnoreCase);
string requestPath = string.Empty;
string queryString = string.Empty;

16
src/ImageProcessor.Web/NET45/ImageProcessor.Web_NET45.csproj

@ -32,6 +32,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
@ -53,6 +57,8 @@
<Compile Include="Config\ImageProcessingSection.cs" />
<Compile Include="Config\ImageProcessorConfig.cs" />
<Compile Include="Config\ImageSecuritySection.cs" />
<Compile Include="Helpers\ResourceHelpers.cs" />
<Compile Include="Helpers\StartUp.cs" />
<Compile Include="Helpers\ImageHelpers.cs" />
<Compile Include="Helpers\RemoteFile.cs" />
<Compile Include="Helpers\TaskHelpers.cs" />
@ -66,6 +72,16 @@
<Name>ImageProcessor</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Config\Resources\cache.config">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Config\Resources\processing.config">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Config\Resources\security.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

8
src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs

@ -5,6 +5,10 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
using System.Web;
using ImageProcessor.Web.HttpModules;
[assembly: AssemblyTitle("ImageProcessor.Web")]
[assembly: AssemblyDescription("A library for on-the-fly processing of image files with ASP.NET written in C#")]
[assembly: AssemblyConfiguration("James South")]
@ -31,5 +35,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("3.1.1.0")]
[assembly: AssemblyFileVersion("3.1.1.0")]
[assembly: AssemblyVersion("3.2.0.0")]
[assembly: AssemblyFileVersion("3.2.0.0")]

4
src/ImageProcessor.Web/NET45/packages.config

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
</packages>

15
src/ImageProcessor/Processors/Resize.cs

@ -446,12 +446,19 @@ namespace ImageProcessor.Processors
graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
graphics.CompositingMode = CompositingMode.SourceCopy;
graphics.CompositingQuality = CompositingQuality.HighQuality;
graphics.Clear(backgroundColor);
Rectangle destRect = new Rectangle(destinationX, destinationY, destinationWidth, destinationHeight);
graphics.DrawImage(image, destRect, 0, 0, sourceWidth, sourceHeight, GraphicsUnit.Pixel);
// An unwanted border appears when using InterpolationMode.HighQualityBicubic to resize the image
// as the algorithm appears to be pulling averaging detail from surrounding pixels beyond the edge
// of the image. Using the ImageAttributes class to specify that the pixels beyond are simply mirror
// images of the pixels within solves this problem.
using (ImageAttributes wrapMode = new ImageAttributes())
{
wrapMode.SetWrapMode(WrapMode.TileFlipXY);
graphics.Clear(backgroundColor);
Rectangle destRect = new Rectangle(destinationX, destinationY, destinationWidth, destinationHeight);
graphics.DrawImage(image, destRect, 0, 0, sourceWidth, sourceHeight, GraphicsUnit.Pixel, wrapMode);
}
// Reassign the image.
image.Dispose();

4
src/ImageProcessor/Properties/AssemblyInfo.cs

@ -32,6 +32,6 @@ using System.Security;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.8.5.0")]
[assembly: AssemblyFileVersion("1.8.5.0")]
[assembly: AssemblyVersion("1.8.6.0")]
[assembly: AssemblyFileVersion("1.8.6.0")]

1
src/Nuget/ImageProcessor.1.8.2.0.nupkg.REMOVED.git-id

@ -1 +0,0 @@
3fc6418ca4779d20c4fad1afc82a3693dd93b9e4

1
src/Nuget/ImageProcessor.1.8.3.0.nupkg.REMOVED.git-id

@ -1 +0,0 @@
b334b903dac55dfc5156a814c1fce9cc1f10f744

1
src/Nuget/ImageProcessor.1.8.4.0.nupkg.REMOVED.git-id

@ -1 +0,0 @@
effc95273383a6d336dd589cf684b3952cb98699

1
src/Nuget/ImageProcessor.1.8.6.0.nupkg.REMOVED.git-id

@ -0,0 +1 @@
8aabc0ada547c28930a04d63f23c2d7e429ef88d

BIN
src/Nuget/ImageProcessor.Web.3.0.1.0.nupkg

Binary file not shown.

BIN
src/Nuget/ImageProcessor.Web.3.1.0.0.nupkg

Binary file not shown.

BIN
src/Nuget/ImageProcessor.Web.3.2.0.0.nupkg

Binary file not shown.

BIN
src/Nuget/ImageProcessor.Web.Config.1.0.0.0.nupkg

Binary file not shown.

4
src/TestWebsites/NET45/Test_Website_NET45/Test_Website_MVC_NET45.csproj

@ -205,11 +205,11 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>False</UseIIS>
<UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>56639</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:51117/</IISUrl>
<IISUrl>http://localhost:56639/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

25
src/TestWebsites/NET45/Test_Website_NET45/Web.config

@ -6,24 +6,24 @@
<configuration>
<configSections>
<sectionGroup name="imageProcessor">
<!--<sectionGroup name="imageProcessor">
<section name="security" requirePermission="false" type="ImageProcessor.Web.Config.ImageSecuritySection, ImageProcessor.Web"/>
<section name="processing" requirePermission="false" type="ImageProcessor.Web.Config.ImageProcessingSection, ImageProcessor.Web"/>
<section name="cache" requirePermission="false" type="ImageProcessor.Web.Config.ImageCacheSection, ImageProcessor.Web"/>
</sectionGroup>
</sectionGroup>-->
</configSections>
<imageProcessor >
<!--<imageProcessor >
<security configSource="config\imageprocessor\security.config"/>
<cache configSource="config\imageprocessor\cache.config"/>
<processing configSource="config\imageprocessor\processing.config"/>
</imageProcessor>
</imageProcessor>-->
<appSettings>
<add key="webpages:Version" value="2.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="webpages:Version" value="2.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="PreserveLoginUrl" value="true" />
<add key="ClientValidationEnabled" value="true" />
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
</appSettings>
</appSettings>
<system.web>
@ -41,16 +41,9 @@
<add namespace="System.Web.WebPages" />
</namespaces>
</pages>
<httpModules>
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
</httpModules>
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false" />
<handlers>
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" />
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" />
@ -60,8 +53,6 @@
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
</handlers>
<modules>
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
</modules>
<modules runAllManagedModulesForAllRequests="true"/>
</system.webServer>
</configuration>

1
src/packages/repositories.config

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<repositories>
<repository path="..\ImageProcessor.Web\NET4\packages.config" />
<repository path="..\ImageProcessor.Web\NET45\packages.config" />
<repository path="..\TestWebsites\NET4\packages.config" />
<repository path="..\TestWebsites\NET45\Test_Website_MVC5_NET45\packages.config" />
<repository path="..\TestWebsites\NET45\Test_Website_NET45\packages.config" />

Loading…
Cancel
Save