Skip to content

Commit 9d9afb1

Browse files
committed
SQLite library dependency fixed
1 parent 5dc8989 commit 9d9afb1

File tree

11 files changed

+123
-93
lines changed

11 files changed

+123
-93
lines changed

SQLProvider.sln

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio Version 17
33
VisualStudioVersion = 17.13.35919.96
44
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{CE6DE91D-90CC-4B87-9644-C2EE75657B53}"
6+
ProjectSection(SolutionItems) = preProject
7+
paket.dependencies = paket.dependencies
8+
EndProjectSection
9+
EndProject
510
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SQLProvider.Runtime", "src\SQLProvider.Runtime\SQLProvider.Runtime.fsproj", "{869D1719-52F6-4161-891F-892E6700EEDA}"
611
EndProject
712
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SQLProvider.DesignTime", "src\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj", "{9DFB1C30-D288-431B-A8EE-425EAD0E2549}"

paket.dependencies

+20-13
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,26 @@ version 8.1.0
22
source https://api.nuget.org/v3/index.json
33
storage: none
44

5+
// Note for package updates:
6+
// - TypeProvider runs on both Dotnet and .NET Framework full
7+
// - Some packages have runtime dependencies that are needed, possibly in desgin-time/compile-time as well
8+
// - Some fsproj files may have direct dependencies listed as packagereference, shouldn't conflict with these versions
9+
// - Nuget packages have dependencies listed, so if updated here, the paket.template needs update as well
10+
511
nuget FSharp.Core == 8.0.301
612
nuget System.Data.SqlClient framework: net461, net472, net48, netstandard2.0, netstandard2.1, netcoreapp2.1, netcoreapp3.1
713
nuget NETStandard.Library.NETFramework storage: packages
814
nuget System.Runtime
915
nuget System.Data.Common
10-
nuget System.Data.OleDb
11-
nuget System.Data.Odbc
16+
nuget System.Data.OleDb 6.0.1
17+
nuget System.Data.Odbc 6.0.2
1218
nuget Microsoft.Data.SQLite 2.0
13-
nuget Microsoft.Data.SqlClient framework: net462, netstandard2.0, net8.0, net6.0, netstandard2.1
19+
nuget Microsoft.Data.SqlClient 5.2.2
1420
nuget System.Memory
15-
nuget System.Runtime.Loader
21+
nuget System.Runtime.Loader 4.3
1622
nuget System.Text.Encodings.Web 9.0.4
1723
nuget System.Threading.Tasks.Extensions
18-
nuget Microsoft.Extensions.Logging.Abstractions
24+
nuget Microsoft.Extensions.Logging.Abstractions 8.0.3
1925

2026
group Build
2127

@@ -86,13 +92,14 @@ group Tests
8692
nuget Newtonsoft.Json
8793
nuget Npgsql 8.0.7
8894
nuget NUnit 3.14.0
89-
nuget Oracle.ManagedDataAccess 23.8.0
90-
nuget Oracle.ManagedDataAccess.Core 23.8.0
95+
nuget Oracle.ManagedDataAccess 23.8.0 framework: net461, netstandard2.0
96+
nuget Oracle.ManagedDataAccess.Core 23.8.0 framework: net8.0, net6.0, netstandard2.1
9197
nuget FirebirdSql.Data.FirebirdClient 10.3.2
92-
nuget System.Data.SQLite.Core 1.0.119
93-
nuget System.Data.SQLite.Linq 1.0.119
94-
nuget SQLitePCLRaw.bundle_green
95-
nuget Microsoft.Data.Sqlite.Core
96-
nuget DuckDB.NET.Bindings.Full
97-
nuget DuckDB.NET.Data.Full
98+
nuget System.Data.SQLite.Core 1.0.115.5
99+
nuget System.Data.SQLite.Linq 1.0.115.5
100+
nuget SQLitePCLRaw.bundle_green 2.1.11
101+
nuget SQLitePCLRaw.core 2.1.11
102+
nuget Microsoft.Data.Sqlite.Core 9.0.4
103+
nuget DuckDB.NET.Bindings.Full 1.2.1
104+
nuget DuckDB.NET.Data.Full 1.2.1
98105
// nuget Microsoft.Data.Sqlite.Core.Backport // Needed if we want currently Core support on Linux.

paket.lock

+86-69
Large diffs are not rendered by default.

src/SQLProvider.SQLite.DesignTime/SQLProvider.SQLite.DesignTime.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.11">
4242
<IncludeAssets>all</IncludeAssets>
4343
</PackageReference>
44-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119">
44+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5">
4545
<IncludeAssets>all</IncludeAssets>
4646
</PackageReference>
47-
<PackageReference Include="System.Data.SQLite.Linq" Version="1.0.119" />
47+
<PackageReference Include="System.Data.SQLite.Linq" Version="1.0.115.5" />
4848
</ItemGroup>
4949
<ItemGroup>
5050
<ProjectReference Include="..\SQLProvider.Common\SQLProvider.Common.fsproj" />
5151
</ItemGroup>
5252
<Import Project="..\..\.paket\Paket.Restore.targets" />
53-
</Project>
53+
</Project>

src/SQLProvider.SQLite.Runtime/SQLProvider.SQLite.Runtime.fsproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<ItemGroup>
3636
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.4" />
3737
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.11" />
38-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
39-
<PackageReference Include="System.Data.SQLite.Linq" Version="1.0.119" />
38+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
39+
<PackageReference Include="System.Data.SQLite.Linq" Version="1.0.115.5" />
4040
</ItemGroup>
4141
<ItemGroup>
4242
<ProjectReference Include="..\SQLProvider.Common\SQLProvider.Common.fsproj" />

src/SQLProvider.SQLite.Runtime/paket.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies
3737
System.Memory >= 4.6.3
3838
System.Runtime >= 4.3
3939
System.Data.Common >= 4.3
40-
System.Data.SQLite.Core >= 1.0.119
41-
System.Data.SQLite.Linq >= 1.0.119
40+
System.Data.SQLite.Core >= 1.0.115.5
41+
System.Data.SQLite.Linq >= 1.0.115.5
4242
SQLitePCLRaw.bundle_green >= 2.1.11
4343
Microsoft.Data.Sqlite.Core >= 9.0.4

tests/SqlProvider.Tests/SqlProvider.Tests.fsproj

+5-4
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@
5353
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5454
<PrivateAssets>all</PrivateAssets>
5555
</PackageReference>
56-
<PackageReference Include="SQLitePCLRaw.core" Version="2.0.4" />
57-
<PackageReference Include="System.Data.SQLite" Version="1.0.113.7" />
56+
<PackageReference Include="System.Data.SQLite.Linq" Version="1.0.115.5" />
57+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
58+
<PackageReference Include="SQLitePCLRaw.core" Version="2.1.11" />
5859
</ItemGroup>
5960
<ItemGroup>
6061
<Reference Include="System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -66,11 +67,11 @@
6667
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
6768
<CallTarget Targets="CopyLibrariesWin" Condition="'$(IsWindows)' == 'true'" />
6869
<CallTarget Targets="CopyLibrariesNonWin" Condition="'$(IsWindows)' != 'true'" />
69-
</Target>
70+
</Target>
7071
<Target Name="BeforeBuild">
7172
</Target>
7273
<Target Name="AfterBuild">
7374
</Target>
7475
<Import Project="..\..\.paket\Paket.Restore.targets" />
7576

76-
</Project>
77+
</Project>
0 Bytes
Binary file not shown.
Binary file not shown.
208 KB
Binary file not shown.
104 KB
Binary file not shown.

0 commit comments

Comments
 (0)