Browse Source

Updating dependencies

Former-commit-id: aa235e428b50a38ef10df639bb11f13c83e72263
pull/17/head
JimBobSquarePants 13 years ago
parent
commit
cb3427c09a
  1. 4
      src/ImageProcessor.Tests/app.config
  2. 3
      src/ImageProcessor.Web/Caching/DiskCache.cs
  3. 23
      src/ImageProcessor.Web/ImageProcessor.Web.csproj
  4. 4
      src/ImageProcessor.Web/Properties/AssemblyInfo.cs
  5. 34
      src/ImageProcessor.Web/app.config
  6. 6
      src/ImageProcessor.Web/packages.config
  7. 76
      src/ImageProcessor/Helpers/Extensions/ImageExtensions.cs
  8. 2
      src/ImageProcessor/Helpers/Extensions/StringExtensions.cs
  9. 1
      src/ImageProcessor/ImageProcessor.csproj
  10. 1
      src/ImageProcessor/Processors/Alpha.cs
  11. 1
      src/ImageProcessor/Processors/Contrast.cs
  12. 291
      src/ImageProcessor/Processors/GaussianBlur.cs
  13. 1
      src/Nuget/ImageProcessor.Web.2.2.1.0.nupkg.REMOVED.git-id
  14. 64
      src/Test/Test/Web.config
  15. 1
      src/packages/Microsoft.Bcl.1.0.16-rc/License.rtf.REMOVED.git-id
  16. 1
      src/packages/Microsoft.Bcl.1.0.16-rc/Microsoft.Bcl.1.0.16-rc.nupkg.REMOVED.git-id
  17. 15
      src/packages/Microsoft.Bcl.1.0.16-rc/content/net40/app.config.transform
  18. 15
      src/packages/Microsoft.Bcl.1.0.16-rc/content/net40/web.config.transform
  19. 15
      src/packages/Microsoft.Bcl.1.0.16-rc/content/portable-net40+sl4+win8+wp71/app.config.transform
  20. 15
      src/packages/Microsoft.Bcl.1.0.16-rc/content/portable-net40+sl4+win8+wp8/app.config.transform
  21. 15
      src/packages/Microsoft.Bcl.1.0.16-rc/content/portable-net40+sl4+win8/app.config.transform
  22. 15
      src/packages/Microsoft.Bcl.1.0.16-rc/content/portable-net40+sl5+win8+wp8/app.config.transform
  23. 15
      src/packages/Microsoft.Bcl.1.0.16-rc/content/portable-net40+win8+wp8/app.config.transform
  24. 15
      src/packages/Microsoft.Bcl.1.0.16-rc/content/portable-net40+win8/app.config.transform
  25. 15
      src/packages/Microsoft.Bcl.1.0.16-rc/content/sl4-windowsphone71/app.config.transform
  26. BIN
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/net40/System.Runtime.dll
  27. BIN
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/net40/System.Threading.Tasks.dll
  28. 1
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.dll.REMOVED.git-id
  29. BIN
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8+wp8/System.Runtime.dll
  30. 1
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.dll.REMOVED.git-id
  31. BIN
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8/System.Runtime.dll
  32. 1
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8/System.Threading.Tasks.dll.REMOVED.git-id
  33. BIN
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl5+win8+wp8/System.Runtime.dll
  34. BIN
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.dll
  35. BIN
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+win8+wp8/System.Runtime.dll
  36. BIN
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+win8+wp8/System.Threading.Tasks.dll
  37. BIN
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+win8/System.Runtime.dll
  38. BIN
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+win8/System.Threading.Tasks.dll
  39. 1
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl4-windowsphone71/System.Threading.Tasks.dll.REMOVED.git-id
  40. BIN
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl4/System.Runtime.dll
  41. 1
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl4/System.Threading.Tasks.dll.REMOVED.git-id
  42. BIN
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl5/System.Runtime.dll
  43. BIN
      src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl5/System.Threading.Tasks.dll
  44. 1
      src/packages/Microsoft.Bcl.1.0.19/License.rtf.REMOVED.git-id
  45. 1
      src/packages/Microsoft.Bcl.1.0.19/Microsoft.Bcl.1.0.19.nupkg.REMOVED.git-id
  46. 22
      src/packages/Microsoft.Bcl.1.0.19/Microsoft.Bcl.1.0.19.nuspec
  47. 0
      src/packages/Microsoft.Bcl.1.0.19/ReleaseNotes.txt
  48. 0
      src/packages/Microsoft.Bcl.1.0.19/content/net45/_._
  49. 0
      src/packages/Microsoft.Bcl.1.0.19/content/portable-net45+win8+wp8/_._
  50. 0
      src/packages/Microsoft.Bcl.1.0.19/content/sl4/_._
  51. 0
      src/packages/Microsoft.Bcl.1.0.19/content/sl5/_._
  52. 0
      src/packages/Microsoft.Bcl.1.0.19/content/win8/_._
  53. 0
      src/packages/Microsoft.Bcl.1.0.19/content/wp8/_._
  54. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Runtime.dll
  55. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Runtime.xml
  56. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Threading.Tasks.dll
  57. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Threading.Tasks.xml
  58. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/net40/ensureRedirect.xml
  59. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/net45/_._
  60. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Runtime.dll
  61. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Runtime.xml
  62. 1
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.dll.REMOVED.git-id
  63. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.xml.REMOVED.git-id
  64. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/ensureRedirect.xml
  65. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Runtime.dll
  66. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Runtime.xml
  67. 1
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.dll.REMOVED.git-id
  68. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.xml.REMOVED.git-id
  69. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/ensureRedirect.xml
  70. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Runtime.dll
  71. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Runtime.xml
  72. 1
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Threading.Tasks.dll.REMOVED.git-id
  73. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Threading.Tasks.xml.REMOVED.git-id
  74. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/ensureRedirect.xml
  75. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Runtime.dll
  76. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Runtime.xml
  77. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.dll
  78. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.xml
  79. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/ensureRedirect.xml
  80. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Runtime.dll
  81. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Runtime.xml
  82. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Threading.Tasks.dll
  83. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Threading.Tasks.xml
  84. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/ensureRedirect.xml
  85. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Runtime.dll
  86. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Runtime.xml
  87. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Threading.Tasks.dll
  88. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Threading.Tasks.xml
  89. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/ensureRedirect.xml
  90. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/portable-net45+win8+wp8/_._
  91. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Runtime.dll
  92. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Runtime.xml
  93. 1
      src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Threading.Tasks.dll.REMOVED.git-id
  94. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Threading.Tasks.xml.REMOVED.git-id
  95. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/ensureRedirect.xml
  96. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Runtime.dll
  97. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Runtime.xml
  98. 1
      src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Threading.Tasks.dll.REMOVED.git-id
  99. 0
      src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Threading.Tasks.xml.REMOVED.git-id
  100. BIN
      src/packages/Microsoft.Bcl.1.0.19/lib/sl5/System.Runtime.dll

4
src/ImageProcessor.Tests/app.config

@ -4,11 +4,11 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
<bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
<bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>

3
src/ImageProcessor.Web/Caching/DiskCache.cs

@ -476,9 +476,6 @@ namespace ImageProcessor.Web.Caching
/// </returns>
private bool RoughDateTimeCompare(DateTime first, DateTime second)
{
var x = first.ToString(CultureInfo.InvariantCulture);
var y = second.ToString(CultureInfo.InvariantCulture);
if (first.ToString(CultureInfo.InvariantCulture) == second.ToString(CultureInfo.InvariantCulture))
{
return true;

23
src/ImageProcessor.Web/ImageProcessor.Web.csproj

@ -33,7 +33,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'All|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\All\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DefineConstants>TRACE;DEBUG;USE_CSHARP_SQLITE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
@ -72,14 +72,17 @@
<Reference Include="Community.CsharpSqlite.SQLiteClient">
<HintPath>..\packages\Csharp-Sqlite.3.7.7.1\lib\net40\Community.CsharpSqlite.SQLiteClient.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks.Extensions">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.16.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
@ -87,10 +90,10 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Net" />
<Reference Include="System.Runtime">
<HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\net40\System.Runtime.dll</HintPath>
<HintPath>..\packages\Microsoft.Bcl.1.0.19\lib\net40\System.Runtime.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks">
<HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\net40\System.Threading.Tasks.dll</HintPath>
<HintPath>..\packages\Microsoft.Bcl.1.0.19\lib\net40\System.Threading.Tasks.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Data" />
@ -130,7 +133,7 @@
<PostBuildEvent>xcopy /y "$(TargetPath)" "$(SolutionDir)\Test\Test\bin"
xcopy /y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)\Test\Test\bin"</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.targets" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.5\tools\Microsoft.Bcl.Build.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

4
src/ImageProcessor.Web/Properties/AssemblyInfo.cs

@ -31,5 +31,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("2.2.0.1")]
[assembly: AssemblyFileVersion("2.2.0.1")]
[assembly: AssemblyVersion("2.2.1.0")]
[assembly: AssemblyFileVersion("2.2.1.0")]

34
src/ImageProcessor.Web/app.config

@ -1,25 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly bcl:name="System.Runtime">
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
<dependentAssembly bcl:name="System.Threading.Tasks">
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly bcl:name="System.Runtime">
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
<dependentAssembly bcl:name="System.Threading.Tasks">
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<runtime>
<assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly bcl:name="System.Runtime">
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
</dependentAssembly>
<dependentAssembly bcl:name="System.Threading.Tasks">
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

6
src/ImageProcessor.Web/packages.config

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Csharp-Sqlite" version="3.7.7.1" targetFramework="net40" />
<package id="Microsoft.Bcl" version="1.0.16-rc" targetFramework="net40" />
<package id="Microsoft.Bcl.Async" version="1.0.14-rc" targetFramework="net40" />
<package id="Microsoft.Bcl.Build" version="1.0.0-rc" targetFramework="net40" />
<package id="Microsoft.Bcl" version="1.0.19" targetFramework="net40" />
<package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40" />
<package id="Microsoft.Bcl.Build" version="1.0.5" targetFramework="net40" />
<package id="sqlite-net" version="1.0.7" targetFramework="net40" />
</packages>

76
src/ImageProcessor/Helpers/Extensions/ImageExtensions.cs

@ -0,0 +1,76 @@
// -----------------------------------------------------------------------
// <copyright file="ImageExtensions.cs" company="James South">
// Copyright (c) James South.
// Licensed under the Apache License, Version 2.0.
// </copyright>
// -----------------------------------------------------------------------
namespace ImageProcessor.Helpers.Extensions
{
#region Using
using System;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
using System.Runtime.InteropServices;
#endregion
/// <summary>
/// Extensions to the <see cref="T:System.Drawing.Image"/> class
/// </summary>
public static class ImageExtensions
{
/// <summary>
/// Converts an image to an array of bytes.
/// </summary>
/// <param name="image">The <see cref="T:System.Drawing.Image"/> instance that this method extends.</param>
/// <param name="imageFormat">The <see cref="T:System.Drawing.Imaging.ImageFormat"/> to export the image with.</param>
/// <returns>A byte array representing the current image.</returns>
public static byte[] ToBytes(this Image image, ImageFormat imageFormat)
{
BitmapData data = ((Bitmap)image).LockBits(new Rectangle(0, 0, image.Width, image.Height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
int length = image.Width * image.Height * 4;
byte[] byteArray = new byte[length];
if (data.Stride == image.Width * 4)
{
Marshal.Copy(data.Scan0, byteArray, 0, length);
}
else
{
for (int i = 0, l = image.Height; i < l; i++)
{
IntPtr p = new IntPtr(data.Scan0.ToInt32() + data.Stride * i);
Marshal.Copy(p, byteArray, i * image.Width * 4, image.Width * 4);
}
}
((Bitmap)image).UnlockBits(data);
return byteArray;
}
public static Image FromBytes(this Image image, byte[] bytes)
{
BitmapData data = ((Bitmap)image).LockBits(new Rectangle(0, 0, image.Width, image.Height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
if (data.Stride == image.Width * 4)
{
Marshal.Copy(bytes, 0, data.Scan0, bytes.Length);
}
else
{
for (int i = 0, l = image.Height; i < l; i++)
{
IntPtr p = new IntPtr(data.Scan0.ToInt32() + data.Stride * i);
Marshal.Copy(bytes, i * image.Width * 4, p, image.Width * 4);
}
}
((Bitmap)image).UnlockBits(data);
return image;
}
}
}

2
src/ImageProcessor/Helpers/Extensions/StringExtensions.cs

@ -18,7 +18,7 @@ namespace ImageProcessor.Helpers.Extensions
#endregion
/// <summary>
/// Encapsulates a series of time saving extension methods to <see cref="T:System.String">String</see>s.
/// Encapsulates a series of time saving extension methods to the <see cref="T:System.String"/> class.
/// </summary>
public static class StringExtensions
{

1
src/ImageProcessor/ImageProcessor.csproj

@ -88,6 +88,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Helpers\Extensions\ImageExtensions.cs" />
<Compile Include="Helpers\Extensions\EnumExtensions.cs" />
<Compile Include="Helpers\Extensions\StringExtensions.cs" />
<Compile Include="ImageFactory.cs" />

1
src/ImageProcessor/Processors/Alpha.cs

@ -12,7 +12,6 @@ namespace ImageProcessor.Processors
using System.Drawing;
using System.Drawing.Imaging;
using System.Text.RegularExpressions;
using ImageProcessor.Helpers.Extensions;
#endregion
/// <summary>

1
src/ImageProcessor/Processors/Contrast.cs

@ -12,7 +12,6 @@ namespace ImageProcessor.Processors
using System.Drawing;
using System.Drawing.Imaging;
using System.Text.RegularExpressions;
using ImageProcessor.Helpers.Extensions;
#endregion
/// <summary>

291
src/ImageProcessor/Processors/GaussianBlur.cs

@ -0,0 +1,291 @@
// -----------------------------------------------------------------------
// <copyright file="GaussianBlur.cs" company="James South">
// Copyright (c) James South.
// Licensed under the Apache License, Version 2.0.
// </copyright>
// -----------------------------------------------------------------------
namespace ImageProcessor.Processors
{
#region Using
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
using System.Text.RegularExpressions;
using ImageProcessor.Helpers.Extensions;
#endregion
/// <summary>
/// Applies a Gaussian blur to the image.
/// Adapted from <see cref="http://code.google.com/p/imagelibrary/source/browse/trunk/Filters/GaussianBlurFilter.cs"/>
/// </summary>
public class GaussianBlur : IGraphicsProcessor
{
/// <summary>
/// The regular expression to search strings for.
/// </summary>
private static readonly Regex QueryRegex = new Regex(@"blur=(\d+(.\d+)?)", RegexOptions.Compiled);
#region IGraphicsProcessor Members
/// <summary>
/// Gets the regular expression to search strings for.
/// </summary>
public Regex RegexPattern
{
get
{
return QueryRegex;
}
}
/// <summary>
/// Gets or sets DynamicParameter.
/// </summary>
public dynamic DynamicParameter
{
get;
set;
}
/// <summary>
/// Gets the order in which this processor is to be used in a chain.
/// </summary>
public int SortOrder
{
get;
private set;
}
/// <summary>
/// Gets or sets any additional settings required by the processor.
/// </summary>
public Dictionary<string, string> Settings
{
get;
set;
}
/// <summary>
/// The position in the original string where the first character of the captured substring was found.
/// </summary>
/// <param name="queryString">
/// The query string to search.
/// </param>
/// <returns>
/// The zero-based starting position in the original string where the captured substring was found.
/// </returns>
public int MatchRegexIndex(string queryString)
{
int index = 0;
// Set the sort order to max to allow filtering.
this.SortOrder = int.MaxValue;
foreach (Match match in this.RegexPattern.Matches(queryString))
{
if (match.Success)
{
if (index == 0)
{
// Set the index on the first instance only.
this.SortOrder = match.Index;
this.DynamicParameter = match.Value.Split('=')[1];
}
index += 1;
}
}
return this.SortOrder;
}
/// <summary>
/// Processes the image.
/// </summary>
/// <param name="factory">
/// The the current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class containing
/// the image to process.
/// </param>
/// <returns>
/// The processed image from the current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class.
/// </returns>
public Image ProcessImage(ImageFactory factory)
{
Bitmap newImage = null;
Image image = factory.Image;
try
{
double radius = double.Parse(this.DynamicParameter);
byte[] sourceBytes = image.ToBytes(factory.ImageFormat);
byte[] destinationBytes = new byte[sourceBytes.Length];
this.ApplyGaussianBlur(image.Width, image.Height, radius, 1, ref sourceBytes, ref destinationBytes);
// Don't use an object initializer here.
newImage = new Bitmap(image.Width, image.Height, PixelFormat.Format32bppPArgb);
newImage = (Bitmap)newImage.FromBytes(destinationBytes);
newImage.Tag = image.Tag;
image.Dispose();
image = newImage;
}
catch (Exception ex)
{
var x = ex;
if (newImage != null)
{
newImage.Dispose();
}
}
return image;
}
#endregion
#region Private
/// <summary>
/// The apply gaussian blur.
/// </summary>
/// <param name="width">
/// The width.
/// </param>
/// <param name="height">
/// The height.
/// </param>
/// <param name="radius">
/// The radius.
/// </param>
/// <param name="sourceBytes">
/// The source bytes array.
/// </param>
/// <param name="destinationBytes">
/// The destination byte array.
/// </param>
private void ApplyGaussianBlur(int width, int height, double radius, double amount, ref byte[] src, ref byte[] dst)
{
int shift, dest, source;
int blurDiam = (int)Math.Pow(radius, 2);
int gaussWidth = (blurDiam * 2) + 1;
double[] kernel = CreateKernel(gaussWidth, blurDiam);
// Calculate the sum of the Gaussian kernel
double gaussSum = 0;
for (int n = 0; n < gaussWidth; n++)
{
gaussSum += kernel[n];
}
// Scale the Gaussian kernel
for (int n = 0; n < gaussWidth; n++)
{
kernel[n] = kernel[n] / gaussSum;
}
//premul = kernel[k] / gaussSum;
// Create an X & Y pass buffer
byte[] gaussPassX = new byte[src.Length];
// Do Horizontal Pass
for (int y = 0; y < height; y++)
{
for (int x = 0; x < width; x++)
{
dest = y * width + x;
// Iterate through kernel
for (int k = 0; k < gaussWidth; k++)
{
// Get pixel-shift (pixel dist between dest and source)
shift = k - blurDiam;
// Basic edge clamp
source = dest + shift;
if (x + shift <= 0 || x + shift >= width)
{
source = dest;
}
// Combine source and destination pixels with Gaussian Weight
gaussPassX[(dest << 2) + 2] = (byte)(gaussPassX[(dest << 2) + 2] + (src[(source << 2) + 2]) * kernel[k]);
gaussPassX[(dest << 2) + 1] = (byte)(gaussPassX[(dest << 2) + 1] + (src[(source << 2) + 1]) * kernel[k]);
gaussPassX[(dest << 2)] = (byte)(gaussPassX[(dest << 2)] + (src[(source << 2)]) * kernel[k]);
}
}
}
// Do Vertical Pass
for (int x = 0; x < width; x++)
{
for (int y = 0; y < height; y++)
{
dest = y * width + x;
// Iterate through kernel
for (int k = 0; k < gaussWidth; k++)
{
// Get pixel-shift (pixel dist between dest and source)
shift = k - blurDiam;
// Basic edge clamp
source = dest + (shift * width);
if (y + shift <= 0 || y + shift >= height)
{
source = dest;
}
// Combine source and destination pixels with Gaussian Weight
dst[(dest << 2) + 2] = (byte)(dst[(dest << 2) + 2] + (gaussPassX[(source << 2) + 2]) * kernel[k]);
dst[(dest << 2) + 1] = (byte)(dst[(dest << 2) + 1] + (gaussPassX[(source << 2) + 1]) * kernel[k]);
dst[(dest << 2)] = (byte)(dst[(dest << 2)] + (gaussPassX[(source << 2)]) * kernel[k]);
}
}
}
}
/// <summary>
/// Creates the Gaussian kernel.
/// </summary>
/// <param name="gaussianWidth">
/// The gaussian width.
/// </param>
/// <param name="blurDiameter">
/// The blur diameter.
/// </param>
/// <returns>
/// The <see cref="double"/>.
/// </returns>
private double[] CreateKernel(int gaussianWidth, int blurDiam)
{
double[] kernel = new double[gaussianWidth];
// Set the maximum value of the Gaussian curve
const double sd = 255;
// Set the width of the Gaussian curve
double range = gaussianWidth;
// Set the average value of the Gaussian curve
double mean = (range / sd);
// Set first half of Gaussian curve in kernel
for (int pos = 0, len = blurDiam + 1; pos < len; pos++)
{
// Distribute Gaussian curve across kernel[array]
kernel[gaussianWidth - 1 - pos] = kernel[pos] = Math.Sqrt(Math.Sin((((pos + 1) * (Math.PI / 2)) - mean) / range)) * sd;
}
return kernel;
}
#endregion
}
}

1
src/Nuget/ImageProcessor.Web.2.2.1.0.nupkg.REMOVED.git-id

@ -0,0 +1 @@
46b009d93ab9f1ea75f1ea1efb0073b3d369d3e5

64
src/Test/Test/Web.config

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
For more information on how to configure your ASP.NET application, please visit
http://go.microsoft.com/fwlink/?LinkId=152368
@ -7,78 +7,78 @@
<!-- Configuration section-handler declaration area. -->
<configSections>
<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"/>
<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>
</configSections>
<appSettings>
<add key="webpages:Version" value="1.0.0.0"/>
<add key="ClientValidationEnabled" value="true"/>
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
<add key="webpages:Version" value="1.0.0.0" />
<add key="ClientValidationEnabled" value="true" />
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
</appSettings>
<system.web>
<compilation debug="true" targetFramework="4.0">
<assemblies>
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</assemblies>
</compilation>
<authentication mode="Forms">
<forms loginUrl="~/Account/LogOn" timeout="2880"/>
<forms loginUrl="~/Account/LogOn" timeout="2880" />
</authentication>
<pages>
<namespaces>
<add namespace="System.Web.Helpers"/>
<add namespace="System.Web.Mvc"/>
<add namespace="System.Web.Mvc.Ajax"/>
<add namespace="System.Web.Mvc.Html"/>
<add namespace="System.Web.Routing"/>
<add namespace="System.Web.WebPages"/>
<add namespace="System.Web.Helpers" />
<add namespace="System.Web.Mvc" />
<add namespace="System.Web.Mvc.Ajax" />
<add namespace="System.Web.Mvc.Html" />
<add namespace="System.Web.Routing" />
<add namespace="System.Web.WebPages" />
</namespaces>
</pages>
<httpModules>
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
<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"/>
<validation validateIntegratedModeConfiguration="false" />
<modules runAllManagedModulesForAllRequests="true" />
</system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0"/>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0"/>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0"/>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<imageProcessor>
<security allowRemoteDownloads="true" timeout="300000" maxBytes="524288" remotePrefix="/remote.axd">
<whiteList>
<add url="http://images.mymovies.net"/>
<add url="http://images.mymovies.net" />
</whiteList>
</security>
<cache virtualPath="~/cache" maxDays="56"/>
<cache virtualPath="~/cache" maxDays="56" />
<processing>
<plugins>
<plugin name="Resize">
<settings>
<setting key="MaxWidth" value="1024"/>
<setting key="MaxHeight" value="768"/>
<setting key="MaxWidth" value="1024" />
<setting key="MaxHeight" value="768" />
</settings>
</plugin>
</plugins>

1
src/packages/Microsoft.Bcl.1.0.16-rc/License.rtf.REMOVED.git-id

@ -1 +0,0 @@
30ff7aa1ad2a7eedde4972dee464f229d4459439

1
src/packages/Microsoft.Bcl.1.0.16-rc/Microsoft.Bcl.1.0.16-rc.nupkg.REMOVED.git-id

@ -1 +0,0 @@
168ac0ce88f1c4eeb97a4ad4665e4f0f3bfc4fd6

15
src/packages/Microsoft.Bcl.1.0.16-rc/content/net40/app.config.transform

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly bcl:name="System.Runtime">
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
<dependentAssembly bcl:name="System.Threading.Tasks">
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

15
src/packages/Microsoft.Bcl.1.0.16-rc/content/net40/web.config.transform

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly bcl:name="System.Runtime">
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
<dependentAssembly bcl:name="System.Threading.Tasks">
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

15
src/packages/Microsoft.Bcl.1.0.16-rc/content/portable-net40+sl4+win8+wp71/app.config.transform

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly bcl:name="System.Runtime">
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.11.0" newVersion="1.5.11.0" />
</dependentAssembly>
<dependentAssembly bcl:name="System.Threading.Tasks">
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.11.0" newVersion="1.5.11.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

15
src/packages/Microsoft.Bcl.1.0.16-rc/content/portable-net40+sl4+win8+wp8/app.config.transform

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly bcl:name="System.Runtime">
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
<dependentAssembly bcl:name="System.Threading.Tasks">
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.11.0" newVersion="1.5.11.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

15
src/packages/Microsoft.Bcl.1.0.16-rc/content/portable-net40+sl4+win8/app.config.transform

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly bcl:name="System.Runtime">
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
<dependentAssembly bcl:name="System.Threading.Tasks">
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.11.0" newVersion="1.5.11.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

15
src/packages/Microsoft.Bcl.1.0.16-rc/content/portable-net40+sl5+win8+wp8/app.config.transform

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly bcl:name="System.Runtime">
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
<dependentAssembly bcl:name="System.Threading.Tasks">
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

15
src/packages/Microsoft.Bcl.1.0.16-rc/content/portable-net40+win8+wp8/app.config.transform

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly bcl:name="System.Runtime">
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
<dependentAssembly bcl:name="System.Threading.Tasks">
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

15
src/packages/Microsoft.Bcl.1.0.16-rc/content/portable-net40+win8/app.config.transform

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly bcl:name="System.Runtime">
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
<dependentAssembly bcl:name="System.Threading.Tasks">
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

15
src/packages/Microsoft.Bcl.1.0.16-rc/content/sl4-windowsphone71/app.config.transform

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly bcl:name="System.Runtime">
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.11.0" newVersion="1.5.11.0" />
</dependentAssembly>
<dependentAssembly bcl:name="System.Threading.Tasks">
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.11.0" newVersion="1.5.11.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/net40/System.Runtime.dll

Binary file not shown.

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/net40/System.Threading.Tasks.dll

Binary file not shown.

1
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.dll.REMOVED.git-id

@ -1 +0,0 @@
9962594785f41f62455059efef8b8007e719a054

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8+wp8/System.Runtime.dll

Binary file not shown.

1
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.dll.REMOVED.git-id

@ -1 +0,0 @@
9962594785f41f62455059efef8b8007e719a054

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8/System.Runtime.dll

Binary file not shown.

1
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8/System.Threading.Tasks.dll.REMOVED.git-id

@ -1 +0,0 @@
9962594785f41f62455059efef8b8007e719a054

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl5+win8+wp8/System.Runtime.dll

Binary file not shown.

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.dll

Binary file not shown.

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+win8+wp8/System.Runtime.dll

Binary file not shown.

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+win8+wp8/System.Threading.Tasks.dll

Binary file not shown.

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+win8/System.Runtime.dll

Binary file not shown.

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+win8/System.Threading.Tasks.dll

Binary file not shown.

1
src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl4-windowsphone71/System.Threading.Tasks.dll.REMOVED.git-id

@ -1 +0,0 @@
9962594785f41f62455059efef8b8007e719a054

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl4/System.Runtime.dll

Binary file not shown.

1
src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl4/System.Threading.Tasks.dll.REMOVED.git-id

@ -1 +0,0 @@
9962594785f41f62455059efef8b8007e719a054

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl5/System.Runtime.dll

Binary file not shown.

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl5/System.Threading.Tasks.dll

Binary file not shown.

1
src/packages/Microsoft.Bcl.1.0.19/License.rtf.REMOVED.git-id

@ -0,0 +1 @@
2fb0cf4c397e4b7deeec1d26755ca05d7831c405

1
src/packages/Microsoft.Bcl.1.0.19/Microsoft.Bcl.1.0.19.nupkg.REMOVED.git-id

@ -0,0 +1 @@
8383f696d05c6a3f3061683355d21bd2a303c8a4

22
src/packages/Microsoft.Bcl.1.0.16-rc/Microsoft.Bcl.1.0.16-rc.nuspec → src/packages/Microsoft.Bcl.1.0.19/Microsoft.Bcl.1.0.19.nuspec

@ -1,12 +1,14 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Microsoft.Bcl</id>
<version>1.0.16-rc</version>
<version>1.0.19</version>
<title>BCL Portability Pack for .NET Framework 4, Silverlight 4 and 5, and Windows Phone 7.5</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<licenseUrl>http://go.microsoft.com/fwlink/?LinkID=261998&amp;clcid=0x409</licenseUrl>
<licenseUrl>http://go.microsoft.com/fwlink/?LinkID=296435</licenseUrl>
<projectUrl>http://go.microsoft.com/fwlink/?LinkID=280057</projectUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>This packages enables projects targeting .NET Framework 4, Silverlight 4 and 5, and Windows Phone 7.5 (including any portable library combinations) to use new types from later versions of .NET including:
@ -26,19 +28,7 @@ This package is not required for projects targeting .NET Framework 4.5 or .NET f
<copyright>Copyright © Microsoft Corporation</copyright>
<tags>BCL Microsoft System Task IProgress</tags>
<dependencies>
<group>
<dependency id="Microsoft.Bcl.Build" version="1.0.0-rc" />
</group>
<group targetFramework="Silverlight4.0" />
<group targetFramework=".NETFramework4.5" />
<group targetFramework="Windows8.0" />
<group targetFramework="WindowsPhone8.0" />
<group targetFramework=".NETPortable0.0-net45+win80+wp80" />
<dependency id="Microsoft.Bcl.Build" version="1.0.4" />
</dependencies>
<references>
<reference file="System.Runtime.dll" />
<reference file="System.Threading.Tasks.dll" />
<reference file="_._" />
</references>
</metadata>
</package>

0
src/packages/Microsoft.Bcl.1.0.16-rc/ReleaseNotes.txt → src/packages/Microsoft.Bcl.1.0.19/ReleaseNotes.txt

0
src/packages/Microsoft.Bcl.1.0.16-rc/content/net45/_._ → src/packages/Microsoft.Bcl.1.0.19/content/net45/_._

0
src/packages/Microsoft.Bcl.1.0.16-rc/content/portable-net45+win8+wp8/_._ → src/packages/Microsoft.Bcl.1.0.19/content/portable-net45+win8+wp8/_._

0
src/packages/Microsoft.Bcl.1.0.16-rc/content/sl4/_._ → src/packages/Microsoft.Bcl.1.0.19/content/sl4/_._

0
src/packages/Microsoft.Bcl.1.0.16-rc/content/sl5/_._ → src/packages/Microsoft.Bcl.1.0.19/content/sl5/_._

0
src/packages/Microsoft.Bcl.1.0.16-rc/content/win8/_._ → src/packages/Microsoft.Bcl.1.0.19/content/win8/_._

0
src/packages/Microsoft.Bcl.1.0.16-rc/content/wp8/_._ → src/packages/Microsoft.Bcl.1.0.19/content/wp8/_._

BIN
src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Runtime.dll

Binary file not shown.

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/net40/System.Runtime.xml → src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Runtime.xml

BIN
src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Threading.Tasks.dll

Binary file not shown.

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/net40/System.Threading.Tasks.xml → src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Threading.Tasks.xml

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/net45/_._ → src/packages/Microsoft.Bcl.1.0.19/lib/net40/ensureRedirect.xml

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net45+win8+wp8/_._ → src/packages/Microsoft.Bcl.1.0.19/lib/net45/_._

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl4-windowsphone71/System.Runtime.dll → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Runtime.dll

Binary file not shown.

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8+wp71/System.Runtime.xml → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Runtime.xml

1
src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.dll.REMOVED.git-id

@ -0,0 +1 @@
74f5e2caed93499de991cfd5ed70b868e5207474

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.xml.REMOVED.git-id → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.xml.REMOVED.git-id

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/win8/_._ → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/ensureRedirect.xml

BIN
src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Runtime.dll

Binary file not shown.

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8+wp8/System.Runtime.xml → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Runtime.xml

1
src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.dll.REMOVED.git-id

@ -0,0 +1 @@
74f5e2caed93499de991cfd5ed70b868e5207474

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.xml.REMOVED.git-id → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.xml.REMOVED.git-id

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/wp8/_._ → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/ensureRedirect.xml

BIN
src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Runtime.dll

Binary file not shown.

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8/System.Runtime.xml → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Runtime.xml

1
src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Threading.Tasks.dll.REMOVED.git-id

@ -0,0 +1 @@
74f5e2caed93499de991cfd5ed70b868e5207474

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8/System.Threading.Tasks.xml.REMOVED.git-id → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Threading.Tasks.xml.REMOVED.git-id

0
src/packages/Microsoft.Bcl.Build.1.0.0-rc/content/net40/_._ → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/ensureRedirect.xml

BIN
src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Runtime.dll

Binary file not shown.

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl5+win8+wp8/System.Runtime.xml → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Runtime.xml

BIN
src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.dll

Binary file not shown.

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.xml → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.xml

0
src/packages/Microsoft.Bcl.Build.1.0.0-rc/content/netcore45/_._ → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/ensureRedirect.xml

BIN
src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Runtime.dll

Binary file not shown.

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+win8+wp8/System.Runtime.xml → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Runtime.xml

BIN
src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Threading.Tasks.dll

Binary file not shown.

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+win8+wp8/System.Threading.Tasks.xml → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Threading.Tasks.xml

0
src/packages/Microsoft.Bcl.Build.1.0.0-rc/content/portable-net40+win8+sl4+wp71/_._ → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/ensureRedirect.xml

BIN
src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Runtime.dll

Binary file not shown.

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+win8/System.Runtime.xml → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Runtime.xml

BIN
src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Threading.Tasks.dll

Binary file not shown.

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+win8/System.Threading.Tasks.xml → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Threading.Tasks.xml

0
src/packages/Microsoft.Bcl.Build.1.0.0-rc/content/sl4-windowsphone71/_._ → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/ensureRedirect.xml

0
src/packages/Microsoft.Bcl.Build.1.0.0-rc/content/sl4/_._ → src/packages/Microsoft.Bcl.1.0.19/lib/portable-net45+win8+wp8/_._

BIN
src/packages/Microsoft.Bcl.1.0.16-rc/lib/portable-net40+sl4+win8+wp71/System.Runtime.dll → src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Runtime.dll

Binary file not shown.

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl4-windowsphone71/System.Runtime.xml → src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Runtime.xml

1
src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Threading.Tasks.dll.REMOVED.git-id

@ -0,0 +1 @@
74f5e2caed93499de991cfd5ed70b868e5207474

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl4-windowsphone71/System.Threading.Tasks.xml.REMOVED.git-id → src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Threading.Tasks.xml.REMOVED.git-id

0
src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/ensureRedirect.xml

BIN
src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Runtime.dll

Binary file not shown.

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl4/System.Runtime.xml → src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Runtime.xml

1
src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Threading.Tasks.dll.REMOVED.git-id

@ -0,0 +1 @@
74f5e2caed93499de991cfd5ed70b868e5207474

0
src/packages/Microsoft.Bcl.1.0.16-rc/lib/sl4/System.Threading.Tasks.xml.REMOVED.git-id → src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Threading.Tasks.xml.REMOVED.git-id

BIN
src/packages/Microsoft.Bcl.1.0.19/lib/sl5/System.Runtime.dll

Binary file not shown.

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save