Skip to content

Commit 7d6359d

Browse files
praeclarumpraeclarum
committed
Convert to .NET Standard 2.0 and update SQLitePCLRaw to 2.0
1 parent 77dee63 commit 7d6359d

File tree

11 files changed

+66
-179
lines changed

11 files changed

+66
-179
lines changed

‎Makefile‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,29 @@ SRC=src/SQLite.cs src/SQLiteAsync.cs
44
all: test nuget
55

66
test: tests/bin/Release/SQLite.Tests.dll tests/ApiDiff/bin/Release/ApiDiff.exe
7-
mono packages/NUnit.ConsoleRunner.3.10.0/tools/nunit3-console.exe tests/bin/Release/SQLite.Tests.dll
7+
mono packages/NUnit.ConsoleRunner.3.10.0/tools/nunit3-console.exe tests/bin/Release/SQLite.Tests.dll --labels=On --trace=Info
88
mono tests/ApiDiff/bin/Release/ApiDiff.exe
99

1010
tests/bin/Release/SQLite.Tests.dll: tests/SQLite.Tests.csproj $(SRC)
11+
nuget restore SQLite.sln
1112
msbuild /p:Configuration=Release tests/SQLite.Tests.csproj
1213

1314
tests/ApiDiff/bin/Release/ApiDiff.exe: tests/ApiDiff/ApiDiff.csproj $(SRC)
1415
msbuild /p:Configuration=Release tests/ApiDiff/ApiDiff.csproj
1516

1617
nuget: srcnuget pclnuget basenuget sqlciphernuget
1718

18-
packages: nuget/SQLite-net/packages.config
19-
nuget restore SQLite.sln
20-
2119
srcnuget: sqlite-net.nuspec $(SRC)
2220
nuget pack sqlite-net.nuspec
2321

24-
pclnuget: sqlite-net-pcl.nuspec packages $(SRC)
25-
msbuild "/p:Configuration=Release" nuget/SQLite-net/SQLite-net.csproj
22+
pclnuget: sqlite-net-pcl.nuspec $(SRC)
2623
msbuild "/p:Configuration=Release" nuget/SQLite-net-std/SQLite-net-std.csproj
2724
nuget pack sqlite-net-pcl.nuspec
2825

29-
basenuget: sqlite-net-pcl.nuspec packages $(SRC)
26+
basenuget: sqlite-net-pcl.nuspec $(SRC)
3027
msbuild "/p:Configuration=Release" nuget/SQLite-net-base/SQLite-net-base.csproj
3128
nuget pack sqlite-net-base.nuspec
3229

33-
sqlciphernuget: sqlite-net-sqlcipher.nuspec packages $(SRC)
30+
sqlciphernuget: sqlite-net-sqlcipher.nuspec $(SRC)
3431
msbuild "/p:Configuration=Release" nuget/SQLite-net-sqlcipher/SQLite-net-sqlcipher.csproj
3532
nuget pack sqlite-net-sqlcipher.nuspec

‎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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.1</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<AssemblyName>SQLite-net</AssemblyName>
66
<Version>1.0.0</Version>
77
<AssemblyTitle>SQLite-net Official .NET Standard Base Library</AssemblyTitle>
@@ -12,14 +12,14 @@
1212
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1313
<DefineConstants>USE_SQLITEPCL_RAW;NO_SQLITEPCL_RAW_BATTERIES;DEBUG;NETSTANDARD1_1</DefineConstants>
1414
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
15-
<DocumentationFile>bin\Debug\netstandard1.1\SQLite-net.xml</DocumentationFile>
15+
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
1616
</PropertyGroup>
1717
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
1818
<DebugSymbols>false</DebugSymbols>
1919
<DebugType></DebugType>
2020
<DefineConstants>USE_SQLITEPCL_RAW;NO_SQLITEPCL_RAW_BATTERIES;RELEASE;NETSTANDARD1_1</DefineConstants>
2121
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
22-
<DocumentationFile>bin\Release\netstandard1.1\SQLite-net.xml</DocumentationFile>
22+
<DocumentationFile>bin\Release\netstandard2.0\SQLite-net.xml</DocumentationFile>
2323
</PropertyGroup>
2424
<ItemGroup>
2525
<Compile Include="..\..\src\SQLite.cs">
@@ -30,7 +30,7 @@
3030
</Compile>
3131
</ItemGroup>
3232
<ItemGroup>
33-
<PackageReference Include="SQLitePCLRaw.core" Version="1.1.13" />
33+
<PackageReference Include="SQLitePCLRaw.core" Version="2.0.1" />
3434
<PackageReference Include="NuGet.Build.Packaging" Version="0.2.2" />
3535
</ItemGroup>
3636
</Project>

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

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.1</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<AssemblyName>SQLite-net</AssemblyName>
66
<Version>1.0.0</Version>
77
<AssemblyTitle>SQLite-net Official SQLCipher .NET Standard Library</AssemblyTitle>
@@ -14,15 +14,15 @@
1414
<DebugType></DebugType>
1515
<DefineConstants>USE_SQLITEPCL_RAW;RELEASE;NETSTANDARD1_1</DefineConstants>
1616
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
17-
<DocumentationFile>bin\Release\netstandard1.1\SQLite-net.xml</DocumentationFile>
17+
<DocumentationFile>bin\Release\netstandard2.0\SQLite-net.xml</DocumentationFile>
1818
</PropertyGroup>
1919
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2020
<DefineConstants>USE_SQLITEPCL_RAW;DEBUG;NETSTANDARD1_1</DefineConstants>
2121
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
22-
<DocumentationFile>bin\Debug\netstandard1.1\SQLite-net.xml</DocumentationFile>
22+
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
2323
</PropertyGroup>
2424
<ItemGroup>
25-
<PackageReference Include="SQLitePCLRaw.bundle_sqlcipher" Version="1.1.13" />
25+
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.0.1" />
2626
<PackageReference Include="NuGet.Build.Packaging" Version="0.2.2" />
2727
</ItemGroup>
2828
<ItemGroup>

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

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.1</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<AssemblyName>SQLite-net</AssemblyName>
66
<Version>1.0.0</Version>
77
<AssemblyTitle>SQLite-net Official .NET Standard Library</AssemblyTitle>
@@ -14,15 +14,15 @@
1414
<DebugType></DebugType>
1515
<DefineConstants>USE_SQLITEPCL_RAW;RELEASE;NETSTANDARD1_1</DefineConstants>
1616
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
17-
<DocumentationFile>bin\Release\netstandard1.1\SQLite-net.xml</DocumentationFile>
17+
<DocumentationFile>bin\Release\netstandard2.0\SQLite-net.xml</DocumentationFile>
1818
</PropertyGroup>
1919
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2020
<DefineConstants>USE_SQLITEPCL_RAW;DEBUG;NETSTANDARD1_1</DefineConstants>
2121
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
22-
<DocumentationFile>bin\Debug\netstandard1.1\SQLite-net.xml</DocumentationFile>
22+
<DocumentationFile>bin\Debug\netstandard2.0\SQLite-net.xml</DocumentationFile>
2323
</PropertyGroup>
2424
<ItemGroup>
25-
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="1.1.13" />
25+
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.0.1" />
2626
<PackageReference Include="NuGet.Build.Packaging" Version="0.2.2" />
2727
</ItemGroup>
2828
<ItemGroup>

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

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎nuget/SQLite-net/packages.config‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎sqlite-net-base.nuspec‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,48 +20,45 @@
2020
<releaseNotes>See project page</releaseNotes>
2121
<dependencies>
2222
<group targetFramework="net">
23-
<dependency id="SQLitePCLRaw.core" version="1.1.13" />
23+
<dependency id="SQLitePCLRaw.core" version="2.0.1" />
2424
</group>
2525
<group targetFramework="win">
26-
<dependency id="SQLitePCLRaw.core" version="1.1.13" />
26+
<dependency id="SQLitePCLRaw.core" version="2.0.1" />
2727
</group>
2828
<group targetFramework="wp">
29-
<dependency id="SQLitePCLRaw.core" version="1.1.13" />
29+
<dependency id="SQLitePCLRaw.core" version="2.0.1" />
3030
</group>
3131
<group targetFramework="wpa">
32-
<dependency id="SQLitePCLRaw.core" version="1.1.13" />
32+
<dependency id="SQLitePCLRaw.core" version="2.0.1" />
3333
</group>
34-
<group targetFramework="netstandard1.1">
35-
<dependency id="SQLitePCLRaw.core" version="1.1.13" />
34+
<group targetFramework="netstandard2.0">
35+
<dependency id="SQLitePCLRaw.core" version="2.0.1" />
3636
<dependency id="NETStandard.Library" version="1.6.1" />
3737
</group>
3838
<group targetFramework="MonoAndroid10">
39-
<dependency id="SQLitePCLRaw.core" version="1.1.13" />
39+
<dependency id="SQLitePCLRaw.core" version="2.0.1" />
4040
</group>
4141
<group targetFramework="Xamarin.iOS10">
42-
<dependency id="SQLitePCLRaw.core" version="1.1.13" />
42+
<dependency id="SQLitePCLRaw.core" version="2.0.1" />
4343
</group>
4444
<group targetFramework="Xamarin.Mac20">
45-
<dependency id="SQLitePCLRaw.core" version="1.1.13" />
46-
</group>
47-
<group targetFramework="portable-net45+win+wpa81+wp80">
48-
<dependency id="SQLitePCLRaw.core" version="1.1.13" />
45+
<dependency id="SQLitePCLRaw.core" version="2.0.1" />
4946
</group>
5047
<group targetFramework="uap">
51-
<dependency id="SQLitePCLRaw.core" version="1.1.13" />
48+
<dependency id="SQLitePCLRaw.core" version="2.0.1" />
5249
</group>
5350
<group targetFramework="dotnet">
54-
<dependency id="SQLitePCLRaw.core" version="1.1.13" />
51+
<dependency id="SQLitePCLRaw.core" version="2.0.1" />
5552
</group>
5653
<group targetFramework="xamarintvos">
57-
<dependency id="SQLitePCLRaw.core" version="1.1.13" />
54+
<dependency id="SQLitePCLRaw.core" version="2.0.1" />
5855
</group>
5956
<group targetFramework="xamarinwatchos">
60-
<dependency id="SQLitePCLRaw.core" version="1.1.13" />
57+
<dependency id="SQLitePCLRaw.core" version="2.0.1" />
6158
</group>
6259
</dependencies>
6360
</metadata>
6461
<files>
65-
<file src="nuget/SQLite-net-base/bin/Release/netstandard1.1/SQLite-net.*" target="lib/netstandard1.1" />
62+
<file src="nuget/SQLite-net-base/bin/Release/netstandard2.0/SQLite-net.*" target="lib/netstandard2.0" />
6663
</files>
6764
</package>

‎sqlite-net-pcl.nuspec‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,49 +16,45 @@
1616
<releaseNotes>See project page</releaseNotes>
1717
<dependencies>
1818
<group targetFramework="net">
19-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.13" />
19+
<dependency id="SQLitePCLRaw.bundle_green" version="2.0.1" />
2020
</group>
2121
<group targetFramework="win">
22-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.13" />
22+
<dependency id="SQLitePCLRaw.bundle_green" version="2.0.1" />
2323
</group>
2424
<group targetFramework="wp">
25-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.13" />
25+
<dependency id="SQLitePCLRaw.bundle_green" version="2.0.1" />
2626
</group>
2727
<group targetFramework="wpa">
28-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.13" />
28+
<dependency id="SQLitePCLRaw.bundle_green" version="2.0.1" />
2929
</group>
30-
<group targetFramework="netstandard1.1">
31-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.13" />
30+
<group targetFramework="netstandard2.0">
31+
<dependency id="SQLitePCLRaw.bundle_green" version="2.0.1" />
3232
<dependency id="NETStandard.Library" version="1.6.1" />
3333
</group>
3434
<group targetFramework="MonoAndroid10">
35-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.13" />
35+
<dependency id="SQLitePCLRaw.bundle_green" version="2.0.1" />
3636
</group>
3737
<group targetFramework="Xamarin.iOS10">
38-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.13" />
38+
<dependency id="SQLitePCLRaw.bundle_green" version="2.0.1" />
3939
</group>
4040
<group targetFramework="Xamarin.Mac20">
41-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.13" />
42-
</group>
43-
<group targetFramework="portable-net45+win+wpa81+wp80">
44-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.13" />
41+
<dependency id="SQLitePCLRaw.bundle_green" version="2.0.1" />
4542
</group>
4643
<group targetFramework="uap">
47-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.13" />
44+
<dependency id="SQLitePCLRaw.bundle_green" version="2.0.1" />
4845
</group>
4946
<group targetFramework="dotnet">
50-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.13" />
47+
<dependency id="SQLitePCLRaw.bundle_green" version="2.0.1" />
5148
</group>
5249
<group targetFramework="xamarintvos">
53-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.13" />
50+
<dependency id="SQLitePCLRaw.bundle_green" version="2.0.1" />
5451
</group>
5552
<group targetFramework="xamarinwatchos">
56-
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.13" />
53+
<dependency id="SQLitePCLRaw.bundle_green" version="2.0.1" />
5754
</group>
5855
</dependencies>
5956
</metadata>
6057
<files>
61-
<file src="nuget/SQLite-net/bin/Release/SQLite-net.*" target="lib/portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
62-
<file src="nuget/SQLite-net-std/bin/Release/netstandard1.1/SQLite-net.*" target="lib/netstandard1.1" />
58+
<file src="nuget/SQLite-net-std/bin/Release/netstandard2.0/SQLite-net.*" target="lib/netstandard2.0" />
6359
</files>
6460
</package>

0 commit comments

Comments
 (0)