Skip to content

Commit 7df294f

Browse files
praeclarumpraeclarum
authored
Merge pull request praeclarum#596 from praeclarum/add-base
SQLite-net Base that references only SQLitePCLRaw.core
2 parents 20ad278 + 6c78cbf commit 7df294f

File tree

10 files changed

+143
-31
lines changed

10 files changed

+143
-31
lines changed

‎Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tests/bin/Debug/SQLite.Tests.dll: tests/SQLite.Tests.csproj $(SRC)
1313
tests/ApiDiff/bin/Debug/ApiDiff.exe: tests/ApiDiff/ApiDiff.csproj $(SRC)
1414
msbuild tests/ApiDiff/ApiDiff.csproj
1515

16-
nuget: srcnuget pclnuget
16+
nuget: srcnuget pclnuget basenuget
1717

1818
packages: nuget/SQLite-net/packages.config
1919
nuget restore SQLite.sln
@@ -26,3 +26,7 @@ pclnuget: sqlite-net-pcl.nuspec packages $(SRC)
2626
msbuild "/p:Configuration=Release" nuget/SQLite-net-std/SQLite-net-std.csproj
2727
nuget pack sqlite-net-pcl.nuspec -o .\
2828

29+
basenuget: sqlite-net-pcl.nuspec packages $(SRC)
30+
msbuild "/p:Configuration=Release" nuget/SQLite-net-base/SQLite-net-base.csproj
31+
nuget pack sqlite-net-base.nuspec -o .\
32+

‎SQLite.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
88
sqlite-net-pcl.nuspec = sqlite-net-pcl.nuspec
99
sqlite-net.nuspec = sqlite-net.nuspec
1010
Makefile = Makefile
11+
sqlite-net-base.nuspec = sqlite-net-base.nuspec
1112
EndProjectSection
1213
EndProject
1314
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite-net", "nuget\SQLite-net\SQLite-net.csproj", "{7F946494-8EE0-432B-8A87-98961143D5C1}"
@@ -20,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite-net-std", "nuget\SQL
2021
EndProject
2122
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiDiff", "tests\ApiDiff\ApiDiff.csproj", "{1DEF735C-B973-4ED9-8446-7FFA6D0B410B}"
2223
EndProject
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite-net-base", "nuget\SQLite-net-base\SQLite-net-base.csproj", "{53D1953C-3641-47D0-BE08-14DB853CC576}"
25+
EndProject
2326
Global
2427
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2528
Debug|Any CPU = Debug|Any CPU
@@ -90,6 +93,18 @@ Global
9093
{1DEF735C-B973-4ED9-8446-7FFA6D0B410B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
9194
{1DEF735C-B973-4ED9-8446-7FFA6D0B410B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
9295
{1DEF735C-B973-4ED9-8446-7FFA6D0B410B}.Debug|iPhone.Build.0 = Debug|Any CPU
96+
{53D1953C-3641-47D0-BE08-14DB853CC576}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
97+
{53D1953C-3641-47D0-BE08-14DB853CC576}.Debug|Any CPU.Build.0 = Debug|Any CPU
98+
{53D1953C-3641-47D0-BE08-14DB853CC576}.Release|Any CPU.ActiveCfg = Release|Any CPU
99+
{53D1953C-3641-47D0-BE08-14DB853CC576}.Release|Any CPU.Build.0 = Release|Any CPU
100+
{53D1953C-3641-47D0-BE08-14DB853CC576}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
101+
{53D1953C-3641-47D0-BE08-14DB853CC576}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
102+
{53D1953C-3641-47D0-BE08-14DB853CC576}.Release|iPhone.ActiveCfg = Release|Any CPU
103+
{53D1953C-3641-47D0-BE08-14DB853CC576}.Release|iPhone.Build.0 = Release|Any CPU
104+
{53D1953C-3641-47D0-BE08-14DB853CC576}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
105+
{53D1953C-3641-47D0-BE08-14DB853CC576}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
106+
{53D1953C-3641-47D0-BE08-14DB853CC576}.Debug|iPhone.ActiveCfg = Debug|Any CPU
107+
{53D1953C-3641-47D0-BE08-14DB853CC576}.Debug|iPhone.Build.0 = Debug|Any CPU
93108
EndGlobalSection
94109
GlobalSection(NestedProjects) = preSolution
95110
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2} = {FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF}

‎nuget/SQLite-net-base/SQLite-net-base.csproj

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard1.1</TargetFramework>
5+
<AssemblyName>SQLite-net</AssemblyName>
6+
</PropertyGroup>
7+
8+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
9+
<DefineConstants>TRACE;USE_SQLITEPCL_RAW;NO_SQLITEPCL_RAW_BATTERIES;DEBUG;NETSTANDARD1_1</DefineConstants>
10+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
11+
<DocumentationFile>bin\Debug\netstandard1.1\SQLite-net.xml</DocumentationFile>
12+
</PropertyGroup>
13+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
14+
<DebugSymbols>true</DebugSymbols>
15+
<DebugType>portable</DebugType>
16+
<DefineConstants>TRACE;USE_SQLITEPCL_RAW;NO_SQLITEPCL_RAW_BATTERIES;RELEASE;NETSTANDARD1_1</DefineConstants>
17+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
18+
<DocumentationFile>bin\Release\netstandard1.1\SQLite-net.xml</DocumentationFile>
19+
</PropertyGroup>
20+
<ItemGroup>
21+
<Compile Include="..\..\src\SQLite.cs">
22+
<Link>SQLite.cs</Link>
23+
</Compile>
24+
<Compile Include="..\..\src\SQLiteAsync.cs">
25+
<Link>SQLiteAsync.cs</Link>
26+
</Compile>
27+
</ItemGroup>
28+
<ItemGroup>
29+
<PackageReference Include="SQLitePCLRaw.core" Version="1.1.8" />
30+
</ItemGroup>
31+
</Project>

‎nuget/SQLite-net-std/SQLite-net-std.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
<DebugSymbols>true</DebugSymbols>
1010
<DebugType>portable</DebugType>
1111
<DefineConstants>TRACE;USE_SQLITEPCL_RAW;RELEASE;NETSTANDARD1_1</DefineConstants>
12+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1213
<DocumentationFile>bin\Release\netstandard1.1\SQLite-net.xml</DocumentationFile>
1314
</PropertyGroup>
1415
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1516
<DefineConstants>TRACE;USE_SQLITEPCL_RAW;DEBUG;NETSTANDARD1_1</DefineConstants>
17+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
18+
<DocumentationFile>bin\Debug\netstandard1.1\SQLite-net.xml</DocumentationFile>
1619
</PropertyGroup>
1720
<ItemGroup>
18-
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="1.1.7" />
21+
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="1.1.8" />
1922
</ItemGroup>
2023
<ItemGroup>
2124
<Compile Include="..\..\src\SQLite.cs">

‎nuget/SQLite-net/SQLite-net.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@
5656
</ItemGroup>
5757
<ItemGroup>
5858
<Reference Include="SQLitePCLRaw.core">
59-
<HintPath>..\..\packages\SQLitePCLRaw.core.1.1.7\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.core.dll</HintPath>
59+
<HintPath>..\..\packages\SQLitePCLRaw.core.1.1.8\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.core.dll</HintPath>
6060
</Reference>
6161
<Reference Include="SQLitePCLRaw.batteries_green">
62-
<HintPath>..\..\packages\SQLitePCLRaw.bundle_green.1.1.7\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.batteries_green.dll</HintPath>
62+
<HintPath>..\..\packages\SQLitePCLRaw.bundle_green.1.1.8\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.batteries_green.dll</HintPath>
6363
</Reference>
6464
<Reference Include="SQLitePCLRaw.batteries_v2">
65-
<HintPath>..\..\packages\SQLitePCLRaw.bundle_green.1.1.7\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.batteries_v2.dll</HintPath>
65+
<HintPath>..\..\packages\SQLitePCLRaw.bundle_green.1.1.8\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.batteries_v2.dll</HintPath>
6666
</Reference>
6767
</ItemGroup>
6868
<ItemGroup>

‎nuget/SQLite-net/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="SQLitePCLRaw.bundle_green" version="1.1.7" targetFramework="portable45-net45+win8+wp8+wpa81" />
4-
<package id="SQLitePCLRaw.core" version="1.1.7" targetFramework="portable45-net45+win8+wp8+wpa81" />
3+
<package id="SQLitePCLRaw.bundle_green" version="1.1.8" targetFramework="portable45-net45+win8+wp8+wpa81" />
4+
<package id="SQLitePCLRaw.core" version="1.1.8" targetFramework="portable45-net45+win8+wp8+wpa81" />
55
</packages>

‎sqlite-net-base.nuspec

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<version>1.5.0</version>
5+
<authors>Frank A. Krueger</authors>
6+
<owners>Frank A. Krueger</owners>
7+
<licenseUrl>https://raw.githubusercontent.com/praeclarum/sqlite-net/master/LICENSE.md</licenseUrl>
8+
<projectUrl>https://github.com/praeclarum/sqlite-net</projectUrl>
9+
<iconUrl>https://raw.githubusercontent.com/praeclarum/sqlite-net/master/nuget/Logo-low.png</iconUrl>
10+
<id>sqlite-net-base</id>
11+
<title>SQLite-net Base Library</title>
12+
<summary>SQLite-net Official Portable Library (Base) is the easy and configurable way to access sqlite from .NET apps.</summary>
13+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
14+
<description>
15+
This is a special version of SQLite-net-pcl that does not include a SQLitePCLRaw bundle.
16+
It is meant to give you all the power of SQLite-net but with the freedom to choose your own provider.
17+
Please use the package sqlite-net-pcl if you have no idea what any of this means.
18+
</description>
19+
<tags>sqlite pcl database orm mobile</tags>
20+
<releaseNotes>See project page</releaseNotes>
21+
<dependencies>
22+
<group targetFramework="net">
23+
<dependency id="SQLitePCLRaw.core" version="1.1.8" />
24+
</group>
25+
<group targetFramework="win">
26+
<dependency id="SQLitePCLRaw.core" version="1.1.8" />
27+
</group>
28+
<group targetFramework="wp">
29+
<dependency id="SQLitePCLRaw.core" version="1.1.8" />
30+
</group>
31+
<group targetFramework="wpa">
32+
<dependency id="SQLitePCLRaw.core" version="1.1.8" />
33+
</group>
34+
<group targetFramework="netstandard1.1">
35+
<dependency id="SQLitePCLRaw.core" version="1.1.8" />
36+
<dependency id="NETStandard.Library" version="1.6.1" />
37+
</group>
38+
<group targetFramework="MonoAndroid10">
39+
<dependency id="SQLitePCLRaw.core" version="1.1.8" />
40+
</group>
41+
<group targetFramework="Xamarin.iOS10">
42+
<dependency id="SQLitePCLRaw.core" version="1.1.8" />
43+
</group>
44+
<group targetFramework="Xamarin.Mac20">
45+
<dependency id="SQLitePCLRaw.core" version="1.1.8" />
46+
</group>
47+
<group targetFramework="portable-net45+win+wpa81+wp80">
48+
<dependency id="SQLitePCLRaw.core" version="1.1.8" />
49+
</group>
50+
<group targetFramework="uap">
51+
<dependency id="SQLitePCLRaw.core" version="1.1.8" />
52+
</group>
53+
<group targetFramework="dotnet">
54+
<dependency id="SQLitePCLRaw.core" version="1.1.8" />
55+
</group>
56+
<group targetFramework="xamarintvos">
57+
<dependency id="SQLitePCLRaw.core" version="1.1.8" />
58+
</group>
59+
<group targetFramework="xamarinwatchos">
60+
<dependency id="SQLitePCLRaw.core" version="1.1.8" />
61+
</group>
62+
</dependencies>
63+
</metadata>
64+
<files>
65+
<file src="nuget/SQLite-net-base/bin/Release/netstandard1.1/SQLite-net.*" target="lib/netstandard1.1" />
66+
</files>
67+
</package>

‎sqlite-net-pcl.nuspec

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,47 @@
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>SQLite-net is an open source and light weight library providing easy SQLite database storage for .NET, Mono, and Xamarin applications. This version uses SQLitePCLRaw to provide platform independent versions of SQLite.</description>
1515
<tags>sqlite pcl database orm mobile</tags>
16-
<releaseNotes>
17-
<![CDATA[
18-
v1.4: Improve .NET Standard Support
19-
]]>
20-
</releaseNotes>
16+
<releaseNotes>See project page</releaseNotes>
2117
<dependencies>
2218
<group targetFramework="net">
23-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.7" />
19+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.8" />
2420
</group>
2521
<group targetFramework="win">
26-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.7" />
22+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.8" />
2723
</group>
2824
<group targetFramework="wp">
29-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.7" />
25+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.8" />
3026
</group>
3127
<group targetFramework="wpa">
32-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.7" />
28+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.8" />
3329
</group>
3430
<group targetFramework="netstandard1.1">
35-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.7" />
31+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.8" />
3632
<dependency id="NETStandard.Library" version="1.6.1" />
3733
</group>
3834
<group targetFramework="MonoAndroid10">
39-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.7" />
35+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.8" />
4036
</group>
4137
<group targetFramework="Xamarin.iOS10">
42-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.7" />
38+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.8" />
4339
</group>
4440
<group targetFramework="Xamarin.Mac20">
45-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.7" />
41+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.8" />
4642
</group>
4743
<group targetFramework="portable-net45+win+wpa81+wp80">
48-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.7" />
44+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.8" />
4945
</group>
5046
<group targetFramework="uap">
51-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.7" />
47+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.8" />
5248
</group>
5349
<group targetFramework="dotnet">
54-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.7" />
50+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.8" />
5551
</group>
5652
<group targetFramework="xamarintvos">
57-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.7" />
53+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.8" />
5854
</group>
5955
<group targetFramework="xamarinwatchos">
60-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.7" />
56+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.8" />
6157
</group>
6258
</dependencies>
6359
</metadata>

‎sqlite-net.nuspec

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
<description>sqlite-net is an open source, minimal library to allow .NET and Mono applications to store data in SQLite databases. It is written in C# 3.0 and is meant to be simply compiled in with your projects. It was first designed to work with MonoTouch on the iPhone, but should work in any other CLI environment.</description>
1414
<tags>sqlite sql monotouch database metro winrt</tags>
1515
<summary>A .NET client library to access SQLite embedded database files in a LINQ manner.</summary>
16-
<releaseNotes>
17-
<![CDATA[
18-
v1.2.1: Compare column names without case.
19-
]]>
20-
</releaseNotes>
16+
<releaseNotes>See project page</releaseNotes>
2117
</metadata>
2218
<files>
2319
<file src="src/SQLite.cs" target="content/SQLite.cs" />

‎src/SQLite.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public partial class SQLiteConnection : IDisposable
212212
/// </summary>
213213
public bool StoreDateTimeAsTicks { get; private set; }
214214

215-
#if USE_SQLITEPCL_RAW
215+
#if USE_SQLITEPCL_RAW && !NO_SQLITEPCL_RAW_BATTERIES
216216
static SQLiteConnection ()
217217
{
218218
SQLitePCL.Batteries_V2.Init ();

0 commit comments

Comments
 (0)