Skip to content

Commit c9ae5d2

Browse files
gtbXgtbX
committed
Merge branch 'master' into custom-datetime
2 parents d29894e + a4bace8 commit c9ae5d2

24 files changed

+198
-414
lines changed

‎.github/FUNDING.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# These are supported funding model platforms
2+
3+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: praeclarum
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
otechie: # Replace with a single Otechie username
12+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

‎.github/workflows/build.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Build
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: macOS-10.14
9+
10+
steps:
11+
12+
- uses: actions/checkout@v1
13+
14+
- name: Restore NuGets
15+
run: nuget restore SQLite.sln
16+
17+
- name: Build and Test
18+
run: make test
19+
20+
- name: Package
21+
run: |
22+
make nuget
23+
24+
- uses: actions/upload-artifact@master
25+
with:
26+
name: Packages
27+
path: PackagesOut
28+

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
.dropbox.attr
33
test-results
44

5+
/PackagesOut
6+
57
## Ignore Visual Studio temporary files, build results, and
68
## files generated by popular Visual Studio add-ons.
79

‎Directory.Build.props‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
<PropertyGroup>
3+
<VersionPrefix>1.7</VersionPrefix>
4+
<VersionSuffix>beta</VersionSuffix>
5+
6+
<PackageIconUrl>https://raw.githubusercontent.com/praeclarum/sqlite-net/master/nuget/Logo-low.png</PackageIconUrl>
7+
<PackageProjectUrl>https://github.com/praeclarum/sqlite-net</PackageProjectUrl>
8+
<RepositoryUrl>https://github.com/praeclarum/sqlite-net.git</RepositoryUrl>
9+
<PackageTags>sqlite-net;sqlite;database;orm</PackageTags>
10+
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
11+
12+
<Company>Krueger Systems, Inc.</Company>
13+
14+
<Deterministic>true</Deterministic>
15+
</PropertyGroup>
16+
</Project>

‎LICENSE‎ renamed to ‎LICENSE.txt‎

File renamed without changes.

‎Makefile‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,28 @@
11

22
SRC=src/SQLite.cs src/SQLiteAsync.cs
33

4-
all: test nuget
5-
6-
test: tests/bin/Debug/SQLite.Tests.dll tests/ApiDiff/bin/Debug/ApiDiff.exe
7-
nunit-console tests/bin/Debug/SQLite.Tests.dll
8-
mono tests/ApiDiff/bin/Debug/ApiDiff.exe
9-
10-
tests/bin/Debug/SQLite.Tests.dll: tests/SQLite.Tests.csproj $(SRC)
11-
msbuild tests/SQLite.Tests.csproj
4+
PACKAGES_OUT=$(abspath PackagesOut)
125

13-
tests/ApiDiff/bin/Debug/ApiDiff.exe: tests/ApiDiff/ApiDiff.csproj $(SRC)
14-
msbuild tests/ApiDiff/ApiDiff.csproj
6+
all: test nuget
157

16-
nuget: srcnuget pclnuget basenuget sqlciphernuget
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
1711

18-
packages: nuget/SQLite-net/packages.config
12+
tests/bin/Release/SQLite.Tests.dll: tests/SQLite.Tests.csproj $(SRC)
1913
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
2018

21-
srcnuget: sqlite-net.nuspec $(SRC)
22-
nuget pack sqlite-net.nuspec
19+
nuget: pclnuget basenuget sqlciphernuget
2320

24-
pclnuget: sqlite-net-pcl.nuspec packages $(SRC)
25-
msbuild "/p:Configuration=Release" nuget/SQLite-net/SQLite-net.csproj
26-
msbuild "/p:Configuration=Release" nuget/SQLite-net-std/SQLite-net-std.csproj
27-
nuget pack sqlite-net-pcl.nuspec
21+
pclnuget: nuget/SQLite-net-std/SQLite-net-std.csproj $(SRC)
22+
dotnet pack -c Release -o $(PACKAGES_OUT) $<
2823

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
24+
basenuget: nuget/SQLite-net-base/SQLite-net-base.csproj $(SRC)
25+
dotnet pack -c Release -o $(PACKAGES_OUT) $<
3226

33-
sqlciphernuget: sqlite-net-sqlcipher.nuspec packages $(SRC)
34-
msbuild "/p:Configuration=Release" nuget/SQLite-net-sqlcipher/SQLite-net-sqlcipher.csproj
35-
nuget pack sqlite-net-sqlcipher.nuspec
27+
sqlciphernuget: nuget/SQLite-net-sqlcipher/SQLite-net-sqlcipher.csproj $(SRC)
28+
dotnet pack -c Release -o $(PACKAGES_OUT) $<

‎SQLite.sln‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
README.md = README.md
1414
EndProjectSection
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite-net", "nuget\SQLite-net\SQLite-net.csproj", "{7F946494-8EE0-432B-8A87-98961143D5C1}"
17-
EndProject
1816
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF}"
1917
EndProject
2018
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLiteTestsiOS", "tests\SQLite.Tests.iOS\SQLiteTestsiOS.csproj", "{81850129-71C3-40C7-A48B-AA5D2C2E365E}"
@@ -49,18 +47,6 @@ Global
4947
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
5048
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
5149
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2}.Debug|iPhone.Build.0 = Debug|Any CPU
52-
{7F946494-8EE0-432B-8A87-98961143D5C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53-
{7F946494-8EE0-432B-8A87-98961143D5C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
54-
{7F946494-8EE0-432B-8A87-98961143D5C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
55-
{7F946494-8EE0-432B-8A87-98961143D5C1}.Release|Any CPU.Build.0 = Release|Any CPU
56-
{7F946494-8EE0-432B-8A87-98961143D5C1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
57-
{7F946494-8EE0-432B-8A87-98961143D5C1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
58-
{7F946494-8EE0-432B-8A87-98961143D5C1}.Release|iPhone.ActiveCfg = Release|Any CPU
59-
{7F946494-8EE0-432B-8A87-98961143D5C1}.Release|iPhone.Build.0 = Release|Any CPU
60-
{7F946494-8EE0-432B-8A87-98961143D5C1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
61-
{7F946494-8EE0-432B-8A87-98961143D5C1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
62-
{7F946494-8EE0-432B-8A87-98961143D5C1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
63-
{7F946494-8EE0-432B-8A87-98961143D5C1}.Debug|iPhone.Build.0 = Debug|Any CPU
6450
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
6551
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
6652
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Release|Any CPU.ActiveCfg = Release|iPhone

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

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,40 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.1</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<AssemblyName>SQLite-net</AssemblyName>
6-
<Version>1.0.0</Version>
7-
<AssemblyTitle>SQLite-net Official .NET Standard Base Library</AssemblyTitle>
8-
<Description>Light weight library providing easy SQLite database storage</Description>
9-
<Company>Krueger Systems, Inc.</Company>
10-
</PropertyGroup>
6+
<PackageId>sqlite-net-base</PackageId>
7+
<AssemblyTitle>SQLite-net .NET Standard Base Library</AssemblyTitle>
8+
<Description>
9+
This is a special version of SQLite-net-pcl that does not include a SQLitePCLRaw bundle.
10+
It is meant to give you all the power of SQLite-net but with the freedom to choose your own provider.
11+
Please use the package sqlite-net-pcl if you have no idea what any of this means.
12+
</Description>
1113

12-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
13-
<DefineConstants>USE_SQLITEPCL_RAW;NO_SQLITEPCL_RAW_BATTERIES;DEBUG;NETSTANDARD1_1</DefineConstants>
14-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
15-
<DocumentationFile>bin\Debug\netstandard1.1\SQLite-net.xml</DocumentationFile>
1614
</PropertyGroup>
15+
1716
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
1817
<DebugSymbols>false</DebugSymbols>
1918
<DebugType></DebugType>
20-
<DefineConstants>USE_SQLITEPCL_RAW;NO_SQLITEPCL_RAW_BATTERIES;RELEASE;NETSTANDARD1_1</DefineConstants>
19+
<DefineConstants>USE_SQLITEPCL_RAW;NO_SQLITEPCL_RAW_BATTERIES;RELEASE</DefineConstants>
2120
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
22-
<DocumentationFile>bin\Release\netstandard1.1\SQLite-net.xml</DocumentationFile>
21+
<DocumentationFile>bin\Release\netstandard2.0\SQLite-net.xml</DocumentationFile>
2322
</PropertyGroup>
23+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
24+
<DefineConstants>USE_SQLITEPCL_RAW;NO_SQLITEPCL_RAW_BATTERIES;DEBUG</DefineConstants>
25+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
26+
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
27+
</PropertyGroup>
28+
<ItemGroup>
29+
<PackageReference Include="SQLitePCLRaw.core" Version="2.0.1" />
30+
</ItemGroup>
2431
<ItemGroup>
2532
<Compile Include="..\..\src\SQLite.cs">
2633
<Link>SQLite.cs</Link>
2734
</Compile>
2835
<Compile Include="..\..\src\SQLiteAsync.cs">
2936
<Link>SQLiteAsync.cs</Link>
3037
</Compile>
31-
</ItemGroup>
32-
<ItemGroup>
33-
<PackageReference Include="SQLitePCLRaw.core" Version="1.1.13" />
34-
<PackageReference Include="NuGet.Build.Packaging" Version="0.2.2" />
38+
<None Include="..\..\LICENSE.txt" Pack="true" PackagePath="" />
3539
</ItemGroup>
3640
</Project>

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,32 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.1</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<AssemblyName>SQLite-net</AssemblyName>
6-
<Version>1.0.0</Version>
7-
<AssemblyTitle>SQLite-net Official SQLCipher .NET Standard Library</AssemblyTitle>
8-
<Description>Light weight library providing easy SQLite database storage</Description>
9-
<Company>Krueger Systems, Inc.</Company>
6+
<PackageId>sqlite-net-sqlcipher</PackageId>
7+
<AssemblyTitle>SQLite-net SQLCipher .NET Standard 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 SQLitePCLRaw to provide platform independent versions of SQLite with the SQLCipher extension.
11+
This enables secure access to the database with password (key) access.
12+
</Description>
13+
<PackageTags>sqlite-net;sqlite;database;orm;encryption;sqlcipher</PackageTags>
1014
</PropertyGroup>
1115

1216
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
1317
<DebugSymbols>false</DebugSymbols>
1418
<DebugType></DebugType>
15-
<DefineConstants>USE_SQLITEPCL_RAW;RELEASE;NETSTANDARD1_1</DefineConstants>
19+
<DefineConstants>USE_SQLITEPCL_RAW;RELEASE</DefineConstants>
1620
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
17-
<DocumentationFile>bin\Release\netstandard1.1\SQLite-net.xml</DocumentationFile>
21+
<DocumentationFile>bin\Release\netstandard2.0\SQLite-net.xml</DocumentationFile>
1822
</PropertyGroup>
1923
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20-
<DefineConstants>USE_SQLITEPCL_RAW;DEBUG;NETSTANDARD1_1</DefineConstants>
24+
<DefineConstants>USE_SQLITEPCL_RAW;DEBUG</DefineConstants>
2125
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
22-
<DocumentationFile>bin\Debug\netstandard1.1\SQLite-net.xml</DocumentationFile>
26+
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
2327
</PropertyGroup>
2428
<ItemGroup>
25-
<PackageReference Include="SQLitePCLRaw.bundle_sqlcipher" Version="1.1.13" />
26-
<PackageReference Include="NuGet.Build.Packaging" Version="0.2.2" />
29+
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.0.1" />
2730
</ItemGroup>
2831
<ItemGroup>
2932
<Compile Include="..\..\src\SQLite.cs">
@@ -32,5 +35,6 @@
3235
<Compile Include="..\..\src\SQLiteAsync.cs">
3336
<Link>SQLiteAsync.cs</Link>
3437
</Compile>
38+
<None Include="..\..\LICENSE.txt" Pack="true" PackagePath="" />
3539
</ItemGroup>
3640
</Project>

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,32 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.1</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<AssemblyName>SQLite-net</AssemblyName>
6-
<Version>1.0.0</Version>
6+
<PackageId>sqlite-net-pcl</PackageId>
77
<AssemblyTitle>SQLite-net Official .NET Standard Library</AssemblyTitle>
8-
<Description>Light weight library providing easy SQLite database storage</Description>
9-
<Company>Krueger Systems, Inc.</Company>
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 SQLitePCLRaw to provide platform independent versions of SQLite.
11+
12+
</Description>
13+
1014
</PropertyGroup>
1115

1216
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
1317
<DebugSymbols>false</DebugSymbols>
1418
<DebugType></DebugType>
15-
<DefineConstants>USE_SQLITEPCL_RAW;RELEASE;NETSTANDARD1_1</DefineConstants>
19+
<DefineConstants>USE_SQLITEPCL_RAW;RELEASE</DefineConstants>
1620
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
17-
<DocumentationFile>bin\Release\netstandard1.1\SQLite-net.xml</DocumentationFile>
21+
<DocumentationFile>bin\Release\netstandard2.0\SQLite-net.xml</DocumentationFile>
1822
</PropertyGroup>
1923
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20-
<DefineConstants>USE_SQLITEPCL_RAW;DEBUG;NETSTANDARD1_1</DefineConstants>
24+
<DefineConstants>USE_SQLITEPCL_RAW;DEBUG</DefineConstants>
2125
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
22-
<DocumentationFile>bin\Debug\netstandard1.1\SQLite-net.xml</DocumentationFile>
26+
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
2327
</PropertyGroup>
2428
<ItemGroup>
25-
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="1.1.13" />
26-
<PackageReference Include="NuGet.Build.Packaging" Version="0.2.2" />
29+
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.0.1" />
2730
</ItemGroup>
2831
<ItemGroup>
2932
<Compile Include="..\..\src\SQLite.cs">
@@ -32,5 +35,6 @@
3235
<Compile Include="..\..\src\SQLiteAsync.cs">
3336
<Link>SQLiteAsync.cs</Link>
3437
</Compile>
38+
<None Include="..\..\LICENSE.txt" Pack="true" PackagePath="" />
3539
</ItemGroup>
3640
</Project>

0 commit comments

Comments
 (0)