Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Even more updates. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | vs2015 |
Files: | files | file ages | folders |
SHA1: |
3fcfa761481cf76537631f846ac81940 |
User & Date: | mistachkin 2015-07-20 18:32:18.816 |
Context
2015-07-20
| ||
22:46 | Add Visual C++ 2015 redist files. check-in: 068cd88467 user: mistachkin tags: vs2015 | |
18:32 | Even more updates. check-in: 3fcfa76148 user: mistachkin tags: vs2015 | |
18:18 | More changes. check-in: 719d9e6cac user: mistachkin tags: vs2015 | |
Changes
Added SQLite.Interop/props/SQLite.Interop.2015.props.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | <?xml version="1.0" encoding="utf-8"?> <!-- * * SQLite.Interop.2015.props - * * Written by Joe Mistachkin. * Released to the public domain, use at your own risk! * --> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0"> <PropertyGroup Label="UserMacros"> <ConfigurationYear>2015</ConfigurationYear> <INTEROP_BUILD_NUMBER>098</INTEROP_BUILD_NUMBER> <INTEROP_LINKER_VERSION>1.0</INTEROP_LINKER_VERSION> <INTEROP_MANIFEST_VERSION>1.0.98.0</INTEROP_MANIFEST_VERSION> <INTEROP_RC_VERSION>1,0,98,0</INTEROP_RC_VERSION> <INTEROP_INCLUDE_DIRECTORIES>src\core</INTEROP_INCLUDE_DIRECTORIES> <INTEROP_LIBRARY_DIRECTORIES></INTEROP_LIBRARY_DIRECTORIES> <INTEROP_LIBRARY_DEPENDENCIES></INTEROP_LIBRARY_DEPENDENCIES> <INTEROP_DEBUG_DEFINES>INTEROP_DEBUG=0x31F;INTEROP_LOG=1;INTEROP_TEST_EXTENSION=1</INTEROP_DEBUG_DEFINES> <INTEROP_EXTRA_DEFINES>INTEROP_PLACEHOLDER=1;INTEROP_EXTENSION_FUNCTIONS=1;INTEROP_CODEC=1;INTEROP_VIRTUAL_TABLE=1;INTEROP_FTS5_EXTENSION=1;INTEROP_PERCENTILE_EXTENSION=1;INTEROP_TOTYPE_EXTENSION=1;INTEROP_REGEXP_EXTENSION=1</INTEROP_EXTRA_DEFINES> <INTEROP_ASSEMBLY_RESOURCES>/ASSEMBLYRESOURCE:..\System.Data.SQLite\Resources\SQLiteCommand.bmp,System.Data.SQLite.SQLiteCommand.bmp /ASSEMBLYRESOURCE:..\System.Data.SQLite\Resources\SQLiteConnection.bmp,System.Data.SQLite.SQLiteConnection.bmp /ASSEMBLYRESOURCE:..\System.Data.SQLite\Resources\SQLiteDataAdapter.bmp,System.Data.SQLite.SQLiteDataAdapter.bmp</INTEROP_ASSEMBLY_RESOURCES> <INTEROP_KEY_FILE>$(ProjectDir)..\Keys\System.Data.SQLite.snk</INTEROP_KEY_FILE> <INTEROP_NATIVE_NAME>SQLite.Interop</INTEROP_NATIVE_NAME> <INTEROP_MIXED_NAME>System.Data.SQLite</INTEROP_MIXED_NAME> </PropertyGroup> <ItemGroup> <BuildMacro Include="ConfigurationYear"> <Value>$(ConfigurationYear)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_BUILD_NUMBER"> <Value>$(INTEROP_BUILD_NUMBER)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_LINKER_VERSION"> <Value>$(INTEROP_LINKER_VERSION)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_MANIFEST_VERSION"> <Value>$(INTEROP_MANIFEST_VERSION)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_RC_VERSION"> <Value>$(INTEROP_RC_VERSION)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_INCLUDE_DIRECTORIES"> <Value>$(INTEROP_INCLUDE_DIRECTORIES)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_LIBRARY_DIRECTORIES"> <Value>$(INTEROP_LIBRARY_DIRECTORIES)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_LIBRARY_DEPENDENCIES"> <Value>$(INTEROP_LIBRARY_DEPENDENCIES)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_DEBUG_DEFINES"> <Value>$(INTEROP_DEBUG_DEFINES)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_EXTRA_DEFINES"> <Value>$(INTEROP_EXTRA_DEFINES)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_ASSEMBLY_RESOURCES"> <Value>$(INTEROP_ASSEMBLY_RESOURCES)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_KEY_FILE"> <Value>$(INTEROP_KEY_FILE)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_NATIVE_NAME"> <Value>$(INTEROP_NATIVE_NAME)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> <BuildMacro Include="INTEROP_MIXED_NAME"> <Value>$(INTEROP_MIXED_NAME)</Value> <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> </ItemGroup> </Project> |
Changes to Tests/version.eagle.
︙ | ︙ | |||
740 741 742 743 744 745 746 747 748 749 750 751 752 753 | lappend patterns \ [appendArgs <INTEROP_BUILD_NUMBER> [format %03d $version(build)] \ </INTEROP_BUILD_NUMBER>] \ [appendArgs <INTEROP_MANIFEST_VERSION> [string map [list . \\.] \ $version(full)] </INTEROP_MANIFEST_VERSION>] \ [appendArgs <INTEROP_RC_VERSION> [string map [list . ,] \ $version(full)] </INTEROP_RC_VERSION>] ############################################################################### # interop.h ############################################################################### lappend patterns \ [appendArgs \" [string map [list . \\.] $version(full)] \"] | > > > > > > > > > > > > | 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 | lappend patterns \ [appendArgs <INTEROP_BUILD_NUMBER> [format %03d $version(build)] \ </INTEROP_BUILD_NUMBER>] \ [appendArgs <INTEROP_MANIFEST_VERSION> [string map [list . \\.] \ $version(full)] </INTEROP_MANIFEST_VERSION>] \ [appendArgs <INTEROP_RC_VERSION> [string map [list . ,] \ $version(full)] </INTEROP_RC_VERSION>] ############################################################################### # SQLite.Interop.2015.props ############################################################################### lappend patterns \ [appendArgs <INTEROP_BUILD_NUMBER> [format %03d $version(build)] \ </INTEROP_BUILD_NUMBER>] \ [appendArgs <INTEROP_MANIFEST_VERSION> [string map [list . \\.] \ $version(full)] </INTEROP_MANIFEST_VERSION>] \ [appendArgs <INTEROP_RC_VERSION> [string map [list . ,] \ $version(full)] </INTEROP_RC_VERSION>] ############################################################################### # interop.h ############################################################################### lappend patterns \ [appendArgs \" [string map [list . \\.] $version(full)] \"] |
︙ | ︙ | |||
876 877 878 879 880 881 882 883 884 885 886 887 888 889 | "SQLiteProviderServices, System\\.Data\\.SQLite\\.EF6, " \ "Version=" [string map [list . \\.] $version(full)] ,] ############################################################################### # 2013/LINQ/App.config ############################################################################### lappend patterns \ [appendArgs \ "SQLiteProviderFactory, System\\.Data\\.SQLite\\.Linq, " \ "Version=" [string map [list . \\.] $version(full)] ,] ############################################################################### # testlinq/Properties/AssemblyInfo.cs | > > > > > > > > > > > > > > > > > > > > > | 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 | "SQLiteProviderServices, System\\.Data\\.SQLite\\.EF6, " \ "Version=" [string map [list . \\.] $version(full)] ,] ############################################################################### # 2013/LINQ/App.config ############################################################################### lappend patterns \ [appendArgs \ "SQLiteProviderFactory, System\\.Data\\.SQLite\\.Linq, " \ "Version=" [string map [list . \\.] $version(full)] ,] ############################################################################### # 2015/EF6/App.config ############################################################################### lappend patterns \ [appendArgs \ "SQLiteProviderFactory, System\\.Data\\.SQLite\\.EF6, " \ "Version=" [string map [list . \\.] $version(full)] ,] \ [appendArgs \ "SQLiteProviderServices, System\\.Data\\.SQLite\\.EF6, " \ "Version=" [string map [list . \\.] $version(full)] ,] ############################################################################### # 2015/LINQ/App.config ############################################################################### lappend patterns \ [appendArgs \ "SQLiteProviderFactory, System\\.Data\\.SQLite\\.Linq, " \ "Version=" [string map [list . \\.] $version(full)] ,] ############################################################################### # testlinq/Properties/AssemblyInfo.cs |
︙ | ︙ | |||
1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 | [file join SQLite.Interop props SQLite.Interop.2010.props] \ [file join SQLite.Interop props SQLite.Interop.2012.props] \ [file join SQLite.Interop props SQLite.Interop.2012.props] \ [file join SQLite.Interop props SQLite.Interop.2012.props] \ [file join SQLite.Interop props SQLite.Interop.2013.props] \ [file join SQLite.Interop props SQLite.Interop.2013.props] \ [file join SQLite.Interop props SQLite.Interop.2013.props] \ [file join SQLite.Interop src win interop.h] \ [file join System.Data.SQLite AssemblyInfo.cs] \ [file join System.Data.SQLite AssemblyInfo.cs] \ [file join System.Data.SQLite SQLite3.cs] \ [file join System.Data.SQLite UnsafeNativeMethods.cs] \ [file join System.Data.SQLite.Linq AssemblyInfo.cs] \ [file join System.Data.SQLite.Linq AssemblyInfo.cs] \ | > > > | 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 | [file join SQLite.Interop props SQLite.Interop.2010.props] \ [file join SQLite.Interop props SQLite.Interop.2012.props] \ [file join SQLite.Interop props SQLite.Interop.2012.props] \ [file join SQLite.Interop props SQLite.Interop.2012.props] \ [file join SQLite.Interop props SQLite.Interop.2013.props] \ [file join SQLite.Interop props SQLite.Interop.2013.props] \ [file join SQLite.Interop props SQLite.Interop.2013.props] \ [file join SQLite.Interop props SQLite.Interop.2015.props] \ [file join SQLite.Interop props SQLite.Interop.2015.props] \ [file join SQLite.Interop props SQLite.Interop.2015.props] \ [file join SQLite.Interop src win interop.h] \ [file join System.Data.SQLite AssemblyInfo.cs] \ [file join System.Data.SQLite AssemblyInfo.cs] \ [file join System.Data.SQLite SQLite3.cs] \ [file join System.Data.SQLite UnsafeNativeMethods.cs] \ [file join System.Data.SQLite.Linq AssemblyInfo.cs] \ [file join System.Data.SQLite.Linq AssemblyInfo.cs] \ |
︙ | ︙ | |||
1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 | [file join testlinq 2010 LINQ App.config] \ [file join testlinq 2012 EF6 App.config] \ [file join testlinq 2012 EF6 App.config] \ [file join testlinq 2012 LINQ App.config] \ [file join testlinq 2013 EF6 App.config] \ [file join testlinq 2013 EF6 App.config] \ [file join testlinq 2013 LINQ App.config] \ [file join testlinq Properties AssemblyInfo.cs] \ [file join testlinq Properties AssemblyInfo.cs] \ [file join tools install Properties AssemblyInfo.cs] \ [file join tools install Properties AssemblyInfo.cs] \ [file join www news.wiki]] if {[llength $patterns] != [llength $fileNames]} then { | > > > | 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 | [file join testlinq 2010 LINQ App.config] \ [file join testlinq 2012 EF6 App.config] \ [file join testlinq 2012 EF6 App.config] \ [file join testlinq 2012 LINQ App.config] \ [file join testlinq 2013 EF6 App.config] \ [file join testlinq 2013 EF6 App.config] \ [file join testlinq 2013 LINQ App.config] \ [file join testlinq 2015 EF6 App.config] \ [file join testlinq 2015 EF6 App.config] \ [file join testlinq 2015 LINQ App.config] \ [file join testlinq Properties AssemblyInfo.cs] \ [file join testlinq Properties AssemblyInfo.cs] \ [file join tools install Properties AssemblyInfo.cs] \ [file join tools install Properties AssemblyInfo.cs] \ [file join www news.wiki]] if {[llength $patterns] != [llength $fileNames]} then { |
︙ | ︙ |
Changes to www/build.wiki.
︙ | ︙ | |||
8 9 10 11 12 13 14 | binaries. Unless otherwise noted, all steps need to be done in the order specified. </p> <p> You will need a Visual Studio 2005, Visual Studio 2005 SP1, Visual Studio 2008, Visual Studio 2008 SP1, Visual Studio 2010, Visual Studio 2010 SP1, | | | | > | | | | > | | | | | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | binaries. Unless otherwise noted, all steps need to be done in the order specified. </p> <p> You will need a Visual Studio 2005, Visual Studio 2005 SP1, Visual Studio 2008, Visual Studio 2008 SP1, Visual Studio 2010, Visual Studio 2010 SP1, Visual Studio 2012, Visual Studio 2013, or Visual Studio 2015 development environment for this build. In order to build both the managed (C#) and native projects (C++) for a particular solution together, the "Professional Edition" (or better) of that particular version of Visual Studio is required. </p> <p> The new build system has been setup using modular solution, project, and property files. </p> <p> In general, all files with 2005, 2008, 2010, 2012, 2013, or 2015 in the name (e.g. "SQLite.Interop.2005.vcproj") are files for Visual Studio 2005, Visual Studio 2008, Visual Studio 2010, Visual Studio 2012, Visual Studio 2013, or Visual Studio 2015, respectively. Files ending in ".vsprops" are property files for a Visual Studio 2005 or Visual Studio 2008 project. Files ending in ".props" are property files for a the Visual Studio 2010, Visual Studio 2012, Visual Studio 2013, or Visual Studio 2015 project. When making changes, they should be made to the corresponding files for all applicable versions of Visual Studio. </p> <p> You can either <a href="#manual">manually build</a> the System.Data.SQLite binaries using one of the supplied Visual Studio solutions or follow the steps outlined in the <a href="#automated">Automated Build</a> section below. </p> |
︙ | ︙ | |||
88 89 90 91 92 93 94 | The string "<root>" represents the root directory of your local source tree (i.e. the working check-out directory) for the System.Data.SQLite project. </li> <li> The string "<year>" represents the version of Visual | | | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | The string "<root>" represents the root directory of your local source tree (i.e. the working check-out directory) for the System.Data.SQLite project. </li> <li> The string "<year>" represents the version of Visual Studio being used (e.g. 2005, 2008, 2010, 2012, 2013, or 2015). </li> <li> For now, the project will always be built on modern Windows using the .NET Framework even when they will eventually be deployed to run under Mono on Unix. </li> |
︙ | ︙ | |||
153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 | <li><root>\SQLite.Designer\AssemblyInfo.cs</li> <li><root>\SQLite.Designer\source.extension.vsixmanifest</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2005.vsprops</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2008.vsprops</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2010.props</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2012.props</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2013.props</li> <li><root>\SQLite.Interop\src\win\interop.h</li> <li><root>\System.Data.SQLite\AssemblyInfo.cs</li> <li><root>\System.Data.SQLite\SQLite3.cs</li> <li><root>\System.Data.SQLite\UnsafeNativeMethods.cs</li> <li><root>\System.Data.SQLite.Linq\AssemblyInfo.cs</li> <li><root>\test\AssemblyInfo.cs</li> <li><root>\test\app.config</li> <li><root>\testce\AssemblyInfo.cs</li> <li><root>\testlinq\2008\LINQ\App.config</li> <li><root>\testlinq\2010\EF6\App.config</li> <li><root>\testlinq\2010\LINQ\App.config</li> <li><root>\testlinq\2012\EF6\App.config</li> <li><root>\testlinq\2012\LINQ\App.config</li> <li><root>\testlinq\2013\EF6\App.config</li> <li><root>\testlinq\2013\LINQ\App.config</li> <li><root>\testlinq\Properties\AssemblyInfo.cs</li> <li><root>\Tests\version.eagle</li> <li><root>\tools\install\Properties\AssemblyInfo.cs</li> </ul> You'll need to update the INTEROP_BUILD_NUMBER, INTEROP_LINKER_VERSION, INTEROP_MANIFEST_VERSION, and INTEROP_RC_VERSION properties in the | > > > | 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 | <li><root>\SQLite.Designer\AssemblyInfo.cs</li> <li><root>\SQLite.Designer\source.extension.vsixmanifest</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2005.vsprops</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2008.vsprops</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2010.props</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2012.props</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2013.props</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2015.props</li> <li><root>\SQLite.Interop\src\win\interop.h</li> <li><root>\System.Data.SQLite\AssemblyInfo.cs</li> <li><root>\System.Data.SQLite\SQLite3.cs</li> <li><root>\System.Data.SQLite\UnsafeNativeMethods.cs</li> <li><root>\System.Data.SQLite.Linq\AssemblyInfo.cs</li> <li><root>\test\AssemblyInfo.cs</li> <li><root>\test\app.config</li> <li><root>\testce\AssemblyInfo.cs</li> <li><root>\testlinq\2008\LINQ\App.config</li> <li><root>\testlinq\2010\EF6\App.config</li> <li><root>\testlinq\2010\LINQ\App.config</li> <li><root>\testlinq\2012\EF6\App.config</li> <li><root>\testlinq\2012\LINQ\App.config</li> <li><root>\testlinq\2013\EF6\App.config</li> <li><root>\testlinq\2013\LINQ\App.config</li> <li><root>\testlinq\2015\EF6\App.config</li> <li><root>\testlinq\2015\LINQ\App.config</li> <li><root>\testlinq\Properties\AssemblyInfo.cs</li> <li><root>\Tests\version.eagle</li> <li><root>\tools\install\Properties\AssemblyInfo.cs</li> </ul> You'll need to update the INTEROP_BUILD_NUMBER, INTEROP_LINKER_VERSION, INTEROP_MANIFEST_VERSION, and INTEROP_RC_VERSION properties in the |
︙ | ︙ | |||
225 226 227 228 229 230 231 232 233 234 235 236 237 238 | <li> The "SQLite.NET.2013.sln" file is the top-level solution primarily designed for use with Visual Studio 2013 in the IDE; however, it may also be used from the command line with MSBuild 4.0. </li> <li> The "SQLite.NET.2005.MSBuild.sln" file is the top-level solution primarily designed for use with MSBuild 2.0 on the command line; however, it may also be used from the Visual Studio 2005 IDE. </li> <li> | > > > > > > | 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | <li> The "SQLite.NET.2013.sln" file is the top-level solution primarily designed for use with Visual Studio 2013 in the IDE; however, it may also be used from the command line with MSBuild 4.0. </li> <li> The "SQLite.NET.2015.sln" file is the top-level solution primarily designed for use with Visual Studio 2015 in the IDE; however, it may also be used from the command line with MSBuild 4.0. </li> <li> The "SQLite.NET.2005.MSBuild.sln" file is the top-level solution primarily designed for use with MSBuild 2.0 on the command line; however, it may also be used from the Visual Studio 2005 IDE. </li> <li> |
︙ | ︙ | |||
254 255 256 257 258 259 260 261 262 263 264 265 266 267 | </li> <li> The "SQLite.NET.2013.MSBuild.sln" file is the top-level solution primarily designed for use with MSBuild 4.0 on the command line; however, it may also be used from the Visual Studio 2013 IDE. </li> </ul> </li> <li> Select the desired solution configuration (e.g. ReleaseNativeOnly) and and solution platform (e.g. x64), then "Build->Rebuild Solution". Alternatively, you can select "Build->Batch Build", | > > > > > > | 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 | </li> <li> The "SQLite.NET.2013.MSBuild.sln" file is the top-level solution primarily designed for use with MSBuild 4.0 on the command line; however, it may also be used from the Visual Studio 2013 IDE. </li> <li> The "SQLite.NET.2015.MSBuild.sln" file is the top-level solution primarily designed for use with MSBuild 4.0 on the command line; however, it may also be used from the Visual Studio 2015 IDE. </li> </ul> </li> <li> Select the desired solution configuration (e.g. ReleaseNativeOnly) and and solution platform (e.g. x64), then "Build->Rebuild Solution". Alternatively, you can select "Build->Batch Build", |
︙ | ︙ |