Skip to content

Commit b62b90a

Browse files
sjlombardosjlombardo
committed
Merge tag 'v1.8.116'
2 parents 84f602a + 0b23275 commit b62b90a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2482
-1455
lines changed

‎.github/workflows/build.yml

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: Build
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
410

511
jobs:
612
build:
@@ -11,12 +17,47 @@ jobs:
1117

1218
- uses: actions/checkout@v1
1319

20+
- name: Update Versions
21+
env:
22+
VERSION_BUILD: ${{github.run_number}}
23+
run: |
24+
sed -i bak "s:</VersionPrefix>:.$VERSION_BUILD</VersionPrefix>:g" Directory.Build.props
25+
1426
- name: Restore NuGets
1527
run: nuget restore SQLite.sln
16-
17-
- name: Build and Test
18-
run: make test
1928

29+
- name: Build and Test
30+
run: |
31+
set -e
32+
cd tests/SQLite.Tests
33+
dotnet test /p:AltCover=true /p:AltCoverForce=true "/p:AltCoverTypeFilter=SQLite.Tests.*"
34+
35+
- name: Generate Code Coverage Report
36+
uses: danielpalme/ReportGenerator-GitHub-Action@4.8.4
37+
with:
38+
reports: 'tests/SQLite.Tests/coverage.xml' # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
39+
targetdir: 'CoverageReport' # REQUIRED # The directory where the generated report should be saved.
40+
reporttypes: 'HtmlInline;Cobertura' # The output formats and scope (separated by semicolon) Values: Badges, Clover, Cobertura, CsvSummary, Html, HtmlChart, HtmlInline, HtmlInline_AzurePipelines, HtmlInline_AzurePipelines_Dark, HtmlSummary, JsonSummary, Latex, LatexSummary, lcov, MHtml, PngChart, SonarQube, TeamCitySummary, TextSummary, Xml, XmlSummary
41+
sourcedirs: '' # Optional directories which contain the corresponding source code (separated by semicolon). The source directories are used if coverage report contains classes without path information.
42+
historydir: '' # Optional directory for storing persistent coverage information. Can be used in future reports to show coverage evolution.
43+
plugins: '' # Optional plugin files for custom reports or custom history storage (separated by semicolon).
44+
assemblyfilters: '+SQLite.Tests;-NUnit3.TestAdapter' # Optional list of assemblies that should be included or excluded in the report. Exclusion filters take precedence over inclusion filters. Wildcards are allowed.
45+
classfilters: '+*;-SQLite.Tests.*' # Optional list of classes that should be included or excluded in the report. Exclusion filters take precedence over inclusion filters. Wildcards are allowed.
46+
filefilters: '+*' # Optional list of files that should be included or excluded in the report. Exclusion filters take precedence over inclusion filters. Wildcards are allowed.
47+
verbosity: 'Info' # The verbosity level of the log messages. Values: Verbose, Info, Warning, Error, Off
48+
title: '' # Optional title.
49+
tag: '${{ github.run_number }}_${{ github.run_id }}' # Optional tag or build version.
50+
customSettings: '' # Optional custom settings (separated by semicolon). See: https://github.com/danielpalme/ReportGenerator/wiki/Settings.
51+
52+
- name: Deploy Code Coverage Report
53+
uses: peaceiris/actions-gh-pages@v3
54+
if: github.event_name == 'push'
55+
with:
56+
github_token: ${{ secrets.GITHUB_TOKEN }}
57+
publish_dir: CoverageReport
58+
destination_dir: coverage
59+
enable_jekyll: true
60+
2061
- name: Package
2162
run: |
2263
make nuget

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
coverage.*
2+
CoverageReport
13
.DS_Store
24
.dropbox.attr
35
test-results

‎Directory.Build.props

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>1.7</VersionPrefix>
4-
<VersionSuffix>beta</VersionSuffix>
3+
<VersionPrefix>1.8</VersionPrefix>
4+
<VersionSuffix></VersionSuffix>
55

6-
<PackageIconUrl>https://raw.githubusercontent.com/praeclarum/sqlite-net/master/nuget/Logo-low.png</PackageIconUrl>
6+
<PackageIcon>Logo-low.png</PackageIcon>
77
<PackageProjectUrl>https://github.com/praeclarum/sqlite-net</PackageProjectUrl>
88
<RepositoryUrl>https://github.com/praeclarum/sqlite-net.git</RepositoryUrl>
99
<PackageTags>sqlite-net;sqlite;database;orm</PackageTags>
@@ -13,4 +13,7 @@
1313

1414
<Deterministic>true</Deterministic>
1515
</PropertyGroup>
16+
<ItemGroup>
17+
<None Include="..\Logo-low.png" Pack="true" PackagePath=""/>
18+
</ItemGroup>
1619
</Project>

‎Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ tests/bin/Release/SQLite.Tests.dll: tests/SQLite.Tests.csproj $(SRC)
1616
tests/ApiDiff/bin/Release/ApiDiff.exe: tests/ApiDiff/ApiDiff.csproj $(SRC)
1717
msbuild /p:Configuration=Release tests/ApiDiff/ApiDiff.csproj
1818

19-
nuget: pclnuget basenuget sqlciphernuget
19+
nuget: pclnuget basenuget sqlciphernuget staticnuget
2020

2121
pclnuget: nuget/SQLite-net-std/SQLite-net-std.csproj $(SRC)
2222
dotnet pack -c Release -o $(PACKAGES_OUT) $<
@@ -26,3 +26,9 @@ basenuget: nuget/SQLite-net-base/SQLite-net-base.csproj $(SRC)
2626

2727
sqlciphernuget: nuget/SQLite-net-sqlcipher/SQLite-net-sqlcipher.csproj $(SRC)
2828
dotnet pack -c Release -o $(PACKAGES_OUT) $<
29+
30+
staticnuget: nuget/SQLite-net-static/SQLite-net-static.csproj $(SRC)
31+
dotnet pack -c Release -o $(PACKAGES_OUT) $<
32+
33+
codecoverage:
34+
cd tests/SQLite.Tests && dotnet test /p:AltCover=true /p:AltCoverForce=true "/p:AltCoverTypeFilter=SQLite.Tests.*" && reportgenerator -reports:coverage.xml -targetdir:./CoverageReport

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11

22
# SQLite-net
33

4-
[![Build Status](https://app.bitrise.io/app/bf752c26c31aec6c/status.svg?token=puU-yHhMNdAwJUusm9swlA&branch=master)](https://app.bitrise.io/app/bf752c26c31aec6c)
4+
[[GitHub Action](https://github.com/praeclarum/sqlite-net/actions)] [[Code Coverage Report](https://praeclarum.org/sqlite-net/coverage/)]
55

66
Use one of these packages:
77

88
| Version | Package | Description |
99
| ------- | ------- | ----------- |
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 |
12+
| [![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 |
1213

1314
SQLite-net is an open source, minimal library to allow .NET, .NET Core, and Mono applications to store data in
1415
[SQLite 3 databases](http://www.sqlite.org). It was first designed to work with [Xamarin.iOS](http://xamarin.com),

‎SQLite.sln

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11

22
Microsoft Visual Studio Solution File, Format Version 11.00
33
# Visual Studio 2010
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Tests", "tests\SQLite.Tests.csproj", "{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}"
5-
EndProject
64
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A0E59A10-7BD0-4554-B133-66FA850159BE}"
75
ProjectSection(SolutionItems) = preProject
8-
sqlite-net-pcl.nuspec = sqlite-net-pcl.nuspec
9-
sqlite-net.nuspec = sqlite-net.nuspec
106
Makefile = Makefile
11-
sqlite-net-base.nuspec = sqlite-net-base.nuspec
12-
sqlite-net-sqlcipher.nuspec = sqlite-net-sqlcipher.nuspec
137
README.md = README.md
148
EndProjectSection
159
EndProject
@@ -25,6 +19,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite-net-base", "nuget\SQ
2519
EndProject
2620
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite-net-sqlcipher", "nuget\SQLite-net-sqlcipher\SQLite-net-sqlcipher.csproj", "{59DB03EF-E28D-431E-9058-74AF316800EE}"
2721
EndProject
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Tests", "tests\SQLite.Tests\SQLite.Tests.csproj", "{80B66A43-B358-4438-BF06-6351B86B121A}"
23+
EndProject
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite-net-static", "nuget\SQLite-net-static\SQLite-net-static.csproj", "{7CD60DAE-D505-4C2E-80B3-296556CE711E}"
25+
EndProject
2826
Global
2927
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3028
Debug|Any CPU = Debug|Any CPU
@@ -35,18 +33,6 @@ Global
3533
Debug|iPhone = Debug|iPhone
3634
EndGlobalSection
3735
GlobalSection(ProjectConfigurationPlatforms) = postSolution
38-
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39-
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
40-
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
41-
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
43-
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
44-
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Release|iPhone.ActiveCfg = Release|Any CPU
45-
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Release|iPhone.Build.0 = Release|Any CPU
46-
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
47-
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
48-
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
49-
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Debug|iPhone.Build.0 = Debug|Any CPU
5036
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
5137
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
5238
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Release|Any CPU.ActiveCfg = Release|iPhone
@@ -107,11 +93,35 @@ Global
10793
{59DB03EF-E28D-431E-9058-74AF316800EE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
10894
{59DB03EF-E28D-431E-9058-74AF316800EE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
10995
{59DB03EF-E28D-431E-9058-74AF316800EE}.Debug|iPhone.Build.0 = Debug|Any CPU
96+
{80B66A43-B358-4438-BF06-6351B86B121A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
97+
{80B66A43-B358-4438-BF06-6351B86B121A}.Debug|Any CPU.Build.0 = Debug|Any CPU
98+
{80B66A43-B358-4438-BF06-6351B86B121A}.Release|Any CPU.ActiveCfg = Release|Any CPU
99+
{80B66A43-B358-4438-BF06-6351B86B121A}.Release|Any CPU.Build.0 = Release|Any CPU
100+
{80B66A43-B358-4438-BF06-6351B86B121A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
101+
{80B66A43-B358-4438-BF06-6351B86B121A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
102+
{80B66A43-B358-4438-BF06-6351B86B121A}.Release|iPhone.ActiveCfg = Release|Any CPU
103+
{80B66A43-B358-4438-BF06-6351B86B121A}.Release|iPhone.Build.0 = Release|Any CPU
104+
{80B66A43-B358-4438-BF06-6351B86B121A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
105+
{80B66A43-B358-4438-BF06-6351B86B121A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
106+
{80B66A43-B358-4438-BF06-6351B86B121A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
107+
{80B66A43-B358-4438-BF06-6351B86B121A}.Debug|iPhone.Build.0 = Debug|Any CPU
108+
{7CD60DAE-D505-4C2E-80B3-296556CE711E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
109+
{7CD60DAE-D505-4C2E-80B3-296556CE711E}.Debug|Any CPU.Build.0 = Debug|Any CPU
110+
{7CD60DAE-D505-4C2E-80B3-296556CE711E}.Release|Any CPU.ActiveCfg = Release|Any CPU
111+
{7CD60DAE-D505-4C2E-80B3-296556CE711E}.Release|Any CPU.Build.0 = Release|Any CPU
112+
{7CD60DAE-D505-4C2E-80B3-296556CE711E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
113+
{7CD60DAE-D505-4C2E-80B3-296556CE711E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
114+
{7CD60DAE-D505-4C2E-80B3-296556CE711E}.Release|iPhone.ActiveCfg = Release|Any CPU
115+
{7CD60DAE-D505-4C2E-80B3-296556CE711E}.Release|iPhone.Build.0 = Release|Any CPU
116+
{7CD60DAE-D505-4C2E-80B3-296556CE711E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
117+
{7CD60DAE-D505-4C2E-80B3-296556CE711E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
118+
{7CD60DAE-D505-4C2E-80B3-296556CE711E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
119+
{7CD60DAE-D505-4C2E-80B3-296556CE711E}.Debug|iPhone.Build.0 = Debug|Any CPU
110120
EndGlobalSection
111121
GlobalSection(NestedProjects) = preSolution
112-
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2} = {FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF}
113122
{81850129-71C3-40C7-A48B-AA5D2C2E365E} = {FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF}
114123
{1DEF735C-B973-4ED9-8446-7FFA6D0B410B} = {FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF}
124+
{80B66A43-B358-4438-BF06-6351B86B121A} = {FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF}
115125
EndGlobalSection
116126
GlobalSection(MonoDevelopProperties) = preSolution
117127
StartupItem = tests\SQLite.Tests.csproj

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
Please use the package sqlite-net-pcl if you have no idea what any of this means.
1212
</Description>
1313

14+
<Configurations>Release;Debug</Configurations>
1415
</PropertyGroup>
1516

1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -26,7 +27,7 @@
2627
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
2728
</PropertyGroup>
2829
<ItemGroup>
29-
<PackageReference Include="SQLitePCLRaw.core" Version="2.0.3" />
30+
<PackageReference Include="SQLitePCLRaw.core" Version="2.0.4" />
3031
</ItemGroup>
3132
<ItemGroup>
3233
<Compile Include="..\..\src\SQLite.cs">

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
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>
1415
</PropertyGroup>
1516

1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -26,7 +27,7 @@
2627
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
2728
</PropertyGroup>
2829
<ItemGroup>
29-
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.0.3" />
30+
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.0.4" />
3031
</ItemGroup>
3132
<ItemGroup>
3233
<Compile Include="..\..\src\SQLite.cs">

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<AssemblyName>SQLite-net</AssemblyName>
6+
<PackageId>sqlite-net-static</PackageId>
7+
<AssemblyTitle>SQLite-net .NET Standard P/Invoke Library</AssemblyTitle>
8+
<Description>
9+
SQLite-net is an open source and light weight library providing easy SQLite database storage for .NET, Mono, and Xamarin applications.
10+
This version uses P/Invokes to the "sqlite3" native library provided by the operating system.
11+
This works on Xamarin.iOS, Xamarin.Mac, Wilderness Labs' Meadow, and any other platform that has a "sqlite3" library in the path.
12+
</Description>
13+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
14+
<Configurations>Release;Debug</Configurations>
15+
</PropertyGroup>
16+
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
18+
<DebugSymbols>false</DebugSymbols>
19+
<DebugType></DebugType>
20+
<DefineConstants>RELEASE</DefineConstants>
21+
<DocumentationFile>bin\Release\netstandard2.0\SQLite-net.xml</DocumentationFile>
22+
</PropertyGroup>
23+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
24+
<DefineConstants>DEBUG</DefineConstants>
25+
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
26+
</PropertyGroup>
27+
<ItemGroup>
28+
<Compile Include="..\..\src\SQLite.cs">
29+
<Link>SQLite.cs</Link>
30+
</Compile>
31+
<Compile Include="..\..\src\SQLiteAsync.cs">
32+
<Link>SQLiteAsync.cs</Link>
33+
</Compile>
34+
<None Include="..\..\LICENSE.txt" Pack="true" PackagePath="" />
35+
</ItemGroup>
36+
</Project>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
</Description>
1313

14+
<Configurations>Release;Debug</Configurations>
1415
</PropertyGroup>
1516

1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -26,7 +27,7 @@
2627
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
2728
</PropertyGroup>
2829
<ItemGroup>
29-
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.0.3" />
30+
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.0.4" />
3031
</ItemGroup>
3132
<ItemGroup>
3233
<Compile Include="..\..\src\SQLite.cs">

0 commit comments

Comments
 (0)