undo, for now, the changes made by #663 to src/tests

Author: ericsink

src/tests/my_batteries_v2.cs

@@ -1,5 +1,5 @@
 /*
-   Copyright 2014-2026 SourceGear, LLC
+   Copyright 2014-2019 SourceGear, LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -14,13 +14,55 @@ You may obtain a copy of the License at
    limitations under the License.
 */
 
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.IO;
+
 namespace SQLitePCL
 {
     public static class Batteries_V2
     {
+        class MyGetFunctionPointer : IGetFunctionPointer
+        {
+            readonly IntPtr _dll;
+            public MyGetFunctionPointer(IntPtr dll)
+            {
+                _dll = dll;
+            }
+
+            public IntPtr GetFunctionPointer(string name)
+            {
+                if (NativeLibrary.TryGetExport(_dll, name, out var f))
+                {
+                    //System.Console.WriteLine("{0}.{1} : {2}", _dll, name, f);
+                    return f;
+                }
+                else
+                {
+                    return IntPtr.Zero;
+                }
+            }
+        }
+        static IGetFunctionPointer MakeDynamic(string name, int flags)
+        {
+            // TODO should this be GetExecutingAssembly()?
+            var assy = typeof(SQLitePCL.raw).Assembly;
+            var dll = SQLitePCL.NativeLibrary.Load(name, assy, flags);
+            var gf = new MyGetFunctionPointer(dll);
+            return gf;
+        }
+        static void DoDynamic_cdecl(string name, int flags)
+        {
+            var gf = MakeDynamic(name, flags);
+            SQLitePCL.SQLite3Provider_dynamic_cdecl.Setup(name, gf);
+            SQLitePCL.raw.SetProvider(new SQLite3Provider_dynamic_cdecl());
+        }
+
         public static void Init()
         {
-            raw.SetProvider(new SQLite3Provider_e_sqlite3());
+		    DoDynamic_cdecl("e_sqlite3", NativeLibrary.WHERE_PLAIN);
         }
     }
 }
+

src/tests/tests.csproj

@@ -1,17 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(tfm_net)</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SQLitePCLRaw.core\SQLitePCLRaw.core.csproj" />
-    <ProjectReference Include="..\SQLitePCLRaw.provider.e_sqlite3\SQLitePCLRaw.provider.e_sqlite3.csproj" />
-    <ProjectReference Include="..\SQLitePCLRaw.ugly\SQLitePCLRaw.ugly.csproj" />
+	<ProjectReference Include="..\SQLitePCLRaw.core\SQLitePCLRaw.core.csproj" />
+	<ProjectReference Include="..\SQLitePCLRaw.provider.dynamic_cdecl\SQLitePCLRaw.provider.dynamic_cdecl.csproj" />
+	<ProjectReference Include="..\SQLitePCLRaw.nativelibrary\SQLitePCLRaw.nativelibrary.csproj" />
+	<!-- <ProjectReference Include="..\SQLitePCLRaw.batteries_v2.e_sqlite3.dynamic\SQLitePCLRaw.batteries_v2.e_sqlite3.dynamic.csproj" /> -->
+	<ProjectReference Include="..\SQLitePCLRaw.ugly\SQLitePCLRaw.ugly.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SourceGear.sqlite3" Version="$(lib_e_sqlite3_package_reference_version)" />
+    <PackageReference Include="AltCover" Version="5.3.675" />
+    <DotNetCliToolReference Include="dotnet-reportgenerator-cli" Version="4.1.10" />
     <PackageReference Include="microsoft.net.test.sdk" Version="$(depversion_microsoft_net_test_sdk)" />
     <PackageReference Include="xunit" Version="$(depversion_xunit)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(depversion_xunit_runner_visualstudio)" />