diff --git a/Makefile b/Makefile index 08ac68739..c7d36353a 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,24 @@ - +SRC=src/SQLite.cs src/SQLiteAsync.cs all: test nuget test: tests/bin/Debug/SQLite.Tests.dll nunit-console tests/bin/Debug/SQLite.Tests.dll -tests/bin/Debug/SQLite.Tests.dll: tests/SQLite.Tests.csproj src/SQLite.cs src/SQLiteAsync.cs - xbuild tests/SQLite.Tests.csproj +tests/bin/Debug/SQLite.Tests.dll: tests/SQLite.Tests.csproj $(SRC) + msbuild tests/SQLite.Tests.csproj nuget: srcnuget pclnuget -srcnuget: src/SQLite.cs src/SQLiteAsync.cs sqlite-net.nuspec +packages: nuget/SQLite-net/packages.config + nuget restore SQLite.sln + +srcnuget: sqlite-net.nuspec $(SRC) nuget pack sqlite-net.nuspec -pclnuget: src/SQLite.cs src/SQLiteAsync.cs - nuget restore SQLite.sln - '/Applications/Xamarin Studio.app/Contents/MacOS/mdtool' build '-c:Release|iPhone' SQLite.sln -p:SQLite-net +pclnuget: sqlite-net-pcl.nuspec packages $(SRC) + msbuild "/p:Configuration=Release" nuget/SQLite-net/SQLite-net.csproj + msbuild "/p:Configuration=Release" nuget/SQLite-net-std/SQLite-net-std.csproj nuget pack sqlite-net-pcl.nuspec -o .\ diff --git a/SQLite.sln b/SQLite.sln index f2dca1882..4325e17a7 100644 --- a/SQLite.sln +++ b/SQLite.sln @@ -16,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FECC0E44 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Tests.iOS", "tests\SQLite.Tests.iOS\SQLite.Tests.iOS.csproj", "{81850129-71C3-40C7-A48B-AA5D2C2E365E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite-net-std", "nuget\SQLite-net-std\SQLite-net-std.csproj", "{081D08D6-10F1-431B-88FE-469FD9FE898C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -62,6 +64,18 @@ Global {81850129-71C3-40C7-A48B-AA5D2C2E365E}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|iPhone.ActiveCfg = Debug|iPhone {81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|iPhone.Build.0 = Debug|iPhone + {081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {081D08D6-10F1-431B-88FE-469FD9FE898C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {081D08D6-10F1-431B-88FE-469FD9FE898C}.Release|Any CPU.Build.0 = Release|Any CPU + {081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {081D08D6-10F1-431B-88FE-469FD9FE898C}.Release|iPhone.ActiveCfg = Release|Any CPU + {081D08D6-10F1-431B-88FE-469FD9FE898C}.Release|iPhone.Build.0 = Release|Any CPU + {081D08D6-10F1-431B-88FE-469FD9FE898C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {081D08D6-10F1-431B-88FE-469FD9FE898C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {081D08D6-10F1-431B-88FE-469FD9FE898C}.Debug|iPhone.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {6947A8F1-99BE-4DD1-AD4D-D89425CE67A2} = {FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF} diff --git a/nuget/SQLite-net-std/SQLite-net-std.csproj b/nuget/SQLite-net-std/SQLite-net-std.csproj new file mode 100644 index 000000000..5a2acd486 --- /dev/null +++ b/nuget/SQLite-net-std/SQLite-net-std.csproj @@ -0,0 +1,28 @@ + + + + netstandard1.1 + SQLite-net + + + + true + portable + TRACE;USE_SQLITEPCL_RAW;RELEASE;NETSTANDARD1_1 + bin\Release\netstandard1.1\SQLite-net.xml + + + TRACE;USE_SQLITEPCL_RAW;DEBUG;NETSTANDARD1_1 + + + + + + + SQLite.cs + + + SQLiteAsync.cs + + + diff --git a/nuget/SQLite-net/SQLite-net.csproj b/nuget/SQLite-net/SQLite-net.csproj index ef12dbf49..9a40e93fb 100644 --- a/nuget/SQLite-net/SQLite-net.csproj +++ b/nuget/SQLite-net/SQLite-net.csproj @@ -23,7 +23,7 @@ full false bin\Debug\ - TRACE;DEBUG;USE_SQLITEPCL_RAW USE_NEW_REFLECTION_API NO_CONCURRENT + TRACE;DEBUG;USE_SQLITEPCL_RAW;NO_CONCURRENT prompt 4 true @@ -31,10 +31,10 @@ true - + portable true bin\Release\ - TRACE;USE_SQLITEPCL_RAW USE_NEW_REFLECTION_API NO_CONCURRENT + TRACE;USE_SQLITEPCL_RAW;NO_CONCURRENT prompt 4 true diff --git a/sqlite-net-pcl.nuspec b/sqlite-net-pcl.nuspec index 9cb703a91..c00bc9df8 100644 --- a/sqlite-net-pcl.nuspec +++ b/sqlite-net-pcl.nuspec @@ -1,7 +1,7 @@ - 1.3.4 + 1.4.0 Frank A. Krueger Frank A. Krueger https://raw.githubusercontent.com/praeclarum/sqlite-net/master/LICENSE.md @@ -15,25 +15,54 @@ sqlite pcl database orm mobile - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + diff --git a/sqlite-net.nuspec b/sqlite-net.nuspec index 72d0f84ea..59375955a 100644 --- a/sqlite-net.nuspec +++ b/sqlite-net.nuspec @@ -1,7 +1,7 @@ - 1.3.4 + 1.4.0 Frank Krueger Frank Krueger,Tim Heuer https://raw.githubusercontent.com/praeclarum/sqlite-net/master/LICENSE.md diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs index dcc0d06aa..c06011b48 100644 --- a/src/AssemblyInfo.cs +++ b/src/AssemblyInfo.cs @@ -11,7 +11,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Krueger Systems, Inc.")] [assembly: AssemblyProduct("SQLite-net")] -[assembly: AssemblyCopyright("Copyright © 2009-2016 Krueger Systems, Inc.")] +[assembly: AssemblyCopyright("Copyright © 2009-2017 Krueger Systems, Inc.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: NeutralResourcesLanguage("en")] @@ -26,5 +26,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] +[assembly: AssemblyVersion("1.4.0.0")] +[assembly: AssemblyFileVersion("1.4.0.0")]