System.Data.SQLite: Check-in [d28c029621]

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

Overview

Comment:	Start modifying the VS design-time installer to support EF6.
Downloads:	Tarball \| ZIP archive
Timelines:	family \| ancestors \| descendants \| both \| newNs
Files:	files \| file ages \| folders
SHA1:	d28c02962151fb6a78f29c75b94ffc35ca12588e
User & Date:	mistachkin 2014-01-12 09:33:26.651

Context

2014-01-12
09:57		In 'what-if' mode, always assume the EF6 assembly is available. check-in: ce06d9e616 user: mistachkin tags: newNs
09:33		Start modifying the VS design-time installer to support EF6. check-in: d28c029621 user: mistachkin tags: newNs
08:54		Get more tests working. check-in: 70b9f5bd6c user: mistachkin tags: newNs

Changes

Changes to Tests/Installer_Test_Vs2010.log.

Changes to Tests/Installer_Test_Vs2012.log.

Changes to Tests/Installer_Test_Vs2013.log.

Changes to Tests/Uninstaller_Test_Vs2010.log.

Changes to Tests/Uninstaller_Test_Vs2012.log.

Changes to Tests/Uninstaller_Test_Vs2013.log.

Changes to tools/install/Installer.cs.

︙
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() {
︙
3275 3276 3277 3278 3279 3280 3281 ~~3282 3283 3284~~ 3285 3286 3287 3288 3289 3290 3291 3292 3293 ~~3294 3295 3296 3297~~ 3298 ~~3299~~ 3300 3301 3302 3303 3304 3305 3306	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() { // // NOTE: Return non-zero if the ~~LINQ ass~~em~~bly should b~~e // processed during the install. ~~If the target is~~ // Visual Studio 2005, this ~~should return zero.~~ // NOTE: Return non-zero if the System.Data.SQLite.Linq // assembly should be processed during the install. // If the target is Visual Studio 2005, this must // return zero. // return !noNetFx35 \|\| !noNetFx40 \|\| !noNetFx45 \|\| !noNetFx451; } /////////////////////////////////////////////////////////////////// public bool IsEf6Supported() { // // NOTE: Return non-zero if the EF6 ~~assembly should be~~ // processed during the install. ~~If the target is~~ // Visual Studio 2005 or Visual ~~Studio 2008, this~~ // ~~should~~ return zero. // NOTE: Return non-zero if the System.Data.SQLite.EF6 // assembly should be processed during the install. // If the target is Visual Studio 2005 or Visual // Studio 2008, this must return zero. Also, if // the EF6 core assembly is unavailable, this must // return zero. // if (noNetFx40 && noNetFx45 && noNetFx451) ~~return ~~!noNetFx40 \|\| !noNetFx45 \|\| !noNetFx451~~;~~ return false; return IsEf6AssemblyAvailable(); } /////////////////////////////////////////////////////////////////// public void Dump( TraceCallback traceCallback )
︙
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"; ///////////////////////////////////////////////////////////////////////
︙