Skip to content

Commit 2c10d1e

Browse files
committed
Merge tag 'v1.9.172'
2 parents 9153a02 + 5f72241 commit 2c10d1e

File tree

20 files changed

+433
-139
lines changed

20 files changed

+433
-139
lines changed

.github/workflows/build.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
build:
1313

14-
runs-on: macOS-10.14
14+
runs-on: ubuntu-latest
1515

1616
steps:
1717

@@ -21,19 +21,33 @@ jobs:
2121
env:
2222
VERSION_BUILD: ${{github.run_number}}
2323
run: |
24-
sed -i bak "s:</VersionPrefix>:.$VERSION_BUILD</VersionPrefix>:g" Directory.Build.props
24+
sed -i.bak "s:</VersionPrefix>:.$VERSION_BUILD</VersionPrefix>:g" Directory.Build.props
25+
26+
- name: Set up .NET
27+
uses: actions/setup-dotnet@v4
28+
with:
29+
global-json-file: global.json
30+
31+
- name: Install Code Coverarage Tool
32+
run: dotnet tool install --global dotnet-reportgenerator-globaltool
2533

2634
- name: Restore NuGets
27-
run: nuget restore SQLite.sln
35+
run: dotnet restore SQLite.sln
2836

2937
- name: Build and Test
3038
run: |
3139
set -e
3240
cd tests/SQLite.Tests
3341
dotnet test /p:AltCover=true /p:AltCoverForce=true "/p:AltCoverTypeFilter=SQLite.Tests.*"
42+
43+
- name: Verify Async API Matches Sync API
44+
run: |
45+
set -e
46+
dotnet run --project tests/ApiDiff/ApiDiff.csproj
3447
3548
- name: Generate Code Coverage Report
36-
uses: danielpalme/ReportGenerator-GitHub-Action@4.8.4
49+
uses: danielpalme/ReportGenerator-GitHub-Action@5.2.4
50+
if: github.event_name == 'push'
3751
with:
3852
reports: 'tests/SQLite.Tests/coverage.xml' # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
3953
targetdir: 'CoverageReport' # REQUIRED # The directory where the generated report should be saved.
@@ -59,11 +73,12 @@ jobs:
5973
enable_jekyll: true
6074

6175
- name: Package
76+
if: github.event_name == 'push'
6277
run: |
6378
make nuget
6479
6580
- uses: actions/upload-artifact@master
81+
if: github.event_name == 'push'
6682
with:
6783
name: Packages
6884
path: PackagesOut
69-

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,3 +265,6 @@ paket-files/
265265
# CodeRush
266266
.cr/
267267

268+
# NCrunch
269+
*.ncrunchsolution
270+
*.ncrunchproject

Directory.Build.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>1.8</VersionPrefix>
3+
<VersionPrefix>1.9</VersionPrefix>
44
<VersionSuffix></VersionSuffix>
55

66
<PackageIcon>Logo-low.png</PackageIcon>
@@ -12,6 +12,8 @@
1212
<Company>Krueger Systems, Inc.</Company>
1313

1414
<Deterministic>true</Deterministic>
15+
16+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1517
</PropertyGroup>
1618
<ItemGroup>
1719
<None Include="..\Logo-low.png" Pack="true" PackagePath=""/>

Makefile

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,7 @@ SRC=src/SQLite.cs src/SQLiteAsync.cs
33

44
PACKAGES_OUT=$(abspath PackagesOut)
55

6-
all: test nuget
7-
8-
test: tests/bin/Release/SQLite.Tests.dll tests/ApiDiff/bin/Release/ApiDiff.exe
9-
mono packages/NUnit.ConsoleRunner.3.10.0/tools/nunit3-console.exe tests/bin/Release/SQLite.Tests.dll --labels=On --trace=Info
10-
mono tests/ApiDiff/bin/Release/ApiDiff.exe
11-
12-
tests/bin/Release/SQLite.Tests.dll: tests/SQLite.Tests.csproj $(SRC)
13-
nuget restore SQLite.sln
14-
msbuild /p:Configuration=Release tests/SQLite.Tests.csproj
15-
16-
tests/ApiDiff/bin/Release/ApiDiff.exe: tests/ApiDiff/ApiDiff.csproj $(SRC)
17-
msbuild /p:Configuration=Release tests/ApiDiff/ApiDiff.csproj
6+
all: nuget
187

198
nuget: pclnuget basenuget sqlciphernuget staticnuget
209

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Use one of these packages:
1010
| [![NuGet Package](https://img.shields.io/nuget/v/sqlite-net-pcl.svg)](https://www.nuget.org/packages/sqlite-net-pcl) | [sqlite-net-pcl](https://www.nuget.org/packages/sqlite-net-pcl) | .NET Standard Library |
1111
| [![NuGet Package with Encryption](https://img.shields.io/nuget/v/sqlite-net-sqlcipher.svg)](https://www.nuget.org/packages/sqlite-net-sqlcipher) | [sqlite-net-sqlcipher](https://www.nuget.org/packages/sqlite-net-sqlcipher) | With Encryption Support |
1212
| [![NuGet Package using P/Invoke](https://img.shields.io/nuget/v/sqlite-net-static.svg)](https://www.nuget.org/packages/sqlite-net-static) | [sqlite-net-static](https://www.nuget.org/packages/sqlite-net-static) | Special version that uses P/Invokes to platform-provided sqlite3 |
13+
| [![NuGet Package without a SQLitePCLRaw bundle](https://img.shields.io/nuget/v/sqlite-net-base.svg)](https://www.nuget.org/packages/sqlite-net-base) | [sqlite-net-base](https://www.nuget.org/packages/sqlite-net-base) | without a SQLitePCLRaw bundle so you can choose your own provider |
1314

1415
SQLite-net is an open source, minimal library to allow .NET, .NET Core, and Mono applications to store data in
1516
[SQLite 3 databases](http://www.sqlite.org). It was first designed to work with [Xamarin.iOS](http://xamarin.com),
@@ -33,7 +34,7 @@ Install [sqlite-net-pcl](https://www.nuget.org/packages/sqlite-net-pcl) from NuG
3334

3435
## Source Installation
3536

36-
SQLite-net is all contained in 1 file (I know, so cool right?) and is easy to add to your project. Just add [SQLite.cs](https://github.com/praeclarum/sqlite-net/blob/master/src/SQLite.cs) to your project, and you're ready to start creating tables.
37+
SQLite-net is all contained in 1 file (I know, so cool right?) and is easy to add to your project. Just add [SQLite.cs](https://github.com/praeclarum/sqlite-net/blob/master/src/SQLite.cs) to your project, and you're ready to start creating tables. An asynchronous implementation can be found in [SQLiteAsync.cs](https://github.com/praeclarum/sqlite-net/blob/master/src/SQLiteAsync.cs).
3738

3839
## Please Contribute!
3940

@@ -62,6 +63,8 @@ public class Valuation
6263
public int StockId { get; set; }
6364
public DateTime Time { get; set; }
6465
public decimal Price { get; set; }
66+
[Ignore]
67+
public string IgnoreField { get; set; }
6568
}
6669
```
6770

SQLite.sln

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
99
EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLiteTestsiOS", "tests\SQLite.Tests.iOS\SQLiteTestsiOS.csproj", "{81850129-71C3-40C7-A48B-AA5D2C2E365E}"
13-
EndProject
1412
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite-net-std", "nuget\SQLite-net-std\SQLite-net-std.csproj", "{081D08D6-10F1-431B-88FE-469FD9FE898C}"
1513
EndProject
1614
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiDiff", "tests\ApiDiff\ApiDiff.csproj", "{1DEF735C-B973-4ED9-8446-7FFA6D0B410B}"
@@ -33,18 +31,6 @@ Global
3331
Debug|iPhone = Debug|iPhone
3432
EndGlobalSection
3533
GlobalSection(ProjectConfigurationPlatforms) = postSolution
36-
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
37-
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
38-
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Release|Any CPU.ActiveCfg = Release|iPhone
39-
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Release|Any CPU.Build.0 = Release|iPhone
40-
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
41-
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
42-
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Release|iPhone.ActiveCfg = Release|iPhone
43-
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Release|iPhone.Build.0 = Release|iPhone
44-
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
45-
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
46-
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|iPhone.ActiveCfg = Debug|iPhone
47-
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|iPhone.Build.0 = Debug|iPhone
4834
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4935
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|Any CPU.Build.0 = Debug|Any CPU
5036
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -119,7 +105,6 @@ Global
119105
{7CD60DAE-D505-4C2E-80B3-296556CE711E}.Debug|iPhone.Build.0 = Debug|Any CPU
120106
EndGlobalSection
121107
GlobalSection(NestedProjects) = preSolution
122-
{81850129-71C3-40C7-A48B-AA5D2C2E365E} = {FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF}
123108
{1DEF735C-B973-4ED9-8446-7FFA6D0B410B} = {FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF}
124109
{80B66A43-B358-4438-BF06-6351B86B121A} = {FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF}
125110
EndGlobalSection

global.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"sdk": {
3+
"version": "8.0.100"
4+
}
5+
}

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,19 @@
1010
It is meant to give you all the power of SQLite-net but with the freedom to choose your own provider.
1111
Please use the package sqlite-net-pcl if you have no idea what any of this means.
1212
</Description>
13-
14-
<Configurations>Release;Debug</Configurations>
1513
</PropertyGroup>
1614

1715
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
18-
<DebugSymbols>false</DebugSymbols>
19-
<DebugType></DebugType>
2016
<DefineConstants>USE_SQLITEPCL_RAW;NO_SQLITEPCL_RAW_BATTERIES;RELEASE</DefineConstants>
21-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2217
<DocumentationFile>bin\Release\netstandard2.0\SQLite-net.xml</DocumentationFile>
2318
</PropertyGroup>
2419
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2520
<DefineConstants>USE_SQLITEPCL_RAW;NO_SQLITEPCL_RAW_BATTERIES;DEBUG</DefineConstants>
26-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2721
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
2822
</PropertyGroup>
23+
2924
<ItemGroup>
30-
<PackageReference Include="SQLitePCLRaw.core" Version="2.0.4" />
25+
<PackageReference Include="SQLitePCLRaw.core" Version="2.1.2" />
3126
</ItemGroup>
3227
<ItemGroup>
3328
<Compile Include="..\..\src\SQLite.cs">

nuget/SQLite-net-sqlcipher/SQLite-net-sqlcipher.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,19 @@
1111
This enables secure access to the database with password (key) access.
1212
</Description>
1313
<PackageTags>sqlite-net;sqlite;database;orm;encryption;sqlcipher</PackageTags>
14-
<Configurations>Release;Debug</Configurations>
1514
</PropertyGroup>
1615

1716
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
18-
<DebugSymbols>false</DebugSymbols>
19-
<DebugType></DebugType>
2017
<DefineConstants>USE_SQLITEPCL_RAW;RELEASE</DefineConstants>
21-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2218
<DocumentationFile>bin\Release\netstandard2.0\SQLite-net.xml</DocumentationFile>
2319
</PropertyGroup>
2420
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2521
<DefineConstants>USE_SQLITEPCL_RAW;DEBUG</DefineConstants>
26-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2722
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
2823
</PropertyGroup>
24+
2925
<ItemGroup>
30-
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.0.4" />
26+
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.2" />
3127
</ItemGroup>
3228
<ItemGroup>
3329
<Compile Include="..\..\src\SQLite.cs">

nuget/SQLite-net-static/SQLite-net-static.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,17 @@
1010
This version uses P/Invokes to the "sqlite3" native library provided by the operating system.
1111
This works on Xamarin.iOS, Xamarin.Mac, Wilderness Labs' Meadow, and any other platform that has a "sqlite3" library in the path.
1212
</Description>
13-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
14-
<Configurations>Release;Debug</Configurations>
1513
</PropertyGroup>
1614

1715
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
18-
<DebugSymbols>false</DebugSymbols>
19-
<DebugType></DebugType>
2016
<DefineConstants>RELEASE</DefineConstants>
2117
<DocumentationFile>bin\Release\netstandard2.0\SQLite-net.xml</DocumentationFile>
2218
</PropertyGroup>
2319
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2420
<DefineConstants>DEBUG</DefineConstants>
2521
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
2622
</PropertyGroup>
23+
2724
<ItemGroup>
2825
<Compile Include="..\..\src\SQLite.cs">
2926
<Link>SQLite.cs</Link>

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,20 @@
88
<Description>
99
SQLite-net is an open source and light weight library providing easy SQLite database storage for .NET, Mono, and Xamarin applications.
1010
This version uses SQLitePCLRaw to provide platform independent versions of SQLite.
11-
1211
</Description>
13-
14-
<Configurations>Release;Debug</Configurations>
1512
</PropertyGroup>
1613

1714
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
18-
<DebugSymbols>false</DebugSymbols>
19-
<DebugType></DebugType>
2015
<DefineConstants>USE_SQLITEPCL_RAW;RELEASE</DefineConstants>
21-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2216
<DocumentationFile>bin\Release\netstandard2.0\SQLite-net.xml</DocumentationFile>
2317
</PropertyGroup>
2418
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2519
<DefineConstants>USE_SQLITEPCL_RAW;DEBUG</DefineConstants>
26-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2720
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
2821
</PropertyGroup>
22+
2923
<ItemGroup>
30-
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.0.4" />
24+
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.2" />
3125
</ItemGroup>
3226
<ItemGroup>
3327
<Compile Include="..\..\src\SQLite.cs">

0 commit comments

Comments
 (0)