Skip to content

S
Sqlite-Net

jobily / Sqlite-Net

通知 1
Star 0
Fork 0
S
Sqlite-Net

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 67622336 编写于 作者: F Frank A. Krueger 提交者： GitHub
浏览文件
操作

Merge pull request #588 from praeclarum/std2 

Improve .NET Standard nuget
上级 9be91710 27fa298e
隐藏空白更改
内联 并排
Showing with 99 addition and 25 deletion
Makefile
浏览文件 @ 67622336
SRC=src/SQLite.cs src/SQLiteAsync.cs
all: test nuget all: test nuget
test: tests/bin/Debug/SQLite.Tests.dll test: tests/bin/Debug/SQLite.Tests.dll
nunit-console 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 tests/bin/Debug/SQLite.Tests.dll: tests/SQLite.Tests.csproj $(SRC)
xbuild tests/SQLite.Tests.csproj msbuild tests/SQLite.Tests.csproj
nuget: srcnuget pclnuget 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 nuget pack sqlite-net.nuspec
pclnuget: src/SQLite.cs src/SQLiteAsync.cs pclnuget: sqlite-net-pcl.nuspec packages $(SRC)
nuget restore SQLite.sln msbuild "/p:Configuration=Release" nuget/SQLite-net/SQLite-net.csproj
'/Applications/Xamarin Studio.app/Contents/MacOS/mdtool' build '-c:Release|iPhone' SQLite.sln -p:SQLite-net msbuild "/p:Configuration=Release" nuget/SQLite-net-std/SQLite-net-std.csproj
nuget pack sqlite-net-pcl.nuspec -o .\ nuget pack sqlite-net-pcl.nuspec -o .\
SQLite.sln
浏览文件 @ 67622336
...@@ -16,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FECC0E44 ...@@ -16,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FECC0E44
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Tests.iOS", "tests\SQLite.Tests.iOS\SQLite.Tests.iOS.csproj", "{81850129-71C3-40C7-A48B-AA5D2C2E365E}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite.Tests.iOS", "tests\SQLite.Tests.iOS\SQLite.Tests.iOS.csproj", "{81850129-71C3-40C7-A48B-AA5D2C2E365E}"
EndProject 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 Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -62,6 +64,18 @@ Global ...@@ -62,6 +64,18 @@ Global
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {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.ActiveCfg = Debug|iPhone
{81850129-71C3-40C7-A48B-AA5D2C2E365E}.Debug|iPhone.Build.0 = 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 EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{6947A8F1-99BE-4DD1-AD4D-D89425CE67A2} = {FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF} {6947A8F1-99BE-4DD1-AD4D-D89425CE67A2} = {FECC0E44-E626-49CB-BD8B-0CFBD93FBEFF}
......
nuget/SQLite-net-std/SQLite-net-std.csproj 0 → 100644
浏览文件 @ 67622336
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.1</TargetFramework>
<AssemblyName>SQLite-net</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>portable</DebugType>
<DefineConstants>TRACE;USE_SQLITEPCL_RAW;RELEASE;NETSTANDARD1_1</DefineConstants>
<DocumentationFile>bin\Release\netstandard1.1\SQLite-net.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DefineConstants>TRACE;USE_SQLITEPCL_RAW;DEBUG;NETSTANDARD1_1</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="1.1.5" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\src\SQLite.cs">
<Link>SQLite.cs</Link>
</Compile>
<Compile Include="..\..\src\SQLiteAsync.cs">
<Link>SQLiteAsync.cs</Link>
</Compile>
</ItemGroup>
</Project>
nuget/SQLite-net/SQLite-net.csproj
浏览文件 @ 67622336
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;USE_SQLITEPCL_RAW USE_NEW_REFLECTION_API NO_CONCURRENT</DefineConstants> <DefineConstants>TRACE;DEBUG;USE_SQLITEPCL_RAW;NO_CONCURRENT</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType></DebugType> <DebugType>portable</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;USE_SQLITEPCL_RAW USE_NEW_REFLECTION_API NO_CONCURRENT</DefineConstants> <DefineConstants>TRACE;USE_SQLITEPCL_RAW;NO_CONCURRENT</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
......
sqlite-net-pcl.nuspec
浏览文件 @ 67622336
<?xml version="1.0"?> <?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<version>1.3.4</version> <version>1.4.0</version>
<authors>Frank A. Krueger</authors> <authors>Frank A. Krueger</authors>
<owners>Frank A. Krueger</owners> <owners>Frank A. Krueger</owners>
<licenseUrl>https://raw.githubusercontent.com/praeclarum/sqlite-net/master/LICENSE.md</licenseUrl> <licenseUrl>https://raw.githubusercontent.com/praeclarum/sqlite-net/master/LICENSE.md</licenseUrl>
...@@ -15,25 +15,54 @@ ...@@ -15,25 +15,54 @@
<tags>sqlite pcl database orm mobile</tags> <tags>sqlite pcl database orm mobile</tags>
<releaseNotes> <releaseNotes>
<![CDATA[ <![CDATA[
v1.3.4: Fix reading and writing nullable enums v1.4: Improve .NET Standard Support
]]> ]]>
</releaseNotes> </releaseNotes>
<dependencies> <dependencies>
<group> <group targetFramework="net">
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" /> <dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
</group> </group>
<group targetFramework=".NETStandard1.1"> <group targetFramework="win">
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
</group>
<group targetFramework="wp">
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
</group>
<group targetFramework="wpa">
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
</group>
<group targetFramework="netstandard1.1">
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
<dependency id="NETStandard.Library" version="1.6.1" />
</group>
<group targetFramework="MonoAndroid10">
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
</group>
<group targetFramework="Xamarin.iOS10">
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
</group>
<group targetFramework="Xamarin.Mac20">
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
</group>
<group targetFramework="portable-net45+win+wpa81+wp80">
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
</group>
<group targetFramework="uap">
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
</group>
<group targetFramework="dotnet">
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
</group>
<group targetFramework="xamarintvos">
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
</group>
<group targetFramework="xamarinwatchos">
<dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" /> <dependency id="SQLitePCLRaw.bundle_green" version="1.1.5" />
<dependency id="NETStandard.Library" version="1.6.0" />
</group> </group>
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>
<file src="nuget/SQLite-net/bin/Release/SQLite-net.dll" target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" /> <file src="nuget/SQLite-net/bin/Release/SQLite-net.*" target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
<file src="nuget/SQLite-net/bin/Release/SQLite-net.pdb" target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" /> <file src="nuget/SQLite-net-std/bin/Release/netstandard1.1/SQLite-net.*" target="lib/netstandard1.1" />
<file src="nuget/SQLite-net/bin/Release/SQLite-net.xml" target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
<file src="nuget/SQLite-net/bin/Release/SQLite-net.dll" target="lib/netstandard1.1" />
<file src="nuget/SQLite-net/bin/Release/SQLite-net.pdb" target="lib/netstandard1.1" />
<file src="nuget/SQLite-net/bin/Release/SQLite-net.xml" target="lib/netstandard1.1" />
</files> </files>
</package> </package>
sqlite-net.nuspec
浏览文件 @ 67622336
<?xml version="1.0"?> <?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<version>1.3.4</version> <version>1.4.0</version>
<authors>Frank Krueger</authors> <authors>Frank Krueger</authors>
<owners>Frank Krueger,Tim Heuer</owners> <owners>Frank Krueger,Tim Heuer</owners>
<licenseUrl>https://raw.githubusercontent.com/praeclarum/sqlite-net/master/LICENSE.md</licenseUrl> <licenseUrl>https://raw.githubusercontent.com/praeclarum/sqlite-net/master/LICENSE.md</licenseUrl>
......
src/AssemblyInfo.cs
浏览文件 @ 67622336
...@@ -11,7 +11,7 @@ using System.Runtime.InteropServices; ...@@ -11,7 +11,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Krueger Systems, Inc.")] [assembly: AssemblyCompany("Krueger Systems, Inc.")]
[assembly: AssemblyProduct("SQLite-net")] [assembly: AssemblyProduct("SQLite-net")]
[assembly: AssemblyCopyright("Copyright © 2009-2016 Krueger Systems, Inc.")] [assembly: AssemblyCopyright("Copyright © 2009-2017 Krueger Systems, Inc.")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en")] [assembly: NeutralResourcesLanguage("en")]
...@@ -26,5 +26,5 @@ using System.Runtime.InteropServices; ...@@ -26,5 +26,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.0.0")] [assembly: AssemblyVersion("1.4.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")] [assembly: AssemblyFileVersion("1.4.0.0")]
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或