Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch newNs Excluding Merge-Ins
This is equivalent to a diff from 16fb7e87b5 to 5baa17100f
2014-01-12
| ||
10:34 | Merge in all namespace name, resource name, packaging, and testing changes. check-in: 9fb39bee99 user: mistachkin tags: ef6 | |
10:26 | Update design-time installer test results to account for EF6 and remove the 'what-if' mode adjustment from the previous check-in. Closed-Leaf check-in: 5baa17100f user: mistachkin tags: newNs | |
09:57 | In 'what-if' mode, always assume the EF6 assembly is available. check-in: ce06d9e616 user: mistachkin tags: newNs | |
04:21 | Experimental changes to the namespace for the LINQ/EF6 assemblies. check-in: 8a14de9d76 user: mistachkin tags: newNs | |
2014-01-11
| ||
04:27 | Minor adjustments to automation. check-in: 16fb7e87b5 user: mistachkin tags: ef6 | |
04:21 | Work on supporting the test suite and making the new assembly work. check-in: e3c75bc864 user: mistachkin tags: ef6 | |
Changes to Externals/Eagle/lib/Eagle1.0/vendor.eagle.
︙ | |||
181 182 183 184 185 186 187 | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 | - - + + | # NOTE: Check for any overridden settings that may have been specified via # the command line, etc. # checkForTestOverrides stdout [expr {[info exists test_overrides] ? \ $test_overrides : [list binary_directory build_base_directory \ build_directory common_directory connection_flags database_directory \ datetime_format release_version scratch_directory temporary_directory \ |
︙ |
Changes to SQLite.Beta.nuspec.
︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 | 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 | + + + + + + + + + + + | <language>en-US</language> <projectUrl>http://system.data.sqlite.org/</projectUrl> <iconUrl>http://system.data.sqlite.org/images/sqlite32.png</iconUrl> <licenseUrl>http://www.sqlite.org/copyright.html</licenseUrl> <tags>sqlite database ado.net provider interop</tags> <copyright>Public Domain</copyright> </metadata> <dependencies> <group targetFramework="net40"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> <group targetFramework="net45"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> <group targetFramework="net451"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> </dependencies> <files> <file src="bin\2008\Release\bin\System.Data.SQLite.dll" target="lib\net20" /> <file src="bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" /> <file src="bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" /> <file src="bin\2010\Release\bin\System.Data.SQLite.xml" target="lib\net40" /> <file src="bin\2012\Release\bin\System.Data.SQLite.dll" target="lib\net45" /> <file src="bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" /> |
︙ |
Changes to SQLite.MSIL.nuspec.
︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 | 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 | + + + + + + + + + + + | <language>en-US</language> <projectUrl>http://system.data.sqlite.org/</projectUrl> <iconUrl>http://system.data.sqlite.org/images/sqlite32.png</iconUrl> <licenseUrl>http://www.sqlite.org/copyright.html</licenseUrl> <tags>sqlite database ado.net provider interop</tags> <copyright>Public Domain</copyright> </metadata> <dependencies> <group targetFramework="net40"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> <group targetFramework="net45"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> <group targetFramework="net451"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> </dependencies> <files> <file src="bin\2008\Release\bin\System.Data.SQLite.dll" target="lib\net20" /> <file src="bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" /> <file src="bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" /> <file src="bin\2010\Release\bin\System.Data.SQLite.xml" target="lib\net40" /> <file src="bin\2012\Release\bin\System.Data.SQLite.dll" target="lib\net45" /> <file src="bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" /> |
︙ |
Changes to SQLite.nuspec.
︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 | 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 | + + + + + + + + + + + | <language>en-US</language> <projectUrl>http://system.data.sqlite.org/</projectUrl> <iconUrl>http://system.data.sqlite.org/images/sqlite32.png</iconUrl> <licenseUrl>http://www.sqlite.org/copyright.html</licenseUrl> <tags>sqlite database ado.net provider interop</tags> <copyright>Public Domain</copyright> </metadata> <dependencies> <group targetFramework="net40"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> <group targetFramework="net45"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> <group targetFramework="net451"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> </dependencies> <files> <file src="bin\2008\Release\bin\System.Data.SQLite.dll" target="lib\net20" /> <file src="bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" /> <file src="bin\2010\Release\bin\System.Data.SQLite.dll" target="lib\net40" /> <file src="bin\2010\Release\bin\System.Data.SQLite.xml" target="lib\net40" /> <file src="bin\2012\Release\bin\System.Data.SQLite.dll" target="lib\net45" /> <file src="bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" /> |
︙ |
Changes to SQLite.x64.nuspec.
︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 | 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 | + + + + + + + + + + + | <language>en-US</language> <projectUrl>http://system.data.sqlite.org/</projectUrl> <iconUrl>http://system.data.sqlite.org/images/sqlite32.png</iconUrl> <licenseUrl>http://www.sqlite.org/copyright.html</licenseUrl> <tags>sqlite database ado.net provider interop</tags> <copyright>Public Domain</copyright> </metadata> <dependencies> <group targetFramework="net40"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> <group targetFramework="net45"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> <group targetFramework="net451"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> </dependencies> <files> <file src="bin\2008\x64\ReleaseStatic\System.Data.SQLite.dll" target="lib\net20" /> <file src="bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" /> <file src="bin\2010\x64\ReleaseStatic\System.Data.SQLite.dll" target="lib\net40" /> <file src="bin\2010\Release\bin\System.Data.SQLite.xml" target="lib\net40" /> <file src="bin\2012\x64\ReleaseStatic\System.Data.SQLite.dll" target="lib\net45" /> <file src="bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" /> |
︙ |
Changes to SQLite.x86.nuspec.
︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 | 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 | + + + + + + + + + + + | <language>en-US</language> <projectUrl>http://system.data.sqlite.org/</projectUrl> <iconUrl>http://system.data.sqlite.org/images/sqlite32.png</iconUrl> <licenseUrl>http://www.sqlite.org/copyright.html</licenseUrl> <tags>sqlite database ado.net provider interop</tags> <copyright>Public Domain</copyright> </metadata> <dependencies> <group targetFramework="net40"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> <group targetFramework="net45"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> <group targetFramework="net451"> <dependency id="EntityFramework" version="6.0.0.0" /> </group> </dependencies> <files> <file src="bin\2008\Win32\ReleaseStatic\System.Data.SQLite.dll" target="lib\net20" /> <file src="bin\2008\Release\bin\System.Data.SQLite.xml" target="lib\net20" /> <file src="bin\2010\Win32\ReleaseStatic\System.Data.SQLite.dll" target="lib\net40" /> <file src="bin\2010\Release\bin\System.Data.SQLite.xml" target="lib\net40" /> <file src="bin\2012\Win32\ReleaseStatic\System.Data.SQLite.dll" target="lib\net45" /> <file src="bin\2012\Release\bin\System.Data.SQLite.xml" target="lib\net45" /> |
︙ |
Changes to Setup/clean.bat.
︙ | |||
238 239 240 241 242 243 244 245 246 247 248 249 250 251 | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 | + + + + + + + + + + + + + + + + | %_AECHO% Deleted "%SOURCE%\Doc\SQLite.NET.chw". %_AECHO%. ) ) ELSE ( %_AECHO% No files matching "%SOURCE%\Doc\SQLite.NET.chw" exist. %_AECHO%. ) IF EXIST "%SOURCE%\Externals\Eagle\bin\EntityFramework.*" ( %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\EntityFramework.*" IF ERRORLEVEL 1 ( ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\EntityFramework.*". ECHO. GOTO errors ) ELSE ( %_AECHO% Deleted "%SOURCE%\Externals\Eagle\bin\EntityFramework.*". %_AECHO%. ) ) ELSE ( %_AECHO% No files matching "%SOURCE%\Externals\Eagle\bin\EntityFramework.*" exist. %_AECHO%. ) IF EXIST "%SOURCE%\Externals\Eagle\bin\sqlite3.*" ( %__ECHO% DEL /Q "%SOURCE%\Externals\Eagle\bin\sqlite3.*" IF ERRORLEVEL 1 ( ECHO Could not delete "%SOURCE%\Externals\Eagle\bin\sqlite3.*". ECHO. |
︙ |
Changes to System.Data.SQLite.Linq/Properties/Resources.Designer.cs.
1 2 3 | 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 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | - + + - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/DmlSqlGenerator.cs.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + - + + + + | //--------------------------------------------------------------------- // <copyright file="DmlSqlGenerator.cs" company="Microsoft"> // Portions of this file copyright (c) Microsoft Corporation // and are released under the Microsoft Pulic License. See // http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx // or License.txt for details. // All rights reserved. // </copyright> //--------------------------------------------------------------------- #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/ISqlFragment.cs.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + - + + + + | //--------------------------------------------------------------------- // <copyright file="ISqlFragment.cs" company="Microsoft"> // Portions of this file copyright (c) Microsoft Corporation // and are released under the Microsoft Pulic License. See // http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx // or License.txt for details. // All rights reserved. // </copyright> //--------------------------------------------------------------------- #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/InternalBase.cs.
1 2 3 4 5 6 7 8 9 10 11 12 13 | 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 | + - + + + + | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ using System.Text; #if NET_40 || NET_45 || NET_451 using System.Runtime; #endif #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/JoinSymbol.cs.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + - + + + + | //--------------------------------------------------------------------- // <copyright file="JoinSymbol.cs" company="Microsoft"> // Portions of this file copyright (c) Microsoft Corporation // and are released under the Microsoft Pulic License. See // http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx // or License.txt for details. // All rights reserved. // </copyright> //--------------------------------------------------------------------- #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/KeyToListMap.cs.
︙ | |||
10 11 12 13 14 15 16 | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | + - + + + + | using System.Collections.ObjectModel; using System.Collections; #if NET_40 || NET_45 || NET_451 using System.Runtime; #endif #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/MetadataHelpers.cs.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + - + + + + | //--------------------------------------------------------------------- // <copyright file="MetadataHelpers.cs" company="Microsoft"> // Portions of this file copyright (c) Microsoft Corporation // and are released under the Microsoft Pulic License. See // http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx // or License.txt for details. // All rights reserved. // </copyright> //--------------------------------------------------------------------- #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/SkipClause.cs.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + - + + + + | //--------------------------------------------------------------------- // <copyright file="SkipClause.cs" company="Microsoft"> // Portions of this file copyright (c) Microsoft Corporation // and are released under the Microsoft Pulic License. See // http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx // or License.txt for details. // All rights reserved. // </copyright> //--------------------------------------------------------------------- #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/SqlBuilder.cs.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + - + + + + | //--------------------------------------------------------------------- // <copyright file="SqlBuilder.cs" company="Microsoft"> // Portions of this file copyright (c) Microsoft Corporation // and are released under the Microsoft Pulic License. See // http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx // or License.txt for details. // All rights reserved. // </copyright> //--------------------------------------------------------------------- #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/SqlChecker.cs.
1 2 3 4 5 6 7 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | + - + + + + | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/SqlGenerator.cs.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + - + + + + | //--------------------------------------------------------------------- // <copyright file="SqlGenerator.cs" company="Microsoft"> // Portions of this file copyright (c) Microsoft Corporation // and are released under the Microsoft Pulic License. See // http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx // or License.txt for details. // All rights reserved. // </copyright> //--------------------------------------------------------------------- #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/SqlSelectStatement.cs.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + - + + + + | //--------------------------------------------------------------------- // <copyright file="SqlSelectStatement.cs" company="Microsoft"> // Portions of this file copyright (c) Microsoft Corporation // and are released under the Microsoft Pulic License. See // http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx // or License.txt for details. // All rights reserved. // </copyright> //--------------------------------------------------------------------- #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/SqlWriter.cs.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + - + + + + | //--------------------------------------------------------------------- // <copyright file="SqlWriter.cs" company="Microsoft"> // Portions of this file copyright (c) Microsoft Corporation // and are released under the Microsoft Pulic License. See // http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx // or License.txt for details. // All rights reserved. // </copyright> //--------------------------------------------------------------------- #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/StringUtil.cs.
︙ | |||
10 11 12 13 14 15 16 | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | + - + + + + | using System.Globalization; using System.Collections; #if NET_40 || NET_45 || NET_451 using System.Runtime; #endif #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/Symbol.cs.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + - + + + + | //--------------------------------------------------------------------- // <copyright file="Symbol.cs" company="Microsoft"> // Portions of this file copyright (c) Microsoft Corporation // and are released under the Microsoft Pulic License. See // http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx // or License.txt for details. // All rights reserved. // </copyright> //--------------------------------------------------------------------- #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/SymbolPair.cs.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + - + + + + | //--------------------------------------------------------------------- // <copyright file="SymbolPair.cs" company="Microsoft"> // Portions of this file copyright (c) Microsoft Corporation // and are released under the Microsoft Pulic License. See // http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx // or License.txt for details. // All rights reserved. // </copyright> //--------------------------------------------------------------------- #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/SymbolTable.cs.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + - + + + + | //--------------------------------------------------------------------- // <copyright file="SymbolTable.cs" company="Microsoft"> // Portions of this file copyright (c) Microsoft Corporation // and are released under the Microsoft Pulic License. See // http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx // or License.txt for details. // All rights reserved. // </copyright> //--------------------------------------------------------------------- #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQL Generation/TopClause.cs.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + - + + + + | //--------------------------------------------------------------------- // <copyright file="TopClause.cs" company="Microsoft"> // Portions of this file copyright (c) Microsoft Corporation // and are released under the Microsoft Pulic License. See // http://archive.msdn.microsoft.com/EFSampleProvider/Project/License.aspx // or License.txt for details. // All rights reserved. // </copyright> //--------------------------------------------------------------------- #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/SQLiteProviderFactory.cs.
1 2 3 4 5 6 7 | 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 | + - + + + + - - + | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ #if USE_ENTITY_FRAMEWORK_6 |
︙ | |||
126 127 128 129 130 131 132 | 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | + - + + + | #region IDisposable "Pattern" Members private bool disposed; private void CheckDisposed() /* throw */ { #if THROW_ON_DISPOSED if (disposed) { |
︙ |
Changes to System.Data.SQLite.Linq/SQLiteProviderManifest.cs.
1 2 3 4 5 6 7 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | + - + + + + | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ #if USE_ENTITY_FRAMEWORK_6 |
︙ | |||
41 42 43 44 45 46 47 | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | - + | : base(SQLiteProviderManifest.GetProviderManifest()) { _dateFormat = (SQLiteDateFormats)Enum.Parse(typeof(SQLiteDateFormats), manifestToken, true); } internal static XmlReader GetProviderManifest() { |
︙ | |||
300 301 302 303 304 305 306 | 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 | - + - + | default: throw new NotSupportedException(String.Format("There is no store type corresponding to the EDM type '{0}' of primitive type '{1}'.", edmType, primitiveType.PrimitiveTypeKind)); } } private XmlReader GetStoreSchemaMapping() { |
︙ |
Changes to System.Data.SQLite.Linq/SQLiteProviderServices.cs.
1 2 3 4 5 6 7 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | + - + + + + | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ #if USE_ENTITY_FRAMEWORK_6 |
︙ |
Changes to System.Data.SQLite.Linq/System.Data.SQLite.Core.2010.csproj.
︙ | |||
86 87 88 89 90 91 92 | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | - + - + - + - + - + - + | <Compile Include="SQL Generation\TopClause.cs" /> <Compile Include="SQLiteProviderFactory.cs" /> <Compile Include="SQLiteProviderManifest.cs" /> <Compile Include="SQLiteProviderServices.cs" /> </ItemGroup> <ItemGroup Condition="'$(UseEntityFramework6)' == 'false'"> <EmbeddedResource Include="Resources\SQLiteProviderServices.StoreSchemaDefinition.Linq.ssdl"> |
︙ |
Changes to System.Data.SQLite.Linq/System.Data.SQLite.Core.2012.csproj.
︙ | |||
84 85 86 87 88 89 90 | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 | - + - + - + - + - + - + | <Compile Include="SQL Generation\TopClause.cs" /> <Compile Include="SQLiteProviderFactory.cs" /> <Compile Include="SQLiteProviderManifest.cs" /> <Compile Include="SQLiteProviderServices.cs" /> </ItemGroup> <ItemGroup Condition="'$(UseEntityFramework6)' == 'false'"> <EmbeddedResource Include="Resources\SQLiteProviderServices.StoreSchemaDefinition.Linq.ssdl"> |
︙ |
Changes to System.Data.SQLite.Linq/System.Data.SQLite.Core.2013.csproj.
︙ | |||
84 85 86 87 88 89 90 | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 | - + - + - + - + - + - + | <Compile Include="SQL Generation\TopClause.cs" /> <Compile Include="SQLiteProviderFactory.cs" /> <Compile Include="SQLiteProviderManifest.cs" /> <Compile Include="SQLiteProviderServices.cs" /> </ItemGroup> <ItemGroup Condition="'$(UseEntityFramework6)' == 'false'"> <EmbeddedResource Include="Resources\SQLiteProviderServices.StoreSchemaDefinition.Linq.ssdl"> |
︙ |
Changes to System.Data.SQLite.Linq/System.Data.SQLite.Linq.2008.csproj.
︙ | |||
74 75 76 77 78 79 80 | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | - + - + - + - + - + | <Compile Include="SQL Generation\TopClause.cs" /> <Compile Include="SQLiteProviderFactory.cs" /> <Compile Include="SQLiteProviderManifest.cs" /> <Compile Include="SQLiteProviderServices.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Resources\SQLiteProviderServices.StoreSchemaDefinition.ssdl"> |
︙ |
Changes to System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs.
︙ | |||
63 64 65 66 67 68 69 | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | - + | [ReflectionPermission(SecurityAction.Assert, MemberAccess = true)] private object GetSQLiteProviderServicesInstance() { if (_sqliteServices == null) { Version version = this.GetType().Assembly.GetName().Version; |
︙ |
Changes to Tests/Installer_Test_Vs2010.log.
1 2 3 | 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 | + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + | Installer.exe: #1: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. Installer.exe: #2: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" Installer.exe: #3: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.Linq.dll]]" Installer.exe: #4: Configuration.IsEf6AssemblyAvailable: Entity Framework 6 assembly was resolved. Installer.exe: #5: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" |
Changes to Tests/Installer_Test_Vs2012.log.
1 2 3 | 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 | + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + | Installer.exe: #1: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. Installer.exe: #2: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" Installer.exe: #3: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.Linq.dll]]" Installer.exe: #4: Configuration.IsEf6AssemblyAvailable: Entity Framework 6 assembly was resolved. Installer.exe: #5: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" |
Changes to Tests/Installer_Test_Vs2013.log.
1 2 3 | 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 | + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + | Installer.exe: #1: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. Installer.exe: #2: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.dll]]" Installer.exe: #3: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.Linq.dll]]" Installer.exe: #4: Configuration.IsEf6AssemblyAvailable: Entity Framework 6 assembly was resolved. Installer.exe: #5: Installer.Main: GacInstall: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" |
Changes to Tests/Uninstaller_Test_Vs2010.log.
1 2 | 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 | + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | Installer.exe: #1: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. Installer.exe: #2: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" Installer.exe: #3: Configuration.IsEf6AssemblyAvailable: Entity Framework 6 assembly was resolved. Installer.exe: #4: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" |
Changes to Tests/Uninstaller_Test_Vs2012.log.
1 2 | 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 | + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | Installer.exe: #1: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. Installer.exe: #2: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" Installer.exe: #3: Configuration.IsEf6AssemblyAvailable: Entity Framework 6 assembly was resolved. Installer.exe: #4: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" |
Changes to Tests/Uninstaller_Test_Vs2013.log.
1 2 | 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 | + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | Installer.exe: #1: Configuration.Process: No actual changes will be made to this system because "what-if" mode is enabled. Installer.exe: #2: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] SQLite.Designer.dll]]" Installer.exe: #3: Configuration.IsEf6AssemblyAvailable: Entity Framework 6 assembly was resolved. Installer.exe: #4: Installer.Main: GacRemove: assemblyPath = "[file nativename [file join [getBuildDirectory] System.Data.SQLite.EF6.dll]]" |
Changes to Tests/basic.eagle.
︙ | |||
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 | 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 | + + + + + + | ############################################################################### # # NOTE: Setup the variables that refer to the various files required by the # tests in this file. # set entityFrameworkDllFile [getBuildFileName EntityFramework.dll] set systemDataSQLiteDllFile [getBuildFileName System.Data.SQLite.dll] set systemDataSQLiteLinqDllFile [getBuildFileName System.Data.SQLite.Linq.dll] set systemDataSQLiteEf6DllFile [getBuildFileName System.Data.SQLite.EF6.dll] set testExeFile [getBuildFileName test.exe] set testLinqExeFile [getBuildFileName testlinq.exe] set testEf6ExeFile [getBuildFileName testef6.exe] set testLinqOutFile [file nativename [file join $path testlinq.out]] set northwindEfDbFile [file nativename [file join [file dirname $path] \ testlinq northwindEF.db]] # # NOTE: Setup the test constraints specific to the tests in this file. # if {![haveConstraint [appendArgs file_ \ [file tail $entityFrameworkDllFile]]]} then { checkForFile $test_channel $entityFrameworkDllFile } if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteDllFile]]]} then { checkForFile $test_channel $systemDataSQLiteDllFile } if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteLinqDllFile]]]} then { |
︙ | |||
186 187 188 189 190 191 192 | 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 | - + | list $code [string equal $output [readFile $testLinqOutFile]] \ [expr {$code == 0 ? "" : $error}] } -cleanup { catch {object invoke Console OutputEncoding $savedEncoding} unset -nocomplain code output error savedEncoding encoding } -constraints \ |
︙ | |||
1348 1349 1350 1351 1352 1353 1354 | 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 | - - + + | \{System\.Reflection\.TargetInvocationException: Exception has been thrown by\ the target of an invocation\. ---> System\.Data\.SQLite\.SQLiteException:\ interrupted.*$}} ############################################################################### runTest {test data-1.24 {LINQ SQL_CONSTRAINTCOLUMNS resource} -body { |
︙ | |||
1374 1375 1376 1377 1378 1379 1380 | 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 | - - + + | FKEY_FROM_COLUMN FROM TEMP.SCHEMAFOREIGNKEYS; }} ############################################################################### runTest {test data-1.25 {LINQ SQL_CONSTRAINTS resource} -body { |
︙ | |||
1486 1487 1488 1489 1490 1491 1492 | 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 | - + | runTest {test data-1.27 {LINQ ISQLiteSchemaExtensions.BuildTempSchema} -setup { setupDb [set fileName data-1.27.db] } -body { set connection [getDbConnection] set providerServices [object invoke -flags +NonPublic \ |
︙ | |||
2755 2756 2757 2758 2759 2760 2761 | 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 | - + | reportSQLiteResources $test_channel ############################################################################### unset -nocomplain northwindEfDbFile testLinqOutFile testEf6ExeFile \ testLinqExeFile testExeFile sqliteDesignerDllFile \ systemDataSQLiteEf6DllFile systemDataSQLiteLinqDllFile \ |
Changes to Tests/common.eagle.
︙ | |||
107 108 109 110 111 112 113 114 115 116 117 118 119 120 | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | } else { # # NOTE: Use the default list of test years. # return [list 2005 2008 2010 2012 2013] } } proc getBuildNetFx {} { # # NOTE: See if the test .NET Framework setting has been overridden by # the user (e.g. on the command line). # if {[info exists ::test_net_fx] && \ [string length $::test_net_fx] > 0} then { # # NOTE: Use the specified test .NET Framework. # return $::test_net_fx } else { set year [getBuildYear] switch -exact -- $year { 2005 { return netFx20 } 2008 { return netFx35 } 2010 { return netFx40 } 2012 { return netFx45 } 2013 { return netFx451 } default { return "" } } } } proc getBuildPlatform { native } { if {[info exists ::test_platform] && \ [string length $::test_platform] > 0} then { # # NOTE: Use the specified test platform. If this variable is not set, # the default value will be based on the machine architecture. |
︙ | |||
509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 | 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 | + + + + + + + + + + + + + + + + | # NOTE: Returns the specified file name as if it were located in the # build directory, discarding any directory information present # in the file name as provided by our caller. # return [file nativename \ [file join [getBuildDirectory] $platform [file tail $fileName]]] } proc getExternalDirectory {} { # # NOTE: This procedure returns the directory where the external binary # files are located. # return [file nativename [file dirname [file dirname [info binary]]]] } proc getBinaryDirectory {} { # # NOTE: This procedure returns the directory where the test application # itself (i.e. the Eagle shell) is located. This will be used as # the destination for the copied System.Data.SQLite native and # managed assemblies (i.e. because this is one of the few places # where the CLR will actually find and load them properly). # if {[info exists ::binary_directory] && \ [string length $::binary_directory] > 0} then { # # NOTE: The location of the binary directory has been overridden; # therefore, use it verbatim. # return $::binary_directory } else { return [info binary] } } proc getExternalFileName { fileName } { # # NOTE: Returns the specified file name as if it were located in the # directory containing the external binaries. # return [file nativename [file join [getExternalDirectory] $fileName]] } proc getBinaryFileName { fileName {platform ""} } { # # NOTE: Returns the specified file name as if it were located in the # binary directory, discarding any directory information present # in the file name as provided by our caller. # |
︙ | |||
756 757 758 759 760 761 762 763 764 765 766 767 768 769 | 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | # return [uplevel 1 [list subst [appendArgs $prefix { if {[hasRuntimeOption native]} then { object invoke Interpreter.GetActive AddRuntimeOption native } } [getTestOverridesPreamble [list path test_channel]] $suffix]]] } proc tryCopyExternalFile { fileName {platform ""} {newFileName ""} } { set sourceFileName [getExternalFileName $fileName] if {![file exists $sourceFileName]} then { tputs $::test_channel [appendArgs \ "---- skipped copying external file \"" $sourceFileName \ "\", it does not exist\n"] return } if {[string length $newFileName] > 0} then { set targetFileName [getBinaryFileName $newFileName $platform] } else { set targetFileName [getBinaryFileName $fileName $platform] } set targetDirectory [file dirname $targetFileName] if {[catch { if {![file exists $targetDirectory]} then { file mkdir $targetDirectory } file copy -force $sourceFileName $targetFileName}] == 0} then { tputs $::test_channel [appendArgs \ "---- copied external file from \"" $sourceFileName "\" to \"" \ $targetFileName \"\n] } else { tputs $::test_channel [appendArgs \ "---- failed to copy external file from \"" $sourceFileName \ "\" to \"" $targetFileName \"\n] } } proc tryCopyBinaryFile { fileName {platform ""} {newFileName ""} } { set sourceFileName [getBinaryFileName $fileName $platform] if {![file exists $sourceFileName]} then { tputs $::test_channel [appendArgs \ "---- skipped copying binary file \"" $sourceFileName \ |
︙ | |||
2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 | 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 | + + + + + + + + + | # NOTE: Build a list of auxiliary Managed Debugging Assistants (MDA) # configuration files that we handle. # set mdaConfigFileNames [list \ Installer.exe.mda.config test.exe.mda.config \ testlinq.exe.mda.config testef6.exe.mda.config] # # NOTE: Build the list of external files that we handle. Some of # these files may be native and/or managed assemblies that are # required to perform various tests. # set externalFileNames [list \ [file join EntityFramework lib [string map [list Fx ""] [string \ map [list netFx451 netFx45] [getBuildNetFx]]] EntityFramework.dll]] # # NOTE: Build the list of native assembly files that we handle. The # reason the "System.Data.SQLite.dll" file is included here is # because it could be the mixed-mode assembly. # set nativeFileNames [list \ sqlite3.dll SQLite.Interop.dll System.Data.SQLite.dll] |
︙ | |||
2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 | 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 | + + + + | foreach fileName $configFileNames { removeConstraint [appendArgs file_ $fileName] } foreach fileName $mdaConfigFileNames { removeConstraint [appendArgs file_ $fileName] } foreach fileName $externalFileNames { removeConstraint [appendArgs file_ [file tail $fileName]] } foreach fileName $nativeFileNames { removeConstraint [appendArgs file_ $fileName] } foreach fileName $managedFileNames { removeConstraint [appendArgs file_ $fileName] |
︙ | |||
2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 | 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 | + + + + + + + + + + | # if {![info exists ::no(deleteSqliteFiles)]} then { if {![info exists ::no(deleteSqliteConfigFiles)]} then { foreach fileName $configFileNames { tryDeleteBinaryFile $fileName } } if {![info exists ::no(deleteSqliteExternalFiles)]} then { foreach fileName $mdaConfigFileNames { tryDeleteBuildFile $fileName } foreach fileName $externalFileNames { tryDeleteBinaryFile $fileName } } if {![info exists ::no(deleteSqliteNativeFiles)]} then { if {![info exists ::no(deleteSqliteImplicitFiles)]} then { foreach fileName $nativeFileNames { tryDeleteAssembly $fileName } } |
︙ | |||
2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 | 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 | + + + + + + + + + + + + + + + + + + | # if {![info exists ::no(copySqliteFiles)]} then { if {![info exists ::no(copySqliteConfigFiles)]} then { foreach fileName $configFileNames { tryCopyBuildFile $fileName } } if {![info exists ::no(copySqliteExternalFiles)]} then { # # NOTE: Copy the Managed Debugging Assistants (MDA) configuration # file for the Eagle shell to the build output directory, # while using each of the names of the various legacy test # executables. This will help to make sure that all the # legacy tests run with exactly the same set of Managed # Debugging Assistants configured. # foreach fileName $mdaConfigFileNames { tryCopyBinaryFile EagleShell.exe.mda.config "" $fileName } foreach fileName $externalFileNames { tryCopyExternalFile $fileName } } if {![info exists ::no(copySqliteNativeFiles)]} then { if {![info exists ::no(copySqliteImplicitFiles)]} then { foreach fileName $nativeFileNames { tryCopyAssembly $fileName } } |
︙ | |||
2543 2544 2545 2546 2547 2548 2549 | 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 | - - - - - - - - - - - - - - - - - - - - - - - - - - | if {![info exists ::no(loadSqliteArchitectureFiles)] && \ [string length $architecture] > 0} then { tryLoadAssembly System.Data.SQLite.dll $architecture } } } |
︙ | |||
2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 | 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 | + + + | # NOTE: Grab the list of native modules for the current process and # report on the System.Data.SQLite related ones. # set modules [object invoke \ System.Diagnostics.Process.GetCurrentProcess Modules] object foreach -alias module $modules { # # NOTE: The module file name here must be normalized. # set fileName [file normalize [$module FileName]] if {[string match -nocase */sqlite3.dll $fileName]} then { tputs $::test_channel [appendArgs \ "---- found loaded SQLite native library module: " \ $fileName \n] } elseif {[string match \ |
︙ |
Changes to Tests/installer.eagle.
︙ | |||
22 23 24 25 26 27 28 29 30 31 32 33 34 35 | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | + | # # NOTE: Setup the variables that refer to the various files required by the # tests in this file. # set systemDataSQLiteDllFile [getBuildFileName System.Data.SQLite.dll] set systemDataSQLiteLinqDllFile [getBuildFileName System.Data.SQLite.Linq.dll] set systemDataSQLiteEf6DllFile [getBuildFileName System.Data.SQLite.EF6.dll] set sqliteDesignerDllFile [getBuildFileName SQLite.Designer.dll] set installerExeFile [getBuildFileName Installer.exe] # # NOTE: The various install/uninstall log files used to test the design-time # component installer. # |
︙ | |||
71 72 73 74 75 76 77 78 79 80 81 82 83 84 | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | + + + + + | checkForFile $test_channel $systemDataSQLiteDllFile } if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteLinqDllFile]]]} then { checkForFile $test_channel $systemDataSQLiteLinqDllFile } if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteEf6DllFile]]]} then { checkForFile $test_channel $systemDataSQLiteEf6DllFile } if {![haveConstraint [appendArgs file_ \ [file tail $sqliteDesignerDllFile]]]} then { checkForFile $test_channel $sqliteDesignerDllFile } if {![haveConstraint [appendArgs file_ \ |
︙ | |||
325 326 327 328 329 330 331 | 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 | + - + | } -cleanup { cleanupFile $fileName unset -nocomplain wow64 is64 code output error fileName } -constraints {eagle administrator buildYear.2010 visualStudio2010\ System.Data.SQLite.dll_v4.0.30319 file_Installer.exe testExec\ file_System.Data.SQLite.dll file_System.Data.SQLite.Linq.dll\ file_System.Data.SQLite.EF6.dll file_SQLite.Designer.dll\ |
︙ | |||
364 365 366 367 368 369 370 | 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 | + - + | } -cleanup { cleanupFile $fileName unset -nocomplain wow64 is64 code output error fileName } -constraints {eagle administrator buildYear.2010 visualStudio2010\ System.Data.SQLite.dll_v4.0.30319 file_Installer.exe testExec\ file_System.Data.SQLite.dll file_System.Data.SQLite.Linq.dll\ file_System.Data.SQLite.EF6.dll file_SQLite.Designer.dll\ |
︙ | |||
404 405 406 407 408 409 410 | 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 | + - + | } -cleanup { cleanupFile $fileName unset -nocomplain wow64 is64 code output error fileName } -constraints {eagle administrator buildYear.2012 visualStudio2012\ System.Data.SQLite.dll_v4.0.30319 file_Installer.exe testExec\ file_System.Data.SQLite.dll file_System.Data.SQLite.Linq.dll\ file_System.Data.SQLite.EF6.dll file_SQLite.Designer.dll\ |
︙ | |||
444 445 446 447 448 449 450 | 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 | + - + | } -cleanup { cleanupFile $fileName unset -nocomplain wow64 is64 code output error fileName } -constraints {eagle administrator buildYear.2012 visualStudio2012\ System.Data.SQLite.dll_v4.0.30319 file_Installer.exe testExec\ file_System.Data.SQLite.dll file_System.Data.SQLite.Linq.dll\ file_System.Data.SQLite.EF6.dll file_SQLite.Designer.dll\ |
︙ | |||
484 485 486 487 488 489 490 | 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 | + - + | } -cleanup { cleanupFile $fileName unset -nocomplain wow64 is64 code output error fileName } -constraints {eagle administrator buildYear.2013 visualStudio2013\ System.Data.SQLite.dll_v4.0.30319 file_Installer.exe testExec\ file_System.Data.SQLite.dll file_System.Data.SQLite.Linq.dll\ file_System.Data.SQLite.EF6.dll file_SQLite.Designer.dll\ |
︙ | |||
524 525 526 527 528 529 530 | 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 | + - + + - + | } -cleanup { cleanupFile $fileName unset -nocomplain wow64 is64 code output error fileName } -constraints {eagle administrator buildYear.2013 visualStudio2013\ System.Data.SQLite.dll_v4.0.30319 file_Installer.exe testExec\ file_System.Data.SQLite.dll file_System.Data.SQLite.Linq.dll\ file_System.Data.SQLite.EF6.dll file_SQLite.Designer.dll\ |
Changes to Tests/tkt-00f86f9739.eagle.
︙ | |||
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 | 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 | + + + + + + | ############################################################################### # # NOTE: Setup the variables that refer to the various files required by the # tests in this file. # set entityFrameworkDllFile [getBuildFileName EntityFramework.dll] set systemDataSQLiteDllFile [getBuildFileName System.Data.SQLite.dll] set systemDataSQLiteLinqDllFile [getBuildFileName System.Data.SQLite.Linq.dll] set systemDataSQLiteEf6DllFile [getBuildFileName System.Data.SQLite.EF6.dll] set testLinqExeFile [getBuildFileName testlinq.exe] set testEf6ExeFile [getBuildFileName testef6.exe] set northwindEfDbFile [file nativename [file join [file dirname $path] \ testlinq northwindEF.db]] # # NOTE: Setup the test constraints specific to the tests in this file. # if {![haveConstraint [appendArgs file_ \ [file tail $entityFrameworkDllFile]]]} then { checkForFile $test_channel $entityFrameworkDllFile } if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteDllFile]]]} then { checkForFile $test_channel $systemDataSQLiteDllFile } if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteLinqDllFile]]]} then { |
︙ | |||
61 62 63 64 65 66 67 68 69 70 71 72 73 74 | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | + + + + + + + | if {![haveConstraint [appendArgs file_ [file tail $northwindEfDbFile]]]} then { checkForFile $test_channel $northwindEfDbFile } ############################################################################### runTest {test tkt-00f86f9739-1.1 {LINQ with StartsWith} -body { # # NOTE: Re-copy the reference database file used for this unit test to the # build directory in case it has been changed by a previous test run. # file copy -force $northwindEfDbFile \ [file join [getBuildDirectory] [file tail $northwindEfDbFile]] set result [list] foreach value [list "" a b z 1+1 don notthere] { set output "" set code [catch { testClrExec $testLinqExeFile [list -eventflags Wait -directory \ |
︙ | |||
98 99 100 101 102 103 104 | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | - + + + + + + + + - - + + | file_System.Data.SQLite.dll file_System.Data.SQLite.Linq.dll file_testlinq.exe\ file_northwindEF.db} -result {0 {} 0 {DRACD OLDWO RATTC} 0 {ALFKI CACTU CHOPS\ FOLKO GALED KOENE LILAS MAGAA MAISD OCEAN RANCH SAVEA THECR} 0 {} 0 {} 0 {} 0\ {}}} ############################################################################### |
︙ | |||
129 130 131 132 133 134 135 | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | + - - - + + + - + - - + + | set result } -cleanup { unset -nocomplain code output error result value } -constraints \ {eagle monoToDo defineConstant.System.Data.SQLite.USE_INTEROP_DLL\ defineConstant.System.Data.SQLite.INTEROP_EXTENSION_FUNCTIONS SQLite testExec\ file_EntityFramework.dll file_System.Data.SQLite.dll\ |
Changes to Tests/tkt-59edc1018b.eagle.
︙ | |||
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 | 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 | + + + + + + + + + + + + + + + + + + | # # NOTE: Setup the variables that refer to the various files required by the # tests in this file. # set systemDataSQLiteDllFile [getBuildFileName System.Data.SQLite.dll] set systemDataSQLiteLinqDllFile [getBuildFileName System.Data.SQLite.Linq.dll] set systemDataSQLiteEf6DllFile [getBuildFileName System.Data.SQLite.EF6.dll] set testLinqExeFile [getBuildFileName testlinq.exe] set testEf6ExeFile [getBuildFileName testef6.exe] set northwindEfDbFile [file nativename [file join [file dirname $path] \ testlinq northwindEF.db]] # # NOTE: Setup the test constraints specific to the tests in this file. # if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteDllFile]]]} then { checkForFile $test_channel $systemDataSQLiteDllFile } if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteLinqDllFile]]]} then { checkForFile $test_channel $systemDataSQLiteLinqDllFile } if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteEf6DllFile]]]} then { checkForFile $test_channel $systemDataSQLiteEf6DllFile } if {![haveConstraint [appendArgs file_ [file tail $testLinqExeFile]]]} then { checkForFile $test_channel $testLinqExeFile } if {![haveConstraint [appendArgs file_ [file tail $testEf6ExeFile]]]} then { checkForFile $test_channel $testEf6ExeFile } if {![haveConstraint [appendArgs file_ [file tail $northwindEfDbFile]]]} then { checkForFile $test_channel $northwindEfDbFile } ############################################################################### runTest {test tkt-59edc1018b-1.1 {LINQ with EndsWith} -body { # # NOTE: Re-copy the reference database file used for this unit test to the # build directory in case it has been changed by a previous test run. # file copy -force $northwindEfDbFile \ [file join [getBuildDirectory] [file tail $northwindEfDbFile]] set result [list] foreach value [list "" a b z 1+1 don notthere] { set output "" set code [catch { testClrExec $testLinqExeFile [list -eventflags Wait -directory \ |
︙ | |||
86 87 88 89 90 91 92 | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + | defineConstant.System.Data.SQLite.INTEROP_EXTENSION_FUNCTIONS SQLite testExec\ file_System.Data.SQLite.dll file_System.Data.SQLite.Linq.dll file_testlinq.exe\ file_northwindEF.db} -result {0 {} 0 {FURIB GALED GODOS LAZYK LINOD PRINI REGGC\ WOLZA} 0 {} 0 ERNSH 0 {} 0 {AROUT BSBEV CONSH EASTC NORTS SEVES} 0 {}}} ############################################################################### runTest {test tkt-59edc1018b-1.2 {EF6 with EndsWith} -body { # # NOTE: Re-copy the reference database file used for this unit test to the # build directory in case it has been changed by a previous test run. # file copy -force $northwindEfDbFile \ [file join [getBuildDirectory] [file tail $northwindEfDbFile]] set result [list] foreach value [list "" a b z 1+1 don notthere] { set output "" set code [catch { testClrExec $testEf6ExeFile [list -eventflags Wait -directory \ [file dirname $testEf6ExeFile] -nocarriagereturns -stdout output \ -success 0] -endsWith $value } error] tlog "---- BEGIN STDOUT OUTPUT\n" tlog $output tlog "\n---- END STDOUT OUTPUT\n" lappend result $code if {$code == 0} then { lappend result [string trim $output] } else { lappend result [string trim $error] } } set result } -cleanup { unset -nocomplain code output error result value } -constraints \ {eagle monoToDo defineConstant.System.Data.SQLite.USE_INTEROP_DLL\ defineConstant.System.Data.SQLite.INTEROP_EXTENSION_FUNCTIONS SQLite testExec\ file_System.Data.SQLite.dll file_System.Data.SQLite.EF6.dll file_testef6.exe\ file_northwindEF.db} -result {0 {} 0 {FURIB GALED GODOS LAZYK LINOD PRINI REGGC\ WOLZA} 0 {} 0 ERNSH 0 {} 0 {AROUT BSBEV CONSH EASTC NORTS SEVES} 0 {}}} ############################################################################### unset -nocomplain northwindEfDbFile testEf6ExeFile testLinqExeFile \ |
Changes to Tests/tkt-8b7d179c3c.eagle.
︙ | |||
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 | 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 | + + + + + + + + + + + + + + + + + + | # # NOTE: Setup the variables that refer to the various files required by the # tests in this file. # set systemDataSQLiteDllFile [getBuildFileName System.Data.SQLite.dll] set systemDataSQLiteLinqDllFile [getBuildFileName System.Data.SQLite.Linq.dll] set systemDataSQLiteEf6DllFile [getBuildFileName System.Data.SQLite.EF6.dll] set testLinqExeFile [getBuildFileName testlinq.exe] set testEf6ExeFile [getBuildFileName testef6.exe] set northwindEfDbFile [file nativename [file join [file dirname $path] \ testlinq northwindEF.db]] # # NOTE: Setup the test constraints specific to the tests in this file. # if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteDllFile]]]} then { checkForFile $test_channel $systemDataSQLiteDllFile } if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteLinqDllFile]]]} then { checkForFile $test_channel $systemDataSQLiteLinqDllFile } if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteEf6DllFile]]]} then { checkForFile $test_channel $systemDataSQLiteEf6DllFile } if {![haveConstraint [appendArgs file_ [file tail $testLinqExeFile]]]} then { checkForFile $test_channel $testLinqExeFile } if {![haveConstraint [appendArgs file_ [file tail $testEf6ExeFile]]]} then { checkForFile $test_channel $testEf6ExeFile } if {![haveConstraint [appendArgs file_ [file tail $northwindEfDbFile]]]} then { checkForFile $test_channel $northwindEfDbFile } ############################################################################### runTest {test tkt-8b7d179c3c-1.1 {LINQ with Skip and Take} -body { # # NOTE: Re-copy the reference database file used for this unit test to the # build directory in case it has been changed by a previous test run. # file copy -force $northwindEfDbFile \ [file join [getBuildDirectory] [file tail $northwindEfDbFile]] set result [list] for {set pageSize 0} {$pageSize <= 2} {incr pageSize} { set output "" set code [catch { testClrExec $testLinqExeFile [list -eventflags Wait -directory \ |
︙ | |||
97 98 99 100 101 102 103 | 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 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 182 183 184 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + | BLAUS BONAP MEREP ANATR ANTON CENTC PERIC TORTU FRANK TOMSP DUMON FRANR WARTH\ PARIS SPECD LONEP THEBI REGGC VINET WELLI HANAR QUEDE RICAR PICCO HILAA LETSS\ COMMI FAMIA QUEEN TRADH WHITC GODOS SANTG BLONP WANDK FRANS LAMAI BOTTM LAUGB\ LACOR LAZYK WOLZA VAFFE}}} ############################################################################### runTest {test tkt-8b7d179c3c-1.2 {EF6 with Skip and Take} -body { # # NOTE: Re-copy the reference database file used for this unit test to the # build directory in case it has been changed by a previous test run. # file copy -force $northwindEfDbFile \ [file join [getBuildDirectory] [file tail $northwindEfDbFile]] set result [list] for {set pageSize 0} {$pageSize <= 2} {incr pageSize} { set output "" set code [catch { testClrExec $testEf6ExeFile [list -eventflags Wait -directory \ [file dirname $testEf6ExeFile] -nocarriagereturns -stdout output \ -success 0] -skip $pageSize } error] tlog "---- BEGIN STDOUT OUTPUT\n" tlog $output tlog "\n---- END STDOUT OUTPUT\n" lappend result $code if {$code == 0} then { lappend result [string trim $output] } else { lappend result [string trim $error] } } set result } -cleanup { unset -nocomplain code output error result pageSize } -constraints {eagle monoToDo SQLite file_System.Data.SQLite.dll testExec\ file_System.Data.SQLite.EF6.dll file_testef6.exe file_northwindEF.db} \ -result {0 {} 0 {DRACD RATTC OLDWO GALED LILAS MAGAA ALFKI CHOPS SAVEA KOENE\ MAISD FOLKO CACTU OCEAN RANCH THECR GOURL GROSR SUPRD HUNGO ISLAT QUICK HUNGC\ GREAL LEHMS RICSU ERNSH WILMK LINOD TRAIH SIMOB OTTIK SPLIR MORGK FOLIG FURIB\ PRINI AROUT BSBEV CONSH EASTC NORTS SEVES BERGS VICTE BOLID FISSA ROMEY BLAUS\ BONAP MEREP ANATR ANTON CENTC PERIC TORTU FRANK TOMSP DUMON FRANR WARTH PARIS\ SPECD LONEP THEBI REGGC VINET WELLI HANAR QUEDE RICAR PICCO HILAA LETSS COMMI\ FAMIA QUEEN TRADH WHITC GODOS SANTG BLONP WANDK FRANS LAMAI BOTTM LAUGB LACOR\ LAZYK WOLZA VAFFE} 0 {DRACD RATTC OLDWO GALED LILAS MAGAA ALFKI CHOPS SAVEA\ KOENE MAISD FOLKO CACTU OCEAN RANCH THECR GOURL GROSR SUPRD HUNGO ISLAT QUICK\ HUNGC GREAL LEHMS RICSU ERNSH WILMK LINOD TRAIH SIMOB OTTIK SPLIR MORGK FOLIG\ FURIB PRINI AROUT BSBEV CONSH EASTC NORTS SEVES BERGS VICTE BOLID FISSA ROMEY\ BLAUS BONAP MEREP ANATR ANTON CENTC PERIC TORTU FRANK TOMSP DUMON FRANR WARTH\ PARIS SPECD LONEP THEBI REGGC VINET WELLI HANAR QUEDE RICAR PICCO HILAA LETSS\ COMMI FAMIA QUEEN TRADH WHITC GODOS SANTG BLONP WANDK FRANS LAMAI BOTTM LAUGB\ LACOR LAZYK WOLZA VAFFE}}} ############################################################################### unset -nocomplain northwindEfDbFile testEf6ExeFile testLinqExeFile \ |
Changes to Tests/tkt-ccfa69fc32.eagle.
︙ | |||
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 | 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 | + + + + + + + + + + + - + + + + + + + + | # # NOTE: Setup the variables that refer to the various files required by the # tests in this file. # set systemDataSQLiteDllFile [getBuildFileName System.Data.SQLite.dll] set systemDataSQLiteLinqDllFile [getBuildFileName System.Data.SQLite.Linq.dll] set systemDataSQLiteEf6DllFile [getBuildFileName System.Data.SQLite.EF6.dll] set testLinqExeFile [getBuildFileName testlinq.exe] set testEf6ExeFile [getBuildFileName testef6.exe] set northwindEfDbFile [file nativename [file join [file dirname $path] \ testlinq northwindEF.db]] # # NOTE: Setup the test constraints specific to the tests in this file. # if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteDllFile]]]} then { checkForFile $test_channel $systemDataSQLiteDllFile } if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteLinqDllFile]]]} then { checkForFile $test_channel $systemDataSQLiteLinqDllFile } if {![haveConstraint [appendArgs file_ \ [file tail $systemDataSQLiteEf6DllFile]]]} then { checkForFile $test_channel $systemDataSQLiteEf6DllFile } if {![haveConstraint [appendArgs file_ [file tail $testLinqExeFile]]]} then { checkForFile $test_channel $testLinqExeFile } if {![haveConstraint [appendArgs file_ [file tail $testEf6ExeFile]]]} then { checkForFile $test_channel $testEf6ExeFile } if {![haveConstraint [appendArgs file_ [file tail $northwindEfDbFile]]]} then { checkForFile $test_channel $northwindEfDbFile } ############################################################################### |
︙ | |||
79 80 81 82 83 84 85 | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 | - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + | } set result } -cleanup { unset -nocomplain code output error result add } -constraints {eagle monoToDo SQLite file_System.Data.SQLite.dll testExec\ file_System.Data.SQLite.Linq.dll file_testlinq.exe file_northwindEF.db} -match \ |
Changes to testlinq/2010/EF6/App.config.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | - + - + | <?xml version="1.0"?> <configuration> <configSections> <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> </configSections> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite, Version=1.0.91.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> <remove invariant="System.Data.SQLite.EF6" /> |
Changes to testlinq/2012/EF6/App.config.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | - + - + | <?xml version="1.0"?> <configuration> <configSections> <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> </configSections> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite, Version=1.0.91.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> <remove invariant="System.Data.SQLite.EF6" /> |
Changes to testlinq/2013/EF6/App.config.
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | - + - + | <?xml version="1.0"?> <configuration> <configSections> <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> </configSections> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite, Version=1.0.91.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> <remove invariant="System.Data.SQLite.EF6" /> |
Changes to tools/install/Installer.cs.
︙ | |||
1137 1138 1139 1140 1141 1142 1143 | 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 | - + | return null; if (whatIf) { // // HACK: Attempt to open the specified sub-key. If this // fails, we will simply return the wrapped root key |
︙ | |||
1386 1387 1388 1389 1390 1391 1392 | 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 | - + | } #endregion /////////////////////////////////////////////////////////////////// #region Implicit Conversion Operators // |
︙ | |||
1526 1527 1528 1529 1530 1531 1532 | 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 | - + | debugCallback, traceCallback, String.Format( "rootKey = {0}, subKeyName = {1}, writable = {2}", ForDisplay(rootKey), ForDisplay(subKeyName), ForDisplay(writable)), traceCategory); // // HACK: Always forbid writable access when operating in |
︙ | |||
1559 1560 1561 1562 1563 1564 1565 | 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 | - + - + | ForDisplay(rootKey), ForDisplay(subKeyName)), traceCategory); try { // // HACK: Always open a key, rather than creating one when |
︙ | |||
2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 | 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | { // do nothing. } } return null; } /////////////////////////////////////////////////////////////////// private static bool IsEf6AssemblyAvailable() { try { Assembly assembly = Assembly.ReflectionOnlyLoad( Ef6AssemblyName); if (assembly != null) { TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, "Entity Framework 6 assembly was resolved.", traceCategory); return true; } } catch { // do nothing. } TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, "Entity Framework 6 assembly was not resolved.", traceCategory); return false; } #endregion /////////////////////////////////////////////////////////////////// #region Public Static Methods public static Configuration CreateDefault() { |
︙ | |||
3079 3080 3081 3082 3083 3084 3085 | 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 | - - + + | debugCallback, traceCallback, String.Format( "Running process is {0}.", Is64BitProcess() ? "64-bit" : "32-bit"), traceCategory); if (!configuration.whatIf) { // |
︙ | |||
3275 3276 3277 3278 3279 3280 3281 | 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 | - - - + + + + - - - - + + + + + + + - + + + | } /////////////////////////////////////////////////////////////////// public bool IsLinqSupported() { // |
︙ | |||
3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 | 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 | + + + + + | private const string Description = ".NET Framework Data Provider for SQLite"; /////////////////////////////////////////////////////////////////////// private const string CLRv2ImageRuntimeVersion = "v2.0.50727"; private const string CLRv4ImageRuntimeVersion = "v4.0.30319"; /////////////////////////////////////////////////////////////////////// private const string Ef6AssemblyName = "EntityFramework, " + "Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; /////////////////////////////////////////////////////////////////////// private const string NameAndValueFormat = "{0}: {1}"; private const string LogFileSuffix = ".log"; /////////////////////////////////////////////////////////////////////// |
︙ | |||
6345 6346 6347 6348 6349 6350 6351 | 6388 6389 6390 6391 6392 6393 6394 6395 6396 6397 6398 6399 6400 6401 6402 | - + | if (verbose) TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, ForDisplay(startInfo), traceCategory); // |
︙ |