Index: .fossil-settings/ignore-glob ================================================================== --- .fossil-settings/ignore-glob +++ .fossil-settings/ignore-glob @@ -1,4 +1,5 @@ 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 +Externals/Eagle/bin/netStandard21/Eagle*.pdb ADDED Externals/Eagle/bin/netStandard21/Eagle.dll Index: Externals/Eagle/bin/netStandard21/Eagle.dll ================================================================== --- /dev/null +++ Externals/Eagle/bin/netStandard21/Eagle.dll cannot compute difference between binary files ADDED Externals/Eagle/bin/netStandard21/EagleShell.dll Index: Externals/Eagle/bin/netStandard21/EagleShell.dll ================================================================== --- /dev/null +++ Externals/Eagle/bin/netStandard21/EagleShell.dll cannot compute difference between binary files Index: Setup/clean.bat ================================================================== --- Setup/clean.bat +++ Setup/clean.bat @@ -241,11 +241,11 @@ ) ELSE ( %_AECHO% No files matching "%SOURCE%\Doc\SQLite.NET.chw" exist. %_AECHO%. ) -FOR %%D IN (netFramework40 netStandard20) DO ( +FOR %%D IN (netFramework40 netStandard20 netStandard21) 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.*". Index: Setup/data/verify.lst ================================================================== --- Setup/data/verify.lst +++ Setup/data/verify.lst @@ -1004,10 +1004,12 @@ Externals/Eagle/bin/netFramework40/x86/Spilornis.dll Externals/Eagle/bin/netStandard20/ Externals/Eagle/bin/netStandard20/Eagle.dll Externals/Eagle/bin/netStandard20/EagleShell.dll Externals/Eagle/bin/netStandard20/EagleShell.runtimeconfig.json + Externals/Eagle/bin/netStandard21/Eagle.dll + Externals/Eagle/bin/netStandard21/EagleShell.dll Externals/Eagle/bin/netStandard21/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 @@ -2247,10 +2249,18 @@ ################### Visual Studio 2017 / .NET Standard 2.0 #################### ############################### Binary Packages ############################### ############################################################################### set manifests(sqlite-netStandard20-binary-.zip) [list sds binaryCore] + +############################################################################### +################### Visual Studio 2019 / .NET Standard 2.1 #################### +############################### Binary Packages ############################### +############################################################################### + +set manifests(sqlite-netStandard21-binary-.zip) [list sds binaryCore \ + binaryEf6] ############################################################################### ############################### NuGet Packages ################################ ############################################################################### Index: Setup/run-netstandard21-tests-debug.sh ================================================================== --- Setup/run-netstandard21-tests-debug.sh +++ Setup/run-netstandard21-tests-debug.sh @@ -20,7 +20,7 @@ if [[ -f "${SQLITE_INTEROP_FILE}" ]]; then cp "$SQLITE_INTEROP_FILE" "$SQLITE_INTEROP_DIR/SQLite.Interop.dll" libname=SQLite.Interop.dll fi -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 "$@" +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 "$@" popd Index: Setup/run-netstandard21-tests-release.sh ================================================================== --- Setup/run-netstandard21-tests-release.sh +++ Setup/run-netstandard21-tests-release.sh @@ -20,7 +20,7 @@ if [[ -f "${SQLITE_INTEROP_FILE}" ]]; then cp "$SQLITE_INTEROP_FILE" "$SQLITE_INTEROP_DIR/SQLite.Interop.dll" libname=SQLite.Interop.dll fi -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 "$@" +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 "$@" popd Index: Setup/test_net_standard_21.bat ================================================================== --- Setup/test_net_standard_21.bat +++ Setup/test_net_standard_21.bat @@ -181,11 +181,11 @@ ) SET CONFIGURATION=%NATIVE_CONFIGURATION% SET CONFIGURATION=%CONFIGURATION:NativeOnly=% IF EXIST "bin\%YEAR%\%CONFIGURATION%NetStandard21\bin" ( IF EXIST "bin\%NATIVE_YEAR%\%PLATFORM%\%NATIVE_CONFIGURATION%" ( - %__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% + %__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% IF ERRORLEVEL 1 ( ECHO Testing of "%YEAR%/%NATIVE_YEAR%/%CONFIGURATION%" .NET Standard 2.1 assembly failed. CALL :fn_SetErrorLevel GOTO :EOF ) Index: data/exclude_full_src.txt ================================================================== --- data/exclude_full_src.txt +++ data/exclude_full_src.txt @@ -25,10 +25,17 @@ Externals/Eagle/bin/netStandard20/sqlite3.* Externals/Eagle/bin/netStandard20/System.* Externals/Eagle/bin/netStandard20/Win32/* Externals/Eagle/bin/netStandard20/x64/SQLite.Interop.* Externals/Eagle/bin/netStandard20/x86/SQLite.Interop.* +Externals/Eagle/bin/netStandard21/EntityFramework.* +Externals/Eagle/bin/netStandard21/SQLite.Interop.* +Externals/Eagle/bin/netStandard21/sqlite3.* +Externals/Eagle/bin/netStandard21/System.* +Externals/Eagle/bin/netStandard21/Win32/* +Externals/Eagle/bin/netStandard21/x64/SQLite.Interop.* +Externals/Eagle/bin/netStandard21/x86/SQLite.Interop.* Externals/EntityFramework/* Externals/HtmlHelp/* Externals/MSVCPP/* Externals/NDoc3/* obj/* Index: data/exclude_src.txt ================================================================== --- data/exclude_src.txt +++ data/exclude_src.txt @@ -22,10 +22,11 @@ Externals/Eagle/bin/netFramework40/System.* Externals/Eagle/bin/netFramework40/Win32/* Externals/Eagle/bin/netFramework40/x64/* Externals/Eagle/bin/netFramework40/x86/* Externals/Eagle/bin/netStandard20/* +Externals/Eagle/bin/netStandard21/* 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 Index: lib/System.Data.SQLite/common.eagle ================================================================== --- lib/System.Data.SQLite/common.eagle +++ lib/System.Data.SQLite/common.eagle @@ -563,11 +563,11 @@ } elseif {[isDotNetCore]} then { # # NOTE: Running on .NET Core, prioritize its extra output directory # for library files. # - return [list netstandard2.0 ""] + return [list netstandard2.0 netstandard2.1 ""] } else { # # NOTE: Use default list of extra output directories, which is one # empty string (no-op). #