Browse Source

Shifting to 32bit version

SQLite has issues with Any project compilation.


Former-commit-id: 82d9680b39da79410ea11d7fd16fff1f77641f25
af/merge-core
James South 13 years ago
parent
commit
4d9c026da8
  1. 14
      src/ImageProcessor.Web/ImageProcessor.Web.csproj
  2. 2
      src/ImageProcessor.Web/packages.config
  3. 1
      src/ImageProcessor.Web/x64/SQLite.Interop.dll.REMOVED.git-id
  4. 1
      src/ImageProcessor.Web/x86/SQLite.Interop.dll.REMOVED.git-id
  5. 2
      src/ImageProcessor.sln
  6. 1
      src/packages/System.Data.SQLite.1.0.84.0/System.Data.SQLite.1.0.84.0.nupkg.REMOVED.git-id
  7. 1
      src/packages/System.Data.SQLite.1.0.84.0/content/net20/x64/SQLite.Interop.dll.REMOVED.git-id
  8. 1
      src/packages/System.Data.SQLite.1.0.84.0/content/net20/x86/SQLite.Interop.dll.REMOVED.git-id
  9. 1
      src/packages/System.Data.SQLite.1.0.84.0/content/net40/x64/SQLite.Interop.dll.REMOVED.git-id
  10. 1
      src/packages/System.Data.SQLite.1.0.84.0/content/net40/x86/SQLite.Interop.dll.REMOVED.git-id
  11. 1
      src/packages/System.Data.SQLite.1.0.84.0/content/net45/x64/SQLite.Interop.dll.REMOVED.git-id
  12. 1
      src/packages/System.Data.SQLite.1.0.84.0/content/net45/x86/SQLite.Interop.dll.REMOVED.git-id
  13. 1
      src/packages/System.Data.SQLite.1.0.84.0/lib/net20/System.Data.SQLite.dll.REMOVED.git-id
  14. 1
      src/packages/System.Data.SQLite.1.0.84.0/lib/net40/System.Data.SQLite.dll.REMOVED.git-id
  15. 1
      src/packages/System.Data.SQLite.1.0.84.0/lib/net45/System.Data.SQLite.dll.REMOVED.git-id
  16. 36
      src/packages/System.Data.SQLite.1.0.84.0/tools/install.ps1
  17. 1
      src/packages/System.Data.SQLite.x86.1.0.84.0/System.Data.SQLite.x86.1.0.84.0.nupkg.REMOVED.git-id
  18. 6
      src/packages/System.Data.SQLite.x86.1.0.84.0/System.Data.SQLite.x86.1.0.84.0.nuspec
  19. 0
      src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net20/System.Data.SQLite.Linq.dll.REMOVED.git-id
  20. 1
      src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net20/System.Data.SQLite.dll.REMOVED.git-id
  21. 0
      src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net40/System.Data.SQLite.Linq.dll.REMOVED.git-id
  22. 1
      src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net40/System.Data.SQLite.dll.REMOVED.git-id
  23. 0
      src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net45/System.Data.SQLite.Linq.dll.REMOVED.git-id
  24. 1
      src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net45/System.Data.SQLite.dll.REMOVED.git-id

14
src/ImageProcessor.Web/ImageProcessor.Web.csproj

@ -69,13 +69,13 @@
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
<Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\System.Data.SQLite.1.0.84.0\lib\net40\System.Data.SQLite.dll</HintPath>
<HintPath>..\packages\System.Data.SQLite.x86.1.0.84.0\lib\net40\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.Data.SQLite.Linq, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\System.Data.SQLite.1.0.84.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
<HintPath>..\packages\System.Data.SQLite.x86.1.0.84.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
@ -106,14 +106,6 @@
<Name>ImageProcessor</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="x64\SQLite.Interop.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="x86\SQLite.Interop.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>

2
src/ImageProcessor.Web/packages.config

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.Data.SQLite" version="1.0.84.0" targetFramework="net40" />
<package id="System.Data.SQLite.x86" version="1.0.84.0" targetFramework="net40" />
</packages>

1
src/ImageProcessor.Web/x64/SQLite.Interop.dll.REMOVED.git-id

@ -1 +0,0 @@
cb352e8236b42cc560ee62583a5b8e0d14d87851

1
src/ImageProcessor.Web/x86/SQLite.Interop.dll.REMOVED.git-id

@ -1 +0,0 @@
1838fba8df03d11c4b76a63b922448593bc908ce

2
src/ImageProcessor.sln

@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio Express 2012 for Web
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor", "ImageProcessor\ImageProcessor.csproj", "{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test\Test.csproj", "{30327C08-7574-4D7E-AC95-6A58753C6855}"

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

@ -1 +0,0 @@
ab8fbbdbc303e4e566b544198a6a7ff562cbdf15

1
src/packages/System.Data.SQLite.1.0.84.0/content/net20/x64/SQLite.Interop.dll.REMOVED.git-id

@ -1 +0,0 @@
860c0e580744e6c434db8d7d468f8fc15e2a41be

1
src/packages/System.Data.SQLite.1.0.84.0/content/net20/x86/SQLite.Interop.dll.REMOVED.git-id

@ -1 +0,0 @@
6f6fd4f437e4579f5d8cd489c0d3095a7f0ebb8c

1
src/packages/System.Data.SQLite.1.0.84.0/content/net40/x64/SQLite.Interop.dll.REMOVED.git-id

@ -1 +0,0 @@
cb352e8236b42cc560ee62583a5b8e0d14d87851

1
src/packages/System.Data.SQLite.1.0.84.0/content/net40/x86/SQLite.Interop.dll.REMOVED.git-id

@ -1 +0,0 @@
1838fba8df03d11c4b76a63b922448593bc908ce

1
src/packages/System.Data.SQLite.1.0.84.0/content/net45/x64/SQLite.Interop.dll.REMOVED.git-id

@ -1 +0,0 @@
26efb8ce39cf9b09e440c00d2639233402b2a154

1
src/packages/System.Data.SQLite.1.0.84.0/content/net45/x86/SQLite.Interop.dll.REMOVED.git-id

@ -1 +0,0 @@
b937604acdc489ab2c0b89e0aaf075672e536b70

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

@ -1 +0,0 @@
7bae8574bfe9fbff66f60d60987008756be04acd

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

@ -1 +0,0 @@
1ee930f18b364964b44e591dd81f3ce1a3615bac

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

@ -1 +0,0 @@
aa5827973b95175e31ab254ee946d7d67c914383

36
src/packages/System.Data.SQLite.1.0.84.0/tools/install.ps1

@ -1,36 +0,0 @@
###############################################################################
#
# install.ps1 --
#
# Written by Joe Mistachkin.
# Released to the public domain, use at your own risk!
#
###############################################################################
param($installPath, $toolsPath, $package, $project)
$platformNames = "x86", "x64"
$fileName = "SQLite.Interop.dll"
$propertyName = "CopyToOutputDirectory"
foreach($platformName in $platformNames) {
$folder = $project.ProjectItems.Item($platformName)
if ($folder -eq $null) {
continue
}
$item = $folder.ProjectItems.Item($fileName)
if ($item -eq $null) {
continue
}
$property = $item.Properties.Item($propertyName)
if ($property -eq $null) {
continue
}
$property.Value = 1
}

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

@ -0,0 +1 @@
2db1579b36b2d81adf041533845e9a72ea6c2393

6
src/packages/System.Data.SQLite.1.0.84.0/System.Data.SQLite.1.0.84.0.nuspec → src/packages/System.Data.SQLite.x86.1.0.84.0/System.Data.SQLite.x86.1.0.84.0.nuspec

@ -1,16 +1,16 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>System.Data.SQLite</id>
<id>System.Data.SQLite.x86</id>
<version>1.0.84.0</version>
<title>System.Data.SQLite (x86/x64)</title>
<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 for both x86 and x64 along with the ADO.NET provider.</description>
<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>

0
src/packages/System.Data.SQLite.1.0.84.0/lib/net20/System.Data.SQLite.Linq.dll.REMOVED.git-id → src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net20/System.Data.SQLite.Linq.dll.REMOVED.git-id

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

@ -0,0 +1 @@
168e4329b21098e36b1c1af6e0c8728d5e9c589e

0
src/packages/System.Data.SQLite.1.0.84.0/lib/net40/System.Data.SQLite.Linq.dll.REMOVED.git-id → src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net40/System.Data.SQLite.Linq.dll.REMOVED.git-id

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

@ -0,0 +1 @@
f60b588d3ff22ae8b1f51d710a44a037683ce81d

0
src/packages/System.Data.SQLite.1.0.84.0/lib/net45/System.Data.SQLite.Linq.dll.REMOVED.git-id → src/packages/System.Data.SQLite.x86.1.0.84.0/lib/net45/System.Data.SQLite.Linq.dll.REMOVED.git-id

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

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