Skip to content

Commit 6762233

Browse files
praeclarumpraeclarum
authored
Merge pull request praeclarum#588 from praeclarum/std2
Improve .NET Standard nuget
2 parents 9be9171 + 27fa298 commit 6762233

File tree

7 files changed

+99
-25
lines changed

7 files changed

+99
-25
lines changed

‎Makefile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11

2-
2+
SRC=src/SQLite.cs src/SQLiteAsync.cs
33

44
all: test nuget
55

66
test: tests/bin/Debug/SQLite.Tests.dll
77
nunit-console tests/bin/Debug/SQLite.Tests.dll
88

9-
tests/bin/Debug/SQLite.Tests.dll: tests/SQLite.Tests.csproj src/SQLite.cs src/SQLiteAsync.cs
10-
xbuild tests/SQLite.Tests.csproj
9+
tests/bin/Debug/SQLite.Tests.dll: tests/SQLite.Tests.csproj $(SRC)
10+
msbuild tests/SQLite.Tests.csproj
1111

1212
nuget: srcnuget pclnuget
1313

14-
srcnuget: src/SQLite.cs src/SQLiteAsync.cs sqlite-net.nuspec
14+
packages: nuget/SQLite-net/packages.config
15+
nuget restore SQLite.sln
16+
17+
srcnuget: sqlite-net.nuspec $(SRC)
1518
nuget pack sqlite-net.nuspec
1619

17-
pclnuget: src/SQLite.cs src/SQLiteAsync.cs
18-
nuget restore SQLite.sln
19-
'/Applications/Xamarin Studio.app/Contents/MacOS/mdtool' build '-c:Release|iPhone' SQLite.sln -p:SQLite-net
20+
pclnuget: sqlite-net-pcl.nuspec packages $(SRC)
21+
msbuild "/p:Configuration=Release" nuget/SQLite-net/SQLite-net.csproj
22+
msbuild "/p:Configuration=Release" nuget/SQLite-net-std/SQLite-net-std.csproj
2023
nuget pack sqlite-net-pcl.nuspec -o .\
2124

‎SQLite.sln

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FECC0E44
1616
EndProject
1717
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Tests.iOS", "tests\SQLite.Tests.iOS\SQLite.Tests.iOS.csproj", "{81850129-71C3-40C7-A48B-AA5D2C2E365E}"
1818
EndProject
19+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite-net-std", "nuget\SQLite-net-std\SQLite-net-std.csproj", "{081D08D6-10F1-431B-88FE-469FD9FE898C}"
20+
EndProject
1921
Global
2022
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2123
Debug|Any CPU = Debug|Any CPU
@@ -62,6 +64,18 @@ Global
6264
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
6365
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|iPhone.ActiveCfg = Debug|iPhone
6466
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|iPhone.Build.0 = Debug|iPhone
67+
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68+
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|Any CPU.Build.0 = Debug|Any CPU
69+
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Release|Any CPU.ActiveCfg = Release|Any CPU
70+
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Release|Any CPU.Build.0 = Release|Any CPU
71+
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
72+
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
73+
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Release|iPhone.ActiveCfg = Release|Any CPU
74+
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Release|iPhone.Build.0 = Release|Any CPU
75+
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
76+
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
77+
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
78+
{081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|iPhone.Build.0 = Debug|Any CPU
6579
EndGlobalSection
6680
GlobalSection(NestedProjects) = preSolution
6781
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2} = {FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF}

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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)' == 'Release|AnyCPU' ">
9+
<DebugSymbols>true</DebugSymbols>
10+
<DebugType>portable</DebugType>
11+
<DefineConstants>TRACE;USE_SQLITEPCL_RAW;RELEASE;NETSTANDARD1_1</DefineConstants>
12+
<DocumentationFile>bin\Release\netstandard1.1\SQLite-net.xml</DocumentationFile>
13+
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
15+
<DefineConstants>TRACE;USE_SQLITEPCL_RAW;DEBUG;NETSTANDARD1_1</DefineConstants>
16+
</PropertyGroup>
17+
<ItemGroup>
18+
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="1.1.5" />
19+
</ItemGroup>
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+
</Project>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
<DebugType>full</DebugType>
2424
<Optimize>false</Optimize>
2525
<OutputPath>bin\Debug\</OutputPath>
26-
<DefineConstants>TRACE;DEBUG;USE_SQLITEPCL_RAW USE_NEW_REFLECTION_API NO_CONCURRENT</DefineConstants>
26+
<DefineConstants>TRACE;DEBUG;USE_SQLITEPCL_RAW;NO_CONCURRENT</DefineConstants>
2727
<ErrorReport>prompt</ErrorReport>
2828
<WarningLevel>4</WarningLevel>
2929
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
3030
<DocumentationFile>bin\Debug\SQLite-net.xml</DocumentationFile>
3131
</PropertyGroup>
3232
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3333
<DebugSymbols>true</DebugSymbols>
34-
<DebugType></DebugType>
34+
<DebugType>portable</DebugType>
3535
<Optimize>true</Optimize>
3636
<OutputPath>bin\Release\</OutputPath>
37-
<DefineConstants>TRACE;USE_SQLITEPCL_RAW USE_NEW_REFLECTION_API NO_CONCURRENT</DefineConstants>
37+
<DefineConstants>TRACE;USE_SQLITEPCL_RAW;NO_CONCURRENT</DefineConstants>
3838
<ErrorReport>prompt</ErrorReport>
3939
<WarningLevel>4</WarningLevel>
4040
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎sqlite-net-pcl.nuspec

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
4-
<version>1.3.4</version>
4+
<version>1.4.0</version>
55
<authors>Frank A. Krueger</authors>
66
<owners>Frank A. Krueger</owners>
77
<licenseUrl>https://raw.githubusercontent.com/praeclarum/sqlite-net/master/LICENSE.md</licenseUrl>
@@ -15,25 +15,54 @@
1515
<tags>sqlite pcl database orm mobile</tags>
1616
<releaseNotes>
1717
<![CDATA[
18-
v1.3.4: Fix reading and writing nullable enums
18+
v1.4: Improve .NET Standard Support
1919
]]>
2020
</releaseNotes>
2121
<dependencies>
22-
<group>
22+
<group targetFramework="net">
2323
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
2424
</group>
25-
<group targetFramework=".NETStandard1.1">
25+
<group targetFramework="win">
26+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
27+
</group>
28+
<group targetFramework="wp">
29+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
30+
</group>
31+
<group targetFramework="wpa">
32+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
33+
</group>
34+
<group targetFramework="netstandard1.1">
35+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
36+
<dependency id="NETStandard.Library" version="1.6.1" />
37+
</group>
38+
<group targetFramework="MonoAndroid10">
39+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
40+
</group>
41+
<group targetFramework="Xamarin.iOS10">
42+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
43+
</group>
44+
<group targetFramework="Xamarin.Mac20">
45+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
46+
</group>
47+
<group targetFramework="portable-net45+win+wpa81+wp80">
48+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
49+
</group>
50+
<group targetFramework="uap">
51+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
52+
</group>
53+
<group targetFramework="dotnet">
54+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
55+
</group>
56+
<group targetFramework="xamarintvos">
57+
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
58+
</group>
59+
<group targetFramework="xamarinwatchos">
2660
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
27-
<dependency id="NETStandard.Library" version="1.6.0" />
2861
</group>
2962
</dependencies>
3063
</metadata>
3164
<files>
32-
<file src="nuget/SQLite-net/bin/Release/SQLite-net.dll" target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
33-
<file src="nuget/SQLite-net/bin/Release/SQLite-net.pdb" target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
34-
<file src="nuget/SQLite-net/bin/Release/SQLite-net.xml" target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
35-
<file src="nuget/SQLite-net/bin/Release/SQLite-net.dll" target="lib/netstandard1.1" />
36-
<file src="nuget/SQLite-net/bin/Release/SQLite-net.pdb" target="lib/netstandard1.1" />
37-
<file src="nuget/SQLite-net/bin/Release/SQLite-net.xml" target="lib/netstandard1.1" />
65+
<file src="nuget/SQLite-net/bin/Release/SQLite-net.*" target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
66+
<file src="nuget/SQLite-net-std/bin/Release/netstandard1.1/SQLite-net.*" target="lib/netstandard1.1" />
3867
</files>
3968
</package>

‎sqlite-net.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
4-
<version>1.3.4</version>
4+
<version>1.4.0</version>
55
<authors>Frank Krueger</authors>
66
<owners>Frank Krueger,Tim Heuer</owners>
77
<licenseUrl>https://raw.githubusercontent.com/praeclarum/sqlite-net/master/LICENSE.md</licenseUrl>

‎src/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[assembly: AssemblyConfiguration("")]
1212
[assembly: AssemblyCompany("Krueger Systems, Inc.")]
1313
[assembly: AssemblyProduct("SQLite-net")]
14-
[assembly: AssemblyCopyright("Copyright © 2009-2016 Krueger Systems, Inc.")]
14+
[assembly: AssemblyCopyright("Copyright © 2009-2017 Krueger Systems, Inc.")]
1515
[assembly: AssemblyTrademark("")]
1616
[assembly: AssemblyCulture("")]
1717
[assembly: NeutralResourcesLanguage("en")]
@@ -26,5 +26,5 @@
2626
// You can specify all the values or you can default the Build and Revision Numbers
2727
// by using the '*' as shown below:
2828
// [assembly: AssemblyVersion("1.0.*")]
29-
[assembly: AssemblyVersion("1.1.0.0")]
30-
[assembly: AssemblyFileVersion("1.1.0.0")]
29+
[assembly: AssemblyVersion("1.4.0.0")]
30+
[assembly: AssemblyFileVersion("1.4.0.0")]

0 commit comments

Comments
 (0)