System.Data.SQLite
Check-in [b53ec99e9f]
Not logged in

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

Overview
Comment:Merge updates from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | preRelease
Files: files | file ages | folders
SHA1: b53ec99e9f6105231e5971c73cf64474d9adde9b
User & Date: mistachkin 2014-09-14 07:17:58
Context
2014-09-14
07:20
Update pre-release source code package to reflect the NuGet package changes. Closed-Leaf check-in: ce64695ba9 user: mistachkin tags: preRelease
07:17
Merge updates from trunk. check-in: b53ec99e9f user: mistachkin tags: preRelease
07:17
Enhancements to the command line build tool. check-in: d79821ede8 user: mistachkin tags: trunk
2014-09-13
21:51
Update all pre-release NuGet packages to version 1.0.94.2 on the download page. check-in: af87bf7a30 user: mistachkin tags: preRelease
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Setup/build.bat.

   107    107     %__ECHO3% CALL "%TOOLS%\set_user_%USERNAME%.bat"
   108    108   
   109    109     IF ERRORLEVEL 1 (
   110    110       ECHO File "%TOOLS%\set_user_%USERNAME%.bat" failed.
   111    111       GOTO errors
   112    112     )
   113    113   )
          114  +
          115  +IF NOT DEFINED MSBUILD (
          116  +  SET MSBUILD=MSBuild.exe
          117  +)
          118  +
          119  +%_VECHO% MsBuild = '%MSBUILD%'
          120  +
          121  +IF NOT DEFINED CSC (
          122  +  SET CSC=csc.exe
          123  +)
          124  +
          125  +%_VECHO% Csc = '%CSC%'
   114    126   
   115    127   IF DEFINED NETFX20ONLY (
   116    128     %_AECHO% Forcing the use of the .NET Framework 2.0...
   117    129     SET YEAR=2005
   118         -  SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\v2.0.50727
          130  +  CALL :fn_CheckFramework v2.0.50727
   119    131     GOTO skip_netFxCheck
   120    132   )
   121    133   
   122    134   IF DEFINED NETFX35ONLY (
   123    135     %_AECHO% Forcing the use of the .NET Framework 3.5...
   124    136     SET YEAR=2008
   125         -  SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\v3.5
          137  +  CALL :fn_CheckFramework v3.5
   126    138     GOTO skip_netFxCheck
   127    139   )
   128    140   
   129    141   IF DEFINED NETFX40ONLY (
   130    142     %_AECHO% Forcing the use of the .NET Framework 4.0...
   131    143     SET YEAR=2010
   132         -  SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\v4.0.30319
          144  +  CALL :fn_CheckFramework v4.0.30319
   133    145     GOTO skip_netFxCheck
   134    146   )
   135    147   
   136    148   IF DEFINED NETFX45ONLY (
   137    149     %_AECHO% Forcing the use of the .NET Framework 4.5...
   138    150     SET YEAR=2012
   139         -  SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\v4.0.30319
          151  +  CALL :fn_CheckFramework v4.0.30319
   140    152     GOTO skip_netFxCheck
   141    153   )
   142    154   
   143    155   IF DEFINED NETFX451ONLY (
   144    156     %_AECHO% Forcing the use of the .NET Framework 4.5.1...
   145    157     SET YEAR=2013
   146         -  SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\v4.0.30319
          158  +  CALL :fn_CheckFramework v4.0.30319
   147    159     GOTO skip_netFxCheck
   148    160   )
   149    161   
   150    162   IF DEFINED FRAMEWORKDIR (
   151    163     IF NOT EXIST "%FRAMEWORKDIR%" (
   152    164       CALL :fn_UnsetVariable FRAMEWORKDIR
   153    165     )
   154    166   )
   155    167   
   156    168   IF DEFINED FRAMEWORKDIR (
   157         -  IF NOT EXIST "%FRAMEWORKDIR%\csc.exe" (
          169  +  IF NOT EXIST "%FRAMEWORKDIR%\%MSBUILD%" (
          170  +    CALL :fn_UnsetVariable FRAMEWORKDIR
          171  +  )
          172  +  IF NOT EXIST "%FRAMEWORKDIR%\%CSC%" (
   158    173       CALL :fn_UnsetVariable FRAMEWORKDIR
   159    174     )
   160    175   )
   161    176   
   162    177   IF NOT DEFINED FRAMEWORKDIR (
   163    178     %_AECHO% Checking for the .NET Framework 4.0...
   164    179     SET YEAR=2010
   165         -  SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\v4.0.30319
          180  +  CALL :fn_CheckFramework v4.0.30319
   166    181   )
   167    182   
   168    183   IF NOT EXIST "%FRAMEWORKDIR%" (
   169    184     %_AECHO% Checking for the .NET Framework 3.5...
   170    185     SET YEAR=2008
   171         -  SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\v3.5
          186  +  CALL :fn_CheckFramework v3.5
   172    187   )
   173    188   
   174    189   IF NOT EXIST "%FRAMEWORKDIR%" (
   175    190     %_AECHO% Checking for the .NET Framework 2.0...
   176    191     SET YEAR=2005
   177         -  SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\v2.0.50727
          192  +  CALL :fn_CheckFramework v2.0.50727
   178    193   )
   179    194   
   180    195   :skip_netFxCheck
          196  +
          197  +%_VECHO% Year = '%YEAR%'
          198  +%_VECHO% FrameworkDir = '%FRAMEWORKDIR%'
          199  +
          200  +IF NOT DEFINED FRAMEWORKDIR (
          201  +  ECHO.
          202  +  ECHO The .NET Framework directory "FRAMEWORKDIR" is not defined.
          203  +  ECHO.
          204  +  ECHO Please install the .NET Framework or set the "FRAMEWORKDIR"
          205  +  ECHO environment variable to the location where it is installed.
          206  +  ECHO.
          207  +  GOTO errors
          208  +)
   181    209   
   182    210   IF NOT EXIST "%FRAMEWORKDIR%" (
   183    211     ECHO.
   184    212     ECHO The .NET Framework directory "%FRAMEWORKDIR%" was not found.
   185    213     ECHO.
   186    214     ECHO Please install the .NET Framework or set the "FRAMEWORKDIR"
   187    215     ECHO environment variable to the location where it is installed.
   188    216     ECHO.
   189    217     GOTO errors
   190    218   )
   191    219   
   192         -%_VECHO% Year = '%YEAR%'
   193         -%_VECHO% FrameworkDir = '%FRAMEWORKDIR%'
   194         -
   195    220   CALL :fn_ResetErrorLevel
   196    221   
   197    222   %__ECHO2% PUSHD "%ROOT%"
   198    223   
   199    224   IF ERRORLEVEL 1 (
   200    225     ECHO Could not change directory to "%ROOT%".
   201    226     GOTO errors
................................................................................
   302    327     ECHO WARNING: Source tagging skipped, disabled via NOTAG environment variable.
   303    328   )
   304    329   
   305    330   %_VECHO% Logging = '%LOGGING%'
   306    331   %_VECHO% BuildArgs = '%BUILD_ARGS%'
   307    332   %_VECHO% MsBuildArgs = '%MSBUILD_ARGS%'
   308    333   
   309         -%__ECHO% MSBuild.exe "%SOLUTION%" "/target:%TARGET%" "/property:Configuration=%CONFIGURATION%" "/property:Platform=%PLATFORM%" %LOGGING% %BUILD_ARGS% %MSBUILD_ARGS%
          334  +%__ECHO% "%MSBUILD%" "%SOLUTION%" "/target:%TARGET%" "/property:Configuration=%CONFIGURATION%" "/property:Platform=%PLATFORM%" %LOGGING% %BUILD_ARGS% %MSBUILD_ARGS%
   310    335   
   311    336   IF ERRORLEVEL 1 (
   312    337     ECHO Build failed.
   313    338     GOTO errors
   314    339   )
   315    340   
   316    341   %__ECHO2% POPD
................................................................................
   317    342   
   318    343   IF ERRORLEVEL 1 (
   319    344     ECHO Could not restore directory.
   320    345     GOTO errors
   321    346   )
   322    347   
   323    348   GOTO no_errors
          349  +
          350  +:fn_CheckFramework
          351  +  SET FRAMEWORKVER=%1
          352  +  IF NOT DEFINED FRAMEWORKVER GOTO :EOF
          353  +  IF DEFINED NOMSBUILD64 (
          354  +    %_AECHO% Forced into using 32-bit version of MSBuild...
          355  +    SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\%FRAMEWORKVER%
          356  +    GOTO :EOF
          357  +  )
          358  +  IF NOT "%PROCESSOR_ARCHITECTURE%" == "x86" (
          359  +    %_AECHO% The operating system appears to be 64-bit.
          360  +    IF EXIST "%windir%\Microsoft.NET\Framework64\%FRAMEWORKVER%" (
          361  +      IF EXIST "%windir%\Microsoft.NET\Framework64\%FRAMEWORKVER%\%MSBUILD%" (
          362  +        IF EXIST "%windir%\Microsoft.NET\Framework64\%FRAMEWORKVER%\%CSC%" (
          363  +          %_AECHO% Using 64-bit version of MSBuild...
          364  +          SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework64\%FRAMEWORKVER%
          365  +          GOTO :EOF
          366  +        ) ELSE (
          367  +          %_AECHO% Missing 64-bit version of "%CSC%".
          368  +        )
          369  +      ) ELSE (
          370  +        %_AECHO% Missing 64-bit version of "%MSBUILD%".
          371  +      )
          372  +    ) ELSE (
          373  +      %_AECHO% Missing 64-bit version of .NET Framework "%FRAMEWORKVER%".
          374  +    )
          375  +  ) ELSE (
          376  +    %_AECHO% The operating system appears to be 32-bit.
          377  +  )
          378  +  %_AECHO% Using 32-bit version of MSBuild...
          379  +  SET FRAMEWORKDIR=%windir%\Microsoft.NET\Framework\%FRAMEWORKVER%
          380  +  GOTO :EOF
   324    381   
   325    382   :fn_UnquoteVariable
   326    383     IF NOT DEFINED %1 GOTO :EOF
   327    384     SETLOCAL
   328    385     SET __ECHO_CMD=ECHO %%%1%%
   329    386     FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO (
   330    387       SET VALUE=%%V

Changes to www/faq.wiki.

   265    265         <a href="http://www.nuget.org/packages/System.Data.SQLite.Core.MSIL">
   266    266         System.Data.SQLite.Core.MSIL</a>: Just the managed ADO.NET provider for
   267    267         SQLite.
   268    268       </li>
   269    269   
   270    270       <li>
   271    271         <a href="http://www.nuget.org/packages/System.Data.SQLite.Core.MSIL.Beta">
   272         -      System.Data.SQLite.Core.MSIL</a>: Just the managed ADO.NET provider for
   273         -      SQLite.  <br><b>This package may contain &quot;beta&quot; code and is not
   274         -      intended for production use.</b>
          272  +      System.Data.SQLite.Core.MSIL.Beta</a>: Just the managed ADO.NET provider
          273  +      for SQLite.  <br><b>This package may contain &quot;beta&quot; code and is
          274  +      not intended for production use.</b>
   275    275       </li>
   276    276   
   277    277       <li>
   278    278         <a href="http://www.nuget.org/packages/System.Data.SQLite.Core.MSIL.Test">
   279    279         System.Data.SQLite.Core.MSIL.Test</a>: Just the managed ADO.NET provider
   280    280         for SQLite.  <br><b>This package may contain pre-release code and is not
   281    281         intended for production use.</b>
................................................................................
   325    325         <a href="http://www.nuget.org/packages/System.Data.SQLite.MSIL">
   326    326         System.Data.SQLite.MSIL</a>: Just the managed ADO.NET provider for
   327    327         SQLite.
   328    328       </li>
   329    329   
   330    330       <li>
   331    331         <a href="http://www.nuget.org/packages/System.Data.SQLite.MSIL.Beta">
   332         -      System.Data.SQLite.MSIL</a>: Just the managed ADO.NET provider for
          332  +      System.Data.SQLite.MSIL.Beta</a>: Just the managed ADO.NET provider for
   333    333         SQLite.  <br><b>This package may contain &quot;beta&quot; code and is
   334    334         not intended for production use.</b>
   335    335       </li>
   336    336   
   337    337       <li>
   338    338         <a href="http://www.nuget.org/packages/System.Data.SQLite.MSIL.Test">
   339         -      System.Data.SQLite.MSIL</a>: Just the managed ADO.NET provider for
          339  +      System.Data.SQLite.MSIL.Test</a>: Just the managed ADO.NET provider for
   340    340         SQLite.  <br><b>This package may contain pre-release code and is not
   341    341         intended for production use.</b>
   342    342       </li>
   343    343   
   344    344       <li>
   345    345         <a href="http://www.nuget.org/packages/System.Data.SQLite.Test">
   346    346         System.Data.SQLite.Test</a>: The SQLite database engine for both x86