System.Data.SQLite
Check-in [3a961372b3]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:When using the mixed-mode assembly, it must be assumed that the 'vtshim' module is already loaded.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 3a961372b3b85b08bc2f98a61d7e4bc4642a825e
User & Date: mistachkin 2016-04-12 13:57:57
Context
2016-04-12
21:20
Fix some issues with the test suite. check-in: 67a33ffd3c user: mistachkin tags: trunk
13:58
Merge updates from trunk. check-in: d31b192da1 user: mistachkin tags: preRelease
13:57
When using the mixed-mode assembly, it must be assumed that the 'vtshim' module is already loaded. check-in: 3a961372b3 user: mistachkin tags: trunk
13:56
The 'Assembly.Load(Byte[])' method cannot be used on the mixed-mode assembly. check-in: e48fe7a84c user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to System.Data.SQLite/SQLite3.cs.

2463
2464
2465
2466
2467
2468
2469

2470



2471
2472
2473
2474
2475
2476
2477
    private string GetShimExtensionFileName(
        ref bool isLoadNeeded /* out */
        )
    {
        if (_shimIsLoadNeeded != null)
            isLoadNeeded = (bool)_shimIsLoadNeeded;
        else

            isLoadNeeded = HelperMethods.IsWindows(); /* COMPAT */




        string fileName = _shimExtensionFileName;

        if (fileName != null)
            return fileName;

#if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY







>

>
>
>







2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
    private string GetShimExtensionFileName(
        ref bool isLoadNeeded /* out */
        )
    {
        if (_shimIsLoadNeeded != null)
            isLoadNeeded = (bool)_shimIsLoadNeeded;
        else
#if SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK
            isLoadNeeded = HelperMethods.IsWindows(); /* COMPAT */
#else
            isLoadNeeded = false; /* mixed-mode assembly */
#endif

        string fileName = _shimExtensionFileName;

        if (fileName != null)
            return fileName;

#if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY