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

v2.1.1.0 

Chenged SQLite dependancy so Any CPU builds were supported.


Former-commit-id: 9f97362c97e389122b3a779f93d069e14c17678d
af/merge-core
JimBobSquarePants 14 years ago
parent
e03e35a08d
commit
3949232cfc
26 changed files with 147 additions and 137 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/ImageProcessor.Web/Caching/SQLContext.cs
  2. 2
      src/ImageProcessor.Web/Config/ImageProcessorConfig.cs
  3. 1
      src/ImageProcessor.Web/HttpModules/ImageProcessingModule.cs
  4. 24
      src/ImageProcessor.Web/ImageProcessor.Web.csproj
  5. 4
      src/ImageProcessor.Web/Properties/AssemblyInfo.cs
  6. 12
      src/ImageProcessor.Web/app.config
  7. 2
      src/ImageProcessor.Web/packages.config
  8. 8
      src/ImageProcessor.sln
  9. 4
      src/ImageProcessor/Properties/AssemblyInfo.cs
  10. BIN
      src/Nuget/ImageProcessor.1.4.2.0.nupkg
  11. 1
      src/Nuget/ImageProcessor.Web.2.1.1.0.nupkg.REMOVED.git-id
  12. 2
      src/Test/Test/Test.csproj
  13. 1
      src/packages/SQLitex64.1.0.66/SQLitex64.1.0.66.nupkg.REMOVED.git-id
  14. 23
      src/packages/SQLitex64.1.0.66/SQLitex64.1.0.66.nuspec
  15. 1
      src/packages/SQLitex64.1.0.66/lib/32/System.Data.SQLite.DLL.REMOVED.git-id
  16. 1
      src/packages/SQLitex64.1.0.66/lib/64/System.Data.SQLite.DLL.REMOVED.git-id
  17. 1
      src/packages/SQLitex64.1.0.66/lib/System.Data.SQLite.DLL.REMOVED.git-id
  18. 1
      src/packages/System.Data.SQLite.x86.1.0.84.0/System.Data.SQLite.x86.1.0.84.0.nupkg.REMOVED.git-id
  19. 23
      src/packages/System.Data.SQLite.x86.1.0.84.0/System.Data.SQLite.x86.1.0.84.0.nuspec
  20. 1
      src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net20/System.Data.SQLite.Linq.dll.REMOVED.git-id
  21. 1
      src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net20/System.Data.SQLite.dll.REMOVED.git-id
  22. 1
      src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net40/System.Data.SQLite.Linq.dll.REMOVED.git-id
  23. 1
      src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net40/System.Data.SQLite.dll.REMOVED.git-id
  24. 1
      src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net45/System.Data.SQLite.Linq.dll.REMOVED.git-id
  25. 1
      src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net45/System.Data.SQLite.dll.REMOVED.git-id

1
src/ImageProcessor.Web/Caching/SQLContext.cs
View File

@ -16,7 +16,6 @@ namespace ImageProcessor.Web.Caching
using System.Web.Hosting; using System.Web.Hosting;
using ImageProcessor.Web.Config; using ImageProcessor.Web.Config;
using ImageProcessor.Web.Helpers; using ImageProcessor.Web.Helpers;
#endregion #endregion
/// <summary> /// <summary>

2
src/ImageProcessor.Web/Config/ImageProcessorConfig.cs
View File

@ -16,6 +16,8 @@ namespace ImageProcessor.Web.Config
using System.Text; using System.Text;
using ImageProcessor.Processors; using ImageProcessor.Processors;
using ImageProcessor.Web.Helpers;
#endregion #endregion
/// <summary> /// <summary>

1
src/ImageProcessor.Web/HttpModules/ImageProcessingModule.cs
View File

@ -69,7 +69,6 @@ namespace ImageProcessor.Web.HttpModules
if (!this.hasModuleInitialized) if (!this.hasModuleInitialized)
{ {
Interlocked.CompareExchange(ref initCheck, 1, 0); Interlocked.CompareExchange(ref initCheck, 1, 0);
DiskCache.CreateDirectories(); DiskCache.CreateDirectories();
} }

24
src/ImageProcessor.Web/ImageProcessor.Web.csproj
View File

@ -66,28 +66,29 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.Threading.Tasks">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.dll</HintPath> <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.Threading.Tasks.Extensions">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath> <HintPath>..\packages\Microsoft.Bcl.Async.1.0.14-rc\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
</Reference> </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>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL"> <Reference Include="System.Data.SQLite, Version=1.0.66.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\System.Data.SQLite.x86.1.0.84.0\lib\net40\System.Data.SQLite.dll</HintPath> <HintPath>..\packages\SQLitex64.1.0.66\lib\32\System.Data.SQLite.DLL</HintPath>
</Reference> </Reference>
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net" /> <Reference Include="System.Net" />
<Reference Include="System.Runtime"> <Reference Include="System.Runtime">
<HintPath>bin\x86\Release\System.Runtime.dll</HintPath> <HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\net40\System.Runtime.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Threading.Tasks"> <Reference Include="System.Threading.Tasks">
<HintPath>bin\x86\Release\System.Threading.Tasks.dll</HintPath> <HintPath>..\packages\Microsoft.Bcl.1.0.16-rc\lib\net40\System.Threading.Tasks.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
@ -115,16 +116,17 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>xcopy /y "$(TargetPath)" "$(SolutionDir)\Test\Test\bin" <PostBuildEvent>xcopy /y "$(TargetPath)" "$(SolutionDir)\Test\Test\bin"
xcopy /y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)\Test\Test\bin"</PostBuildEvent> xcopy /y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)\Test\Test\bin"</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

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

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2.1.0.4")] [assembly: AssemblyVersion("2.1.1.0")]
[assembly: AssemblyFileVersion("2.1.0.4")] [assembly: AssemblyFileVersion("2.1.1.0")]

12
src/ImageProcessor.Web/app.config
View File

@ -1,7 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<runtime> <runtime>
<assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl"> <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"> <dependentAssembly bcl:name="System.Runtime">
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <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.16.0" newVersion="2.5.16.0" />

2
src/ImageProcessor.Web/packages.config
View File

@ -3,5 +3,5 @@
<package id="Microsoft.Bcl" version="1.0.16-rc" 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.Async" version="1.0.14-rc" targetFramework="net40" />
<package id="Microsoft.Bcl.Build" version="1.0.0-rc" targetFramework="net40" /> <package id="Microsoft.Bcl.Build" version="1.0.0-rc" targetFramework="net40" />
<package id="System.Data.SQLite.x86" version="1.0.84.0" targetFramework="net40" /> <package id="SQLitex64" version="1.0.66" targetFramework="net40" />
</packages> </packages>

8
src/ImageProcessor.sln
View File

@ -39,8 +39,8 @@ Global
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|Mixed Platforms.Build.0 = All|x86 {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|Mixed Platforms.Build.0 = All|x86
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|x86.ActiveCfg = All|x86 {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|x86.ActiveCfg = All|x86
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|x86.Build.0 = All|x86 {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|x86.Build.0 = All|x86
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Any CPU.ActiveCfg = Release|Any CPU {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Any CPU.Build.0 = Release|Any CPU {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Mixed Platforms.Build.0 = Debug|x86 {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Mixed Platforms.Build.0 = Debug|x86
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|x86.ActiveCfg = Debug|x86 {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|x86.ActiveCfg = Debug|x86
@ -75,8 +75,8 @@ Global
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|Mixed Platforms.Build.0 = All|x86 {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|Mixed Platforms.Build.0 = All|x86
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|x86.ActiveCfg = All|x86 {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|x86.ActiveCfg = All|x86
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|x86.Build.0 = All|x86 {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|x86.Build.0 = All|x86
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Any CPU.ActiveCfg = Release|Any CPU {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Any CPU.Build.0 = Release|Any CPU {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Mixed Platforms.Build.0 = Debug|x86 {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Mixed Platforms.Build.0 = Debug|x86
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|x86.ActiveCfg = Debug|x86 {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|x86.ActiveCfg = Debug|x86

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

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

BIN
src/Nuget/ImageProcessor.1.4.2.0.nupkg
View File

Binary file not shown.

1
src/Nuget/ImageProcessor.Web.2.1.1.0.nupkg.REMOVED.git-id
View File

@ -0,0 +1 @@
2af35ccdf0476cbe432b2440be45ffd0f6c414f4

2
src/Test/Test/Test.csproj
View File

@ -185,7 +185,7 @@
<WebProjectProperties> <WebProjectProperties>
<UseIIS>False</UseIIS> <UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort> <AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>6261</DevelopmentServerPort> <DevelopmentServerPort>14238</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath> <DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl> <IISUrl>
</IISUrl> </IISUrl>

1
src/packages/SQLitex64.1.0.66/SQLitex64.1.0.66.nupkg.REMOVED.git-id
View File

@ -0,0 +1 @@
aff828512d1afca48fa5d6824429359562199078

23
src/packages/SQLitex64.1.0.66/SQLitex64.1.0.66.nuspec
View File

@ -0,0 +1,23 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>SQLitex64</id>
<version>1.0.66</version>
<title>SQLitex64</title>
<authors>Amir Barylko</authors>
<owners>Amir Barylko</owners>
<projectUrl>http://www.sqlite.org/</projectUrl>
<iconUrl>http://www.sqlite.org/images/sqlite370_banner.gif</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Provides both (32 and 64 bit) assemblies needed to use SQLite.
The current package only provides 32 bit.</description>
<summary>SQLite 64 bit and 32 bit assemblies</summary>
<releaseNotes />
<copyright />
<language />
<tags>SQLite</tags>
<references>
<reference file="System.Data.SQLite.DLL" />
</references>
</metadata>
</package>

1
src/packages/SQLitex64.1.0.66/lib/32/System.Data.SQLite.DLL.REMOVED.git-id
View File

@ -0,0 +1 @@
aa398bbec1a567de55f984959d200900b794372a

1
src/packages/SQLitex64.1.0.66/lib/64/System.Data.SQLite.DLL.REMOVED.git-id
View File

@ -0,0 +1 @@
6f07d5e7ab41a0f791f07d5407f10edb4b716a02

1
src/packages/SQLitex64.1.0.66/lib/System.Data.SQLite.DLL.REMOVED.git-id
View File

@ -0,0 +1 @@
aa398bbec1a567de55f984959d200900b794372a

1
src/packages/System.Data.SQLite.x86.1.0.84.0/System.Data.SQLite.x86.1.0.84.0.nupkg.REMOVED.git-id
View File

@ -1 +0,0 @@
2db1579b36b2d81adf041533845e9a72ea6c2393

23
src/packages/System.Data.SQLite.x86.1.0.84.0/System.Data.SQLite.x86.1.0.84.0.nuspec
View File

@ -1,23 +0,0 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>System.Data.SQLite.x86</id>
<version>1.0.84.0</version>
<title>System.Data.SQLite.x86</title>
<authors>SQLite Development Team</authors>
<owners>SQLite Development Team</owners>
<licenseUrl>http://www.sqlite.org/copyright.html</licenseUrl>
<projectUrl>http://system.data.sqlite.org/</projectUrl>
<iconUrl>http://system.data.sqlite.org/images/sqlite32.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>The official SQLite database engine combined with a complete ADO.NET provider all rolled into a single mixed-mode assembly for x86.</description>
<releaseNotes />
<copyright>Public Domain</copyright>
<language>en-US</language>
<tags>sqlite database ado.net provider interop</tags>
<references>
<reference file="System.Data.SQLite.dll" />
<reference file="System.Data.SQLite.Linq.dll" />
</references>
</metadata>
</package>

1
src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net20/System.Data.SQLite.Linq.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
91d583cc0540c5252c68278bea13a48045548a20

1
src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net20/System.Data.SQLite.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
168e4329b21098e36b1c1af6e0c8728d5e9c589e

1
src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net40/System.Data.SQLite.Linq.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
31c463596b575043d8559b8a10cb25ad3bc15090

1
src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net40/System.Data.SQLite.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
f60b588d3ff22ae8b1f51d710a44a037683ce81d

1
src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net45/System.Data.SQLite.Linq.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
71a4551ce7011a6caeeadb73aea687ec586a5d87

1
src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net45/System.Data.SQLite.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
c62d000052745e37933833a3b764eb47ece9673f
Write Preview
Loading…
Cancel
Save