System.Data.SQLite: Check-in [08df79b52e]

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

Overview

Comment:	Clone Eagle binaries for .NET Standard 2.1.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| netStandard21
Files:	files \| file ages \| folders
SHA1:	08df79b52ebbee98e12ca877f3729b097b92516b
User & Date:	mistachkin 2019-10-08 23:55:41

Context

2019-10-08
23:59		More build system updates for .NET Standard 2.1. check-in: 1f451718a6 user: mistachkin tags: netStandard21
23:55		Clone Eagle binaries for .NET Standard 2.1. check-in: 08df79b52e user: mistachkin tags: netStandard21
01:24		Get the EF6 integration test project building and working. check-in: cd8bf2f63b user: mistachkin tags: netStandard21

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to .fossil-settings/ignore-glob.

     1      1   Externals/Eagle/bin/netFramework40/Eagle*.pdb
     2      2   Externals/Eagle/bin/netFramework40/x64/Spilornis.pdb
     3      3   Externals/Eagle/bin/netFramework40/x86/Spilornis.pdb
     4      4   Externals/Eagle/bin/netStandard20/Eagle*.pdb
            5  +Externals/Eagle/bin/netStandard21/Eagle*.pdb

Added Externals/Eagle/bin/netStandard21/Eagle.dll.

cannot compute difference between binary files

Added Externals/Eagle/bin/netStandard21/EagleShell.dll.

cannot compute difference between binary files

Changes to Setup/clean.bat.

   239    239       %_AECHO%.
   240    240     )
   241    241   ) ELSE (
   242    242     %_AECHO% No files matching "%SOURCE%\Doc\SQLite.NET.chw" exist.
   243    243     %_AECHO%.
   244    244   )
   245    245   
   246         -FOR %%D IN (netFramework40 netStandard20) DO (
          246  +FOR %%D IN (netFramework40 netStandard20 netStandard21) DO (
   247    247     IF EXIST "%SOURCE%\Externals\Eagle\bin\%%D\EntityFramework.*" (
   248    248       %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\%%D\EntityFramework.*"
   249    249   
   250    250       IF ERRORLEVEL 1 (
   251    251         ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\%%D\EntityFramework.*".
   252    252         ECHO.
   253    253         GOTO errors

Changes to Setup/data/verify.lst.

  1002   1002     Externals/Eagle/bin/netFramework40/x64/Spilornis.dll
  1003   1003     Externals/Eagle/bin/netFramework40/x86/
  1004   1004     Externals/Eagle/bin/netFramework40/x86/Spilornis.dll
  1005   1005     Externals/Eagle/bin/netStandard20/
  1006   1006     Externals/Eagle/bin/netStandard20/Eagle.dll
  1007   1007     Externals/Eagle/bin/netStandard20/EagleShell.dll
  1008   1008     Externals/Eagle/bin/netStandard20/EagleShell.runtimeconfig.json
         1009  +  Externals/Eagle/bin/netStandard21/Eagle.dll
         1010  +  Externals/Eagle/bin/netStandard21/EagleShell.dll
  1009   1011     Externals/Eagle/bin/netStandard21/EagleShell.runtimeconfig.json
  1010   1012     Externals/Eagle/lib/Eagle1.0/auxiliary.eagle
  1011   1013     Externals/Eagle/lib/Eagle1.0/compat.eagle
  1012   1014     Externals/Eagle/lib/Eagle1.0/csharp.eagle
  1013   1015     Externals/Eagle/lib/Eagle1.0/database.eagle
  1014   1016     Externals/Eagle/lib/Eagle1.0/embed.eagle
  1015   1017     Externals/Eagle/lib/Eagle1.0/exec.eagle
................................................................................
  2245   2247   
  2246   2248   ###############################################################################
  2247   2249   ################### Visual Studio 2017 / .NET Standard 2.0 ####################
  2248   2250   ############################### Binary Packages ###############################
  2249   2251   ###############################################################################
  2250   2252   
  2251   2253   set manifests(sqlite-netStandard20-binary-.zip) [list sds binaryCore]
         2254  +
         2255  +###############################################################################
         2256  +################### Visual Studio 2019 / .NET Standard 2.1 ####################
         2257  +############################### Binary Packages ###############################
         2258  +###############################################################################
         2259  +
         2260  +set manifests(sqlite-netStandard21-binary-.zip) [list sds binaryCore \
         2261  +    binaryEf6]
  2252   2262   
  2253   2263   ###############################################################################
  2254   2264   ############################### NuGet Packages ################################
  2255   2265   ###############################################################################
  2256   2266   
  2257   2267   set manifests(System.Data.SQLite..nupkg) [list sds \
  2258   2268       nuGetMetadata nuGetPrimary]

Changes to Setup/run-netstandard21-tests-debug.sh.

    18     18   SQLITE_INTEROP_FILE=$SQLITE_INTEROP_DIR/$libname
    19     19   
    20     20   if [[ -f "${SQLITE_INTEROP_FILE}" ]]; then
    21     21     cp "$SQLITE_INTEROP_FILE" "$SQLITE_INTEROP_DIR/SQLite.Interop.dll"
    22     22     libname=SQLite.Interop.dll
    23     23   fi
    24     24   
    25         -dotnet exec Externals/Eagle/bin/netStandard20/EagleShell.dll -preInitialize "set test_configuration Debug; set test_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_native_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_year NetStandard21; set test_native_year {$SQLITE_NET_YEAR}; set test_extra netstandard2.1" -file Tests/all.eagle "$@"
           25  +dotnet exec Externals/Eagle/bin/netStandard21/EagleShell.dll -preInitialize "set test_configuration Debug; set test_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_native_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_year NetStandard21; set test_native_year {$SQLITE_NET_YEAR}; set test_extra netstandard2.1" -file Tests/all.eagle "$@"
    26     26   popd

Changes to Setup/run-netstandard21-tests-release.sh.

    18     18   SQLITE_INTEROP_FILE=$SQLITE_INTEROP_DIR/$libname
    19     19   
    20     20   if [[ -f "${SQLITE_INTEROP_FILE}" ]]; then
    21     21     cp "$SQLITE_INTEROP_FILE" "$SQLITE_INTEROP_DIR/SQLite.Interop.dll"
    22     22     libname=SQLite.Interop.dll
    23     23   fi
    24     24   
    25         -dotnet exec Externals/Eagle/bin/netStandard20/EagleShell.dll -preInitialize "set test_configuration Release; set test_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_native_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_year NetStandard21; set test_native_year {$SQLITE_NET_YEAR}; set test_extra netstandard2.1" -file Tests/all.eagle "$@"
           25  +dotnet exec Externals/Eagle/bin/netStandard21/EagleShell.dll -preInitialize "set test_configuration Release; set test_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_native_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_year NetStandard21; set test_native_year {$SQLITE_NET_YEAR}; set test_extra netstandard2.1" -file Tests/all.eagle "$@"
    26     26   popd

Changes to Setup/test_net_standard_21.bat.

   179    179       CALL :fn_SetErrorLevel
   180    180       GOTO :EOF
   181    181     )
   182    182     SET CONFIGURATION=%NATIVE_CONFIGURATION%
   183    183     SET CONFIGURATION=%CONFIGURATION:NativeOnly=%
   184    184     IF EXIST "bin\%YEAR%\%CONFIGURATION%NetStandard21\bin" (
   185    185       IF EXIST "bin\%NATIVE_YEAR%\%PLATFORM%\%NATIVE_CONFIGURATION%" (
   186         -      %__ECHO% "%DOTNET%" %SUBCOMMANDS% "Externals\Eagle\bin\netStandard20\%EAGLESHELL%" %PREARGS% -anyInitialize "set test_year {%YEAR%}; set test_native_year {%NATIVE_YEAR%}; set test_configuration {%CONFIGURATION%}; set test_configuration_suffix NetStandard21; set test_extra netstandard2.1" -initialize -postInitialize "unset -nocomplain no(deleteSqliteImplicitNativeFiles); unset -nocomplain no(copySqliteImplicitNativeFiles)" -file "%TEST_FILE%" %POSTARGS%
          186  +      %__ECHO% "%DOTNET%" %SUBCOMMANDS% "Externals\Eagle\bin\netStandard21\%EAGLESHELL%" %PREARGS% -anyInitialize "set test_year {%YEAR%}; set test_native_year {%NATIVE_YEAR%}; set test_configuration {%CONFIGURATION%}; set test_configuration_suffix NetStandard21; set test_extra netstandard2.1" -initialize -postInitialize "unset -nocomplain no(deleteSqliteImplicitNativeFiles); unset -nocomplain no(copySqliteImplicitNativeFiles)" -file "%TEST_FILE%" %POSTARGS%
   187    187         IF ERRORLEVEL 1 (
   188    188           ECHO Testing of "%YEAR%/%NATIVE_YEAR%/%CONFIGURATION%" .NET Standard 2.1 assembly failed.
   189    189           CALL :fn_SetErrorLevel
   190    190           GOTO :EOF
   191    191         )
   192    192       ) ELSE (
   193    193         %_AECHO% Native directory "bin\%NATIVE_YEAR%\%PLATFORM%\%NATIVE_CONFIGURATION%" not found, skipped.

Changes to data/exclude_full_src.txt.

     24     25     26     27     28     29            30     31     32     33     34     35     36

class="diffln"> 23 23 Externals/Eagle/bin/netStandard20/EntityFramework.* 24 Externals/Eagle/bin/netStandard20/SQLite.Interop.* 25 Externals/Eagle/bin/netStandard20/sqlite3.* 26 Externals/Eagle/bin/netStandard20/System.* 27 Externals/Eagle/bin/netStandard20/Win32/* 28 Externals/Eagle/bin/netStandard20/x64/SQLite.Interop.* 29 Externals/Eagle/bin/netStandard20/x86/SQLite.Interop.* 30 +Externals/Eagle/bin/netStandard21/EntityFramework.* 31 +Externals/Eagle/bin/netStandard21/SQLite.Interop.* 32 +Externals/Eagle/bin/netStandard21/sqlite3.* 33 +Externals/Eagle/bin/netStandard21/System.* 34 +Externals/Eagle/bin/netStandard21/Win32/* 35 +Externals/Eagle/bin/netStandard21/x64/SQLite.Interop.* 36 +Externals/Eagle/bin/netStandard21/x86/SQLite.Interop.* 37 Externals/EntityFramework/* 38 Externals/HtmlHelp/* 39 Externals/MSVCPP/* 40 Externals/NDoc3/* 41 obj/* 42 Setup/Output/* 43 Setup/set_user_*.bat

Changes to data/exclude_src.txt.

    20     20   Externals/Eagle/bin/netFramework40/SQLite.Interop.*
    21     21   Externals/Eagle/bin/netFramework40/sqlite3.*
    22     22   Externals/Eagle/bin/netFramework40/System.*
    23     23   Externals/Eagle/bin/netFramework40/Win32/*
    24     24   Externals/Eagle/bin/netFramework40/x64/*
    25     25   Externals/Eagle/bin/netFramework40/x86/*
    26     26   Externals/Eagle/bin/netStandard20/*
           27  +Externals/Eagle/bin/netStandard21/*
    27     28   Externals/Eagle/lib/Eagle1.0/auxiliary.eagle
    28     29   Externals/Eagle/lib/Eagle1.0/compat.eagle
    29     30   Externals/Eagle/lib/Eagle1.0/csharp.eagle
    30     31   Externals/Eagle/lib/Eagle1.0/database.eagle
    31     32   Externals/Eagle/lib/Eagle1.0/embed.eagle
    32     33   Externals/Eagle/lib/Eagle1.0/exec.eagle
    33     34   Externals/Eagle/lib/Eagle1.0/file1.eagle

Changes to lib/System.Data.SQLite/common.eagle.

   561    561           #
   562    562           return $::test_extras
   563    563         } elseif {[isDotNetCore]} then {
   564    564           #
   565    565           # NOTE: Running on .NET Core, prioritize its extra output directory
   566    566           #       for library files.
   567    567           #
   568         -        return [list netstandard2.0 ""]
          568  +        return [list netstandard2.0 netstandard2.1 ""]
   569    569         } else {
   570    570           #
   571    571           # NOTE: Use default list of extra output directories, which is one
   572    572           #       empty string (no-op).
   573    573           #
   574    574           return [list ""]
   575    575         }