System.Data.SQLite
Check-in [33424a48a4]
Not logged in

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

Overview
Comment:Attempt to support cross-platform native binaries in the core NuGet package for use with .NET Standard 2.0.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 33424a48a4c62a386e225646c4169bf1ab9cff6b
User & Date: mistachkin 2018-08-04 21:41:33
Context
2018-08-13
21:49
Final updates for release 1.0.109.0. check-in: 27de5a6698 user: mistachkin tags: trunk, release, release-1.0.109.0
2018-08-04
21:56
Documentation updates for the 1.0.109.0 release. check-in: 06449871a8 user: mistachkin tags: preRelease
21:41
Attempt to support cross-platform native binaries in the core NuGet package for use with .NET Standard 2.0. check-in: 33424a48a4 user: mistachkin tags: trunk
2018-07-30
05:04
Update Eagle in externals to the beta 42 release. check-in: 2f73ab7148 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to NuGet/SQLite.Core.Beta.nuspec.

    50     50       <file src="..\bin\2012\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x64" />
    51     51       <file src="..\bin\2013\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x86" />
    52     52       <file src="..\bin\2013\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x64" />
    53     53       <file src="..\bin\2015\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net46\x86" />
    54     54       <file src="..\bin\2015\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net46\x64" />
    55     55       <file src="..\bin\2015\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\netstandard2.0\x86" />
    56     56       <file src="..\bin\2015\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\netstandard2.0\x64" />
           57  +    <file src="..\bin\2016\linux-x64\ReleaseNativeOnly\SQLite.Interop.dll" target="build\netstandard2.0\linux-x64" />
           58  +    <file src="..\bin\2016\osx-x64\ReleaseNativeOnly\SQLite.Interop.dll" target="build\netstandard2.0\osx-x64" />
    57     59       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net20\System.Data.SQLite.Core.Beta.targets" />
    58     60       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net40\System.Data.SQLite.Core.Beta.targets" />
    59     61       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net45\System.Data.SQLite.Core.Beta.targets" />
    60     62       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net451\System.Data.SQLite.Core.Beta.targets" />
    61     63       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net46\System.Data.SQLite.Core.Beta.targets" />
    62     64       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\netstandard2.0\System.Data.SQLite.Core.Beta.targets" />
    63     65       <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net20" />

Changes to NuGet/SQLite.Core.Test.nuspec.

    50     50       <file src="..\bin\2012\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x64" />
    51     51       <file src="..\bin\2013\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x86" />
    52     52       <file src="..\bin\2013\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x64" />
    53     53       <file src="..\bin\2015\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net46\x86" />
    54     54       <file src="..\bin\2015\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net46\x64" />
    55     55       <file src="..\bin\2015\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\netstandard2.0\x86" />
    56     56       <file src="..\bin\2015\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\netstandard2.0\x64" />
           57  +    <file src="..\bin\2016\linux-x64\ReleaseNativeOnly\SQLite.Interop.dll" target="build\netstandard2.0\linux-x64" />
           58  +    <file src="..\bin\2016\osx-x64\ReleaseNativeOnly\SQLite.Interop.dll" target="build\netstandard2.0\osx-x64" />
    57     59       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net20\System.Data.SQLite.Core.Test.targets" />
    58     60       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net40\System.Data.SQLite.Core.Test.targets" />
    59     61       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net45\System.Data.SQLite.Core.Test.targets" />
    60     62       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net451\System.Data.SQLite.Core.Test.targets" />
    61     63       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net46\System.Data.SQLite.Core.Test.targets" />
    62     64       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\netstandard2.0\System.Data.SQLite.Core.Test.targets" />
    63     65       <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net20" />

Changes to NuGet/SQLite.Core.nuspec.

    50     50       <file src="..\bin\2012\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net45\x64" />
    51     51       <file src="..\bin\2013\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x86" />
    52     52       <file src="..\bin\2013\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net451\x64" />
    53     53       <file src="..\bin\2015\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net46\x86" />
    54     54       <file src="..\bin\2015\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\net46\x64" />
    55     55       <file src="..\bin\2015\Win32\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\netstandard2.0\x86" />
    56     56       <file src="..\bin\2015\x64\ReleaseNativeOnlyStatic\SQLite.Interop.dll" target="build\netstandard2.0\x64" />
           57  +    <file src="..\bin\2016\linux-x64\ReleaseNativeOnly\SQLite.Interop.dll" target="build\netstandard2.0\linux-x64" />
           58  +    <file src="..\bin\2016\osx-x64\ReleaseNativeOnly\SQLite.Interop.dll" target="build\netstandard2.0\osx-x64" />
    57     59       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net20\System.Data.SQLite.Core.targets" />
    58     60       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net40\System.Data.SQLite.Core.targets" />
    59     61       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net45\System.Data.SQLite.Core.targets" />
    60     62       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net451\System.Data.SQLite.Core.targets" />
    61     63       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\net46\System.Data.SQLite.Core.targets" />
    62     64       <file src="shared\Core\build\System.Data.SQLite.Core.targets" target="build\netstandard2.0\System.Data.SQLite.Core.targets" />
    63     65       <file src="shared\Core\lib\System.Data.SQLite.dll.config" target="lib\net20" />

Changes to Setup/build_nuget.bat.

    33     33   
    34     34   SET TOOLS=%~dp0
    35     35   SET TOOLS=%TOOLS:~0,-1%
    36     36   
    37     37   %_VECHO% Tools = '%TOOLS%'
    38     38   
    39     39   IF NOT DEFINED NUGET (
    40         -  SET NUGET=NuGet2.exe
           40  +  SET NUGET=NuGet4.exe
    41     41   )
    42     42   
    43     43   %_VECHO% NuGet = '%NUGET%'
    44     44   
    45     45   CALL :fn_ResetErrorLevel
    46     46   
    47     47   IF NOT EXIST "%ROOT%\Setup\Output" (
................................................................................
    48     48     %__ECHO% MKDIR "%ROOT%\Setup\Output"
    49     49   
    50     50     IF ERRORLEVEL 1 (
    51     51       ECHO Could not create directory "%ROOT%\Setup\Output".
    52     52       GOTO errors
    53     53     )
    54     54   )
           55  +
           56  +IF NOT DEFINED LINUX_URI (
           57  +  SET LINUX_URI=https://system.data.sqlite.org/index.html/uv/linux-x64/SQLite.Interop.dll
           58  +)
           59  +
           60  +IF NOT DEFINED LINUX_DIRECTORY (
           61  +  SET LINUX_DIRECTORY=%ROOT%\bin\2016\linux-x64\ReleaseNativeOnly
           62  +)
           63  +
           64  +%_VECHO% LinuxUri = '%LINUX_URI%'
           65  +%_VECHO% LinuxDirectory = '%LINUX_DIRECTORY%'
           66  +
           67  +IF NOT DEFINED MACOS_URI (
           68  +  SET MACOS_URI=https://system.data.sqlite.org/index.html/uv/osx-x64/SQLite.Interop.dll
           69  +)
           70  +
           71  +IF NOT DEFINED MACOS_DIRECTORY (
           72  +  SET MACOS_DIRECTORY=%ROOT%\bin\2016\osx-x64\ReleaseNativeOnly
           73  +)
           74  +
           75  +%_VECHO% MacOsUri = '%MACOS_URI%'
           76  +%_VECHO% MacOsDirectory = '%MACOS_DIRECTORY%'
           77  +
           78  +IF NOT DEFINED NO_NUGET_XPLATFORM (
           79  +  %__ECHO% "%ROOT%\Externals\Eagle\bin\netFramework40\EagleShell.exe" -evaluate "set directory {%LINUX_DIRECTORY%}; file mkdir $directory; uri download -- {%LINUX_URI%} [file join $directory SQLite.Interop.dll]"
           80  +
           81  +  IF ERRORLEVEL 1 (
           82  +    ECHO Download of System.Data.SQLite interop assembly "%LINUX_URI%" to "%LINUX_DIRECTORY%" failure.
           83  +    GOTO errors
           84  +  ) ELSE (
           85  +    %_AECHO% Download of System.Data.SQLite interop assembly "%LINUX_URI%" to "%LINUX_DIRECTORY%" success.
           86  +  )
           87  +
           88  +  %__ECHO% "%ROOT%\Externals\Eagle\bin\netFramework40\EagleShell.exe" -evaluate "set directory {%MACOS_DIRECTORY%}; file mkdir $directory; uri download -- {%MACOS_URI%} [file join $directory SQLite.Interop.dll]"
           89  +
           90  +  IF ERRORLEVEL 1 (
           91  +    ECHO Download of System.Data.SQLite interop assembly "%MACOS_URI%" to "%MACOS_DIRECTORY%" failure.
           92  +    GOTO errors
           93  +  ) ELSE (
           94  +    %_AECHO% Download of System.Data.SQLite interop assembly "%MACOS_URI%" to "%MACOS_DIRECTORY%" success.
           95  +  )
           96  +)
    55     97   
    56     98   %__ECHO% "%NUGET%" pack "%ROOT%\NuGet\SQLite.nuspec"
    57     99   
    58    100   IF ERRORLEVEL 1 (
    59    101     ECHO The "%ROOT%\NuGet\SQLite.nuspec" package could not be built.
    60    102     GOTO usage
    61    103   )