tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev' 

Former-commit-id: 1edd58a770d20fe9bd5afe93b54b58905eb571a9
pull/17/head
James South 12 years ago
parent
7d83ef6588 219be638d5
commit
0c025cdb1b
17 changed files with 37 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .gitignore
  2. 2
      build/Build.bat
  3. 2
      build/NuSpecs/ImageProcessor.Web.Config.nuspec
  4. 4
      build/NuSpecs/ImageProcessor.Web.nuspec
  5. 2
      build/NuSpecs/ImageProcessor.nuspec
  6. 14
      build/content/ImageProcessor.Web/web.config.transform
  7. 7
      src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj
  8. 1
      src/ImageProcessor.Web/NET4/packages.config
  9. 31
      src/ImageProcessor.Web/NET45/Helpers/StartUp.cs
  10. 8
      src/ImageProcessor.Web/NET45/Helpers/TaskHelpers.cs
  11. 6
      src/ImageProcessor.Web/NET45/ImageProcessor.Web_NET45.csproj
  12. 4
      src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
  13. 4
      src/ImageProcessor.Web/NET45/packages.config
  14. 7
      src/TestWebsites/NET4/Web.config
  15. 8
      src/TestWebsites/NET45/Test_Website_NET45/Web.config
  16. 4
      src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.config
  17. 2
      src/packages/repositories.config

4
.gitignore
View File

@ -164,4 +164,6 @@ pip-log.txt
build/_BuildOutput/
build/*.nupkg
*.db
*.db
_site/

2
build/Build.bat
View File

@ -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%

2
build/NuSpecs/ImageProcessor.Web.Config.nuspec
View File

@ -6,7 +6,7 @@
<title>ImageProcessor.Web.Config</title>
<authors>James South</authors>
<owners>James South</owners>
<projectUrl>http://jimbobsquarepants.github.com/ImageProcessor/</projectUrl>
<projectUrl>http://imageprocessor.org</projectUrl>
<iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Adds configuration to your ImageProcessor.Web solution to allow you to override the default settings.

4
build/NuSpecs/ImageProcessor.Web.nuspec
View File

@ -6,7 +6,7 @@
<title>ImageProcessor.Web</title>
<authors>James South</authors>
<owners>James South</owners>
<projectUrl>http://jimbobsquarepants.github.com/ImageProcessor/</projectUrl>
<projectUrl>http://imageprocessor.org</projectUrl>
<iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>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</description>
<group targetFramework=".NETFramework4.0">
<dependency id="Microsoft.Bcl.Async" version="1.0.168" />
<dependency id="Microsoft.Bcl" version="1.1.8" />
<dependency id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
<dependency id="ImageProcessor" version="1.9.2.0" />
</group>
<group targetFramework=".NETFramework4.5">
<dependency id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
<dependency id="ImageProcessor" version="1.9.2.0" />
</group>
</dependencies>

2
build/NuSpecs/ImageProcessor.nuspec
View File

@ -6,7 +6,7 @@
<title>ImageProcessor</title>
<authors>James South</authors>
<owners>James South</owners>
<projectUrl>http://jimbobsquarepants.github.com/ImageProcessor/</projectUrl>
<projectUrl>http://imageprocessor.org</projectUrl>
<iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.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.

14
build/content/ImageProcessor.Web/web.config.transform
View File

@ -1,6 +1,14 @@
<?xml version="1.0"?>
<configuration>
<configuration>
<system.web>
<httpModules>
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
</httpModules>
</system.web>
<system.webServer>
<modules runAllManagedModulesForAllRequests="true"/>
<validation validateIntegratedModeConfiguration="false" />
<modules>
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
</modules>
</system.webServer>
</configuration>
</configuration>

7
src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj
View File

@ -54,10 +54,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\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" />
@ -97,9 +93,6 @@
<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" />

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

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

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

@ -1,31 +0,0 @@
// --------------------------------------------------------------------------------------------------------------------
// <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));
}
}
}

8
src/ImageProcessor.Web/NET45/Helpers/TaskHelpers.cs
View File

@ -30,9 +30,7 @@ namespace ImageProcessor.Web.Helpers
/// </exception>
public static Task Run(Action action)
{
Task task = new Task(action);
task.Start();
return task;
return Task.Factory.StartNew(action);
}
/// <summary>
@ -47,9 +45,7 @@ namespace ImageProcessor.Web.Helpers
/// </exception>
public static Task<TResult> Run<TResult>(Func<TResult> function)
{
Task<TResult> task = new Task<TResult>(function);
task.Start();
return task;
return Task<TResult>.Factory.StartNew(function);
}
}
}

6
src/ImageProcessor.Web/NET45/ImageProcessor.Web_NET45.csproj
View File

@ -32,10 +32,6 @@
<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" />
@ -58,7 +54,6 @@
<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" />
@ -80,7 +75,6 @@
<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')" />

4
src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
View File

@ -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")]
[assembly: AssemblyVersion("3.2.6.0")]
[assembly: AssemblyFileVersion("3.2.6.0")]

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

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

7
src/TestWebsites/NET4/Web.config
View File

@ -45,12 +45,17 @@
<add namespace="System.Web.WebPages" />
</namespaces>
</pages>
<httpModules>
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
</httpModules>
<!--Set the trust level.-->
<!--<trust level="Medium"/>-->
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false" />
<modules runAllManagedModulesForAllRequests="true" />
<modules>
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
</modules>
</system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

8
src/TestWebsites/NET45/Test_Website_NET45/Web.config
View File

@ -41,9 +41,13 @@
<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" />
@ -52,7 +56,9 @@
<add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
<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>

4
src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.config
View File

@ -62,9 +62,9 @@
<add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" />
</providers>
</sessionState>
<!--<httpModules>
<httpModules>
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
</httpModules>-->
</httpModules>
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false" />

2
src/packages/repositories.config
View File

@ -1,9 +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" />
<repository path="..\TestWebsites\NET45\Test_Website_Webforms_NET45\packages.config" />
</repositories>
Write Preview
Loading…
Cancel
Save