Revert "Update to System.Data.SQLite 1.0.119 (#1003)"

This reverts commit c159547.
ErikEJ · Nov 5, 2024 · 8e3ae75 · 8e3ae75
1 parent c159547
commit 8e3ae75
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 18 deletions.
diff --git a/src/API/Properties/AssemblyInfo.cs b/src/API/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly:ComVisible(false)]
 [assembly: AssemblyVersion("3.5.2.15")]
-[assembly: AssemblyFileVersion("3.5.2.100")]
-[assembly: AssemblyInformationalVersion("3.5.2.100")]
+[assembly: AssemblyFileVersion("3.5.2.99")]
+[assembly: AssemblyInformationalVersion("3.5.2.99")]
diff --git a/src/API/RebuildAllExceptSetup.cmd b/src/API/RebuildAllExceptSetup.cmd
@@ -6,13 +6,15 @@ chdir /d %ORIGINAL_DIR%
 
 msbuild Export2SQLCE.sln /t:Rebuild /p:Configuration=Release
 copy bin\Release\*.dll ..\..\..\
+copy bin\x86\Release\*.dll ..\..\..\
 cd lib
 .\ilmerge /targetplatform:"v4,C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2" /out:..\..\..\..\Export2SqlCe.exe ..\bin\release\export2sqlce.exe QuickGraph.dll QuickGraph.Data.dll QuickGraph.GraphViz.dll
 cd ..
 pause
 
 msbuild ExportSQLCE.sln /t:Rebuild /p:Configuration=Release
 copy bin\Release\*.dll ..\..\..\
+copy bin\x86\Release\*.dll ..\..\..\
 cd lib
 .\ilmerge /targetplatform:"v4,C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2" /out:..\..\..\..\ExportSqlCe.exe ..\bin\release\exportsqlce.exe QuickGraph.dll QuickGraph.Data.dll QuickGraph.GraphViz.dll
 cd ..
@@ -21,11 +23,13 @@ pause
 
 msbuild ExportSQLCE40.sln /t:Rebuild /p:Configuration=Release
 copy bin\Release\*.dll ..\..\..\
+copy bin\x86\Release\*.dll ..\..\..\
 cd lib
 .\ilmerge /targetplatform:"v4,C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2" /out:..\..\..\..\ExportSqlCe40.exe ..\bin\release\exportsqlce40.exe QuickGraph.dll QuickGraph.Data.dll QuickGraph.GraphViz.dll
 cd ..
 pause
 
 msbuild SqlCeScripting40.sln /t:Rebuild /p:Configuration=Release
 copy bin\Release\*.dll ..\..\..\
+copy bin\x86\Release\*.dll ..\..\..\
 pause
diff --git a/src/API/SQLiteScripting/Repositories/SQLiteRepository.cs b/src/API/SQLiteScripting/Repositories/SQLiteRepository.cs
@@ -12,8 +12,7 @@
 
 namespace ErikEJ.SQLiteScripting
 {
-    //download sqlite-netFx46-static-binary-bundle-Win32-2015-1.0.119.0.zip to extract System.Data.Sqlite.dll for SSMS
-    //download sqlite-netFx46-binary-x64-2015-1.0.119.0.zip to extract SQLite.Interop.dll for VS (lib folder x64)
+    //SSMS extension uses sqlite-netFx46-static-binary-bundle-Win32-2013-1.0.116.0.zip still, all others use NuGet package
     public class SQLiteRepository : IRepository
     { 
         private SQLiteConnection _cn;

diff --git a/src/API/SQLiteScripting/SQLiteScripting.csproj b/src/API/SQLiteScripting/SQLiteScripting.csproj
@@ -50,8 +50,8 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net451\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.118.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\lib\net451\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -80,12 +80,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
+  <Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
   </Target>
   <!-- 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.

diff --git a/src/API/SQLiteScripting/packages.config b/src/API/SQLiteScripting/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.119.0" targetFramework="net451" />
+  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.118.0" targetFramework="net451" />
 </packages>
diff --git a/src/API/SqlCeScripting40/Tests/Tests.csproj b/src/API/SqlCeScripting40/Tests/Tests.csproj
@@ -47,8 +47,8 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net451\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.118.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\lib\net451\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" />
     <Reference Include="System.Xml.Linq" />
@@ -139,9 +139,9 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props'))" />
     <Error Condition="!Exists('..\..\packages\NUnit.3.13.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.13.1\build\NUnit.props'))" />
-    <Error Condition="!Exists('..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
   </Target>
-  <Import Project="..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
+  <Import Project="..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\build\net451\Stub.System.Data.SQLite.Core.NetFramework.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">

diff --git a/src/API/SqlCeScripting40/Tests/packages.config b/src/API/SqlCeScripting40/Tests/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="NUnit" version="3.13.1" targetFramework="net451" />
   <package id="NUnit3TestAdapter" version="3.17.0" targetFramework="net451" />
-  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.119.0" targetFramework="net451" />
+  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.118.0" targetFramework="net451" />
 </packages>
diff --git a/src/GUI/SSMSToolbox/SSMSToolbox.csproj b/src/GUI/SSMSToolbox/SSMSToolbox.csproj
@@ -481,7 +481,7 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+    <Reference Include="System.Data.SQLite, Version=1.0.118.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
       <HintPath>..\lib\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.Entity" />

diff --git a/src/GUI/SqlCe35Toolbox/VSToolbox.csproj b/src/GUI/SqlCe35Toolbox/VSToolbox.csproj
@@ -265,6 +265,11 @@
     <Resource Include="Resources\GroupBy_284.png" />
     <Resource Include="Resources\AddDatabase_16x.png" />
     <Resource Include="Resources\CopyLongTextToClipboard_16x.png" />
+    <Content Include="..\lib\sqlite\x86\SQLite.Interop.dll">
+      <Link>x86\SQLite.Interop.dll</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Resources\LocalDatabaseConnectionStringBuilder.sdf">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -354,11 +359,9 @@
     </EmbeddedResource>
     <EmbeddedResource Include="WinForms\PanelQuickSearch.resx">
       <DependentUpon>PanelQuickSearch.cs</DependentUpon>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="WinForms\ReportGrid.resx">
       <DependentUpon>ReportGrid.cs</DependentUpon>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="WinForms\ResultsetGrid.resx">
       <DependentUpon>ResultsetGrid.cs</DependentUpon>
@@ -570,7 +573,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="System.Data.SQLite.Core">
-      <Version>1.0.119</Version>
+      <Version>1.0.118</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/GUI/lib/ISqlCeScripting.dll b/src/GUI/lib/ISqlCeScripting.dll
diff --git a/src/GUI/lib/SQLiteScripting.dll b/src/GUI/lib/SQLiteScripting.dll
diff --git a/src/GUI/lib/SqlCeScripting.dll b/src/GUI/lib/SqlCeScripting.dll
diff --git a/src/GUI/lib/SqlCeScripting40.dll b/src/GUI/lib/SqlCeScripting40.dll
diff --git a/src/GUI/lib/System.Data.SQLite.dll b/src/GUI/lib/System.Data.SQLite.dll
diff --git a/src/GUI/lib/sqlite/x64/SQLite.Interop.dll b/src/GUI/lib/sqlite/x64/SQLite.Interop.dll
diff --git a/src/GUI/lib/sqlite/x86/SQLite.Interop.dll b/src/GUI/lib/sqlite/x86/SQLite.Interop.dll