Index: Setup/build_mono.bat
==================================================================
--- Setup/build_mono.bat
+++ Setup/build_mono.bat
@@ -32,12 +32,11 @@
SET BUILD_CONFIGURATIONS=DebugManagedOnly ReleaseManagedOnly
SET PLATFORMS="Any CPU"
SET YEARS=2008 2013
SET NOUSER=1
-SET MSBUILD_ARGS=/property:UseInteropDll=false
-SET MSBUILD_ARGS=%MSBUILD_ARGS% /property:UseSqliteStandard=true
+SET MSBUILD_ARGS=/property:UseSqliteStandardLibraryName=true
SET MSBUILD_ARGS=%MSBUILD_ARGS% /property:InteropCodec=false
CALL :fn_ResetErrorLevel
%__ECHO3% CALL "%TOOLS%\build_all.bat"
Index: System.Data.SQLite/SQLiteDefineConstants.cs
==================================================================
--- System.Data.SQLite/SQLiteDefineConstants.cs
+++ System.Data.SQLite/SQLiteDefineConstants.cs
@@ -137,10 +137,14 @@
#endif
#if SQLITE_STANDARD
"SQLITE_STANDARD",
#endif
+
+#if SQLITE_STANDARD_LIBRARY_NAME
+ "SQLITE_STANDARD_LIBRARY_NAME",
+#endif
#if THROW_ON_DISPOSED
"THROW_ON_DISPOSED",
#endif
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
@@ -150,10 +150,19 @@
-->
$(DefineConstants);SQLITE_STANDARD
+
+
+ $(DefineConstants);SQLITE_STANDARD_LIBRARY_NAME
+
+
$(DefineConstants);PLATFORM_COMPACTFRAMEWORK
Index: System.Data.SQLite/UnsafeNativeMethods.cs
==================================================================
--- System.Data.SQLite/UnsafeNativeMethods.cs
+++ System.Data.SQLite/UnsafeNativeMethods.cs
@@ -1352,11 +1352,15 @@
// be used because it provides several workarounds to .NET Compact
// Framework limitations important for proper operation of the core
// System.Data.SQLite functionality (e.g. being able to bind
// parameters and handle column values of types Int64 and Double).
//
+#if SQLITE_STANDARD_LIBRARY_NAME
+ internal const string SQLITE_DLL = "sqlite3";
+#else
internal const string SQLITE_DLL = "SQLite.Interop.100.dll";
+#endif
#elif SQLITE_STANDARD
//
// NOTE: Otherwise, if the standard SQLite library is enabled, use it.
//
internal const string SQLITE_DLL = "sqlite3";
@@ -1363,11 +1367,15 @@
#elif USE_INTEROP_DLL
//
// NOTE: Otherwise, if the native SQLite interop assembly is enabled,
// use it.
//
+#if SQLITE_STANDARD_LIBRARY_NAME
+ internal const string SQLITE_DLL = "sqlite3";
+#else
internal const string SQLITE_DLL = "SQLite.Interop.dll";
+#endif
#else
//
// NOTE: Finally, assume that the mixed-mode assembly is being used.
//
internal const string SQLITE_DLL = "System.Data.SQLite.dll";
Index: Targets/SQLite.NET.Settings.targets
==================================================================
--- Targets/SQLite.NET.Settings.targets
+++ Targets/SQLite.NET.Settings.targets
@@ -340,10 +340,19 @@
above. This should always be disabled in the project file that
builds the NetModule target.
-->
false
+
+ false
+
false
Index: lib/System.Data.SQLite/common.eagle
==================================================================
--- lib/System.Data.SQLite/common.eagle
+++ lib/System.Data.SQLite/common.eagle
@@ -3872,13 +3872,13 @@
INTEROP_LEGACY_CLOSE INTEROP_LOG INTEROP_PERCENTILE_EXTENSION \
INTEROP_REGEXP_EXTENSION INTEROP_TEST_EXTENSION \
INTEROP_TOTYPE_EXTENSION INTEROP_VIRTUAL_TABLE NET_20 NET_35 \
NET_40 NET_45 NET_451 NET_452 NET_46 NET_461 NET_COMPACT_20 \
PLATFORM_COMPACTFRAMEWORK PRELOAD_NATIVE_LIBRARY RETARGETABLE \
- SQLITE_STANDARD THROW_ON_DISPOSED TRACE TRACE_CONNECTION \
- TRACE_DETECTION TRACE_HANDLE TRACE_PRELOAD TRACE_SHARED \
- TRACE_STATEMENT TRACE_WARNING TRACK_MEMORY_BYTES \
+ SQLITE_STANDARD SQLITE_STANDARD_LIBRARY_NAME THROW_ON_DISPOSED \
+ TRACE TRACE_CONNECTION TRACE_DETECTION TRACE_HANDLE TRACE_PRELOAD \
+ TRACE_SHARED TRACE_STATEMENT TRACE_WARNING TRACK_MEMORY_BYTES \
USE_ENTITY_FRAMEWORK_6 USE_INTEROP_DLL USE_PREPARE_V2 WINDOWS] {
#
# NOTE: Check if the compile-time option is listed in the list of
# "define constants" kept track of by the managed assembly.
#