Index: .fossil-settings/ignore-glob
==================================================================
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -1,3 +1,4 @@
-Externals/Eagle/bin/Eagle*.pdb
-Externals/Eagle/bin/x64/Spilornis.pdb
-Externals/Eagle/bin/x86/Spilornis.pdb
+Externals/Eagle/bin/netFramework40/Eagle*.pdb
+Externals/Eagle/bin/netFramework40/x64/Spilornis.pdb
+Externals/Eagle/bin/netFramework40/x86/Spilornis.pdb
+Externals/Eagle/bin/netStandard20/Eagle*.pdb

Index: Doc/Extra/Provider/environment.html
==================================================================
--- Doc/Extra/Provider/environment.html
+++ Doc/Extra/Provider/environment.html
@@ -185,10 +185,16 @@
           GetSettingValue method will never result in the XML configuration
           file being read; instead, the default value will be returned.  This
           will effectively prevent any setting values specified via the XML
           configuration file from having any effect.</td>
         </tr>
+        <tr valign="top">
+          <td>PreLoadSQLite_AllowBaseDirectoryOnly</td>
+          <td>If this environment variable is set [to anything], the base
+          directory itself is considered valid for pre-loading the native
+          SQLite library.</td>
+        </tr>
         <tr valign="top">
           <td>PreLoadSQLite_BaseDirectory</td>
           <td>If this environment variable is set [to anything], it will be
           used instead of the application base directory by the native
           library pre-loader.  This environment variable can be especially
@@ -196,11 +202,11 @@
           of the location of the managed assemblies is not under the control
           of the application.</td>
         </tr>
         <tr valign="top">
           <td>PreLoadSQLite_BreakIntoDebugger</td>
-          <td>If this configuration variable is set [to anything], the native
+          <td>If this environment variable is set [to anything], the native
           library pre-loader subsystem will attempt to give the interactive
           user an opportunity to attach a debugger to the current process.</td>
         </tr>
         <tr valign="top">
           <td>PreLoadSQLite_LibraryFileNameOnly</td>

Index: Doc/Extra/Provider/version.html
==================================================================
--- Doc/Extra/Provider/version.html
+++ Doc/Extra/Provider/version.html
@@ -45,10 +45,11 @@
     <h1 class="heading">Version History</h1>
     <p><b>1.0.109.0 - May XX, 2018 <font color="red">(release scheduled)</font></b></p>
     <ul>
       <li>Updated to <a href="https://www.sqlite.org/releaselog/3_23_1.html">SQLite 3.23.1</a>.</li>
       <li>Prevent GetSchemaTable from throwing InvalidCastException. Fix for <a href="https://system.data.sqlite.org/index.html/info/baf42ee135">[baf42ee135]</a>.</li>
+      <li>Add preliminary support for .NET Core 2.0 and the .NET Standard 2.0.</li>
       <li>Add simpler overload for the SQLiteBlob.Create method. Pursuant to <a href="https://system.data.sqlite.org/index.html/info/dfc8133ba2">[dfc8133ba2]</a>.</li>
       <li>Add GetFieldAffinity method to the SQLiteDataReader class.</li>
     </ul>
     <p><b>1.0.108.0 - March 2, 2018</b></p>
     <ul>

DELETED Externals/Eagle/bin/Eagle.dll
Index: Externals/Eagle/bin/Eagle.dll
==================================================================
--- Externals/Eagle/bin/Eagle.dll
+++ /dev/null
cannot compute difference between binary files

DELETED Externals/Eagle/bin/EagleShell.exe
Index: Externals/Eagle/bin/EagleShell.exe
==================================================================
--- Externals/Eagle/bin/EagleShell.exe
+++ /dev/null
cannot compute difference between binary files

DELETED Externals/Eagle/bin/EagleShell.exe.config
Index: Externals/Eagle/bin/EagleShell.exe.config
==================================================================
--- Externals/Eagle/bin/EagleShell.exe.config
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *
- * EagleShell.exe.config -
- *
- * Copyright (c) 2007-2012 by Joe Mistachkin.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution of
- * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: $
- *
--->
-<configuration>
-  <appSettings>
-    <add key="NoVerbose" value="1" />
-
-    <!--
-    <add key="ArgumentCount" value="3" />
-    <add key="Argument0String" value="-anyInitialize" />
-    <add key="Argument1String" value="puts stdout app_settings1" />
-    <add key="Argument2List" value="-anyInitialize {puts stdout app_settings2}" />
-    -->
-  </appSettings>
-
-  <startup useLegacyV2RuntimeActivationPolicy="true">
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
-
-    <!--
-    <supportedRuntime version="v2.0.50727" />
-    <supportedRuntime version="v4.0.30319" />
-    -->
-
-    <!--
-    <requiredRuntime version="v2.0.50727" safemode="false" />
-    <requiredRuntime version="v4.0.30319" safemode="false" />
-    -->
-  </startup>
-
-  <runtime>
-    <!--
-        NOTE: These are known to be useful with Eagle.  Some of these only
-              work on the .NET Framework 4.0.
-    -->
-    <!--
-    <legacyCorruptedStateExceptionsPolicy enabled="true" />
-    <generatePublisherEvidence enabled="false" />
-    <NetFx40_LegacySecurityPolicy enabled="true" />
-    -->
-
-    <!--
-        NOTE: Most of these have not been tested with Eagle.  Some of these
-              only work on the .NET Framework 2.0 -OR- .NET Framework 4.0.
-    -->
-    <!--
-    <alwaysFlowImpersonationPolicy enabled="false" />
-    <appDomainManagerAssembly value="Eagle, ..." />
-    <appDomainManagerType value="Eagle._Components.Public.DomainManager" />
-    <appDomainResourceMonitoring enabled="false" />
-    <bypassTrustedAppStrongNames enabled="false" />
-    <CompatSortNLSVersion enabled="4096" />
-    <developmentMode developerInstallation="false" />
-    <disableCachingBindingFailure enabled="0" />
-    <disableCommitThreadStack enabled="0" />
-    <disableFusionUpdatesFromADManager enabled="0" />
-    <enforceFIPSPolicy enabled="true" />
-    <etwEnable enabled="true" />
-    <forcePerformanceCounterUniqueSharedMemoryReads enabled="false" />
-    <gcConcurrent enabled="true" />
-    <gcServer enabled="false" />
-    <generatePublisherEvidence enabled="true" />
-    <legacyCorruptedStateExceptionsPolicy enabled="false" />
-    <legacyImpersonationPolicy enabled="false" />
-    <legacyV1CASPolicy enabled="false" />
-    <loadFromRemoteSources enabled="false" />
-    <NetFx40_LegacySecurityPolicy enabled="false" />
-    <NetFx40_PInvokeStackResilience enabled="0" />
-    <PreferComInsteadOfManagedRemoting enabled="false" />
-    <qualifyAssembly partialName="Eagle" fullName="Eagle, ..." />
-    <shadowCopyVerifyByTimestamp enabled="false" />
-    <supportPortability PKT="31bf3856ad364e35" enabled="false" />
-    <TimeSpan_LegacyFormatMode enabled="false" />
-    <UseSmallInternalThreadStacks enabled="false" />
-    -->
-
-    <!--
-        NOTE: This could be used to redirect assembly binding for Eagle,
-              to avoid needing the exact build number.
-    -->
-    <!--
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Eagle"
-                          publicKeyToken="29c6297630be05eb"
-                          culture="neutral" />
-
-        <bindingRedirect oldVersion="1.0.0.0-1.0.65535.65535"
-                         newVersion="[info engine PatchLevel]" />
-      </dependentAssembly>
-
-      <dependentAssembly>
-        <assemblyIdentity name="Eagle"
-                          publicKeyToken="1e22ec67879739a2"
-                          culture="neutral" />
-
-        <bindingRedirect oldVersion="1.0.0.0-1.0.65535.65535"
-                         newVersion="[info engine PatchLevel]" />
-      </dependentAssembly>
-
-      <dependentAssembly>
-        <assemblyIdentity name="Eagle"
-                          publicKeyToken="358030063a832bc3"
-                          culture="neutral" />
-
-        <bindingRedirect oldVersion="1.0.0.0-1.0.65535.65535"
-                         newVersion="[info engine PatchLevel]" />
-      </dependentAssembly>
-    </assemblyBinding>
-    -->
-  </runtime>
-
-  <system.diagnostics>
-    <!--
-        NOTE: This can be used to enable trace logging to a test file.
-    -->
-    <!--
-    <trace>
-      <listeners>
-        <add name="eagleLogListener"
-             type="System.Diagnostics.TextWriterTraceListener"
-             initializeData="eagle.log" />
-      </listeners>
-    </trace>
-    -->
-  </system.diagnostics>
-</configuration>

DELETED Externals/Eagle/bin/EagleShell.exe.mda.config
Index: Externals/Eagle/bin/EagleShell.exe.mda.config
==================================================================
--- Externals/Eagle/bin/EagleShell.exe.mda.config
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *
- * EagleShell.exe.mda.config -
- *
- * Copyright (c) 2007-2012 by Joe Mistachkin.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution of
- * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: $
- *
--->
-<mdaConfig xmlns="http://schemas.microsoft.com/CLR/2004/10/mda">
-  <!--
-      NOTE: The "jitCompilationStart" and "memberInfoCacheCreation" managed
-            debugging assistants are extremely noisy.
-
-            Using the "pInvokeLog" managed debugging assistant with no filter
-            shows the signature of all P/Invoke calls.  Unfortunately, as of
-            the .NET Framework 4.5, it does not appear to support the standard
-            wildcard (i.e. "glob") syntax in the filter "dllName" attribute.
-            Also, it does not appear to monitor any native calls invoked via
-            managed delegates (i.e. those created via the Marshal class using
-            the GetDelegateForFunctionPointer method).
-  -->
-  <assistants>
-    <!--++
-    <asynchronousThreadAbort />
-    <bindingFailure />
-    <callbackOnCollectedDelegate listSize="50" />
-    <contextSwitchDeadlock enable="true" />
-    <dangerousThreadingAPI />
-    <dateTimeInvalidLocalFormat />
-    <dirtyCastAndCallOnInterface />
-    <disconnectedContext enable="true" />
-    <dllMainReturnsFalse />
-    <exceptionSwallowedOnCallFromCom enable="true" />
-    <failedQI />
-    <fatalExecutionEngineError />
-    <gcManagedToUnmanaged />
-    <gcUnmanagedToManaged />
-    <illegalPrepareConstrainedRegion />
-    <invalidApartmentStateChange />
-    <invalidCERCall />
-    <invalidFunctionPointerInDelegate enable="true" />
-    <invalidGCHandleCookie />
-    <invalidIUnknown />
-    <invalidMemberDeclaration />
-    <invalidOverlappedToPinvoke />
-    <invalidVariant />
-    <jitCompilationStart>
-      <methods>
-        <match name="*" />
-      </methods>
-    </jitCompilationStart>
-    <loaderLock />
-    <loadFromContext />
-    <marshalCleanupError enable="true" />
-    <marshaling>
-      <methodFilter>
-        <match name="*" />
-      </methodFilter>
-      <fieldFilter>
-        <match name="*" />
-      </fieldFilter>
-    </marshaling>
-    <memberInfoCacheCreation />
-    <moduloObjectHashcode modulus="1" />
-    <nonComVisibleBaseClass />
-    <notMarshalable />
-    <openGenericCERCall />
-    <overlappedFreeError />
-    <pInvokeLog />
-    <pInvokeLog>
-      <filter>
-        <match dllName="advapi32.dll" />
-        <match dllName="advpack.dll" />
-        <match dllName="crypt32.dll" />
-        <match dllName="kernel32.dll" />
-        <match dllName="mscoree.dll" />
-        <match dllName="msvcrt.dll" />
-        <match dllName="ntdll.dll" />
-        <match dllName="shell32.dll" />
-        <match dllName="user32.dll" />
-        <match dllName="wintrust.dll" />
-      </filter>
-    </pInvokeLog>
-    <pInvokeStackImbalance />
-    <raceOnRCWCleanup />
-    <reentrancy />
-    <releaseHandleFailed />
-    <reportAvOnComRelease allowAv="true" />
-    <streamWriterBufferedDataLost />
-    <virtualCERCall />
-    ++-->
-  </assistants>
-</mdaConfig>

DELETED Externals/Eagle/bin/EagleShell32.exe
Index: Externals/Eagle/bin/EagleShell32.exe
==================================================================
--- Externals/Eagle/bin/EagleShell32.exe
+++ /dev/null
cannot compute difference between binary files

ADDED   Externals/Eagle/bin/netFramework40/Eagle.dll
Index: Externals/Eagle/bin/netFramework40/Eagle.dll
==================================================================
--- /dev/null
+++ Externals/Eagle/bin/netFramework40/Eagle.dll
cannot compute difference between binary files

ADDED   Externals/Eagle/bin/netFramework40/EagleShell.exe
Index: Externals/Eagle/bin/netFramework40/EagleShell.exe
==================================================================
--- /dev/null
+++ Externals/Eagle/bin/netFramework40/EagleShell.exe
cannot compute difference between binary files

ADDED   Externals/Eagle/bin/netFramework40/EagleShell.exe.config
Index: Externals/Eagle/bin/netFramework40/EagleShell.exe.config
==================================================================
--- /dev/null
+++ Externals/Eagle/bin/netFramework40/EagleShell.exe.config
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ *
+ * EagleShell.exe.config -
+ *
+ * Copyright (c) 2007-2012 by Joe Mistachkin.  All rights reserved.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS: @(#) $Id: $
+ *
+-->
+<configuration>
+  <appSettings>
+    <add key="NoVerbose" value="1" />
+
+    <!--
+    <add key="ArgumentCount" value="3" />
+    <add key="Argument0String" value="-anyInitialize" />
+    <add key="Argument1String" value="puts stdout app_settings1" />
+    <add key="Argument2List" value="-anyInitialize {puts stdout app_settings2}" />
+    -->
+  </appSettings>
+
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+
+    <!--
+    <supportedRuntime version="v2.0.50727" />
+    <supportedRuntime version="v4.0.30319" />
+    -->
+
+    <!--
+    <requiredRuntime version="v2.0.50727" safemode="false" />
+    <requiredRuntime version="v4.0.30319" safemode="false" />
+    -->
+  </startup>
+
+  <runtime>
+    <!--
+        NOTE: These are known to be useful with Eagle.  Some of these only
+              work on the .NET Framework 4.0.
+    -->
+    <!--
+    <legacyCorruptedStateExceptionsPolicy enabled="true" />
+    <generatePublisherEvidence enabled="false" />
+    <NetFx40_LegacySecurityPolicy enabled="true" />
+    -->
+
+    <!--
+        NOTE: Most of these have not been tested with Eagle.  Some of these
+              only work on the .NET Framework 2.0 -OR- .NET Framework 4.0.
+    -->
+    <!--
+    <alwaysFlowImpersonationPolicy enabled="false" />
+    <appDomainManagerAssembly value="Eagle, ..." />
+    <appDomainManagerType value="Eagle._Components.Public.DomainManager" />
+    <appDomainResourceMonitoring enabled="false" />
+    <bypassTrustedAppStrongNames enabled="false" />
+    <CompatSortNLSVersion enabled="4096" />
+    <developmentMode developerInstallation="false" />
+    <disableCachingBindingFailure enabled="0" />
+    <disableCommitThreadStack enabled="0" />
+    <disableFusionUpdatesFromADManager enabled="0" />
+    <enforceFIPSPolicy enabled="true" />
+    <etwEnable enabled="true" />
+    <forcePerformanceCounterUniqueSharedMemoryReads enabled="false" />
+    <gcConcurrent enabled="true" />
+    <gcServer enabled="false" />
+    <generatePublisherEvidence enabled="true" />
+    <legacyCorruptedStateExceptionsPolicy enabled="false" />
+    <legacyImpersonationPolicy enabled="false" />
+    <legacyV1CASPolicy enabled="false" />
+    <loadFromRemoteSources enabled="false" />
+    <NetFx40_LegacySecurityPolicy enabled="false" />
+    <NetFx40_PInvokeStackResilience enabled="0" />
+    <PreferComInsteadOfManagedRemoting enabled="false" />
+    <qualifyAssembly partialName="Eagle" fullName="Eagle, ..." />
+    <shadowCopyVerifyByTimestamp enabled="false" />
+    <supportPortability PKT="31bf3856ad364e35" enabled="false" />
+    <TimeSpan_LegacyFormatMode enabled="false" />
+    <UseSmallInternalThreadStacks enabled="false" />
+    -->
+
+    <!--
+        NOTE: This could be used to redirect assembly binding for Eagle,
+              to avoid needing the exact build number.
+    -->
+    <!--
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Eagle"
+                          publicKeyToken="29c6297630be05eb"
+                          culture="neutral" />
+
+        <bindingRedirect oldVersion="1.0.0.0-1.0.65535.65535"
+                         newVersion="[info engine PatchLevel]" />
+      </dependentAssembly>
+
+      <dependentAssembly>
+        <assemblyIdentity name="Eagle"
+                          publicKeyToken="1e22ec67879739a2"
+                          culture="neutral" />
+
+        <bindingRedirect oldVersion="1.0.0.0-1.0.65535.65535"
+                         newVersion="[info engine PatchLevel]" />
+      </dependentAssembly>
+
+      <dependentAssembly>
+        <assemblyIdentity name="Eagle"
+                          publicKeyToken="358030063a832bc3"
+                          culture="neutral" />
+
+        <bindingRedirect oldVersion="1.0.0.0-1.0.65535.65535"
+                         newVersion="[info engine PatchLevel]" />
+      </dependentAssembly>
+    </assemblyBinding>
+    -->
+  </runtime>
+
+  <system.diagnostics>
+    <!--
+        NOTE: This can be used to enable trace logging to a test file.
+    -->
+    <!--
+    <trace>
+      <listeners>
+        <add name="eagleLogListener"
+             type="System.Diagnostics.TextWriterTraceListener"
+             initializeData="eagle.log" />
+      </listeners>
+    </trace>
+    -->
+  </system.diagnostics>
+</configuration>

ADDED   Externals/Eagle/bin/netFramework40/EagleShell.exe.mda.config
Index: Externals/Eagle/bin/netFramework40/EagleShell.exe.mda.config
==================================================================
--- /dev/null
+++ Externals/Eagle/bin/netFramework40/EagleShell.exe.mda.config
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ *
+ * EagleShell.exe.mda.config -
+ *
+ * Copyright (c) 2007-2012 by Joe Mistachkin.  All rights reserved.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS: @(#) $Id: $
+ *
+-->
+<mdaConfig xmlns="http://schemas.microsoft.com/CLR/2004/10/mda">
+  <!--
+      NOTE: The "jitCompilationStart" and "memberInfoCacheCreation" managed
+            debugging assistants are extremely noisy.
+
+            Using the "pInvokeLog" managed debugging assistant with no filter
+            shows the signature of all P/Invoke calls.  Unfortunately, as of
+            the .NET Framework 4.5, it does not appear to support the standard
+            wildcard (i.e. "glob") syntax in the filter "dllName" attribute.
+            Also, it does not appear to monitor any native calls invoked via
+            managed delegates (i.e. those created via the Marshal class using
+            the GetDelegateForFunctionPointer method).
+  -->
+  <assistants>
+    <!--++
+    <asynchronousThreadAbort />
+    <bindingFailure />
+    <callbackOnCollectedDelegate listSize="50" />
+    <contextSwitchDeadlock enable="true" />
+    <dangerousThreadingAPI />
+    <dateTimeInvalidLocalFormat />
+    <dirtyCastAndCallOnInterface />
+    <disconnectedContext enable="true" />
+    <dllMainReturnsFalse />
+    <exceptionSwallowedOnCallFromCom enable="true" />
+    <failedQI />
+    <fatalExecutionEngineError />
+    <gcManagedToUnmanaged />
+    <gcUnmanagedToManaged />
+    <illegalPrepareConstrainedRegion />
+    <invalidApartmentStateChange />
+    <invalidCERCall />
+    <invalidFunctionPointerInDelegate enable="true" />
+    <invalidGCHandleCookie />
+    <invalidIUnknown />
+    <invalidMemberDeclaration />
+    <invalidOverlappedToPinvoke />
+    <invalidVariant />
+    <jitCompilationStart>
+      <methods>
+        <match name="*" />
+      </methods>
+    </jitCompilationStart>
+    <loaderLock />
+    <loadFromContext />
+    <marshalCleanupError enable="true" />
+    <marshaling>
+      <methodFilter>
+        <match name="*" />
+      </methodFilter>
+      <fieldFilter>
+        <match name="*" />
+      </fieldFilter>
+    </marshaling>
+    <memberInfoCacheCreation />
+    <moduloObjectHashcode modulus="1" />
+    <nonComVisibleBaseClass />
+    <notMarshalable />
+    <openGenericCERCall />
+    <overlappedFreeError />
+    <pInvokeLog />
+    <pInvokeLog>
+      <filter>
+        <match dllName="advapi32.dll" />
+        <match dllName="advpack.dll" />
+        <match dllName="crypt32.dll" />
+        <match dllName="kernel32.dll" />
+        <match dllName="mscoree.dll" />
+        <match dllName="msvcrt.dll" />
+        <match dllName="ntdll.dll" />
+        <match dllName="shell32.dll" />
+        <match dllName="user32.dll" />
+        <match dllName="wintrust.dll" />
+      </filter>
+    </pInvokeLog>
+    <pInvokeStackImbalance />
+    <raceOnRCWCleanup />
+    <reentrancy />
+    <releaseHandleFailed />
+    <reportAvOnComRelease allowAv="true" />
+    <streamWriterBufferedDataLost />
+    <virtualCERCall />
+    ++-->
+  </assistants>
+</mdaConfig>

ADDED   Externals/Eagle/bin/netFramework40/EagleShell32.exe
Index: Externals/Eagle/bin/netFramework40/EagleShell32.exe
==================================================================
--- /dev/null
+++ Externals/Eagle/bin/netFramework40/EagleShell32.exe
cannot compute difference between binary files

ADDED   Externals/Eagle/bin/netFramework40/x64/Spilornis.dll
Index: Externals/Eagle/bin/netFramework40/x64/Spilornis.dll
==================================================================
--- /dev/null
+++ Externals/Eagle/bin/netFramework40/x64/Spilornis.dll
cannot compute difference between binary files

ADDED   Externals/Eagle/bin/netFramework40/x86/Spilornis.dll
Index: Externals/Eagle/bin/netFramework40/x86/Spilornis.dll
==================================================================
--- /dev/null
+++ Externals/Eagle/bin/netFramework40/x86/Spilornis.dll
cannot compute difference between binary files

DELETED Externals/Eagle/bin/x64/Spilornis.dll
Index: Externals/Eagle/bin/x64/Spilornis.dll
==================================================================
--- Externals/Eagle/bin/x64/Spilornis.dll
+++ /dev/null
cannot compute difference between binary files

DELETED Externals/Eagle/bin/x86/Spilornis.dll
Index: Externals/Eagle/bin/x86/Spilornis.dll
==================================================================
--- Externals/Eagle/bin/x86/Spilornis.dll
+++ /dev/null
cannot compute difference between binary files

Index: Externals/Eagle/lib/Eagle1.0/csharp.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/csharp.eagle
+++ Externals/Eagle/lib/Eagle1.0/csharp.eagle
@@ -19,16 +19,433 @@
 #       support namespaces ourselves, we do not want to pollute the global
 #       namespace if this script actually ends up being evaluated in Tcl.
 #
 namespace eval ::Eagle {
   #
-  # NOTE: This procedure is used to dynamically compile some C# code from
-  #       within a script.  While this procedure was originally designed
-  #       to be used by the test suite, it can be quite useful in non-test
+  # NOTE: This procedure is used to determine the fully qualified path to the
+  #       .NET Core SDK.  An empty string will be returned to indicate an
+  #       error.  This procedure should not raise script errors.
+  #
+  proc getDotNetCoreSdkPath {} {
+    if {[catch {exec -- dotnet --info} info] == 0} then {
+      set info [string map [list \r\n \n] $info]
+
+      if {[regexp -line -- \
+          {^\s*Base Path:\s+([^\n]+)$} $info dummy path]} then {
+        return [file normalize $path]
+      }
+    }
+
+    return ""
+  }
+
+  #
+  # NOTE: This procedure is used to determine the fully qualified path to the
+  #       directory containing the reference assemblies for the .NET Standard
+  #       2.0.  An empty string will be returned to indicate an error.  This
+  #       procedure should not raise script errors.
+  #
+  proc getDotNetStandardReferencePath {
+          {packageVersion ""} {standardVersion netstandard2.0} } {
+    set path [getDotNetCoreSdkPath]
+
+    if {[string length $path] > 0} then {
+      set libraryDirectory [file normalize [file join \
+          [file dirname $path] NuGetFallbackFolder netstandard.library]]
+
+      set buildReferenceSubDirectory [file join build $standardVersion ref]
+
+      if {[string length $packageVersion] > 0} then {
+        set assemblyDirectory [file normalize [file join \
+            $libraryDirectory $packageVersion $buildReferenceSubDirectory]]
+
+        if {[file exists $assemblyDirectory]} then {
+          return $assemblyDirectory
+        }
+      } else {
+        set globPathPattern [file join $libraryDirectory *]
+
+        set maybeVersions [lsort -decreasing -command [list package vsort] \
+            [lmap directory [glob -nocomplain -types {d} $globPathPattern] \
+            { file tail $directory }]]
+
+        foreach maybeVersion $maybeVersions {
+          set assemblyDirectory [file normalize [file join \
+              $libraryDirectory $maybeVersion $buildReferenceSubDirectory]]
+
+          if {[file exists $assemblyDirectory]} then {
+            return $assemblyDirectory
+          }
+        }
+      }
+    }
+
+    return ""
+  }
+
+  #
+  # NOTE: This procedure is used to obtain a test program for use with the
+  #       C# compiler.  Upon success, the return value will be a list with
+  #       two elements.  The first element will be the name of the C# class
+  #       to be compiled.  The second element will be the C# program text.
+  #       Upon failure, the return value will be an empty list.
+  #
+  proc getCSharpTestProgram { {name ""} } {
+    set prefix Test
+    set id [object invoke Interpreter.GetActive NextId]
+
+    set className [appendArgs \
+        $prefix Namespace $id [object invoke Type Delimiter] \
+        $prefix Class $id]
+
+    return [list $className [subst {
+      using System;
+
+      namespace ${prefix}Namespace${id}
+      {
+        public static class ${prefix}Class${id}
+        {
+          public static Int32 Main(String\[\] args)
+          {
+            return 0;
+          }
+        }
+      }
+    }]]
+  }
+
+  #
+  # NOTE: This procedure is used to determine whether the C# compiler appears
+  #       to work when invoked via the interfaces defined in this script file.
+  #       Non-zero is returned to indicate success.  This procedure should not
+  #       raise script errors.
+  #
+  proc doesCompileCSharpWork { {name ""} } {
+    if {[catch {getCSharpTestProgram $name} program]} then {
+      return false
+    }
+
+    if {[llength $program] < 2} then {
+      return false
+    }
+
+    unset -nocomplain results errors
+
+    if {[catch {
+      compileCSharp [lindex $program 1] true true true results errors
+    } code]} then {
+      return false
+    }
+
+    if {$code ne "Ok"} then {
+      return false
+    }
+
+    if {[catch {
+      object invoke [lindex $program 0] Main null
+    } exitCode]} then {
+      return false
+    }
+
+    if {$exitCode ne "0"} then {
+      return false
+    }
+
+    return true
+  }
+
+  #
+  # NOTE: This procedure is used to determine the command line arguments that
+  #       are required to invoke the .NET Core SDK compiler for C#.  An empty
+  #       list will be returned if the arguments cannot be determined for some
+  #       reason -OR- the C# compiler cannot be found.  This procedure should
+  #       not raise script errors.
+  #
+  proc getDotNetCoreCSharpCommandArgs {} {
+    set path [getDotNetCoreSdkPath]
+
+    if {[string length $path] > 0} then {
+      set compilerFileName [file normalize [file join \
+          $path Roslyn bincore csc.dll]]
+
+      if {[file exists $compilerFileName]} then {
+        return [list dotnet exec [appendArgs \
+            \" [file nativename $compilerFileName] \"]]
+      }
+    }
+
+    return [list]
+  }
+
+  #
+  # NOTE: This procedure is used to format an option to the C# compiler.  It
+  #       may have a name and/or a value.  This procedure should not raise
+  #       script errors.
+  #
+  proc formatCompilerArgument { name value } {
+    set wrap ""
+
+    if {[regexp -- {\s} $name] || [regexp -- {\s} $value]} then {
+      set wrap \"
+    }
+
+    if {[string length $name] > 0} then {
+      if {[string length $value] > 0} then {
+        return [appendArgs $wrap $name : $value $wrap]
+      } else {
+        return [appendArgs $wrap $name $wrap]
+      }
+    } else {
+      if {[string length $value] > 0} then {
+        return [appendArgs $wrap $value $wrap]
+      } else {
+        return ""
+      }
+    }
+  }
+
+  #
+  # NOTE: This procedure is used to translate a name/value pair into zero or
+  #       more options to the C# compiler.  This procedure should not raise
+  #       script errors.
+  #
+  proc compilerParameterToArguments {
+          name {value ""} {outputAssemblyVarName ""} } {
+    switch -exact -nocase -- $name {
+      WarningLevel {
+        set name -warn
+      }
+      TreatWarningsAsErrors {
+        set name -warnaserror
+      }
+      OutputAssembly {
+        if {[string length $outputAssemblyVarName] > 0} then {
+          #
+          # HACK: This compiler parameter is handled by our caller; however,
+          #       we want to honor the value specified via the OutputAssembly
+          #       property.  Therefore, reset the specified variable from the
+          #       caller to the new value.
+          #
+          upvar 1 $outputAssemblyVarName outputAssembly
+
+          #
+          # NOTE: Use the file name value specified by the caller verbatim.
+          #
+          set outputAssembly $value
+
+          #
+          # HACK: Also, make sure that we do not handle this parameter again,
+          #       below.
+          #
+          set name ""; set value ""
+        } else {
+          #
+          # BUGBUG: Translate the compiler parameter; however, this may not
+          #         actually work, depending on how our caller handles its
+          #         output assembly file name.  At the time this block was
+          #         originally written (2018-04-09), the only caller (i.e.
+          #         [compileViaDotNetCoreCSharp]) always passed the output
+          #         assembly variable name, making this a non-issue.  This
+          #         convention should also be followed by future callers of
+          #         this procedure.
+          #
+          set name -out
+        }
+      }
+      ReferencedAssemblies.Add {
+        set name -reference
+
+        if {[file pathtype $value] ne "absolute"} then {
+          set value [file nativename [file normalize \
+              [file join [getDotNetStandardReferencePath] \
+              $value]]]
+        }
+      }
+    }
+
+    set formatted [formatCompilerArgument $name $value]
+
+    if {[string length $formatted] > 0} then {
+      return [list $formatted]
+    } else {
+      return [list]
+    }
+  }
+
+  #
+  # NOTE: This procedure is used to obtain the base command line options for
+  #       the C# compiler, including those that may be enabled by default.
+  #       An empty string may be returned.  This procedure should not raise
+  #       script errors.
+  #
+  proc getCSharpCompilerOptions { parameters library csharp prefix } {
+    #
+    # NOTE: Make sure that the "standard" preprocessor defines match those
+    #       for the platform (i.e. the ones used to compile the Eagle core
+    #       library assembly).  This caller may disable this handling.
+    #
+    if {$library} then {
+      set libraryOptions [expr { \
+          [info exists ::eagle_platform(compileOptions)] ? \
+          $::eagle_platform(compileOptions) : [list] \
+      }]
+    } else {
+      set libraryOptions ""
+    }
+
+    #
+    # NOTE: Permit extra C# compiler options to be passed via the global
+    #       array element "csharpOptions", if it exists.  This caller may
+    #       disable this handling.
+    #
+    if {$csharp} then {
+      set csharpOptions [expr { \
+          [info exists ::eagle_platform(csharpOptions)] ? \
+          $::eagle_platform(csharpOptions) : [list] \
+      }]
+    } else {
+      set csharpOptions ""
+    }
+
+    #
+    # NOTE: Start out with no compiler options.
+    #
+    set result ""
+
+    #
+    # NOTE: Grab the existing compiler options, if any.  This caller may
+    #       disable this handling (e.g. by specifying an invalid opaque
+    #       object handle for the "parameters" argument).
+    #
+    if {[isNonNullObjectHandle $parameters]} then {
+      if {[string length $result] > 0} then {
+        append result " "
+      }
+
+      append result [$parameters CompilerOptions]
+    }
+
+    #
+    # NOTE: Are there any Eagle core library options to check?
+    #
+    if {[llength $libraryOptions] > 0} then {
+      #
+      # NOTE: Was the Eagle core library built in the Debug configuration?
+      #
+      if {"DEBUG" in $libraryOptions} then {
+        if {[string length $result] > 0} then {
+          append result " "
+        }
+
+        append result $prefix define:DEBUG
+      }
+
+      #
+      # NOTE: Was the Eagle core library built with tracing enabled (i.e.
+      #       this allows for use of System.Diagnostics.Trace, etc)?
+      #
+      if {"TRACE" in $libraryOptions} then {
+        if {[string length $result] > 0} then {
+          append result " "
+        }
+
+        append result $prefix define:TRACE
+      }
+    }
+
+    #
+    # NOTE: Are there any extra C# compiler options to add?
+    #
+    if {[llength $csharpOptions] > 0} then {
+      #
+      # NOTE: Append the configured extra C# compiler options configured
+      #       via the global array element "csharpOptions", if any.
+      #
+      foreach csharpOption $csharpOptions {
+        if {[string length $result] > 0} then {
+          append result " "
+        }
+
+        append result $csharpOption
+      }
+    }
+
+    return $result
+  }
+
+  #
+  # NOTE: This procedure is used to escape all characters in the specified
+  #       string for use inside of a regular expression.  An empty string
+  #       may be returned.  This procedure should not raise script errors.
+  #
+  proc regexpEscapeAll { value } {
+    set result ""
+
+    foreach char [split $value ""] {
+      append result \\u [format %04X [string ordinal $char 0]]
+    }
+
+    return $result
+  }
+
+  #
+  # NOTE: This procedure is used to execute the C# compiler and returns its
+  #       platform normalized results.
+  #
+  proc runDotNetCSharpCommand { command } {
+    #
+    # NOTE: Evaluate the [exec] command constructed by our caller, in their
+    #       context, and return the results, with line-endings normalized.
+    #
+    return [string map [list \r\n \n] [uplevel 1 $command]]
+  }
+
+  #
+  # NOTE: This procedure is used to extract the C# compiler error messages
+  #       from its results.  An empty list will be returned if the errors
+  #       cannot be determined for some reason.  This procedure should not
+  #       raise script errors.
+  #
+  proc extractCSharpErrors { fileName results } {
+    set list [list]
+
+    foreach {dummy match} [regexp -all -line -inline -- \
+        [appendArgs (^(?: [regexpEscapeAll $fileName] \
+        {\(\d+,\d+\): )?error CS\d{4}: [^\n]+$)}] $results] {
+      lappend list $match
+    }
+
+    return $list
+  }
+
+  #
+  # NOTE: This procedure is used to extract the C# compiler warning messages
+  #       from its results.  An empty list will be returned if the warnings
+  #       cannot be determined for some reason.  This procedure should not
+  #       raise script errors.
+  #
+  proc extractCSharpWarnings { fileName results } {
+    set list [list]
+
+    foreach {dummy match} [regexp -all -line -inline -- \
+        [appendArgs (^(?: [regexpEscapeAll $fileName] \
+        {\(\d+,\d+\): )?warning CS\d{4}: [^\n]+$)}] $results] {
+      lappend list $match
+    }
+
+    return $list
+  }
+
+  #
+  # NOTE: This procedure is used to dynamically compile arbitrary C# code
+  #       from within a script using the CSharpCodeProvider class present
+  #       in the desktop .NET Framework.  It may work on some versions of
+  #       Mono as well.  This procedure was originally designed to be used
+  #       by the test suite; however, it can be quite useful in non-test
   #       scripts as well.
   #
-  proc compileCSharp {
+  proc compileViaCSharpCodeProvider {
           string memory symbols strict resultsVarName errorsVarName args } {
     #
     # NOTE: The [object] command is required by this procedure.  If it
     #       is not available, bail out now.
     #
@@ -69,12 +486,17 @@
         System.CodeDom.Compiler.CompilerParameters]
 
     #
     # NOTE: Do we not want to persist the generated assembly to disk?
     #
+    set outputFileName ""
+
     if {$memory} then {
       $parameters GenerateInMemory true
+    } else {
+      $parameters OutputAssembly \
+          [set outputFileName [appendArgs [file tempname] .dll]]
     }
 
     #
     # NOTE: Do we want symbols to be generated for the generated assembly?
     #
@@ -81,80 +503,27 @@
     if {$symbols} then {
       $parameters IncludeDebugInformation true
     }
 
     #
-    # NOTE: Make sure that the "standard" preprocessor defines match those
-    #       for the platform (i.e. the ones used to compile the Eagle core
-    #       library assembly).
-    #
-    set platformOptions [expr { \
-        [info exists ::eagle_platform(compileOptions)] ? \
-        $::eagle_platform(compileOptions) : [list]}]
-
-    #
-    # NOTE: Permit extra C# compiler options to be passed via the global
-    #       array element "csharpOptions", if it exists.
-    #
-    set csharpOptions [expr { \
-        [info exists ::eagle_platform(csharpOptions)] ? \
-        $::eagle_platform(csharpOptions) : [list]}]
-
-    if {[llength $platformOptions] > 0 || \
-        [llength $csharpOptions] > 0} then {
-      #
-      # NOTE: Grab the existing compiler options, if any.
-      #
-      set compilerOptions [$parameters CompilerOptions]
-
-      if {"DEBUG" in $platformOptions} then {
-        if {[string length $compilerOptions] > 0} then {
-          append compilerOptions " "
-        }
-
-        append compilerOptions /define:DEBUG
-      }
-
-      if {"TRACE" in $platformOptions} then {
-        if {[string length $compilerOptions] > 0} then {
-          append compilerOptions " "
-        }
-
-        append compilerOptions /define:TRACE
-      }
-
-      #
-      # NOTE: Append the configured extra C# compiler options configured
-      #       via the global array element "csharpOptions", if any.
-      #
-      foreach csharpOption $csharpOptions {
-        if {[string length $compilerOptions] > 0} then {
-          append compilerOptions " "
-        }
-
-        append compilerOptions $csharpOption
-      }
-
-      #
-      # NOTE: Reset the compiler options to the pre-existing ones plus the
-      #       extra defines we may have added (above).
-      #
-      $parameters CompilerOptions $compilerOptions
-    }
-
-    #
-    # NOTE: Process any extra compiler settings the caller may have
-    #       provided.
+    # NOTE: Start out the compiler options with the pre-existing defaults
+    #       for the compiler followed by those necessary for the platform.
+    #
+    $parameters CompilerOptions \
+        [getCSharpCompilerOptions $parameters true true /]
+
+    #
+    # NOTE: Process extra compiler settings the caller may have provided.
     #
     foreach {name value} $args {
       $parameters -nocase $name $value
     }
 
     #
     # NOTE: Prepare to transfer the object reference to the caller.  We
-    #       must use upvar here because otherwise the object is lost when
-    #       the procedure call frame is cleaned up.
+    #       must use [upvar] here because otherwise the object is lost
+    #       when the procedure call frame is cleaned up.
     #
     if {[string length $resultsVarName] > 0} then {
       upvar 1 $resultsVarName results
     }
 
@@ -179,11 +548,12 @@
     #
     # NOTE: It is assumed that no assembly was generated if there were
     #       any compiler errors.  Ignore all compiler warnings unless
     #       we are in strict mode.
     #
-    if {[$errors HasErrors] || ($strict && [$errors HasWarnings])} then {
+    if {[$errors HasErrors] || \
+        ($strict && [$errors HasWarnings])} then {
       #
       # NOTE: Compilation of the assembly failed.
       #
       set code Error
 
@@ -192,20 +562,15 @@
       #
       if {[string length $errorsVarName] > 0} then {
         upvar 1 $errorsVarName local_errors
       }
 
-      #
-      # NOTE: How many compile errors?
-      #
-      set count [$errors Count]
-
       #
       # NOTE: Grab each error object and append the string itself to
       #       the overall list of errors.
       #
-      for {set index 0} {$index < $count} {incr index} {
+      for {set index 0} {$index < [$errors Count]} {incr index} {
         #
         # NOTE: Get the compiler error object at this index.
         #
         set error [$errors -alias Item $index]
 
@@ -227,23 +592,282 @@
       #
       set code Ok
     }
 
     #
-    # NOTE: We no longer need the collection of compiler errors;
-    #       therefore, dispose it now.
+    # NOTE: We no longer need the compiler errors collection; therefore,
+    #       dispose it now.
     #
     unset errors; # dispose
 
     #
-    # NOTE: Return the overall result to the caller.
+    # HACK: *BREAKING CHANGE* If there is an output file name, return it
+    #       as well; otherwise, just return success.
+    #
+    if {[string length $outputFileName] > 0} then {
+      #
+      # NOTE: Return a two element list: the first element is the overall
+      #       result and the second element is the output file name.
+      #
+      return [list $code $outputFileName]
+    } else {
+      #
+      # NOTE: Return the overall result to the caller.
+      #
+      return $code
+    }
+  }
+
+  #
+  # NOTE: This procedure is used to dynamically compile arbitrary C# code
+  #       from within a script using the command line C# compiler provided
+  #       by the .NET Core SDK.  This procedure was originally designed to
+  #       be used by the test suite; however, it can be quite useful in
+  #       non-test scripts as well.
+  #
+  proc compileViaDotNetCoreCSharp {
+          string memory symbols strict resultsVarName errorsVarName args } {
+    #
+    # NOTE: Get the initial command line arguments needed to invoke the C#
+    #       compiler on .NET Core.  If this ends up being invalid, nothing
+    #       else can be done.
+    #
+    set command [getDotNetCoreCSharpCommandArgs]
+
+    if {[llength $command] == 0} then {
+      #
+      # NOTE: We cannot even attempt to compile anything, fail.
+      #
+      set code Error
+
+      #
+      # NOTE: Prepare to transfer error messages to the caller.
+      #
+      if {[string length $errorsVarName] > 0} then {
+        upvar 1 $errorsVarName local_errors
+      }
+
+      #
+      # NOTE: Append to the list of errors.
+      #
+      lappend local_errors "cannot compile, C# compiler was not found"
+
+      #
+      # NOTE: Return the overall result to the caller.
+      #
+      return $code
+    }
+
+    #
+    # NOTE: Insert the [exec] command before the command line arguments.
+    #       The -success option is not used here because we want to handle
+    #       errors (only) by processing the compiler output.
+    #
+    set command [linsert $command 0 exec --]
+
+    #
+    # NOTE: Start out the compiler options with the pre-existing defaults
+    #       for the compiler followed by those necessary for the platform.
+    #
+    append command " " [getCSharpCompilerOptions "" true true -]
+
+    #
+    # NOTE: Allocate a couple temporary file names, one to hold the source
+    #       code to compile and one to hold the generated assembly.
+    #
+    set sourceFileName [appendArgs [file tempname] .cs]
+    set outputFileName [appendArgs [file tempname] .dll]
+
+    #
+    # NOTE: Process extra compiler settings the caller may have provided.
+    #
+    foreach {name value} $args {
+      set nameValueArguments \
+          [compilerParameterToArguments $name $value outputFileName]
+
+      if {[llength $nameValueArguments] > 0} then {
+        eval lappend command $nameValueArguments
+      }
+    }
+
+    try {
+      #
+      # NOTE: Make the compiler output a little quieter.  This is needed
+      #       to maintain compatibility with the results generated by the
+      #       [compileViaCSharpCodeProvider] procedure.
+      #
+      lappend command -nologo
+
+      #
+      # NOTE: Always build as a library so that we do not require a static
+      #       Main method.
+      #
+      lappend command -target:library
+
+      #
+      # NOTE: If symbols are enabled, add the necessary command line
+      #       argument.
+      #
+      if {$symbols} then {lappend command -debug}
+
+      #
+      # NOTE: As of this writing (2018-04-06), the current version of the
+      #       .NET Core SDK (2.1.101) uses the "netstandard.dll" assembly
+      #       to enable use of the .NET Standard 2.0 library.
+      #
+      lappend command [appendArgs \"-reference: [file nativename \
+          [file normalize [file join [getDotNetStandardReferencePath] \
+          netstandard.dll]]] \"]
+
+      #
+      # NOTE: Set the output assembly file name to the temporary output
+      #       file name we obtained from [file tempname] above.
+      #
+      lappend command [appendArgs \"-out: [file nativename [file \
+          normalize $outputFileName]] \"]
+
+      #
+      # NOTE: Set the source code file name to the temporary source code
+      #       file name we obtained from [file tempname] above.
+      #
+      lappend command [appendArgs \" [file nativename [file normalize \
+          $sourceFileName]] \"]
+
+      #
+      # NOTE: First, write the specified string (containing C# code) to
+      #       the temporary source code file.
+      #
+      writeFile $sourceFileName $string
+
+      #
+      # NOTE: Attempt to compile the temporary file as C# and capture the
+      #       results into the variable provided by the caller.  Since the
+      #       results are text, normalize line endings before extracting
+      #       the compiler errors and/or warnings.
+      #
+      set local_results [runDotNetCSharpCommand $command]
+
+      #
+      # NOTE: Extract the compiler errors (which may be empty).
+      #
+      set errors [extractCSharpErrors $sourceFileName $local_results]
+
+      #
+      # NOTE: Extract the compiler warnings (which may be empty).
+      #
+      set warnings [extractCSharpWarnings $sourceFileName $local_results]
+
+      #
+      # NOTE: Prepare to transfer the "results" to the caller.
+      #
+      if {[string length $resultsVarName] > 0} then {
+        upvar 1 $resultsVarName results
+      }
+
+      #
+      # HACK: For backward compatibility with the results generated by
+      #       the [compileViaCSharpCodeProvider] procedure, we must now
+      #       set the results to an obviously fake opaque object handle
+      #       that still matches the normal pattern.
+      #
+      set results System#CodeDom#Compiler#CompilerResults#0
+
+      #
+      # NOTE: It is assumed that no assembly was generated if there were
+      #       any compiler errors.  Ignore all compiler warnings unless
+      #       we are in strict mode.
+      #
+      if {[llength $errors] > 0 || \
+          ($strict && [llength $warnings] > 0)} then {
+        #
+        # NOTE: Compilation of the assembly failed.
+        #
+        set code Error
+
+        #
+        # NOTE: Prepare to transfer error messages to the caller.
+        #
+        if {[string length $errorsVarName] > 0} then {
+          upvar 1 $errorsVarName local_errors
+        }
+
+        #
+        # NOTE: If there are compiler errors, add them to the list now.
+        #
+        if {[llength $errors] > 0} then {
+          eval lappend local_errors $errors
+        }
+
+        #
+        # NOTE: If there are compiler warnings, add them to the list now.
+        #
+        if {[llength $warnings] > 0} then {
+          eval lappend local_errors $warnings
+        }
+      } else {
+        #
+        # NOTE: If the generated assembly was supposed to be loaded into
+        #       memory, try to do that now.
+        #
+        if {$memory} then {
+          object load -loadtype File $outputFileName
+        }
+
+        #
+        # NOTE: Compilation of the assembly succeeded.
+        #
+        set code Ok
+      }
+    } finally {
+      #
+      # NOTE: Delete the temporary file name used to hold the source code.
+      #
+      if {[string length $sourceFileName] > 0 && \
+          [file exists $sourceFileName]} then {
+        catch {file delete $sourceFileName}
+      }
+    }
+
+    #
+    # HACK: *BREAKING CHANGE* If there is an output file name, return it
+    #       as well; otherwise, just return success.
     #
-    return $code
+    if {!$memory && [string length $outputFileName] > 0} then {
+      #
+      # NOTE: Return a two element list: the first element is the overall
+      #       result and the second element is the output file name.
+      #
+      return [list $code $outputFileName]
+    } else {
+      #
+      # NOTE: Return the overall result to the caller.
+      #
+      return $code
+    }
+  }
+
+  #
+  # NOTE: This procedure is used to dynamically compile arbitrary C# code
+  #       from within a script.  This procedure was originally designed to
+  #       be used by the test suite; however, it can be quite useful in
+  #       non-test scripts as well.
+  #
+  proc compileCSharp {
+          string memory symbols strict resultsVarName errorsVarName args } {
+    if {[isDotNetCore]} then {
+      return [uplevel 1 [list \
+          compileViaDotNetCoreCSharp $string $memory $symbols $strict \
+          $resultsVarName $errorsVarName] $args]
+    } else {
+      return [uplevel 1 [list \
+          compileViaCSharpCodeProvider $string $memory $symbols $strict \
+          $resultsVarName $errorsVarName] $args]
+    }
   }
 
   #
   # NOTE: Provide the Eagle "C#" package to the interpreter.
   #
   package provide Eagle.CSharp \
     [expr {[isEagle] ? [info engine PatchLevel] : "1.0"}]
 }
 

Index: Externals/Eagle/lib/Eagle1.0/exec.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/exec.eagle
+++ Externals/Eagle/lib/Eagle1.0/exec.eagle
@@ -52,10 +52,21 @@
       #
       lappend command mono \
           [appendArgs \" [file nativename [info nameofexecutable]] \"]
     } else {
       lappend command [info nameofexecutable]
+
+      #
+      # HACK: When running on .NET Core, we need to insert the "exec"
+      #       command line argument followed by our assembly name.
+      #
+      if {[isEagle] && [isDotNetCore]} then {
+        lappend command exec
+
+        lappend command [appendArgs \" \
+            [file nativename [lindex [info assembly true] 1]] \"]
+      }
     }
 
     #
     # NOTE: If possible, check if the current interpreter has security
     #       enabled; if so, add the appropriate command line option for

Index: Externals/Eagle/lib/Eagle1.0/info.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/info.eagle
+++ Externals/Eagle/lib/Eagle1.0/info.eagle
@@ -81,10 +81,83 @@
       }
     }
 
     return ""
   }
+
+  #
+  # NOTE: This procedure returns the fully qualified directory name where new
+  #       packages targeting the interpreter should be installed.  The return
+  #       values of this procedure are subject to change in future releases.
+  #
+  proc getPackageInstallPath { {packageName ""} {temporaryPrefix ""} } {
+    #
+    # NOTE: Skip using the Tcl library location if that has been explicitly
+    #       forbidden.
+    #
+    if {![info exists ::no(getPackageInstallPath)]} then {
+      #
+      # NOTE: First, check if the Tcl library variable exists and its location
+      #       exists.  The location may refer to a file.
+      #
+      global tcl_library
+
+      if {[info exists tcl_library]} then {
+        #
+        # NOTE: What is the parent directory for the Tcl library location?  If
+        #       the Tcl library location was a file, it should be a directory;
+        #       if it was already a directory, it should still be one.  Either
+        #       way, the new (directory) location must be writable.
+        #
+        set directory [file dirname $tcl_library]
+
+        if {[file exists $directory] && [file isdirectory $directory] && \
+            [file writable $directory]} then {
+          #
+          # NOTE: Ok, all checks passed, return the location.  Callers of this
+          #       procedure should generally not put files directly within it;
+          #       instead, they should create a sub-directory within it, named
+          #       appropriately.  If a package name was supplied by the caller
+          #       it will be used.  In that case, the resulting directory will
+          #       be created if necessary.
+          #
+          if {[string length $packageName] > 0} then {
+            set directory [file join $directory $packageName]
+            file mkdir $directory
+          }
+
+          return $directory
+        }
+      }
+    }
+
+    #
+    # NOTE: Next, since the fallback location requires the test package, load
+    #       it now.
+    #
+    package require Eagle.Test
+
+    #
+    # NOTE: Return the temporary directory as the fallback location.  Callers
+    #       of this procedure should generally not put files directly within
+    #       it; instead, they should create a sub-directory within it, named
+    #       appropriately.  If a temporary prefix was supplied by the caller
+    #       it will be used.  In that case, the resulting directory will be
+    #       created if necessary.
+    #
+    set directory [getTemporaryPath]
+
+    if {[string length $temporaryPrefix] > 0} then {
+      set directory [file join \
+          $directory [appendArgs $temporaryPrefix - \
+          [pid] - [string trim [clock seconds] -]]]
+
+      file mkdir $directory
+    }
+
+    return $directory
+  }
 
   #
   # NOTE: This procedure returns the Eagle core library base path, e.g. a
   #       value like "C:\Eagle" when loaded from "C:\Eagle\bin\Eagle.dll".
   #

Index: Externals/Eagle/lib/Eagle1.0/init.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/init.eagle
+++ Externals/Eagle/lib/Eagle1.0/init.eagle
@@ -111,31 +111,54 @@
     #
     # NOTE: Success, return an empty string.
     #
     return ""
   }
+
+  #
+  # NOTE: This procedure is designed to "load" (i.e. [source]) other script
+  #       files that logically belong to the package defined in this script
+  #       file.  Upon success, an empty string will be returned.  A script
+  #       error may be raised.  This should work properly in both Tcl and
+  #       Eagle.  This procedure must be defined in this script file because
+  #       it is needed while this script file is being evaluated.  If there
+  #       exists a global array element no($fileNameOnly) corresponding to a
+  #       particular script file to be loaded, it will be skipped.
+  #
+  # <bootstrap>
+  proc maybeLoadScripts { directory fileNamesOnly } {
+    set matchFileNames [list]
+
+    foreach fileNameOnly $fileNamesOnly {
+      if {![info exists ::no($fileNameOnly)]} then {
+        lappend matchFileNames $fileNameOnly
+      }
+    }
+
+    return [uplevel 1 [list loadScripts $directory $matchFileNames]]
+  }
 
   if {![interp issafe]} then {
     #
     # NOTE: Load the extra script library files that contain commonly used
     #       procedures that are shared between native Tcl and Eagle.
     #
-    loadScripts [file dirname [info script]] [list \
+    maybeLoadScripts [file dirname [info script]] [list \
         auxiliary.eagle database.eagle exec.eagle file1.eagle \
         file2.eagle file3.eagle info.eagle list.eagle \
         pkgt.eagle platform.eagle testlog.eagle unzip.eagle]
 
     #
     # NOTE: Load the extra script library files that contain procedures that
     #       require a specific language (i.e. either native Tcl or Eagle).
     #
     if {[isEagle]} then {
-      loadScripts [file dirname [info script]] [list \
+      maybeLoadScripts [file dirname [info script]] [list \
           compat.eagle csharp.eagle object.eagle process.eagle \
           runopt.eagle unkobj.eagle update.eagle]
     } else {
-      loadScripts [file dirname [info script]] [list shim.eagle]
+      maybeLoadScripts [file dirname [info script]] [list shim.eagle]
     }
   }
 
   if {[isEagle]} then {
     ###########################################################################
@@ -320,11 +343,11 @@
 
     #
     # NOTE: Add script library files borrowed from native Tcl.
     #
     if {![interp issafe]} then {
-      loadScripts [file dirname [info script]] [list word.tcl]
+      maybeLoadScripts [file dirname [info script]] [list word.tcl]
     }
 
     ###########################################################################
     ############################# END Eagle ONLY ##############################
     ###########################################################################
@@ -337,16 +360,16 @@
     # NOTE: Exports the necessary commands from this package and import them
     #       into the global namespace.
     #
     if {[llength [info commands exportAndImportPackageCommands]] > 0} then {
       exportAndImportPackageCommands [namespace current] [list \
-          isEagle loadScripts isWindows isInteractive haveGaruda \
-          isTclThread isMono isSameFileName getEnvironmentVariable \
-          combineFlags getCompileInfo getPlatformInfo getPluginName \
-          getPluginPath appendArgs lappendArgs getDictionaryValue \
-          getColumnValue getRowColumnValue tqputs tqlog \
-          makeBinaryChannel makeAsciiChannel makeUnicodeChannel \
+          isEagle loadScripts maybeLoadScripts isWindows isInteractive \
+          haveGaruda isTclThread isMono isDotNetCore isSameFileName \
+          getEnvironmentVariable combineFlags getCompileInfo getPlatformInfo \
+          getPluginName getPluginPath getPackageInstallPath appendArgs \
+          lappendArgs getDictionaryValue getColumnValue getRowColumnValue \
+          tqputs tqlog makeBinaryChannel makeAsciiChannel makeUnicodeChannel \
           makeLogChannel readFile readSharedFile writeFile appendFile \
           appendLogFile appendSharedFile appendSharedLogFile \
           readAsciiFile writeAsciiFile readUnicodeFile \
           writeUnicodeFile getDirResultPath addToPath removeFromPath \
           execShell lshuffle ldifference filter map reduce \

Index: Externals/Eagle/lib/Eagle1.0/object.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/object.eagle
+++ Externals/Eagle/lib/Eagle1.0/object.eagle
@@ -131,11 +131,11 @@
 
     if {[string length $typeName] == 0} then {
       return ""
     }
 
-    set type [object invoke -create -alias Type GetType $typeName]
+    set type [object invoke -create -alias Utility GetType $typeName]
 
     if {[string length $type] == 0} then {
       return ""
     }
 
@@ -277,15 +277,29 @@
     #       evaluation is complete?  If so, build an anonymous procedure
     #       that wraps it; otherwise, set the callback argument to null, so
     #       the core marshaller will handle the lack of a callback correctly.
     #       The context argument will be added to this script prior to it
     #       being evaluated; however, it is not actually used by this script.
+    #       The -identifier option is NOT actually processed by the library;
+    #       however, it is necessary here to avoid having multiple calls to
+    #       this procedure collide with each other when attempting to remove
+    #       their callbacks during cleanup.
     #
     if {[string length $doneScript] > 0} then {
-      set callback [list -callbackflags {+ResetCancel FireAndForget} \
-          -- apply [list [list script context] {uplevel 1 $script}] \
-          $doneScript]
+      #
+      # NOTE: If the core library was compiled without dynamic delegates,
+      #       this procedure cannot be used when there is a callback, due
+      #       to the AsynchronousCallback delegate type being unsupported.
+      #
+      if {[lsearch -exact -- \
+          $::eagle_platform(compileOptions) EMIT] == -1} then {
+        error "cannot eval async: library missing EMIT compile-option"
+      }
+
+      set callback [list -identifier [expr {random()}] -callbackflags \
+          {+ResetCancel FireAndForget} -- apply [list [list script context] \
+          {uplevel 1 $script}] $doneScript]
     } else {
       set callback null
     }
 
     #

Index: Externals/Eagle/lib/Eagle1.0/pkgt.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/pkgt.eagle
+++ Externals/Eagle/lib/Eagle1.0/pkgt.eagle
@@ -36,11 +36,10 @@
     #
     variable baseUri; # DEFAULT: [getAuxiliaryBaseUri] -OR- https://urn.to/r
 
     if {$force || ![info exists baseUri]} then {
       if {[isEagle]} then {
-        package require Eagle.Update
         set baseUri [getAuxiliaryBaseUri]
       } else {
         set baseUri https://urn.to/r
       }
     }
@@ -120,10 +119,30 @@
     variable licenseUri; # DEFAULT: ${baseUri}/${urn}
 
     if {$force || ![info exists licenseUri]} then {
       set licenseUri {${baseUri}/${urn}}
     }
+
+    #
+    # NOTE: The URN, relative to the base URI, where script evaluation
+    #       requests should be submitted to the "safe" sandbox.
+    #
+    variable sandboxEvalUrn; # DEFAULT: eval_01
+
+    if {$force || ![info exists sandboxEvalUrn]} then {
+      set sandboxEvalUrn eval_01
+    }
+
+    #
+    # NOTE: The URI where script evaluation requests should be submitted
+    #       to the "safe" sandbox.
+    #
+    variable sandboxEvalUri; # DEFAULT: ${baseUri}/${urn}
+
+    if {$force || ![info exists sandboxEvalUri]} then {
+      set sandboxEvalUri {${baseUri}/${urn}}
+    }
   }
 
   #
   # NOTE: This procedure attempts to download and extract the Package Client
   #       Toolset.  The optional channel argument is the output channel where
@@ -141,14 +160,11 @@
     variable packageToolsetUrn
 
     package require Eagle.Test
     package require Eagle.Unzip
 
-    set extractRootDirectory [getTemporaryPath]
-
-    set directory [file join $extractRootDirectory [appendArgs \
-        ea-pt-di- [pid] - [string trim [clock seconds] -]]]
+    set extractRootDirectory [getPackageInstallPath pkgd ea-pt-di]
 
     set uri [subst $packageToolsetUri]
     set fileName [getTemporaryFileName]
 
     if {[isEagle]} then {
@@ -163,13 +179,181 @@
       set data [getFileViaHttp $uri 20 $channel $quiet -binary true]
 
       writeFile $fileName $data
     }
 
-    set extractDirectory [extractZipArchive $fileName $extractRootDirectory]
+    set extractDirectory [extractZipArchive \
+        $fileName $extractRootDirectory true]
+
     return [file join $extractDirectory pkgr_an_d client 1.0 neutral]
   }
+
+  #
+  # NOTE: This procedure attempts to load (via [package require]) the package
+  #       client toolset.  It is designed to be used in conjunction with the
+  #       [downloadAndExtractPackageClientToolset] procedure, above.  Support
+  #       is included for specifying an extra auto-path directory and API key
+  #       to use.  By default, the [package unknown] handler is hooked to add
+  #       the remote package repository lookup functionality.  Eagle supports
+  #       extra script security via signed script certificates, which will be
+  #       enabled by default, unless it is unavailable.
+  #
+  proc loadPackageClientToolset {
+          {directory auto} {apiKeys ""} {hookUnknown true} {enableSecurity true}
+          {strictSecurity false} {debug false} } {
+    #
+    # NOTE: When running in Eagle, namespace support must be available and
+    #       enabled.
+    #
+    if {[isEagle] && ![namespace enable]} then {
+      error "namespace support must be enabled"
+    }
+
+    #
+    # NOTE: Does the caller want automatic discovery of the directory that
+    #       contains the (downloaded?) package client toolset?  Currently,
+    #       this only works on Windows and searches the temporary download
+    #       location, which normally obtains its value from the environment
+    #       variable TEMP.
+    #
+    if {$directory eq "auto"} then {
+      #
+      # NOTE: First, before doing anything else, see if the package client
+      #       toolset is already installed somewhere it can be loaded from.
+      #
+      set needDirectory true
+
+      if {[isEagle]} then {
+        #
+        # NOTE: Force Eagle to find *ALL* available package index files.
+        #       This must be done in the global scope so that the special
+        #       global variable 'dir' set by the package index loading
+        #       subsystem can be accessed.  Use [catch] here just in case
+        #       a package index file raises a script error.
+        #
+        catch {
+          uplevel #0 [list package scan -host -normal -refresh]
+        }
+      } else {
+        #
+        # HACK: Force Tcl to find *ALL* available package index files.
+        #       Without this, checking for the available versions of a
+        #       package using [package versions] likely will not succeed
+        #       unless the package is already loaded.  Use [catch] here
+        #       just in case a package index file raises a script error.
+        #
+        catch {
+          package require [appendArgs \
+              bogus_package_ [string trim [clock seconds] -]]
+        }
+      }
+
+      #
+      # NOTE: Check and see if the package repository client is a known
+      #       package now.  If so, there is no need to search directories
+      #       for it.
+      #
+      if {[llength [package versions Eagle.Package.Repository]] > 0} then {
+        set needDirectory false
+      }
+
+      #
+      # NOTE: Is searching for temporary download directories required at
+      #       this point?
+      #
+      if {$needDirectory} then {
+        if {![isWindows]} then {
+          error "directory discovery not supported on this platform"
+        }
+
+        set extractRootDirectory [getPackageInstallPath]
+
+        foreach directory [findDirectoriesRecursive \
+            [file join $extractRootDirectory pkgr_an_d]] {
+          #
+          # NOTE: Reset directory we just found to include the necessary
+          #       sub-directory components for the actual client files
+          #       and then stop, thereby selecting the first match.
+          #
+          set directory [file join $directory client 1.0 neutral]; break
+        }
+      }
+
+      #
+      # NOTE: If no directory was found, just clear the directory name,
+      #       which will cause auto-path modification(s) to be skipped.
+      #
+      if {$directory eq "auto"} then {
+        set directory ""
+      }
+    }
+
+    #
+    # NOTE: If there is a directory specified by the caller -OR- found
+    #       via automatic directory discovery, add it to the auto-path
+    #       now.
+    #
+    if {[string length $directory] > 0} then {
+      #
+      # NOTE: Only modify the auto-path if the directory is not already
+      #       present.  This prevents needless variable trace execution
+      #       that rescans the various auto-path directories.
+      #
+      if {![info exists ::auto_path] || \
+          [lsearch -exact $::auto_path $directory] == -1} then {
+        lappend ::auto_path $directory
+      }
+    }
+
+    #
+    # NOTE: If the caller wants to enable extra diagnostic information,
+    #       set the appropriate environment variables now.
+    #
+    if {$debug} then {
+      set ::env(DEBUG_PKGR) 1; set ::env(DEBUG_PKGD) 1
+    }
+
+    #
+    # NOTE: If the caller specified API keys, add them to the configured
+    #       list of API keys for the package repository client now.  This
+    #       uses a special global variable.
+    #
+    if {[llength $apiKeys] > 0} then {
+      eval lappend ::pkgr_api_keys $apiKeys
+    }
+
+    #
+    # NOTE: If the caller wants to enable the extra Eagle script security,
+    #       attempt to do that now.  Only treat a failure here as fatal if
+    #       the caller said so.
+    #
+    if {[isEagle] && $enableSecurity} then {
+      if {[catch {
+        uplevel 1 [list source enableSecurity]
+      } error] && $strictSecurity} then {
+        error $error
+      }
+    }
+
+    #
+    # NOTE: In Eagle, to actually enable make use of the [package unknown]
+    #       handler, an interpreter flag must be disabled.  If necessary,
+    #       do that now.
+    #
+    if {[isEagle] && $hookUnknown} then {
+      object invoke -flags +NonPublic -objectflags +AutoFlagsEnum \
+          Interpreter.GetActive interpreterFlags -NoPackageUnknown
+    }
+
+    #
+    # NOTE: Finally, attempt to actually load the package repository client.
+    #       This may fail for a number of reasons.  The most likely failure
+    #       case is when the directory containing the package is not found;
+    #       however, there are other possible failure modes.
+    #
+    package require Eagle.Package.Repository
+  }
 
   #
   # NOTE: This procedure attempts to download and extract a native TclKit DLL
   #       for the current platform.  The optional channel argument is the
   #       output channel where diagnostic information is sent.  The optional
@@ -186,16 +370,15 @@
     variable tclKitDllUrn
 
     package require Eagle.Test
     package require Eagle.Unzip
 
-    set extractRootDirectory [getTemporaryPath]
-
-    set directory [file join $extractRootDirectory [appendArgs \
-        ea-td-di- [pid] - [string trim [clock seconds] -]]]
-
     set platform [machineToPlatform $::tcl_platform(machine) true]
+
+    set extractRootDirectory [getPackageInstallPath \
+        [appendArgs KitDll_ $platform] ea-td-di]
+
     set urn [subst $tclKitDllUrn]; set uri [subst $tclKitDllUri]
     set fileName [getTemporaryFileName]
 
     if {[isEagle]} then {
       uri download $uri $fileName
@@ -209,11 +392,12 @@
       set data [getFileViaHttp $uri 20 $channel $quiet -binary true]
 
       writeFile $fileName $data
     }
 
-    set extractDirectory [extractZipArchive $fileName $extractRootDirectory]
+    set extractDirectory [extractZipArchive \
+        $fileName $extractRootDirectory true]
 
     return [lindex [glob -nocomplain \
         [file join $extractDirectory lib *[info sharedlibextension]]] 0]
   }
 
@@ -235,20 +419,19 @@
     variable securityToolsetUrn
 
     package require Eagle.Test
     package require Eagle.Unzip
 
-    set extractRootDirectory [getTemporaryPath]
-
-    set directory [file join $extractRootDirectory [appendArgs \
-        ea-st-di- [pid] - [string trim [clock seconds] -]]]
-
-    if {[info exists ::eagle_platform(text)]} then {
+    if {[info exists ::eagle_platform(text)] && \
+        [string length $::eagle_platform(text)] > 0} then {
       set platform [string tolower $::eagle_platform(text)]
     } else {
       set platform [string tolower netFx20]; # TODO: Good default?
     }
+
+    set extractRootDirectory [getPackageInstallPath \
+        [appendArgs eee_ $platform] ea-st-di]
 
     set dir [string map [list fx ""] $platform]; # netfx20 -> net20
     set urn [subst $securityToolsetUrn]; set uri [subst $securityToolsetUri]
     set fileName [getTemporaryFileName]
 
@@ -264,11 +447,13 @@
       set data [getFileViaHttp $uri 20 $channel $quiet -binary true]
 
       writeFile $fileName $data
     }
 
-    set extractDirectory [extractZipArchive $fileName $extractRootDirectory]
+    set extractDirectory [extractZipArchive \
+        $fileName $extractRootDirectory true]
+
     return [file join $extractDirectory build $dir lib]
   }
 
   #
   # NOTE: This procedure attempts to request a license certificate for Eagle,
@@ -445,13 +630,63 @@
     file mkdir $directory; file copy $fileName $newFileName
     file delete $fileName
 
     return $newFileName
   }
+
+  #
+  # NOTE: This procedure attempts to submit the specified script to a remote
+  #       sandbox for evaluation.  The apiKey parameter is the optional API
+  #       key to use, which MAY enable additional permissions in the remote
+  #       sandbox.  The params parameter contains any optional extra names
+  #       and values to include in the submitted query.  Upon success, this
+  #       procedure returns a Tcl dictionary that includes at least the keys
+  #       "returnCode", "result", and "errorLine".  The "returnCode" value
+  #       will be "Ok", "Error", "Return", "Break", "Continue", or possibly
+  #       a signed integer.  The "result" value will be the textual result
+  #       of the script or an error message.  The "errorLine" value will be
+  #       zero or the line where a script error was raised.  This procedure
+  #       may raise script errors.
+  #
+  proc evaluateInRemoteSandbox {
+          script {apiKey ""} {params ""} {channel stdout} {quiet false} } {
+    setupPackageToolsetVars false
+
+    variable baseUri
+    variable sandboxEvalUri
+    variable sandboxEvalUrn
+
+    set urn [subst $sandboxEvalUrn]
+    set uri [subst $sandboxEvalUri]
+
+    set query [list go 1 raw 1 script $script]
+
+    if {[string length $apiKey] > 0} then {
+      lappend query apiKey $apiKey
+    }
+
+    if {[llength $params] > 0} then {
+      eval lappend query $params
+    }
+
+    if {[isEagle]} then {
+      return [uri upload -inline -data $query $uri]
+    } else {
+      package require http 2.0
+      package require Eagle.Tools.Common
+
+      namespace import \
+          ::Eagle::Tools::Common::getFileViaHttp
+
+      return [getFileViaHttp \
+          $uri 20 $channel $quiet -binary true \
+          -query [eval ::http::formatQuery $query]]
+    }
+  }
 
   #
   # NOTE: Provide the Eagle "package toolset" package to the interpreter.
   #
   package provide Eagle.Package.Toolset \
     [expr {[isEagle] ? [info engine PatchLevel] : "1.0"}]
 }
 

Index: Externals/Eagle/lib/Eagle1.0/platform.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/platform.eagle
+++ Externals/Eagle/lib/Eagle1.0/platform.eagle
@@ -37,14 +37,14 @@
         [string compare -nocase eagle $::tcl_platform(engine)] == 0}]
   }
 
   #
   # NOTE: This is the procedure that detects whether or not we are running
-  #       in Eagle on Mono (otherwise, we are running in Tcl or in Eagle on
-  #       the .NET Framework).  This procedure must function correctly in
-  #       both Tcl and Eagle and must return non-zero only when running in
-  #       Eagle on Mono.
+  #       in Eagle on Mono (i.e. otherwise, we are running in Tcl or in Eagle
+  #       on the .NET Framework or .NET Core).  This procedure must function
+  #       correctly in both Tcl and Eagle and must return non-zero only when
+  #       running in Eagle on Mono.
   #
   proc isMono {} {
     #
     # NOTE: Nothing too fancy or expensive should be done here.  In theory,
     #       use of this procedure should be rare; however, in practice, this
@@ -51,10 +51,27 @@
     #       procedure is actually used quite a bit (e.g. by the test suite).
     #
     return [expr {[info exists ::eagle_platform(runtime)] && \
         [string compare -nocase mono $::eagle_platform(runtime)] == 0}]
   }
+
+  #
+  # NOTE: This is the procedure that detects whether or not we are running
+  #       in Eagle on .NET Core (i.e. otherwise, we are running in Tcl or in
+  #       Eagle on the .NET Framework or Mono).  This procedure must function
+  #       correctly in both Tcl and Eagle and must return non-zero only when
+  #       running in Eagle on .NET Core.
+  #
+  proc isDotNetCore {} {
+    #
+    # NOTE: Nothing too fancy or expensive should be done here.  In theory,
+    #       use of this procedure should be rare; however, in practice, this
+    #       procedure is actually used quite a bit (e.g. by the test suite).
+    #
+    return [expr {[info exists ::eagle_platform(runtime)] && \
+        [string compare -nocase ".net core" $::eagle_platform(runtime)] == 0}]
+  }
 
   #
   # NOTE: This procedure returns non-zero if the logged on user has full
   #       administrator rights on this machine.  Currently, this only works
   #       in Eagle; however, it may work from native Tcl in the future.

Index: Externals/Eagle/lib/Eagle1.0/test.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/test.eagle
+++ Externals/Eagle/lib/Eagle1.0/test.eagle
@@ -288,10 +288,48 @@
       lappend result $name $array($name)
     }
 
     return $result
   }
+
+  proc testArrayGet2 { varName {pattern ""} {integer false} } {
+    #
+    # NOTE: Returns the results of [array get] in a well-defined order.
+    #
+    if {[string length $varName] == 0} then {
+      return [list]
+    }
+
+    #
+    # NOTE: Refer to the array in the context of the caller.
+    #
+    upvar 1 $varName array
+
+    #
+    # NOTE: Build the command that will sort the array names into order.
+    #
+    set command [list lsort]
+    if {$integer} then {lappend command -integer}
+
+    #
+    # NOTE: If there is a pattern, use it; otherwise, all elements are
+    #       returned.
+    #
+    if {[string length $pattern] > 0} then {
+      lappend command [array names array $pattern]
+    } else {
+      lappend command [array names array]
+    }
+
+    set result [list]
+
+    foreach name [eval $command] {
+      lappend result $name $array($name)
+    }
+
+    return $result
+  }
 
   proc testResultGet { script } {
     set code [catch {uplevel 1 $script} result]
     return [expr {$code == 0 ? $result : "<error>"}]
   }
@@ -716,21 +754,52 @@
     #       name/value pairs, to the caller.
     #
     return $result
   }
 
-  proc getTclShellFileName { automatic kits } {
+  proc getTclShellFileName { automatic kits machine } {
     #
     # NOTE: Start out with an empty list of candiate Tcl shells.
     #
     set shells [list]
 
     #
-    # NOTE: Check all environment variables we know about that
+    # NOTE: Figure out the environment variables to be checked.  If
+    #       there was a machine specified, it will be used to check
+    #       for machine-specific Tcl shells.
+    #
+    set names [list]
+
+    foreach name [list Eagle_Tcl_Shell Tcl_Shell EAGLE_TCLSH TCLSH] {
+      if {[string length $machine] > 0} then {
+        set platform [machineToPlatform $machine true]
+
+        if {[string length $platform] > 0} then {
+          lappend names [appendArgs $name _ $platform]
+        }
+
+        set platform [machineToPlatform $machine false]
+
+        if {[string length $platform] > 0} then {
+          lappend names [appendArgs $name _ $platform]
+        }
+
+        lappend names [appendArgs $name _ $machine]
+      }
+
+      lappend names $name
+    }
+
+    #
+    # NOTE: Check all environment variables (we know about) that
     #       may contain the path where the Tcl shell is located.
     #
-    foreach name [list Eagle_Tcl_Shell Tcl_Shell EAGLE_TCLSH TCLSH] {
+    foreach name $names {
+      #
+      # NOTE: Grab the value of the environment variable.  This
+      #       will be an empty string if it was not set.
+      #
       set value [getEnvironmentVariable $name]
 
       #
       # TODO: Possibly add a check if the file actually exists
       #       here.
@@ -1313,16 +1382,26 @@
       #
       # NOTE: Use the test suffix.  There is no default value for
       #       this variable (i.e. by default, it does not exist).
       #
       return $::test_suffix
-    } elseif {[info exists ::eagle_platform(text)]} then {
+    } elseif {[info exists ::eagle_platform(text)] && \
+        [string length $::eagle_platform(text)] > 0} then {
       #
-      # NOTE: Use the build text of Eagle itself.  This value will
-      #       typically be "NetFx20" or "NetFx40".
+      # NOTE: Use the build "text" of Eagle itself.  This value
+      #       will typically be "NetFx20", "NetFx40", etc.  The
+      #       default value of this element is an empty string.
       #
       return $::eagle_platform(text)
+    } elseif {[info exists ::eagle_platform(suffix)] && \
+        [string length $::eagle_platform(suffix)] > 0} then {
+      #
+      # NOTE: Use the build suffix of Eagle itself.  This value
+      #       will typically be "NetFx20", "NetFx40", etc.  The
+      #       default value of this element is an empty string.
+      #
+      return $::eagle_platform(suffix)
     } else {
       #
       # NOTE: We are missing the suffix, return nothing.
       #
       return ""
@@ -1335,10 +1414,63 @@
       return $::test_uncounted_leaks
     }
 
     return [list]
   }
+
+  proc getRuntimeAssemblyName {} {
+    if {[isEagle]} then {
+      if {[isDotNetCore]} then {
+        if {[llength [info commands object]] > 0} then {
+          #
+          # HACK: The core runtime assembly (i.e. the one containing
+          #       System.Object, et al) must have already been loaded
+          #       (?), so just abuse the [object load] sub-command to
+          #       return its assembly name.
+          #
+          return [lindex [object load System.Private.CoreLib] 0]
+        } else {
+          #
+          # HACK: The [object] command is unavailable, just fake it.
+          #
+          return "System.Private.CoreLib, Version=4.0.0.0,\
+              Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+        }
+      } else {
+        if {[llength [info commands object]] > 0} then {
+          #
+          # HACK: The core runtime assembly (i.e. the one containing
+          #       System.Object, et al) must have already been loaded
+          #       (?), so just abuse the [object load] sub-command to
+          #       return its assembly name.
+          #
+          return [lindex [object load mscorlib] 0]
+        } else {
+          #
+          # HACK: The [object] command is unavailable, just fake it.
+          #
+          if {[info exists ::eagle_platform(runtimeVersion)] && \
+              [string index $::eagle_platform(runtimeVersion) 0] >= 4} then {
+            #
+            # BUGBUG: Does not handle a major CLR version greater than
+            #         four (4).
+            #
+            return "mscorlib, Version=4.0.0.0, Culture=neutral,\
+                PublicKeyToken=b77a5c561934e089"
+          } else {
+            return "mscorlib, Version=2.0.0.0, Culture=neutral,\
+                PublicKeyToken=b77a5c561934e089"
+          }
+        }
+      }
+    } else {
+      #
+      # HACK: Native Tcl has no runtime assembly name as it is native.
+      #
+      return ""
+    }
+  }
 
   proc getTestAssemblyName {} {
     if {[isEagle]} then {
       return [lindex [split [lindex [info assembly] 0] ,] 0]
     } else {
@@ -1400,11 +1532,20 @@
     #
     if {[isMono]} then {
       lappend command mono \
           [appendArgs \" [file nativename $commandName] \"]
     } else {
-      lappend command $commandName
+      #
+      # HACK: When running on .NET Core, need to insert "dotnet exec"
+      #       command line arguments before command to execute.
+      #
+      if {[isDotNetCore]} then {
+        lappend command dotnet exec \
+            [appendArgs \" [file nativename $commandName] \"]
+      } else {
+        lappend command $commandName
+      }
     }
 
     if {[llength $args] > 0} then {eval lappend command $args}
     set procName [lindex [info level [info level]] 0]
 
@@ -1599,20 +1740,44 @@
 
     set code [catch {uplevel 1 $script} result]
     set error [expr {$code == 0 ? false : true}]
 
     if {[isEagle]} then {
+      #
+      # NOTE: Initially, the call to [tresult] (i.e. [host result]) will
+      #       use the actual return code from the test command; however,
+      #       if that return code was 3 (i.e. break), that indicates the
+      #       test results should be highlighted in yellow -AND- that the
+      #       test should still be considered successful even though the
+      #       test was skipped.  If the return code was 4 (i.e. continue),
+      #       that indicates the test results should be highlighted in
+      #       dark yellow -AND- that the test should still be considered
+      #       successful because failures are being ignored for it.
+      #
+      set tresultCode $code
+
+      if {$code == 3} then {
+        set code 0; set error false
+      } elseif {$code == 4} then {
+        set code 0
+      }
+
+      #
+      # NOTE: If the return code from the test command indicates success
+      #       and the test results contain a clear indication of failure,
+      #       reset both return codes to indicate that failure.
+      #
       if {$code == 0 && [regexp -- {\s==== (.*?) FAILED\s} $result]} then {
-        set code 1
+        set code 1; set tresultCode $code
       }
 
       #
       # NOTE: Display and/or log the results for the test that we just
       #       completed.
       #
       if {[shouldWriteTestData $code]} then {
-        tresult $code $result
+        tresult $tresultCode $result
       } else {
         tlog $result
       }
 
       #
@@ -2032,10 +2197,24 @@
         \\ \\\\ \$ \\\$ ( \\( ) \\) * \\* + \\+ - \\- . \\. \
         ? \\? \[ \\\[ \] \\\] ^ \\^ \{ \\\{ \} \\\}]
 
     return [string map $map [expr {$list ? [list $path] : $path}]]
   }
+
+  proc assemblyNameToRegexp { assemblyName {list false} } {
+    #
+    # NOTE: This procedure needs to escape all characters that
+    #       have any special meaning to the regular expression
+    #       engine -AND- that can actually appear in a legal
+    #       assembly name.  Normally, this would only include
+    #       the period character.
+    #
+    # HACK: For now, just abuse the [pathToRegexp] procedure
+    #       for this.
+    #
+    return [pathToRegexp $assemblyName $list]
+  }
 
   proc inverseLsearchGlob { noCase patterns element } {
     #
     # NOTE: Perform the inverse of [lsearch -glob], attempt
     #       to match an element against a list of patterns.
@@ -2125,11 +2304,11 @@
       host title ""
     }
   }
 
   proc reportTestPercent {
-          channel percent totalFiles failedFiles leakedFiles } {
+          channel percent doneFiles totalFiles failedFiles leakedFiles } {
     if {[isEagle]} then {
       set totalTests $::eagle_tests(Total)
       set failedTests $::eagle_tests(Failed)
       set skippedTests $::eagle_tests(Skipped)
     } else {
@@ -2139,12 +2318,13 @@
     }
 
     set status [appendArgs \
         "---- test suite running, about " $percent "% complete (" \
         $totalTests " tests total, " $failedTests " tests failed, " \
-        $skippedTests " tests skipped, " $totalFiles " files total, " \
-        $failedFiles " files failed, " $leakedFiles " files leaked)..."]
+        $skippedTests " tests skipped, " $doneFiles " files done, " \
+        $totalFiles " files total, " $failedFiles " files failed, " \
+        $leakedFiles " files leaked)..."]
 
     tputs $channel [appendArgs $status \n]
 
     if {[isEagle]} then {
       host title $status
@@ -2255,11 +2435,11 @@
     set leaked [list]
 
     #
     # NOTE: Process each file name we have been given by the caller...
     #
-    set total 0; set lastPercent -1
+    set total [llength $fileNames]; set lastPercent -1
 
     foreach fileName $fileNames {
       #
       # NOTE: If configured to break into the debugger before running the
       #       test file, do it now.
@@ -2270,16 +2450,16 @@
 
       #
       # NOTE: In terms of files, not tests, what percent done are we now?
       #
       set percent [formatDecimal \
-          [expr {$total != 0 ? 100.0 * ($count / double($total)) : 100}]]
+          [expr {$total != 0 ? 100.0 * ($count / double($total)) : 0}]]
 
       if {$percent != $lastPercent} then {
         if {![info exists ::no(runPercent)]} then {
           reportTestPercent $channel $percent \
-              $total [llength $failed] [llength $leaked]
+              $count $total [llength $failed] [llength $leaked]
         }
 
         set lastPercent $percent
       }
 
@@ -2444,21 +2624,10 @@
             #
             if {![info exists ::no(runEndFile)]} then {
               tputs $channel [appendArgs "==== \"" $fileName "\" END\n"]
             }
 
-            #
-            # NOTE: At this point, we know that another test file was
-            #       processed successfully.
-            #
-            incr total
-
-            if {![info exists ::no(runPercent)]} then {
-              reportTestPercent $channel $percent \
-                  $total [llength $failed] [llength $leaked]
-            }
-
             #
             # NOTE: Are we being prevented from waiting after the file?
             #
             if {![info exists ::no(postWait)]} then {
               if {[info exists ::test_wait(post)] && \
@@ -2525,15 +2694,10 @@
               #
               lappend ::test_suite_errors [list $fileName $error]
             }
           }
 
-          #
-          # NOTE: We evaluated another test file.
-          #
-          incr count
-
           #
           # NOTE: Record failed test count after this file.
           #
           if {[isEagle]} then {
             set after $::eagle_tests(Failed)
@@ -2550,16 +2714,16 @@
 
           #
           # NOTE: In terms of files, not tests, what percent done are we now?
           #
           set percent [formatDecimal \
-              [expr {$total != 0 ? 100.0 * ($count / double($total)) : 100}]]
+              [expr {$total != 0 ? 100.0 * ($count / double($total)) : 0}]]
 
           if {$percent != $lastPercent} then {
             if {![info exists ::no(runPercent)]} then {
               reportTestPercent $channel $percent \
-                  $total [llength $failed] [llength $leaked]
+                  $count $total [llength $failed] [llength $leaked]
             }
 
             set lastPercent $percent
           }
 
@@ -2595,20 +2759,26 @@
             tputs $channel [appendArgs \
                 "==== \"" $fileName "\" NON_TEST_FILE\n"]
           }
         }
 
+        #
+        # NOTE: Another file of some kind was processed.  It may have been
+        #       skipped; however, that does not matter.
+        #
+        incr count
+
         #
         # NOTE: In terms of files, not tests, what percent done are we now?
         #
         set percent [formatDecimal \
-            [expr {$total != 0 ? 100.0 * ($count / double($total)) : 100}]]
+            [expr {$total != 0 ? 100.0 * ($count / double($total)) : 0}]]
 
         if {$percent != $lastPercent} then {
           if {![info exists ::no(runPercent)]} then {
             reportTestPercent $channel $percent \
-                $total [llength $failed] [llength $leaked]
+                $count $total [llength $failed] [llength $leaked]
           }
 
           set lastPercent $percent
         }
 
@@ -2626,22 +2796,27 @@
         #       test suite log file.
         #
         if {![info exists ::no(runSkippedFile)]} then {
           tputs $channel [appendArgs "==== \"" $fileName "\" SKIPPED\n"]
         }
+
+        #
+        # NOTE: This file was skipped.
+        #
+        incr count
       }
 
       #
       # NOTE: In terms of files, not tests, what percent done are we now?
       #
       set percent [formatDecimal \
-          [expr {$total != 0 ? 100.0 * ($count / double($total)) : 100}]]
+          [expr {$total != 0 ? 100.0 * ($count / double($total)) : 0}]]
 
       if {$percent != $lastPercent} then {
         if {![info exists ::no(runPercent)]} then {
           reportTestPercent $channel $percent \
-              $total [llength $failed] [llength $leaked]
+              $count $total [llength $failed] [llength $leaked]
         }
 
         set lastPercent $percent
       }
     }
@@ -3315,10 +3490,50 @@
             double($::eagle_tests(Total)))}]
       }
 
       return 0; # no tests were run, etc.
     }
+
+    proc createThread { script {parameterized false} {maxStackSize ""} } {
+      if {[isDotNetCore]} then {
+        #
+        # HACK: This seems to make .NET Core happier for reasons
+        #       that are not entirely clear.
+        #
+        set typeName "System.Threading.Thread, mscorlib"
+      } else {
+        set typeName System.Threading.Thread
+      }
+
+      if {$parameterized} then {
+        if {[string length $maxStackSize] > 0} then {
+          return [object create -alias -objectflags +NoReturnReference \
+              -parametertypes System.Threading.ParameterizedThreadStart \
+              $typeName $script $maxStackSize]
+        } else {
+          return [object create -alias -objectflags +NoReturnReference \
+              -parametertypes System.Threading.ParameterizedThreadStart \
+              $typeName $script]
+        }
+      } else {
+        if {[string length $maxStackSize] > 0} then {
+          return [object create -alias -objectflags +NoReturnReference \
+              $typeName $script $maxStackSize]
+        } else {
+          return [object create -alias -objectflags +NoReturnReference \
+              $typeName $script]
+        }
+      }
+    }
+
+    proc startThread { thread {parameterized false} {parameter null} } {
+      if {$parameterized} then {
+        $thread Start $parameter
+      } else {
+        $thread Start
+      }
+    }
 
     proc cleanupThread { thread {timeout 2000} } {
       if {[$thread IsAlive]} then {
         if {[catch {$thread Interrupt} error]} then {
           tputs $::test_channel [appendArgs \
@@ -3453,10 +3668,22 @@
       catch {uplevel 1 [list object invoke -flags +NonPublic \
           Eagle._Comparers.FileName ClearCache]} result
 
       tputs $channel [appendArgs \
           "---- Comparers.FileName cleanup results: " $result \n]
+
+      catch {uplevel 1 [list object invoke -flags +NonPublic \
+          Eagle._Components.Private.HashOps Cleanup]} result
+
+      tputs $channel [appendArgs \
+          "---- HashOps cleanup results: " $result \n]
+
+      catch {uplevel 1 [list object invoke -flags +NonPublic \
+          Eagle._Components.Private.FactoryOps Cleanup]} result
+
+      tputs $channel [appendArgs \
+          "---- FactoryOps cleanup results: " $result \n]
     }
 
     proc evalWithTimeout { script {milliseconds 2000} {resultVarName ""} } {
       #
       # NOTE: Verify that the number of milliseconds requested is greater than
@@ -3946,16 +4173,17 @@
         calculateRelativePerformance formatTimeStamp formatElapsedTime \
         sourceIfValid processTestArguments getTclShellFileName \
         getTemporaryPath getFiles getTestFiles getTestRunId getTestLogId \
         getDefaultTestLog getTestLog getLastTestLog getTestSuite \
         getTestMachine getTestPlatform getTestConfiguration getTestSuffix \
-        getTestUncountedLeaks getTestAssemblyName canTestExec testExec \
-        testClrExec execTestShell isRandomOrder isBreakOnDemand isBreakOnLeak \
-        isStopOnFailure isStopOnLeak isExitOnComplete returnInfoScript \
-        runTestPrologue runTestEpilogue hookPuts unhookPuts runTest \
-        testDebugBreak testArrayGet testShim tsource recordTestStatistics \
-        reportTestStatistics formatList formatListAsDict pathToRegexp \
+        getTestUncountedLeaks getRuntimeAssemblyName getTestAssemblyName \
+        canTestExec testExec testClrExec execTestShell isRandomOrder \
+        isBreakOnDemand isBreakOnLeak isStopOnFailure isStopOnLeak \
+        isExitOnComplete returnInfoScript runTestPrologue runTestEpilogue \
+        hookPuts unhookPuts runTest testDebugBreak testArrayGet testShim \
+        tsource recordTestStatistics reportTestStatistics formatList \
+        formatListAsDict pathToRegexp assemblyNameToRegexp \
         inverseLsearchGlob removePathFromFileNames formatDecimal \
         clearTestPercent reportTestPercent runAllTests isTestSuiteRunning \
         getTestChannelOrDefault tryVerifyTestPath checkForAndSetTestPath \
         configureTcltest machineToPlatform getPassPercentage \
         getSkipPercentage] false false

Index: Externals/Eagle/lib/Eagle1.0/unzip.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/unzip.eagle
+++ Externals/Eagle/lib/Eagle1.0/unzip.eagle
@@ -36,11 +36,10 @@
     #
     variable baseUri; # DEFAULT: [getAuxiliaryBaseUri] -OR- https://urn.to/r
 
     if {$force || ![info exists baseUri]} then {
       if {[isEagle]} then {
-        package require Eagle.Update
         set baseUri [getAuxiliaryBaseUri]
       } else {
         set baseUri https://urn.to/r
       }
     }
@@ -146,11 +145,11 @@
   #       ZIP archive file to extract.  The extractRootDirectory argument is
   #       the location of a directory that should contain a new temporary
   #       extraction directory.  The actual temporary extraction directory is
   #       returned.
   #
-  proc extractZipArchive { archiveFileName extractRootDirectory } {
+  proc extractZipArchive { archiveFileName extractRootDirectory rootOnly } {
     setupUnzipVars false
 
     variable baseUri
     variable unzipExtractCommand
     variable unzipUri
@@ -157,12 +156,16 @@
     variable unzipUrn
     variable unzipVersionCommand
 
     set fileName [file nativename $archiveFileName]
 
-    set extractDirectory [file join $extractRootDirectory \
-        [appendArgs ea-uz-xa- [pid] - [string trim [clock seconds] -]]]
+    if {$rootOnly} then {
+      set extractDirectory $extractRootDirectory
+    } else {
+      set extractDirectory [file join $extractRootDirectory \
+          [appendArgs ea-uz-xa- [pid] - [string trim [clock seconds] -]]]
+    }
 
     set directory [file nativename $extractDirectory]
 
     if {[isEagle]} then {
       #

Index: Externals/Eagle/lib/Eagle1.0/update.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/update.eagle
+++ Externals/Eagle/lib/Eagle1.0/update.eagle
@@ -23,12 +23,21 @@
   #
   # NOTE: This procedure returns non-zero if the specified public key token
   #       matches the one in use by the Eagle script engine.
   #
   proc matchEnginePublicKeyToken { publicKeyToken } {
-    return [expr {[string length $publicKeyToken] == 0 || \
-        $publicKeyToken eq [info engine PublicKeyToken]}]
+    if {[string length $publicKeyToken] == 0} then {
+      return true
+    }
+
+    set enginePublicKeyToken [info engine PublicKeyToken]
+
+    if {[string length $enginePublicKeyToken] == 0} then {
+      return true
+    }
+
+    return [expr {$publicKeyToken eq $enginePublicKeyToken}]
   }
 
   #
   # NOTE: This procedure returns non-zero if the specified engine name
   #       matches the Eagle script engine.
@@ -162,11 +171,11 @@
       # NOTE: Start trusting ONLY our self-signed SSL certificate.
       #
       set trusted true
 
       if {[lindex [uri softwareupdates] end] eq "untrusted"} then {
-        uri softwareupdates true
+        catch {uri softwareupdates true}
       } else {
         set trusted false; # NOTE: Already trusted.
       }
 
       try {
@@ -178,11 +187,11 @@
         if {$trusted && \
             [lindex [uri softwareupdates] end] eq "trusted"} then {
           #
           # NOTE: Stop trusting ONLY our self-signed SSL certificate.
           #
-          uri softwareupdates false
+          catch {uri softwareupdates false}
         }
       }
 
       #
       # NOTE: Return a result indicating what was done.
@@ -199,14 +208,55 @@
   #       the process.
   #
   proc runUpdateAndExit { {automatic false} } {
     global tcl_platform
 
-    set directory [file dirname [info nameofexecutable]]
+    #
+    # NOTE: Determine the fully qualified file name for the updater.  If
+    #       it is not available, we cannot continue.
+    #
+    set fileName [file join [file normalize \
+        [file dirname [info nameofexecutable]]] Hippogriff.exe]
 
-    set command [list exec -shell -- \
-        [file join $directory Hippogriff.exe] -delay 2000]
+    if {![file exists $fileName]} then {
+      error [appendArgs \
+          "updater executable \"" $fileName "\" is not available"]
+    }
+
+    #
+    # NOTE: For .NET Core, updating via the updater tool is unsupported.
+    #
+    if {[isDotNetCore]} then {
+      error [appendArgs \
+          "updater executable \"" $fileName "\" unsupported on .NET Core"]
+    }
+
+    #
+    # NOTE: Start out with just the base [exec] command, -shell option,
+    #       and the end-of-options marker.
+    #
+    set command [list exec -shell --]
+
+    #
+    # NOTE: Check for native Tcl and Mono because this impacts how the
+    #       shell executable name is determined.
+    #
+    if {[isEagle] && [isMono]} then {
+      #
+      # HACK: Assume that Mono is somewhere along the PATH.
+      #
+      lappend command mono \
+          [appendArgs \" [file nativename $fileName] \"]
+    } else {
+      lappend command $fileName
+    }
+
+    #
+    # NOTE: Add the base options to the updater executable.  Typically,
+    #       this only includes the initial (mutex checking) delay.
+    #
+    lappend command -delay 2000
 
     #
     # HACK: The native StrongNameSignatureVerificationEx() function does
     #       not appear to work on WOA (Windows-on-ARM) on the Surface RT
     #       tablet; therefore, attempt to disable its use when calling
@@ -311,11 +361,11 @@
     # NOTE: Start trusting ONLY our own self-signed SSL certificate.
     #
     set trusted true
 
     if {[lindex [uri softwareupdates] end] eq "untrusted"} then {
-      uri softwareupdates true
+      catch {uri softwareupdates true}
     } else {
       set trusted false; # NOTE: Already trusted.
     }
 
     try {
@@ -327,11 +377,11 @@
       if {$trusted && \
           [lindex [uri softwareupdates] end] eq "trusted"} then {
         #
         # NOTE: Stop trusting ONLY our own self-signed SSL certificate.
         #
-        uri softwareupdates false
+        catch {uri softwareupdates false}
       }
     }
   }
 
   #
@@ -343,11 +393,11 @@
     # NOTE: Start trusting ONLY our own self-signed SSL certificate.
     #
     set trusted true
 
     if {[lindex [uri softwareupdates] end] eq "untrusted"} then {
-      uri softwareupdates true
+      catch {uri softwareupdates true}
     } else {
       set trusted false; # NOTE: Already trusted.
     }
 
     try {
@@ -359,11 +409,11 @@
       if {$trusted && \
           [lindex [uri softwareupdates] end] eq "trusted"} then {
         #
         # NOTE: Stop trusting ONLY our own self-signed SSL certificate.
         #
-        uri softwareupdates false
+        catch {uri softwareupdates false}
       }
     }
   }
 
   #

Index: Externals/Eagle/lib/Eagle1.0/vendor.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/vendor.eagle
+++ Externals/Eagle/lib/Eagle1.0/vendor.eagle
@@ -357,15 +357,17 @@
         connection_flags core_library_version database_directory \
         datetime_format define_constant_prefix execute_on_setup \
         interop_assembly_file_names native_library_file_names \
         release_version scratch_directory temporary_directory test_clr \
         test_clr_v2 test_clr_v4 test_configuration test_configurations \
-        test_constraints test_machine test_net_fx test_net_fx_2005 \
-        test_net_fx_2008 test_net_fx_2010 test_net_fx_2012 test_net_fx_2013 \
-        test_net_fx_2015 test_overrides test_platform test_suite test_year \
-        test_years test_year_clr_v2 test_year_clr_v4 vendor_directory \
-        vendor_test_directory]}] [checkForVendorQuiet checkForTestOverrides]
+        test_constraints test_extra test_extras test_machine \
+        test_native_year test_net_fx test_net_fx_2005 test_net_fx_2008 \
+        test_net_fx_2010 test_net_fx_2012 test_net_fx_2013 \
+        test_net_fx_2015 test_overrides test_platform test_suite \
+        test_year test_years test_year_clr_v2 test_year_clr_v4 \
+        vendor_directory vendor_test_directory]}] \
+        [checkForVendorQuiet checkForTestOverrides]
 
     #
     # NOTE: Set the name of the running test suite, if necessary.
     #
     if {![info exists test_suite]} then {

Index: Externals/Eagle/lib/Test1.0/constraints.eagle
==================================================================
--- Externals/Eagle/lib/Test1.0/constraints.eagle
+++ Externals/Eagle/lib/Test1.0/constraints.eagle
@@ -20,13 +20,14 @@
 #       namespace if this script actually ends up being evaluated in Tcl.
 #
 namespace eval ::Eagle {
   proc getKnownBuildTypes {} {
     return [list \
-        NetFx20 NetFx35 NetFx40 NetFx45 NetFx451 NetFx452 \
-        NetFx46 NetFx461 NetFx462 NetFx47 NetFx471 Bare \
-        LeanAndMean Database MonoOnUnix Development]
+        NetFx20 NetFx35 NetFx40 NetFx45 NetFx451 \
+        NetFx452 NetFx46 NetFx461 NetFx462 NetFx47 \
+        NetFx471 NetStandard20 Bare LeanAndMean \
+        Database MonoOnUnix Development]
   }
 
   proc getKnownCompileOptions {} {
     return [list \
         APPDOMAINS APPROVED_VERBS ARGUMENT_CACHE ARM ARM64 ASSEMBLY_DATETIME \
@@ -33,23 +34,24 @@
         ASSEMBLY_RELEASE ASSEMBLY_STRONG_NAME_TAG ASSEMBLY_TAG ASSEMBLY_TEXT \
         ASSEMBLY_URI BREAK_ON_EXITING BREAKPOINTS CACHE_ARGUMENT_TOSTRING \
         CACHE_ARGUMENTLIST_TOSTRING CACHE_DICTIONARY CACHE_RESULT_TOSTRING \
         CACHE_STATISTICS CACHE_STRINGLIST_TOSTRING CALLBACK_QUEUE CAS_POLICY \
         CERTIFICATE_PLUGIN CERTIFICATE_POLICY CERTIFICATE_RENEWAL \
-        CODE_ANALYSIS COM_TYPE_CACHE CONSOLE DAEMON DATA DEAD_CODE DEBUG \
-        DEBUGGER DEBUGGER_ARGUMENTS DEBUGGER_ENGINE DEBUGGER_EXECUTE \
-        DEBUGGER_EXPRESSION DEBUGGER_VARIABLE DEBUG_TRACE DEBUG_WRITE \
-        DEMO_EDITION DRAWING DYNAMIC EAGLE EMBEDDED_LIBRARY \
-        EMBED_CERTIFICATES ENTERPRISE_LOCKDOWN EXECUTE_CACHE EXPRESSION_FLAGS \
-        FAST_ERRORCODE FAST_ERRORINFO FOR_TEST_USE_ONLY HAVE_SIZEOF HISTORY \
-        IA64 INTERACTIVE_COMMANDS INTERNALS_VISIBLE_TO ISOLATED_INTERPRETERS \
-        ISOLATED_PLUGINS LIBRARY LICENSING LICENSE_MANAGER LIMITED_EDITION \
-        LIST_CACHE MONO MONO_BUILD MONO_HACKS MONO_LEGACY NATIVE \
-        NATIVE_PACKAGE NATIVE_THREAD_ID NATIVE_UTILITY NATIVE_UTILITY_BSTR \
-        NETWORK NET_20 NET_20_FAST_ENUM NET_20_ONLY NET_20_SP1 NET_20_SP2 \
-        NET_30 NET_35 NET_40 NET_45 NET_451 NET_452 NET_46 NET_461 NET_462 \
-        NET_47 NET_471 NON_WORKING_CODE NOTIFY NOTIFY_ACTIVE NOTIFY_ARGUMENTS \
+        CODE_ANALYSIS COM_TYPE_CACHE CONFIGURATION CONSOLE DAEMON DATA \
+        DEAD_CODE DEBUG DEBUGGER DEBUGGER_ARGUMENTS DEBUGGER_ENGINE \
+        DEBUGGER_EXECUTE DEBUGGER_EXPRESSION DEBUGGER_VARIABLE DEBUG_TRACE \
+        DEBUG_WRITE DEMO_EDITION DRAWING DYNAMIC EAGLE EMBEDDED_LIBRARY \
+        EMBED_CERTIFICATES EMIT ENTERPRISE_LOCKDOWN EXECUTE_CACHE \
+        EXPRESSION_FLAGS FAST_ERRORCODE FAST_ERRORINFO FOR_TEST_USE_ONLY \
+        HAVE_SIZEOF HISTORY IA64 INTERACTIVE_COMMANDS INTERNALS_VISIBLE_TO \
+        ISOLATED_INTERPRETERS ISOLATED_PLUGINS LIBRARY LICENSING \
+        LICENSE_MANAGER LIMITED_EDITION LIST_CACHE MONO MONO_BUILD MONO_HACKS \
+        MONO_LEGACY NATIVE NATIVE_PACKAGE NATIVE_THREAD_ID NATIVE_UTILITY \
+        NATIVE_UTILITY_BSTR NETWORK NET_20 NET_20_FAST_ENUM NET_20_ONLY \
+        NET_20_SP1 NET_20_SP2 NET_30 NET_35 NET_40 NET_45 NET_451 NET_452 \
+        NET_46 NET_461 NET_462 NET_47 NET_471 NET_CORE_20 NET_STANDARD_20 \
+        NON_WORKING_CODE NOTIFY NOTIFY_ACTIVE NOTIFY_ARGUMENTS \
         NOTIFY_EXCEPTION NOTIFY_EXECUTE NOTIFY_EXPRESSION NOTIFY_GLOBAL \
         NOTIFY_OBJECT OBSOLETE OBFUSCATION OFFICIAL PARSE_CACHE PATCHLEVEL \
         PLUGIN_COMMANDS POLICY_TRACE PREVIOUS_RESULT RANDOMIZE_ID REMOTING \
         RESULT_LIMITS SAMPLE SECURITY SERIALIZATION SHARED_ID_POOL SHELL \
         SOURCE_ID SOURCE_TIMESTAMP STATIC TCL TCL_KITS TCL_THREADED \
@@ -78,11 +80,11 @@
       return [list \
           [list 2 0] [list 2 2] [list 2 4] [list 2 6] [list 2 8] [list 2 10] \
           [list 2 11] [list 3 0] [list 3 1] [list 3 2] [list 3 4] [list 3 6] \
           [list 3 8] [list 3 10] [list 3 12] [list 4 0] [list 4 2] [list 4 4] \
           [list 4 6] [list 4 8] [list 5 0] [list 5 2] [list 5 4] [list 5 8] \
-          [list 5 10]]
+          [list 5 10] [list 5 12]]
     } else {
       return [list]
     }
   }
 
@@ -163,10 +165,77 @@
       lappend result $version
     }
 
     return $result
   }
+
+  proc getDotNetCoreDirectoryNameOnly { path } {
+    #
+    # HACK: Obtain parent directory name that matches "net*", if any (e.g.
+    #       "netcoreapp2.0", "netstandard2.0", etc).
+    #
+    if {[string length $path] > 0} then {
+      set tail [file tail $path]
+
+      if {[string match net* $tail]} then {
+        return $tail
+      }
+    }
+
+    return ""
+  }
+
+  proc getDotNetCoreLibPathDirectoryNameOnly { {name ""} } {
+    #
+    # NOTE: Search for matching directories based on the globally detected
+    #       library path associated with the current core library.
+    #
+    if {[info exists ::core_lib_path] && \
+        [string length $::core_lib_path] > 0} then {
+      #
+      # NOTE: Make sure the directory actually exists before trying to find
+      #       things within it.
+      #
+      if {[file isdirectory $::core_lib_path]} then {
+        #
+        # NOTE: Grab all directories that are directly beneath the detected
+        #       library path, if any.
+        #
+        foreach directory [glob \
+            -nocomplain -types {d} -- [file join $::core_lib_path *]] {
+          #
+          # NOTE: If the caller specified a (plugin) name to match against,
+          #       make sure it matches; otherwise, skip this directory.
+          #
+          if {[string length $name] > 0 && \
+              ![string match $name [file tail $directory]]} then {
+            continue
+          }
+
+          #
+          # NOTE: Find directories beneath the current candidate directory
+          #       that are .NET Core output directories.
+          #
+          set directories [glob \
+              -nocomplain -types {d} -- [file join $directory net*]]
+
+          #
+          # NOTE: If there is at least one match, we are done.  Return the
+          #       final path segment of the directory name to the caller.
+          #
+          if {[llength $directories] > 0} then {
+            return [file tail [lindex $directories 0]]
+          }
+        }
+      }
+    }
+
+    #
+    # NOTE: There was no match, just return something obviously invalid.
+    #
+    return ""
+  }
 
   proc getDottedVersion { version } {
     return [join $version .]
   }
 
@@ -345,10 +414,18 @@
   #       considered to be running on Mono.
   #
   proc isTestMono {} {
     return [expr {![info exists ::no(mono)] && [isMono]}]
   }
+
+  #
+  # NOTE: This procedure should return non-zero if the test suite should be
+  #       considered to be running on .NET Core.
+  #
+  proc isTestDotNetCore {} {
+    return [expr {![info exists ::no(dotNetCore)] && [isDotNetCore]}]
+  }
 
   proc isTestAdministrator { {force false} } {
     #
     # NOTE: This is a workaround for the [isAdministrator] procedure being
     #       inaccurate for Mono on Windows, primarily due to the inability
@@ -1380,10 +1457,11 @@
         #
         # NOTE: We are running in Eagle via the EagleShell.
         #
         addConstraint shell
         addConstraint [appendArgs shell. $name]
+        addConstraint dotNetCoreOrShell
 
         tputs $channel "yes (Eagle)\n"
 
         #
         # NOTE: We are done here, return now.
@@ -1395,10 +1473,11 @@
         #
         # NOTE: We are running in Tcl via tclsh.
         #
         addConstraint shell
         addConstraint [appendArgs shell. $name]
+        addConstraint dotNetCoreOrShell
 
         tputs $channel "yes (Tcl)\n"
 
         #
         # NOTE: We are done here, return now.
@@ -2743,11 +2822,11 @@
     proc checkForStrongName { channel } {
       tputs $channel "---- checking for strong name... "
 
       if {[catch {
         object invoke Interpreter.GetActive GetStrongName
-      } strongName] == 0 && [string length $strongName] > 0} then {
+      } strongName] == 0 && [isNonNullObjectHandle $strongName]} then {
         #
         # NOTE: Yes, it appears that the core library was signed with a
         #       strong name key.
         #
         addConstraint strongName
@@ -2839,11 +2918,11 @@
     proc checkForCertificate { channel } {
       tputs $channel "---- checking for certificate... "
 
       if {[catch {
         object invoke Interpreter.GetActive GetCertificate
-      } certificate] == 0 && [string length $certificate] > 0} then {
+      } certificate] == 0 && [isNonNullObjectHandle $certificate]} then {
         #
         # NOTE: Yes, it appears that the core library was signed with a
         #       code-signing certificate.
         #
         addConstraint certificate
@@ -2867,11 +2946,12 @@
     }
 
     proc checkForCompileCSharp { channel } {
       tputs $channel "---- checking for test use of C# compiler... "
 
-      if {![info exists ::no(compileCSharp)]} then {
+      if {![info exists ::no(compileCSharp)] && \
+          [doesCompileCSharpWork]} then {
         addConstraint compileCSharp
 
         tputs $channel yes\n
       } else {
         tputs $channel no\n
@@ -2950,11 +3030,11 @@
     proc checkForDefaultAppDomain { channel } {
       tputs $channel "---- checking for default application domain... "
 
       if {[catch {
         object invoke AppDomain CurrentDomain
-      } appDomain] == 0 && [string length $appDomain] > 0} then {
+      } appDomain] == 0 && [isNonNullObjectHandle $appDomain]} then {
         if {[catch {
           object invoke $appDomain IsDefaultAppDomain
         } default] || [string length $default] == 0} then {
           set default false
         }
@@ -2978,26 +3058,45 @@
 
     proc checkForRuntime { channel } {
       tputs $channel "---- checking for runtime... "
 
       #
-      # NOTE: Are we running inside Mono (regardless of operating system)?
+      # NOTE: Are we running inside Mono -OR- on .NET Core (regardless
+      #       of operating system)?
       #
-      if {[isTestMono]} then {
+      if {[isTestDotNetCore]} then {
+        #
+        # NOTE: Yes, it appears that we are running on .NET Core.
+        #
+        addConstraint dotNetCore; # running on .NET Core.
+        addConstraint dotNetOrDotNetCore
+        addConstraint dotNetCoreOrShell
+
+        #
+        # NOTE: We do not want to skip Mono bugs on .NET Core.
+        #
+        addKnownMonoConstraints true; # running on .NET Core.
+
+        tputs $channel [appendArgs [expr {[info exists \
+            ::eagle_platform(runtime)] ? \
+            $::eagle_platform(runtime) : ".NET Core"}] \n]
+      } elseif {[isTestMono]} then {
         #
         # NOTE: Yes, it appears that we are running inside Mono.
         #
         addConstraint mono; # running on Mono.
+        addConstraint monoOrDotNetCore
 
         tputs $channel [appendArgs [expr {[info exists \
             ::eagle_platform(runtime)] ? \
             $::eagle_platform(runtime) : "Mono"}] \n]
       } else {
         #
-        # NOTE: No, it appears that we are not running inside Mono.
+        # NOTE: It appears that we are running on the full .NET.
         #
         addConstraint dotNet; # running on .NET.
+        addConstraint dotNetOrDotNetCore
 
         #
         # NOTE: We do not want to skip Mono bugs on .NET.
         #
         addKnownMonoConstraints true; # running on .NET.
@@ -3112,24 +3211,39 @@
             # NOTE: Yes, the image runtime version matches the framework.
             #
             addConstraint matchFramework
             addConstraint [appendArgs matchFramework $version(1)]
 
-            addConstraint dotnetMatchFramework
-            addConstraint [appendArgs dotnetMatchFramework $version(1)]
+            addConstraint dotNetMatchFramework
+            addConstraint [appendArgs dotNetMatchFramework $version(1)]
 
             addConstraint monoMatchFramework
             addConstraint [appendArgs monoMatchFramework $version(1)]
 
+            addConstraint dotNetCoreMatchFramework
+            addConstraint [appendArgs dotNetCoreMatchFramework $version(1)]
+
             tputs $channel yes\n
           } else {
-            if {[isMono]} then {
-              addConstraint dotnetMatchFramework
-              addConstraint [appendArgs dotnetMatchFramework $version(1)]
+            if {[isTestDotNetCore]} then {
+              addConstraint dotNetMatchFramework
+              addConstraint [appendArgs dotNetMatchFramework $version(1)]
+
+              addConstraint monoMatchFramework
+              addConstraint [appendArgs monoMatchFramework $version(1)]
+            } elseif {[isTestMono]} then {
+              addConstraint dotNetMatchFramework
+              addConstraint [appendArgs dotNetMatchFramework $version(1)]
+
+              addConstraint dotNetCoreMatchFramework
+              addConstraint [appendArgs dotNetCoreMatchFramework $version(1)]
             } else {
               addConstraint monoMatchFramework
               addConstraint [appendArgs monoMatchFramework $version(1)]
+
+              addConstraint dotNetCoreMatchFramework
+              addConstraint [appendArgs dotNetCoreMatchFramework $version(1)]
             }
 
             tputs $channel no\n
           }
         } else {
@@ -3155,11 +3269,31 @@
         # NOTE: Now create a version string for use in the constraint name
         #       (remove the periods).
         #
         set version [string map [list . ""] $dotVersion]
 
-        if {[isTestMono]} then {
+        if {[isTestDotNetCore]} then {
+          #
+          # NOTE: If the runtime version was found, add a test constraint
+          #       for it now.
+          #
+          if {[string length $version] > 0} then {
+            #
+            # NOTE: We are running on the .NET Core.  Keep track of the
+            #       specific version for usage in test constraints.
+            #
+            addConstraint [appendArgs dotNetCore $version]
+            addConstraint [appendArgs dotNetCore $version OrHigher]
+          }
+
+          #
+          # NOTE: We do not want to skip any Mono bugs on .NET Core.  Add
+          #       the necessary constraints for each version of Mono we
+          #       know about.
+          #
+          addKnownMonoConstraints false; # running on .NET.
+        } elseif {[isTestMono]} then {
           #
           # NOTE: If the runtime version was found, add a test constraint
           #       for it now.
           #
           if {[string length $version] > 0} then {
@@ -3506,21 +3640,38 @@
         tputs $channel yes\n
       } else {
         tputs $channel no\n
       }
     }
+
+    proc testForDynamicLoading { {fileName ""} } {
+      if {[catch {
+        if {[isWindows] && [string length $fileName] == 0} then {
+          set fileName kernel32; # HACK: Always pre-loaded?
+        }
+
+        set error null
+
+        object invoke -flags +NonPublic \
+            Eagle._Components.Private.NativeOps TestLoadLibrary \
+            $fileName error
+      } code] == 0 && $code eq "Ok"} then {
+        return true
+      }
+
+      return false
+    }
 
     proc checkForDynamicLoading { channel } {
       tputs $channel "---- checking for dynamic loading... "
 
       #
       # NOTE: As far as we know, dynamic loading always works on Windows.
       #       On some Unix systems, dlopen does not work (e.g. because
       #       Mono is statically linked, etc).
       #
-      if {[isWindows] || ([llength [info commands library]] > 0 && \
-          [catch {library test}] == 0)} then {
+      if {[isWindows] || [testForDynamicLoading]} then {
         #
         # NOTE: Yes, it appears that it is available.
         #
         addConstraint dynamic
 
@@ -3715,10 +3866,225 @@
         tputs $channel yes\n
       } else {
         tputs $channel no\n
       }
     }
+
+    proc checkForExcelUsable { channel } {
+      tputs $channel "---- checking for usable instance of Excel... "
+
+      #
+      # NOTE: As of this writing, this check is only supported on Windows.
+      #
+      if {[isWindows]} then {
+        #
+        # NOTE: This constraint check must run after the interop assembly for
+        #       Excel has been detected, because this check makes use of it.
+        #
+        if {[haveConstraint Microsoft.Office.Interop.Excel]} then {
+          #
+          # NOTE: This constraint check requires the (optional) interpreter
+          #       isolation feature of Eagle in order to keep the primary
+          #       interpreter and AppDomain tidy.  It also requires access
+          #       to native Windows support in order to use the [info hwnd]
+          #       sub-command.
+          #
+          if {[haveConstraint compile.ISOLATED_INTERPRETERS] && \
+              [haveConstraint compile.NATIVE] && \
+              [haveConstraint compile.WINDOWS]} then {
+            try {
+              if {[catch {
+                #
+                # NOTE: In an attempt to limit the assemblies loaded into the
+                #       primary AppDomain, create an isolated interpreter.
+                #
+                set interp [interp create -isolated]
+
+                #
+                # NOTE: Give the newly created (isolated) interpreter a means
+                #       to set variables in the parent (this) interpreter.
+                #
+                interp alias $interp pset {} set; # parent set
+
+                #
+                # NOTE: Evaluate all the Excel interop assembly related code
+                #       in the other AppDomain.
+                #
+                interp eval $interp {
+                  #
+                  # NOTE: First, attempt to load the Excel interop assembly.
+                  #       If this fails, we cannot continue and Excel is not
+                  #       considered usable.
+                  #
+                  set assembly [object load -import -declare \
+                      Microsoft.Office.Interop.Excel]
+
+                  #
+                  # NOTE: Next, attempt to run the Excel application using
+                  #       its automation object model.  If this fails, we
+                  #       cannot continue and Excel is not considered usable.
+                  #
+                  set application [object create -alias \
+                      Microsoft.Office.Interop.Excel.ApplicationClass]; # run
+
+                  #
+                  # NOTE: Next, attempt to extract the process ID associated
+                  #       with the Excel application window.  This is used to
+                  #       help make sure the running Excel instance is closed
+                  #       after our testing is complete.  Generally, this will
+                  #       not fail because we know the [info hwnd] sub-command
+                  #       should be available, due to define constant checks.
+                  #
+                  pset pid [getDictionaryValue \
+                      [info hwnd [$application Hwnd]] processId]
+
+                  #
+                  # NOTE: Next, attempt to make sure that the Excel instance
+                  #       is not visible and will not display alerts/prompts.
+                  #       If this fails, Excel is not considered usable.
+                  #
+                  $application Visible false
+                  $application DisplayAlerts false
+
+                  #
+                  # NOTE: Next, create a value of an enumerated type exposed
+                  #       by the Excel automation object model so that we can
+                  #       add a new workbook.  Generally, this does not fail.
+                  #       If this fails, Excel is not considered usable.
+                  #
+                  set enumValue [object invoke -create \
+                      Enum Parse XlWBATemplate xlWBATWorksheet]
+
+                  #
+                  # NOTE: Next, attempt to add a new workbook.  If this fails,
+                  #       Excel is not considered usable.
+                  #
+                  set workbook [object invoke -alias \
+                      $application.Workbooks Add $enumValue]
+
+                  #
+                  # NOTE: The test package is needed in order to make use of
+                  #       the [getTemporaryFileName] procedure.
+                  #
+                  package require Eagle.Test
+
+                  #
+                  # NOTE: Setup a temporary file name that can be used to save
+                  #       the Excel spreadsheet.
+                  #
+                  pset fileName [set fileName [file nativename \
+                      [appendArgs [getTemporaryFileName] .xls]]]
+
+                  #
+                  # NOTE: Next, attempt to save a new workbook.  If this fails,
+                  #       Excel is not considered usable.
+                  #
+                  $workbook SaveAs $fileName
+
+                  #
+                  # NOTE: Next, attempt to close Excel.  If this fails, Excel
+                  #       is not considered usable.
+                  #
+                  $application Quit; # close
+
+                  #
+                  # NOTE: Finally, cleanup our local state just to be tidy.
+                  #
+                  unset workbook enumValue application assembly; # dispose
+                }
+              } result] == 0} then {
+                #
+                # NOTE: It appears the Excel instance is usable.
+                #
+                addConstraint excel.usable
+
+                #
+                # NOTE: Show that a usable Excel instance was found.
+                #
+                tputs $channel yes\n
+              } else {
+                #
+                # NOTE: This is the list of error message patterns that may
+                #       indicate a trial version of Excel is being used.
+                #
+                set patterns [list \
+                    "* 0x800AC472*" "* 0x800A03EC*" \
+                    "* application has expired.*"]
+
+                #
+                # NOTE: Check each error message pattern.  Upon finding any
+                #       match, mark Excel as unusable due to being a trial
+                #       edition and then stop.
+                #
+                foreach pattern $patterns {
+                  #
+                  # TODO: For now, just use [string match] here; eventually,
+                  #       regular expressions may be needed.
+                  #
+                  if {[string match $pattern $result]} then {
+                    #
+                    # NOTE: It appears that Excel is a trial edition.
+                    #
+                    addConstraint excel.trial
+
+                    #
+                    # NOTE: Show that the Excel trial edition was found.
+                    #
+                    tputs $channel "no, trial\n"
+
+                    #
+                    # NOTE: We are done here, return now.
+                    #
+                    return
+                  }
+                }
+
+                #
+                # NOTE: It appears the Excel instance is not usable.
+                #
+                addConstraint excel.unusable
+
+                #
+                # NOTE: Show that a unusable Excel instance was found.
+                #
+                tputs $channel "no, broken\n"
+              }
+            } finally {
+              #
+              # NOTE: Make sure the isolated interpreter is deleted if it was
+              #       actually created.
+              #
+              if {[info exists interp] && [interp exists $interp]} then {
+                catch {interp delete $interp}
+              }
+
+              #
+              # NOTE: Make sure the Excel process is (forcibly) closed if it
+              #       is still running at this point.
+              #
+              if {[info exists pid] && $pid in [getProcesses excel]} then {
+                catch {kill -force $pid}
+              }
+
+              #
+              # NOTE: Make sure the temporary spreadsheet file is deleted if
+              #       it was actually created.
+              #
+              if {[info exists fileName] && [file exists $fileName]} then {
+                catch {file delete $fileName}
+              }
+            }
+          } else {
+            tputs $channel "unknown, missing optional feature\n"
+          }
+        } else {
+          tputs $channel "unknown, no Excel interop assembly\n"
+        }
+      } else {
+        tputs $channel "unknown, not running on Windows\n"
+      }
+    }
 
     proc checkForTclInstalls { channel } {
       tputs $channel "---- checking for Tcl installs... "
 
       #
@@ -4639,11 +5005,11 @@
         object invoke -flags +NonPublic Interpreter.GetActive Debugger
       } debugger] == 0} then {
         #
         # NOTE: We do not own this, do not dispose it.
         #
-        if {[string length $debugger] > 0} then {
+        if {[isNonNullObjectHandle $debugger]} then {
           catch {object flags $debugger +NoDispose}
         }
 
         if {[regexp -- {^Debugger#\d+$} $debugger]} then {
           #
@@ -4673,20 +5039,20 @@
         object invoke -flags +NonPublic Interpreter.GetActive Debugger
       } debugger] == 0} then {
         #
         # NOTE: We do not own this, do not dispose it.
         #
-        if {[string length $debugger] > 0} then {
+        if {[isNonNullObjectHandle $debugger]} then {
           catch {object flags $debugger +NoDispose}
         }
 
         if {[regexp -- {^Debugger#\d+$} $debugger] && \
             [catch {object invoke $debugger Interpreter} interp] == 0} then {
           #
           # NOTE: We do not own this, do not dispose it.
           #
-          if {[string length $interp] > 0} then {
+          if {[isNonNullObjectHandle $interp]} then {
             catch {object flags $interp +NoDispose}
           }
 
           if {[regexp -- {^Interpreter#\d+$} $interp]} then {
             #
@@ -4719,19 +5085,20 @@
     # NOTE: We need several of our test constraint related commands in the
     #       global namespace.
     #
     exportAndImportPackageCommands [namespace current] [list \
         getKnownBuildTypes getKnownCompileOptions getKnownMonoVersions \
-        addKnownMonoConstraints lpermute alwaysFullInterpReady canExecComSpec \
-        canExecWhoAmI canExecTclShell canExecFossil canExecVsWhere isTestMono \
-        isTestAdministrator canPing cleanConstraintName cleanPackageName \
-        haveTclPlatformOsExtraUpdateName checkForTestSuiteFiles \
-        checkForPlatform checkForWindowsVersion checkForOperatingSystemUpdate \
-        checkForScriptLibrary checkForVariable checkForTclOptions \
-        checkForWindowsCommandProcessor checkForPackage checkForFossil \
-        checkForVisualStudioViaVsWhere checkForEagle checkForSymbols \
-        checkForLogFile checkForGaruda checkForShell \
+        addKnownMonoConstraints getDotNetCoreLibPathDirectoryNameOnly \
+        lpermute alwaysFullInterpReady canExecComSpec canExecWhoAmI \
+        canExecTclShell canExecFossil canExecVsWhere isTestMono \
+        isTestDotNetCore isTestAdministrator canPing cleanConstraintName \
+        cleanPackageName haveTclPlatformOsExtraUpdateName \
+        checkForTestSuiteFiles checkForPlatform checkForWindowsVersion \
+        checkForOperatingSystemUpdate checkForScriptLibrary checkForVariable \
+        checkForTclOptions checkForWindowsCommandProcessor checkForPackage \
+        checkForFossil checkForVisualStudioViaVsWhere checkForEagle \
+        checkForSymbols checkForLogFile checkForGaruda checkForShell \
         checkForOfficialStableReleaseInProgress checkForDebug checkForTk \
         checkForVersion checkForCommand checkForSubCommand checkForNamespaces \
         checkForTestExec checkForTestMachine checkForTestPlatform \
         checkForTestConfiguration checkForTestSuffix checkForFile \
         checkForPathFile checkForNativeCode checkForTip127 checkForTip194 \

Index: Externals/Eagle/lib/Test1.0/prologue.eagle
==================================================================
--- Externals/Eagle/lib/Test1.0/prologue.eagle
+++ Externals/Eagle/lib/Test1.0/prologue.eagle
@@ -172,11 +172,12 @@
   }
 
   #
   # NOTE: Set the location of the [non-script] library directory
   #       (i.e. the directory where the plugins are located), if
-  #       necessary.
+  #       necessary.  This variant is based on where the process
+  #       executable is located.
   #
   if {![info exists lib_path]} then {
     #
     # NOTE: This should go one directory up from the directory
     #       containing the executable file for the process (e.g.
@@ -183,10 +184,72 @@
     #       the shell) and then into the "lib" directory just
     #       beneath that.
     #
     set lib_path [file normalize [file join [file dirname $bin_path] lib]]
   }
+
+  #
+  # NOTE: Set the location of the Eagle core library -OR- Tcl core
+  #       library file is located.  This may be different than the
+  #       location of the (shell?) executable file.
+  #
+  if {![info exists core_bin_path]} then {
+    #
+    # NOTE: Attempt to obtain the information for the Eagle core
+    #       library assembly.  This will not work for native Tcl.
+    #
+    if {[catch {info assembly} bin_dir] == 0} then {
+      #
+      # NOTE: Grab the directory for the core library assembly.
+      #
+      set core_bin_path [file dirname [lindex $bin_dir end]]
+    } else {
+      #
+      # NOTE: This is native Tcl.  There is no way to query the
+      #       path for the Tcl core library itself (e.g. "tcl*.dll",
+      #       "libtcl*.so", etc); however, using [info library] is
+      #       close enough.
+      #
+      set core_bin_path [file dirname [info library]]
+    }
+
+    unset bin_dir
+  }
+
+  #
+  # NOTE: Set the location of the [non-script] library directory
+  #       (i.e. the directory where the plugins are located), if
+  #       necessary.  This variant is based on where the Eagle
+  #       core library -OR- Tcl core library file is located.
+  #
+  if {![info exists core_lib_path]} then {
+    #
+    # NOTE: Start with the directory for the core library assembly.
+    #
+    set core_lib_path $core_bin_path
+
+    #
+    # NOTE: Perform a check for the .NET Core output directories
+    #       (e.g. "netcoreapp2.0", etc), which must be removed
+    #       if present, prior to further checks.
+    #
+    if {![info exists no(dotNetCoreLibPath)] && \
+        [string match net* [file tail $core_lib_path]]} then {
+      #
+      # NOTE: Remove the .NET Core output directory name.
+      #
+      set core_lib_path [file dirname $core_lib_path]
+    }
+
+    #
+    # NOTE: Go up one level, to remove the "bin" directory and
+    #       then append the "lib" directory.  This gives us the
+    #       final path we need.
+    #
+    set core_lib_path [file normalize \
+        [file join [file dirname $core_lib_path] lib]]
+  }
 
   #
   # NOTE: Set the web host to test against, if necessary.
   #
   if {![info exists test_host]} then {
@@ -623,11 +686,12 @@
                   "==== WARNING: attempting automatic Tcl shell selection...\n"
             }
 
             set test_tclsh [getTclShellFileName \
                 [expr {![info exists no(automaticTclShell)]}] \
-                [expr {![info exists no(tclKit)]}]]
+                [expr {![info exists no(tclKit)]}] \
+                [expr {[info exists test_machine] ? $test_machine : ""}]]
           } else {
             #
             # NOTE: Skip detection and use the fallback default.
             #
             set test_tclsh tclsh
@@ -947,10 +1011,16 @@
   tputs $test_channel [appendArgs "---- binary path: \"" \
       $bin_path \"\n]
 
   tputs $test_channel [appendArgs "---- library path: \"" \
       $lib_path \"\n]
+
+  tputs $test_channel [appendArgs "---- core binary path: \"" \
+      $core_bin_path \"\n]
+
+  tputs $test_channel [appendArgs "---- core library path: \"" \
+      $core_lib_path \"\n]
 
   tputs $test_channel [appendArgs "---- test suite files located in: \"" \
       $test_all_path \"\n]
 
   tputs $test_channel [appendArgs "---- test script files located in: \"" \
@@ -1048,11 +1118,11 @@
     # NOTE: If the "no(mono)" variable is set (to anything) then any
     #       special test suite hacks for Mono will be disabled. This
     #       does not control or change any hacks for Mono that may
     #       be present in the library itself.
     #
-    # if {[isTestMono]} then {
+    # if {[isMono]} then {
     #   set no(mono) true
     # }
 
     ###########################################################################
     ######################### BEGIN Eagle Constraints #########################
@@ -1348,17 +1418,10 @@
       #       and "object-98.*".
       #
       checkForReferenceCountTracking $test_channel
     }
 
-    #
-    # NOTE: Has testing using the C# compiler been disabled?
-    #
-    if {![info exists no(checkForCompileCSharp)]} then {
-      checkForCompileCSharp $test_channel
-    }
-
     #
     # NOTE: Has compile/runtime option testing support been disabled?
     #
     if {![info exists no(compileOptions)]} then {
       #
@@ -1387,10 +1450,21 @@
           #
           # NOTE: For tests "load-1.6" and "load-1.7".
           #
           checkForCompileOption $test_channel CAS_POLICY
         }
+
+        #
+        # NOTE: Has configuration support been enabled (at compile-time)?
+        #
+        if {![info exists no(compileConfiguration)]} then {
+          #
+          # NOTE: For tests "debug-1.3", "object-99.1", "object-11.4",
+          #       and "garuda-1.2".
+          #
+          checkForCompileOption $test_channel CONFIGURATION
+        }
 
         #
         # NOTE: Has console support been enabled (at compile-time)?
         #
         if {![info exists no(compileConsole)]} then {
@@ -1491,10 +1565,46 @@
           #
           # NOTE: For test "object-4.8".
           #
           checkForCompileOption $test_channel APPROVED_VERBS
         }
+
+        #
+        # NOTE: Has embedded library support been enabled (at
+        #       compile-time)?
+        #
+        if {![info exists no(compileEmbeddedLibrary)]} then {
+          #
+          # NOTE: For test "interp-1.400".
+          #
+          checkForCompileOption $test_channel EMBEDDED_LIBRARY
+        }
+
+        #
+        # NOTE: Has System.Reflection.Emit support been enabled (at
+        #       compile-time)?
+        #
+        if {![info exists no(compileEmit)]} then {
+          #
+          # NOTE: For tests "commands-1.1.*", "debug-9.1", "library-*",
+          #       "object-4.10", "object-4.11", "object-4.12",
+          #       "object-8.1??", and "perf-101.0".
+          #
+          checkForCompileOption $test_channel EMIT
+        }
+
+        #
+        # NOTE: Has .NET Standard 2.0 support been enabled (at
+        #       compile-time)?
+        #
+        if {![info exists no(compileNetStandard20)]} then {
+          #
+          # NOTE: For tests "basic-1.29.*", "basic-1.30.*", "host-1.1",
+          #       "interp-1.601", "redefine-6.2", and "sql-1.17".
+          #
+          checkForCompileOption $test_channel NET_STANDARD_20
+        }
 
         #
         # NOTE: Has Mono support been enabled (at compile-time)?
         #
         if {![info exists no(compileMono)]} then {
@@ -1618,10 +1728,31 @@
           # NOTE: For test "interp-1.10".
           #
           checkForCompileOption $test_channel SERIALIZATION
         }
 
+        #
+        # NOTE: Has remoting support been enabled (at compile-time)?
+        #
+        if {![info exists no(compileRemoting)]} then {
+          #
+          # NOTE: For tests "remotingServer-1.*".
+          #
+          checkForCompileOption $test_channel REMOTING
+        }
+
+        #
+        # NOTE: Has result size limit support been enabled (at
+        #       compile-time)?
+        #
+        if {![info exists no(compileResultLimits)]} then {
+          #
+          # NOTE: For tests "interp-1.500" and "interp-1.501".
+          #
+          checkForCompileOption $test_channel RESULT_LIMITS
+        }
+
         #
         # NOTE: Has dedicated test support been enabled (at compile-time)?
         #
         if {![info exists no(compileTest)]} then {
           #
@@ -1669,17 +1800,10 @@
         #
         if {![info exists no(compileDrawing)]} then {
           checkForCompileOption $test_channel DRAWING
         }
 
-        #
-        # NOTE: Has WinForms support been enabled (at compile-time)?
-        #
-        if {![info exists no(compileWinForms)]} then {
-          checkForCompileOption $test_channel WINFORMS
-        }
-
         #
         # NOTE: Has runtime license checking support been disabled (at
         #       compile-time)?  This only applies to third-party plugins
         #       and applications.
         #
@@ -1713,10 +1837,17 @@
           #
           checkForCompileOption $test_channel DEMO_EDITION
         }
       }
     }
+
+    #
+    # NOTE: Has testing using the C# compiler been disabled?
+    #
+    if {![info exists no(checkForCompileCSharp)]} then {
+      checkForCompileCSharp $test_channel
+    }
 
     #
     # NOTE: Has dynamic loading testing support been disabled?
     #
     if {![info exists no(dynamic)]} then {
@@ -1937,10 +2068,13 @@
         checkForObjectMember $test_channel Eagle._Tests.Default \
             *TestCallDynamicCallback2*
 
         checkForObjectMember $test_channel Eagle._Tests.Default \
             *TestCallDynamicCallback3*
+
+        checkForObjectMember $test_channel Eagle._Tests.Default \
+            *TestCallDynamicCallback4*
 
         checkForObjectMember $test_channel Eagle._Tests.Default \
             *TestGetDynamicCallbacks*
 
         checkForObjectMember $test_channel Eagle._Tests.Default \
@@ -1952,10 +2086,13 @@
         checkForObjectMember $test_channel Eagle._Tests.Default \
             *TestCallStaticDynamicCallback2*
 
         checkForObjectMember $test_channel Eagle._Tests.Default \
             *TestCallStaticDynamicCallback3*
+
+        checkForObjectMember $test_channel Eagle._Tests.Default \
+            *TestCallStaticDynamicCallback4*
 
         checkForObjectMember $test_channel Eagle._Tests.Default \
             *TestGetStaticDynamicCallbacks*
       }
 
@@ -2086,10 +2223,21 @@
         #
         checkForObjectMember $test_channel Eagle._Tests.Default \
             *TestSetComplain*
       }
 
+      #
+      # NOTE: Has special variable testing support been disabled?
+      #
+      if {![info exists no(testSetVariable)]} then {
+        #
+        # NOTE: For test "basic-1.107".
+        #
+        checkForObjectMember $test_channel Eagle._Tests.Default \
+            *TestSetVariableWithTypedValue*
+      }
+
       #
       # NOTE: Has enumerable variable testing support been disabled?
       #
       if {![info exists no(testEnumerableVariables)]} then {
         #
@@ -2189,17 +2337,17 @@
 
         checkForObjectMember $test_channel Eagle._Tests.Default \
             *TestRestoreObjects*
 
         #
-        # NOTE: For test "basic-1.29".
+        # NOTE: For test "basic-1.29.*".
         #
         checkForObjectMember $test_channel Eagle._Tests.Default \
             *TestExecuteStaticDelegates*
 
         #
-        # NOTE: For tests "basic-1.30" and "basic-1.31".
+        # NOTE: For tests "basic-1.30.*" and "basic-1.31".
         #
         checkForObjectMember $test_channel Eagle._Tests.Default \
             *TestExecuteDelegateCommands*
 
         #
@@ -2440,10 +2588,34 @@
         # NOTE: For test "basic-1.75".
         #
         checkForObjectMember $test_channel Eagle._Tests.Default+Listener \
             * Eagle._Tests.Default.Listener
       }
+
+      #
+      # NOTE: Has script event thread testing support been disabled?
+      #
+      if {![info exists no(testScriptEventThread)]} then {
+        #
+        # NOTE: For test "interp-1.801".
+        #
+        checkForObjectMember $test_channel \
+            Eagle._Tests.Default+ScriptEventState \
+            *ToString* Eagle._Tests.Default.ScriptEventState.ToString
+
+        checkForObjectMember $test_channel \
+            Eagle._Tests.Default+ScriptEventThread \
+            *ToString* Eagle._Tests.Default.ScriptEventThread.ToString
+
+        checkForObjectMember $test_channel \
+            Eagle._Tests.Default+ScriptThreadClientData \
+            *ToString* Eagle._Tests.Default.ScriptThreadClientData.ToString
+
+        checkForObjectMember $test_channel \
+            Eagle._Tests.Default+ScriptTimeoutThread \
+            *ToString* Eagle._Tests.Default.ScriptTimeoutThread.ToString
+      }
     }
 
     #
     # NOTE: Has MSBuild testing support been disabled?
     #
@@ -2465,10 +2637,20 @@
     if {![info exists no(excel)]} then {
       #
       # NOTE: For tests "excel-*.*".
       #
       checkForAssembly $test_channel Microsoft.Office.Interop.Excel
+
+      #
+      # NOTE: Has Excel usability testing been disabled?
+      #
+      if {![info exists no(excelUsable)]} then {
+        #
+        # NOTE: For tests "excel-*.*".
+        #
+        checkForExcelUsable $test_channel
+      }
     }
 
     #
     # NOTE: Has speech testing support been disabled?
     #
@@ -3029,32 +3211,34 @@
 
     #
     # NOTE: For tests "load-1.1.*".
     #
     if {![info exists no(Plugin.dll)]} then {
-      checkForFile $test_channel [file join $lib_path Plugin1.0 Plugin.dll]
+      checkForFile $test_channel [file join \
+          $core_lib_path Plugin1.0 [getDotNetCoreLibPathDirectoryNameOnly \
+          Plugin1.0] Plugin.dll]
     }
 
     #
     # NOTE: For test "object-6.1".
     #
     if {![info exists no(Sample.exe)]} then {
-      checkForFile $test_channel [file join $bin_path Sample.exe]
+      checkForFile $test_channel [file join $core_bin_path Sample.exe]
     }
 
     #
     # NOTE: For test "object-4.8".
     #
     if {![info exists no(EagleCmdlets.dll)]} then {
-      checkForFile $test_channel [file join $bin_path EagleCmdlets.dll]
+      checkForFile $test_channel [file join $core_bin_path EagleCmdlets.dll]
     }
 
     #
     # NOTE: For test "object-4.10".
     #
     if {![info exists no(EagleExtensions.dll)]} then {
-      checkForFile $test_channel [file join $bin_path EagleExtensions.dll]
+      checkForFile $test_channel [file join $core_bin_path EagleExtensions.dll]
     }
 
     #
     # NOTE: For test "object-4.10".
     #
@@ -3065,11 +3249,11 @@
     #
     # NOTE: For tests "sql-1.2", "sql-1.4", "sql-1.5", "sql-1.6", "sql-1.7",
     #       "sql-1.8", and "sql-1.9".
     #
     if {![info exists no(sqlite3.dll)]} then {
-      checkForFile $test_channel [file join $bin_path sqlite3.dll]
+      checkForFile $test_channel [file join $core_bin_path sqlite3.dll]
 
       #
       # NOTE: Did we manage to find the native SQLite library?  If not, do we
       #       at least know the machine type?
       #
@@ -3076,29 +3260,30 @@
       if {![haveConstraint file_sqlite3.dll]} then {
         #
         # NOTE: Ok, now try to check for the machine specific native SQLite
         #       library.
         #
-        checkForFile $test_channel [file join $bin_path [machineToPlatform \
-            $test_machine true] sqlite3.dll]
+        checkForFile $test_channel [file join $core_bin_path \
+            [machineToPlatform $test_machine true] sqlite3.dll]
 
         #
         # NOTE: Did we manage to find the native SQLite library yet?
         #
         if {![haveConstraint file_sqlite3.dll]} then {
           #
           # NOTE: Ok, now try to check for the platform specific native SQLite
           #       library.
           #
-          checkForFile $test_channel [file join $bin_path [machineToPlatform \
-              $test_machine false] sqlite3.dll]
+          checkForFile $test_channel [file join $core_bin_path \
+              [machineToPlatform $test_machine false] sqlite3.dll]
         }
       }
     }
 
     if {![info exists no(System.Data.SQLite.dll)]} then {
-      checkForFile $test_channel [file join $bin_path System.Data.SQLite.dll]
+      checkForFile $test_channel [file join $core_bin_path \
+          System.Data.SQLite.dll]
     }
 
     if {![info exists no(test.sqlite3)]} then {
       checkForFile $test_channel [file join $test_data_path test.sqlite3]
     }

ADDED   Externals/ResGen/ResGen.exe
Index: Externals/ResGen/ResGen.exe
==================================================================
--- /dev/null
+++ Externals/ResGen/ResGen.exe
cannot compute difference between binary files

ADDED   Externals/ResGen/ResGen.exe.config
Index: Externals/ResGen/ResGen.exe.config
==================================================================
--- /dev/null
+++ Externals/ResGen/ResGen.exe.config
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ *
+ * ResGen.exe.config -
+ *
+ * Copyright (c) 2007-2012 by Joe Mistachkin.  All rights reserved.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS: @(#) $Id: $
+ *
+-->
+<configuration>
+  <startup>
+    <supportedRuntime version="v2.0.50727" />
+    <supportedRuntime version="v4.0.30319" />
+  </startup>
+
+  <runtime>
+    <generatePublisherEvidence enabled="false" />
+  </runtime>
+</configuration>

Index: NuGet/SQLite.Core.Beta.nuspec
==================================================================
--- NuGet/SQLite.Core.Beta.nuspec
+++ NuGet/SQLite.Core.Beta.nuspec
@@ -18,10 +18,18 @@
     <projectUrl>https://system.data.sqlite.org/</projectUrl>
     <iconUrl>https://system.data.sqlite.org/images/sqlite128.png</iconUrl>
     <licenseUrl>https://www.sqlite.org/copyright.html</licenseUrl>
     <tags>sqlite database ado.net provider interop</tags>
     <copyright>Public Domain</copyright>
+    <dependencies>
+      <group targetFramework="net20" />
+      <group targetFramework="net40" />
+      <group targetFramework="net45" />
+      <group targetFramework="net451" />
+      <group targetFramework="net46" />
+      <group targetFramework="netstandard2.0" />
+    </dependencies>
   </metadata>
   <files>
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.dll" target="lib\net20" />
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" />
     <file src="..\bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" />
@@ -30,10 +38,12 @@
     <file src="..\bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" />
     <file src="..\bin\2013\Release\bin\System.Data.SQLite.dll" target="lib\net451" />
     <file src="..\bin\2013\Release\bin\System.Data.SQLite.xml" target="lib\net451" />
     <file src="..\bin\2015\Release\bin\System.Data.SQLite.dll" target="lib\net46" />
     <file src="..\bin\2015\Release\bin\System.Data.SQLite.xml" target="lib\net46" />
+    <file src="..\bin\NetStandard20\Release\bin\System.Data.SQLite.dll" target="lib\netstandard2.0" />
+    <file src="..\bin\NetStandard20\Release\bin\System.Data.SQLite.xml" target="lib\netstandard2.0" />
     <file src="..\bin\2008\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net20\x86" />
     <file src="..\bin\2008\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net20\x64" />
     <file src="..\bin\2010\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net40\x86" />
     <file src="..\bin\2010\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net40\x64" />
     <file src="..\bin\2012\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x86" />
@@ -40,17 +50,21 @@
     <file src="..\bin\2012\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x64" />
     <file src="..\bin\2013\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x86" />
     <file src="..\bin\2013\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x64" />
     <file src="..\bin\2015\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net46\x86" />
     <file src="..\bin\2015\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net46\x64" />
+    <file src="..\bin\2015\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\netstandard2.0\x86" />
+    <file src="..\bin\2015\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\netstandard2.0\x64" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net20\System.Data.SQLite.Core.Beta.targets" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net40\System.Data.SQLite.Core.Beta.targets" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net45\System.Data.SQLite.Core.Beta.targets" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net451\System.Data.SQLite.Core.Beta.targets" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net46\System.Data.SQLite.Core.Beta.targets" />
+    <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\netstandard2.0\System.Data.SQLite.Core.Beta.targets" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net20" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net40" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net45" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net451" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net46" />
+    <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\netstandard2.0" />
   </files>
 </package>

Index: NuGet/SQLite.Core.MSIL.Beta.nuspec
==================================================================
--- NuGet/SQLite.Core.MSIL.Beta.nuspec
+++ NuGet/SQLite.Core.MSIL.Beta.nuspec
@@ -18,10 +18,18 @@
     <projectUrl>https://system.data.sqlite.org/</projectUrl>
     <iconUrl>https://system.data.sqlite.org/images/sqlite128.png</iconUrl>
     <licenseUrl>https://www.sqlite.org/copyright.html</licenseUrl>
     <tags>sqlite database ado.net provider interop</tags>
     <copyright>Public Domain</copyright>
+    <dependencies>
+      <group targetFramework="net20" />
+      <group targetFramework="net40" />
+      <group targetFramework="net45" />
+      <group targetFramework="net451" />
+      <group targetFramework="net46" />
+      <group targetFramework="netstandard2.0" />
+    </dependencies>
   </metadata>
   <files>
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.dll" target="lib\net20" />
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" />
     <file src="..\bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" />
@@ -30,7 +38,9 @@
     <file src="..\bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" />
     <file src="..\bin\2013\Release\bin\System.Data.SQLite.dll" target="lib\net451" />
     <file src="..\bin\2013\Release\bin\System.Data.SQLite.xml" target="lib\net451" />
     <file src="..\bin\2015\Release\bin\System.Data.SQLite.dll" target="lib\net46" />
     <file src="..\bin\2015\Release\bin\System.Data.SQLite.xml" target="lib\net46" />
+    <file src="..\bin\NetStandard20\Release\bin\System.Data.SQLite.dll" target="lib\netstandard2.0" />
+    <file src="..\bin\NetStandard20\Release\bin\System.Data.SQLite.xml" target="lib\netstandard2.0" />
   </files>
 </package>

Index: NuGet/SQLite.Core.MSIL.Test.nuspec
==================================================================
--- NuGet/SQLite.Core.MSIL.Test.nuspec
+++ NuGet/SQLite.Core.MSIL.Test.nuspec
@@ -18,10 +18,18 @@
     <projectUrl>https://system.data.sqlite.org/</projectUrl>
     <iconUrl>https://system.data.sqlite.org/images/sqlite128.png</iconUrl>
     <licenseUrl>https://www.sqlite.org/copyright.html</licenseUrl>
     <tags>sqlite database ado.net provider interop</tags>
     <copyright>Public Domain</copyright>
+    <dependencies>
+      <group targetFramework="net20" />
+      <group targetFramework="net40" />
+      <group targetFramework="net45" />
+      <group targetFramework="net451" />
+      <group targetFramework="net46" />
+      <group targetFramework="netstandard2.0" />
+    </dependencies>
   </metadata>
   <files>
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.dll" target="lib\net20" />
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" />
     <file src="..\bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" />
@@ -30,7 +38,9 @@
     <file src="..\bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" />
     <file src="..\bin\2013\Release\bin\System.Data.SQLite.dll" target="lib\net451" />
     <file src="..\bin\2013\Release\bin\System.Data.SQLite.xml" target="lib\net451" />
     <file src="..\bin\2015\Release\bin\System.Data.SQLite.dll" target="lib\net46" />
     <file src="..\bin\2015\Release\bin\System.Data.SQLite.xml" target="lib\net46" />
+    <file src="..\bin\NetStandard20\Release\bin\System.Data.SQLite.dll" target="lib\netstandard2.0" />
+    <file src="..\bin\NetStandard20\Release\bin\System.Data.SQLite.xml" target="lib\netstandard2.0" />
   </files>
 </package>

Index: NuGet/SQLite.Core.MSIL.nuspec
==================================================================
--- NuGet/SQLite.Core.MSIL.nuspec
+++ NuGet/SQLite.Core.MSIL.nuspec
@@ -18,10 +18,18 @@
     <projectUrl>https://system.data.sqlite.org/</projectUrl>
     <iconUrl>https://system.data.sqlite.org/images/sqlite128.png</iconUrl>
     <licenseUrl>https://www.sqlite.org/copyright.html</licenseUrl>
     <tags>sqlite database ado.net provider interop</tags>
     <copyright>Public Domain</copyright>
+    <dependencies>
+      <group targetFramework="net20" />
+      <group targetFramework="net40" />
+      <group targetFramework="net45" />
+      <group targetFramework="net451" />
+      <group targetFramework="net46" />
+      <group targetFramework="netstandard2.0" />
+    </dependencies>
   </metadata>
   <files>
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.dll" target="lib\net20" />
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" />
     <file src="..\bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" />
@@ -30,7 +38,9 @@
     <file src="..\bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" />
     <file src="..\bin\2013\Release\bin\System.Data.SQLite.dll" target="lib\net451" />
     <file src="..\bin\2013\Release\bin\System.Data.SQLite.xml" target="lib\net451" />
     <file src="..\bin\2015\Release\bin\System.Data.SQLite.dll" target="lib\net46" />
     <file src="..\bin\2015\Release\bin\System.Data.SQLite.xml" target="lib\net46" />
+    <file src="..\bin\NetStandard20\Release\bin\System.Data.SQLite.dll" target="lib\netstandard2.0" />
+    <file src="..\bin\NetStandard20\Release\bin\System.Data.SQLite.xml" target="lib\netstandard2.0" />
   </files>
 </package>

Index: NuGet/SQLite.Core.Test.nuspec
==================================================================
--- NuGet/SQLite.Core.Test.nuspec
+++ NuGet/SQLite.Core.Test.nuspec
@@ -18,10 +18,18 @@
     <projectUrl>https://system.data.sqlite.org/</projectUrl>
     <iconUrl>https://system.data.sqlite.org/images/sqlite128.png</iconUrl>
     <licenseUrl>https://www.sqlite.org/copyright.html</licenseUrl>
     <tags>sqlite database ado.net provider interop</tags>
     <copyright>Public Domain</copyright>
+    <dependencies>
+      <group targetFramework="net20" />
+      <group targetFramework="net40" />
+      <group targetFramework="net45" />
+      <group targetFramework="net451" />
+      <group targetFramework="net46" />
+      <group targetFramework="netstandard2.0" />
+    </dependencies>
   </metadata>
   <files>
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.dll" target="lib\net20" />
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" />
     <file src="..\bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" />
@@ -30,10 +38,12 @@
     <file src="..\bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" />
     <file src="..\bin\2013\Release\bin\System.Data.SQLite.dll" target="lib\net451" />
     <file src="..\bin\2013\Release\bin\System.Data.SQLite.xml" target="lib\net451" />
     <file src="..\bin\2015\Release\bin\System.Data.SQLite.dll" target="lib\net46" />
     <file src="..\bin\2015\Release\bin\System.Data.SQLite.xml" target="lib\net46" />
+    <file src="..\bin\NetStandard20\Release\bin\System.Data.SQLite.dll" target="lib\netstandard2.0" />
+    <file src="..\bin\NetStandard20\Release\bin\System.Data.SQLite.xml" target="lib\netstandard2.0" />
     <file src="..\bin\2008\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net20\x86" />
     <file src="..\bin\2008\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net20\x64" />
     <file src="..\bin\2010\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net40\x86" />
     <file src="..\bin\2010\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net40\x64" />
     <file src="..\bin\2012\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x86" />
@@ -40,17 +50,21 @@
     <file src="..\bin\2012\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x64" />
     <file src="..\bin\2013\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x86" />
     <file src="..\bin\2013\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x64" />
     <file src="..\bin\2015\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net46\x86" />
     <file src="..\bin\2015\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net46\x64" />
+    <file src="..\bin\2015\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\netstandard2.0\x86" />
+    <file src="..\bin\2015\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\netstandard2.0\x64" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net20\System.Data.SQLite.Core.Test.targets" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net40\System.Data.SQLite.Core.Test.targets" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net45\System.Data.SQLite.Core.Test.targets" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net451\System.Data.SQLite.Core.Test.targets" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net46\System.Data.SQLite.Core.Test.targets" />
+    <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\netstandard2.0\System.Data.SQLite.Core.Test.targets" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net20" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net40" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net45" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net451" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net46" />
+    <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\netstandard2.0" />
   </files>
 </package>

Index: NuGet/SQLite.Core.nuspec
==================================================================
--- NuGet/SQLite.Core.nuspec
+++ NuGet/SQLite.Core.nuspec
@@ -18,10 +18,18 @@
     <projectUrl>https://system.data.sqlite.org/</projectUrl>
     <iconUrl>https://system.data.sqlite.org/images/sqlite128.png</iconUrl>
     <licenseUrl>https://www.sqlite.org/copyright.html</licenseUrl>
     <tags>sqlite database ado.net provider interop</tags>
     <copyright>Public Domain</copyright>
+    <dependencies>
+      <group targetFramework="net20" />
+      <group targetFramework="net40" />
+      <group targetFramework="net45" />
+      <group targetFramework="net451" />
+      <group targetFramework="net46" />
+      <group targetFramework="netstandard2.0" />
+    </dependencies>
   </metadata>
   <files>
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.dll" target="lib\net20" />
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" />
     <file src="..\bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" />
@@ -30,10 +38,12 @@
     <file src="..\bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" />
     <file src="..\bin\2013\Release\bin\System.Data.SQLite.dll" target="lib\net451" />
     <file src="..\bin\2013\Release\bin\System.Data.SQLite.xml" target="lib\net451" />
     <file src="..\bin\2015\Release\bin\System.Data.SQLite.dll" target="lib\net46" />
     <file src="..\bin\2015\Release\bin\System.Data.SQLite.xml" target="lib\net46" />
+    <file src="..\bin\NetStandard20\Release\bin\System.Data.SQLite.dll" target="lib\netstandard2.0" />
+    <file src="..\bin\NetStandard20\Release\bin\System.Data.SQLite.xml" target="lib\netstandard2.0" />
     <file src="..\bin\2008\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net20\x86" />
     <file src="..\bin\2008\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net20\x64" />
     <file src="..\bin\2010\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net40\x86" />
     <file src="..\bin\2010\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net40\x64" />
     <file src="..\bin\2012\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x86" />
@@ -40,17 +50,21 @@
     <file src="..\bin\2012\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x64" />
     <file src="..\bin\2013\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x86" />
     <file src="..\bin\2013\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x64" />
     <file src="..\bin\2015\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net46\x86" />
     <file src="..\bin\2015\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net46\x64" />
+    <file src="..\bin\2015\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\netstandard2.0\x86" />
+    <file src="..\bin\2015\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\netstandard2.0\x64" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net20\System.Data.SQLite.Core.targets" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net40\System.Data.SQLite.Core.targets" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net45\System.Data.SQLite.Core.targets" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net451\System.Data.SQLite.Core.targets" />
     <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net46\System.Data.SQLite.Core.targets" />
+    <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\netstandard2.0\System.Data.SQLite.Core.targets" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net20" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net40" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net45" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net451" />
     <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net46" />
+    <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\netstandard2.0" />
   </files>
 </package>

Index: NuGet/SQLite.Linq.Beta.nuspec
==================================================================
--- NuGet/SQLite.Linq.Beta.nuspec
+++ NuGet/SQLite.Linq.Beta.nuspec
@@ -18,10 +18,17 @@
     <projectUrl>https://system.data.sqlite.org/</projectUrl>
     <iconUrl>https://system.data.sqlite.org/images/sqlite128.png</iconUrl>
     <licenseUrl>https://www.sqlite.org/copyright.html</licenseUrl>
     <tags>sqlite database ado.net provider interop</tags>
     <copyright>Public Domain</copyright>
+    <dependencies>
+      <group targetFramework="net20" />
+      <group targetFramework="net40" />
+      <group targetFramework="net45" />
+      <group targetFramework="net451" />
+      <group targetFramework="net46" />
+    </dependencies>
   </metadata>
   <files>
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.Linq.dll" target="lib\net20" />
     <file src="..\bin\2010\Release\bin\System.Data.SQLite.Linq.dll" target="lib\net40" />
     <file src="..\bin\2012\Release\bin\System.Data.SQLite.Linq.dll" target="lib\net45" />

Index: NuGet/SQLite.Linq.Test.nuspec
==================================================================
--- NuGet/SQLite.Linq.Test.nuspec
+++ NuGet/SQLite.Linq.Test.nuspec
@@ -18,10 +18,17 @@
     <projectUrl>https://system.data.sqlite.org/</projectUrl>
     <iconUrl>https://system.data.sqlite.org/images/sqlite128.png</iconUrl>
     <licenseUrl>https://www.sqlite.org/copyright.html</licenseUrl>
     <tags>sqlite database ado.net provider interop</tags>
     <copyright>Public Domain</copyright>
+    <dependencies>
+      <group targetFramework="net20" />
+      <group targetFramework="net40" />
+      <group targetFramework="net45" />
+      <group targetFramework="net451" />
+      <group targetFramework="net46" />
+    </dependencies>
   </metadata>
   <files>
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.Linq.dll" target="lib\net20" />
     <file src="..\bin\2010\Release\bin\System.Data.SQLite.Linq.dll" target="lib\net40" />
     <file src="..\bin\2012\Release\bin\System.Data.SQLite.Linq.dll" target="lib\net45" />

Index: NuGet/SQLite.Linq.nuspec
==================================================================
--- NuGet/SQLite.Linq.nuspec
+++ NuGet/SQLite.Linq.nuspec
@@ -18,10 +18,17 @@
     <projectUrl>https://system.data.sqlite.org/</projectUrl>
     <iconUrl>https://system.data.sqlite.org/images/sqlite128.png</iconUrl>
     <licenseUrl>https://www.sqlite.org/copyright.html</licenseUrl>
     <tags>sqlite database ado.net provider interop</tags>
     <copyright>Public Domain</copyright>
+    <dependencies>
+      <group targetFramework="net20" />
+      <group targetFramework="net40" />
+      <group targetFramework="net45" />
+      <group targetFramework="net451" />
+      <group targetFramework="net46" />
+    </dependencies>
   </metadata>
   <files>
     <file src="..\bin\2008\Release\bin\System.Data.SQLite.Linq.dll" target="lib\net20" />
     <file src="..\bin\2010\Release\bin\System.Data.SQLite.Linq.dll" target="lib\net40" />
     <file src="..\bin\2012\Release\bin\System.Data.SQLite.Linq.dll" target="lib\net45" />

Index: SQLite.Interop/src/generic/interop.c
==================================================================
--- SQLite.Interop/src/generic/interop.c
+++ SQLite.Interop/src/generic/interop.c
@@ -369,11 +369,11 @@
       logConfigured = 1;
     }else{
       sqlite3InteropDebug("sqlite3_config_log_interop(): sqlite3_config(SQLITE_CONFIG_LOG) returned %d.\n", ret);
     }
   }else{
-    ret = SQLITE_OK;
+    ret = SQLITE_DONE;
   }
   return ret;
 }
 #endif
 

Index: SQLite.NET.2005.MSBuild.sln
==================================================================
--- SQLite.NET.2005.MSBuild.sln
+++ SQLite.NET.2005.MSBuild.sln
@@ -33,12 +33,16 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2005", "System.Data.SQLite\System.Data.SQLite.2005.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
 EndProject

Index: SQLite.NET.2005.sln
==================================================================
--- SQLite.NET.2005.sln
+++ SQLite.NET.2005.sln
@@ -33,12 +33,16 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2005", "System.Data.SQLite\System.Data.SQLite.2005.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
 EndProject

Index: SQLite.NET.2008.MSBuild.sln
==================================================================
--- SQLite.NET.2008.MSBuild.sln
+++ SQLite.NET.2008.MSBuild.sln
@@ -33,12 +33,16 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2008", "System.Data.SQLite\System.Data.SQLite.2008.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
 EndProject

Index: SQLite.NET.2008.sln
==================================================================
--- SQLite.NET.2008.sln
+++ SQLite.NET.2008.sln
@@ -33,12 +33,16 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2008", "System.Data.SQLite\System.Data.SQLite.2008.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
 EndProject

Index: SQLite.NET.2010.MSBuild.sln
==================================================================
--- SQLite.NET.2010.MSBuild.sln
+++ SQLite.NET.2010.MSBuild.sln
@@ -33,12 +33,16 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2010", "System.Data.SQLite\System.Data.SQLite.2010.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
 EndProject

Index: SQLite.NET.2010.sln
==================================================================
--- SQLite.NET.2010.sln
+++ SQLite.NET.2010.sln
@@ -33,12 +33,16 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2010", "System.Data.SQLite\System.Data.SQLite.2010.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
 EndProject

Index: SQLite.NET.2012.MSBuild.sln
==================================================================
--- SQLite.NET.2012.MSBuild.sln
+++ SQLite.NET.2012.MSBuild.sln
@@ -33,12 +33,16 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2012", "System.Data.SQLite\System.Data.SQLite.2012.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
 EndProject

Index: SQLite.NET.2012.sln
==================================================================
--- SQLite.NET.2012.sln
+++ SQLite.NET.2012.sln
@@ -33,12 +33,16 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2012", "System.Data.SQLite\System.Data.SQLite.2012.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
 EndProject

Index: SQLite.NET.2013.MSBuild.sln
==================================================================
--- SQLite.NET.2013.MSBuild.sln
+++ SQLite.NET.2013.MSBuild.sln
@@ -33,12 +33,16 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2013", "System.Data.SQLite\System.Data.SQLite.2013.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
 EndProject

Index: SQLite.NET.2013.sln
==================================================================
--- SQLite.NET.2013.sln
+++ SQLite.NET.2013.sln
@@ -33,12 +33,16 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2013", "System.Data.SQLite\System.Data.SQLite.2013.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
 EndProject

Index: SQLite.NET.2015.MSBuild.sln
==================================================================
--- SQLite.NET.2015.MSBuild.sln
+++ SQLite.NET.2015.MSBuild.sln
@@ -35,12 +35,16 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2015", "System.Data.SQLite\System.Data.SQLite.2015.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
 EndProject

Index: SQLite.NET.2015.sln
==================================================================
--- SQLite.NET.2015.sln
+++ SQLite.NET.2015.sln
@@ -35,12 +35,16 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2015", "System.Data.SQLite\System.Data.SQLite.2015.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
 EndProject

Index: SQLite.NET.2017.MSBuild.sln
==================================================================
--- SQLite.NET.2017.MSBuild.sln
+++ SQLite.NET.2017.MSBuild.sln
@@ -35,16 +35,22 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2017", "System.Data.SQLite\System.Data.SQLite.2017.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.NetStandard20", "System.Data.SQLite\System.Data.SQLite.NetStandard20.csproj", "{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Module.2017", "System.Data.SQLite\System.Data.SQLite.Module.2017.csproj", "{AC139952-261A-4463-B6FA-AEBC25284A66}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Linq.2017", "System.Data.SQLite.Linq\System.Data.SQLite.Linq.2017.csproj", "{E6BF9F74-58E2-413B-A7CE-EA653ECB728D}"
 EndProject
@@ -139,10 +145,50 @@
 		{AC139952-261A-4463-B6FA-AEBC25283A66}.ReleaseManagedOnly|x64.Build.0 = Release|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Any CPU.ActiveCfg = Release|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Win32.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|x64.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|Any CPU.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|Any CPU.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|Mixed Platforms.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|Win32.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|Win32.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|x64.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|x64.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|Any CPU.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|Win32.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|x64.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Win32.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Win32.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|x64.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|x64.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|Any CPU.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|Any CPU.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|Mixed Platforms.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|Win32.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|Win32.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|x64.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|x64.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|Any CPU.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25284A66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25284A66}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25284A66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25284A66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25284A66}.Debug|Win32.ActiveCfg = Debug|Any CPU

Index: SQLite.NET.2017.sln
==================================================================
--- SQLite.NET.2017.sln
+++ SQLite.NET.2017.sln
@@ -35,16 +35,22 @@
 		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
 		readme.htm = readme.htm
 		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
 		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
 		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
 		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
 		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2017", "System.Data.SQLite\System.Data.SQLite.2017.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.NetStandard20", "System.Data.SQLite\System.Data.SQLite.NetStandard20.csproj", "{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Module.2017", "System.Data.SQLite\System.Data.SQLite.Module.2017.csproj", "{AC139952-261A-4463-B6FA-AEBC25284A66}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Linq.2017", "System.Data.SQLite.Linq\System.Data.SQLite.Linq.2017.csproj", "{E6BF9F74-58E2-413B-A7CE-EA653ECB728D}"
 EndProject
@@ -128,10 +134,42 @@
 		{AC139952-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Mixed Platforms.Build.0 = Release|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|Win32.Build.0 = Release|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25283A66}.ReleaseNativeOnly|x64.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Win32.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|x64.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|Any CPU.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|Any CPU.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|Mixed Platforms.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|Win32.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|Win32.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|x64.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|x64.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Win32.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Win32.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|x64.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|x64.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|Any CPU.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|Any CPU.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|Mixed Platforms.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|Win32.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|x64.Build.0 = Release|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25284A66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25284A66}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25284A66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25284A66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{AC139952-261A-4463-B6FA-AEBC25284A66}.Debug|Win32.ActiveCfg = Debug|Any CPU

ADDED   SQLite.NET.NetStandard20.MSBuild.sln
Index: SQLite.NET.NetStandard20.MSBuild.sln
==================================================================
--- /dev/null
+++ SQLite.NET.NetStandard20.MSBuild.sln
@@ -0,0 +1,123 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.16
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{39A3B743-1EBD-4CC0-8E37-ACE3DD38B1C0}"
+	ProjectSection(SolutionItems) = preProject
+		data\exclude_bin.txt = data\exclude_bin.txt
+		data\exclude_src.txt = data\exclude_src.txt
+		Keys\System.Data.SQLite.CF.snk = Keys\System.Data.SQLite.CF.snk
+		Keys\System.Data.SQLite.snk = Keys\System.Data.SQLite.snk
+		NuGet\shared\Core\build\System.Data.SQLite.Core.targets = NuGet\shared\Core\build\System.Data.SQLite.Core.targets
+		NuGet\shared\Core\content\config.install.xdt = NuGet\shared\Core\content\config.install.xdt
+		NuGet\shared\Core\content\config.transform = NuGet\shared\Core\content\config.transform
+		NuGet\net40\EF6\content\config.transform = NuGet\net40\EF6\content\config.transform
+		NuGet\net40\EF6\tools\provider.ps1 = NuGet\net40\EF6\tools\provider.ps1
+		NuGet\SQLite.Core.nuspec = NuGet\SQLite.Core.nuspec
+		NuGet\SQLite.Core.Beta.nuspec = NuGet\SQLite.Core.Beta.nuspec
+		NuGet\SQLite.Core.Test.nuspec = NuGet\SQLite.Core.Test.nuspec
+		NuGet\SQLite.Core.MSIL.nuspec = NuGet\SQLite.Core.MSIL.nuspec
+		NuGet\SQLite.Core.MSIL.Beta.nuspec = NuGet\SQLite.Core.MSIL.Beta.nuspec
+		NuGet\SQLite.Core.MSIL.Test.nuspec = NuGet\SQLite.Core.MSIL.Test.nuspec
+		NuGet\SQLite.EF6.nuspec = NuGet\SQLite.EF6.nuspec
+		NuGet\SQLite.EF6.Beta.nuspec = NuGet\SQLite.EF6.Beta.nuspec
+		NuGet\SQLite.EF6.Test.nuspec = NuGet\SQLite.EF6.Test.nuspec
+		NuGet\SQLite.Linq.nuspec = NuGet\SQLite.Linq.nuspec
+		NuGet\SQLite.Linq.Beta.nuspec = NuGet\SQLite.Linq.Beta.nuspec
+		NuGet\SQLite.Linq.Test.nuspec = NuGet\SQLite.Linq.Test.nuspec
+		NuGet\SQLite.MSIL.nuspec = NuGet\SQLite.MSIL.nuspec
+		NuGet\SQLite.MSIL.Beta.nuspec = NuGet\SQLite.MSIL.Beta.nuspec
+		NuGet\SQLite.MSIL.Test.nuspec = NuGet\SQLite.MSIL.Test.nuspec
+		NuGet\SQLite.nuspec = NuGet\SQLite.nuspec
+		NuGet\SQLite.Beta.nuspec = NuGet\SQLite.Beta.nuspec
+		NuGet\SQLite.Test.nuspec = NuGet\SQLite.Test.nuspec
+		NuGet\SQLite.x64.nuspec = NuGet\SQLite.x64.nuspec
+		NuGet\SQLite.x86.nuspec = NuGet\SQLite.x86.nuspec
+		readme.htm = readme.htm
+		System.Data.SQLite\Targets\System.Data.SQLite.Files.targets = System.Data.SQLite\Targets\System.Data.SQLite.Files.targets
+		System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets = System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets
+		System.Data.SQLite\Targets\System.Data.SQLite.References.targets = System.Data.SQLite\Targets\System.Data.SQLite.References.targets
+		Targets\SQLite.NET.Mono.Settings.targets = Targets\SQLite.NET.Mono.Settings.targets
+		Targets\SQLite.NET.NetStandard20.Settings.targets = Targets\SQLite.NET.NetStandard20.Settings.targets
+		Targets\SQLite.NET.Platform.Settings.targets = Targets\SQLite.NET.Platform.Settings.targets
+		Targets\SQLite.NET.Settings.targets = Targets\SQLite.NET.Settings.targets
+		Targets\SQLite.NET.Settings.targets.netFx35 = Targets\SQLite.NET.Settings.targets.netFx35
+		Targets\SQLite.NET.Settings.targets.netFx40 = Targets\SQLite.NET.Settings.targets.netFx40
+		Targets\SQLite.NET.targets = Targets\SQLite.NET.targets
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.NetStandard20", "System.Data.SQLite\System.Data.SQLite.NetStandard20.csproj", "{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		DebugManagedOnly|Any CPU = DebugManagedOnly|Any CPU
+		DebugManagedOnly|Mixed Platforms = DebugManagedOnly|Mixed Platforms
+		DebugManagedOnly|Win32 = DebugManagedOnly|Win32
+		DebugManagedOnly|x64 = DebugManagedOnly|x64
+		DebugNativeOnly|Any CPU = DebugNativeOnly|Any CPU
+		DebugNativeOnly|Mixed Platforms = DebugNativeOnly|Mixed Platforms
+		DebugNativeOnly|Win32 = DebugNativeOnly|Win32
+		DebugNativeOnly|x64 = DebugNativeOnly|x64
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		ReleaseManagedOnly|Any CPU = ReleaseManagedOnly|Any CPU
+		ReleaseManagedOnly|Mixed Platforms = ReleaseManagedOnly|Mixed Platforms
+		ReleaseManagedOnly|Win32 = ReleaseManagedOnly|Win32
+		ReleaseManagedOnly|x64 = ReleaseManagedOnly|x64
+		ReleaseNativeOnly|Any CPU = ReleaseNativeOnly|Any CPU
+		ReleaseNativeOnly|Mixed Platforms = ReleaseNativeOnly|Mixed Platforms
+		ReleaseNativeOnly|Win32 = ReleaseNativeOnly|Win32
+		ReleaseNativeOnly|x64 = ReleaseNativeOnly|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|Win32.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Debug|x64.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|Any CPU.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|Any CPU.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|Mixed Platforms.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|Win32.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|Win32.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|x64.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugManagedOnly|x64.Build.0 = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|Any CPU.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|Win32.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.DebugNativeOnly|x64.ActiveCfg = Debug|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Win32.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|Win32.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|x64.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.Release|x64.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|Any CPU.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|Any CPU.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|Mixed Platforms.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|Win32.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|Win32.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|x64.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseManagedOnly|x64.Build.0 = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|Any CPU.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|Win32.ActiveCfg = Release|Any CPU
+		{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}.ReleaseNativeOnly|x64.ActiveCfg = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

ADDED   Setup/build-netstandard20-debug.sh
Index: Setup/build-netstandard20-debug.sh
==================================================================
--- /dev/null
+++ Setup/build-netstandard20-debug.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+scriptdir=`dirname "$BASH_SOURCE"`
+pushd "$scriptdir/.."
+
+dotnet build SQLite.NET.NetStandard20.MSBuild.sln /property:Configuration=Debug /property:ConfigurationSuffix=$SQLITE_NET_CONFIGURATION_SUFFIX /property:InteropCodec=false /property:InteropLog=false /property:CheckState=true /property:CountHandle=true /property:TraceConnection=true /property:TraceDetection=true /property:TraceHandle=true /property:TraceStatement=true /property:TrackMemoryBytes=true "$@"
+
+popd

ADDED   Setup/build-netstandard20-release.sh
Index: Setup/build-netstandard20-release.sh
==================================================================
--- /dev/null
+++ Setup/build-netstandard20-release.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+scriptdir=`dirname "$BASH_SOURCE"`
+pushd "$scriptdir/.."
+
+dotnet build SQLite.NET.NetStandard20.MSBuild.sln /property:Configuration=Release /property:ConfigurationSuffix=$SQLITE_NET_CONFIGURATION_SUFFIX /property:InteropCodec=false /property:InteropLog=false "$@"
+
+popd

Index: Setup/build.bat
==================================================================
--- Setup/build.bat
+++ Setup/build.bat
@@ -132,10 +132,16 @@
   SET MSBUILD=MSBuild.exe
 )
 
 %_VECHO% MsBuild = '%MSBUILD%'
 
+IF NOT DEFINED DOTNET (
+  SET DOTNET=dotnet.exe
+)
+
+%_VECHO% DotNet = '%DOTNET%'
+
 IF NOT DEFINED CSC (
   SET CSC=csc.exe
 )
 
 %_VECHO% Csc = '%CSC%'
@@ -142,10 +148,21 @@
 
 REM
 REM TODO: When the next version of Visual Studio is released, this section
 REM       may need updating.
 REM
+IF DEFINED NETCORE20ONLY (
+  %_AECHO% Forcing the use of the .NET Core 2.0...
+  IF NOT DEFINED YEAR (
+    SET YEAR=NetStandard20
+  )
+  CALL :fn_VerifyDotNetCore
+  SET NOBUILDTOOLDIR=1
+  SET USEDOTNET=1
+  GOTO setup_buildToolDir
+)
+
 IF DEFINED NETFX20ONLY (
   %_AECHO% Forcing the use of the .NET Framework 2.0...
   SET YEAR=2005
   CALL :fn_CheckFrameworkDir v2.0.50727
   GOTO setup_buildToolDir
@@ -296,31 +313,38 @@
   )
 )
 
 :setup_buildToolDir
 
-IF DEFINED BUILDTOOLDIR (
-  %_AECHO% Forcing the use of build tool directory "%BUILDTOOLDIR%"...
-) ELSE (
-  CALL :fn_CheckBuildToolDir
-  CALL :fn_VerifyBuildToolDir
+%_VECHO% NoBuildToolDir = '%NOBUILDTOOLDIR%'
+%_VECHO% UseDotNet = '%USEDOTNET%'
+
+IF NOT DEFINED NOBUILDTOOLDIR (
+  IF DEFINED BUILDTOOLDIR (
+    %_AECHO% Forcing the use of build tool directory "%BUILDTOOLDIR%"...
+  ) ELSE (
+    CALL :fn_CheckBuildToolDir
+    CALL :fn_VerifyBuildToolDir
+  )
 )
 
 %_VECHO% Year = '%YEAR%'
 %_VECHO% FrameworkDir = '%FRAMEWORKDIR%'
 %_VECHO% MsBuildDir = '%MSBUILDDIR%'
 %_VECHO% VisualStudioMsBuildDir = '%VISUALSTUDIOMSBUILDDIR%'
 %_VECHO% BuildToolDir = '%BUILDTOOLDIR%'
 
-IF NOT DEFINED BUILDTOOLDIR (
-  ECHO.
-  ECHO No directory containing MSBuild could be found.
-  ECHO.
-  ECHO Please install the .NET Framework or set the "FRAMEWORKDIR"
-  ECHO environment variable to the location where it is installed.
-  ECHO.
-  GOTO errors
+IF NOT DEFINED NOBUILDTOOLDIR (
+  IF NOT DEFINED BUILDTOOLDIR (
+    ECHO.
+    ECHO No directory containing MSBuild could be found.
+    ECHO.
+    ECHO Please install the .NET Framework or set the "FRAMEWORKDIR"
+    ECHO environment variable to the location where it is installed.
+    ECHO.
+    GOTO errors
+  )
 )
 
 CALL :fn_ResetErrorLevel
 
 %__ECHO2% PUSHD "%ROOT%"
@@ -328,11 +352,13 @@
 IF ERRORLEVEL 1 (
   ECHO Could not change directory to "%ROOT%".
   GOTO errors
 )
 
-CALL :fn_PrependToPath BUILDTOOLDIR
+IF NOT DEFINED NOBUILDTOOLDIR (
+  CALL :fn_PrependToPath BUILDTOOLDIR
+)
 
 %_VECHO% Path = '%PATH%'
 
 IF NOT DEFINED SOLUTION (
   IF DEFINED COREONLY (
@@ -405,10 +431,20 @@
   GOTO errors
 )
 
 %_VECHO% Temp = '%TEMP%'
 
+IF NOT DEFINED LOGASM (
+  IF DEFINED USEDOTNET (
+    SET LOGASM=Microsoft.Build
+  ) ELSE (
+    SET LOGASM=Microsoft.Build.Engine
+  )
+)
+
+%_VECHO% LogAsm = '%LOGASM%'
+
 IF NOT DEFINED LOGDIR (
   SET LOGDIR=%TEMP%
 )
 
 %_VECHO% LogDir = '%LOGDIR%'
@@ -426,24 +462,26 @@
 %_VECHO% LogSuffix = '%LOGSUFFIX%'
 
 IF DEFINED LOGGING GOTO skip_setLogging
 IF DEFINED NOLOG GOTO skip_setLogging
 
-SET LOGGING="/logger:FileLogger,Microsoft.Build.Engine;Logfile=%LOGDIR%\%LOGPREFIX%_%CONFIGURATION%_%PLATFORM%_%YEAR%_%LOGSUFFIX%.log;Verbosity=diagnostic"
+SET LOGGING="/logger:FileLogger,%LOGASM%;Logfile=%LOGDIR%\%LOGPREFIX%_%CONFIGURATION%_%PLATFORM%_%YEAR%_%LOGSUFFIX%.log;Verbosity=diagnostic"
+
+%_VECHO% Logging = '%LOGGING%'
 
 :skip_setLogging
 
 IF NOT DEFINED NOPROPS (
-  IF EXIST Externals\Eagle\bin\EagleShell.exe (
+  IF EXIST Externals\Eagle\bin\netFramework40\EagleShell.exe (
     IF DEFINED INTEROP_EXTRA_PROPS_FILE (
       REM
       REM HACK: This is used to work around a limitation of Visual Studio 2005
       REM       and 2008 that prevents the "InheritedPropertySheets" attribute
       REM       value from working correctly when it refers to a property that
       REM       evaluates to an empty string.
       REM
-      %__ECHO% Externals\Eagle\bin\EagleShell.exe -evaluate "set fileName {SQLite.Interop/props/include.vsprops}; set data [readFile $fileName]; regsub -- {	InheritedPropertySheets=\"\"} $data {	InheritedPropertySheets=\"$^(INTEROP_EXTRA_PROPS_FILE^)\"} data; writeFile $fileName $data"
+      %__ECHO% Externals\Eagle\bin\netFramework40\EagleShell.exe -evaluate "set fileName {SQLite.Interop/props/include.vsprops}; set data [readFile $fileName]; regsub -- {	InheritedPropertySheets=\"\"} $data {	InheritedPropertySheets=\"$^(INTEROP_EXTRA_PROPS_FILE^)\"} data; writeFile $fileName $data"
 
       IF ERRORLEVEL 1 (
         ECHO Property file modification of "SQLite.Interop\props\include.vsprops" failed.
         GOTO errors
       ) ELSE (
@@ -456,19 +494,19 @@
 ) ELSE (
   ECHO WARNING: Property file modification skipped, disabled via NOPROPS environment variable.
 )
 
 IF NOT DEFINED NOTAG (
-  IF EXIST Externals\Eagle\bin\EagleShell.exe (
-    %__ECHO% Externals\Eagle\bin\EagleShell.exe -file Setup\sourceTag.eagle SourceIdMode SQLite.Interop\src\generic\interop.h
+  IF EXIST Externals\Eagle\bin\netFramework40\EagleShell.exe (
+    %__ECHO% Externals\Eagle\bin\netFramework40\EagleShell.exe -file Setup\sourceTag.eagle SourceIdMode SQLite.Interop\src\generic\interop.h
 
     IF ERRORLEVEL 1 (
       ECHO Source tagging of "SQLite.Interop\src\generic\interop.h" failed.
       GOTO errors
     )
 
-    %__ECHO% Externals\Eagle\bin\EagleShell.exe -file Setup\sourceTag.eagle SourceIdMode System.Data.SQLite\SQLitePatchLevel.cs
+    %__ECHO% Externals\Eagle\bin\netFramework40\EagleShell.exe -file Setup\sourceTag.eagle SourceIdMode System.Data.SQLite\SQLitePatchLevel.cs
 
     IF ERRORLEVEL 1 (
       ECHO Source tagging of "System.Data.SQLite\SQLitePatchLevel.cs" failed.
       GOTO errors
     )
@@ -479,17 +517,27 @@
   ECHO WARNING: Source tagging skipped, disabled via NOTAG environment variable.
 )
 
 CALL :fn_CopyVariable MSBUILD_ARGS_%BASE_CONFIGURATION% MSBUILD_ARGS_CFG
 
-%_VECHO% Logging = '%LOGGING%'
+IF DEFINED USEDOTNET (
+  SET MSBUILD=%DOTNET%
+  SET SUBCOMMANDS=build
+  SET TARGET=Build
+) ELSE (
+  CALL :fn_UnsetVariable SUBCOMMANDS
+)
+
+%_VECHO% MsBuild = '%MSBUILD%'
+%_VECHO% SubCommands = '%SUBCOMMANDS%'
+%_VECHO% Target = '%TARGET%'
 %_VECHO% BuildArgs = '%BUILD_ARGS%'
 %_VECHO% MsBuildArgs = '%MSBUILD_ARGS%'
 %_VECHO% MsBuildArgsCfg = '%MSBUILD_ARGS_CFG%'
 
 IF NOT DEFINED NOBUILD (
-  %__ECHO% "%MSBUILD%" "%SOLUTION%" "/target:%TARGET%" "/property:Configuration=%MSBUILD_CONFIGURATION%" "/property:Platform=%PLATFORM%" %LOGGING% %BUILD_ARGS% %MSBUILD_ARGS% %MSBUILD_ARGS_CFG%
+  %__ECHO% "%MSBUILD%" %SUBCOMMANDS% "%SOLUTION%" "/target:%TARGET%" "/property:Configuration=%MSBUILD_CONFIGURATION%" "/property:Platform=%PLATFORM%" %LOGGING% %BUILD_ARGS% %MSBUILD_ARGS% %MSBUILD_ARGS_CFG%
 
   IF ERRORLEVEL 1 (
     ECHO Build failed.
     GOTO errors
   )
@@ -704,10 +752,20 @@
     CALL :fn_UnsetVariable BUILDTOOLDIR
     GOTO :EOF
   )
   %_AECHO% Build tool directory "%BUILDTOOLDIR%" verified.
   GOTO :EOF
+
+:fn_VerifyDotNetCore
+  FOR %%T IN (%DOTNET%) DO (
+    SET %%T_PATH=%%~dp$PATH:T
+  )
+  IF NOT DEFINED %DOTNET%_PATH (
+    ECHO The .NET Core executable "%DOTNET%" is required to be in the PATH.
+    GOTO errors
+  )
+  GOTO :EOF
 
 :fn_UnquoteVariable
   IF NOT DEFINED %1 GOTO :EOF
   SETLOCAL
   SET __ECHO_CMD=ECHO %%%1%%

Index: Setup/build_all.bat
==================================================================
--- Setup/build_all.bat
+++ Setup/build_all.bat
@@ -65,11 +65,11 @@
 %_VECHO% Years = '%YEARS%'
 
 FOR %%C IN (%BUILD_CONFIGURATIONS%) DO (
   FOR %%P IN (%PLATFORMS%) DO (
     FOR %%Y IN (%YEARS%) DO (
-      %__ECHO3% CALL "%TOOLS%\set_%%Y.bat"
+      %__ECHO3% CALL "%TOOLS%\set_year_%%Y.bat"
 
       IF ERRORLEVEL 1 (
         ECHO Could not set variables for %%Y.
         GOTO errors
       )

ADDED   Setup/build_net_standard_20.bat
Index: Setup/build_net_standard_20.bat
==================================================================
--- /dev/null
+++ Setup/build_net_standard_20.bat
@@ -0,0 +1,149 @@
+@ECHO OFF
+
+::
+:: build_net_standard_20.bat --
+::
+:: .NET Standard 2.0 Wrapper Tool for MSBuild
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SETLOCAL
+
+REM SET __ECHO=ECHO
+REM SET __ECHO3=ECHO
+IF NOT DEFINED _AECHO (SET _AECHO=REM)
+IF NOT DEFINED _CECHO (SET _CECHO=REM)
+IF NOT DEFINED _VECHO (SET _VECHO=REM)
+
+%_AECHO% Running %0 %*
+
+SET DUMMY2=%2
+
+IF DEFINED DUMMY2 (
+  GOTO usage
+)
+
+SET TOOLS=%~dp0
+SET TOOLS=%TOOLS:~0,-1%
+
+%_VECHO% Tools = '%TOOLS%'
+
+SET BUILD_CONFIGURATIONS=%1
+
+IF DEFINED BUILD_CONFIGURATIONS (
+  CALL :fn_UnquoteVariable BUILD_CONFIGURATIONS
+) ELSE (
+  %_AECHO% No build configurations specified, using default...
+  IF DEFINED BUILD_DEBUG (
+    SET BUILD_CONFIGURATIONS=DebugManagedOnly ReleaseManagedOnly
+  ) ELSE (
+    SET BUILD_CONFIGURATIONS=ReleaseManagedOnly
+  )
+)
+
+%_VECHO% BuildConfigurations = '%BUILD_CONFIGURATIONS%'
+
+SET YEARS=NetStandard20
+SET PLATFORMS="Any CPU"
+SET NOUSER=1
+
+REM
+REM TODO: This list of properties must be kept synchronized with the common
+REM       list in the "SQLite.NET.NetStandard20.Settings.targets" file.
+REM
+SET MSBUILD_ARGS=/property:ConfigurationSuffix=NetStandard20
+SET MSBUILD_ARGS=%MSBUILD_ARGS% /property:InteropCodec=false
+SET MSBUILD_ARGS=%MSBUILD_ARGS% /property:InteropLog=false
+
+IF DEFINED MSBUILD_ARGS_NET_STANDARD_20 (
+  SET MSBUILD_ARGS=%MSBUILD_ARGS% %MSBUILD_ARGS_NET_STANDARD_20%
+)
+
+REM
+REM TODO: This list of properties must be kept synchronized with the debug
+REM       list in the "SQLite.NET.NetStandard20.Settings.targets" file.
+REM
+SET MSBUILD_ARGS_DEBUG=/property:CheckState=true
+SET MSBUILD_ARGS_DEBUG=%MSBUILD_ARGS_DEBUG% /property:CountHandle=true
+SET MSBUILD_ARGS_DEBUG=%MSBUILD_ARGS_DEBUG% /property:TraceConnection=true
+SET MSBUILD_ARGS_DEBUG=%MSBUILD_ARGS_DEBUG% /property:TraceDetection=true
+SET MSBUILD_ARGS_DEBUG=%MSBUILD_ARGS_DEBUG% /property:TraceHandle=true
+SET MSBUILD_ARGS_DEBUG=%MSBUILD_ARGS_DEBUG% /property:TraceStatement=true
+SET MSBUILD_ARGS_DEBUG=%MSBUILD_ARGS_DEBUG% /property:TrackMemoryBytes=true
+
+REM
+REM NOTE: For use of the .NET Core SDK build system.
+REM
+SET NETCORE20ONLY=1
+
+REM
+REM NOTE: Prevent output files from being wrongly deleted.
+REM
+SET TARGET=Build
+
+%__ECHO3% CALL "%TOOLS%\build_all.bat"
+
+IF ERRORLEVEL 1 (
+  ECHO Failed to build .NET Standard 2.0 binaries.
+  GOTO errors
+)
+
+GOTO no_errors
+
+:fn_UnquoteVariable
+  IF NOT DEFINED %1 GOTO :EOF
+  SETLOCAL
+  SET __ECHO_CMD=ECHO %%%1%%
+  FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO (
+    SET VALUE=%%V
+  )
+  SET VALUE=%VALUE:"=%
+  REM "
+  ENDLOCAL && SET %1=%VALUE%
+  GOTO :EOF
+
+:fn_UnsetVariable
+  SETLOCAL
+  SET VALUE=%1
+  IF DEFINED VALUE (
+    SET VALUE=
+    ENDLOCAL
+    SET %VALUE%=
+  ) ELSE (
+    ENDLOCAL
+  )
+  CALL :fn_ResetErrorLevel
+  GOTO :EOF
+
+:fn_ResetErrorLevel
+  VERIFY > NUL
+  GOTO :EOF
+
+:fn_SetErrorLevel
+  VERIFY MAYBE 2> NUL
+  GOTO :EOF
+
+:usage
+  ECHO.
+  ECHO Usage: %~nx0 [configurations]
+  ECHO.
+  GOTO errors
+
+:errors
+  CALL :fn_SetErrorLevel
+  ENDLOCAL
+  ECHO.
+  ECHO Build failure, errors were encountered.
+  GOTO end_of_file
+
+:no_errors
+  CALL :fn_ResetErrorLevel
+  ENDLOCAL
+  ECHO.
+  ECHO Build success, no errors were encountered.
+  GOTO end_of_file
+
+:end_of_file
+%__ECHO% EXIT /B %ERRORLEVEL%

Index: Setup/clean.bat
==================================================================
--- Setup/clean.bat
+++ Setup/clean.bat
@@ -241,199 +241,217 @@
 ) ELSE (
   %_AECHO% No files matching "%SOURCE%\Doc\SQLite.NET.chw" exist.
   %_AECHO%.
 )
 
-IF EXIST "%SOURCE%\Externals\Eagle\bin\EntityFramework.*" (
-  %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\EntityFramework.*"
-
-  IF ERRORLEVEL 1 (
-    ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\EntityFramework.*".
-    ECHO.
-    GOTO errors
-  ) ELSE (
-    %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\EntityFramework.*".
-    %_AECHO%.
-  )
-) ELSE (
-  %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\EntityFramework.*" exist.
-  %_AECHO%.
-)
-
-IF EXIST "%SOURCE%\Externals\Eagle\bin\sqlite3.*" (
-  %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\sqlite3.*"
-
-  IF ERRORLEVEL 1 (
-    ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\sqlite3.*".
-    ECHO.
-    GOTO errors
-  ) ELSE (
-    %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\sqlite3.*".
-    %_AECHO%.
-  )
-) ELSE (
-  %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\sqlite3.*" exist.
-  %_AECHO%.
-)
-
-IF EXIST "%SOURCE%\Externals\Eagle\bin\Win32\sqlite3.*" (
-  %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\Win32\sqlite3.*"
-
-  IF ERRORLEVEL 1 (
-    ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\Win32\sqlite3.*".
-    ECHO.
-    GOTO errors
-  ) ELSE (
-    %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\Win32\sqlite3.*".
-    %_AECHO%.
-  )
-) ELSE (
-  %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\Win32\sqlite3.*" exist.
-  %_AECHO%.
-)
-
-IF EXIST "%SOURCE%\Externals\Eagle\bin\x86\sqlite3.*" (
-  %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\x86\sqlite3.*"
-
-  IF ERRORLEVEL 1 (
-    ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\x86\sqlite3.*".
-    ECHO.
-    GOTO errors
-  ) ELSE (
-    %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\x86\sqlite3.*".
-    %_AECHO%.
-  )
-) ELSE (
-  %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\x86\sqlite3.*" exist.
-  %_AECHO%.
-)
-
-IF EXIST "%SOURCE%\Externals\Eagle\bin\x64\sqlite3.*" (
-  %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\x64\sqlite3.*"
-
-  IF ERRORLEVEL 1 (
-    ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\x64\sqlite3.*".
-    ECHO.
-    GOTO errors
-  ) ELSE (
-    %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\x64\sqlite3.*".
-    %_AECHO%.
-  )
-) ELSE (
-  %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\x64\sqlite3.*" exist.
-  %_AECHO%.
-)
-
-IF EXIST "%SOURCE%\Externals\Eagle\bin\SQLite.Interop.*" (
-  %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\SQLite.Interop.*"
-
-  IF ERRORLEVEL 1 (
-    ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\SQLite.Interop.*".
-    ECHO.
-    GOTO errors
-  ) ELSE (
-    %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\SQLite.Interop.*".
-    %_AECHO%.
-  )
-) ELSE (
-  %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\SQLite.Interop.*" exist.
-  %_AECHO%.
-)
-
-IF EXIST "%SOURCE%\Externals\Eagle\bin\Win32\SQLite.Interop.*" (
-  %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\Win32\SQLite.Interop.*"
-
-  IF ERRORLEVEL 1 (
-    ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\Win32\SQLite.Interop.*".
-    ECHO.
-    GOTO errors
-  ) ELSE (
-    %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\Win32\SQLite.Interop.*".
-    %_AECHO%.
-  )
-) ELSE (
-  %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\Win32\SQLite.Interop.*" exist.
-  %_AECHO%.
-)
-
-IF EXIST "%SOURCE%\Externals\Eagle\bin\x86\SQLite.Interop.*" (
-  %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\x86\SQLite.Interop.*"
-
-  IF ERRORLEVEL 1 (
-    ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\x86\SQLite.Interop.*".
-    ECHO.
-    GOTO errors
-  ) ELSE (
-    %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\x86\SQLite.Interop.*".
-    %_AECHO%.
-  )
-) ELSE (
-  %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\x86\SQLite.Interop.*" exist.
-  %_AECHO%.
-)
-
-IF EXIST "%SOURCE%\Externals\Eagle\bin\x64\SQLite.Interop.*" (
-  %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\x64\SQLite.Interop.*"
-
-  IF ERRORLEVEL 1 (
-    ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\x64\SQLite.Interop.*".
-    ECHO.
-    GOTO errors
-  ) ELSE (
-    %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\x64\SQLite.Interop.*".
-    %_AECHO%.
-  )
-) ELSE (
-  %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\x64\SQLite.Interop.*" exist.
-  %_AECHO%.
-)
-
-IF EXIST "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.*" (
-  %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.*"
-
-  IF ERRORLEVEL 1 (
-    ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.*".
-    ECHO.
-    GOTO errors
-  ) ELSE (
-    %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.*".
-    %_AECHO%.
-  )
-) ELSE (
-  %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.*" exist.
-  %_AECHO%.
-)
-
-IF EXIST "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.Linq.*" (
-  %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.Linq.*"
-
-  IF ERRORLEVEL 1 (
-    ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.Linq.*".
-    ECHO.
-    GOTO errors
-  ) ELSE (
-    %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.Linq.*".
-    %_AECHO%.
-  )
-) ELSE (
-  %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.Linq.*" exist.
-  %_AECHO%.
-)
-
-IF EXIST "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.EF6.*" (
-  %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.EF6.*"
-
-  IF ERRORLEVEL 1 (
-    ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.EF6.*".
-    ECHO.
-    GOTO errors
-  ) ELSE (
-    %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.EF6.*".
-    %_AECHO%.
-  )
-) ELSE (
-  %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\System.Data.SQLite.EF6.*" exist.
+FOR %%D IN (netFramework40 netStandard20) DO (
+  IF EXIST "%SOURCE%\Externals\Eagle\bin\%%D\EntityFramework.*" (
+    %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\%%D\EntityFramework.*"
+
+    IF ERRORLEVEL 1 (
+      ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\%%D\EntityFramework.*".
+      ECHO.
+      GOTO errors
+    ) ELSE (
+      %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\%%D\EntityFramework.*".
+      %_AECHO%.
+    )
+  ) ELSE (
+    %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\%%D\EntityFramework.*" exist.
+    %_AECHO%.
+  )
+
+  IF EXIST "%SOURCE%\Externals\Eagle\bin\%%D\sqlite3.*" (
+    %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\%%D\sqlite3.*"
+
+    IF ERRORLEVEL 1 (
+      ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\%%D\sqlite3.*".
+      ECHO.
+      GOTO errors
+    ) ELSE (
+      %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\%%D\sqlite3.*".
+      %_AECHO%.
+    )
+  ) ELSE (
+    %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\%%D\sqlite3.*" exist.
+    %_AECHO%.
+  )
+
+  IF EXIST "%SOURCE%\Externals\Eagle\bin\%%D\Win32\sqlite3.*" (
+    %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\%%D\Win32\sqlite3.*"
+
+    IF ERRORLEVEL 1 (
+      ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\%%D\Win32\sqlite3.*".
+      ECHO.
+      GOTO errors
+    ) ELSE (
+      %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\%%D\Win32\sqlite3.*".
+      %_AECHO%.
+    )
+  ) ELSE (
+    %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\%%D\Win32\sqlite3.*" exist.
+    %_AECHO%.
+  )
+
+  IF EXIST "%SOURCE%\Externals\Eagle\bin\%%D\x86\sqlite3.*" (
+    %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\%%D\x86\sqlite3.*"
+
+    IF ERRORLEVEL 1 (
+      ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\%%D\x86\sqlite3.*".
+      ECHO.
+      GOTO errors
+    ) ELSE (
+      %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\%%D\x86\sqlite3.*".
+      %_AECHO%.
+    )
+  ) ELSE (
+    %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\%%D\x86\sqlite3.*" exist.
+    %_AECHO%.
+  )
+
+  IF EXIST "%SOURCE%\Externals\Eagle\bin\%%D\x64\sqlite3.*" (
+    %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\%%D\x64\sqlite3.*"
+
+    IF ERRORLEVEL 1 (
+      ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\%%D\x64\sqlite3.*".
+      ECHO.
+      GOTO errors
+    ) ELSE (
+      %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\%%D\x64\sqlite3.*".
+      %_AECHO%.
+    )
+  ) ELSE (
+    %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\%%D\x64\sqlite3.*" exist.
+    %_AECHO%.
+  )
+
+  IF EXIST "%SOURCE%\Externals\Eagle\bin\%%D\SQLite.Interop.*" (
+    %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\%%D\SQLite.Interop.*"
+
+    IF ERRORLEVEL 1 (
+      ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\%%D\SQLite.Interop.*".
+      ECHO.
+      GOTO errors
+    ) ELSE (
+      %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\%%D\SQLite.Interop.*".
+      %_AECHO%.
+    )
+  ) ELSE (
+    %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\%%D\SQLite.Interop.*" exist.
+    %_AECHO%.
+  )
+
+  IF EXIST "%SOURCE%\Externals\Eagle\bin\%%D\Win32\SQLite.Interop.*" (
+    %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\%%D\Win32\SQLite.Interop.*"
+
+    IF ERRORLEVEL 1 (
+      ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\%%D\Win32\SQLite.Interop.*".
+      ECHO.
+      GOTO errors
+    ) ELSE (
+      %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\%%D\Win32\SQLite.Interop.*".
+      %_AECHO%.
+    )
+  ) ELSE (
+    %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\%%D\Win32\SQLite.Interop.*" exist.
+    %_AECHO%.
+  )
+
+  IF EXIST "%SOURCE%\Externals\Eagle\bin\%%D\x86\SQLite.Interop.*" (
+    %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\%%D\x86\SQLite.Interop.*"
+
+    IF ERRORLEVEL 1 (
+      ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\%%D\x86\SQLite.Interop.*".
+      ECHO.
+      GOTO errors
+    ) ELSE (
+      %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\%%D\x86\SQLite.Interop.*".
+      %_AECHO%.
+    )
+  ) ELSE (
+    %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\%%D\x86\SQLite.Interop.*" exist.
+    %_AECHO%.
+  )
+
+  IF EXIST "%SOURCE%\Externals\Eagle\bin\%%D\x64\SQLite.Interop.*" (
+    %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\%%D\x64\SQLite.Interop.*"
+
+    IF ERRORLEVEL 1 (
+      ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\%%D\x64\SQLite.Interop.*".
+      ECHO.
+      GOTO errors
+    ) ELSE (
+      %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\%%D\x64\SQLite.Interop.*".
+      %_AECHO%.
+    )
+  ) ELSE (
+    %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\%%D\x64\SQLite.Interop.*" exist.
+    %_AECHO%.
+  )
+
+  IF EXIST "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.*" (
+    %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.*"
+
+    IF ERRORLEVEL 1 (
+      ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.*".
+      ECHO.
+      GOTO errors
+    ) ELSE (
+      %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.*".
+      %_AECHO%.
+    )
+  ) ELSE (
+    %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.*" exist.
+    %_AECHO%.
+  )
+
+  IF EXIST "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.Linq.*" (
+    %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.Linq.*"
+
+    IF ERRORLEVEL 1 (
+      ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.Linq.*".
+      ECHO.
+      GOTO errors
+    ) ELSE (
+      %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.Linq.*".
+      %_AECHO%.
+    )
+  ) ELSE (
+    %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.Linq.*" exist.
+    %_AECHO%.
+  )
+
+  IF EXIST "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.EF6.*" (
+    %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.EF6.*"
+
+    IF ERRORLEVEL 1 (
+      ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.EF6.*".
+      ECHO.
+      GOTO errors
+    ) ELSE (
+      %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.EF6.*".
+      %_AECHO%.
+    )
+  ) ELSE (
+    %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\%%D\System.Data.SQLite.EF6.*" exist.
+    %_AECHO%.
+  )
+)
+
+IF EXIST "%TEMP%\dotnet.exe.test.*.log" (
+  %__ECHO% DEL /Q "%TEMP%\dotnet.exe.test.*.log"
+
+  IF ERRORLEVEL 1 (
+    ECHO Could not delete "%TEMP%\dotnet.exe.test.*.log".
+    ECHO.
+    GOTO errors
+  ) ELSE (
+    %_AECHO% Deleted "%TEMP%\dotnet.exe.test.*.log".
+    %_AECHO%.
+  )
+) ELSE (
+  %_AECHO% No files matching "%TEMP%\dotnet.exe.test.*.log" exist.
   %_AECHO%.
 )
 
 IF EXIST "%TEMP%\EagleShell.exe.test.*.log" (
   %__ECHO% DEL /Q "%TEMP%\EagleShell.exe.test.*.log"

Index: Setup/data/verify.lst
==================================================================
--- Setup/data/verify.lst
+++ Setup/data/verify.lst
@@ -208,12 +208,13 @@
   Doc/sync.eagle
   Doc/vtab.tcl
   Externals/
   Externals/Eagle/
   Externals/Eagle/bin/
-  Externals/Eagle/bin/EagleShell.exe.config
-  Externals/Eagle/bin/EagleShell.exe.mda.config
+  Externals/Eagle/bin/netFramework40/
+  Externals/Eagle/bin/netFramework40/EagleShell.exe.config
+  Externals/Eagle/bin/netFramework40/EagleShell.exe.mda.config
   Externals/Eagle/lib/
   Externals/Eagle/lib/Eagle1.0/
   Externals/Eagle/lib/Eagle1.0/vendor.eagle
   Keys/
   Keys/System.Data.SQLite.CF.snk
@@ -261,15 +262,18 @@
   readme.htm
   Setup/
   Setup/archive.bat
   Setup/bake.bat
   Setup/bake_all.bat
+  Setup/build-netstandard20-debug.sh
+  Setup/build-netstandard20-release.sh
   Setup/build.bat
   Setup/build_all.bat
   Setup/build_ce_200x.bat
   Setup/build_ce_2013.bat
   Setup/build_mono.bat
+  Setup/build_net_standard_20.bat
   Setup/build_nuget.bat
   Setup/clean.bat
   Setup/compile-interop-assembly-debug.sh
   Setup/compile-interop-assembly-release.sh
   Setup/data/
@@ -281,20 +285,16 @@
   Setup/release.bat
   Setup/release_all.bat
   Setup/release_ce_200x.bat
   Setup/release_ce_2013.bat
   Setup/release_mono.bat
+  Setup/release_net_standard_20.bat
   Setup/release_static.bat
   Setup/run-mono-tests-debug.sh
   Setup/run-mono-tests-release.sh
-  Setup/set_2005.bat
-  Setup/set_2008.bat
-  Setup/set_2010.bat
-  Setup/set_2012.bat
-  Setup/set_2013.bat
-  Setup/set_2015.bat
-  Setup/set_2017.bat
+  Setup/run-netstandard20-tests-debug.sh
+  Setup/run-netstandard20-tests-release.sh
   Setup/set_common.bat
   Setup/set_Debug.bat
   Setup/set_Debug_ARMV7.bat
   "Setup/set_Debug_CEPC DevPlatform.bat"
   "Setup/set_Debug_Pocket PC 2003 (ARMV4).bat"
@@ -312,10 +312,11 @@
   Setup/set_Debug_x86_2010.bat
   Setup/set_Debug_x86_2012.bat
   Setup/set_Debug_x86_2013.bat
   Setup/set_Debug_x86_2015.bat
   Setup/set_Debug_x86_2017.bat
+  Setup/set_Debug_x86_NetStandard20.bat
   Setup/set_DebugNativeOnly.bat
   Setup/set_DebugNativeOnly_ARMV7.bat
   "Setup/set_DebugNativeOnly_CEPC DevPlatform.bat"
   "Setup/set_DebugNativeOnly_Pocket PC 2003 (ARMV4).bat"
   Setup/set_DebugNativeOnly_Win32.bat
@@ -332,10 +333,11 @@
   Setup/set_DebugNativeOnly_x86_2010.bat
   Setup/set_DebugNativeOnly_x86_2012.bat
   Setup/set_DebugNativeOnly_x86_2013.bat
   Setup/set_DebugNativeOnly_x86_2015.bat
   Setup/set_DebugNativeOnly_x86_2017.bat
+  Setup/set_DebugNativeOnly_x86_NetStandard20.bat
   Setup/set_netFx20.bat
   Setup/set_netFx35.bat
   Setup/set_netFx40.bat
   Setup/set_netFx45.bat
   Setup/set_netFx451.bat
@@ -343,10 +345,11 @@
   Setup/set_netFx46.bat
   Setup/set_netFx461.bat
   Setup/set_netFx462.bat
   Setup/set_netFx47.bat
   Setup/set_netFx471.bat
+  Setup/set_netStandard20.bat
   Setup/set_Release.bat
   Setup/set_Release_ARMV7.bat
   "Setup/set_Release_CEPC DevPlatform.bat"
   "Setup/set_Release_Pocket PC 2003 (ARMV4).bat"
   Setup/set_Release_Win32.bat
@@ -363,10 +366,11 @@
   Setup/set_Release_x86_2010.bat
   Setup/set_Release_x86_2012.bat
   Setup/set_Release_x86_2013.bat
   Setup/set_Release_x86_2015.bat
   Setup/set_Release_x86_2017.bat
+  Setup/set_Release_x86_NetStandard20.bat
   Setup/set_ReleaseNativeOnly.bat
   Setup/set_ReleaseNativeOnly_ARMV7.bat
   "Setup/set_ReleaseNativeOnly_CEPC DevPlatform.bat"
   "Setup/set_ReleaseNativeOnly_Pocket PC 2003 (ARMV4).bat"
   Setup/set_ReleaseNativeOnly_Win32.bat
@@ -383,10 +387,11 @@
   Setup/set_ReleaseNativeOnly_x86_2010.bat
   Setup/set_ReleaseNativeOnly_x86_2012.bat
   Setup/set_ReleaseNativeOnly_x86_2013.bat
   Setup/set_ReleaseNativeOnly_x86_2015.bat
   Setup/set_ReleaseNativeOnly_x86_2017.bat
+  Setup/set_ReleaseNativeOnly_x86_NetStandard20.bat
   Setup/set_x64_2005.bat
   Setup/set_x64_2008.bat
   Setup/set_x64_2010.bat
   Setup/set_x64_2012.bat
   Setup/set_x64_2013.bat
@@ -397,10 +402,19 @@
   Setup/set_x86_2010.bat
   Setup/set_x86_2012.bat
   Setup/set_x86_2013.bat
   Setup/set_x86_2015.bat
   Setup/set_x86_2017.bat
+  Setup/set_x86_NetStandard20.bat
+  Setup/set_year_2005.bat
+  Setup/set_year_2008.bat
+  Setup/set_year_2010.bat
+  Setup/set_year_2012.bat
+  Setup/set_year_2013.bat
+  Setup/set_year_2015.bat
+  Setup/set_year_2017.bat
+  Setup/set_year_NetStandard20.bat
   Setup/sourceTag.eagle
   Setup/test.bat
   Setup/test_all.bat
   Setup/test_ce_200x.bat
   Setup/updateFileInfo.tcl
@@ -563,17 +577,20 @@
   SQLite.NET.2013.sln
   SQLite.NET.2015.MSBuild.sln
   SQLite.NET.2015.sln
   SQLite.NET.2017.MSBuild.sln
   SQLite.NET.2017.sln
+  SQLite.NET.NetStandard20.MSBuild.sln
   System.Data.SQLite.url
   System.Data.SQLite/
   System.Data.SQLite/AssemblyInfo.cs
   System.Data.SQLite/AssemblySourceIdAttribute.cs
   System.Data.SQLite/AssemblySourceTimeStampAttribute.cs
   System.Data.SQLite/Configurations/
   System.Data.SQLite/Configurations/System.Data.SQLite.dll.config
+  System.Data.SQLite/Generated/
+  System.Data.SQLite/Generated/SR.resources
   System.Data.SQLite/ISQLiteNativeModule.cs
   System.Data.SQLite/LINQ/
   System.Data.SQLite/LINQ/SQLiteConnection_Linq.cs
   System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
   System.Data.SQLite/Resources/
@@ -633,10 +650,11 @@
   System.Data.SQLite/System.Data.SQLite.Module.2010.csproj
   System.Data.SQLite/System.Data.SQLite.Module.2012.csproj
   System.Data.SQLite/System.Data.SQLite.Module.2013.csproj
   System.Data.SQLite/System.Data.SQLite.Module.2015.csproj
   System.Data.SQLite/System.Data.SQLite.Module.2017.csproj
+  System.Data.SQLite/System.Data.SQLite.NetStandard20.csproj
   System.Data.SQLite/Targets/
   System.Data.SQLite/Targets/System.Data.SQLite.Files.targets
   System.Data.SQLite/Targets/System.Data.SQLite.Properties.targets
   System.Data.SQLite/Targets/System.Data.SQLite.References.targets
   System.Data.SQLite/UnsafeNativeMethods.cs
@@ -695,10 +713,11 @@
   System.Data.SQLite.Linq/System.Data.SQLite.Linq.2013.csproj
   System.Data.SQLite.Linq/System.Data.SQLite.Linq.2015.csproj
   System.Data.SQLite.Linq/System.Data.SQLite.Linq.2017.csproj
   Targets/
   Targets/SQLite.NET.Mono.Settings.targets
+  Targets/SQLite.NET.NetStandard20.Settings.targets
   Targets/SQLite.NET.Platform.Settings.targets
   Targets/SQLite.NET.Settings.targets
   Targets/SQLite.NET.Settings.targets.netFx35
   Targets/SQLite.NET.Settings.targets.netFx40
   Targets/SQLite.NET.targets
@@ -941,17 +960,20 @@
 # NOTE: This is the list of Eagle files that should be present in the full
 #       source code archive.  These files are needed only to run the test
 #       suite.
 #
 set sds_manifests(eagle) {
-  Externals/Eagle/bin/Eagle.dll
-  Externals/Eagle/bin/EagleShell.exe
-  Externals/Eagle/bin/EagleShell32.exe
-  Externals/Eagle/bin/x64/
-  Externals/Eagle/bin/x64/Spilornis.dll
-  Externals/Eagle/bin/x86/
-  Externals/Eagle/bin/x86/Spilornis.dll
+  Externals/Eagle/bin/netFramework40/Eagle.dll
+  Externals/Eagle/bin/netFramework40/EagleShell.exe
+  Externals/Eagle/bin/netFramework40/EagleShell32.exe
+  Externals/Eagle/bin/netFramework40/x64/
+  Externals/Eagle/bin/netFramework40/x64/Spilornis.dll
+  Externals/Eagle/bin/netFramework40/x86/
+  Externals/Eagle/bin/netFramework40/x86/Spilornis.dll
+  Externals/Eagle/bin/netStandard20/Eagle.dll
+  Externals/Eagle/bin/netStandard20/EagleShell.dll
+  Externals/Eagle/bin/netStandard20/EagleShell.runtimeconfig.json
   Externals/Eagle/lib/Eagle1.0/auxiliary.eagle
   Externals/Eagle/lib/Eagle1.0/compat.eagle
   Externals/Eagle/lib/Eagle1.0/csharp.eagle
   Externals/Eagle/lib/Eagle1.0/database.eagle
   Externals/Eagle/lib/Eagle1.0/embed.eagle
@@ -994,10 +1016,13 @@
 #       source code archive.  These files may be required by the build and/or
 #       during release processing.  If missing, some features and/or build
 #       options may be unavailable.
 #
 set sds_manifests(external) {
+  Externals/ResGen/
+  Externals/ResGen/ResGen.exe
+  Externals/ResGen/ResGen.exe.config
   Externals/vswhere/
   Externals/vswhere/vswhere.exe
 }
 
 ###############################################################################

Index: Setup/release.bat
==================================================================
--- Setup/release.bat
+++ Setup/release.bat
@@ -186,31 +186,51 @@
 SET PREFIX=sqlite
 
 %_VECHO% ExcludeBin = '%EXCLUDE_BIN%'
 %_VECHO% Prefix = '%PREFIX%'
 
+IF DEFINED NO_RELEASE_YEAR (
+  IF DEFINED NO_RELEASE_PLATFORM (
+    SET RELEASE_OUTPUT_FILE=Setup\Output\%PREFIX%-%FRAMEWORK%-%TYPE%-%VERSION%.zip
+  ) ELSE (
+    SET RELEASE_OUTPUT_FILE=Setup\Output\%PREFIX%-%FRAMEWORK%-%TYPE%-%BASE_PLATFORM%%EXTRA_PLATFORM%-%VERSION%.zip
+  )
+) ELSE (
+  IF DEFINED NO_RELEASE_PLATFORM (
+    SET RELEASE_OUTPUT_FILE=Setup\Output\%PREFIX%-%FRAMEWORK%-%TYPE%-%YEAR%-%VERSION%.zip
+  ) ELSE (
+    SET RELEASE_OUTPUT_FILE=Setup\Output\%PREFIX%-%FRAMEWORK%-%TYPE%-%BASE_PLATFORM%%EXTRA_PLATFORM%-%YEAR%-%VERSION%.zip
+  )
+)
+
+%_VECHO% ReleaseOutputFile = '%RELEASE_OUTPUT_FILE%'
+
 IF DEFINED BASE_CONFIGURATIONSUFFIX (
-  FOR /F "delims=" %%F IN ('DIR /B /S /AD "bin\%YEAR%\%BASE_CONFIGURATION%%BASE_CONFIGURATIONSUFFIX%\bin" 2^> NUL') DO (
-    %__ECHO% RMDIR /S /Q "%%F"
+  IF NOT DEFINED NO_RELEASE_RMDIR (
+    FOR /F "delims=" %%F IN ('DIR /B /S /AD "bin\%YEAR%\%BASE_CONFIGURATION%%BASE_CONFIGURATIONSUFFIX%\bin" 2^> NUL') DO (
+      %__ECHO% RMDIR /S /Q "%%F"
+    )
   )
-  %__ECHO% zip.exe -v -j -r "Setup\Output\%PREFIX%-%FRAMEWORK%-%TYPE%-%BASE_PLATFORM%%EXTRA_PLATFORM%-%YEAR%-%VERSION%.zip" "bin\%YEAR%\%BASE_CONFIGURATION%%BASE_CONFIGURATIONSUFFIX%\bin" -x "%EXCLUDE_BIN%"
+  %__ECHO% zip.exe -v -j -r "%RELEASE_OUTPUT_FILE%" "bin\%YEAR%\%BASE_CONFIGURATION%%BASE_CONFIGURATIONSUFFIX%\bin" -x "%EXCLUDE_BIN%"
 ) ELSE (
-  FOR /F "delims=" %%F IN ('DIR /B /S /AD "bin\%YEAR%\%BASE_CONFIGURATION%\bin" 2^> NUL') DO (
-    %__ECHO% RMDIR /S /Q "%%F"
+  IF NOT DEFINED NO_RELEASE_RMDIR (
+    FOR /F "delims=" %%F IN ('DIR /B /S /AD "bin\%YEAR%\%BASE_CONFIGURATION%\bin" 2^> NUL') DO (
+      %__ECHO% RMDIR /S /Q "%%F"
+    )
   )
-  %__ECHO% zip.exe -v -j -r "Setup\Output\%PREFIX%-%FRAMEWORK%-%TYPE%-%BASE_PLATFORM%%EXTRA_PLATFORM%-%YEAR%-%VERSION%.zip" "bin\%YEAR%\%BASE_CONFIGURATION%\bin" -x "%EXCLUDE_BIN%"
+  %__ECHO% zip.exe -v -j -r "%RELEASE_OUTPUT_FILE%" "bin\%YEAR%\%BASE_CONFIGURATION%\bin" -x "%EXCLUDE_BIN%"
 )
 
 IF DEFINED RELEASE_MANAGEDONLY GOTO skip_releaseInterop
 
 IF /I "%CONFIGURATION%" == "%BASE_CONFIGURATION%" (
   IF NOT DEFINED BASE_CONFIGURATIONSUFFIX (
-    %__ECHO% zip.exe -v -d "Setup\Output\%PREFIX%-%FRAMEWORK%-%TYPE%-%BASE_PLATFORM%%EXTRA_PLATFORM%-%YEAR%-%VERSION%.zip" SQLite.Interop.*
+    %__ECHO% zip.exe -v -d "%RELEASE_OUTPUT_FILE%" SQLite.Interop.*
   )
 )
 
-%__ECHO% zip.exe -v -j -r "Setup\Output\%PREFIX%-%FRAMEWORK%-%TYPE%-%BASE_PLATFORM%%EXTRA_PLATFORM%-%YEAR%-%VERSION%.zip" "bin\%YEAR%\%PLATFORM%\%CONFIGURATION%%CONFIGURATIONSUFFIX%" -x "%EXCLUDE_BIN%"
+%__ECHO% zip.exe -v -j -r "%RELEASE_OUTPUT_FILE%" "bin\%YEAR%\%PLATFORM%\%CONFIGURATION%%CONFIGURATIONSUFFIX%" -x "%EXCLUDE_BIN%"
 
 :skip_releaseInterop
 
 IF ERRORLEVEL 1 (
   ECHO Failed to archive binary files.

ADDED   Setup/release_net_standard_20.bat
Index: Setup/release_net_standard_20.bat
==================================================================
--- /dev/null
+++ Setup/release_net_standard_20.bat
@@ -0,0 +1,89 @@
+@ECHO OFF
+
+::
+:: release_net_standard_20.bat --
+::
+:: .NET Standard 2.0 Release Tool
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SETLOCAL
+
+REM SET __ECHO=ECHO
+REM SET __ECHO3=ECHO
+IF NOT DEFINED _AECHO (SET _AECHO=REM)
+IF NOT DEFINED _CECHO (SET _CECHO=REM)
+IF NOT DEFINED _VECHO (SET _VECHO=REM)
+
+%_AECHO% Running %0 %*
+
+SET DUMMY2=%1
+
+IF DEFINED DUMMY2 (
+  GOTO usage
+)
+
+SET TOOLS=%~dp0
+SET TOOLS=%TOOLS:~0,-1%
+
+%_VECHO% Tools = '%TOOLS%'
+
+IF DEFINED RELEASE_DEBUG (
+  SET RELEASE_CONFIGURATIONS=DebugManagedOnly ReleaseManagedOnly
+) ELSE (
+  SET RELEASE_CONFIGURATIONS=ReleaseManagedOnly
+)
+
+SET BASE_CONFIGURATIONSUFFIX=NetStandard20
+SET YEARS=NetStandard20
+SET PLATFORMS=MSIL
+SET BASE_PLATFORM=NetCore20
+SET NOBUNDLE=1
+SET RELEASE_MANAGEDONLY=1
+SET NO_RELEASE_YEAR=1
+SET NO_RELEASE_PLATFORM=1
+SET NO_RELEASE_RMDIR=1
+
+CALL :fn_ResetErrorLevel
+
+%__ECHO3% CALL "%TOOLS%\release_all.bat"
+
+IF ERRORLEVEL 1 (
+  ECHO Failed to build .NET Standard 2.0 release files.
+  GOTO errors
+)
+
+GOTO no_errors
+
+:fn_ResetErrorLevel
+  VERIFY > NUL
+  GOTO :EOF
+
+:fn_SetErrorLevel
+  VERIFY MAYBE 2> NUL
+  GOTO :EOF
+
+:usage
+  ECHO.
+  ECHO Usage: %~nx0
+  ECHO.
+  GOTO errors
+
+:errors
+  CALL :fn_SetErrorLevel
+  ENDLOCAL
+  ECHO.
+  ECHO Release failure, errors were encountered.
+  GOTO end_of_file
+
+:no_errors
+  CALL :fn_ResetErrorLevel
+  ENDLOCAL
+  ECHO.
+  ECHO Release success, no errors were encountered.
+  GOTO end_of_file
+
+:end_of_file
+%__ECHO% EXIT /B %ERRORLEVEL%

Index: Setup/run-mono-tests-debug.sh
==================================================================
--- Setup/run-mono-tests-debug.sh
+++ Setup/run-mono-tests-debug.sh
@@ -11,7 +11,7 @@
 if [[ -z "$SQLITE_NET_YEAR" ]]; then
   SQLITE_NET_YEAR=2013
 fi
 
 pushd "$scriptdir/.."
-mono Externals/Eagle/bin/EagleShell.exe -preInitialize "set root_path {$scriptdir/..}; set test_configuration Debug; set test_year $SQLITE_NET_YEAR; set build_directory {bin/$SQLITE_NET_YEAR/Debug$SQLITE_NET_CONFIGURATION_SUFFIX/bin}; set interop_assembly_file_names $libname" -initialize -postInitialize "unset no(deleteSqliteImplicitNativeFiles); unset no(copySqliteImplicitNativeFiles)" -file Tests/all.eagle "$@"
+mono Externals/Eagle/bin/netFramework40/EagleShell.exe -preInitialize "set root_path {$scriptdir/..}; set test_configuration Debug; set test_year $SQLITE_NET_YEAR; set build_directory {bin/$SQLITE_NET_YEAR/Debug$SQLITE_NET_CONFIGURATION_SUFFIX/bin}; set interop_assembly_file_names $libname" -initialize -postInitialize "unset no(deleteSqliteImplicitNativeFiles); unset no(copySqliteImplicitNativeFiles)" -file Tests/all.eagle "$@"
 popd

Index: Setup/run-mono-tests-release.sh
==================================================================
--- Setup/run-mono-tests-release.sh
+++ Setup/run-mono-tests-release.sh
@@ -11,7 +11,7 @@
 if [[ -z "$SQLITE_NET_YEAR" ]]; then
   SQLITE_NET_YEAR=2013
 fi
 
 pushd "$scriptdir/.."
-mono Externals/Eagle/bin/EagleShell.exe -preInitialize "set root_path {$scriptdir/..}; set test_configuration Release; set test_year $SQLITE_NET_YEAR; set build_directory {bin/$SQLITE_NET_YEAR/Release$SQLITE_NET_CONFIGURATION_SUFFIX/bin}; set interop_assembly_file_names $libname" -initialize -postInitialize "unset no(deleteSqliteImplicitNativeFiles); unset no(copySqliteImplicitNativeFiles)" -file Tests/all.eagle "$@"
+mono Externals/Eagle/bin/netFramework40/EagleShell.exe -preInitialize "set root_path {$scriptdir/..}; set test_configuration Release; set test_year $SQLITE_NET_YEAR; set build_directory {bin/$SQLITE_NET_YEAR/Release$SQLITE_NET_CONFIGURATION_SUFFIX/bin}; set interop_assembly_file_names $libname" -initialize -postInitialize "unset no(deleteSqliteImplicitNativeFiles); unset no(copySqliteImplicitNativeFiles)" -file Tests/all.eagle "$@"
 popd

ADDED   Setup/run-netstandard20-tests-debug.sh
Index: Setup/run-netstandard20-tests-debug.sh
==================================================================
--- /dev/null
+++ Setup/run-netstandard20-tests-debug.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+scriptdir=`dirname "$BASH_SOURCE"`
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  libname=libSQLite.Interop.dylib
+else
+  libname=libSQLite.Interop.so
+fi
+
+if [[ -z "$SQLITE_NET_YEAR" ]]; then
+  SQLITE_NET_YEAR=2013
+fi
+
+pushd "$scriptdir/.."
+
+SQLITE_INTEROP_DIR=bin/$SQLITE_NET_YEAR/Debug$SQLITE_NET_CONFIGURATION_SUFFIX/bin
+SQLITE_INTEROP_FILE=$SQLITE_INTEROP_DIR/$libname
+
+if [[ -f "${SQLITE_INTEROP_FILE}" ]]; then
+  cp "$SQLITE_INTEROP_FILE" "$SQLITE_INTEROP_DIR/SQLite.Interop.dll"
+fi
+
+libname=SQLite.Interop.dll
+
+dotnet exec Externals/Eagle/bin/netStandard20/EagleShell.dll -preInitialize "set test_configuration Debug; set test_year NetStandard20; set test_native_year $SQLITE_NET_YEAR; set interop_assembly_file_names $libname" -initialize -postInitialize "unset no(deleteSqliteImplicitNativeFiles); unset no(copySqliteImplicitNativeFiles)" -file Tests/all.eagle "$@"
+
+popd

ADDED   Setup/run-netstandard20-tests-release.sh
Index: Setup/run-netstandard20-tests-release.sh
==================================================================
--- /dev/null
+++ Setup/run-netstandard20-tests-release.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+scriptdir=`dirname "$BASH_SOURCE"`
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  libname=libSQLite.Interop.dylib
+else
+  libname=libSQLite.Interop.so
+fi
+
+if [[ -z "$SQLITE_NET_YEAR" ]]; then
+  SQLITE_NET_YEAR=2013
+fi
+
+pushd "$scriptdir/.."
+
+SQLITE_INTEROP_DIR=bin/$SQLITE_NET_YEAR/Release$SQLITE_NET_CONFIGURATION_SUFFIX/bin
+SQLITE_INTEROP_FILE=$SQLITE_INTEROP_DIR/$libname
+
+if [[ -f "${SQLITE_INTEROP_FILE}" ]]; then
+  cp "$SQLITE_INTEROP_FILE" "$SQLITE_INTEROP_DIR/SQLite.Interop.dll"
+fi
+
+libname=SQLite.Interop.dll
+
+dotnet exec Externals/Eagle/bin/netStandard20/EagleShell.dll -preInitialize "set test_configuration Release; set test_year NetStandard20; set test_native_year $SQLITE_NET_YEAR; set interop_assembly_file_names $libname" -initialize -postInitialize "unset no(deleteSqliteImplicitNativeFiles); unset no(copySqliteImplicitNativeFiles)" -file Tests/all.eagle "$@"
+
+popd

DELETED Setup/set_2005.bat
Index: Setup/set_2005.bat
==================================================================
--- Setup/set_2005.bat
+++ /dev/null
@@ -1,23 +0,0 @@
-@ECHO OFF
-
-::
-:: set_2005.bat --
-::
-:: Written by Joe Mistachkin.
-:: Released to the public domain, use at your own risk!
-::
-
-SET NETFX20ONLY=1
-SET NETFX35ONLY=
-SET NETFX40ONLY=
-SET NETFX45ONLY=
-SET NETFX451ONLY=
-SET NETFX452ONLY=
-SET NETFX46ONLY=
-SET NETFX461ONLY=
-SET NETFX462ONLY=
-SET NETFX47ONLY=
-SET NETFX471ONLY=
-SET BUILD_ARGS=
-
-VERIFY > NUL

DELETED Setup/set_2008.bat
Index: Setup/set_2008.bat
==================================================================
--- Setup/set_2008.bat
+++ /dev/null
@@ -1,23 +0,0 @@
-@ECHO OFF
-
-::
-:: set_2008.bat --
-::
-:: Written by Joe Mistachkin.
-:: Released to the public domain, use at your own risk!
-::
-
-SET NETFX20ONLY=
-SET NETFX35ONLY=1
-SET NETFX40ONLY=
-SET NETFX45ONLY=
-SET NETFX451ONLY=
-SET NETFX452ONLY=
-SET NETFX46ONLY=
-SET NETFX461ONLY=
-SET NETFX462ONLY=
-SET NETFX47ONLY=
-SET NETFX471ONLY=
-SET BUILD_ARGS=
-
-VERIFY > NUL

DELETED Setup/set_2010.bat
Index: Setup/set_2010.bat
==================================================================
--- Setup/set_2010.bat
+++ /dev/null
@@ -1,23 +0,0 @@
-@ECHO OFF
-
-::
-:: set_2010.bat --
-::
-:: Written by Joe Mistachkin.
-:: Released to the public domain, use at your own risk!
-::
-
-SET NETFX20ONLY=
-SET NETFX35ONLY=
-SET NETFX40ONLY=1
-SET NETFX45ONLY=
-SET NETFX451ONLY=
-SET NETFX452ONLY=
-SET NETFX46ONLY=
-SET NETFX461ONLY=
-SET NETFX462ONLY=
-SET NETFX47ONLY=
-SET NETFX471ONLY=
-SET BUILD_ARGS=
-
-VERIFY > NUL

DELETED Setup/set_2012.bat
Index: Setup/set_2012.bat
==================================================================
--- Setup/set_2012.bat
+++ /dev/null
@@ -1,28 +0,0 @@
-@ECHO OFF
-
-::
-:: set_2012.bat --
-::
-:: Written by Joe Mistachkin.
-:: Released to the public domain, use at your own risk!
-::
-
-SET NETFX20ONLY=
-SET NETFX35ONLY=
-SET NETFX40ONLY=
-SET NETFX45ONLY=1
-SET NETFX451ONLY=
-SET NETFX452ONLY=
-SET NETFX46ONLY=
-SET NETFX461ONLY=
-SET NETFX462ONLY=
-SET NETFX47ONLY=
-SET NETFX471ONLY=
-
-REM
-REM HACK: Evidently, installing Visual Studio 2013 breaks using MSBuild to
-REM       build native projects that specify a platform toolset of "v110".
-REM
-SET BUILD_ARGS=/property:VisualStudioVersion=11.0
-
-VERIFY > NUL

DELETED Setup/set_2013.bat
Index: Setup/set_2013.bat
==================================================================
--- Setup/set_2013.bat
+++ /dev/null
@@ -1,28 +0,0 @@
-@ECHO OFF
-
-::
-:: set_2013.bat --
-::
-:: Written by Joe Mistachkin.
-:: Released to the public domain, use at your own risk!
-::
-
-SET NETFX20ONLY=
-SET NETFX35ONLY=
-SET NETFX40ONLY=
-SET NETFX45ONLY=
-SET NETFX451ONLY=1
-SET NETFX452ONLY=
-SET NETFX46ONLY=
-SET NETFX461ONLY=
-SET NETFX462ONLY=
-SET NETFX47ONLY=
-SET NETFX471ONLY=
-
-REM
-REM HACK: Evidently, using MSBuild with Visual Studio 2013 requires some
-REM       extra magic to make it recognize the "v120" platform toolset.
-REM
-SET BUILD_ARGS=/property:VisualStudioVersion=12.0
-
-VERIFY > NUL

DELETED Setup/set_2015.bat
Index: Setup/set_2015.bat
==================================================================
--- Setup/set_2015.bat
+++ /dev/null
@@ -1,28 +0,0 @@
-@ECHO OFF
-
-::
-:: set_2015.bat --
-::
-:: Written by Joe Mistachkin.
-:: Released to the public domain, use at your own risk!
-::
-
-SET NETFX20ONLY=
-SET NETFX35ONLY=
-SET NETFX40ONLY=
-SET NETFX45ONLY=
-SET NETFX451ONLY=
-SET NETFX452ONLY=
-SET NETFX46ONLY=1
-SET NETFX461ONLY=
-SET NETFX462ONLY=
-SET NETFX47ONLY=
-SET NETFX471ONLY=
-
-REM
-REM HACK: Evidently, using MSBuild with Visual Studio 2015 requires some
-REM       extra magic to make it recognize the "v140" platform toolset.
-REM
-SET BUILD_ARGS=/property:VisualStudioVersion=14.0
-
-VERIFY > NUL

DELETED Setup/set_2017.bat
Index: Setup/set_2017.bat
==================================================================
--- Setup/set_2017.bat
+++ /dev/null
@@ -1,28 +0,0 @@
-@ECHO OFF
-
-::
-:: set_2017.bat --
-::
-:: Written by Joe Mistachkin.
-:: Released to the public domain, use at your own risk!
-::
-
-SET NETFX20ONLY=
-SET NETFX35ONLY=
-SET NETFX40ONLY=
-SET NETFX45ONLY=
-SET NETFX451ONLY=
-SET NETFX452ONLY=
-SET NETFX46ONLY=
-SET NETFX461ONLY=
-SET NETFX462ONLY=
-SET NETFX47ONLY=1
-SET NETFX471ONLY=
-
-REM
-REM HACK: Evidently, using MSBuild with Visual Studio 2017 requires some
-REM       extra magic to make it recognize the "v141" platform toolset.
-REM
-SET BUILD_ARGS=/property:VisualStudioVersion=15.0
-
-VERIFY > NUL

ADDED   Setup/set_DebugNativeOnly_x86_NetStandard20.bat
Index: Setup/set_DebugNativeOnly_x86_NetStandard20.bat
==================================================================
--- /dev/null
+++ Setup/set_DebugNativeOnly_x86_NetStandard20.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+
+::
+:: set_DebugNativeOnly_x86_NetStandard20.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET CONFIGURATION=DebugNativeOnly
+CALL "%~dp0\set_x86_NetStandard20.bat"

ADDED   Setup/set_Debug_x86_NetStandard20.bat
Index: Setup/set_Debug_x86_NetStandard20.bat
==================================================================
--- /dev/null
+++ Setup/set_Debug_x86_NetStandard20.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+
+::
+:: set_Debug_x86_NetStandard20.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET CONFIGURATION=Debug
+CALL "%~dp0\set_x86_NetStandard20.bat"

ADDED   Setup/set_ReleaseNativeOnly_x86_NetStandard20.bat
Index: Setup/set_ReleaseNativeOnly_x86_NetStandard20.bat
==================================================================
--- /dev/null
+++ Setup/set_ReleaseNativeOnly_x86_NetStandard20.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+
+::
+:: set_ReleaseNativeOnly_x86_NetStandard20.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET CONFIGURATION=ReleaseNativeOnly
+CALL "%~dp0\set_x86_NetStandard20.bat"

ADDED   Setup/set_Release_x86_NetStandard20.bat
Index: Setup/set_Release_x86_NetStandard20.bat
==================================================================
--- /dev/null
+++ Setup/set_Release_x86_NetStandard20.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+
+::
+:: set_Release_x86_NetStandard20.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET CONFIGURATION=Release
+CALL "%~dp0\set_x86_NetStandard20.bat"

Index: Setup/set_common.bat
==================================================================
--- Setup/set_common.bat
+++ Setup/set_common.bat
@@ -88,10 +88,14 @@
 
 IF NOT DEFINED FRAMEWORK2017 (
   SET FRAMEWORK2017=netFx47
   REM SET FRAMEWORK2015=netFx471
 )
+
+IF NOT DEFINED FRAMEWORKNETSTANDARD20 (
+  SET FRAMEWORKNETSTANDARD20=netStandard20
+)
 
 IF DEFINED YEARS GOTO end_of_file
 
 IF NOT DEFINED NOVS2005 (
   IF DEFINED VS2005SP (
@@ -132,7 +136,11 @@
 IF NOT DEFINED NOVS2017 (
   IF DEFINED VS2017SP (
     SET YEARS=%YEARS% 2017
   )
 )
+
+IF NOT DEFINED NONETSTANDARD20 (
+  SET YEARS=%YEARS% NetStandard20
+)
 
 :end_of_file

ADDED   Setup/set_netStandard20.bat
Index: Setup/set_netStandard20.bat
==================================================================
--- /dev/null
+++ Setup/set_netStandard20.bat
@@ -0,0 +1,38 @@
+@ECHO OFF
+
+::
+:: set_netStandard20.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+IF NOT DEFINED ISNETFX2 (
+  SET ISNETFX2=False
+)
+
+IF NOT DEFINED VCRUNTIME (
+  SET VCRUNTIME=2017_VCU3
+)
+
+IF NOT DEFINED CONFIGURATION (
+  SET CONFIGURATION=Release
+)
+
+IF NOT DEFINED PLATFORM (
+  SET PLATFORM=Win32
+)
+
+IF NOT DEFINED PROCESSOR (
+  SET PROCESSOR=x86
+)
+
+IF NOT DEFINED YEAR (
+  SET YEAR=2017
+)
+
+IF NOT DEFINED FRAMEWORK (
+  SET FRAMEWORK=netStandard20
+)
+
+:end_of_file

ADDED   Setup/set_x86_NetStandard20.bat
Index: Setup/set_x86_NetStandard20.bat
==================================================================
--- /dev/null
+++ Setup/set_x86_NetStandard20.bat
@@ -0,0 +1,14 @@
+@ECHO OFF
+
+::
+:: set_x86_NetStandard20.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET ISNETFX2=False
+SET VCRUNTIME=2017_VCU3
+SET PLATFORM=Win32
+SET PROCESSOR=x86
+SET YEAR=NetStandard20

ADDED   Setup/set_year_2005.bat
Index: Setup/set_year_2005.bat
==================================================================
--- /dev/null
+++ Setup/set_year_2005.bat
@@ -0,0 +1,24 @@
+@ECHO OFF
+
+::
+:: set_year_2005.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET NETCORE20ONLY=
+SET NETFX20ONLY=1
+SET NETFX35ONLY=
+SET NETFX40ONLY=
+SET NETFX45ONLY=
+SET NETFX451ONLY=
+SET NETFX452ONLY=
+SET NETFX46ONLY=
+SET NETFX461ONLY=
+SET NETFX462ONLY=
+SET NETFX47ONLY=
+SET NETFX471ONLY=
+SET BUILD_ARGS=
+
+VERIFY > NUL

ADDED   Setup/set_year_2008.bat
Index: Setup/set_year_2008.bat
==================================================================
--- /dev/null
+++ Setup/set_year_2008.bat
@@ -0,0 +1,24 @@
+@ECHO OFF
+
+::
+:: set_year_2008.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET NETCORE20ONLY=
+SET NETFX20ONLY=
+SET NETFX35ONLY=1
+SET NETFX40ONLY=
+SET NETFX45ONLY=
+SET NETFX451ONLY=
+SET NETFX452ONLY=
+SET NETFX46ONLY=
+SET NETFX461ONLY=
+SET NETFX462ONLY=
+SET NETFX47ONLY=
+SET NETFX471ONLY=
+SET BUILD_ARGS=
+
+VERIFY > NUL

ADDED   Setup/set_year_2010.bat
Index: Setup/set_year_2010.bat
==================================================================
--- /dev/null
+++ Setup/set_year_2010.bat
@@ -0,0 +1,24 @@
+@ECHO OFF
+
+::
+:: set_year_2010.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET NETCORE20ONLY=
+SET NETFX20ONLY=
+SET NETFX35ONLY=
+SET NETFX40ONLY=1
+SET NETFX45ONLY=
+SET NETFX451ONLY=
+SET NETFX452ONLY=
+SET NETFX46ONLY=
+SET NETFX461ONLY=
+SET NETFX462ONLY=
+SET NETFX47ONLY=
+SET NETFX471ONLY=
+SET BUILD_ARGS=
+
+VERIFY > NUL

ADDED   Setup/set_year_2012.bat
Index: Setup/set_year_2012.bat
==================================================================
--- /dev/null
+++ Setup/set_year_2012.bat
@@ -0,0 +1,29 @@
+@ECHO OFF
+
+::
+:: set_year_2012.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET NETCORE20ONLY=
+SET NETFX20ONLY=
+SET NETFX35ONLY=
+SET NETFX40ONLY=
+SET NETFX45ONLY=1
+SET NETFX451ONLY=
+SET NETFX452ONLY=
+SET NETFX46ONLY=
+SET NETFX461ONLY=
+SET NETFX462ONLY=
+SET NETFX47ONLY=
+SET NETFX471ONLY=
+
+REM
+REM HACK: Evidently, installing Visual Studio 2013 breaks using MSBuild to
+REM       build native projects that specify a platform toolset of "v110".
+REM
+SET BUILD_ARGS=/property:VisualStudioVersion=11.0
+
+VERIFY > NUL

ADDED   Setup/set_year_2013.bat
Index: Setup/set_year_2013.bat
==================================================================
--- /dev/null
+++ Setup/set_year_2013.bat
@@ -0,0 +1,29 @@
+@ECHO OFF
+
+::
+:: set_year_2013.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET NETCORE20ONLY=
+SET NETFX20ONLY=
+SET NETFX35ONLY=
+SET NETFX40ONLY=
+SET NETFX45ONLY=
+SET NETFX451ONLY=1
+SET NETFX452ONLY=
+SET NETFX46ONLY=
+SET NETFX461ONLY=
+SET NETFX462ONLY=
+SET NETFX47ONLY=
+SET NETFX471ONLY=
+
+REM
+REM HACK: Evidently, using MSBuild with Visual Studio 2013 requires some
+REM       extra magic to make it recognize the "v120" platform toolset.
+REM
+SET BUILD_ARGS=/property:VisualStudioVersion=12.0
+
+VERIFY > NUL

ADDED   Setup/set_year_2015.bat
Index: Setup/set_year_2015.bat
==================================================================
--- /dev/null
+++ Setup/set_year_2015.bat
@@ -0,0 +1,29 @@
+@ECHO OFF
+
+::
+:: set_year_2015.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET NETCORE20ONLY=
+SET NETFX20ONLY=
+SET NETFX35ONLY=
+SET NETFX40ONLY=
+SET NETFX45ONLY=
+SET NETFX451ONLY=
+SET NETFX452ONLY=
+SET NETFX46ONLY=1
+SET NETFX461ONLY=
+SET NETFX462ONLY=
+SET NETFX47ONLY=
+SET NETFX471ONLY=
+
+REM
+REM HACK: Evidently, using MSBuild with Visual Studio 2015 requires some
+REM       extra magic to make it recognize the "v140" platform toolset.
+REM
+SET BUILD_ARGS=/property:VisualStudioVersion=14.0
+
+VERIFY > NUL

ADDED   Setup/set_year_2017.bat
Index: Setup/set_year_2017.bat
==================================================================
--- /dev/null
+++ Setup/set_year_2017.bat
@@ -0,0 +1,29 @@
+@ECHO OFF
+
+::
+:: set_year_2017.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET NETCORE20ONLY=
+SET NETFX20ONLY=
+SET NETFX35ONLY=
+SET NETFX40ONLY=
+SET NETFX45ONLY=
+SET NETFX451ONLY=
+SET NETFX452ONLY=
+SET NETFX46ONLY=
+SET NETFX461ONLY=
+SET NETFX462ONLY=
+SET NETFX47ONLY=1
+SET NETFX471ONLY=
+
+REM
+REM HACK: Evidently, using MSBuild with Visual Studio 2017 requires some
+REM       extra magic to make it recognize the "v141" platform toolset.
+REM
+SET BUILD_ARGS=/property:VisualStudioVersion=15.0
+
+VERIFY > NUL

ADDED   Setup/set_year_NetStandard20.bat
Index: Setup/set_year_NetStandard20.bat
==================================================================
--- /dev/null
+++ Setup/set_year_NetStandard20.bat
@@ -0,0 +1,23 @@
+@ECHO OFF
+
+::
+:: set_year_NetStandard20.bat --
+::
+:: Written by Joe Mistachkin.
+:: Released to the public domain, use at your own risk!
+::
+
+SET NETCORE20ONLY=1
+SET NETFX20ONLY=
+SET NETFX35ONLY=
+SET NETFX40ONLY=
+SET NETFX45ONLY=
+SET NETFX451ONLY=
+SET NETFX452ONLY=
+SET NETFX46ONLY=
+SET NETFX461ONLY=
+SET NETFX462ONLY=
+SET NETFX47ONLY=
+SET NETFX471ONLY=
+
+VERIFY > NUL

Index: Setup/test.bat
==================================================================
--- Setup/test.bat
+++ Setup/test.bat
@@ -73,12 +73,12 @@
   SET EAGLESHELL=EagleShell32.exe
 )
 
 %_VECHO% EagleShell = '%EAGLESHELL%'
 
-%_CECHO% "Externals\Eagle\bin\%EAGLESHELL%" %PREARGS% %* %POSTARGS%
-%__ECHO% "Externals\Eagle\bin\%EAGLESHELL%" %PREARGS% %* %POSTARGS%
+%_CECHO% "Externals\Eagle\bin\netFramework40\%EAGLESHELL%" %PREARGS% %* %POSTARGS%
+%__ECHO% "Externals\Eagle\bin\netFramework40\%EAGLESHELL%" %PREARGS% %* %POSTARGS%
 
 IF ERRORLEVEL 1 (
   ECHO Received non-zero return code from the Eagle Shell.
   GOTO errors
 )

Index: Setup/test_all.bat
==================================================================
--- Setup/test_all.bat
+++ Setup/test_all.bat
@@ -141,11 +141,11 @@
             GOTO errors
           )
         )
 
         IF NOT DEFINED NOMANAGEDONLY (
-          %__ECHO% "Externals\Eagle\bin\%EAGLESHELL%" %PREARGS% -anyInitialize "set test_year {%%Y}; set test_configuration {%%C}" -file "%TEST_FILE%" %POSTARGS%
+          %__ECHO% "Externals\Eagle\bin\netFramework40\%EAGLESHELL%" %PREARGS% -anyInitialize "set test_year {%%Y}; set test_configuration {%%C}" -file "%TEST_FILE%" %POSTARGS%
 
           IF ERRORLEVEL 1 (
             ECHO Testing of "%%Y/%%C" managed-only assembly failed.
             GOTO errors
           )
@@ -222,11 +222,11 @@
                 ECHO Failed to copy "bin\%%Y\%%C\bin\Installer.*" to "bin\%%Y\%PLATFORM%\%%C".
                 GOTO errors
               )
             )
 
-            %__ECHO% "Externals\Eagle\bin\%EAGLESHELL%" %PREARGS% -preInitialize "set test_year {%%Y}; set test_configuration {%%C}" -initialize -runtimeOption native -file "%TEST_FILE%" %POSTARGS%
+            %__ECHO% "Externals\Eagle\bin\netFramework40\%EAGLESHELL%" %PREARGS% -preInitialize "set test_year {%%Y}; set test_configuration {%%C}" -initialize -runtimeOption native -file "%TEST_FILE%" %POSTARGS%
 
             IF ERRORLEVEL 1 (
               ECHO Testing of "%%Y/%%C" mixed-mode assembly failed.
               GOTO errors
             )

Index: Setup/test_ce_200x.bat
==================================================================
--- Setup/test_ce_200x.bat
+++ Setup/test_ce_200x.bat
@@ -33,11 +33,11 @@
 SET TOOLS=%~dp0
 SET TOOLS=%TOOLS:~0,-1%
 
 %_VECHO% Tools = '%TOOLS%'
 
-SET EAGLEBINDIR=%ROOT%\Externals\Eagle\bin
+SET EAGLEBINDIR=%ROOT%\Externals\Eagle\bin\netFramework40
 
 CALL :fn_PrependToPath EAGLEBINDIR
 
 %_VECHO% EagleBinDir = '%EAGLEBINDIR%'
 %_VECHO% Path = '%PATH%'

Index: System.Data.SQLite/Configurations/System.Data.SQLite.dll.config
==================================================================
--- System.Data.SQLite/Configurations/System.Data.SQLite.dll.config
+++ System.Data.SQLite/Configurations/System.Data.SQLite.dll.config
@@ -142,10 +142,19 @@
                       be set via an environment variable.
     -->
     <!--
     <add key="No_SQLiteXmlConfigFile" value="1" />
     -->
+
+    <!--
+        NOTE: If this configuration variable is set [to anything], the base
+              directory itself is considered valid for pre-loading the native
+              SQLite library.
+    -->
+    <!--
+    <add key="PreLoadSQLite_AllowBaseDirectoryOnly" value="1" />
+    -->
 
     <!--
         NOTE: If this configuration variable is set [to anything], it will be
               used instead of the application base directory by the native
               library pre-loader.  This environment variable can be especially

ADDED   System.Data.SQLite/Generated/SR.resources
Index: System.Data.SQLite/Generated/SR.resources
==================================================================
--- /dev/null
+++ System.Data.SQLite/Generated/SR.resources
cannot compute difference between binary files

Index: System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
==================================================================
--- System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
+++ System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
@@ -42,14 +42,16 @@
 #if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY
         UnsafeNativeMethods.Initialize();
 #endif
 
 #if USE_INTEROP_DLL && INTEROP_LOG
-        if (UnsafeNativeMethods.sqlite3_config_log_interop() == SQLiteErrorCode.Ok)
+        SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3_config_log_interop();
+
+        if (rc == SQLiteErrorCode.Ok)
         {
             UnsafeNativeMethods.sqlite3_log(
-                SQLiteErrorCode.Ok, SQLiteConvert.ToUTF8("logging initialized."));
+                rc, SQLiteConvert.ToUTF8("logging initialized via SQLiteFactory."));
         }
 #endif
 
         SQLiteLog.Initialize();
 
@@ -76,11 +78,13 @@
         return GetSQLiteProviderServicesInstance();
       }
       return null;
     }
 
+#if !NET_STANDARD_20
     [ReflectionPermission(SecurityAction.Assert, MemberAccess = true)]
+#endif
     private object GetSQLiteProviderServicesInstance()
     {
         if (_sqliteServices == null)
         {
             string typeName = UnsafeNativeMethods.GetSettingValue(

Index: System.Data.SQLite/SQLiteConnection.cs
==================================================================
--- System.Data.SQLite/SQLiteConnection.cs
+++ System.Data.SQLite/SQLiteConnection.cs
@@ -1791,14 +1791,16 @@
           }
       }
 #endif
 
 #if USE_INTEROP_DLL && INTEROP_LOG
-      if (UnsafeNativeMethods.sqlite3_config_log_interop() == SQLiteErrorCode.Ok)
+      SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3_config_log_interop();
+
+      if (rc == SQLiteErrorCode.Ok)
       {
           UnsafeNativeMethods.sqlite3_log(
-              SQLiteErrorCode.Ok, SQLiteConvert.ToUTF8("logging initialized."));
+              rc, SQLiteConvert.ToUTF8("logging initialized via SQLiteConnection."));
       }
 #endif
 
       _cachedSettings = new Dictionary<string, object>(
           new TypeNameStringComparer());

Index: System.Data.SQLite/SQLiteDefineConstants.cs
==================================================================
--- System.Data.SQLite/SQLiteDefineConstants.cs
+++ System.Data.SQLite/SQLiteDefineConstants.cs
@@ -141,10 +141,14 @@
 #endif
 
 #if NET_COMPACT_20
             "NET_COMPACT_20",
 #endif
+
+#if NET_STANDARD_20
+            "NET_STANDARD_20",
+#endif
 
 #if PLATFORM_COMPACTFRAMEWORK
             "PLATFORM_COMPACTFRAMEWORK",
 #endif
 

Index: System.Data.SQLite/SQLiteFunction.cs
==================================================================
--- System.Data.SQLite/SQLiteFunction.cs
+++ System.Data.SQLite/SQLiteFunction.cs
@@ -642,11 +642,11 @@
 
     /// <summary>
     /// Using reflection, enumerate all assemblies in the current appdomain looking for classes that
     /// have a SQLiteFunctionAttribute attribute, and registering them accordingly.
     /// </summary>
-#if !PLATFORM_COMPACTFRAMEWORK
+#if !PLATFORM_COMPACTFRAMEWORK && !NET_STANDARD_20
     [Security.Permissions.FileIOPermission(Security.Permissions.SecurityAction.Assert, AllFiles = Security.Permissions.FileIOPermissionAccess.PathDiscovery)]
 #endif
     static SQLiteFunction()
     {
       _registeredFunctions = new Dictionary<SQLiteFunctionAttribute, object>();

ADDED   System.Data.SQLite/System.Data.SQLite.NetStandard20.csproj
Index: System.Data.SQLite/System.Data.SQLite.NetStandard20.csproj
==================================================================
--- /dev/null
+++ System.Data.SQLite/System.Data.SQLite.NetStandard20.csproj
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ *
+ * System.Data.SQLite.NetStandard20.csproj -
+ *
+ * Written by Joe Mistachkin.
+ * Released to the public domain, use at your own risk!
+ *
+-->
+<Project ToolsVersion="15.0">
+  <!--
+  ******************************************************************************
+  **                     Import .NET Core SDK Properties                      **
+  ******************************************************************************
+  -->
+
+  <!--
+      WARNING: This project cannot use the recommended pattern of having the
+               "Project" element simply include the "Sdk" attribute, due to
+               the "BuildDependsOn" property not being honored, see:
+
+               https://github.com/Microsoft/msbuild/issues/1680
+
+               Instead, the .NET Core SDK properties file is imported here
+               and the corresponding targets file is imported right before
+               resetting the "BuildDependsOn" property to include targets
+               necessary for this project.
+  -->
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
+  <!--
+  ******************************************************************************
+  **                       Project Specific Properties                        **
+  ******************************************************************************
+  -->
+
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{77BE07F7-8183-4A83-8AEC-D46A0C2C026D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>System.Data.SQLite</RootNamespace>
+    <AssemblyName>System.Data.SQLite</AssemblyName>
+    <SQLiteNetDir>$(MSBuildProjectDirectory)\..</SQLiteNetDir>
+    <NetFx461>true</NetFx461>
+    <IsDotNetStandard>true</IsDotNetStandard>
+    <ConfigurationYear>NetStandard20</ConfigurationYear>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Deterministic>False</Deterministic>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+
+  <!--
+  ******************************************************************************
+  **                    .NET Standard 2.0 Specific Targets                    **
+  ******************************************************************************
+  -->
+
+  <Target Name="GenerateResourcesForNetStandard20"
+          Condition="'$(GenerateResourcesForNetStandard20)' != 'false' And
+                     '$(BuildTool)' == 'DotNetCore' And
+                     '$(OperatingSystem)' == 'Windows' And
+                     '$(MSBuildProjectDirectory)' != '' And
+                     !HasTrailingSlash('$(MSBuildProjectDirectory)') And
+                     Exists('$(MSBuildProjectDirectory)\..\Externals\ResGen\ResGen.exe')"
+          Inputs="Resources\SR.resx"
+          Outputs="Generated\SR.resources">
+    <MakeDir Directories="Generated" />
+
+    <Exec Command="&quot;$(MSBuildProjectDirectory)\..\Externals\ResGen\ResGen.exe&quot; Resources\SR.resx Generated\SR.resources &quot;$(MSBuildProjectDirectory)\Resources&quot;" />
+  </Target>
+
+  <!--
+  ******************************************************************************
+  **                     Import Project Default Settings                      **
+  ******************************************************************************
+  -->
+
+  <Import Project="$(SQLiteNetDir)\Targets\SQLite.NET.Platform.Settings.targets" />
+  <Import Project="$(SQLiteNetDir)\Targets\SQLite.NET.Settings.targets" />
+
+  <!--
+  ******************************************************************************
+  **                       Import Project Build Targets                       **
+  ******************************************************************************
+  -->
+
+  <Import Project="$(SQLiteNetDir)\Targets\SQLite.NET.targets" />
+
+  <!--
+  ******************************************************************************
+  **               Convert Project Settings To MSBuild Settings               **
+  ******************************************************************************
+  -->
+
+  <PropertyGroup Condition="'$(BinaryOutputPath)' != ''">
+    <OutputPath>$(BinaryOutputPath)</OutputPath>
+    <DocumentationFile>$(BinaryOutputPath)netstandard2.0\System.Data.SQLite.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <!--
+  ******************************************************************************
+  **                Project Configuration Specific Properties                 **
+  ******************************************************************************
+  -->
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <Optimize>false</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+
+  <!--
+  ******************************************************************************
+  -->
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <Optimize>true</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+
+  <!--
+  ******************************************************************************
+  **                        Import Assembly References                        **
+  ******************************************************************************
+  -->
+
+  <Import Project="$(MSBuildProjectDirectory)\Targets\System.Data.SQLite.References.targets" />
+
+  <!--
+  ******************************************************************************
+  **       Import Project Compile-Time Options (i.e. Define Constants)        **
+  ******************************************************************************
+  -->
+
+  <Import Project="$(MSBuildProjectDirectory)\Targets\System.Data.SQLite.Properties.targets" />
+
+  <!--
+  ******************************************************************************
+  **                     Import Project Source Code Files                     **
+  ******************************************************************************
+  -->
+
+  <Import Project="$(MSBuildProjectDirectory)\Targets\System.Data.SQLite.Files.targets" />
+
+  <!--
+  ******************************************************************************
+  **                     Project Embedded Resource Files                      **
+  ******************************************************************************
+  -->
+
+  <ItemGroup>
+    <EmbeddedResource Include="Generated\SR.resources">
+      <LogicalName>System.Data.SQLite.SR.resources</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <!--
+  ******************************************************************************
+  **                       Import .NET Core SDK Targets                       **
+  ******************************************************************************
+  -->
+
+  <!--
+      WARNING: This project cannot use the recommended pattern of having the
+               "Project" element simply include the "Sdk" attribute, see the
+               comment at the top of this file for more information.
+  -->
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
+  <!--
+  ******************************************************************************
+  **                  Add Targets To BuildDependsOn Property                  **
+  ******************************************************************************
+  -->
+
+  <PropertyGroup>
+    <BuildDependsOn>
+      DetectBuildTool;
+      DetectOperatingSystem;
+      GenerateResourcesForNetStandard20;
+      $(BuildDependsOn);
+      CopyConfigurations;
+    </BuildDependsOn>
+    <CleanDependsOn>
+      $(CleanDependsOn);
+      CleanConfigurations;
+    </CleanDependsOn>
+  </PropertyGroup>
+  <!-- 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>

Index: System.Data.SQLite/Targets/System.Data.SQLite.Files.targets
==================================================================
--- System.Data.SQLite/Targets/System.Data.SQLite.Files.targets
+++ System.Data.SQLite/Targets/System.Data.SQLite.Files.targets
@@ -7,11 +7,11 @@
  *
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--
   ******************************************************************************
-  **                            Core Files (Common)                           **
+  **                    Project Source Code Files (Common)                    **
   ******************************************************************************
   -->
 
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -57,22 +57,31 @@
     <Compile Include="Resources\SR.Designer.cs">
       <DependentUpon>SR.resx</DependentUpon>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="Configurations\System.Data.SQLite.dll.config" />
+  </ItemGroup>
+
+  <!--
+  ******************************************************************************
+  **                     Project Embedded Resource Files                      **
+  ******************************************************************************
+  -->
+
+  <ItemGroup Condition="'$(IsDotNetStandard)' == 'false'">
     <EmbeddedResource Include="Resources\SR.resx">
       <SubType>Designer</SubType>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>SR.Designer.cs</LastGenOutput>
       <LogicalName>System.Data.SQLite.SR.resources</LogicalName>
     </EmbeddedResource>
-    <None Include="Configurations\System.Data.SQLite.dll.config" />
   </ItemGroup>
 
   <!--
   ******************************************************************************
-  **                        Core Files (Full Framework)                       **
+  **                Project Source Code Files (Full Framework)                **
   ******************************************************************************
   -->
 
   <ItemGroup Condition="'$(IsCompactFramework)' == 'false'">
     <Compile Include="SQLiteEnlistment.cs" />
@@ -107,11 +116,11 @@
     <EmbeddedResource Include="Resources\SQLiteDataAdapter.bmp" />
   </ItemGroup>
 
   <!--
   ******************************************************************************
-  **                           Virtual Table Files                            **
+  **                     Virtual Table Source Code Files                      **
   ******************************************************************************
   -->
 
   <ItemGroup Condition="'$(InteropVirtualTable)' != 'false'">
     <Compile Include="ISQLiteNativeModule.cs" />
@@ -121,13 +130,13 @@
     <Compile Include="SQLiteModuleNoop.cs" />
   </ItemGroup>
 
   <!--
   ******************************************************************************
-  **                         Session Extension Files                          **
+  **                   Session Extension Source Code Files                    **
   ******************************************************************************
   -->
 
   <ItemGroup Condition="'$(InteropSessionExtension)' != 'false'">
     <Compile Include="SQLiteSession.cs" />
   </ItemGroup>
 </Project>

Index: System.Data.SQLite/Targets/System.Data.SQLite.Properties.targets
==================================================================
--- System.Data.SQLite/Targets/System.Data.SQLite.Properties.targets
+++ System.Data.SQLite/Targets/System.Data.SQLite.Properties.targets
@@ -144,10 +144,20 @@
   <PropertyGroup Condition="'$(IsCompactFramework)' != 'false' And
                             '$(TargetFrameworkVersion)' == 'v2.0'">
     <DefineConstants>$(DefineConstants);NET_COMPACT_20</DefineConstants>
   </PropertyGroup>
 
+  <!--
+      NOTE: Only use functionality available in .NET Standard 2.0?  By default,
+            this is disabled.  This must be enabled to successfully build the
+            project using .NET Core 2.0 SDK (if necessary, it will typically
+            be enabled from within the project file itself).
+  -->
+  <PropertyGroup Condition="'$(IsDotNetStandard)' != 'false'">
+    <DefineConstants>$(DefineConstants);NET_STANDARD_20</DefineConstants>
+  </PropertyGroup>
+
   <!--
       NOTE: Enable extra internal state checking?
   -->
   <PropertyGroup Condition="'$(CheckState)' != 'false'">
     <DefineConstants>$(DefineConstants);CHECK_STATE</DefineConstants>

Index: System.Data.SQLite/Targets/System.Data.SQLite.References.targets
==================================================================
--- System.Data.SQLite/Targets/System.Data.SQLite.References.targets
+++ System.Data.SQLite/Targets/System.Data.SQLite.References.targets
@@ -11,11 +11,12 @@
   ******************************************************************************
   **                     Core References (Full Framework)                     **
   ******************************************************************************
   -->
 
-  <ItemGroup Condition="'$(IsCompactFramework)' == 'false'">
+  <ItemGroup Condition="'$(IsCompactFramework)' == 'false' And
+                        '$(IsDotNetStandard)' == 'false'">
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
   </ItemGroup>

Index: System.Data.SQLite/UnsafeNativeMethods.cs
==================================================================
--- System.Data.SQLite/UnsafeNativeMethods.cs
+++ System.Data.SQLite/UnsafeNativeMethods.cs
@@ -354,11 +354,12 @@
 
       /////////////////////////////////////////////////////////////////////////
 
       #region Private Data
       /// <summary>
-      /// This lock is used to protect the static <see cref="isMono" /> field.
+      /// This lock is used to protect the static <see cref="isMono" /> and
+      /// <see cref="isDotNetCore" /> fields.
       /// </summary>
       private static readonly object staticSyncRoot = new object();
 
       /////////////////////////////////////////////////////////////////////////
       /// <summary>
@@ -366,15 +367,30 @@
       /// </summary>
       private static readonly string MonoRuntimeType = "Mono.Runtime";
 
       /////////////////////////////////////////////////////////////////////////
       /// <summary>
+      /// This type is only present when running on .NET Core.
+      /// </summary>
+      private static readonly string DotNetCoreLibType = "System.CoreLib";
+
+      /////////////////////////////////////////////////////////////////////////
+      /// <summary>
       /// Keeps track of whether we are running on Mono.  Initially null, it is
       /// set by the <see cref="IsMono" /> method on its first call.  Later, it
       /// is returned verbatim by the <see cref="IsMono" /> method.
       /// </summary>
       private static bool? isMono = null;
+
+      /////////////////////////////////////////////////////////////////////////
+      /// <summary>
+      /// Keeps track of whether we are running on .NET Core.  Initially null,
+      /// it is set by the <see cref="IsDotNetCore" /> method on its first
+      /// call.  Later, it is returned verbatim by the
+      /// <see cref="IsDotNetCore" /> method.
+      /// </summary>
+      private static bool? isDotNetCore = null;
 
       /////////////////////////////////////////////////////////////////////////
       /// <summary>
       /// Keeps track of whether we successfully invoked the
       /// <see cref="Debugger.Break" /> method.  Initially null, it is set by
@@ -419,10 +435,41 @@
                   if (isMono == null)
                       isMono = (Type.GetType(MonoRuntimeType) != null);
 
                   return (bool)isMono;
               }
+          }
+          catch
+          {
+              // do nothing.
+          }
+
+          return false;
+      }
+
+      ///////////////////////////////////////////////////////////////////////
+
+      /// <summary>
+      /// Determines whether or not this assembly is running on .NET Core.
+      /// </summary>
+      /// <returns>
+      /// Non-zero if this assembly is running on .NET Core.
+      /// </returns>
+      public static bool IsDotNetCore()
+      {
+          try
+          {
+              lock (staticSyncRoot)
+              {
+                  if (isDotNetCore == null)
+                  {
+                      isDotNetCore = (Type.GetType(
+                          DotNetCoreLibType) != null);
+                  }
+
+                  return (bool)isDotNetCore;
+              }
           }
           catch
           {
               // do nothing.
           }
@@ -851,10 +898,21 @@
       /// The native module handle upon success -OR- IntPtr.Zero on failure.
       /// </returns>
       private delegate IntPtr LoadLibraryCallback(
           string fileName
       );
+
+      /////////////////////////////////////////////////////////////////////////
+
+      /// <summary>
+      /// This delegate is used to wrap the concept of querying the machine
+      /// name of the current process.
+      /// </summary>
+      /// <returns>
+      /// The machine name for the current process -OR- null on failure.
+      /// </returns>
+      private delegate string GetMachineCallback();
       #endregion
 
       /////////////////////////////////////////////////////////////////////////
 
       #region Private Methods
@@ -875,10 +933,49 @@
           return UnsafeNativeMethodsWin32.LoadLibrary(fileName);
       }
 
       /////////////////////////////////////////////////////////////////////////
 
+      /// <summary>
+      /// Attempts to determine the machine name of the current process using
+      /// the Win32 API.
+      /// </summary>
+      /// <returns>
+      /// The machine name for the current process -OR- null on failure.
+      /// </returns>
+      private static string GetMachineWin32()
+      {
+          //
+          // NOTE: When running on Windows, attempt to use the native Win32
+          //       API function (via P/Invoke) that can provide us with the
+          //       processor architecture.
+          //
+          try
+          {
+              UnsafeNativeMethodsWin32.SYSTEM_INFO systemInfo;
+
+              //
+              // NOTE: Query the system information via P/Invoke, thus
+              //       filling the structure.
+              //
+              UnsafeNativeMethodsWin32.GetSystemInfo(out systemInfo);
+
+              //
+              // NOTE: Return the processor architecture value as a string.
+              //
+              return systemInfo.wProcessorArchitecture.ToString();
+          }
+          catch
+          {
+              // do nothing.
+          }
+
+          return null;
+      }
+
+      /////////////////////////////////////////////////////////////////////////
+
 #if !PLATFORM_COMPACTFRAMEWORK
       /// <summary>
       /// Attempts to load the specified native library file using the POSIX
       /// API.
       /// </summary>
@@ -893,10 +990,43 @@
           )
       {
           return UnsafeNativeMethodsPosix.dlopen(
               fileName, UnsafeNativeMethodsPosix.RTLD_DEFAULT);
       }
+
+      /////////////////////////////////////////////////////////////////////////
+
+      /// <summary>
+      /// Attempts to determine the machine name of the current process using
+      /// the POSIX API.
+      /// </summary>
+      /// <returns>
+      /// The machine name for the current process -OR- null on failure.
+      /// </returns>
+      private static string GetMachinePosix()
+      {
+          //
+          // NOTE: When running on POSIX (non-Windows), attempt to query the
+          //       machine from the operating system via uname().
+          //
+          try
+          {
+              UnsafeNativeMethodsPosix.utsname utsName = null;
+
+              if (UnsafeNativeMethodsPosix.GetOsVersionInfo(ref utsName) &&
+                  (utsName != null))
+              {
+                  return utsName.machine;
+              }
+          }
+          catch
+          {
+              // do nothing.
+          }
+
+          return null;
+      }
 #endif
       #endregion
 
       /////////////////////////////////////////////////////////////////////////
 
@@ -921,10 +1051,30 @@
               callback = LoadLibraryPosix;
 #endif
 
           return callback(fileName);
       }
+
+      /////////////////////////////////////////////////////////////////////////
+
+      /// <summary>
+      /// Attempts to determine the machine name of the current process.
+      /// </summary>
+      /// <returns>
+      /// The machine name for the current process -OR- null on failure.
+      /// </returns>
+      public static string GetMachine()
+      {
+          GetMachineCallback callback = GetMachineWin32;
+
+#if !PLATFORM_COMPACTFRAMEWORK
+          if (!HelperMethods.IsWindows())
+              callback = GetMachinePosix;
+#endif
+
+          return callback();
+      }
       #endregion
   }
   #endregion
 
   /////////////////////////////////////////////////////////////////////////////
@@ -935,10 +1085,78 @@
   /// This class declares P/Invoke methods to call native POSIX APIs.
   /// </summary>
   [SuppressUnmanagedCodeSecurity]
   internal static class UnsafeNativeMethodsPosix
   {
+      /// <summary>
+      /// This structure is used when running on POSIX operating systems
+      /// to store information about the current machine, including the
+      /// human readable name of the operating system as well as that of
+      /// the underlying hardware.
+      /// </summary>
+      internal sealed class utsname
+      {
+          public string sysname;  /* Name of this implementation of
+                                   * the operating system. */
+          public string nodename; /* Name of this node within the
+                                   * communications network to which
+                                   * this node is attached, if any. */
+          public string release;  /* Current release level of this
+                                   * implementation. */
+          public string version;  /* Current version level of this
+                                   * release. */
+          public string machine;  /* Name of the hardware type on
+                                   * which the system is running. */
+      }
+
+      /////////////////////////////////////////////////////////////////////////
+
+      /// <summary>
+      /// This structure is passed directly to the P/Invoke method to
+      /// obtain the information about the current machine, including
+      /// the human readable name of the operating system as well as
+      /// that of the underlying hardware.
+      /// </summary>
+      [StructLayout(LayoutKind.Sequential)]
+      private struct utsname_interop
+      {
+          //
+          // NOTE: The following string fields should be present in
+          //       this buffer, all of which will be zero-terminated:
+          //
+          //                      sysname
+          //                      nodename
+          //                      release
+          //                      version
+          //                      machine
+          //
+          [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4096)]
+          public byte[] buffer;
+      }
+
+      /////////////////////////////////////////////////////////////////////////
+
+      /// <summary>
+      /// This is the P/Invoke method that wraps the native Unix uname
+      /// function.  See the POSIX documentation for full details on what it
+      /// does.
+      /// </summary>
+      /// <param name="name">
+      /// Structure containing a preallocated byte buffer to fill with the
+      /// requested information.
+      /// </param>
+      /// <returns>
+      /// Zero for success and less than zero upon failure.
+      /// </returns>
+#if NET_STANDARD_20
+      [DllImport("libc",
+#else
+      [DllImport("__Internal",
+#endif
+          CallingConvention = CallingConvention.Cdecl)]
+      private static extern int uname(out utsname_interop name);
+
       /////////////////////////////////////////////////////////////////////////
       /// <summary>
       /// This is the P/Invoke method that wraps the native Unix dlopen
       /// function.  See the POSIX documentation for full details on what it
       /// does.
@@ -951,17 +1169,45 @@
       /// RTLD_NOW, RTLD_GLOBAL, and/or RTLD_LOCAL.
       /// </param>
       /// <returns>
       /// The native module handle upon success -OR- IntPtr.Zero on failure.
       /// </returns>
-      [DllImport("__Internal", EntryPoint = "dlopen",
+#if NET_STANDARD_20
+      [DllImport("libdl",
+#else
+      [DllImport("__Internal",
+#endif
+          EntryPoint = "dlopen",
           CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi,
           BestFitMapping = false, ThrowOnUnmappableChar = true,
           SetLastError = true)]
       internal static extern IntPtr dlopen(string fileName, int mode);
 
       /////////////////////////////////////////////////////////////////////////
+      /// <summary>
+      /// This is the P/Invoke method that wraps the native Unix dlclose
+      /// function.  See the POSIX documentation for full details on what it
+      /// does.
+      /// </summary>
+      /// <param name="module">
+      /// The handle to the loaded native library.
+      /// </param>
+      /// <returns>
+      /// Zero upon success -OR- non-zero on failure.
+      /// </returns>
+#if NET_STANDARD_20
+      [DllImport("libdl",
+#else
+      [DllImport("__Internal",
+#endif
+          EntryPoint = "dlclose",
+          CallingConvention = CallingConvention.Cdecl, SetLastError = true)]
+      internal static extern int dlclose(IntPtr module);
+
+      /////////////////////////////////////////////////////////////////////////
+
+      #region Private Constants
       /// <summary>
       /// For use with dlopen(), bind function calls lazily.
       /// </summary>
       internal const int RTLD_LAZY = 0x1;
 
@@ -985,11 +1231,95 @@
 
       /////////////////////////////////////////////////////////////////////////
       /// <summary>
       /// For use with dlopen(), the defaults used by this class.
       /// </summary>
-      internal  const int RTLD_DEFAULT = RTLD_NOW | RTLD_GLOBAL;
+      internal const int RTLD_DEFAULT = RTLD_NOW | RTLD_GLOBAL;
+      #endregion
+
+      /////////////////////////////////////////////////////////////////////////
+
+      #region Private Data
+      /// <summary>
+      /// These are the characters used to separate the string fields within
+      /// the raw buffer returned by the <see cref="uname" /> P/Invoke method.
+      /// </summary>
+      private static readonly char[] utsNameSeparators = { '\0' };
+      #endregion
+
+      /////////////////////////////////////////////////////////////////////////
+
+      #region Private Methods
+      /// <summary>
+      /// This method is a wrapper around the <see cref="uname" /> P/Invoke
+      /// method that extracts and returns the human readable strings from
+      /// the raw buffer.
+      /// </summary>
+      /// <param name="utsName">
+      /// This structure, which contains strings, will be filled based on the
+      /// data placed in the raw buffer returned by the <see cref="uname" />
+      /// P/Invoke method.
+      /// </param>
+      /// <returns>
+      /// Non-zero upon success; otherwise, zero.
+      /// </returns>
+      internal static bool GetOsVersionInfo(
+          ref utsname utsName
+          )
+      {
+          try
+          {
+              utsname_interop utfNameInterop;
+
+              if (uname(out utfNameInterop) < 0)
+                  return false;
+
+              if (utfNameInterop.buffer == null)
+                  return false;
+
+              string bufferAsString = Encoding.UTF8.GetString(
+                  utfNameInterop.buffer);
+
+              if ((bufferAsString == null) || (utsNameSeparators == null))
+                  return false;
+
+              bufferAsString = bufferAsString.Trim(utsNameSeparators);
+
+              string[] parts = bufferAsString.Split(
+                  utsNameSeparators, StringSplitOptions.RemoveEmptyEntries);
+
+              if (parts == null)
+                  return false;
+
+              utsname localUtsName = new utsname();
+
+              if (parts.Length >= 1)
+                  localUtsName.sysname = parts[0];
+
+              if (parts.Length >= 2)
+                  localUtsName.nodename = parts[1];
+
+              if (parts.Length >= 3)
+                  localUtsName.release = parts[2];
+
+              if (parts.Length >= 4)
+                  localUtsName.version = parts[3];
+
+              if (parts.Length >= 5)
+                  localUtsName.machine = parts[4];
+
+              utsName = localUtsName;
+              return true;
+          }
+          catch
+          {
+              // do nothing.
+          }
+
+          return false;
+      }
+      #endregion
   }
 #endif
   #endregion
 
   /////////////////////////////////////////////////////////////////////////////
@@ -1018,29 +1348,34 @@
 #if !PLATFORM_COMPACTFRAMEWORK
       [DllImport("kernel32",
 #else
       [DllImport("coredll",
 #endif
- CallingConvention = CallingConvention.Winapi, CharSet = CharSet.Auto,
+          CallingConvention = CallingConvention.Winapi, CharSet = CharSet.Auto,
 #if !PLATFORM_COMPACTFRAMEWORK
           BestFitMapping = false, ThrowOnUnmappableChar = true,
 #endif
           SetLastError = true)]
       internal static extern IntPtr LoadLibrary(string fileName);
 
       /////////////////////////////////////////////////////////////////////////
 
-#if PLATFORM_COMPACTFRAMEWORK
       /// <summary>
       /// This is the P/Invoke method that wraps the native Win32 GetSystemInfo
       /// function.  See the MSDN documentation for full details on what it
       /// does.
       /// </summary>
       /// <param name="systemInfo">
       /// The system information structure to be filled in by the function.
       /// </param>
-      [DllImport("coredll", CallingConvention = CallingConvention.Winapi)]
+      ///
+#if !PLATFORM_COMPACTFRAMEWORK
+      [DllImport("kernel32",
+#else
+      [DllImport("coredll",
+#endif
+          CallingConvention = CallingConvention.Winapi)]
       internal static extern void GetSystemInfo(out SYSTEM_INFO systemInfo);
 
       /////////////////////////////////////////////////////////////////////////
       /// <summary>
       /// This enumeration contains the possible values for the processor
@@ -1073,18 +1408,21 @@
           public ProcessorArchitecture wProcessorArchitecture;
           public ushort wReserved; /* NOT USED */
           public uint dwPageSize; /* NOT USED */
           public IntPtr lpMinimumApplicationAddress; /* NOT USED */
           public IntPtr lpMaximumApplicationAddress; /* NOT USED */
+#if PLATFORM_COMPACTFRAMEWORK
           public uint dwActiveProcessorMask; /* NOT USED */
+#else
+          public IntPtr dwActiveProcessorMask; /* NOT USED */
+#endif
           public uint dwNumberOfProcessors; /* NOT USED */
           public uint dwProcessorType; /* NOT USED */
           public uint dwAllocationGranularity; /* NOT USED */
           public ushort wProcessorLevel; /* NOT USED */
           public ushort wProcessorRevision; /* NOT USED */
       }
-#endif
   }
   #endregion
 
   /////////////////////////////////////////////////////////////////////////////
 
@@ -1281,10 +1619,11 @@
                   //
                   // NOTE: Setup the list of platform names associated with
                   //       the supported processor architectures.
                   //
                   processorArchitecturePlatforms.Add("x86", "Win32");
+                  processorArchitecturePlatforms.Add("x86_64", "x64");
                   processorArchitecturePlatforms.Add("AMD64", "x64");
                   processorArchitecturePlatforms.Add("IA64", "Itanium");
                   processorArchitecturePlatforms.Add("ARM", "WinCE");
               }
 
@@ -1295,23 +1634,25 @@
               //
               if (_SQLiteNativeModuleHandle == IntPtr.Zero)
               {
                   string baseDirectory = null;
                   string processorArchitecture = null;
+                  bool allowBaseDirectoryOnly = false;
 
                   /* IGNORED */
                   SearchForDirectory(
-                      ref baseDirectory, ref processorArchitecture);
+                      ref baseDirectory, ref processorArchitecture,
+                      ref allowBaseDirectoryOnly);
 
                   //
                   // NOTE: Attempt to pre-load the SQLite core library (or
                   //       interop assembly) and store both the file name
                   //       and native module handle for later usage.
                   //
                   /* IGNORED */
-                  PreLoadSQLiteDll(
-                      baseDirectory, processorArchitecture,
+                  PreLoadSQLiteDll(baseDirectory,
+                      processorArchitecture, allowBaseDirectoryOnly,
                       ref _SQLiteNativeModuleFileName,
                       ref _SQLiteNativeModuleHandle);
               }
 #endif
 #endif
@@ -2346,18 +2687,24 @@
       /// </param>
       /// <param name="processorArchitecture">
       /// Upon success, this parameter will be modified to refer to the name
       /// of the immediate directory (i.e. the offset from the base directory)
       /// containing the native SQLite library.
+      /// </param>
+      /// <param name="allowBaseDirectoryOnly">
+      /// Upon success, this parameter will be modified to non-zero only if
+      /// the base directory itself should be allowed for loading the native
+      /// library.
       /// </param>
       /// <returns>
       /// Non-zero (success) if the native SQLite library was found; otherwise,
       /// zero (failure).
       /// </returns>
       private static bool SearchForDirectory(
-          ref string baseDirectory,        /* out */
-          ref string processorArchitecture /* out */
+          ref string baseDirectory,         /* out */
+          ref string processorArchitecture, /* out */
+          ref bool allowBaseDirectoryOnly   /* out */
           )
       {
           if (GetSettingValue(
                 "PreLoadSQLite_NoSearchForDirectory", null) != null)
           {
@@ -2383,13 +2730,24 @@
               GetAssemblyDirectory(),
 #if !PLATFORM_COMPACTFRAMEWORK
               AppDomain.CurrentDomain.BaseDirectory,
 #endif
           };
+
+          string extraSubDirectory = null;
+
+          if ((GetSettingValue(
+                  "PreLoadSQLite_AllowBaseDirectoryOnly", null) != null) ||
+              (HelperMethods.IsDotNetCore() && !HelperMethods.IsWindows()))
+          {
+              extraSubDirectory = String.Empty; /* .NET Core on POSIX */
+          }
 
           string[] subDirectories = {
-              GetProcessorArchitecture(), GetPlatformName(null)
+              GetProcessorArchitecture(), /* e.g. "x86" */
+              GetPlatformName(null),      /* e.g. "Win32" */
+              extraSubDirectory           /* base directory only? */
           };
 
           foreach (string directory in directories)
           {
               if (directory == null)
@@ -2428,10 +2786,12 @@
                       }
 #endif
 
                       baseDirectory = directory;
                       processorArchitecture = subDirectory;
+                      allowBaseDirectoryOnly = (subDirectory.Length == 0);
+
                       return true; /* FOUND */
                   }
               }
           }
 
@@ -2599,52 +2959,30 @@
               {
                   // do nothing.
               }
 #endif
           }
-#else
+#endif
+
+          /////////////////////////////////////////////////////////////////////
+
           if (processorArchitecture == null)
           {
               //
-              // NOTE: On the .NET Compact Framework, attempt to use the native
-              //       Win32 API function (via P/Invoke) that can provide us
-              //       with the processor architecture.
-              //
-              try
-              {
-                  //
-                  // NOTE: The output of the GetSystemInfo function will be
-                  //       placed here.  Only the processor architecture field
-                  //       is used by this method.
-                  //
-                  UnsafeNativeMethodsWin32.SYSTEM_INFO systemInfo;
-
-                  //
-                  // NOTE: Query the system information via P/Invoke, thus
-                  //       filling the structure.
-                  //
-                  UnsafeNativeMethodsWin32.GetSystemInfo(out systemInfo);
-
-                  //
-                  // NOTE: Return the processor architecture value as a string.
-                  //
-                  processorArchitecture =
-                      systemInfo.wProcessorArchitecture.ToString();
-              }
-              catch
-              {
-                  // do nothing.
-              }
-
-              //
-              // NOTE: Upon failure, return an empty string.  This will prevent
-              //       the calling method from considering this method call a
-              //       "failure".
-              //
-              processorArchitecture = String.Empty;
-          }
-#endif
+              // NOTE: Default to the processor architecture reported by the
+              //       appropriate native operating system API, if any.
+              //
+              processorArchitecture = NativeLibraryHelper.GetMachine();
+
+              //
+              // NOTE: Upon failure, return empty string.  This will prevent
+              //       the calling method from considering this method call
+              //       a "failure".
+              //
+              if (processorArchitecture == null)
+                  processorArchitecture = String.Empty;
+          }
 
           /////////////////////////////////////////////////////////////////////
 
           return processorArchitecture;
       }
@@ -2699,10 +3037,14 @@
       /// </param>
       /// <param name="processorArchitecture">
       /// The requested processor architecture, null for default (the
       /// processor architecture of the current process).  This caller should
       /// almost always specify null for this parameter.
+      /// </param>
+      /// <param name="allowBaseDirectoryOnly">
+      /// Non-zero indicates that the native SQLite library can be loaded
+      /// from the base directory itself.
       /// </param>
       /// <param name="nativeModuleFileName">
       /// The candidate native module file name to load will be stored here,
       /// if necessary.
       /// </param>
@@ -2716,10 +3058,11 @@
       /// zero.
       /// </returns>
       private static bool PreLoadSQLiteDll(
           string baseDirectory,            /* in */
           string processorArchitecture,    /* in */
+          bool allowBaseDirectoryOnly,     /* in */
           ref string nativeModuleFileName, /* out */
           ref IntPtr nativeModuleHandle    /* out */
           )
       {
           //
@@ -2744,17 +3087,33 @@
           if (fileNameOnly == null)
               return false;
 
           //
           // NOTE: If the native SQLite library exists in the base directory
-          //       itself, stop now.
+          //       itself, possibly stop now.
           //
           string fileName = FixUpDllFileName(MaybeCombinePath(baseDirectory,
               fileNameOnly));
 
           if (File.Exists(fileName))
-              return false;
+          {
+              //
+              // NOTE: If the caller is allowing the base directory itself
+              //       to be used, also make sure a processor architecture
+              //       was not specified; if either condition is false just
+              //       stop now and return failure.
+              //
+              if (allowBaseDirectoryOnly &&
+                  String.IsNullOrEmpty(processorArchitecture))
+              {
+                  goto baseDirOnly;
+              }
+              else
+              {
+                  return false;
+              }
+          }
 
           //
           // NOTE: If the specified processor architecture is null, use the
           //       default.
           //
@@ -2803,10 +3162,12 @@
               // NOTE: If the file does not exist, skip trying to load it.
               //
               if (!File.Exists(fileName))
                   return false;
           }
+
+      baseDirOnly:
 
           try
           {
 #if !NET_COMPACT_20 && TRACE_PRELOAD
               try

ADDED   Targets/SQLite.NET.NetStandard20.Settings.targets
Index: Targets/SQLite.NET.NetStandard20.Settings.targets
==================================================================
--- /dev/null
+++ Targets/SQLite.NET.NetStandard20.Settings.targets
@@ -0,0 +1,45 @@
+<!--
+ *
+ * SQLite.NET.NetStandard20.Settings.targets -
+ *
+ * Written by Joe Mistachkin.
+ * Released to the public domain, use at your own risk!
+ *
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+  ******************************************************************************
+  **               .NET Standard 2.0 Specific Settings (Common)               **
+  ******************************************************************************
+  -->
+
+  <PropertyGroup>
+    <!--
+        TODO: This list of properties must be kept synchronized with the common
+              list in the "build_net_standard_20.bat" file.
+    -->
+    <ConfigurationSuffix Condition="'$(ConfigurationSuffix)' == ''">NetStandard20</ConfigurationSuffix>
+    <InteropCodec Condition="'$(InteropCodec)' == ''">false</InteropCodec>
+    <InteropLog Condition="'$(InteropLog)' == ''">false</InteropLog>
+  </PropertyGroup>
+
+  <!--
+  ******************************************************************************
+  **               .NET Standard 2.0 Specific Settings (Debug)                **
+  ******************************************************************************
+  -->
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <!--
+        TODO: This list of properties must be kept synchronized with the debug
+              list in the "build_net_standard_20.bat" file.
+    -->
+    <CheckState Condition="'$(CheckState)' == ''">true</CheckState>
+    <CountHandle Condition="'$(CountHandle)' == ''">true</CountHandle>
+    <TraceConnection Condition="'$(TraceConnection)' == ''">true</TraceConnection>
+    <TraceDetection Condition="'$(TraceDetection)' == ''">true</TraceDetection>
+    <TraceHandle Condition="'$(TraceHandle)' == ''">true</TraceHandle>
+    <TraceStatement Condition="'$(TraceStatement)' == ''">true</TraceStatement>
+    <TrackMemoryBytes Condition="'$(TrackMemoryBytes)' == ''">true</TrackMemoryBytes>
+  </PropertyGroup>
+</Project>

Index: Targets/SQLite.NET.Settings.targets
==================================================================
--- Targets/SQLite.NET.Settings.targets
+++ Targets/SQLite.NET.Settings.targets
@@ -417,10 +417,15 @@
     <!--
         NOTE: Is the project being built to support the .NET Compact Framework?
     -->
     <IsCompactFramework Condition="'$(IsCompactFramework)' == ''">false</IsCompactFramework>
 
+    <!--
+        NOTE: Is the project being built to support .NET Standard 2.0?
+    -->
+    <IsDotNetStandard Condition="'$(IsDotNetStandard)' == ''">false</IsDotNetStandard>
+
     <!--
         NOTE: Emit an AssemblyFlags attribute that includes the Retargetable
               flag from the AssemblyNameFlags enumeration?
     -->
     <IsRetargetable Condition="'$(IsRetargetable)' == ''">false</IsRetargetable>
@@ -860,11 +865,11 @@
   ******************************************************************************
   **                         Relative Path Properties                         **
   ******************************************************************************
   -->
 
-  <PropertyGroup Condition="'$(SQLiteNetDir)' != ''">
+  <PropertyGroup Condition="'$(SQLiteNetDir)' != '' And '$(IsDotNetStandard)' == 'false'">
     <!--
         NOTE: Keep all the intermediate files in one place.  The Visual Studio
               IDE seems to have a nasty habit of ignoring this setting.  The
               Visual Studio IDE then fails to build the project(s) properly when
               the output does not end up where it expects the output to be.  The

Index: Targets/SQLite.NET.targets
==================================================================
--- Targets/SQLite.NET.targets
+++ Targets/SQLite.NET.targets
@@ -257,10 +257,67 @@
 
     <Exec Condition="'$(DoesMachineMatchPlatform)' != 'false'"
           Command="XCOPY &quot;$(OutDir)$(TargetName).*&quot; &quot;$(OutDir)..\..\$(BaseConfiguration)\bin\&quot; /D /E /V /I /F /H /Y" />
   </Target>
 
+  <!--
+  ******************************************************************************
+  -->
+
+  <Target Name="DetectBuildTool"
+          Condition="'$(DetectBuildTool)' != 'false' And
+                     '$(MSBuildBinPath)' != '' And
+                     !HasTrailingSlash('$(MSBuildBinPath)')">
+    <CreateProperty Condition="Exists('$(MSBuildBinPath)\MSBuild.exe')"
+                    Value="MSBuild">
+      <Output TaskParameter="Value" PropertyName="BuildTool" />
+    </CreateProperty>
+
+    <CreateProperty Condition="Exists('$(MSBuildBinPath)\xbuild.exe')"
+                    Value="XBuild">
+      <Output TaskParameter="Value" PropertyName="BuildTool" />
+    </CreateProperty>
+
+    <CreateProperty Condition="Exists('$(MSBuildBinPath)\MSBuild.dll')"
+                    Value="DotNetCore">
+      <Output TaskParameter="Value" PropertyName="BuildTool" />
+    </CreateProperty>
+
+    <CreateProperty Condition="!Exists('$(MSBuildBinPath)\MSBuild.exe') And
+                               !Exists('$(MSBuildBinPath)\xbuild.exe') And
+                               !Exists('$(MSBuildBinPath)\MSBuild.dll')"
+                    Value="Unknown">
+      <Output TaskParameter="Value" PropertyName="BuildTool" />
+    </CreateProperty>
+  </Target>
+
+  <!--
+  ******************************************************************************
+  -->
+
+  <Target Name="DetectOperatingSystem"
+          Condition="'$(DetectOperatingSystem)' != 'false'">
+    <CreateProperty Condition="'$(OS)' == 'Windows_NT'" Value="Windows">
+      <Output TaskParameter="Value" PropertyName="OperatingSystem" />
+    </CreateProperty>
+
+    <CreateProperty Condition="'$(OS)' == 'Unix'" Value="Unix">
+      <Output TaskParameter="Value" PropertyName="OperatingSystem" />
+    </CreateProperty>
+
+    <CreateProperty Condition="'$(OS)' == 'OSX'" Value="MacOSX">
+      <Output TaskParameter="Value" PropertyName="OperatingSystem" />
+    </CreateProperty>
+
+    <CreateProperty Condition="'$(OS)' != 'Windows_NT' And
+                               '$(OS)' != 'Unix' And
+                               '$(OS)' != 'OSX'"
+                    Value="Unknown">
+      <Output TaskParameter="Value" PropertyName="OperatingSystem" />
+    </CreateProperty>
+  </Target>
+
   <!--
   ******************************************************************************
   **                        Visual Studio 2017 Targets                        **
   ******************************************************************************
   -->

Index: Tests/basic.eagle
==================================================================
--- Tests/basic.eagle
+++ Tests/basic.eagle
@@ -1810,12 +1810,10 @@
       if {$::found(temp)} then {
         return
       }
     }
   }
-
-  object import System.Threading
 } -body {
   set result [list]
 
   #
   # NOTE: Attempt to modify the process-wide data and temporary directory
@@ -1839,12 +1837,12 @@
   }
 
   set found(data) [expr \
       {[llength [file list $directory(data) $fileName]] == 1}]
 
-  set t [object create -alias Thread threadStart]
-  sql execute $db "BEGIN TRANSACTION;"; $t Start
+  set t [createThread threadStart]
+  sql execute $db "BEGIN TRANSACTION;"; startThread $t
 
   for {set i 1} {$i < 1000} {incr i} {
     #
     # NOTE: Execute a query that should force the creation of a temporary file
     #       for its statement journal.
@@ -1902,12 +1900,10 @@
       [file exists $directory(temp)] && \
       [file isdirectory $directory(temp)]} then {
     file delete -recursive -force $directory(temp)
   }
 
-  object unimport -importpattern System.Threading
-
   if {[info exists t] && [cleanupThread $t]} then {
     unset t
   }
 
   catch {object removecallback threadStart}
@@ -3842,14 +3838,14 @@
   rename myFuncInvokeCallback ""
   rename myFuncCallback ""
   rename hashManagedArray ""
   rename getHashCode ""
   rename getMyFuncArgs ""
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite} -match regexp -result {^0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 \{1\
-2 3 A a M m Z z\} True 1 True 1 True 1 True 1 True 1 True 1 True 1 True 1\
-\{(?:-)?\d+ (?:-)?\d+\}$}}
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA\
+compile.EMIT SQLite System.Data.SQLite} -match regexp -result {^0 -1 0 -1 0 -1\
+0 -1 0 -1 0 -1 0 \{1 2 3 A a M m Z z\} True 1 True 1 True 1 True 1 True 1 True\
+1 True 1 True 1 \{(?:-)?\d+ (?:-)?\d+\}$}}
 
 ###############################################################################
 
 runTest {test data-1.75 {SQLiteCommand.Reset method} -setup {
   setupDb [set fileName data-1.75.db]

Index: Tests/memory.eagle
==================================================================
--- Tests/memory.eagle
+++ Tests/memory.eagle
@@ -44,10 +44,14 @@
 getSQLiteHandleCounts $test_channel
 reportSQLiteResources $test_channel
 
 ###############################################################################
 
+#
+# NOTE: This test is disabled for .NET Core due to its lack of support for
+#       performance counters.
+#
 runTest {test memory-1.1 {SQLiteDataReader memory testing} -setup {
   setupMemoryCounters counter
   reportMemoryCounters $test_channel counter initial
 
   setupDb [set fileName $test_repository_file] \
@@ -123,14 +127,13 @@
   unset -nocomplain dataReader connection
 
   cleanupDb $fileName db true false false
 
   unset -nocomplain working sql counter db fileName
-} -constraints \
-{eagle command.object windows monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite fossil_repository_file variable_test_repository_file} \
--result {}}
+} -constraints [fixConstraints {eagle command.object !dotNetCore windows\
+monoBug28 command.sql compile.DATA SQLite System.Data.SQLite\
+fossil_repository_file variable_test_repository_file}] -result {}}
 
 ###############################################################################
 
 #
 # NOTE: Report after test.

Index: Tests/session.eagle
==================================================================
--- Tests/session.eagle
+++ Tests/session.eagle
@@ -860,12 +860,12 @@
       catch {object dispose $callbackResult}
     }
   }
 
   unset -nocomplain callbackResult callbackResults db fileName
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite SQLiteInterop\
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA\
+compile.EMIT SQLite System.Data.SQLite SQLiteInterop\
 defineConstant.System.Data.SQLite.INTEROP_SESSION_EXTENSION} -result {IsEmpty\
 True MatchT2 false IsEmpty False MatchT1 true IsEmpty False MatchT2 true\
 IsEmpty False MatchT1 true}}
 
 ###############################################################################
@@ -926,12 +926,12 @@
       catch {object dispose $callbackResult}
     }
   }
 
   unset -nocomplain callbackResult callbackResults db fileName
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite SQLiteInterop\
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA\
+compile.EMIT SQLite System.Data.SQLite SQLiteInterop\
 defineConstant.System.Data.SQLite.INTEROP_SESSION_EXTENSION} -result \
 {{{TableName t1 NumberOfColumns 2 OperationCode Delete Indirect False\
 PrimaryKeyColumns {[True, False]} OldValue 0 1 NewValue 0 <nullObject>\
 ConflictValue 0 <nullObject> OldValue 1 {"inserted: Alpha Bravo Charlie Delta\
 Echo"} NewValue 1 <nullObject> ConflictValue 1 <nullObject>} {TableName t1\
@@ -1009,12 +1009,12 @@
       catch {object dispose $callbackResult}
     }
   }
 
   unset -nocomplain callbackResult callbackResults db fileName
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite SQLiteInterop\
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA\
+compile.EMIT SQLite System.Data.SQLite SQLiteInterop\
 defineConstant.System.Data.SQLite.INTEROP_SESSION_EXTENSION} -result \
 {{{TableName t1 NumberOfColumns 2 OperationCode Delete Indirect False\
 PrimaryKeyColumns {[True, False]} OldValue 0 1 NewValue 0 <nullObject>\
 ConflictValue 0 <nullObject> OldValue 1 {"inserted: Alpha Bravo Charlie Delta\
 Echo"} NewValue 1 <nullObject> ConflictValue 1 <nullObject>} {TableName t1\
@@ -1083,12 +1083,12 @@
       catch {object dispose $callbackResult}
     }
   }
 
   unset -nocomplain callbackResult callbackResults db fileName
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite SQLiteInterop\
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA\
+compile.EMIT SQLite System.Data.SQLite SQLiteInterop\
 defineConstant.System.Data.SQLite.INTEROP_SESSION_EXTENSION} -result \
 {{{TableName t1 NumberOfColumns 2 OperationCode Delete Indirect False\
 PrimaryKeyColumns {[True, False]} OldValue 0 1 NewValue 0 <nullObject>\
 ConflictValue 0 <nullObject> OldValue 1 <nullObject> NewValue 1 <nullObject>\
 ConflictValue 1 <nullObject>} {TableName t1 NumberOfColumns 2 OperationCode\
@@ -1166,12 +1166,12 @@
       catch {object dispose $callbackResult}
     }
   }
 
   unset -nocomplain callbackResult callbackResults db fileName
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite SQLiteInterop\
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA\
+compile.EMIT SQLite System.Data.SQLite SQLiteInterop\
 defineConstant.System.Data.SQLite.INTEROP_SESSION_EXTENSION} -result \
 {{{TableName t1 NumberOfColumns 2 OperationCode Delete Indirect False\
 PrimaryKeyColumns {[True, False]} OldValue 0 1 NewValue 0 <nullObject>\
 ConflictValue 0 <nullObject> OldValue 1 <nullObject> NewValue 1 <nullObject>\
 ConflictValue 1 <nullObject>} {TableName t1 NumberOfColumns 2 OperationCode\
@@ -1269,12 +1269,12 @@
       catch {object dispose $callbackResult}
     }
   }
 
   unset -nocomplain callbackResult callbackResults db fileName
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite SQLiteInterop\
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA\
+compile.EMIT SQLite System.Data.SQLite SQLiteInterop\
 defineConstant.System.Data.SQLite.INTEROP_SESSION_EXTENSION} -result \
 {06631bf3545dba83b25db5142afc4d229544ed55}}
 
 ###############################################################################
 

Index: Tests/speed.eagle
==================================================================
--- Tests/speed.eagle
+++ Tests/speed.eagle
@@ -113,12 +113,14 @@
   cleanupDb $fileName
 
   unset -nocomplain time sql result char db fileName
 } -time true -constraints {eagle monoBug28 command.sql compile.DATA SQLite\
 System.Data.SQLite} -match regexp -result "^\\\{-9223372036854775808 0\
-9223372036854775807\\\} \\\{-(?:Infinity|\u221E) 0 (?:Infinity|\u221E)\\\}\
-\\\{1 1\\.1 1048576\\\} \\\{1 \\\{1 35 69 103 137\\\} 1048576\\\}$"}
+9223372036854775807\\\}\
+\\\{-(?:Infinity|\u221E|1\\.7976931348623157(?:E|e)\\+308) 0\
+(?:Infinity|\u221E|1\\.7976931348623157(?:E|e)\\+308)\\\} \\\{1 1\\.1\
+1048576\\\} \\\{1 \\\{1 35 69 103 137\\\} 1048576\\\}$"}
 
 ###############################################################################
 
 runTest {test speed-1.2 {SQLiteDataReader speed testing} -setup {
   setupDb [set fileName [appendArgs speed-1.2- [pid] .db]]

Index: Tests/stress.eagle
==================================================================
--- Tests/stress.eagle
+++ Tests/stress.eagle
@@ -281,11 +281,16 @@
   }
 
   #############################################################################
 
   proc useMem { ptr size } {
-    if {[isWindows] && ![isMono]} then {
+    #
+    # NOTE: This procedure does nothing on non-Windows operating systems.  It
+    #       also does nothing when running on Mono or .NET Core, due to their
+    #       lack of the (internal, undocumented) ZeroMemory method.
+    #
+    if {[isWindows] && ![isMono] && ![isDotNetCore]} then {
       #
       # HACK: The type signature of the ZeroMemory method changed as of the
       #       .NET Framework 4.5.  The second argument went from being of
       #       type UInt to type UIntPtr.
       #
@@ -356,13 +361,15 @@
     }
 
     #
     # NOTE: Copy the trace listener log file to the main test log file.
     #
-    tlog "---- BEGIN TRACE LISTENER OUTPUT\n"
-    tlog [readFile $fileName]
-    tlog "\n---- END TRACE LISTENER OUTPUT\n"
+    if {[file exists $fileName]} then {
+      tlog "---- BEGIN TRACE LISTENER OUTPUT\n"
+      tlog [readFile $fileName]
+      tlog "\n---- END TRACE LISTENER OUTPUT\n"
+    }
 
     #
     # NOTE: Delete the trace listener log file because its contents have
     #       been copied to the main test log file.
     #
@@ -1674,15 +1681,16 @@
     sql execute $srcDb "CREATE INDEX IF NOT EXISTS i1 ON t1(y);"
     sql execute $db "CREATE INDEX IF NOT EXISTS i1 ON t1(y);"
 
     foreach index(1) [lsort -integer $workloadNames(enabled)] {
       set workloadCallbacks($index(1)) [list \
-          apply $workload($index(1)) $fileName(1) $fileName(2) t1 $count(1) \
-          $count(3) $count(4) $count(5) $count(6) $count(7) $count(8)]
+          apply $workload($index(1)) $fileName(1) $fileName(2) t1 \
+          $count(1) $count(3) $count(4) $count(5) $count(6) $count(7) \
+          $count(8)]
 
-      set thread($index(1)) [object create -alias System.Threading.Thread \
-          $workloadCallbacks($index(1)) 1048576]
+      set thread($index(1)) [createThread $workloadCallbacks($index(1)) \
+          false 1048576]
 
       $thread($index(1)) Name [appendArgs \
           [file rootname [file tail $fileName(2)]] " #" $index(1)]
 
       if {[info exists priority($index(1))]} then {
@@ -1689,11 +1697,11 @@
         $thread($index(1)) Priority $priority($index(1))
       }
     }
 
     foreach index(1) [array names thread] {
-      $thread($index(1)) Start
+      startThread $thread($index(1))
     }
 
     $event Set; # GO
 
     foreach index(1) [array names thread] {

Index: Tests/thread.eagle
==================================================================
--- Tests/thread.eagle
+++ Tests/thread.eagle
@@ -63,10 +63,15 @@
   set count(4) 1000
 }
 
 ###############################################################################
 
+#
+# NOTE: This test is disabled for .NET Core due to its lack of support for
+#       the Thread.Abort method (i.e. throws PlatformNotSupportedException
+#       when called).
+#
 runTest {test thread-1.1 {Thread.Abort() impact on native resources} -setup {
   setupDb [set fileName thread-1.1.db]
 
   tputs $test_channel [appendArgs \
       "---- using " $count(1) " test threads (with one master thread)\n"]
@@ -456,15 +461,15 @@
       [reportSQLiteResources $test_channel]
 } -cleanup {
   cleanupDb $fileName
 
   unset -nocomplain result results errors code sql dataSource id db fileName
-} -time true -constraints {eagle command.object monoBug28 monoCrash211\
-monoCrash42 monoBug46 command.sql compile.DATA SQLite System.Data.SQLite\
-compileCSharp} -match regexp -result [appendArgs "^Ok\
-System#CodeDom#Compiler#CompilerResults#\\d+ \\{\\} 0 \\{\\d+ \\d+ " $count(1) \
-"\\} \\{\\} \\{" $handle_counts "\\} " $memory_used \$]}
+} -time true -constraints [fixConstraints {eagle command.object monoBug28\
+monoCrash211 monoCrash42 monoBug46 command.sql compile.DATA SQLite\
+System.Data.SQLite compileCSharp !dotNetCore}] -match regexp -result \
+[appendArgs "^Ok System#CodeDom#Compiler#CompilerResults#\\d+ \\{\\} 0 \\{\\d+\
+\\d+ " $count(1) "\\} \\{\\} \\{" $handle_counts "\\} " $memory_used \$]}
 
 ###############################################################################
 
 unset -nocomplain count
 

Index: Tests/tkt-0e48e80333.eagle
==================================================================
--- Tests/tkt-0e48e80333.eagle
+++ Tests/tkt-0e48e80333.eagle
@@ -119,10 +119,15 @@
 } -constraints {eagle dotNet testExec command.object monoBug28 command.sql\
 compile.DATA SQLite System.Data.SQLite} -result {0}}
 
 ###############################################################################
 
+#
+# HACK: This test is non-portable (e.g. to Mono) due to its use of Managed
+#       Debugging Assistants (MDAs), which are only implemented by the full
+#       .NET Framework.
+#
 runTest {test tkt-0e48e80333-1.2 {delegate MDA on pooled close} -setup {
   moveEagleShellMdaConfig false
 
   saveEagleShellEnvironment
   saveMdaConfigEnvironment
@@ -311,13 +316,13 @@
 
   restoreMdaConfigEnvironment
   restoreEagleShellEnvironment
 
   moveEagleShellMdaConfig true
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite compileCSharp} -match regexp -result {^0 \{Ok\
+} -constraints {eagle dotNet command.object monoBug28 command.sql compile.DATA\
+SQLite System.Data.SQLite compileCSharp} -match regexp -result {^0 \{Ok\
 System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\} 0 \d+\}$}}
 
 ###############################################################################
 
 runSQLiteTestEpilogue
 runTestEpilogue

Index: Tests/tkt-5cee5409f8.eagle
==================================================================
--- Tests/tkt-5cee5409f8.eagle
+++ Tests/tkt-5cee5409f8.eagle
@@ -18,10 +18,14 @@
 package require System.Data.SQLite.Test
 runSQLiteTestPrologue
 
 ###############################################################################
 
+#
+# NOTE: This test is disabled for .NET Core due to its lack of support for
+#       distributed transactions.
+#
 runTest {test tkt-5cee5409f8-1.1 {asynchronous transaction handling} -setup {
   setupDb [set fileName tkt-5cee5409f8-1.1.db]
 } -body {
   sql execute $db "CREATE TABLE t1(x INTEGER);"
 
@@ -207,13 +211,14 @@
       [expr {[lindex $result 1] > 0}]
 } -cleanup {
   cleanupDb $fileName
 
   unset -nocomplain result results errors code dataSource id db fileName
-} -constraints {eagle command.object monoBug211 monoBug510 command.sql\
-compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \
-{^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 True True$}}
+} -constraints [fixConstraints {eagle command.object monoBug211 monoBug510\
+command.sql compile.DATA SQLite System.Data.SQLite compileCSharp !dotNetCore}] \
+-match regexp -result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0\
+True True$}}
 
 ###############################################################################
 
 runSQLiteTestEpilogue
 runTestEpilogue

Index: Tests/tkt-84718e79fa.eagle
==================================================================
--- Tests/tkt-84718e79fa.eagle
+++ Tests/tkt-84718e79fa.eagle
@@ -28,25 +28,23 @@
   proc threadStart { args } {
     lappend ::results [sql execute -execute reader -format list $::db \
         "SELECT x FROM t1;"]
   }
 
-  object import System.Threading
-
   setupDb [set fileName tkt-84718e79fa-1.1.db]
 } -body {
   sql execute $db "CREATE TABLE t1(x INTEGER PRIMARY KEY ASC);"
   sql execute $db "INSERT INTO t1 (x) VALUES(1);"
 
   for {set i 0} {$i < $c} {incr i} {
-    set t($i) [object create -alias Thread threadStart 1048576]
+    set t($i) [createThread threadStart false 1048576]
   }
 
   set results [list]
 
   for {set i 0} {$i < $c} {incr i} {
-    $t($i) Start
+    startThread $t($i)
   }
 
   after 4000; # wait for other threads to do something...
 
   for {set i 0} {$i < $c} {incr i} {
@@ -55,12 +53,10 @@
 
   set results
 } -cleanup {
   cleanupDb $fileName
 
-  object unimport -importpattern System.Threading
-
   for {set i 0} {$i < $c} {incr i} {
     if {[info exists t($i)] && [cleanupThread $t($i)]} then {
       unset t($i)
     }
   }
@@ -68,16 +64,16 @@
   catch {object removecallback threadStart}
 
   unset -nocomplain results t i c db fileName
 
   rename threadStart ""
-} -constraints {eagle command.object shell monoBug28 command.sql compile.DATA\
-SQLite System.Data.SQLite} -result [lrepeat $c 1]}
+} -constraints {eagle command.object dotNetCoreOrShell monoBug28 command.sql\
+compile.DATA SQLite System.Data.SQLite} -result [lrepeat $c 1]}
 
 ###############################################################################
 
 unset -nocomplain c
 
 ###############################################################################
 
 runSQLiteTestEpilogue
 runTestEpilogue

Index: Tests/types.eagle
==================================================================
--- Tests/types.eagle
+++ Tests/types.eagle
@@ -340,11 +340,11 @@
 
     unset -nocomplain buffer typeCallbacks callback value list
     unset -nocomplain result connection db fileName
     unset -nocomplain typeName methodName isArray
   } -constraints {eagle command.object monoBug28 command.sql compile.DATA\
-SQLite System.Data.SQLite} -result $expectedResult}
+compile.EMIT SQLite System.Data.SQLite} -result $expectedResult}
 
   rename readValueCallback2 ""
 }
 
 ###############################################################################
@@ -356,11 +356,11 @@
 unset -nocomplain savedDateTimeKind
 
 ###############################################################################
 
 unset -nocomplain i readArgs params typeName methodName isArray propertyName \
-    isRequired expectedResults expectedResult
+    isRequired value expectedResults expectedResult
 
 ###############################################################################
 
 runTest {test types-3.1 {bind callback (incomplete)} -setup {
   unset -nocomplain log
@@ -401,14 +401,14 @@
   freeDbConnection
 
   cleanupDb $fileName
 
   unset -nocomplain result typeCallbacks callback log connection db fileName
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite} -result {{{convert true} {command true} {flags\
-{UseConnectionBindValueCallbacks, UseParameterNameForTypeName}} {parameter\
-true} {typeName Special} {index 1} {userData 0}} 1234}}
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA\
+compile.EMIT SQLite System.Data.SQLite} -result {{{convert true} {command true}\
+{flags {UseConnectionBindValueCallbacks, UseParameterNameForTypeName}}\
+{parameter true} {typeName Special} {index 1} {userData 0}} 1234}}
 
 ###############################################################################
 
 runTest {test types-3.2 {bind callback (complete)} -setup {
   unset -nocomplain log
@@ -449,14 +449,14 @@
   freeDbConnection
 
   cleanupDb $fileName
 
   unset -nocomplain result typeCallbacks callback log connection db fileName
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite} -result {{{convert true} {command true} {flags\
-{UseConnectionBindValueCallbacks, UseParameterNameForTypeName}} {parameter\
-true} {typeName Special} {index 1} {userData 1}} {}}}
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA\
+compile.EMIT SQLite System.Data.SQLite} -result {{{convert true} {command true}\
+{flags {UseConnectionBindValueCallbacks, UseParameterNameForTypeName}}\
+{parameter true} {typeName Special} {index 1} {userData 1}} {}}}
 
 ###############################################################################
 
 runTest {test types-3.3 {bind callback (modify/incomplete)} -setup {
   unset -nocomplain log
@@ -497,14 +497,14 @@
   freeDbConnection
 
   cleanupDb $fileName
 
   unset -nocomplain result typeCallbacks callback log connection db fileName
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite} -result {{{convert true} {command true} {flags\
-{UseConnectionBindValueCallbacks, UseParameterNameForTypeName}} {parameter\
-true} {typeName Special} {index 1} {userData 2}} custom}}
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA\
+compile.EMIT SQLite System.Data.SQLite} -result {{{convert true} {command true}\
+{flags {UseConnectionBindValueCallbacks, UseParameterNameForTypeName}}\
+{parameter true} {typeName Special} {index 1} {userData 2}} custom}}
 
 ###############################################################################
 
 runTest {test types-4.1 {read callback (exception)} -setup {
   unset -nocomplain log
@@ -549,14 +549,14 @@
 
   cleanupDb $fileName
 
   unset -nocomplain error result typeCallbacks callback log connection db \
       fileName
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite} -result {1 {reading of value canceled} 0 1 {{convert true}\
-{dataReader true} {flags UseConnectionReadValueCallbacks} {eventArgs true}\
-{typeName SPECIAL} {index 0} {userData 3}}}}
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA\
+compile.EMIT SQLite System.Data.SQLite} -result {1 {reading of value canceled}\
+0 1 {{convert true} {dataReader true} {flags UseConnectionReadValueCallbacks}\
+{eventArgs true} {typeName SPECIAL} {index 0} {userData 3}}}}
 
 ###############################################################################
 
 runTest {test types-5.1 {bind callback (exception)} -setup {
   unset -nocomplain log
@@ -599,14 +599,14 @@
   freeDbConnection
 
   cleanupDb $fileName
 
   unset -nocomplain result typeCallbacks callback log connection db fileName
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite} -result {{{convert true} {command true} {flags\
-{UseConnectionBindValueCallbacks, UseParameterNameForTypeName}} {parameter\
-true} {typeName Special} {index 1} {userData 3}} {}}}
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA\
+compile.EMIT SQLite System.Data.SQLite} -result {{{convert true} {command true}\
+{flags {UseConnectionBindValueCallbacks, UseParameterNameForTypeName}}\
+{parameter true} {typeName Special} {index 1} {userData 3}} {}}}
 
 ###############################################################################
 
 catch {eval object dispose [info objects System#Boolean#*]}
 

Index: data/exclude_bin.txt
==================================================================
--- data/exclude_bin.txt
+++ data/exclude_bin.txt
@@ -1,8 +1,9 @@
 *.done
 *.exp
 *.ilk
+*.json
 *.lib
 *.manifest
 *.map
 *.mda.config
 *.netmodule

Index: data/exclude_full_src.txt
==================================================================
--- data/exclude_full_src.txt
+++ data/exclude_full_src.txt
@@ -11,15 +11,20 @@
 *.zip
 .fossil-settings/*
 _FOSSIL_
 bin/*
 Doc/Output/*
-Externals/Eagle/bin/EntityFramework.*
-Externals/Eagle/bin/SQLite.Interop.*
-Externals/Eagle/bin/sqlite3.*
-Externals/Eagle/bin/System.*
-Externals/Eagle/bin/Win32/*
+Externals/Eagle/bin/netFramework40/EntityFramework.*
+Externals/Eagle/bin/netFramework40/SQLite.Interop.*
+Externals/Eagle/bin/netFramework40/sqlite3.*
+Externals/Eagle/bin/netFramework40/System.*
+Externals/Eagle/bin/netFramework40/Win32/*
+Externals/Eagle/bin/netStandard20/EntityFramework.*
+Externals/Eagle/bin/netStandard20/SQLite.Interop.*
+Externals/Eagle/bin/netStandard20/sqlite3.*
+Externals/Eagle/bin/netStandard20/System.*
+Externals/Eagle/bin/netStandard20/Win32/*
 Externals/EntityFramework/*
 Externals/HtmlHelp/*
 Externals/MSVCPP/*
 Externals/NDoc3/*
 obj/*

Index: data/exclude_src.txt
==================================================================
--- data/exclude_src.txt
+++ data/exclude_src.txt
@@ -11,20 +11,28 @@
 *.zip
 .fossil-settings/*
 _FOSSIL_
 bin/*
 Doc/Output/*
-Externals/Eagle/bin/Eagle.dll
-Externals/Eagle/bin/EagleShell.exe
-Externals/Eagle/bin/EagleShell32.exe
-Externals/Eagle/bin/EntityFramework.*
-Externals/Eagle/bin/SQLite.Interop.*
-Externals/Eagle/bin/sqlite3.*
-Externals/Eagle/bin/System.*
-Externals/Eagle/bin/Win32/*
-Externals/Eagle/bin/x64/*
-Externals/Eagle/bin/x86/*
+Externals/Eagle/bin/netFramework40/Eagle.dll
+Externals/Eagle/bin/netFramework40/EagleShell.exe
+Externals/Eagle/bin/netFramework40/EagleShell32.exe
+Externals/Eagle/bin/netFramework40/EntityFramework.*
+Externals/Eagle/bin/netFramework40/SQLite.Interop.*
+Externals/Eagle/bin/netFramework40/sqlite3.*
+Externals/Eagle/bin/netFramework40/System.*
+Externals/Eagle/bin/netFramework40/Win32/*
+Externals/Eagle/bin/netFramework40/x64/*
+Externals/Eagle/bin/netFramework40/x86/*
+Externals/Eagle/bin/netStandard20/Eagle.dll
+Externals/Eagle/bin/netStandard20/EagleShell.dll
+Externals/Eagle/bin/netStandard20/EagleShell.runtimeconfig.json
+Externals/Eagle/bin/netStandard20/EntityFramework.*
+Externals/Eagle/bin/netStandard20/SQLite.Interop.*
+Externals/Eagle/bin/netStandard20/sqlite3.*
+Externals/Eagle/bin/netStandard20/System.*
+Externals/Eagle/bin/netStandard20/Win32/*
 Externals/Eagle/lib/Eagle1.0/auxiliary.eagle
 Externals/Eagle/lib/Eagle1.0/compat.eagle
 Externals/Eagle/lib/Eagle1.0/csharp.eagle
 Externals/Eagle/lib/Eagle1.0/database.eagle
 Externals/Eagle/lib/Eagle1.0/embed.eagle
@@ -54,10 +62,11 @@
 Externals/Eagle/lib/Test1.0/*
 Externals/EntityFramework/*
 Externals/HtmlHelp/*
 Externals/MSVCPP/*
 Externals/NDoc3/*
+Externals/ResGen/*
 Externals/vswhere/*
 obj/*
 Setup/Output/*
 Setup/set_user_*.bat
 SQLite.Designer/obj/*

Index: lib/System.Data.SQLite/common.eagle
==================================================================
--- lib/System.Data.SQLite/common.eagle
+++ lib/System.Data.SQLite/common.eagle
@@ -146,10 +146,27 @@
           }
         }
       }
     }
 
+    proc getBuildNativeYear {} {
+      if {[info exists ::test_native_year] && \
+          [string length $::test_native_year] > 0} then {
+        #
+        # NOTE: Use the specified test year for native binaries.  If this
+        #       variable is not set, the value returned by [getBuildYear]
+        #       will be used.
+        #
+        return $::test_native_year
+      } else {
+        #
+        # NOTE: Fallback on the (normal) build year for managed binaries.
+        #
+        return [getBuildYear]
+      }
+    }
+
     #
     # NOTE: This procedure is only used when adding shimmed test constraints.
     #
     proc getBuildClrVersion {} {
       if {[info exists ::test_clr] && [string length $::test_clr] > 0} then {
@@ -211,11 +228,11 @@
         return $::test_years
       } else {
         #
         # NOTE: Use the default list of test years (i.e. all).
         #
-        return [list 2005 2008 2010 2012 2013 2015 2017]
+        return [list 2005 2008 2010 2012 2013 2015 2017 NetStandard20]
       }
     }
 
     proc getBuildNetFx {} {
       #
@@ -265,10 +282,13 @@
               return netFx46; # TODO: Or "netFx461" / "netFx462"?
             }
             2017 {
               return netFx47; # TODO: Or "netFx471"?
             }
+            NetStandard20 {
+              return netStandard20
+            }
             default {
               return netFx35; # TODO: Good "fallback" default?
             }
           }
         }
@@ -391,10 +411,57 @@
         # NOTE: Use the default list of test configurations.
         #
         return [list Debug Release]
       }
     }
+
+    proc getBuildExtra {} {
+      if {[info exists ::test_extra] && \
+          [string length $::test_extra] > 0} then {
+        #
+        # NOTE: Use the specified extra output directory.
+        #
+        return $::test_extra
+      } elseif {[isDotNetCore]} then {
+        #
+        # NOTE: Running on .NET Core, use the extra output directory for
+        #       library files.
+        #
+        return netstandard2.0
+      } else {
+        #
+        # NOTE: No extra output directory is required.
+        #
+        return ""
+      }
+    }
+
+    proc getBuildExtras {} {
+      #
+      # NOTE: See if the list of extra output directories has been overridden
+      #       by the user (e.g. on the command line).
+      #
+      if {[info exists ::test_extras] && \
+          [llength $::test_extras] > 0} then {
+        #
+        # NOTE: Use the specified list of extra output directories.
+        #
+        return $::test_extras
+      } elseif {[isDotNetCore]} then {
+        #
+        # NOTE: Running on .NET Core, prioritize its extra output directory
+        #       for library files.
+        #
+        return [list netstandard2.0 ""]
+      } else {
+        #
+        # NOTE: Use default list of extra output directories, which is one
+        #       empty string (no-op).
+        #
+        return [list ""]
+      }
+    }
 
     proc getBuildBaseDirectory {} {
       #
       # NOTE: Figure out the base directory where all the builds should be
       #       located.  This will be the directory that contains the actual
@@ -634,11 +701,11 @@
       if {$native} then {
         return true
       }
 
       #
-      # NOTE: If the machine name is unavailable, there is nothign else we
+      # NOTE: If the machine name is unavailable, there is nothing else we
       #       can do.
       #
       if {![info exists ::tcl_platform(machine)]} then {
         return false
       }
@@ -722,19 +789,19 @@
       }
 
       return [isBuildAvailable "" $directory $varName]
     }
 
-    proc joinBuildDirectory { native path year platform configuration } {
+    proc joinBuildDirectory { native path year platform configuration extra } {
       #
       # NOTE: Figure out and then return the fully qualified path to the build
       #       directory based on all the arguments provided by our caller.
       #
       if {$native} then {
-        return [file join $path bin $year $platform $configuration]
+        return [file join $path bin $year $platform $configuration $extra]
       } else {
-        return [file join $path bin $year $configuration bin]
+        return [file join $path bin $year $configuration bin $extra]
       }
     }
 
     proc getBuildDirectory { managedOnly } {
       #
@@ -803,11 +870,13 @@
         #       how to set this variable.
         #
         set native [expr {!$managedOnly && [hasRuntimeOption native]}]
 
         return [joinBuildDirectory $native [getBuildBaseDirectory] \
-            [getBuildYear] [getBuildPlatform $native] [getBuildConfiguration]]
+            [expr {$managedOnly ? [getBuildYear] : [getBuildNativeYear]}] \
+            [getBuildPlatform $native] [getBuildConfiguration] \
+            [expr {$managedOnly ? [getBuildExtra] : ""}]]
       }
     }
 
     proc getReleaseVersion {} {
       #
@@ -1609,11 +1678,11 @@
       if {[string length $platform] == 0} then {
         return true
       }
 
       #
-      # NOTE: If the machine name is unavailable, there is nothign else we
+      # NOTE: If the machine name is unavailable, there is nothing else we
       #       can do.
       #
       if {![info exists ::tcl_platform(machine)]} then {
         return false
       }
@@ -1708,70 +1777,75 @@
       #       build variation along the way.
       #
       foreach native [list false true] {
         foreach year [getBuildYears] {
           foreach configuration [getBuildConfigurations] {
-            #
-            # NOTE: Figure out the effective build platform.  This is
-            #       based on whether or not a [primarily] native build
-            #       is being used.  For [primarily] non-native builds,
-            #       this will be an empty string.
-            #
-            set platform [getBuildPlatform $native]
-
-            tputs $channel [appendArgs \
-                "---- checking for System.Data.SQLite build \"" [expr \
-                {$native ? "native/" : ""}] [expr {[string length \
-                $platform] > 0 ? [appendArgs $platform /] : ""}] $year \
-                / $configuration "\"... "]
-
-            #
-            # NOTE: Build the fully qualified directory where the necessary
-            #       components for System.Data.SQLite should be found.
-            #
-            set directory [joinBuildDirectory $native \
-                [getBuildBaseDirectory] $year $platform $configuration]
-
-            #
-            # NOTE: Do the necessary files exist?  Currently, no other steps
-            #       are taken to verify this build is actually viable.
-            #
-            if {[isBuildAvailable $native $directory]} then {
-              #
-              # NOTE: When in "select" mode, automatically select the first
-              #       available build of System.Data.SQLite and then return
-              #       immediately.
-              #
-              if {$select && [matchPlatform $platform]} then {
-                #
-                # NOTE: Manually override all the build directory selection
-                #       related test settings in order to force this build
-                #       of System.Data.SQLite to be used.
-                #
-                if {![changeNativeRuntimeOption $native]} then {
-                  tputs $channel [appendArgs \
-                      "no, failed to " [expr {$native ? "add" : "remove"}] \
-                      " the \"native\" runtime option\n"]
-
-                  return false
-                }
-
-                set ::test_year $year
-                set ::test_platform $platform
-                set ::test_configuration $configuration
-
-                tputs $channel [appendArgs \
-                    "yes, selected (" [expr {$native ? "native/" : ""}] \
-                    [expr {[string length $platform] > 0 ? [appendArgs \
-                    $platform /] : ""}] $year / $configuration ")\n"]
-
-                return true
-              } else {
-                tputs $channel yes\n
-              }
-            } else {
-              tputs $channel no\n
+            foreach extra [getBuildExtras] {
+              #
+              # NOTE: Figure out the effective build platform.  This is
+              #       based on whether or not a [primarily] native build
+              #       is being used.  For [primarily] non-native builds,
+              #       this will be an empty string.
+              #
+              set platform [getBuildPlatform $native]
+
+              tputs $channel [appendArgs \
+                  "---- checking for System.Data.SQLite build \"" [expr \
+                  {$native ? "native/" : ""}] [expr {[string length \
+                  $platform] > 0 ? [appendArgs $platform /] : ""}] $year \
+                  / $configuration "\"... "]
+
+              #
+              # NOTE: Build the fully qualified directory where the necessary
+              #       components for System.Data.SQLite should be found.
+              #
+              set directory [joinBuildDirectory $native \
+                  [getBuildBaseDirectory] $year $platform $configuration \
+                  $extra]
+
+              #
+              # NOTE: Do the necessary files exist?  Currently, no other steps
+              #       are taken to verify this build is actually viable.
+              #
+              if {[isBuildAvailable $native $directory]} then {
+                #
+                # NOTE: When in "select" mode, automatically select the first
+                #       available build of System.Data.SQLite and then return
+                #       immediately.
+                #
+                if {$select && [matchPlatform $platform]} then {
+                  #
+                  # NOTE: Manually override all the build directory selection
+                  #       related test settings in order to force this build
+                  #       of System.Data.SQLite to be used.
+                  #
+                  if {![changeNativeRuntimeOption $native]} then {
+                    tputs $channel [appendArgs \
+                        "no, failed to " [expr {$native ? "add" : "remove"}] \
+                        " the \"native\" runtime option\n"]
+
+                    return false
+                  }
+
+                  set ::test_year $year
+                  set ::test_platform $platform
+                  set ::test_configuration $configuration
+
+                  tputs $channel [appendArgs \
+                      "yes, selected (" [expr {$native ? "native/" : ""}] \
+                      [expr {[string length $platform] > 0 ? [appendArgs \
+                      $platform /] : ""}] $year / $configuration \
+                      [expr {[string length $extra] > 0 ? [appendArgs / \
+                      $extra] : ""}] ")\n"]
+
+                  return true
+                } else {
+                  tputs $channel yes\n
+                }
+              } else {
+                tputs $channel no\n
+              }
             }
           }
         }
       }
 
@@ -4386,11 +4460,12 @@
         #
         set externalFileNames [list \
             [file join EntityFramework lib [string map [list Fx ""] \
             [string map [list netFx451 netFx45 netFx452 netFx45 netFx46 \
             netFx45 netFx461 netFx45 netFx462 netFx45 netFx47 netFx45 \
-            netFx471 netFx45] [getBuildNetFx]]] EntityFramework.dll]]
+            netFx471 netFx45 netStandard20 netFx45] [getBuildNetFx]]] \
+            EntityFramework.dll]]
 
         #
         # NOTE: Build the list of native assembly files that we handle.
         #
         set nativeFileNames [list]
@@ -4575,12 +4650,12 @@
           #       otherwise, make sure it actually exists or halt the entire
           #       testing process if it does not exist.
           #
           if {![info exists ::no(verifyBuildDirectory)]} then {
             #
-            # NOTE: At this point, the build directory MUST exist as a
-            #       valid directory for the testing process to continue.
+            # NOTE: At this point, the build directories MUST exist for
+            #       the testing process to continue.
             #
             set directory [getBuildDirectory false]
 
             if {![file exists $directory] || \
                 ![file isdirectory $directory]} then {
@@ -4587,20 +4662,41 @@
               #
               # NOTE: Just prior to actually halting the testing process,
               #       add an error to the test log file.
               #
               tputs $::test_channel [appendArgs \
-                  "---- could not verify build directory \"" $directory \
-                  "\", all testing halted\n"]
+                  "---- could not verify native build directory \"" \
+                  $directory "\", all testing halted\n"]
+
+              #
+              # NOTE: Raising a script error from this point should halt
+              #       the testing process.
+              #
+              error [appendArgs \
+                  "could not verify native build directory \"" \
+                  $directory "\", all testing halted"]
+            }
+
+            set directory [getBuildDirectory true]
+
+            if {![file exists $directory] || \
+                ![file isdirectory $directory]} then {
+              #
+              # NOTE: Just prior to actually halting the testing process,
+              #       add an error to the test log file.
+              #
+              tputs $::test_channel [appendArgs \
+                  "---- could not verify managed build directory \"" \
+                  $directory "\", all testing halted\n"]
 
               #
               # NOTE: Raising a script error from this point should halt
               #       the testing process.
               #
               error [appendArgs \
-                  "could not verify build directory \"" $directory \
-                  "\", all testing halted"]
+                  "could not verify managed build directory \"" \
+                  $directory "\", all testing halted"]
             }
           }
 
           #
           # NOTE: Skip trying to copy any files if instructed.
@@ -4766,67 +4862,74 @@
         }
 
         foreach fileNameOnly $nativeFileNames {
           catch {
             tputs $::test_channel [appendArgs \
-                "---- file version of \"" $fileNameOnly "\"... \"" \
-                [file version [getBinaryFileName $fileNameOnly]] \"\n]
+                "---- file version of \"" native/ $fileNameOnly \
+                "\"... \"" [file version [getBinaryFileName \
+                $fileNameOnly]] \"\n]
           }
         }
 
         foreach fileNameOnly $mixedFileNames {
           catch {
             tputs $::test_channel [appendArgs \
-                "---- file version of \"" $fileNameOnly "\"... \"" \
-                [file version [getBinaryFileName $fileNameOnly]] \"\n]
+                "---- file version of \"" mixed/ $fileNameOnly \
+                "\"... \"" [file version [getBinaryFileName \
+                $fileNameOnly]] \"\n]
           }
         }
 
         foreach fileNameOnly $managedFileNames {
           catch {
             tputs $::test_channel [appendArgs \
-                "---- file version of \"" $fileNameOnly "\"... \"" \
-                [file version [getBinaryFileName $fileNameOnly]] \"\n]
+                "---- file version of \"" managed/ $fileNameOnly \
+                "\"... \"" [file version [getBinaryFileName \
+                $fileNameOnly]] \"\n]
           }
         }
 
         if {[string length $platform] > 0} then {
           foreach fileNameOnly $nativeFileNames {
             catch {
               tputs $::test_channel [appendArgs \
-                  "---- file version of \"" $platform \
-                  / $fileNameOnly "\"... \"" [file version \
-                  [getBinaryFileName $fileNameOnly $platform]] \"\n]
+                  "---- file version of \"" native/platform/ \
+                  $platform / $fileNameOnly "\"... \"" [file \
+                  version [getBinaryFileName $fileNameOnly \
+                  $platform]] \"\n]
             }
           }
 
           foreach fileNameOnly $mixedFileNames {
             catch {
               tputs $::test_channel [appendArgs \
-                  "---- file version of \"" $platform \
-                  / $fileNameOnly "\"... \"" [file version \
-                  [getBinaryFileName $fileNameOnly $platform]] \"\n]
+                  "---- file version of \"" mixed/platform/ \
+                  $platform / $fileNameOnly "\"... \"" [file \
+                  version [getBinaryFileName $fileNameOnly \
+                  $platform]] \"\n]
             }
           }
         }
 
         if {[string length $architecture] > 0} then {
           foreach fileNameOnly $nativeFileNames {
             catch {
               tputs $::test_channel [appendArgs \
-                  "---- file version of \"" $architecture \
-                  / $fileNameOnly "\"... \"" [file version \
-                  [getBinaryFileName $fileNameOnly $architecture]] \"\n]
+                  "---- file version of \"" native/architecture/ \
+                  $architecture / $fileNameOnly "\"... \"" [file \
+                  version [getBinaryFileName $fileNameOnly \
+                  $architecture]] \"\n]
             }
           }
 
           foreach fileNameOnly $mixedFileNames {
             catch {
               tputs $::test_channel [appendArgs \
-                  "---- file version of \"" $architecture \
-                  / $fileNameOnly "\"... \"" [file version \
-                  [getBinaryFileName $fileNameOnly $architecture]] \"\n]
+                  "---- file version of \"" mixed/architecture/ \
+                  $architecture / $fileNameOnly "\"... \"" [file \
+                  version [getBinaryFileName $fileNameOnly \
+                  $architecture]] \"\n]
             }
           }
         }
 
         #
@@ -5026,10 +5129,17 @@
 
         set year [getBuildYear]
         addConstraint [appendArgs buildYear. $year]
         tputs $::test_channel [appendArgs \" $year \"\n]
 
+        tputs $::test_channel \
+            "---- checking for System.Data.SQLite build native year... "
+
+        set year [getBuildNativeYear]
+        addConstraint [appendArgs buildNativeYear. $year]
+        tputs $::test_channel [appendArgs \" $year \"\n]
+
         #
         # NOTE: Check the current build .NET Framework.  Basically, this
         #       indicates which version of the .NET Framework is being
         #       used by the assembly binaries under test.
         #
@@ -5048,10 +5158,27 @@
             "---- checking for System.Data.SQLite build configuration... "
 
         set configuration [getBuildConfiguration]
         addConstraint [appendArgs buildConfiguration. $configuration]
         tputs $::test_channel [appendArgs \" $configuration \"\n]
+
+        tputs $::test_channel \
+            "---- checking for System.Data.SQLite build extra... "
+
+        #
+        # NOTE: Check the current build extra directory.  This will normally
+        #       be either "netstandard2.0" or an empty string.
+        #
+        set extra [getBuildExtra]
+
+        if {[string length $extra] > 0} then {
+          addConstraint [appendArgs buildExtra. $extra]
+          tputs $::test_channel [appendArgs \" $extra \"\n]
+        } else {
+          addConstraint buildExtra.none
+          tputs $::test_channel <none>\n
+        }
 
         #
         # NOTE: Try to setup an interrupt callback using the script debugger
         #       that will cancel all SQL queries in progress for all database
         #       connections known to this interpreter.

Index: readme.htm
==================================================================
--- readme.htm
+++ readme.htm
@@ -211,10 +211,11 @@
     <b>1.0.109.0 - May XX, 2018 <font color="red">(release scheduled)</font></b>
 </p>
 <ul>
     <li>Updated to <a href="https://www.sqlite.org/releaselog/3_23_1.html">SQLite 3.23.1</a>.</li>
     <li>Prevent GetSchemaTable from throwing InvalidCastException. Fix for [baf42ee135].</li>
+    <li>Add preliminary support for .NET Core 2.0 and the .NET Standard 2.0.</li>
     <li>Add simpler overload for the SQLiteBlob.Create method. Pursuant to [dfc8133ba2].</li>
     <li>Add GetFieldAffinity method to the SQLiteDataReader class.</li>
 </ul>
 <p>
     <b>1.0.XXX.0 - March 2, 2018</b>

Index: www/build.wiki
==================================================================
--- www/build.wiki
+++ www/build.wiki
@@ -421,10 +421,46 @@
       <br />
     </li>
 
     <li>
       Make sure everything succeeds with no errors; the log file
-      &quot;%TEMP%\System.Data.SQLite.Build_ReleaseManagedOnly_Win32_&lt;year&gt;_Unknown.log&quot;
+      &quot;%TEMP%\System.Data.SQLite.Build_ReleaseManagedOnly_Any CPU_&lt;year&gt;_Unknown.log&quot;
+      may be checked if any errors should occur.
+    </li>
+  </ol>
+
+  <a name="netStandard20"></a>
+  <h2>.NET Standard 2.0 Build</h2>
+
+  <ol>
+    <li>
+      Complete the applicable steps outlined in the <a href="#all">All Builds</a>
+      section (above).
+    </li>
+
+    <li>
+      Make sure the &quot;&lt;root&gt;\bin&quot; and &quot;&lt;root&gt;\obj&quot;
+      directories are completely free of all output files.  In theory, you should
+      be able to simply delete these directories.
+    </li>
+
+    <li>Open a normal command prompt window with &quot;cmd.exe&quot;.</li>
+
+    <li>Change the current directory to &quot;&lt;root&gt;\Setup&quot;.</li>
+
+    <li>
+      Enter the following command to build the managed-only binaries for .NET
+      Standard 2.0:
+      <br />
+      <br />
+      <b>build_net_standard_20.bat</b>
+      <br />
+      <br />
+    </li>
+
+    <li>
+      Make sure everything succeeds with no errors; the log file
+      &quot;%TEMP%\System.Data.SQLite.Build_ReleaseManagedOnly_Any CPU_NetStandard20_Unknown.log&quot;
       may be checked if any errors should occur.
     </li>
   </ol>
 </nowiki>

Index: www/downloads.wiki
==================================================================
--- www/downloads.wiki
+++ www/downloads.wiki
@@ -2526,11 +2526,11 @@
     Mono.
   </p>
 
   <p>
     The <b>year</b> in templates (5), (6), (7), (8), (9), and (10) will be
-    one of 2005, 2008, 2010, 2012, 2013, 2015, 2017, 20XX.
+    one of 2005, 2008, 2010, 2012, 2013, 2015, 2017, 20XX, NetStandard20.
   </p>
 
   <p>
     The <b>version</b> in templates (1), (2), (3), (4), (5), (6), (7), (8),
     (9), (10), (13), (14), and (15) is the dot-delimited version number of

Index: www/news.wiki
==================================================================
--- www/news.wiki
+++ www/news.wiki
@@ -48,10 +48,11 @@
     <b>1.0.109.0 - May XX, 2018 <font color="red">(release scheduled)</font></b>
 </p>
 <ul>
     <li>Updated to [https://www.sqlite.org/releaselog/3_23_1.html|SQLite 3.23.1].</li>
     <li>Prevent GetSchemaTable from throwing InvalidCastException. Fix for [baf42ee135].</li>
+    <li>Add preliminary support for .NET Core 2.0 and the .NET Standard 2.0.</li>
     <li>Add simpler overload for the SQLiteBlob.Create method. Pursuant to [dfc8133ba2].</li>
     <li>Add GetFieldAffinity method to the SQLiteDataReader class.</li>
 </ul>
 <p>
     <b>1.0.108.0 - March 2, 2018</b>

Index: www/release.wiki
==================================================================
--- www/release.wiki
+++ www/release.wiki
@@ -231,10 +231,36 @@
   <li>
     Make sure everything succeeds with no errors; the console output may be
     checked if any errors should occur.
   </li>
 </ol>
+
+<a name="buildNetStandard20Binaries"></a>
+<h2>Build .NET Standard 2.0 Binaries</h2>
+
+<ol>
+  <li>Open a normal command prompt window with &quot;cmd.exe&quot;.</li>
+
+  <li>Change the current directory to &quot;&lt;root&gt;\Setup&quot;.</li>
+
+  <li>
+    Enter the following command to build all the binaries available for .NET
+    Standard 2.0:
+    <br />
+    <br />
+    <b>SET BUILD_FULL=</b>
+    <br />
+    <b>SET BUILD_DEBUG=1</b>
+    <br />
+    <b>build_net_standard_20.bat</b>
+  </li>
+
+  <li>
+    Make sure everything succeeds with no errors; the console output may be
+    checked if any errors should occur.
+  </li>
+</ol>
 
 <a name="updateDocumentation"></a>
 <h2>Update Documentation</h2>
 
 <ol>
@@ -255,11 +281,11 @@
   <li>
     Enter the following command to update all documentation that is
     included from upstream (e.g. from the SQLite core library, etc):
     <br />
     <br />
-    <b>..\Externals\Eagle\bin\EagleShell.exe -file sync.eagle --verbose</b>
+    <b>..\Externals\Eagle\bin\netFramework40\EagleShell.exe -file sync.eagle --verbose</b>
   </li>
 
   <li>
     Enter the following command to update the embedded SQLite core library
     virtual table documentation:
@@ -433,10 +459,33 @@
   <li>
     Make sure everything succeeds with no errors; the console output may be
     checked if any errors should occur.
   </li>
 </ol>
+
+<a name="buildNetStandard20BinaryPackages"></a>
+<h2>Build .NET Standard 2.0 Release Packages</h2>
+
+<ol>
+  <li>Open a normal command prompt window with &quot;cmd.exe&quot;.</li>
+
+  <li>Change the current directory to &quot;&lt;root&gt;\Setup&quot;.</li>
+
+  <li>
+    Enter the following commands to build all the Mono release packages:
+    <br />
+    <br />
+    <b>SET RELEASE_DEBUG=1</b>
+    <br />
+    <b>release_net_standard_20.bat</b>
+  </li>
+
+  <li>
+    Make sure everything succeeds with no errors; the console output may be
+    checked if any errors should occur.
+  </li>
+</ol>
 
 <a name="buildSourcePackages"></a>
 <h2>Build Source Release Packages</h2>
 
 <ol>
@@ -506,11 +555,11 @@
 
   <li>
     Enter the following command to build all the source release packages:
     <br />
     <br />
-    <b>..\Externals\Eagle\bin\EagleShell.exe -file verify.eagle Output true</b>
+    <b>..\Externals\Eagle\bin\netFramework40\EagleShell.exe -file verify.eagle Output true</b>
     <br />
     <br />
     <i>This assumes that the <a href="https://www.fossil-scm.org/">Fossil</a>,
     <a href="https://sourceforge.net/projects/innounp/">Inno Setup Unpacker</a>,
     <a href="http://www.rarlab.com/">UnRAR</a>, and

Index: www/test.wiki
==================================================================
--- www/test.wiki
+++ www/test.wiki
@@ -82,47 +82,48 @@
   <li>
     Enter the following command to run all the unit tests against the binaries
     built with a separate managed and interop assembly:
     <br />
     <br />
-    <b>Externals\Eagle\bin\EagleShell.exe&nbsp;-file&nbsp;Tests\all.eagle</b>
+    <b>Externals\Eagle\bin\netFramework40\EagleShell.exe&nbsp;-file&nbsp;Tests\all.eagle</b>
   </li>
 
   <li>
     Enter the following command to run all the unit tests against the binaries
     built with a mixed-mode assembly:
     <br />
     <br />
-    <b>Externals\Eagle\bin\EagleShell.exe&nbsp;-initialize&nbsp;-runtimeOption&nbsp;native&nbsp;-file&nbsp;Tests\all.eagle</b>
+    <b>Externals\Eagle\bin\netFramework40\EagleShell.exe&nbsp;-initialize&nbsp;-runtimeOption&nbsp;native&nbsp;-file&nbsp;Tests\all.eagle</b>
   </li>
 
   <li>
     In order to test binaries built with MSBuild 3.5 or Visual Studio 2008 (i.e.
     because the default is to test binaries built with MSBuild 4.0 or Visual
     Studio 2010) add the following command line argument right after
-    &quot;<b>Externals\Eagle\bin\EagleShell.exe</b>&quot; in any of the above
-    command lines:
+    &quot;<b>Externals\Eagle\bin\netFramework40\EagleShell.exe</b>&quot; in any
+    of the above command lines:
     <br />
     <br />
     <b>-anyInitialize&nbsp;&quot;set&nbsp;test_year&nbsp;2008&quot;</b>
   </li>
 
   <li>
     In order to test binaries built in the &quot;Debug&quot; build configuration
     (i.e. because the default is to test binaries built in the
     &quot;Release&quot; build configuration) add the following command line
-    argument right after &quot;<b>Externals\Eagle\bin\EagleShell.exe</b>&quot;
-    in any of the above command lines:
+    argument right after
+    &quot;<b>Externals\Eagle\bin\netFramework40\EagleShell.exe</b>&quot; in any
+    of the above command lines:
     <br />
     <br />
     <b>-anyInitialize&nbsp;&quot;set&nbsp;test_configuration&nbsp;Debug&quot;</b>
   </li>
 
   <li>
     In order to test the native library pre-loader, add the following command
     line argument right after
-    &quot;<b>Externals\Eagle\bin\EagleShell.exe</b>&quot;
+    &quot;<b>Externals\Eagle\bin\netFramework40\EagleShell.exe</b>&quot;
     in any of the above command lines:
     <br />
     <br />
     <b>-anyInitialize&nbsp;&quot;set&nbsp;no(copySqliteImplicitFiles)&nbsp;1&quot;</b>
   </li>