System.Data.SQLite
Check-in [8e1eb0e6a2]
Not logged in

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

Overview
Comment:Add another diagnostic message to the native library pre-loader.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 8e1eb0e6a2945d67300c359d874bd666b74894c3
User & Date: mistachkin 2016-08-29 23:15:14
Context
2016-08-29
23:16
The 'tkt-58ed318f2f-1.14' test requires using the SQLite interop assembly (i.e. not the mixed-mode assembly). check-in: bc7b1fd0d9 user: mistachkin tags: trunk
23:15
Add another diagnostic message to the native library pre-loader. check-in: 8e1eb0e6a2 user: mistachkin tags: trunk
23:14
Add remaining changes for the design-time installer tool to support the .NET Framework 4.6.2 that were missing from the previous check-in. check-in: 5461676a9d user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

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

1340
1341
1342
1343
1344
1345
1346
















1347
1348
1349
1350
1351
1352
1353
                  // NOTE: If the SQLite DLL file exists, return success.
                  //       Prior to returning, set the base directory and
                  //       processor architecture to reflect the location
                  //       where it was found.
                  //
                  if (File.Exists(fileName))
                  {
















                      baseDirectory = directory;
                      processorArchitecture = subDirectory;
                      return true; /* FOUND */
                  }
              }
          }








>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
                  // NOTE: If the SQLite DLL file exists, return success.
                  //       Prior to returning, set the base directory and
                  //       processor architecture to reflect the location
                  //       where it was found.
                  //
                  if (File.Exists(fileName))
                  {
#if !NET_COMPACT_20 && TRACE_DETECTION
                      try
                      {
                          Trace.WriteLine(HelperMethods.StringFormat(
                              CultureInfo.CurrentCulture,
                              "Native library pre-loader search found file " +
                              "name \"{0}\", returning directory \"{1}\" and " +
                              "sub-directory \"{2}\"...", fileName, directory,
                              subDirectory)); /* throw */
                      }
                      catch
                      {
                          // do nothing.
                      }
#endif

                      baseDirectory = directory;
                      processorArchitecture = subDirectory;
                      return true; /* FOUND */
                  }
              }
          }