progress on bringing back the provider.sqlite3 nuget package. #325 and …

…#340
ericsink · Apr 7, 2020 · 7b48e9c · 7b48e9c
1 parent d46f4e9
commit 7b48e9c
Show file tree

Hide file tree

Showing 10 changed files with 3,732 additions and 27 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,7 @@
     <Copyright>Copyright 2014-2020 SourceGear, LLC</Copyright>
     <Company>SourceGear</Company>
     <Authors>Eric Sink</Authors>
-    <Version>2.0.3-pre20200407142036</Version>
+    <Version>2.0.3-pre20200407150926</Version>
     <AssemblyVersion>2.0.3.827</AssemblyVersion>
     <FileVersion>2.0.3.827</FileVersion>
     <Description>SQLitePCLRaw is a Portable Class Library (PCL) for low-level (raw) access to SQLite</Description>

diff --git a/build/Program.fs b/build/Program.fs
@@ -46,14 +46,15 @@ let main argv =
     gen_provider "e_sqlite3.most" "e_sqlite3" "e_sqlite3" "Cdecl" "dllimport" "false" "false"
     gen_provider "e_sqlcipher.most" "e_sqlcipher" "e_sqlcipher" "Cdecl" "dllimport" "false" "true"
     gen_provider "sqlcipher.most" "sqlcipher" "sqlcipher" "Cdecl" "dllimport" "false" "true"
-    gen_provider "sqlite3" "sqlite3" "sqlite3" "Cdecl" "dllimport" "false" "false"
+    gen_provider "sqlite3.most" "sqlite3" "sqlite3" "Cdecl" "dllimport" "false" "false"
     gen_provider "internal" "__Internal" "internal" "Cdecl" "dllimport" "false" "true"
 
     gen_provider "winsqlite3" "winsqlite3" "winsqlite3" "StdCall" "dllimport" "true" "false"
 
     gen_provider "e_sqlite3.uwp" "e_sqlite3" "e_sqlite3" "Cdecl" "dllimport" "true" "false"
     gen_provider "e_sqlcipher.uwp" "e_sqlcipher" "e_sqlcipher" "Cdecl" "dllimport" "true" "true"
     gen_provider "sqlcipher.uwp" "sqlcipher" "sqlcipher" "Cdecl" "dllimport" "true" "true"
+    gen_provider "sqlite3.uwp" "sqlcipher" "sqlcipher" "Cdecl" "dllimport" "true" "true"
 
     let just_build_dirs = [
         "SQLitePCLRaw.nativelibrary" 
@@ -63,6 +64,8 @@ let main argv =
         "SQLitePCLRaw.provider.e_sqlcipher.uwp" 
         "SQLitePCLRaw.provider.sqlcipher.most" 
         "SQLitePCLRaw.provider.sqlcipher.uwp" 
+        "SQLitePCLRaw.provider.sqlite3.most" 
+        "SQLitePCLRaw.provider.sqlite3.uwp" 
     ]
     for s in just_build_dirs do
         exec "dotnet" "build -c Release" (Path.Combine(top, "src", s))
@@ -138,6 +141,7 @@ let main argv =
         "provider.e_sqlite3"
         "provider.e_sqlcipher"
         "provider.sqlcipher"
+        "provider.sqlite3"
         "bundle_green"
         "bundle_e_sqlite3"
         "bundle_e_sqlcipher"

diff --git a/...ePCLRaw.batteries_v2.sqlite3.dllimport/SQLitePCLRaw.batteries_v2.sqlite3.dllimport.csproj b/...ePCLRaw.batteries_v2.sqlite3.dllimport/SQLitePCLRaw.batteries_v2.sqlite3.dllimport.csproj
@@ -14,7 +14,7 @@
 </ItemGroup>
 
 <ItemGroup>
-	<ProjectReference Include="..\SQLitePCLRaw.provider.sqlite3\SQLitePCLRaw.provider.sqlite3.csproj" />
+	<ProjectReference Include="..\SQLitePCLRaw.provider.sqlite3.most\SQLitePCLRaw.provider.sqlite3.csproj" />
 </ItemGroup>
 
 </Project>
diff --git a/...der.sqlite3/Generated/provider_sqlite3.cs → ...qlite3.most/Generated/provider_sqlite3.cs b/...der.sqlite3/Generated/provider_sqlite3.cs → ...qlite3.most/Generated/provider_sqlite3.cs
diff --git a/src/SQLitePCLRaw.provider.sqlite3.most/SQLitePCLRaw.provider.sqlite3.csproj b/src/SQLitePCLRaw.provider.sqlite3.most/SQLitePCLRaw.provider.sqlite3.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <LangVersion>7.3</LangVersion>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.provider.sqlite3.snk</AssemblyOriginatorKeyFile>
+    <PackageDescription>SQLitePCL.raw is a Portable Class Library (PCL) for low-level (raw) access to SQLite.  Packages named 'SQLitePCLRaw.provider.*' (like this one) are 'plugins' that allow SQLitePCLRaw.core to access the native SQLite library.  This provider does DllImport of 'sqlite3'.  The most common use for this provider is to access the SQLite library provided with iOS.</PackageDescription>
+  </PropertyGroup>
+
+<!--
+<Target Name="autogen" BeforeTargets="BeforeBuild">
+<Exec WorkingDirectory="$(ProjectDir)" Command="t4 -o gen_provider_cdecl.cs -p:CONV=Cdecl provider.tt"/>
+<Exec WorkingDirectory="$(ProjectDir)" Command="t4 -o gen_provider_stdcall.cs -p:CONV=StdCall provider.tt"/>
+</Target>
+-->
+
+<ItemGroup>
+	<ProjectReference Include="..\SQLitePCLRaw.core\SQLitePCLRaw.core.csproj" />
+</ItemGroup>
+
+<ItemGroup>
+    <Compile Include="Generated\provider_sqlite3.cs" />
+</ItemGroup>
+
+</Project>