.NET Standard support

appveyor.yml

@@ -1,3 +1,5 @@
+image: Visual Studio 2017
+
 build:
   project: SQLite.Net.OSS.sln
 

nuget/SQLite.Net.Async.nuspec

@@ -2,22 +2,22 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>SQLite.Net.Async-PCL</id>
-        <version>3.1.1</version>
+        <version>4.0.0-beta1</version>
         <title>SQLite.Net.Async PCL</title>
         <authors>Øystein Krog,Frank Krueger,Tim Heuer</authors>
         <owners>Øystein Krog</owners>
         <licenseUrl>https://raw.github.com/oysteinkrog/SQLite.Net-PCL/master/LICENSE.txt</licenseUrl>
         <projectUrl>https://github.com/oysteinkrog/SQLite.Net-PCL</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>SQLite.Net PCL is an open source, minimal library to allow .NET and Mono applications to store data in SQLite databases.
-            This is a fork of the original sqlite-net project, which aims to cleanup/improve the code and deliver the package as PCL assemblies with some additional platform-specific implementations.
-            This package is compatible with the following .net platforms: net4+sl5+wp8+win8+monotouch+monoAndroid</description>
+            This is a fork of the original sqlite-net project, which aims to cleanup/improve the code and deliver the package as .NET Standard assemblies with some additional platform-specific implementations.
+            This package is compatible with the following .NET Standard platforms: Xamarin.iOS (Classic), Xamarin.iOS (Unified), Xamarin.Android, UWP, Win32, Generic</description>
         <summary>A .NET client library to access SQLite embedded database files in a LINQ manner.
             This package provides Async extensions to the core SQLite.Net package.</summary>
         <releaseNotes>https://github.com/oysteinkrog/SQLite.Net-PCL/commits</releaseNotes>
-        <tags>sqlite pcl sql database ios android windows metro winrt xamarin monotouch monodroid win32 windowsphone wp wp8 wp8.1</tags>
+        <tags>sqlite netstandard sql database ios android windows xamarin monotouch monodroid win32</tags>
         <dependencies>
-            <dependency id="SQLite.Net.Core-PCL" version="3.1.1"/>
+            <dependency id="SQLite.Net.Core-PCL" version="4.0.0-beta1"/>
         </dependencies>
     </metadata>
     <files>

nuget/SQLite.Net.Core.nuspec

@@ -2,24 +2,23 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>SQLite.Net.Core-PCL</id>
-        <version>3.1.1</version>
+        <version>4.0.0-beta1</version>
         <title>SQLite.Net PCL</title>
         <authors>Øystein Krog,Frank Krueger,Tim Heuer</authors>
         <owners>Øystein Krog</owners>
         <licenseUrl>https://raw.github.com/oysteinkrog/SQLite.Net-PCL/master/LICENSE.txt</licenseUrl>
         <projectUrl>https://github.com/oysteinkrog/SQLite.Net-PCL</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>SQLite.Net PCL is an open source, minimal library to allow .NET and Mono applications to store data in SQLite databases.
-            This is a fork of the original sqlite-net project, which aims to cleanup/improve the code and deliver the package as PCL assemblies with some additional platform-specific implementations.
-            This package is compatible with the following .net platforms: Xamarin.iOS (Classic), Xamarin.iOS (Unified), Xamarin.Android, Windows Phone 8.1, Windows Phone 8.0, Windows 8.1, Windows 8.0, Win32, Generic, PCL(net4+sl4+wp7+win8+monotouch+MonoAndroid)</description>
+            This is a fork of the original sqlite-net project, which aims to cleanup/improve the code and deliver the package as .NET Standard assemblies with some additional platform-specific implementations.
+            This package is compatible with the following .NET Standard platforms: Xamarin.iOS (Classic), Xamarin.iOS (Unified), Xamarin.Android, UWP, Win32, Generic</description>
         <summary>A .NET client library to access SQLite embedded database files in a LINQ manner.</summary>
         <releaseNotes>https://github.com/oysteinkrog/SQLite.Net-PCL/commits</releaseNotes>
-        <tags>sqlite pcl sql database ios android windows metro winrt xamarin monotouch monodroid win32 windowsphone wp wp8 wp8.1</tags>
+        <tags>sqlite netstandard sql database ios android windows xamarin monotouch monodroid win32</tags>
         <dependencies>
         </dependencies>
     </metadata>
     <files>
-        <!-- PCL -->
-        <file src="SQLite.Net\SQLite.Net.dll" target="lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll" />
+        <file src="SQLite.Net\SQLite.Net.dll" target="lib\netstandard1.0\SQLite.Net.dll" />
     </files>
 </package>

nuget/SQLite.Net.nuspec

@@ -2,57 +2,39 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>SQLite.Net-PCL</id>
-        <version>3.1.1</version>
+        <version>4.0.0-beta1</version>
         <title>SQLite.Net PCL</title>
         <authors>Øystein Krog,Frank Krueger,Tim Heuer</authors>
         <owners>Øystein Krog</owners>
         <licenseUrl>https://raw.github.com/oysteinkrog/SQLite.Net-PCL/master/LICENSE.txt</licenseUrl>
         <projectUrl>https://github.com/oysteinkrog/SQLite.Net-PCL</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>SQLite.Net PCL is an open source, minimal library to allow .NET and Mono applications to store data in SQLite databases.
-            This is a fork of the original sqlite-net project, which aims to cleanup/improve the code and deliver the package as PCL assemblies with some additional platform-specific implementations.
-            This package is compatible with the following .net platforms: Xamarin.iOS (Classic), Xamarin.iOS (Unified), Xamarin.Android, Windows Phone 8.1, Windows Phone 8.0, Windows 8.1, Windows 8.0, Win32, Generic, PCL(net4+sl4+wp7+win8+monotouch+MonoAndroid)</description>
+            This is a fork of the original sqlite-net project, which aims to cleanup/improve the code and deliver the package as .NET Standard assemblies with some additional platform-specific implementations.
+            This package is compatible with the following .NET Standard platforms: Xamarin.iOS (Classic), Xamarin.iOS (Unified), Xamarin.Android, UWP, Win32, Generic</description>
         <summary>A .NET client library to access SQLite embedded database files in a LINQ manner.</summary>
         <releaseNotes>https://github.com/oysteinkrog/SQLite.Net-PCL/commits</releaseNotes>
-        <tags>sqlite pcl sql database ios android windows metro winrt xamarin monotouch monodroid win32 windowsphone wp wp8 wp8.1</tags>
+        <tags>sqlite netstandard sql database ios android windows xamarin monotouch monodroid win32</tags>
         <dependencies>
-            <group targetFramework="wp8">
-                <dependency id="sqlite-net-wp8" version="3.8.5"/>
-            </group>
             <group>
-		        <dependency id="SQLite.Net.Core-PCL" version="3.1.1"/>
+		        <dependency id="SQLite.Net.Core-PCL" version="4.0.0-beta1"/>
             </group>
         </dependencies>
     </metadata>
     <files>
-        <!-- Xamarin.iOS (Classic)-->
-        <file src="SQLite.Net.Platform.XamarinIOS\SQLite.Net.Platform.XamarinIOS.dll" target="lib\monotouch\SQLite.Net.Platform.XamarinIOS.dll" />
-
         <!-- Xamarin.iOS (Unified)-->
         <file src="SQLite.Net.Platform.XamarinIOS.Unified\SQLite.Net.Platform.XamarinIOS.Unified.dll" target="lib\Xamarin.iOS10\SQLite.Net.Platform.XamarinIOS.Unified.dll" />
 
         <!-- Xamarin.Android -->
         <file src="SQLite.Net.Platform.XamarinAndroid\SQLite.Net.Platform.XamarinAndroid.dll" target="lib\MonoAndroid\SQLite.Net.Platform.XamarinAndroid.dll" />
 
-        <!-- Windows Phone & Windows 8.1 -->
-        <file src="SQLite.Net.Platform.WinRT\SQLite.Net.Platform.WinRT.dll" target="lib\portable-win81+wpa81\SQLite.Net.Platform.WinRT.dll" />
-
-        <!-- Windows 8.0 -->
-        <file src="SQLite.Net.Platform.WinRT\SQLite.Net.Platform.WinRT.dll" target="lib\Windows8\SQLite.Net.Platform.WinRT.dll" />
-
-        <!-- Windows Phone 8.0 (ARM) -->
-        <file src="SQLite.Net.Platform.WindowsPhone8\ARM\SQLite.Net.Platform.WindowsPhone8.dll" target="lib\windowsphone8\ARM\SQLite.Net.Platform.WindowsPhone8.dll" />
-
-        <!-- Windows Phone 8.0 (x86) -->
-        <file src="SQLite.Net.Platform.WindowsPhone8\x86\SQLite.Net.Platform.WindowsPhone8.dll" target="lib\windowsphone8\x86\SQLite.Net.Platform.WindowsPhone8.dll" />
-
         <!-- Win32 -->
         <file src="SQLite.Net.Platform.Win32\SQLite.Net.Platform.Win32.dll" target="lib\net4\SQLite.Net.Platform.Win32.dll" />
 
         <!-- Generic -->
         <file src="SQLite.Net.Platform.Generic\SQLite.Net.Platform.Generic.dll" target="lib\net40\SQLite.Net.Platform.Generic.dll"/>
 
-        <!-- PCL -->
-        <file src="SQLite.Net\_._" target="lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\_._" />
+        <!-- .NET Standard -->
+        <file src="SQLite.Net\SQLite.Net.dll" target="lib\netstandard1.0\SQLite.Net.dll" />
     </files>
 </package>

nuget/build.bat

@@ -1,4 +1,4 @@
 @mkdir output
-..\.nuget\nuget pack SQLite.Net.Core.nuspec -o output
-..\.nuget\nuget pack SQLite.Net.nuspec -o output
-..\.nuget\nuget pack SQLite.Net.Async.nuspec -o output
+..\.nuget\nuget pack SQLite.Net.Core.nuspec -OutputDirectory output
+..\.nuget\nuget pack SQLite.Net.nuspec -OutputDirectory output
+..\.nuget\nuget pack SQLite.Net.Async.nuspec -OutputDirectory output

nuget/prepare.bat

@@ -1,30 +1,17 @@
 mkdir SQLite.Net
-copy /y ..\src\SQLite.Net\bin\Release\SQLite.Net.dll SQLite.Net
-type nul >SQLite.Net\_._
+copy /y ..\src\SQLite.Net\bin\Release\netstandard1.0\SQLite.Net.dll SQLite.Net
 
 mkdir SQLite.Net.Async
-copy /y ..\src\SQLite.Net.Async\bin\Release\SQLite.Net.Async.dll SQLite.Net.Async
+copy /y ..\src\SQLite.Net.Async\bin\Release\netstandard1.0\SQLite.Net.Async.dll SQLite.Net.Async
 
 mkdir SQLite.Net.Platform.Generic
 copy /y ..\src\SQLite.Net.Platform.Generic\bin\Release\SQLite.Net.Platform.Generic.dll SQLite.Net.Platform.Generic
 
 mkdir SQLite.Net.Platform.Win32
 copy /y ..\src\SQLite.Net.Platform.Win32\bin\Release\SQLite.Net.Platform.Win32.dll SQLite.Net.Platform.Win32
 
-mkdir SQLite.Net.Platform.WindowsPhone8
-mkdir SQLite.Net.Platform.WindowsPhone8\ARM
-mkdir SQLite.Net.Platform.WindowsPhone8\x86
-copy /y ..\src\SQLite.Net.Platform.WindowsPhone8\bin\x86\Release\SQLite.Net.Platform.WindowsPhone8.dll SQLite.Net.Platform.WindowsPhone8\x86
-copy /y ..\src\SQLite.Net.Platform.WindowsPhone8\bin\ARM\Release\SQLite.Net.Platform.WindowsPhone8.dll SQLite.Net.Platform.WindowsPhone8\ARM
-
-mkdir SQLite.Net.Platform.WinRT
-copy /y ..\src\SQLite.Net.Platform.WinRT\bin\Release\SQLite.Net.Platform.WinRT.dll SQLite.Net.Platform.WinRT
-
 mkdir SQLite.Net.Platform.XamarinAndroid
 copy /y ..\src\SQLite.Net.Platform.XamarinAndroid\bin\Release\SQLite.Net.Platform.XamarinAndroid.dll SQLite.Net.Platform.XamarinAndroid
 
-mkdir SQLite.Net.Platform.XamarinIOS
-copy /y ..\src\SQLite.Net.Platform.XamarinIOS\bin\iPhone\Release\SQLite.Net.Platform.XamarinIOS.dll SQLite.Net.Platform.XamarinIOS
-
 mkdir SQLite.Net.Platform.XamarinIOS.Unified
 copy /y ..\src\SQLite.Net.Platform.XamarinIOS.Unified\bin\Release\SQLite.Net.Platform.XamarinIOS.Unified.dll SQLite.Net.Platform.XamarinIOS.Unified

nuget/upload.bat

@@ -1,3 +1,3 @@
-..\.nuget\nuget push output\SQLite.Net.Core-PCL.3.1.1.nupkg
-..\.nuget\nuget push output\SQLite.Net-PCL.3.1.1.nupkg
-..\.nuget\nuget push output\SQLite.Net.Async-PCL.3.1.1.nupkg
+..\.nuget\nuget push output\SQLite.Net.Core-PCL.4.0.0-beta1.nupkg
+..\.nuget\nuget push output\SQLite.Net-PCL.4.0.0-beta1.nupkg
+..\.nuget\nuget push output\SQLite.Net.Async-PCL.4.0.0-beta1.nupkg

src/GlobalAssemblyInfo.cs

@@ -11,5 +11,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.1.1.0")]
-[assembly: AssemblyFileVersion("3.1.1.0")]
+[assembly: AssemblyVersion("4.0.0.0")]
+[assembly: AssemblyFileVersion("4.0.0.0")]

src/SQLite.Net.Async/SQLite.Net.Async.csproj

@@ -1,70 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{3AB34E91-8E1A-442F-8E66-2494B371A890}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SQLite.Net.Async</RootNamespace>
-    <AssemblyName>SQLite.Net.Async</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFramework>netstandard1.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;JETBRAINS_ANNOTATIONS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD1_0;JETBRAINS_ANNOTATIONS</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;JETBRAINS_ANNOTATIONS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;RELEASE;NETSTANDARD1_0;JETBRAINS_ANNOTATIONS</DefineConstants>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
+    <Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AsyncTableQuery.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SQLiteAsyncConnection.cs" />
+    <ProjectReference Include="..\SQLite.Net\SQLite.Net.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SQLite.Net\SQLite.Net.csproj">
-      <Project>{4971D437-0694-4297-A8CC-146CE08C3BD9}</Project>
-      <Name>SQLite.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+</Project>

src/SQLite.Net.Platform.Win32/SQLite.Net.Platform.Win32.csproj

@@ -14,6 +14,7 @@
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,9 +41,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="System.Data.SQLite">
-      <HintPath>..\..\packages\System.Data.SQLite.Core.1.0.92.0\lib\net40\System.Data.SQLite.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs">
@@ -71,9 +69,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.