Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Merge updates from trunk. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | nugetChanges |
Files: | files | file ages | folders |
SHA1: |
30a16ee47cebc0fad53467198625dbad |
User & Date: | mistachkin 2014-09-04 03:46:01.125 |
Context
2014-09-04
| ||
03:52 | Remove previously deleted NuGet support files from the solution files. check-in: c44741f6f5 user: mistachkin tags: nugetChanges | |
03:46 | Merge updates from trunk. check-in: 30a16ee47c user: mistachkin tags: nugetChanges | |
03:42 | Enhance the design-time components and installer in order to better support EF6 model entity generation. check-in: c9f62dd914 user: mistachkin tags: trunk | |
02:59 | Remove the shared PowerShell scripts for NuGet as they are no longer required. check-in: 63e49af71a user: mistachkin tags: nugetChanges | |
Changes
Changes to Doc/Extra/Provider/dbfactorysupport.html.
︙ | ︙ | |||
57 58 59 60 61 62 63 | Add the following code to your app.config file:</p> <div class="syntax"> <PRE><configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite"/> <add name="SQLite Data Provider" invariant="System.Data.SQLite" | | | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | Add the following code to your app.config file:</p> <div class="syntax"> <PRE><configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite"/> <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite"<br /> type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /> </DbProviderFactories> </system.data> </configuration> </PRE> </div> <h4> Scenario 2: Version Dependent, using either the DLL located in the same folder |
︙ | ︙ | |||
79 80 81 82 83 84 85 | <div class="syntax"> <PRE> <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite"/> <add name="SQLite Data Provider" invariant="System.Data.SQLite" | | | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | <div class="syntax"> <PRE> <configuration> <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.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/> </DbProviderFactories> </system.data> </configuration> </pre> |
︙ | ︙ |
Changes to Doc/Extra/Provider/version.html.
︙ | ︙ | |||
1078 1079 1080 1081 1082 1083 1084 | <li>The designer has had another round of cleanup applied, in preparation for moving to a VS package.</li> <li>Added SQLiteMetaDataCollectionNames class.</li> </ul> <p><b>1.0.24.6 beta - January 23, 2006</b></p> <ul> <li>This beta is built from sqlite.org's 3.3.2 beta.</li><li>Eliminated the static linking of mscoree from all binaries. Native projects | | | 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 | <li>The designer has had another round of cleanup applied, in preparation for moving to a VS package.</li> <li>Added SQLiteMetaDataCollectionNames class.</li> </ul> <p><b>1.0.24.6 beta - January 23, 2006</b></p> <ul> <li>This beta is built from sqlite.org's 3.3.2 beta.</li><li>Eliminated the static linking of mscoree from all binaries. Native projects can now use the library without any dependencies on the .NET Framework, while managed projects continue to be able to use the library normally.</li></ul> <p><b>1.0.24.5 beta - January 20, 2006</b></p> <ul> <li>This beta is built from sqlite.org's 3.3.1 alpha and contains development-in-progress code. Therefore no guarantees can be made regarding its suitability for production use.</li> <li><strong>You no longer need to distribute 2 files on the CompactFramework. You can delete SQLite.Interop.DLL entirely. </strong>I wrote a custom tool |
︙ | ︙ |
Changes to Externals/Eagle/bin/Eagle.dll.
cannot compute difference between binary files
Changes to Externals/Eagle/bin/EagleShell.exe.
cannot compute difference between binary files
Changes to Externals/Eagle/bin/EagleShell32.exe.
cannot compute difference between binary files
Changes to Externals/Eagle/bin/x64/Spilornis.dll.
cannot compute difference between binary files
Changes to Externals/Eagle/bin/x86/Spilornis.dll.
cannot compute difference between binary files
Changes to Externals/Eagle/lib/Eagle1.0/init.eagle.
︙ | ︙ | |||
99 100 101 102 103 104 105 106 107 108 109 110 111 112 | # in both Tcl and Eagle and must return non-zero only when # running in Eagle on Mono. # proc isMono {} { return [expr {[info exists ::eagle_platform(runtime)] && \ [string compare -nocase mono $::eagle_platform(runtime)] == 0}] } proc getEnvironmentVariable { name } { # # NOTE: This should work properly in both Tcl and Eagle. # return [expr {[info exists ::env($name)] ? $::env($name) : ""}] } | > > > > > > > > > > > > > > > > > | 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 | # in both Tcl and Eagle and must return non-zero only when # running in Eagle on Mono. # proc isMono {} { return [expr {[info exists ::eagle_platform(runtime)] && \ [string compare -nocase mono $::eagle_platform(runtime)] == 0}] } # # NOTE: This procedure returns non-zero if the specified file names refer # to the same file, using the most robust method available for the # script engine and platform. # proc isSameFileName { fileName1 fileName2 } { if {[isEagle]} then { return [file same $fileName1 $fileName2] } else { if {[isWindows]} then { return [string equal -nocase $fileName1 $fileName2] } else { return [string equal $fileName1 $fileName2] } } } proc getEnvironmentVariable { name } { # # NOTE: This should work properly in both Tcl and Eagle. # return [expr {[info exists ::env($name)] ? $::env($name) : ""}] } |
︙ | ︙ | |||
914 915 916 917 918 919 920 | # for the platform (i.e. the ones used to compile the Eagle core # library assembly). # set platformOptions [expr { \ [info exists ::eagle_platform(compileOptions)] ? \ $::eagle_platform(compileOptions) : [list]}] | > > > > > > > > | > > | | > > > > | > > > > > > > > > > > > > > > | 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 | # for the platform (i.e. the ones used to compile the Eagle core # library assembly). # set platformOptions [expr { \ [info exists ::eagle_platform(compileOptions)] ? \ $::eagle_platform(compileOptions) : [list]}] # # NOTE: Permit extra C# compiler options to be passed via the global # array element "csharpOptions", if it exists. # set csharpOptions [expr { \ [info exists ::eagle_platform(csharpOptions)] ? \ $::eagle_platform(csharpOptions) : [list]}] if {[llength $platformOptions] > 0 || \ [llength $csharpOptions] > 0} then { # # NOTE: Grab the existing compiler options, if any. # set compilerOptions [$parameters CompilerOptions] if {"DEBUG" in $platformOptions} then { if {[string length $compilerOptions] > 0} then { append compilerOptions " " } append compilerOptions /define:DEBUG } if {"TRACE" in $platformOptions} then { if {[string length $compilerOptions] > 0} then { append compilerOptions " " } append compilerOptions /define:TRACE } # # NOTE: Append the configured extra C# compiler options configured # via the global array element "csharpOptions", if any. # foreach csharpOption $csharpOptions { if {[string length $compilerOptions] > 0} then { append compilerOptions " " } append compilerOptions $csharpOption } # # NOTE: Reset the compiler options to the pre-existing ones plus the # extra defines we may have added (above). # $parameters CompilerOptions $compilerOptions |
︙ | ︙ | |||
1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 | set length [string length $name] if {$length > $maxLength} { set maxLength $length } } set maxLength [expr {$maxLength + [string length $a] + 2}] set hostLength [lindex [getHostSize] 0] set valueLength [expr {$hostLength - $maxLength - 5}]; # " ... " foreach name $names { # # NOTE: Format the array element name for display. # | > | | | 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 | set length [string length $name] if {$length > $maxLength} { set maxLength $length } } set stringMap [list \b " " \t " " \r \xB6 \n \xB6] set maxLength [expr {$maxLength + [string length $a] + 2}] set hostLength [lindex [getHostSize] 0] set valueLength [expr {$hostLength - $maxLength - 5}]; # " ... " foreach name $names { # # NOTE: Format the array element name for display. # set nameString [string map $stringMap [appendArgs $a ( $name )]] # # NOTE: If the value by itself is too long to fit on one host line, # just truncate and ellipsis it. # set valueString [string map $stringMap $array($name)] if {[string length $valueString] > $valueLength} then { set valueString [appendArgs [string range $valueString 0 \ [expr {$valueLength - 4}]] " ..."] } # |
︙ | ︙ | |||
1964 1965 1966 1967 1968 1969 1970 | } } proc findDirectories { pattern } { # # NOTE: Block non-Windows platforms since this is Windows specific. # | | | 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 | } } proc findDirectories { pattern } { # # NOTE: Block non-Windows platforms since this is Windows specific. # if {![isWindows]} then { error "not supported on this operating system" } # # NOTE: This should work properly in Eagle only. # set dir ""; set result [list] |
︙ | ︙ | |||
2012 2013 2014 2015 2016 2017 2018 | return $result } proc findFiles { pattern } { # # NOTE: Block non-Windows platforms since this is Windows specific. # | | | 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 | return $result } proc findFiles { pattern } { # # NOTE: Block non-Windows platforms since this is Windows specific. # if {![isWindows]} then { error "not supported on this operating system" } # # NOTE: This should work properly in Eagle only. # set fileName ""; set result [list] |
︙ | ︙ | |||
2060 2061 2062 2063 2064 2065 2066 | return $result } proc findFilesRecursive { pattern } { # # NOTE: Block non-Windows platforms since this is Windows specific. # | | | 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 | return $result } proc findFilesRecursive { pattern } { # # NOTE: Block non-Windows platforms since this is Windows specific. # if {![isWindows]} then { error "not supported on this operating system" } # # NOTE: This should work properly in Eagle only. # set fileName ""; set result [list] |
︙ | ︙ | |||
2167 2168 2169 2170 2171 2172 2173 | return $result } proc findFilesRecursive { pattern } { # # NOTE: Block non-Windows platforms since this is Windows specific. # | | | 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 | return $result } proc findFilesRecursive { pattern } { # # NOTE: Block non-Windows platforms since this is Windows specific. # if {![isWindows]} then { error "not supported on this operating system" } # # NOTE: This should work properly in Tcl only. # set result [list] |
︙ | ︙ | |||
2258 2259 2260 2261 2262 2263 2264 | } # # NOTE: Exports the necessary commands from this package and import them # into the global namespace. # exportAndImportPackageCommands [namespace current] [list \ | | | 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 | } # # NOTE: Exports the necessary commands from this package and import them # into the global namespace. # exportAndImportPackageCommands [namespace current] [list \ isEagle isWindows haveGaruda isTclThread isMono isSameFileName \ getEnvironmentVariable combineFlags getCompileInfo getPlatformInfo \ getPluginPath appendArgs lappendArgs getDictionaryValue \ getColumnValue getRowColumnValue tqputs tqlog readFile \ readSharedFile writeFile appendFile appendLogFile appendSharedFile \ appendSharedLogFile readAsciiFile writeAsciiFile readUnicodeFile \ writeUnicodeFile getDirResultPath addToPath removeFromPath execShell \ lshuffle ldifference filter map reduce getLengthModifier debug \ |
︙ | ︙ |
Changes to Externals/Eagle/lib/Eagle1.0/test.eagle.
︙ | ︙ | |||
483 484 485 486 487 488 489 | # # TODO: Add more support for standard tcltest options here. # set options [list \ -breakOnLeak -configuration -constraints -exitOnComplete -file \ -logFile -machine -match -no -notFile -platform -postTest -preTest \ | | | > | > > > > > > > > > > > > > > | | | | | | > > > > > > > > > > > > | | > > > > > > > > > > > > | 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 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 543 544 545 546 547 548 549 550 551 552 553 554 555 556 | # # TODO: Add more support for standard tcltest options here. # set options [list \ -breakOnLeak -configuration -constraints -exitOnComplete -file \ -logFile -machine -match -no -notFile -platform -postTest -preTest \ -randomOrder -skip -startFile -stopFile -stopOnFailure -stopOnLeak \ -suffix -suite -tclsh -threshold] set length [llength $args] for {set index 0} {$index < $length} {incr index} { # # NOTE: Grab the current list element, which should be the name of # the test option. # set name [lindex $args $index] # # NOTE: Use the [tqputs] command here just in case the test log file # has not been setup yet (i.e. by default, this procedure is # almost always called by the test prologue file prior to the # test log file having been setup and we do not want to just # lose this output). # if {[lsearch -exact $options $name] != -1} then { # # NOTE: Is there another list element available for the value? If # not, this is not a valid test option. # if {$index + 1 < $length} then { incr index; set value [lindex $args $index] set array($name) $value tqputs $::test_channel [appendArgs \ "---- overrode test option \"" $name "\" with value \"" \ $value \"\n] } else { tqputs $::test_channel [appendArgs \ "---- no value for test option \"" $name "\", ignored\n"] } } elseif {[string index $name 0] eq "-"} then { # # NOTE: Is there another list element available for the value? If # not, it does not conform to the standard command line name # and value pattern. # if {$index + 1 < $length} then { incr index; set value [lindex $args $index] tqputs $::test_channel [appendArgs \ "---- unknown test option \"" $name "\" with value \"" \ $value "\" ignored\n"] } else { tqputs $::test_channel [appendArgs \ "---- no value for unknown test option \"" $name \ "\" ignored\n"] } } else { # # NOTE: This is not an option of *any* kind that we know about. # Ignore it and issue a warning. # tqputs $::test_channel [appendArgs \ "---- unknown argument \"" $name "\" ignored\n"] } } # # NOTE: Now, attempt to flush the test log queue, if available. # tlog "" |
︙ | ︙ | |||
799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 | } } proc getTestLogId {} { return [expr {[info exists ::test_log_id] ? \ [append result . $::test_log_id] : ""}] } proc getTestLog {} { return [expr {[info exists ::test_log] ? $::test_log : ""}] } proc getTestSuite {} { # # NOTE: Determine the effective test suite name and return it. If the # test suite name cannot be determined, return the default based # on whether we are running in Eagle or native Tcl. # | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 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 923 | } } proc getTestLogId {} { return [expr {[info exists ::test_log_id] ? \ [append result . $::test_log_id] : ""}] } proc getDefaultTestLog {} { return [file join [getTemporaryPath] [appendArgs \ [file tail [info nameofexecutable]] [getTestLogId] \ .test. [pid] .log]] } proc getTestLog {} { return [expr {[info exists ::test_log] ? $::test_log : ""}] } proc getLastTestLog {} { # # NOTE: Use the configured log file name -OR- what the configured # log file name would be, by default, if it actually existed. # if {[info exists ::test_log]} then { set logFileName $::test_log } else { set logFileName [getDefaultTestLog] } set logFileName [file normalize $logFileName] set logTime [expr {[file exists $logFileName] ? \ [file mtime $logFileName] : 0}] # # NOTE: Make the log file name into a pattern we can use to find # the related log files. # if {[regsub -- {\.\d+\.} $logFileName {.*.} pattern]} then { set lastLogFile [list] foreach fileName [findFiles $pattern] { # # NOTE: Skip the current test log file, if found. # if {[isSameFileName $fileName $logFileName]} then { continue } # # NOTE: When was this log file last modified? # set time [file mtime $fileName] # # NOTE: Check if there has been no log file seen -OR- this # log file has the latest modified time seen. # if {[llength $lastLogFile] == 0 || \ $time > [lindex $lastLogFile 0]} then { # # NOTE: This is now the latest log file seen. # set lastLogFile [list $time $fileName] } } # # NOTE: Either return the last log file seen, if any -OR- the # configured log file, if it actually exists. # if {[llength $lastLogFile] > 0} then { return [lindex $lastLogFile 1] } elseif {$logTime != 0} then { return $logFileName } } return "" } proc getTestSuite {} { # # NOTE: Determine the effective test suite name and return it. If the # test suite name cannot be determined, return the default based # on whether we are running in Eagle or native Tcl. # |
︙ | ︙ | |||
1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 | } proc isStopOnFailure {} { return [expr {[info exists ::test_stop_on_failure] && \ [string is boolean -strict $::test_stop_on_failure] && \ $::test_stop_on_failure}] } proc isExitOnComplete {} { return [expr {[info exists ::test_exit_on_complete] && \ [string is boolean -strict $::test_exit_on_complete] && \ $::test_exit_on_complete}] } | > > > > > > | 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 | } proc isStopOnFailure {} { return [expr {[info exists ::test_stop_on_failure] && \ [string is boolean -strict $::test_stop_on_failure] && \ $::test_stop_on_failure}] } proc isStopOnLeak {} { return [expr {[info exists ::test_stop_on_leak] && \ [string is boolean -strict $::test_stop_on_leak] && \ $::test_stop_on_leak}] } proc isExitOnComplete {} { return [expr {[info exists ::test_exit_on_complete] && \ [string is boolean -strict $::test_exit_on_complete] && \ $::test_exit_on_complete}] } |
︙ | ︙ | |||
1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 | proc recordTestStatistics { varName index } { # # NOTE: Record counts of all object types that we track. # upvar 1 $varName array set array(time,$index) [clock seconds] set array(afters,$index) [llength [after info]] set array(variables,$index) [llength [info globals]] set array(commands,$index) [llength [info commands]] set array(procedures,$index) [llength [info procs]] set array(namespaces,$index) [llength [namespace children ::]] set array(files,$index) [llength [getFiles $::test_path *]] set array(temporaryFiles,$index) [llength [getFiles [getTemporaryPath] *]] set array(channels,$index) [llength [file channels]] set array(aliases,$index) [llength [interp aliases]] set array(interpreters,$index) [llength [interp slaves]] set array(environment,$index) [llength [array names env]] if {[isEagle]} then { set array(scopes,$index) [llength [scope list]] set array(assemblies,$index) [llength [object assemblies]] set array(processes,$index) [llength [getProcesses ""]] set array(objects,$index) [llength [info objects]] set array(objectCallbacks,$index) [llength [info callbacks]] set array(objectTypes,$index) [llength [object types]] set array(objectInterfaces,$index) [llength [object interfaces]] set array(objectNamespaces,$index) [llength [object namespaces]] # # NOTE: Support for some of all of these entity types may not be # present in the interpreter, initialize all these counts # to zero and then try to query each one individually below # wrapped in a catch. # set array(connections,$index) 0 | > > > > > > > > > > > > > > > | 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 | proc recordTestStatistics { varName index } { # # NOTE: Record counts of all object types that we track. # upvar 1 $varName array set array(uncounted,$index) [list] set array(time,$index) [clock seconds] set array(afters,$index) [llength [after info]] set array(variables,$index) [llength [info globals]] set array(commands,$index) [llength [info commands]] set array(procedures,$index) [llength [info procs]] set array(namespaces,$index) [llength [namespace children ::]] set array(files,$index) [llength [getFiles $::test_path *]] set array(temporaryFiles,$index) [llength [getFiles [getTemporaryPath] *]] set array(channels,$index) [llength [file channels]] set array(aliases,$index) [llength [interp aliases]] set array(interpreters,$index) [llength [interp slaves]] set array(environment,$index) [llength [array names env]] # # NOTE: These native resource types cannot be positively checked # for leaks (i.e. because the "leak" may be from an external # process). # lappend array(uncounted,$index) temporaryFiles if {[isEagle]} then { set array(scopes,$index) [llength [scope list]] set array(assemblies,$index) [llength [object assemblies]] set array(processes,$index) [llength [getProcesses ""]] set array(objects,$index) [llength [info objects]] set array(objectCallbacks,$index) [llength [info callbacks]] set array(objectTypes,$index) [llength [object types]] set array(objectInterfaces,$index) [llength [object interfaces]] set array(objectNamespaces,$index) [llength [object namespaces]] # # NOTE: These managed resource types cannot be positively checked # for leaks (i.e. because the "leak" may be from an external # process). # lappend array(uncounted,$index) assemblies processes # # NOTE: Support for some of all of these entity types may not be # present in the interpreter, initialize all these counts # to zero and then try to query each one individually below # wrapped in a catch. # set array(connections,$index) 0 |
︙ | ︙ | |||
1376 1377 1378 1379 1380 1381 1382 | # # NOTE: Show what leaked, if anything. # set count 0; upvar 1 $statsVarName array foreach statistic $statistics { if {$array($statistic,after) > $array($statistic,before)} then { | | > > > > > > > > > > > > | | | > > > > > > | > | 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 | # # NOTE: Show what leaked, if anything. # set count 0; upvar 1 $statsVarName array foreach statistic $statistics { if {$array($statistic,after) > $array($statistic,before)} then { lappend array(statistics,leaked) $statistic tputs $channel [appendArgs "==== \"" $fileName "\" LEAKED " \ $statistic \n] if {[info exists array($statistic,before,list)]} then { tputs $channel [appendArgs "---- " $statistic " BEFORE: " \ [formatList $array($statistic,before,list)] \n] } if {[info exists array($statistic,after,list)]} then { tputs $channel [appendArgs "---- " $statistic " AFTER: " \ [formatList $array($statistic,after,list)] \n] } if {[info exists array(uncounted,before)] && \ [lsearch -exact $array(uncounted,before) $statistic] != -1} then { continue } if {[info exists array(uncounted,after)] && \ [lsearch -exact $array(uncounted,after) $statistic] != -1} then { continue } incr count } } # # NOTE: Make sure this file name is recorded in the list of file names with # leaking tests. # upvar 1 $filesVarName fileNames if {$count > 0 && \ [lsearch -exact $fileNames [file tail $fileName]] == -1} then { lappend fileNames [file tail $fileName] } # # NOTE: If we are supposed to stop or break into the debugger whenever # a leak is detected, do it now. # if {$count > 0} then { if {[isStopOnLeak]} then { tresult Error "OVERALL RESULT: STOP-ON-LEAK\n" unset -nocomplain ::test_suite_running error ""; # no message } elseif {[isBreakOnLeak]} then { testDebugBreak } } } proc formatList { list {default ""} {columns 1} } { if {[catch { set result "" set count 1 |
︙ | ︙ | |||
1494 1495 1496 1497 1498 1499 1500 | # # NOTE: Perform the inverse of [lsearch -glob], attempt # to match an element against a list of patterns. # set command [list string match] if {$noCase} then {lappend command -nocase} | > > | > | > > | 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 | # # NOTE: Perform the inverse of [lsearch -glob], attempt # to match an element against a list of patterns. # set command [list string match] if {$noCase} then {lappend command -nocase} set length [llength $patterns] for {set index 0} {$index < $length} {incr index} { set pattern [lindex $patterns $index] if {[eval $command [list $pattern] [list $element]]} then { return $index } } return -1 } proc removePathFromFileNames { path fileNames } { set result [list] |
︙ | ︙ | |||
2477 2478 2479 2480 2481 2482 2483 | after flags =$flags } } finally { interp bgerror {} $bgerror } } | | | 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 | after flags =$flags } } finally { interp bgerror {} $bgerror } } proc testExecTclScript { script {shell ""} {verbose false} } { try { # # NOTE: Get a temporary file name for the script we are going to # use to query the machine type for the native Tcl shell. # set fileName [file tempname] |
︙ | ︙ | |||
2509 2510 2511 2512 2513 2514 2515 | [string length $::test_tclsh] > 0} then { set shell $::test_tclsh } else { # # NOTE: We cannot execute the native Tcl shell because one # has not been specified, nor configured. # | | | | 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 | [string length $::test_tclsh] > 0} then { set shell $::test_tclsh } else { # # NOTE: We cannot execute the native Tcl shell because one # has not been specified, nor configured. # return [expr {$verbose ? "::test_tclsh missing" : "error"}] } } # # NOTE: Evaluate the script using the native Tcl shell, trim the # excess whitespace from the output, and return it to the # caller. # if {[catch {string trim \ [testExec $shell [list -success Success] \ [appendArgs \" $fileName \"]]} result] == 0} then { # # NOTE: Success, return the result to the caller. # return $result } else { # # NOTE: We could not execute the native Tcl shell (perhaps one # is not available?). # return [expr {$verbose ? [appendArgs "error: " $result] : "error"}] } } finally { # # NOTE: Did we create a temporary file? # if {[info exists fileName] && \ [string length $fileName] > 0 && \ |
︙ | ︙ | |||
2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 | } proc getTkVersionForTclShell { {shell ""} } { return [testExecTclScript { puts -nonewline stdout [package require Tk]; exit } $shell] } proc getGarudaDll { {machine ""} } { # # NOTE: Get the Garuda DLL of the same platform (i.e. machine type) # as the native Tcl shell. # if {[info exists ::base_path]} then { | > > > > > > > > > > > > | 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 | } proc getTkVersionForTclShell { {shell ""} } { return [testExecTclScript { puts -nonewline stdout [package require Tk]; exit } $shell] } proc evalWithTclShell { script {raw false} {shell ""} {verbose false} } { return [testExecTclScript [string map \ [list %script% $script %raw% $raw] { if {%raw%} then { set code [catch {%script%} result] puts -nonewline stdout [list $code $result] } else { puts -nonewline stdout [eval {%script%}] } }] $shell $verbose] } proc getGarudaDll { {machine ""} } { # # NOTE: Get the Garuda DLL of the same platform (i.e. machine type) # as the native Tcl shell. # if {[info exists ::base_path]} then { |
︙ | ︙ | |||
2863 2864 2865 2866 2867 2868 2869 | # exportAndImportPackageCommands [namespace current] [list \ tputs tlog getSoftwareRegistryKey haveConstraint addConstraint \ haveOrAddConstraint getConstraints removeConstraint fixConstraints \ calculateBogoCops calculateRelativePerformance formatTimeStamp \ formatElapsedTime sourceIfValid processTestArguments \ getTclShellFileName getTemporaryPath getFiles getTestFiles \ | | | | > | | | < | | > | | 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 | # exportAndImportPackageCommands [namespace current] [list \ tputs tlog getSoftwareRegistryKey haveConstraint addConstraint \ haveOrAddConstraint getConstraints removeConstraint fixConstraints \ calculateBogoCops calculateRelativePerformance formatTimeStamp \ formatElapsedTime sourceIfValid processTestArguments \ getTclShellFileName getTemporaryPath getFiles getTestFiles \ getTestRunId getTestLogId getDefaultTestLog getTestLog getLastTestLog \ getTestSuite getTestMachine getTestPlatform getTestConfiguration \ getTestSuffix testExec testClrExec execTestShell isRandomOrder \ isBreakOnLeak isStopOnFailure isStopOnLeak isExitOnComplete \ returnInfoScript runTestPrologue runTestEpilogue hookPuts unhookPuts \ runTest testDebugBreak testArrayGet testShim tsource \ recordTestStatistics reportTestStatistics formatList formatListAsDict \ pathToRegexp inverseLsearchGlob removePathFromFileNames formatDecimal \ clearTestPercent reportTestPercent runAllTests isTestSuiteRunning \ configureTcltest machineToPlatform getPassPercentage \ getSkipPercentage] false false ########################################################################### ############################## END Tcl ONLY ############################### ########################################################################### } # # NOTE: Provide the Eagle test package to the interpreter. # package provide Eagle.Test \ [expr {[isEagle] ? [info engine PatchLevel] : "1.0"}] } |
Changes to Externals/Eagle/lib/Test1.0/constraints.eagle.
︙ | ︙ | |||
244 245 246 247 248 249 250 | ########################################################################### if {![isEagle]} then { # # BUGFIX: We do not normally want to skip any Mono bugs in native Tcl. # if {![info exists ::no(runtimeVersion)]} then { | < < > > > > > | 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 | ########################################################################### if {![isEagle]} then { # # BUGFIX: We do not normally want to skip any Mono bugs in native Tcl. # if {![info exists ::no(runtimeVersion)]} then { # # NOTE: Add the necessary constraints for each version of Mono that # we know about. # foreach monoVersion [getKnownMonoVersions] { set constraintVersion [join $monoVersion ""] addConstraint [appendArgs monoToDo $constraintVersion] addConstraint [appendArgs monoToDo $constraintVersion Only] addConstraint [appendArgs monoBug $constraintVersion] addConstraint [appendArgs monoBug $constraintVersion Only] addConstraint [appendArgs monoCrash $constraintVersion] addConstraint [appendArgs monoCrash $constraintVersion Only] } # # NOTE: Also add just the generic Mono constraints that do not have # a trailing version. # set constraints [list monoToDo monoBug monoCrash] foreach constraint $constraints { addConstraint $constraint } } } } |
︙ | ︙ | |||
767 768 769 770 771 772 773 774 | # if {$::tcl_version eq "8.4"} then { # # NOTE: Baseline reported language and feature # version. # addConstraint tcl84 addConstraint tcl84OrHigher | > > | | > | | | | > | | | | | 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 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 | # if {$::tcl_version eq "8.4"} then { # # NOTE: Baseline reported language and feature # version. # addConstraint tcl84 addConstraint tcl84Feature addConstraint tcl84OrLower addConstraint tcl84OrHigher addConstraint tcl85OrLower if {[isEagle]} then { # # NOTE: *EAGLE* We do want to include any # tests that target "Tcl 8.5 or higher" # features and/or "Tcl 8.6 or higher" # features because they would not be in # the test suite if we did not support # that particular feature, regardless # of the language version. # addConstraint tcl85Feature addConstraint tcl86Feature } } elseif {$::tcl_version eq "8.5"} then { # # NOTE: Baseline reported language and feature # version. Tcl 8.5 includes all the # features from itself and Tcl 8.4. # addConstraint tcl84Feature addConstraint tcl84OrHigher addConstraint tcl85 addConstraint tcl85Feature addConstraint tcl85OrLower addConstraint tcl85OrHigher if {[isEagle]} then { # # NOTE: *EAGLE* We do want to include any # tests that target "Tcl 8.5 or higher" # features and/or "Tcl 8.6 or higher" # features because they would not be in # the test suite if we did not support # that particular feature, regardless # of the language version. # addConstraint tcl86Feature } } elseif {$::tcl_version eq "8.6"} then { # # NOTE: Baseline reported language and feature # version. Tcl 8.6 includes all the # features from itself Tcl 8.4, and Tcl # 8.5. # addConstraint tcl84Feature addConstraint tcl84OrHigher addConstraint tcl85Feature addConstraint tcl85OrHigher addConstraint tcl86 addConstraint tcl86Feature addConstraint tcl86OrLower addConstraint tcl86OrHigher } tputs $channel [appendArgs $::tcl_version \n] } else { tputs $channel no\n } } |
︙ | ︙ | |||
848 849 850 851 852 853 854 | tputs $channel yes\n } else { tputs $channel no\n } } | | | 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 | tputs $channel yes\n } else { tputs $channel no\n } } proc checkForNamespaces { channel quiet } { tputs $channel "---- checking for namespace support... " if {[isEagle]} then { # # NOTE: Check if namespace support was compiled into the core library # (i.e. this is beta 30 or later). # |
︙ | ︙ | |||
887 888 889 890 891 892 893 | } else { tputs $channel disabled\n # # NOTE: Check if namespace support was compiled into the core # library (i.e. is this beta 30 or later). # | | | 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 | } else { tputs $channel disabled\n # # NOTE: Check if namespace support was compiled into the core # library (i.e. is this beta 30 or later). # if {!$quiet && $available} then { # # NOTE: The tests seem to be running with namespace support # available, but disabled. Emit a warning into the # test log file. # tputs $channel \ "==== WARNING: running with namespaces available and disabled\n" |
︙ | ︙ | |||
912 913 914 915 916 917 918 | addConstraint namespaces.available addConstraint namespaces tputs $channel enabled\n } } | | | | 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 | addConstraint namespaces.available addConstraint namespaces tputs $channel enabled\n } } proc checkForTestExec { channel quiet } { tputs $channel "---- checking for test use of \"exec\" command... " set procName [lindex [info level [info level]] 0] if {![info exists ::no(testExec)] && [canTestExec $procName]} then { addConstraint testExec tputs $channel yes\n if {!$quiet && [info exists ::no(exec)]} then { tputs $channel \ "==== WARNING: running with the \"testExec\" procedure disabled\n" } } else { tputs $channel no\n } } |
︙ | ︙ | |||
1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 | addConstraint tip426 tputs $channel yes\n } else { tputs $channel no\n } } proc checkForTiming { channel threshold {constraint ""} {tries 1} {delay 1000} {average false} {asynchronous false} } { tputs $channel [appendArgs \ "---- checking for precision timing (threshold of " $threshold \ " milliseconds" [expr {$average ? " average" : ""}] ", delay of " \ | > > > > > > > > > > > > > > > | 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 | addConstraint tip426 tputs $channel yes\n } else { tputs $channel no\n } } proc checkForTip429 { channel } { tputs $channel "---- checking for TIP #429... " # # NOTE: Is the interpreter TIP #429 ready? # if {[catch {string cat}] == 0} then { addConstraint tip429 tputs $channel yes\n } else { tputs $channel no\n } } proc checkForTiming { channel threshold {constraint ""} {tries 1} {delay 1000} {average false} {asynchronous false} } { tputs $channel [appendArgs \ "---- checking for precision timing (threshold of " $threshold \ " milliseconds" [expr {$average ? " average" : ""}] ", delay of " \ |
︙ | ︙ | |||
1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 | tputs $channel yes\n } } else { tputs $channel no\n } } proc checkForStackIntensive { channel } { tputs $channel "---- checking for stack intensive testing... " # # NOTE: Are we allowed to do stack intensive testing? # | > > > > > > > > > > > > > > > | 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 | tputs $channel yes\n } } else { tputs $channel no\n } } proc checkForMemoryIntensive { channel } { tputs $channel "---- checking for memory intensive testing... " # # NOTE: Are we allowed to do memory intensive testing? # if {![info exists ::no(memoryIntensive)]} then { addConstraint memoryIntensive tputs $channel yes\n } else { tputs $channel no\n } } proc checkForStackIntensive { channel } { tputs $channel "---- checking for stack intensive testing... " # # NOTE: Are we allowed to do stack intensive testing? # |
︙ | ︙ | |||
2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 | set constraintVersion [join $monoVersion ""] addConstraint [appendArgs mono $constraintVersion OrHigher] addConstraint [appendArgs monoToDo $constraintVersion] addConstraint [appendArgs monoBug $constraintVersion] addConstraint [appendArgs monoCrash $constraintVersion] } } } else { # # NOTE: If the runtime version was found, add a test constraint # for it now. # if {[string length $version] > 0} then { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 | set constraintVersion [join $monoVersion ""] addConstraint [appendArgs mono $constraintVersion OrHigher] addConstraint [appendArgs monoToDo $constraintVersion] addConstraint [appendArgs monoBug $constraintVersion] addConstraint [appendArgs monoCrash $constraintVersion] } # # NOTE: Check all known versions of Mono for an exact match with # the currently running one. # foreach monoVersion [getKnownMonoVersions] { # # NOTE: Check if Mono major/minor version is exactly the one # we are currently processing. # set constraintVersion [join $monoVersion ""] if {[lindex $monoVersion 0] == $majorVersion && \ [lindex $monoVersion 1] == $minorVersion} then { # # NOTE: Add test constraints that only apply to this exact # version of Mono. # addConstraint [appendArgs mono $constraintVersion Only] } else { # # NOTE: Add test constraints that apply to all versions of # Mono except this exact version. # addConstraint [appendArgs monoToDo $constraintVersion Only] addConstraint [appendArgs monoBug $constraintVersion Only] addConstraint [appendArgs monoCrash $constraintVersion Only] } } } } else { # # NOTE: If the runtime version was found, add a test constraint # for it now. # if {[string length $version] > 0} then { |
︙ | ︙ | |||
2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 | # necessary constraints for each version of Mono we know # about. # foreach monoVersion [getKnownMonoVersions] { set constraintVersion [join $monoVersion ""] addConstraint [appendArgs monoToDo $constraintVersion] addConstraint [appendArgs monoBug $constraintVersion] addConstraint [appendArgs monoCrash $constraintVersion] } } tputs $channel [appendArgs $::eagle_platform(runtimeVersion) \ " " ( $dotVersion ) \n] } else { tputs $channel no\n | > > > | 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 | # necessary constraints for each version of Mono we know # about. # foreach monoVersion [getKnownMonoVersions] { set constraintVersion [join $monoVersion ""] addConstraint [appendArgs monoToDo $constraintVersion] addConstraint [appendArgs monoToDo $constraintVersion Only] addConstraint [appendArgs monoBug $constraintVersion] addConstraint [appendArgs monoBug $constraintVersion Only] addConstraint [appendArgs monoCrash $constraintVersion] addConstraint [appendArgs monoCrash $constraintVersion Only] } } tputs $channel [appendArgs $::eagle_platform(runtimeVersion) \ " " ( $dotVersion ) \n] } else { tputs $channel no\n |
︙ | ︙ | |||
2181 2182 2183 2184 2185 2186 2187 | tputs $channel [appendArgs $culture \n] } else { tputs $channel unknown\n } } | | > | | > > | | > | > > | > | 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 | tputs $channel [appendArgs $culture \n] } else { tputs $channel unknown\n } } proc checkForQuiet { channel quiet } { if {!$quiet} then { tputs $channel "---- checking for quiet... " } if {[catch { object invoke Interpreter.GetActive Quiet } isQuiet] == 0 && $isQuiet} then { # # NOTE: Yes, quiet mode is enabled. # addConstraint quiet if {!$quiet} then { tputs $channel yes\n } } else { if {!$quiet} then { tputs $channel no\n } } } proc checkForReferenceCountTracking { channel } { tputs $channel "---- checking for object reference count tracking... " if {[info exists ::eagle_platform(compileOptions)] && \ |
︙ | ︙ | |||
3116 3117 3118 3119 3120 3121 3122 | checkForTclOptions checkForWindowsCommandProcessor checkForFossil \ checkForEagle checkForSymbols checkForLogFile checkForGaruda \ checkForShell checkForDebug checkForTk checkForVersion \ checkForCommand checkForNamespaces checkForTestExec \ checkForTestMachine checkForTestPlatform checkForTestConfiguration \ checkForTestSuffix checkForFile checkForPathFile checkForNativeCode \ checkForTip127 checkForTip194 checkForTip207 checkForTip241 \ | | | | | | | 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 | checkForTclOptions checkForWindowsCommandProcessor checkForFossil \ checkForEagle checkForSymbols checkForLogFile checkForGaruda \ checkForShell checkForDebug checkForTk checkForVersion \ checkForCommand checkForNamespaces checkForTestExec \ checkForTestMachine checkForTestPlatform checkForTestConfiguration \ checkForTestSuffix checkForFile checkForPathFile checkForNativeCode \ checkForTip127 checkForTip194 checkForTip207 checkForTip241 \ checkForTip285 checkForTip405 checkForTip426 checkForTip429 \ checkForTiming checkForPerformance checkForBigLists \ checkForMemoryIntensive checkForStackIntensive checkForInteractive \ checkForInteractiveCommand checkForUserInteraction checkForNetwork \ checkForCompileOption checkForKnownCompileOptions] false false ########################################################################### ############################## END Tcl ONLY ############################### ########################################################################### } # # NOTE: Provide the Eagle test constraints package to the interpreter. # package provide Eagle.Test.Constraints \ [expr {[isEagle] ? [info engine PatchLevel] : "1.0"}] } |
Changes to Externals/Eagle/lib/Test1.0/prologue.eagle.
︙ | ︙ | |||
89 90 91 92 93 94 95 96 97 98 99 100 101 102 | } unset pkg_dir } ############################################################################# # # NOTE: Set the executable file name for the process, if # necessary. # if {![info exists bin_file]} then { set bin_file [info nameofexecutable] } | > > > > > > > > > > > > > > | 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 | } unset pkg_dir } ############################################################################# # # NOTE: Set the location of the Eagle main strong name keys directory, # if necessary. # if {![info exists key_path]} then { # # NOTE: Normally, there should be a "Keys" sub-directory just within # the base directory. # set key_path [file join $base_path Keys] } ############################################################################# # # NOTE: Set the executable file name for the process, if # necessary. # if {![info exists bin_file]} then { set bin_file [info nameofexecutable] } |
︙ | ︙ | |||
282 283 284 285 286 287 288 289 290 291 292 293 294 295 | set test_flags(-skip) [list]; # default to skipping no tests. set test_flags(-constraints) [list]; # default to no manual constraints. set test_flags(-logFile) ""; # default to using standard log file naming. set test_flags(-threshold) ""; # default to requiring all tests to pass. set test_flags(-randomOrder) ""; # default to deterministic order. set test_flags(-breakOnLeak) ""; # default to continue on leak. set test_flags(-stopOnFailure) ""; # default to continue on failure. set test_flags(-exitOnComplete) ""; # default to not exit after complete. set test_flags(-preTest) ""; # default to not evaluating anything. set test_flags(-postTest) ""; # default to not evaluating anything. set test_flags(-tclsh) ""; # Tcl shell, default to empty. # # NOTE: Check for and process any command line arguments. | > | 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 | set test_flags(-skip) [list]; # default to skipping no tests. set test_flags(-constraints) [list]; # default to no manual constraints. set test_flags(-logFile) ""; # default to using standard log file naming. set test_flags(-threshold) ""; # default to requiring all tests to pass. set test_flags(-randomOrder) ""; # default to deterministic order. set test_flags(-breakOnLeak) ""; # default to continue on leak. set test_flags(-stopOnFailure) ""; # default to continue on failure. set test_flags(-stopOnLeak) ""; # default to continue on leak. set test_flags(-exitOnComplete) ""; # default to not exit after complete. set test_flags(-preTest) ""; # default to not evaluating anything. set test_flags(-postTest) ""; # default to not evaluating anything. set test_flags(-tclsh) ""; # Tcl shell, default to empty. # # NOTE: Check for and process any command line arguments. |
︙ | ︙ | |||
350 351 352 353 354 355 356 357 358 359 360 361 362 363 | [string is boolean -strict $test_flags(-stopOnFailure)]} then { # # NOTE: Set the test stop-on-failure flag to the one provided by the # command line. # set test_stop_on_failure $test_flags(-stopOnFailure) } if {[info exists test_flags(-exitOnComplete)] && \ [string is boolean -strict $test_flags(-exitOnComplete)]} then { # # NOTE: Set the test exit-on-complete flag to the one provided by the # command line. # | > > > > > > > > > | 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 | [string is boolean -strict $test_flags(-stopOnFailure)]} then { # # NOTE: Set the test stop-on-failure flag to the one provided by the # command line. # set test_stop_on_failure $test_flags(-stopOnFailure) } if {[info exists test_flags(-stopOnLeak)] && \ [string is boolean -strict $test_flags(-stopOnLeak)]} then { # # NOTE: Set the test stop-on-leak flag to the one provided by the # command line. # set test_stop_on_leak $test_flags(-stopOnLeak) } if {[info exists test_flags(-exitOnComplete)] && \ [string is boolean -strict $test_flags(-exitOnComplete)]} then { # # NOTE: Set the test exit-on-complete flag to the one provided by the # command line. # |
︙ | ︙ | |||
414 415 416 417 418 419 420 | # NOTE: Has automatic log file naming been disabled? # if {![info exists no(logFileName)]} then { # # NOTE: Set the log to use for test output, if necessary. # if {![info exists test_log]} then { | > > > | > | > > > > > > > > > > > > > > > > > > > | 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 | # NOTE: Has automatic log file naming been disabled? # if {![info exists no(logFileName)]} then { # # NOTE: Set the log to use for test output, if necessary. # if {![info exists test_log]} then { set test_log [getDefaultTestLog] } } ############################################################################# # # NOTE: *SPECIAL* This test constraint must be checked first as it can # determine if subsequent ones will emit warnings. This is only # applicable to Eagle. # if {[isEagle]} then { # # NOTE: Has quiet testing support been disabled? # if {![info exists no(preQuiet)]} then { # # NOTE: There are checks for the "quiet" test constraint prior to # the real test constraints being initialized. Prepare for # those checks now. This will have to be repeated later, # after the real test constraints are initialized. # checkForQuiet $test_channel true } } ############################################################################# # # NOTE: Has native Tcl shell detection and use been disabled? # if {![info exists no(tclsh)]} then { # # NOTE: Set the Tcl shell executable to use for those specialized |
︙ | ︙ | |||
449 450 451 452 453 454 455 | } else { if {[canExecTclShell] && \ ![info exists no(getTclShellFileName)]} then { # # NOTE: Attempt to automatically select the native Tcl shell # to use. # | | > | 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 | } else { if {[canExecTclShell] && \ ![info exists no(getTclShellFileName)]} then { # # NOTE: Attempt to automatically select the native Tcl shell # to use. # if {![info exists no(warningForTclShell)] && \ ![haveConstraint quiet]} then { tputs $test_channel \ "==== WARNING: attempting automatic Tcl shell selection...\n" } set test_tclsh [getTclShellFileName true] } else { # |
︙ | ︙ | |||
475 476 477 478 479 480 481 | # # NOTE: When running in Eagle, check for any non-core plugins loaded into # the interpreter and issue warnings if any are found. The warning # may be used to explain subsequent test failures due to the extra # plugins being loaded (i.e. there are some tests are sensitive to # having "unexpected" plugins loaded). # | | > | 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 | # # NOTE: When running in Eagle, check for any non-core plugins loaded into # the interpreter and issue warnings if any are found. The warning # may be used to explain subsequent test failures due to the extra # plugins being loaded (i.e. there are some tests are sensitive to # having "unexpected" plugins loaded). # if {[isEagle] && ![info exists no(warningForPlugin)] && \ ![haveConstraint quiet]} then { foreach loaded [info loaded] { # # HACK: This code assumes that all plugins in the "Eagle._Plugins" # namespace belong to the Eagle core library itself. # if {![string match Eagle._Plugins.* [lindex $loaded 1]]} then { tputs $test_channel [appendArgs \ |
︙ | ︙ | |||
579 580 581 582 583 584 585 | [expr {[info exists test_configuration] ? \ $test_configuration : "<none>"}] \n] tputs $test_channel [appendArgs "---- test suffix: " \ [expr {[info exists test_suffix] ? \ $test_suffix : "<none>"}] \n] | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 | [expr {[info exists test_configuration] ? \ $test_configuration : "<none>"}] \n] tputs $test_channel [appendArgs "---- test suffix: " \ [expr {[info exists test_suffix] ? \ $test_suffix : "<none>"}] \n] if {[isEagle]} then { tputs $test_channel [appendArgs "---- original command line: " \ [info cmdline] \n] tputs $test_channel [appendArgs "---- threadId: " \ [info tid] \n] tputs $test_channel [appendArgs "---- processors: " \ |
︙ | ︙ | |||
693 694 695 696 697 698 699 700 701 702 703 704 705 706 | [string is boolean -strict $test_break_on_leak] ? \ $test_break_on_leak : "<none>"}] \n] tputs $test_channel [appendArgs "---- stop on failure: " \ [expr {[info exists test_stop_on_failure] && \ [string is boolean -strict $test_stop_on_failure] ? \ $test_stop_on_failure : "<none>"}] \n] tputs $test_channel [appendArgs "---- exit on complete: " \ [expr {[info exists test_exit_on_complete] && \ [string is boolean -strict $test_exit_on_complete] ? \ $test_exit_on_complete : "<none>"}] \n] # | > > > > > | 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 | [string is boolean -strict $test_break_on_leak] ? \ $test_break_on_leak : "<none>"}] \n] tputs $test_channel [appendArgs "---- stop on failure: " \ [expr {[info exists test_stop_on_failure] && \ [string is boolean -strict $test_stop_on_failure] ? \ $test_stop_on_failure : "<none>"}] \n] tputs $test_channel [appendArgs "---- stop on leak: " \ [expr {[info exists test_stop_on_leak] && \ [string is boolean -strict $test_stop_on_leak] ? \ $test_stop_on_leak : "<none>"}] \n] tputs $test_channel [appendArgs "---- exit on complete: " \ [expr {[info exists test_exit_on_complete] && \ [string is boolean -strict $test_exit_on_complete] ? \ $test_exit_on_complete : "<none>"}] \n] # |
︙ | ︙ | |||
741 742 743 744 745 746 747 748 749 750 751 752 753 754 | tputs $test_channel [appendArgs "---- path: " \ [expr {[info exists path] && [string length $path] > 0 ? \ [appendArgs \" $path \"] : "<none>"}] \n] tputs $test_channel [appendArgs "---- base path: \"" \ $base_path \"\n] tputs $test_channel [appendArgs "---- root path: \"" \ $root_path \"\n] tputs $test_channel [appendArgs "---- binary path: \"" \ $bin_path \"\n] | > > > | 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 | tputs $test_channel [appendArgs "---- path: " \ [expr {[info exists path] && [string length $path] > 0 ? \ [appendArgs \" $path \"] : "<none>"}] \n] tputs $test_channel [appendArgs "---- base path: \"" \ $base_path \"\n] tputs $test_channel [appendArgs "---- key path: \"" \ $key_path \"\n] tputs $test_channel [appendArgs "---- root path: \"" \ $root_path \"\n] tputs $test_channel [appendArgs "---- binary path: \"" \ $bin_path \"\n] |
︙ | ︙ | |||
774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 | tputs $test_channel [appendArgs "---- disabled options: " \ [formatList [lsort [array names no]] <none>] \n] # # NOTE: Initialize the Eagle test constraints. # if {[isEagle]} then { initializeTests; configureTcltest [list] [list] [list] [list] false # # NOTE: If the "no(mono)" variable is set (to anything) then any # special test suite hacks for Mono will be disabled. This # does not control or change any hacks for Mono that may # be present in the library itself. # # if {![info exists no(mono)] && [isMono]} then { # set no(mono) true # } ########################################################################### ######################### BEGIN Eagle Constraints ######################### ########################################################################### tputs $test_channel \ "---- start of Eagle specific test constraints...\n" # # NOTE: Has administrator detection support been disabled? We do # this check [nearly] first as it may [eventually] be used # to help determine if other constraints should be skipped. # if {![info exists no(administrator)]} then { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 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 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 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 | tputs $test_channel [appendArgs "---- disabled options: " \ [formatList [lsort [array names no]] <none>] \n] # # NOTE: Initialize the Eagle test constraints. # if {[isEagle]} then { # # NOTE: *WARNING* This has the effect of removing test constraints # added prior to this point. # initializeTests; configureTcltest [list] [list] [list] [list] false # # NOTE: If the "no(mono)" variable is set (to anything) then any # special test suite hacks for Mono will be disabled. This # does not control or change any hacks for Mono that may # be present in the library itself. # # if {![info exists no(mono)] && [isMono]} then { # set no(mono) true # } ########################################################################### ######################### BEGIN Eagle Constraints ######################### ########################################################################### tputs $test_channel \ "---- start of Eagle specific test constraints...\n" # # NOTE: *WARNING* Has quiet testing support been disabled? # Please do not move this "quietness" test constraint # check as subsequent test constraints may rely on it # when determining if a warning should be emitted. # if {![info exists no(quiet)]} then { # # NOTE: For tests "basic-1.36", "benchmark-1.*", "debug-1.3", # "debug-1.4", "glob-99.*", "object-10.*", "perf-2.2", # and various other places within the test suite code # itself. # checkForQuiet $test_channel false } # # NOTE: Has strong name key detection been disabled? # if {![info exists no(strongNameKey)]} then { catch {info engine PublicKeyToken} publicKeyToken if {[string length $publicKeyToken] == 0} then { # # NOTE: The Eagle core library is not signed with a strong name key. # This is not an error, per se; however, it may cause selected # tests to fail and it should be reported to the user and noted # in the test suite log file. # addConstraint strongName.none if {![info exists no(warningForStrongNameKey)] && \ ![haveConstraint quiet]} then { tputs $test_channel \ "==== WARNING: no Eagle strong name signature detected...\n" } } else { # # NOTE: Add a test constraint for this specific strong name key. # addConstraint [appendArgs strongName. $publicKeyToken] # # BUGBUG: Tcl 8.4 does not seem to like this expression because it # contains the "ni" operator added in Tcl 8.5 (and Tcl 8.4 # tries to compile it even though it will only be evaluated # in Eagle). # set expr {$publicKeyToken ni \ "29c6297630be05eb 1e22ec67879739a2 358030063a832bc3"} if {[expr $expr]} then { # # NOTE: The Eagle core library is strong name signed with a key that # is not official. This is also not an error, per se; however, # it may cause some tests to fail and it should be reported to # the user and noted in the test suite log file. # addConstraint strongName.unofficial if {![info exists no(warningForStrongNameKey)] && \ ![haveConstraint quiet]} then { tputs $test_channel [appendArgs \ "==== WARNING: unofficial Eagle strong name signature " \ "detected: " $publicKeyToken \n] } } else { # # NOTE: Several tests require one of the official strong name keys to # be used in order for them to pass. # addConstraint strongName.official tputs $test_channel [appendArgs \ "---- official Eagle strong name signature detected: " \ $publicKeyToken \n] } unset expr } unset publicKeyToken } # # NOTE: Has administrator detection support been disabled? We do # this check [nearly] first as it may [eventually] be used # to help determine if other constraints should be skipped. # if {![info exists no(administrator)]} then { |
︙ | ︙ | |||
1011 1012 1013 1014 1015 1016 1017 | # # NOTE: Has symbol testing support been disabled? # if {![info exists no(assemblySymbols)]} then { checkForSymbols $test_channel [lindex [info assembly] end] } | < < < < < < < < < < < | 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 | # # NOTE: Has symbol testing support been disabled? # if {![info exists no(assemblySymbols)]} then { checkForSymbols $test_channel [lindex [info assembly] end] } # # NOTE: Has object handle reference count tracking support been disabled # (at compile-time)? # if {![info exists no(refCount)]} then { # # NOTE: For tests "excel-*", "object-2.*", "object-7.1", "object-8.*", |
︙ | ︙ | |||
1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 | checkForObjectMember $test_channel Eagle._Tests.Default \ *TestSetVariableLinks* checkForObjectMember $test_channel Eagle._Tests.Default \ *TestUnsetVariableLinks* } # # NOTE: Has field testing support been disabled? # if {![info exists no(testFields)]} then { # # NOTE: For tests "basic-1.39", "basic-1.40", "basic-1.41", # "basic-1.42", and "basic-1.43". | > > > > > > > > > > > > > > > > > > | 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 | checkForObjectMember $test_channel Eagle._Tests.Default \ *TestSetVariableLinks* checkForObjectMember $test_channel Eagle._Tests.Default \ *TestUnsetVariableLinks* } # # NOTE: Has system array variable testing support been disabled? # if {![info exists no(testSystemArrayVariables)]} then { # # NOTE: For tests "basic-1.62", "basic-1.63", "basic-1.64", # and "basic-1.65". # checkForObjectMember $test_channel Eagle._Tests.Default \ *TestIntPtrChangeTypeCallback* checkForObjectMember $test_channel Eagle._Tests.Default \ *TestSetVariableSystemArray* checkForObjectMember $test_channel Eagle._Tests.Default \ *TestUnsetVariableSystemArray* } # # NOTE: Has field testing support been disabled? # if {![info exists no(testFields)]} then { # # NOTE: For tests "basic-1.39", "basic-1.40", "basic-1.41", # "basic-1.42", and "basic-1.43". |
︙ | ︙ | |||
1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 | # # NOTE: For test "object-2.1". # checkForObjectMember $test_channel Eagle._Tests.Default \ *TestComplexMethod* # # NOTE: For test "object-2.3". # checkForObjectMember $test_channel Eagle._Tests.Default \ *TestToHexadecimalString* checkForObjectMember $test_channel Eagle._Tests.Default \ | > > > > > > | 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 | # # NOTE: For test "object-2.1". # checkForObjectMember $test_channel Eagle._Tests.Default \ *TestComplexMethod* # # NOTE: For test "object-2.12". # checkForObjectMember $test_channel Eagle._Tests.Default \ *TestMoreComplexMethod* # # NOTE: For test "object-2.3". # checkForObjectMember $test_channel Eagle._Tests.Default \ *TestToHexadecimalString* checkForObjectMember $test_channel Eagle._Tests.Default \ |
︙ | ︙ | |||
2022 2023 2024 2025 2026 2027 2028 | checkForTestSuiteFiles $test_channel } # # NOTE: Has all use of [exec] for tests been disabled? # if {![info exists no(checkForTestExec)]} then { | | | 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 | checkForTestSuiteFiles $test_channel } # # NOTE: Has all use of [exec] for tests been disabled? # if {![info exists no(checkForTestExec)]} then { checkForTestExec $test_channel [haveConstraint quiet] } # # NOTE: Has checking for the test machine been disabled? # if {![info exists no(testMachine)]} then { checkForTestMachine $test_channel |
︙ | ︙ | |||
2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 | if {![info exists no(tclOptions)]} then { checkForTclOptions $test_channel } if {![info exists no(checkForBigLists)]} then { checkForBigLists $test_channel } if {![info exists no(checkForStackIntensive)]} then { checkForStackIntensive $test_channel } if {![info exists no(windowsCommandProcessor)]} then { checkForWindowsCommandProcessor $test_channel cmd.exe | > > > > | 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 | if {![info exists no(tclOptions)]} then { checkForTclOptions $test_channel } if {![info exists no(checkForBigLists)]} then { checkForBigLists $test_channel } if {![info exists no(checkForMemoryIntensive)]} then { checkForMemoryIntensive $test_channel } if {![info exists no(checkForStackIntensive)]} then { checkForStackIntensive $test_channel } if {![info exists no(windowsCommandProcessor)]} then { checkForWindowsCommandProcessor $test_channel cmd.exe |
︙ | ︙ | |||
2419 2420 2421 2422 2423 2424 2425 | checkForCommand $test_channel xml } # # NOTE: Has namespace detection support been disabled? # if {![info exists no(namespaces)]} then { | | | 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 | checkForCommand $test_channel xml } # # NOTE: Has namespace detection support been disabled? # if {![info exists no(namespaces)]} then { checkForNamespaces $test_channel [haveConstraint quiet] } # # NOTE: Check for various features that were added through # the TIP process. # if {![info exists no(tip127)]} then { |
︙ | ︙ | |||
2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 | checkForTip405 $test_channel } if {![info exists no(tip426)]} then { checkForTip426 $test_channel } # # NOTE: Has performance testing been disabled? # if {![info exists no(core)] && \ ![info exists no(checkForPerformance)]} then { checkForPerformance $test_channel } | > > > > | 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 | checkForTip405 $test_channel } if {![info exists no(tip426)]} then { checkForTip426 $test_channel } if {![info exists no(tip429)]} then { checkForTip429 $test_channel } # # NOTE: Has performance testing been disabled? # if {![info exists no(core)] && \ ![info exists no(checkForPerformance)]} then { checkForPerformance $test_channel } |
︙ | ︙ | |||
2478 2479 2480 2481 2482 2483 2484 | if {![info exists no(core)] && \ ![info exists no(timing)]} then { checkForTiming $test_channel 50; # 1/20th second. } if {![info exists no(core)] && \ ![info exists no(preciseTiming)]} then { | > > > > > > > | > | 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 | if {![info exists no(core)] && \ ![info exists no(timing)]} then { checkForTiming $test_channel 50; # 1/20th second. } if {![info exists no(core)] && \ ![info exists no(preciseTiming)]} then { # # NOTE: Normally, the "preciseTiming" constraint implicitly requires that # the "timing" constraint be present as well; however, that can be # overridden. # if {[info exists no(requireTiming)] || \ [haveConstraint timing]} then { checkForTiming $test_channel 25 preciseTiming; # 1/40th second. } } # # NOTE: Has interactive testing been disabled? # if {![info exists no(interactive)]} then { checkForInteractive $test_channel |
︙ | ︙ |
Changes to SQLite.Designer/Editors/ViewDesignerDoc.cs.
︙ | ︙ | |||
73 74 75 76 77 78 79 | try { _typeQB = SQLiteDataAdapterToolboxItem._vsdesigner.GetType("Microsoft.VSDesigner.Data.Design.QueryBuilderControl"); if (_typeQB != null) { _queryDesigner = Activator.CreateInstance(_typeQB) as UserControl; | | | 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | try { _typeQB = SQLiteDataAdapterToolboxItem._vsdesigner.GetType("Microsoft.VSDesigner.Data.Design.QueryBuilderControl"); if (_typeQB != null) { _queryDesigner = Activator.CreateInstance(_typeQB) as UserControl; _typeQB.InvokeMember("Provider", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.SetProperty | System.Reflection.BindingFlags.NonPublic, null, _queryDesigner, new object[] { SQLiteOptions.GetProviderName() }); _typeQB.InvokeMember("ConnectionString", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.SetProperty | System.Reflection.BindingFlags.NonPublic, null, _queryDesigner, new object[] { _connection.ConnectionSupport.ConnectionString }); _typeQB.InvokeMember("EnableMorphing", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.SetProperty | System.Reflection.BindingFlags.NonPublic, null, _queryDesigner, new object[] { false }); Controls.Add(_queryDesigner); _queryDesigner.Dock = DockStyle.Fill; _queryDesigner.Visible = true; } |
︙ | ︙ |
Changes to SQLite.Designer/SQLite.Designer.2005.csproj.
︙ | ︙ | |||
131 132 133 134 135 136 137 138 139 140 141 142 143 144 | </Compile> <Compile Include="SQLiteDataAdapterToolboxItem.cs" /> <Compile Include="SQLiteDataConnectionSupport.cs" /> <Compile Include="SQLiteDataObjectIdentifierResolver.cs" /> <Compile Include="SQLiteDataObjectSupport.cs" /> <Compile Include="SQLiteDataSourceInformation.cs" /> <Compile Include="SQLiteDataViewSupport.cs" /> <Compile Include="SQLitePackage.cs" /> <Compile Include="SQLiteProviderObjectFactory.cs" /> <Compile Include="TableNameDialog.cs"> <SubType>Form</SubType> </Compile> <Compile Include="TableNameDialog.Designer.cs"> <DependentUpon>TableNameDialog.cs</DependentUpon> | > | 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 | </Compile> <Compile Include="SQLiteDataAdapterToolboxItem.cs" /> <Compile Include="SQLiteDataConnectionSupport.cs" /> <Compile Include="SQLiteDataObjectIdentifierResolver.cs" /> <Compile Include="SQLiteDataObjectSupport.cs" /> <Compile Include="SQLiteDataSourceInformation.cs" /> <Compile Include="SQLiteDataViewSupport.cs" /> <Compile Include="SQLiteOptions.cs" /> <Compile Include="SQLitePackage.cs" /> <Compile Include="SQLiteProviderObjectFactory.cs" /> <Compile Include="TableNameDialog.cs"> <SubType>Form</SubType> </Compile> <Compile Include="TableNameDialog.Designer.cs"> <DependentUpon>TableNameDialog.cs</DependentUpon> |
︙ | ︙ |
Changes to SQLite.Designer/SQLite.Designer.2008.csproj.
︙ | ︙ | |||
136 137 138 139 140 141 142 143 144 145 146 147 148 149 | </Compile> <Compile Include="SQLiteDataAdapterToolboxItem.cs" /> <Compile Include="SQLiteDataConnectionSupport.cs" /> <Compile Include="SQLiteDataObjectIdentifierResolver.cs" /> <Compile Include="SQLiteDataObjectSupport.cs" /> <Compile Include="SQLiteDataSourceInformation.cs" /> <Compile Include="SQLiteDataViewSupport.cs" /> <Compile Include="SQLitePackage.cs" /> <Compile Include="SQLiteProviderObjectFactory.cs" /> <Compile Include="TableNameDialog.cs"> <SubType>Form</SubType> </Compile> <Compile Include="TableNameDialog.Designer.cs"> <DependentUpon>TableNameDialog.cs</DependentUpon> | > | 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 | </Compile> <Compile Include="SQLiteDataAdapterToolboxItem.cs" /> <Compile Include="SQLiteDataConnectionSupport.cs" /> <Compile Include="SQLiteDataObjectIdentifierResolver.cs" /> <Compile Include="SQLiteDataObjectSupport.cs" /> <Compile Include="SQLiteDataSourceInformation.cs" /> <Compile Include="SQLiteDataViewSupport.cs" /> <Compile Include="SQLiteOptions.cs" /> <Compile Include="SQLitePackage.cs" /> <Compile Include="SQLiteProviderObjectFactory.cs" /> <Compile Include="TableNameDialog.cs"> <SubType>Form</SubType> </Compile> <Compile Include="TableNameDialog.Designer.cs"> <DependentUpon>TableNameDialog.cs</DependentUpon> |
︙ | ︙ |
Changes to SQLite.Designer/SQLite.Designer.2010.csproj.
︙ | ︙ | |||
136 137 138 139 140 141 142 143 144 145 146 147 148 149 | </Compile> <Compile Include="SQLiteDataAdapterToolboxItem.cs" /> <Compile Include="SQLiteDataConnectionSupport.cs" /> <Compile Include="SQLiteDataObjectIdentifierResolver.cs" /> <Compile Include="SQLiteDataObjectSupport.cs" /> <Compile Include="SQLiteDataSourceInformation.cs" /> <Compile Include="SQLiteDataViewSupport.cs" /> <Compile Include="SQLitePackage.cs" /> <Compile Include="SQLiteProviderObjectFactory.cs" /> <Compile Include="TableNameDialog.cs"> <SubType>Form</SubType> </Compile> <Compile Include="TableNameDialog.Designer.cs"> <DependentUpon>TableNameDialog.cs</DependentUpon> | > | 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 | </Compile> <Compile Include="SQLiteDataAdapterToolboxItem.cs" /> <Compile Include="SQLiteDataConnectionSupport.cs" /> <Compile Include="SQLiteDataObjectIdentifierResolver.cs" /> <Compile Include="SQLiteDataObjectSupport.cs" /> <Compile Include="SQLiteDataSourceInformation.cs" /> <Compile Include="SQLiteDataViewSupport.cs" /> <Compile Include="SQLiteOptions.cs" /> <Compile Include="SQLitePackage.cs" /> <Compile Include="SQLiteProviderObjectFactory.cs" /> <Compile Include="TableNameDialog.cs"> <SubType>Form</SubType> </Compile> <Compile Include="TableNameDialog.Designer.cs"> <DependentUpon>TableNameDialog.cs</DependentUpon> |
︙ | ︙ |
Changes to SQLite.Designer/SQLite.Designer.2012.csproj.
︙ | ︙ | |||
142 143 144 145 146 147 148 149 150 151 152 153 154 155 | </Compile> <Compile Include="SQLiteDataAdapterToolboxItem.cs" /> <Compile Include="SQLiteDataConnectionSupport.cs" /> <Compile Include="SQLiteDataObjectIdentifierResolver.cs" /> <Compile Include="SQLiteDataObjectSupport.cs" /> <Compile Include="SQLiteDataSourceInformation.cs" /> <Compile Include="SQLiteDataViewSupport.cs" /> <Compile Include="SQLitePackage.cs" /> <Compile Include="SQLiteProviderObjectFactory.cs" /> <Compile Include="TableNameDialog.cs"> <SubType>Form</SubType> </Compile> <Compile Include="TableNameDialog.Designer.cs"> <DependentUpon>TableNameDialog.cs</DependentUpon> | > | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | </Compile> <Compile Include="SQLiteDataAdapterToolboxItem.cs" /> <Compile Include="SQLiteDataConnectionSupport.cs" /> <Compile Include="SQLiteDataObjectIdentifierResolver.cs" /> <Compile Include="SQLiteDataObjectSupport.cs" /> <Compile Include="SQLiteDataSourceInformation.cs" /> <Compile Include="SQLiteDataViewSupport.cs" /> <Compile Include="SQLiteOptions.cs" /> <Compile Include="SQLitePackage.cs" /> <Compile Include="SQLiteProviderObjectFactory.cs" /> <Compile Include="TableNameDialog.cs"> <SubType>Form</SubType> </Compile> <Compile Include="TableNameDialog.Designer.cs"> <DependentUpon>TableNameDialog.cs</DependentUpon> |
︙ | ︙ |
Changes to SQLite.Designer/SQLite.Designer.2013.csproj.
︙ | ︙ | |||
142 143 144 145 146 147 148 149 150 151 152 153 154 155 | </Compile> <Compile Include="SQLiteDataAdapterToolboxItem.cs" /> <Compile Include="SQLiteDataConnectionSupport.cs" /> <Compile Include="SQLiteDataObjectIdentifierResolver.cs" /> <Compile Include="SQLiteDataObjectSupport.cs" /> <Compile Include="SQLiteDataSourceInformation.cs" /> <Compile Include="SQLiteDataViewSupport.cs" /> <Compile Include="SQLitePackage.cs" /> <Compile Include="SQLiteProviderObjectFactory.cs" /> <Compile Include="TableNameDialog.cs"> <SubType>Form</SubType> </Compile> <Compile Include="TableNameDialog.Designer.cs"> <DependentUpon>TableNameDialog.cs</DependentUpon> | > | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | </Compile> <Compile Include="SQLiteDataAdapterToolboxItem.cs" /> <Compile Include="SQLiteDataConnectionSupport.cs" /> <Compile Include="SQLiteDataObjectIdentifierResolver.cs" /> <Compile Include="SQLiteDataObjectSupport.cs" /> <Compile Include="SQLiteDataSourceInformation.cs" /> <Compile Include="SQLiteDataViewSupport.cs" /> <Compile Include="SQLiteOptions.cs" /> <Compile Include="SQLitePackage.cs" /> <Compile Include="SQLiteProviderObjectFactory.cs" /> <Compile Include="TableNameDialog.cs"> <SubType>Form</SubType> </Compile> <Compile Include="TableNameDialog.Designer.cs"> <DependentUpon>TableNameDialog.cs</DependentUpon> |
︙ | ︙ |
Changes to SQLite.Designer/SQLiteConnectionProperties.cs.
︙ | ︙ | |||
19 20 21 22 23 24 25 | { public SQLiteConnectionProperties() : this(null) { } public SQLiteConnectionProperties(string connectionString) | | | | 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 | { public SQLiteConnectionProperties() : this(null) { } public SQLiteConnectionProperties(string connectionString) : base(SQLiteOptions.GetProviderName(), connectionString) { } public override string[] GetBasicProperties() { return new string[] { "data source" }; } protected override bool ShouldPersistProperty(string propertyName) { if (String.Compare(propertyName, "Database", StringComparison.OrdinalIgnoreCase) == 0) return false; return base.ShouldPersistProperty(propertyName); } public override bool Contains(string propertyName) { if (String.Compare(propertyName, "Database", StringComparison.OrdinalIgnoreCase) == 0) return (base.Contains("data source") || base.Contains("uri") || base.Contains("fulluri")); return base.Contains(propertyName); } public override object this[string propertyName] { get |
︙ | ︙ | |||
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 | internal string GetDatabaseFile() { if (this["data source"] is string && ((string)this["data source"]).Length > 0) return (string)this["data source"]; else if (this["uri"] is string) return MapUriPath((string)this["uri"]); return String.Empty; } public override bool IsComplete { get { if (Contains("data source") == true) { if (this["data source"] is string && ((string)this["data source"]).Length > 0) return true; } else if (Contains("uri") == true) { if (this["uri"] is string && MapUriPath((string)this["uri"]).Length > 0) return true; } return false; } } internal static string MapUriPath(string path) | > > > > > > > | 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 | internal string GetDatabaseFile() { if (this["data source"] is string && ((string)this["data source"]).Length > 0) return (string)this["data source"]; else if (this["uri"] is string) return MapUriPath((string)this["uri"]); else if (this["fulluri"] is string) return (string)this["fulluri"]; return String.Empty; } public override bool IsComplete { get { if (Contains("data source") == true) { if (this["data source"] is string && ((string)this["data source"]).Length > 0) return true; } else if (Contains("uri") == true) { if (this["uri"] is string && MapUriPath((string)this["uri"]).Length > 0) return true; } else if (Contains("fulluri") == true) { if (this["fulluri"] is string && ((string)this["fulluri"]).Length > 0) return true; } return false; } } internal static string MapUriPath(string path) |
︙ | ︙ |
Changes to SQLite.Designer/SQLiteConnectionStringEditor.cs.
︙ | ︙ | |||
56 57 58 59 60 61 62 | if (connectionString == null && newConnection != null) { if (_managerType != null) { object manager = Activator.CreateInstance(_managerType, new object[] { provider }); if (manager != null) { | | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | if (connectionString == null && newConnection != null) { if (_managerType != null) { object manager = Activator.CreateInstance(_managerType, new object[] { provider }); if (manager != null) { index = (int)_managerType.InvokeMember("AddNewConnection", BindingFlags.Instance | BindingFlags.InvokeMethod | BindingFlags.Public, null, manager, new object[] { SQLiteOptions.GetProviderName() }); if (index > -1 && _selector != null) { connectionString = (string)_managerType.InvokeMember("GetConnectionString", BindingFlags.Instance | BindingFlags.InvokeMethod | BindingFlags.Public, null, manager, new object[] { index }); _selector.SelectedNode = _selector.AddNode((string)_managerType.InvokeMember("GetConnectionName", BindingFlags.Instance | BindingFlags.InvokeMethod | BindingFlags.Public, null, manager, new object[] { index }), connectionString, null); } } } |
︙ | ︙ | |||
100 101 102 103 104 105 106 | string connectionName; for (int n = 0; n < items; n++) { connectionString = (string)_managerType.InvokeMember("GetConnectionString", BindingFlags.Instance | BindingFlags.InvokeMethod | BindingFlags.Public, null, manager, new object[] { n }); connectionName = (string)_managerType.InvokeMember("GetConnectionName", BindingFlags.Instance | BindingFlags.InvokeMethod | BindingFlags.Public, null, manager, new object[] { n }); dataProvider = (string)_managerType.InvokeMember("GetProvider", BindingFlags.Instance | BindingFlags.InvokeMethod | BindingFlags.Public, null, manager, new object[] { n }); | | | 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | string connectionName; for (int n = 0; n < items; n++) { connectionString = (string)_managerType.InvokeMember("GetConnectionString", BindingFlags.Instance | BindingFlags.InvokeMethod | BindingFlags.Public, null, manager, new object[] { n }); connectionName = (string)_managerType.InvokeMember("GetConnectionName", BindingFlags.Instance | BindingFlags.InvokeMethod | BindingFlags.Public, null, manager, new object[] { n }); dataProvider = (string)_managerType.InvokeMember("GetProvider", BindingFlags.Instance | BindingFlags.InvokeMethod | BindingFlags.Public, null, manager, new object[] { n }); if (String.Compare(dataProvider, SQLiteOptions.GetProviderName(), StringComparison.OrdinalIgnoreCase) == 0) { node = selector.AddNode(connectionName, connectionString, null); if (String.Compare(connectionString, connection.ConnectionString, StringComparison.OrdinalIgnoreCase) == 0) selector.SelectedNode = node; } } selector.AddNode("<New Connection...>", this, null); } } } } |
Changes to SQLite.Designer/SQLiteConnectionUIControl.Designer.cs.
1 2 3 | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) | | | | | | | | | | | | | | | | | | | | | < | | | | | | | | | | | | | | > | | | | | | | | | | | | | | > | | | | | | | | > | | | | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > > > > | | | > | | | | | | | | | | | | | | | | | | | | > | < | | | | | | | | | | | | | | | > | | 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 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 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 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 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 | /******************************************************** * 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! ********************************************************/ namespace SQLite.Designer { partial class SQLiteConnectionUIControl { /// <summary> /// Required designer variable. /// </summary> private System.ComponentModel.IContainer components = null; /// <summary> /// Clean up any resources being used. /// </summary> /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> protected override void Dispose(bool disposing) { if (disposing && (components != null)) { components.Dispose(); } base.Dispose(disposing); } #region Windows Form Designer generated code /// <summary> /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// </summary> private void InitializeComponent() { System.Windows.Forms.Label labelPassword; System.Windows.Forms.GroupBox securityGroup; System.Windows.Forms.GroupBox encodingGroup; System.Windows.Forms.GroupBox dateTimeGroup; System.Windows.Forms.GroupBox databaseGroup; System.Windows.Forms.Label cacheSizeLabel; System.Windows.Forms.Label pageSizeLabel; System.Windows.Forms.GroupBox syncGroup; System.Windows.Forms.GroupBox providerGroup; this.passwordTextBox = new System.Windows.Forms.TextBox(); this.utf16RadioButton = new System.Windows.Forms.RadioButton(); this.utf8RadioButton = new System.Windows.Forms.RadioButton(); this.ticksRadioButton = new System.Windows.Forms.RadioButton(); this.iso8601RadioButton = new System.Windows.Forms.RadioButton(); this.cacheSizeTextbox = new System.Windows.Forms.TextBox(); this.pageSizeTextBox = new System.Windows.Forms.TextBox(); this.fileTextBox = new System.Windows.Forms.TextBox(); this.browseButton = new System.Windows.Forms.Button(); this.newDatabase = new System.Windows.Forms.Button(); this.offRadioButton = new System.Windows.Forms.RadioButton(); this.normalRadioButton = new System.Windows.Forms.RadioButton(); this.fullRadioButton = new System.Windows.Forms.RadioButton(); this.julianRadioButton = new System.Windows.Forms.RadioButton(); this.providerComboBox = new System.Windows.Forms.ComboBox(); labelPassword = new System.Windows.Forms.Label(); securityGroup = new System.Windows.Forms.GroupBox(); encodingGroup = new System.Windows.Forms.GroupBox(); dateTimeGroup = new System.Windows.Forms.GroupBox(); databaseGroup = new System.Windows.Forms.GroupBox(); cacheSizeLabel = new System.Windows.Forms.Label(); pageSizeLabel = new System.Windows.Forms.Label(); syncGroup = new System.Windows.Forms.GroupBox(); providerGroup = new System.Windows.Forms.GroupBox(); securityGroup.SuspendLayout(); encodingGroup.SuspendLayout(); dateTimeGroup.SuspendLayout(); databaseGroup.SuspendLayout(); syncGroup.SuspendLayout(); providerGroup.SuspendLayout(); this.SuspendLayout(); // // labelPassword // labelPassword.AutoSize = true; labelPassword.Location = new System.Drawing.Point(6, 23); labelPassword.Name = "labelPassword"; labelPassword.Size = new System.Drawing.Size(53, 13); labelPassword.TabIndex = 0; labelPassword.Text = "Password"; // // securityGroup // securityGroup.Controls.Add(this.passwordTextBox); securityGroup.Controls.Add(labelPassword); securityGroup.Location = new System.Drawing.Point(3, 263); securityGroup.Name = "securityGroup"; securityGroup.Size = new System.Drawing.Size(306, 56); securityGroup.TabIndex = 10; securityGroup.TabStop = false; securityGroup.Text = "Encryption"; // // passwordTextBox // this.passwordTextBox.Location = new System.Drawing.Point(65, 20); this.passwordTextBox.Name = "passwordTextBox"; this.passwordTextBox.Size = new System.Drawing.Size(235, 21); this.passwordTextBox.TabIndex = 1; this.passwordTextBox.UseSystemPasswordChar = true; this.passwordTextBox.Leave += new System.EventHandler(this.passwordTextBox_Leave); // // encodingGroup // encodingGroup.Controls.Add(this.utf16RadioButton); encodingGroup.Controls.Add(this.utf8RadioButton); encodingGroup.Location = new System.Drawing.Point(3, 159); encodingGroup.Name = "encodingGroup"; encodingGroup.Size = new System.Drawing.Size(75, 98); encodingGroup.TabIndex = 7; encodingGroup.TabStop = false; encodingGroup.Text = "Encoding"; // // utf16RadioButton // this.utf16RadioButton.AutoSize = true; this.utf16RadioButton.Location = new System.Drawing.Point(6, 44); this.utf16RadioButton.Name = "utf16RadioButton"; this.utf16RadioButton.Size = new System.Drawing.Size(60, 17); this.utf16RadioButton.TabIndex = 1; this.utf16RadioButton.TabStop = true; this.utf16RadioButton.Text = "UTF-16"; this.utf16RadioButton.UseVisualStyleBackColor = true; this.utf16RadioButton.CheckedChanged += new System.EventHandler(this.encoding_Changed); // // utf8RadioButton // this.utf8RadioButton.AutoSize = true; this.utf8RadioButton.Checked = true; this.utf8RadioButton.Location = new System.Drawing.Point(7, 21); this.utf8RadioButton.Name = "utf8RadioButton"; this.utf8RadioButton.Size = new System.Drawing.Size(54, 17); this.utf8RadioButton.TabIndex = 0; this.utf8RadioButton.TabStop = true; this.utf8RadioButton.Text = "UTF-8"; this.utf8RadioButton.UseVisualStyleBackColor = true; this.utf8RadioButton.CheckedChanged += new System.EventHandler(this.encoding_Changed); // // dateTimeGroup // dateTimeGroup.Controls.Add(this.julianRadioButton); dateTimeGroup.Controls.Add(this.ticksRadioButton); dateTimeGroup.Controls.Add(this.iso8601RadioButton); dateTimeGroup.Location = new System.Drawing.Point(84, 159); dateTimeGroup.Name = "dateTimeGroup"; dateTimeGroup.Size = new System.Drawing.Size(113, 98); dateTimeGroup.TabIndex = 8; dateTimeGroup.TabStop = false; dateTimeGroup.Text = "Date/Time Format"; // // ticksRadioButton // this.ticksRadioButton.AutoSize = true; this.ticksRadioButton.Location = new System.Drawing.Point(7, 66); this.ticksRadioButton.Name = "ticksRadioButton"; this.ticksRadioButton.Size = new System.Drawing.Size(48, 17); this.ticksRadioButton.TabIndex = 1; this.ticksRadioButton.TabStop = true; this.ticksRadioButton.Text = "Ticks"; this.ticksRadioButton.UseVisualStyleBackColor = true; this.ticksRadioButton.CheckedChanged += new System.EventHandler(this.datetime_Changed); // // iso8601RadioButton // this.iso8601RadioButton.AutoSize = true; this.iso8601RadioButton.Checked = true; this.iso8601RadioButton.Location = new System.Drawing.Point(7, 21); this.iso8601RadioButton.Name = "iso8601RadioButton"; this.iso8601RadioButton.Size = new System.Drawing.Size(71, 17); this.iso8601RadioButton.TabIndex = 0; this.iso8601RadioButton.TabStop = true; this.iso8601RadioButton.Text = "ISO-8601"; this.iso8601RadioButton.UseVisualStyleBackColor = true; this.iso8601RadioButton.CheckedChanged += new System.EventHandler(this.datetime_Changed); // // databaseGroup // databaseGroup.Controls.Add(cacheSizeLabel); databaseGroup.Controls.Add(this.cacheSizeTextbox); databaseGroup.Controls.Add(pageSizeLabel); databaseGroup.Controls.Add(this.pageSizeTextBox); databaseGroup.Controls.Add(this.fileTextBox); databaseGroup.Controls.Add(this.browseButton); databaseGroup.Controls.Add(this.newDatabase); databaseGroup.Location = new System.Drawing.Point(3, 3); databaseGroup.Name = "databaseGroup"; databaseGroup.Size = new System.Drawing.Size(306, 150); databaseGroup.TabIndex = 8; databaseGroup.TabStop = false; databaseGroup.Text = "Database"; // // cacheSizeLabel // cacheSizeLabel.AutoSize = true; cacheSizeLabel.Location = new System.Drawing.Point(7, 116); cacheSizeLabel.Name = "cacheSizeLabel"; cacheSizeLabel.Size = new System.Drawing.Size(59, 13); cacheSizeLabel.TabIndex = 5; cacheSizeLabel.Text = "Cache Size"; // // cacheSizeTextbox // this.cacheSizeTextbox.Location = new System.Drawing.Point(72, 113); this.cacheSizeTextbox.Name = "cacheSizeTextbox"; this.cacheSizeTextbox.Size = new System.Drawing.Size(100, 21); this.cacheSizeTextbox.TabIndex = 6; this.cacheSizeTextbox.Text = "2000"; this.cacheSizeTextbox.Leave += new System.EventHandler(this.cacheSizeTextbox_Leave); // // pageSizeLabel // pageSizeLabel.AutoSize = true; pageSizeLabel.Location = new System.Drawing.Point(13, 89); pageSizeLabel.Name = "pageSizeLabel"; pageSizeLabel.Size = new System.Drawing.Size(53, 13); pageSizeLabel.TabIndex = 3; pageSizeLabel.Text = "Page Size"; // // pageSizeTextBox // this.pageSizeTextBox.Location = new System.Drawing.Point(72, 86); this.pageSizeTextBox.Name = "pageSizeTextBox"; this.pageSizeTextBox.Size = new System.Drawing.Size(100, 21); this.pageSizeTextBox.TabIndex = 4; this.pageSizeTextBox.Text = "1024"; this.pageSizeTextBox.Leave += new System.EventHandler(this.pageSizeTextBox_Leave); // // fileTextBox // this.fileTextBox.Location = new System.Drawing.Point(6, 20); this.fileTextBox.Name = "fileTextBox"; this.fileTextBox.Size = new System.Drawing.Size(294, 21); this.fileTextBox.TabIndex = 0; this.fileTextBox.Leave += new System.EventHandler(this.fileTextBox_Leave); // // browseButton // this.browseButton.Location = new System.Drawing.Point(6, 47); this.browseButton.Name = "browseButton"; this.browseButton.Size = new System.Drawing.Size(75, 23); this.browseButton.TabIndex = 1; this.browseButton.Text = "&Browse ..."; this.browseButton.UseVisualStyleBackColor = true; this.browseButton.Click += new System.EventHandler(this.browseButton_Click); // // newDatabase // this.newDatabase.Location = new System.Drawing.Point(87, 47); this.newDatabase.Name = "newDatabase"; this.newDatabase.Size = new System.Drawing.Size(75, 23); this.newDatabase.TabIndex = 2; this.newDatabase.Text = "&New ..."; this.newDatabase.UseVisualStyleBackColor = true; this.newDatabase.Click += new System.EventHandler(this.newDatabase_Click); // // syncGroup // syncGroup.Controls.Add(this.offRadioButton); syncGroup.Controls.Add(this.normalRadioButton); syncGroup.Controls.Add(this.fullRadioButton); syncGroup.Location = new System.Drawing.Point(204, 159); syncGroup.Name = "syncGroup"; syncGroup.Size = new System.Drawing.Size(105, 98); syncGroup.TabIndex = 9; syncGroup.TabStop = false; syncGroup.Text = "Synchronization"; // // offRadioButton // this.offRadioButton.AutoSize = true; this.offRadioButton.Location = new System.Drawing.Point(6, 66); this.offRadioButton.Name = "offRadioButton"; this.offRadioButton.Size = new System.Drawing.Size(41, 17); this.offRadioButton.TabIndex = 2; this.offRadioButton.Text = "Off"; this.offRadioButton.UseVisualStyleBackColor = true; this.offRadioButton.CheckedChanged += new System.EventHandler(this.sync_Changed); // // normalRadioButton // this.normalRadioButton.AutoSize = true; this.normalRadioButton.Checked = true; this.normalRadioButton.Location = new System.Drawing.Point(6, 43); this.normalRadioButton.Name = "normalRadioButton"; this.normalRadioButton.Size = new System.Drawing.Size(58, 17); this.normalRadioButton.TabIndex = 1; this.normalRadioButton.TabStop = true; this.normalRadioButton.Text = "Normal"; this.normalRadioButton.UseVisualStyleBackColor = true; this.normalRadioButton.CheckedChanged += new System.EventHandler(this.sync_Changed); // // fullRadioButton // this.fullRadioButton.AutoSize = true; this.fullRadioButton.Location = new System.Drawing.Point(6, 20); this.fullRadioButton.Name = "fullRadioButton"; this.fullRadioButton.Size = new System.Drawing.Size(41, 17); this.fullRadioButton.TabIndex = 0; this.fullRadioButton.Text = "Full"; this.fullRadioButton.UseVisualStyleBackColor = true; this.fullRadioButton.CheckedChanged += new System.EventHandler(this.sync_Changed); // // julianRadioButton // this.julianRadioButton.AutoSize = true; this.julianRadioButton.Location = new System.Drawing.Point(7, 44); this.julianRadioButton.Name = "julianRadioButton"; this.julianRadioButton.Size = new System.Drawing.Size(74, 17); this.julianRadioButton.TabIndex = 2; this.julianRadioButton.TabStop = true; this.julianRadioButton.Text = "Julian Day"; this.julianRadioButton.UseVisualStyleBackColor = true; this.julianRadioButton.CheckedChanged += new System.EventHandler(this.datetime_Changed); // // providerGroup // providerGroup.Controls.Add(this.providerComboBox); providerGroup.Location = new System.Drawing.Point(3, 325); providerGroup.Name = "providerGroup"; providerGroup.Size = new System.Drawing.Size(306, 56); providerGroup.TabIndex = 11; providerGroup.TabStop = false; providerGroup.Text = "Provider"; // // providerComboBox // this.providerComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.providerComboBox.FormattingEnabled = true; this.providerComboBox.Location = new System.Drawing.Point(6, 20); this.providerComboBox.Name = "providerComboBox"; this.providerComboBox.Size = new System.Drawing.Size(294, 21); this.providerComboBox.TabIndex = 0; this.providerComboBox.SelectedIndexChanged += new System.EventHandler(this.provider_Changed); // // SQLiteConnectionUIControl // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(providerGroup); this.Controls.Add(syncGroup); this.Controls.Add(databaseGroup); this.Controls.Add(dateTimeGroup); this.Controls.Add(encodingGroup); this.Controls.Add(securityGroup); this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "SQLiteConnectionUIControl"; this.Size = new System.Drawing.Size(312, 386); securityGroup.ResumeLayout(false); securityGroup.PerformLayout(); encodingGroup.ResumeLayout(false); encodingGroup.PerformLayout(); dateTimeGroup.ResumeLayout(false); dateTimeGroup.PerformLayout(); databaseGroup.ResumeLayout(false); databaseGroup.PerformLayout(); syncGroup.ResumeLayout(false); syncGroup.PerformLayout(); providerGroup.ResumeLayout(false); providerGroup.PerformLayout(); this.ResumeLayout(false); } #endregion private System.Windows.Forms.TextBox fileTextBox; private System.Windows.Forms.Button browseButton; private System.Windows.Forms.Button newDatabase; private System.Windows.Forms.TextBox passwordTextBox; private System.Windows.Forms.RadioButton utf16RadioButton; private System.Windows.Forms.RadioButton utf8RadioButton; private System.Windows.Forms.RadioButton ticksRadioButton; private System.Windows.Forms.RadioButton iso8601RadioButton; private System.Windows.Forms.TextBox pageSizeTextBox; private System.Windows.Forms.TextBox cacheSizeTextbox; private System.Windows.Forms.RadioButton offRadioButton; private System.Windows.Forms.RadioButton normalRadioButton; private System.Windows.Forms.RadioButton fullRadioButton; private System.Windows.Forms.RadioButton julianRadioButton; private System.Windows.Forms.ComboBox providerComboBox; } } |
Changes to SQLite.Designer/SQLiteConnectionUIControl.cs.
1 2 3 | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) | | < < < < < > | 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 | /******************************************************** * 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! ********************************************************/ namespace SQLite.Designer { using System; using System.ComponentModel; using System.Windows.Forms; using System.Globalization; using Microsoft.VisualStudio.Data; /// <summary> /// Provides a UI to edit/create SQLite database connections /// </summary> [ToolboxItem(false)] public partial class SQLiteConnectionUIControl : DataConnectionUIControl { public SQLiteConnectionUIControl() { InitializeComponent(); SQLiteOptions.AddProviderNames(providerComboBox.Items); } private void browseButton_Click(object sender, EventArgs e) { OpenFileDialog dlg = new OpenFileDialog(); dlg.FileName = fileTextBox.Text; dlg.Title = "Select SQLite Database File"; |
︙ | ︙ | |||
53 54 55 56 57 58 59 60 61 | } } #region IDataConnectionUIControl Members public override void LoadProperties() { if (ConnectionProperties.Contains("data source")) fileTextBox.Text = ConnectionProperties["data source"] as string; | > > > > > > > > < < < < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 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 | } } #region IDataConnectionUIControl Members public override void LoadProperties() { SQLiteOptions.SelectProviderName(providerComboBox); fileTextBox.Text = String.Empty; passwordTextBox.Text = String.Empty; if (ConnectionProperties == null) return; if (ConnectionProperties.Contains("data source")) fileTextBox.Text = ConnectionProperties["data source"] as string; if (ConnectionProperties.Contains("password")) passwordTextBox.Text = ConnectionProperties["password"] as string; } #endregion private void passwordTextBox_Leave(object sender, EventArgs e) { if (ConnectionProperties == null) return; if (String.IsNullOrEmpty(passwordTextBox.Text)) ConnectionProperties.Remove("password"); else ConnectionProperties["password"] = passwordTextBox.Text; } private void encoding_Changed(object sender, EventArgs e) { if (ConnectionProperties == null) return; if (utf8RadioButton.Checked == true) ConnectionProperties.Remove("useutf16encoding"); else ConnectionProperties["useutf16encoding"] = utf16RadioButton.Checked; } private void datetime_Changed(object sender, EventArgs e) { if (ConnectionProperties == null) return; if (iso8601RadioButton.Checked == true) ConnectionProperties.Remove("datetimeformat"); else if (ticksRadioButton.Checked == true) ConnectionProperties["datetimeformat"] = "Ticks"; else ConnectionProperties["datetimeformat"] = "JulianDay"; } private void provider_Changed(object sender, EventArgs e) { object item = providerComboBox.SelectedItem; if (item != null) SQLiteOptions.SetProviderName(item.ToString()); } private void sync_Changed(object sender, EventArgs e) { if (ConnectionProperties == null) return; string sync = "Normal"; if (fullRadioButton.Checked == true) sync = "Full"; else if (offRadioButton.Checked == true) sync = "Off"; if (sync == "Normal") ConnectionProperties.Remove("synchronous"); else ConnectionProperties["synchronous"] = sync; } private void pageSizeTextBox_Leave(object sender, EventArgs e) { if (ConnectionProperties == null) return; int n = Convert.ToInt32(pageSizeTextBox.Text, CultureInfo.CurrentCulture); ConnectionProperties["page size"] = n; } private void cacheSizeTextbox_Leave(object sender, EventArgs e) { if (ConnectionProperties == null) return; int n = Convert.ToInt32(cacheSizeTextbox.Text, CultureInfo.CurrentCulture); ConnectionProperties["cache size"] = n; } private void fileTextBox_Leave(object sender, EventArgs e) { if (ConnectionProperties == null) return; ConnectionProperties["data source"] = fileTextBox.Text; } } } |
Changes to SQLite.Designer/SQLiteConnectionUIControl.resx.
1 2 | <?xml version="1.0" encoding="utf-8"?> <root> | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | <?xml version="1.0" encoding="utf-8"?> <root> <!-- Microsoft ResX Schema Version 2.0 The primary goals of this format is to allow a simple XML format that is mostly human readable. The generation and parsing of the various data types are done through the TypeConverter classes associated with the data types. Example: ... ado.net/XML headers & schema ... <resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="version">2.0</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> <value>[base64 mime encoded serialized .NET Framework object]</value> </data> <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> <comment>This is a comment</comment> </data> There are any number of "resheader" rows that contain simple name/value pairs. Each data row contains a name, and value. The row also contains a type or mimetype. Type corresponds to a .NET class that support text/value conversion through the TypeConverter architecture. Classes that don't support this are serialized and stored with the mimetype set. The mimetype is used for serialized objects, and tells the ResXResourceReader how to depersist the object. This is currently not extensible. For a given mimetype the value must be set accordingly: Note - application/x-microsoft.net.object.binary.base64 is the format that the ResXResourceWriter will generate, however the reader can read any of the formats listed below. mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Soap.SoapFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.bytearray.base64 value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> |
︙ | ︙ | |||
136 137 138 139 140 141 142 143 144 | <value>False</value> </metadata> <metadata name="pageSizeLabel.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </metadata> <metadata name="syncGroup.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </metadata> </root> | > > > | 136 137 138 139 140 141 142 143 144 145 146 147 | <value>False</value> </metadata> <metadata name="pageSizeLabel.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </metadata> <metadata name="syncGroup.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </metadata> <metadata name="providerGroup.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </metadata> </root> |
Changes to SQLite.Designer/SQLiteDataAdapterToolboxItem.cs.
︙ | ︙ | |||
59 60 61 62 63 64 65 | /// <summary> /// Creates the necessary components associated with this data adapter instance /// </summary> /// <param name="host">The designer host</param> /// <returns>The components created by this toolbox item</returns> protected override IComponent[] CreateComponentsCore(IDesignerHost host) { | | | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | /// <summary> /// Creates the necessary components associated with this data adapter instance /// </summary> /// <param name="host">The designer host</param> /// <returns>The components created by this toolbox item</returns> protected override IComponent[] CreateComponentsCore(IDesignerHost host) { DbProviderFactory fact = DbProviderFactories.GetFactory(SQLiteOptions.GetProviderName()); DbDataAdapter dataAdapter = fact.CreateDataAdapter(); IContainer container = host.Container; using (DbCommand adapterCommand = fact.CreateCommand()) { ICloneable adapter = (ICloneable)adapterCommand; |
︙ | ︙ |
Changes to SQLite.Designer/SQLiteDataConnectionSupport.cs.
︙ | ︙ | |||
19 20 21 22 23 24 25 | internal sealed class SQLiteDataConnectionSupport : AdoDotNetConnectionSupport { private SQLiteDataViewSupport _dataViewSupport; private SQLiteDataObjectSupport _dataObjectSupport; private SQLiteDataObjectIdentifierResolver _dataObjectIdentifierResolver; public SQLiteDataConnectionSupport() | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | internal sealed class SQLiteDataConnectionSupport : AdoDotNetConnectionSupport { private SQLiteDataViewSupport _dataViewSupport; private SQLiteDataObjectSupport _dataObjectSupport; private SQLiteDataObjectIdentifierResolver _dataObjectIdentifierResolver; public SQLiteDataConnectionSupport() : base(SQLiteOptions.GetProviderName()) { } protected override DataSourceInformation CreateDataSourceInformation() { return new SQLiteDataSourceInformation(Site as DataConnection); } |
︙ | ︙ |
Added SQLite.Designer/SQLiteOptions.cs.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 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 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 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 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 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 543 544 545 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 | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Joe Mistachkin (joe@mistachkin.com) * * Released to the public domain, use at your own risk! ********************************************************/ using System; using System.Collections.Generic; using System.Data.Common; using System.IO; using System.Runtime.InteropServices; using System.Windows.Forms; using Microsoft.VisualStudio.Shell; namespace SQLite.Designer { /// <summary> /// This class keeps track of the options configured on a per-solution file /// basis pertaining to the System.Data.SQLite design-time components. /// </summary> [Guid("5cf5656c-ccbe-4162-8780-0cbee936b90c")] internal static class SQLiteOptions { #region Private Constants /// <summary> /// This is the name of the setting containing the configured ADO.NET /// provider name. /// </summary> private static readonly string ProviderNameKey = "ProviderName"; /////////////////////////////////////////////////////////////////////// /// <summary> /// This is the name of the environment variable that will be checked /// prior to setting the initial default value for the configured /// ADO.NET provider name, thus allowing the default value to be /// overridden via the environment. /// </summary> private static readonly string ProviderNameEnvVarName = "ProviderName_SQLiteDesigner"; /////////////////////////////////////////////////////////////////////// /// <summary> /// This is the legacy provider name used by the System.Data.SQLite /// design-time components. It is also the default value for the /// associated option key. /// </summary> private static readonly string DefaultProviderName = "System.Data.SQLite"; /////////////////////////////////////////////////////////////////////// #if NET_40 || NET_45 || NET_451 /// <summary> /// This is the provider name used when Entity Framework 6.x support is /// required for use with the System.Data.SQLite design-time components. /// This provider name is only available when this class is compiled for /// the .NET Framework 4.0 or later. /// </summary> private static readonly string Ef6ProviderName = "System.Data.SQLite.EF6"; #endif #endregion /////////////////////////////////////////////////////////////////////// #region Private Static Data /// <summary> /// This is used to synchronize access to the static dictionary of /// options (just below). /// </summary> private static readonly object syncRoot = new object(); /// <summary> /// This dictionary contains the key/value pairs representing the /// per-solution options configured for the current solution. When /// a new solution is loaded by Visual Studio, this dictionary must /// be reset. /// </summary> private static Dictionary<string, string> options; #endregion /////////////////////////////////////////////////////////////////////// #region Private Static Methods /// <summary> /// This method initializes (or resets) the per-solution configuration /// options. /// </summary> /// <param name="reset"> /// Non-zero to reset the options if they are already initialized. /// When this method is called from the <see cref="SQLitePackage" /> /// constructor, this value should always be true. /// </param> private static void Initialize( bool reset ) { lock (syncRoot) { if (options != null) options.Clear(); else options = new Dictionary<string, string>(); string key = ProviderNameKey; string value = Environment.GetEnvironmentVariable( ProviderNameEnvVarName); if (IsValidValue(key, value)) options[key] = value; else options[key] = DefaultProviderName; } } #endregion /////////////////////////////////////////////////////////////////////// #region Public Static Methods #region Provider Name Handling /// <summary> /// This method determines the name of the ADO.NET provider for the /// System.Data.SQLite design-time components to use. /// </summary> /// <returns> /// The configured ADO.NET provider name for System.Data.SQLite -OR- /// the default ADO.NET provider name for System.Data.SQLite in the /// event of any failure. This method cannot return null. /// </returns> public static string GetProviderName() { return GetProviderName(DefaultProviderName); } /////////////////////////////////////////////////////////////////////// /// <summary> /// This method determines the name of the ADO.NET provider for the /// System.Data.SQLite design-time components to use. /// </summary> /// <param name="default"> /// The value to return from this method if the name of the ADO.NET /// provider is unavailable -OR- cannot be determined. /// </param> /// <returns> /// The configured ADO.NET provider name for System.Data.SQLite -OR- /// the default ADO.NET provider name for System.Data.SQLite in the /// event of any failure. /// </returns> private static string GetProviderName( string @default ) { string key = ProviderNameKey; string value; if (GetValue(key, out value) && IsValidValue(key, value)) return value; return @default; } /////////////////////////////////////////////////////////////////////// /// <summary> /// This method attempts to set the name of the ADO.NET provider for /// the System.Data.SQLite design-time components to use. /// </summary> /// <param name="value"> /// The ADO.NET provider name to use. /// </param> /// <returns> /// Non-zero upon success; otherwise, zero. All ADO.NET provider names /// unknown to this class are rejected. /// </returns> public static bool SetProviderName( string value ) { string key = ProviderNameKey; if (IsValidValue(key, value)) return SetValue(key, value); return false; } /////////////////////////////////////////////////////////////////////// #region User-Interface Handling /// <summary> /// This method attempts to select the configured ADO.NET provider name /// in the specified <see cref="ComboBox" />. This method will only /// work correctly when called from the user-interface thread. /// </summary> /// <param name="comboBox"> /// The <see cref="ComboBox" /> object where the selection is to be /// modified. /// </param> /// <returns> /// Non-zero upon success; otherwise, zero. /// </returns> public static bool SelectProviderName( ComboBox comboBox ) { if (comboBox == null) return false; string value = GetProviderName(null); for (int index = 0; index < comboBox.Items.Count; index++) { object item = comboBox.Items[index]; if (item == null) continue; if ((value == null) || String.Equals( item.ToString(), value, StringComparison.Ordinal)) { comboBox.SelectedIndex = index; return true; } } return false; } /////////////////////////////////////////////////////////////////////// private static bool CheckProviderName( string name ) { DbProviderFactory dbProviderFactory = null; try { dbProviderFactory = DbProviderFactories.GetFactory( name); /* throw */ return (dbProviderFactory != null); } catch { // do nothing. } finally { if (dbProviderFactory != null) { IDisposable disposable = dbProviderFactory as IDisposable; if (disposable != null) { disposable.Dispose(); disposable = null; } dbProviderFactory = null; } } return false; } /////////////////////////////////////////////////////////////////////// /// <summary> /// This method populates the specified <see cref="ComboBox" /> item /// list with the recognized ADO.NET provider names. This method will /// only work correctly when called from the user-interface thread. /// </summary> /// <param name="items"> /// The <see cref="ComboBox.Items" /> property value containing the /// list of items to be modified. This value cannot be null. /// </param> /// <returns> /// The number of items actually added to the list, which may be zero. /// </returns> public static int AddProviderNames( ComboBox.ObjectCollection items ) { int result = 0; if (items == null) return result; IList<string> names = new List<string>(); #if NET_40 || NET_45 || NET_451 names.Add(Ef6ProviderName); #endif names.Add(DefaultProviderName); foreach (string name in names) { if (CheckProviderName(name)) { items.Add(name); result++; } } return result; } #endregion #endregion /////////////////////////////////////////////////////////////////////// #region Hard-Coded Default Value Handling /// <summary> /// This method determines if the specified key/value pair represents /// the default value for that option. /// </summary> /// <param name="key"> /// The name ("key") of the configuration option. /// </param> /// <param name="value"> /// The value of the configuration option. /// </param> /// <returns> /// Non-zero if the key/value pair represents its default value. /// </returns> public static bool IsDefaultValue( string key, string value ) { if (String.Equals( key, ProviderNameKey, StringComparison.Ordinal) && String.Equals( value, DefaultProviderName, StringComparison.Ordinal)) { return true; } return false; } /////////////////////////////////////////////////////////////////////// /// <summary> /// This method determines if the specified key/value pair is valid /// and supported by this class. /// </summary> /// <param name="key"> /// The name ("key") of the configuration option. /// </param> /// <param name="value"> /// The value of the configuration option. /// </param> /// <returns> /// Non-zero if the key/value pair represents a valid option key and /// value supported by this class. /// </returns> public static bool IsValidValue( string key, string value ) { if (String.Equals( key, ProviderNameKey, StringComparison.Ordinal) && (String.Equals( value, DefaultProviderName, StringComparison.Ordinal) #if NET_40 || NET_45 || NET_451 || String.Equals( value, Ef6ProviderName, StringComparison.Ordinal) #endif )) { return true; } return false; } #endregion /////////////////////////////////////////////////////////////////////// #region Core Option Handling /// <summary> /// This method returns the current list of option keys supported by /// the System.Data.SQLite design-time components. /// </summary> /// <returns> /// An <see cref="IEnumerable{T}" /> of strings containing the list of /// option keys supported by the System.Data.SQLite design-time /// components -OR- null in the event of any failure. /// </returns> public static IEnumerable<string> GetKeys( bool reset ) { lock (syncRoot) /* TRANSACTIONAL */ { Initialize(reset); return (options != null) ? new List<string>(options.Keys) : null; } } /////////////////////////////////////////////////////////////////////// /// <summary> /// This method determines if the specified option key is supported by /// this class. /// </summary> /// <param name="key"> /// The name ("key") of the configuration option. /// </param> /// <returns> /// Non-zero if the specified option key is supported by this class. /// </returns> public static bool HaveKey( string key ) { lock (syncRoot) { if ((key == null) || (options == null)) return false; return options.ContainsKey(key); } } /////////////////////////////////////////////////////////////////////// /// <summary> /// This method attempts to query and return the current value of the /// specified option key. /// </summary> /// <param name="key"> /// The name ("key") of the configuration option. /// </param> /// <param name="value"> /// Upon success, the current value for the configuration option; /// otherwise, null. /// </param> /// <returns> /// Non-zero for success; otherwise, zero. /// </returns> public static bool GetValue( string key, out string value ) { lock (syncRoot) { value = null; if ((key == null) || (options == null)) return false; if (options.TryGetValue(key, out value)) return true; return false; } } /////////////////////////////////////////////////////////////////////// /// <summary> /// This method attempts to set the value of the specified option key. /// </summary> /// <param name="key"> /// The name ("key") of the configuration option. /// </param> /// <param name="value"> /// The new value for the configuration option. /// </param> /// <returns> /// Non-zero for success; otherwise, zero. /// </returns> public static bool SetValue( string key, string value ) { lock (syncRoot) { if ((key == null) || (options == null)) return false; options[key] = value; return true; } } #endregion /////////////////////////////////////////////////////////////////////// #region Stream Handling /// <summary> /// This method attempts to read an option value from the specified /// stream. The stream must be readable. After this method returns, /// the stream may no longer be usable. /// </summary> /// <param name="stream"> /// The stream to read the option value from. /// </param> /// <param name="value"> /// Upon success, the read value for the configuration option; /// otherwise, null. /// </param> /// <returns> /// Non-zero for success; otherwise, zero. /// </returns> public static bool ReadValue( Stream stream, out string value ) { value = null; if ((stream == null) || !stream.CanRead) return false; try { using (StreamReader streamReader = new StreamReader(stream)) { value = streamReader.ReadToEnd(); return true; } } catch (Exception) { // do nothing. } return false; } /////////////////////////////////////////////////////////////////////// /// <summary> /// This method attempts to write an option value to the specified /// stream. The stream must be writable. After this method returns, /// the stream may no longer be usable. /// </summary> /// <param name="stream"> /// The stream to write the option value to. /// </param> /// <param name="value"> /// The option value to be written. This value may be null. /// </param> /// <returns> /// Non-zero for success; otherwise, zero. /// </returns> public static bool WriteValue( Stream stream, string value ) { if ((stream == null) || !stream.CanWrite) return false; try { using (StreamWriter streamWriter = new StreamWriter(stream)) { streamWriter.Write(value); return true; } } catch (Exception) { // do nothing. } return false; } #endregion #endregion } } |
Changes to SQLite.Designer/SQLitePackage.cs.
1 2 3 | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | /******************************************************** * 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! ********************************************************/ namespace SQLite.Designer { using System; using System.Collections.Generic; using System.IO; using Microsoft.VisualStudio.Shell; using System.Runtime.InteropServices; using System.ComponentModel.Design; using Microsoft.VisualStudio.Shell.Interop; /// <summary> /// Ideally we'd be a package provider, but the VS Express Editions don't support us, so this class /// exists so that in the future we can perhaps work with the Express Editions. /// </summary> [Guid("DCBE6C8D-0E57-4099-A183-98FF74C64D9C")] internal sealed class SQLitePackage : Package { public SQLitePackage() { IEnumerable<string> keys = SQLiteOptions.GetKeys(true); if (keys != null) { foreach (string key in keys) { if (key == null) continue; AddOptionKey(key); } } } protected override void Initialize() { IServiceContainer sc = (IServiceContainer)this; sc.AddService(typeof(SQLiteProviderObjectFactory), new ServiceCreatorCallback(CreateService), true); ToolboxInitialized += new EventHandler(SQLitePackage_ToolboxInitialized); ToolboxUpgraded += new EventHandler(SQLitePackage_ToolboxUpgraded); base.Initialize(); } protected override void OnLoadOptions(string key, Stream stream) { if (SQLiteOptions.HaveKey(key)) { string value; if (SQLiteOptions.ReadValue(stream, out value) && SQLiteOptions.IsValidValue(key, value)) { SQLiteOptions.SetValue(key, value); } return; } base.OnLoadOptions(key, stream); } protected override void OnSaveOptions(string key, Stream stream) { if (SQLiteOptions.HaveKey(key)) { string value; if (SQLiteOptions.GetValue(key, out value) && SQLiteOptions.IsValidValue(key, value) && !SQLiteOptions.IsDefaultValue(key, value)) { SQLiteOptions.WriteValue(stream, value); } return; } base.OnSaveOptions(key, stream); } void SQLitePackage_ToolboxUpgraded(object sender, EventArgs e) { IVsToolbox vstbx = GetService(typeof(SVsToolbox)) as IVsToolbox; vstbx.RemoveTab("SQLite"); |
︙ | ︙ |
Changes to Setup/build_all.bat.
︙ | ︙ | |||
43 44 45 46 47 48 49 | IF ERRORLEVEL 1 ( ECHO Could not set common variables. GOTO errors ) IF NOT DEFINED BUILD_CONFIGURATIONS ( | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | IF ERRORLEVEL 1 ( ECHO Could not set common variables. GOTO errors ) IF NOT DEFINED BUILD_CONFIGURATIONS ( SET BUILD_CONFIGURATIONS=Debug Release ) %_VECHO% BuildConfigurations = '%BUILD_CONFIGURATIONS%' IF NOT DEFINED PLATFORMS ( SET PLATFORMS=Win32 ) |
︙ | ︙ |
Changes to Setup/data/SQLite.iss.
︙ | ︙ | |||
208 209 210 211 212 213 214 215 216 217 218 219 220 221 | #if Year != "2005" && Year != "2008" #if Year == "2010" Components: Application\EF6; Source: ..\..\Externals\EntityFramework\lib\net40\EntityFramework.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete #elif Year == "2012" || Year == "2013" Components: Application\EF6; Source: ..\..\Externals\EntityFramework\lib\net45\EntityFramework.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete #endif Components: Application\EF6; Source: ..\..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.EF6.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete Components: Application\EF6 and Application\Symbols; Source: ..\..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.EF6.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete #endif #if Pos("NativeOnly", AppConfiguration) != 0 Components: Application\Core\{#AppProcessor}; Source: ..\..\bin\{#Year}\{#AppPlatform}\{#AppConfiguration}\SQLite.Interop.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete | > > > > | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 | #if Year != "2005" && Year != "2008" #if Year == "2010" Components: Application\EF6; Source: ..\..\Externals\EntityFramework\lib\net40\EntityFramework.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete #elif Year == "2012" || Year == "2013" Components: Application\EF6; Source: ..\..\Externals\EntityFramework\lib\net45\EntityFramework.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete #endif #if Pos("NativeOnly", AppConfiguration) == 0 Components: Application\EF6; Tasks: gac; Source: ..\..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.EF6.dll; DestDir: {app}\GAC; StrongAssemblyName: "System.Data.SQLite.EF6, Version={#AppVersion}, Culture=neutral, PublicKeyToken={#AppPublicKey}, ProcessorArchitecture=MSIL"; Flags: restartreplace uninsrestartdelete uninsnosharedfileprompt sharedfile gacinstall #endif Components: Application\EF6; Source: ..\..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.EF6.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete Components: Application\EF6 and Application\Symbols; Source: ..\..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.EF6.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete #endif #if Pos("NativeOnly", AppConfiguration) != 0 Components: Application\Core\{#AppProcessor}; Source: ..\..\bin\{#Year}\{#AppPlatform}\{#AppConfiguration}\SQLite.Interop.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete |
︙ | ︙ |
Changes to Tests/common.eagle.
︙ | ︙ | |||
1647 1648 1649 1650 1651 1652 1653 | # it is necessary to attempt a conversion to the actual enumerated # type. Failing that, the check against the default value will be # skipped. # set error null; # IGNORED set value [object invoke Utility TryParseFlagsEnum "" \ System.Data.SQLite.SQLiteConnectionFlags "" $flags null true \ | | | 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 | # it is necessary to attempt a conversion to the actual enumerated # type. Failing that, the check against the default value will be # skipped. # set error null; # IGNORED set value [object invoke Utility TryParseFlagsEnum "" \ System.Data.SQLite.SQLiteConnectionFlags "" $flags null true \ true error] # # NOTE: If the combined flags string could not actually be converted # to the enumerated type it is the default value, then just use # it verbatim; otherwise, just return an empty string. In that # case, the default connection flags will be used. # |
︙ | ︙ |
Changes to Tests/data/Installer_Test_Vs2005.log.
︙ | ︙ | |||
58 59 60 61 62 63 64 | Installer.exe: #58: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #59: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #60: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Installer.exe: #61: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataViewSupport" Installer.exe: #62: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\8.0", writable = False Installer.exe: #63: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0", name = "InstallDir", defaultValue = <null> Installer.exe: #64: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 8} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 8} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True | | | 58 59 60 61 62 63 64 65 66 67 | Installer.exe: #58: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #59: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #60: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Installer.exe: #61: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataViewSupport" Installer.exe: #62: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\8.0", writable = False Installer.exe: #63: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0", name = "InstallDir", defaultValue = <null> Installer.exe: #64: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 8} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 8} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True Installer.exe: #65: Installer.Main: subKeysCreated = 12, subKeysDeleted = 1, keyValuesRead = 5, keyValuesWritten = 23, keyValuesDeleted = 0 Installer.exe: #66: Installer.Main: filesCreated = 1, filesModified = 2, filesDeleted = 0 Installer.exe: #67: Installer.Main: Success. |
Changes to Tests/data/Installer_Test_Vs2008.log.
︙ | ︙ | |||
68 69 70 71 72 73 74 | Installer.exe: #68: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #69: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #70: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Installer.exe: #71: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataViewSupport" Installer.exe: #72: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\9.0", writable = False Installer.exe: #73: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0", name = "InstallDir", defaultValue = <null> Installer.exe: #74: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 9.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 9.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True | | | 68 69 70 71 72 73 74 75 76 77 | Installer.exe: #68: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #69: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #70: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Installer.exe: #71: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataViewSupport" Installer.exe: #72: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\9.0", writable = False Installer.exe: #73: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0", name = "InstallDir", defaultValue = <null> Installer.exe: #74: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 9.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 9.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True Installer.exe: #75: Installer.Main: subKeysCreated = 13, subKeysDeleted = 2, keyValuesRead = 6, keyValuesWritten = 24, keyValuesDeleted = 0 Installer.exe: #76: Installer.Main: filesCreated = 1, filesModified = 2, filesDeleted = 0 Installer.exe: #77: Installer.Main: Success. |
Changes to Tests/data/Installer_Test_Vs2010.log.
︙ | ︙ | |||
61 62 63 64 65 66 67 | Installer.exe: #61: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #62: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #63: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Installer.exe: #64: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataViewSupport" Installer.exe: #65: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\10.0", writable = False Installer.exe: #66: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0", name = "InstallDir", defaultValue = <null> Installer.exe: #67: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 10.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 10.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True | | | 61 62 63 64 65 66 67 68 69 70 | Installer.exe: #61: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #62: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #63: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Installer.exe: #64: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataViewSupport" Installer.exe: #65: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\10.0", writable = False Installer.exe: #66: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0", name = "InstallDir", defaultValue = <null> Installer.exe: #67: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 10.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 10.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True Installer.exe: #68: Installer.Main: subKeysCreated = 12, subKeysDeleted = 1, keyValuesRead = 5, keyValuesWritten = 23, keyValuesDeleted = 0 Installer.exe: #69: Installer.Main: filesCreated = 1, filesModified = 2, filesDeleted = 0 Installer.exe: #70: Installer.Main: Success. |
Changes to Tests/data/Installer_Test_Vs2012.log.
︙ | ︙ | |||
61 62 63 64 65 66 67 | Installer.exe: #61: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #62: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #63: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Installer.exe: #64: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataViewSupport" Installer.exe: #65: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\11.0", writable = False Installer.exe: #66: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0", name = "InstallDir", defaultValue = <null> Installer.exe: #67: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 11.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 11.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True | | | 61 62 63 64 65 66 67 68 69 70 | Installer.exe: #61: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #62: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #63: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Installer.exe: #64: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataViewSupport" Installer.exe: #65: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\11.0", writable = False Installer.exe: #66: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0", name = "InstallDir", defaultValue = <null> Installer.exe: #67: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 11.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 11.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True Installer.exe: #68: Installer.Main: subKeysCreated = 12, subKeysDeleted = 1, keyValuesRead = 5, keyValuesWritten = 23, keyValuesDeleted = 0 Installer.exe: #69: Installer.Main: filesCreated = 1, filesModified = 2, filesDeleted = 0 Installer.exe: #70: Installer.Main: Success. |
Changes to Tests/data/Installer_Test_Vs2013.log.
︙ | ︙ | |||
61 62 63 64 65 66 67 | Installer.exe: #61: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #62: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #63: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Installer.exe: #64: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataViewSupport" Installer.exe: #65: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\12.0", writable = False Installer.exe: #66: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0", name = "InstallDir", defaultValue = <null> Installer.exe: #67: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 12.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 12.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True | | | 61 62 63 64 65 66 67 68 69 70 | Installer.exe: #61: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionProperties" Installer.exe: #62: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataConnectionSupport" Installer.exe: #63: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataObjectSupport" Installer.exe: #64: RegistryHelper.CreateSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders\{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}", subKeyName = "SupportedObjects\DataViewSupport" Installer.exe: #65: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\12.0", writable = False Installer.exe: #66: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0", name = "InstallDir", defaultValue = <null> Installer.exe: #67: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 12.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 12.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True Installer.exe: #68: Installer.Main: subKeysCreated = 12, subKeysDeleted = 1, keyValuesRead = 5, keyValuesWritten = 23, keyValuesDeleted = 0 Installer.exe: #69: Installer.Main: filesCreated = 1, filesModified = 2, filesDeleted = 0 Installer.exe: #70: Installer.Main: Success. |
Changes to Tests/data/Uninstaller_Test_Vs2005.log.
︙ | ︙ | |||
27 28 29 30 31 32 33 | Installer.exe: #27: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\8.0", writable = False Installer.exe: #28: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0", subKeyName = "DataProviders", writable = True Installer.exe: #29: RegistryHelper.DeleteSubKeyTree: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders", subKeyName = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}" Installer.exe: #30: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\8.0", writable = False Installer.exe: #31: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0", name = "InstallDir", defaultValue = <null> Installer.exe: #32: Installer.RemoveVsDevEnvSetup: Preparing to run Visual Studio v8.0 'setup' mode to refresh its configuration. Installer.exe: #33: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 8} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 8} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True | | | 27 28 29 30 31 32 33 34 35 36 | Installer.exe: #27: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\8.0", writable = False Installer.exe: #28: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0", subKeyName = "DataProviders", writable = True Installer.exe: #29: RegistryHelper.DeleteSubKeyTree: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0\DataProviders", subKeyName = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}" Installer.exe: #30: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\8.0", writable = False Installer.exe: #31: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\8.0", name = "InstallDir", defaultValue = <null> Installer.exe: #32: Installer.RemoveVsDevEnvSetup: Preparing to run Visual Studio v8.0 'setup' mode to refresh its configuration. Installer.exe: #33: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 8} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 8} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True Installer.exe: #34: Installer.Main: subKeysCreated = 0, subKeysDeleted = 5, keyValuesRead = 5, keyValuesWritten = 0, keyValuesDeleted = 1 Installer.exe: #35: Installer.Main: filesCreated = 1, filesModified = 1, filesDeleted = 0 Installer.exe: #36: Installer.Main: Success. |
Changes to Tests/data/Uninstaller_Test_Vs2008.log.
︙ | ︙ | |||
34 35 36 37 38 39 40 | Installer.exe: #34: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\9.0", writable = False Installer.exe: #35: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0", subKeyName = "DataProviders", writable = True Installer.exe: #36: RegistryHelper.DeleteSubKeyTree: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders", subKeyName = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}" Installer.exe: #37: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\9.0", writable = False Installer.exe: #38: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0", name = "InstallDir", defaultValue = <null> Installer.exe: #39: Installer.RemoveVsDevEnvSetup: Preparing to run Visual Studio v9.0 'setup' mode to refresh its configuration. Installer.exe: #40: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 9.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 9.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True | | | 34 35 36 37 38 39 40 41 42 43 | Installer.exe: #34: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\9.0", writable = False Installer.exe: #35: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0", subKeyName = "DataProviders", writable = True Installer.exe: #36: RegistryHelper.DeleteSubKeyTree: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0\DataProviders", subKeyName = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}" Installer.exe: #37: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\9.0", writable = False Installer.exe: #38: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\9.0", name = "InstallDir", defaultValue = <null> Installer.exe: #39: Installer.RemoveVsDevEnvSetup: Preparing to run Visual Studio v9.0 'setup' mode to refresh its configuration. Installer.exe: #40: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 9.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 9.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True Installer.exe: #41: Installer.Main: subKeysCreated = 0, subKeysDeleted = 6, keyValuesRead = 6, keyValuesWritten = 0, keyValuesDeleted = 1 Installer.exe: #42: Installer.Main: filesCreated = 1, filesModified = 1, filesDeleted = 0 Installer.exe: #43: Installer.Main: Success. |
Changes to Tests/data/Uninstaller_Test_Vs2010.log.
︙ | ︙ | |||
30 31 32 33 34 35 36 | Installer.exe: #30: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\10.0", writable = False Installer.exe: #31: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0", subKeyName = "DataProviders", writable = True Installer.exe: #32: RegistryHelper.DeleteSubKeyTree: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders", subKeyName = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}" Installer.exe: #33: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\10.0", writable = False Installer.exe: #34: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0", name = "InstallDir", defaultValue = <null> Installer.exe: #35: Installer.RemoveVsDevEnvSetup: Preparing to run Visual Studio v10.0 'setup' mode to refresh its configuration. Installer.exe: #36: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 10.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 10.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True | | | 30 31 32 33 34 35 36 37 38 39 | Installer.exe: #30: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\10.0", writable = False Installer.exe: #31: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0", subKeyName = "DataProviders", writable = True Installer.exe: #32: RegistryHelper.DeleteSubKeyTree: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0\DataProviders", subKeyName = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}" Installer.exe: #33: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\10.0", writable = False Installer.exe: #34: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\10.0", name = "InstallDir", defaultValue = <null> Installer.exe: #35: Installer.RemoveVsDevEnvSetup: Preparing to run Visual Studio v10.0 'setup' mode to refresh its configuration. Installer.exe: #36: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 10.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 10.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True Installer.exe: #37: Installer.Main: subKeysCreated = 0, subKeysDeleted = 5, keyValuesRead = 5, keyValuesWritten = 0, keyValuesDeleted = 1 Installer.exe: #38: Installer.Main: filesCreated = 1, filesModified = 1, filesDeleted = 0 Installer.exe: #39: Installer.Main: Success. |
Changes to Tests/data/Uninstaller_Test_Vs2012.log.
︙ | ︙ | |||
30 31 32 33 34 35 36 | Installer.exe: #30: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\11.0", writable = False Installer.exe: #31: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0", subKeyName = "DataProviders", writable = True Installer.exe: #32: RegistryHelper.DeleteSubKeyTree: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders", subKeyName = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}" Installer.exe: #33: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\11.0", writable = False Installer.exe: #34: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0", name = "InstallDir", defaultValue = <null> Installer.exe: #35: Installer.RemoveVsDevEnvSetup: Preparing to run Visual Studio v11.0 'setup' mode to refresh its configuration. Installer.exe: #36: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 11.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 11.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True | | | 30 31 32 33 34 35 36 37 38 39 | Installer.exe: #30: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\11.0", writable = False Installer.exe: #31: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0", subKeyName = "DataProviders", writable = True Installer.exe: #32: RegistryHelper.DeleteSubKeyTree: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0\DataProviders", subKeyName = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}" Installer.exe: #33: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\11.0", writable = False Installer.exe: #34: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\11.0", name = "InstallDir", defaultValue = <null> Installer.exe: #35: Installer.RemoveVsDevEnvSetup: Preparing to run Visual Studio v11.0 'setup' mode to refresh its configuration. Installer.exe: #36: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 11.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 11.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True Installer.exe: #37: Installer.Main: subKeysCreated = 0, subKeysDeleted = 5, keyValuesRead = 5, keyValuesWritten = 0, keyValuesDeleted = 1 Installer.exe: #38: Installer.Main: filesCreated = 1, filesModified = 1, filesDeleted = 0 Installer.exe: #39: Installer.Main: Success. |
Changes to Tests/data/Uninstaller_Test_Vs2013.log.
︙ | ︙ | |||
30 31 32 33 34 35 36 | Installer.exe: #30: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\12.0", writable = False Installer.exe: #31: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0", subKeyName = "DataProviders", writable = True Installer.exe: #32: RegistryHelper.DeleteSubKeyTree: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders", subKeyName = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}" Installer.exe: #33: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\12.0", writable = False Installer.exe: #34: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0", name = "InstallDir", defaultValue = <null> Installer.exe: #35: Installer.RemoveVsDevEnvSetup: Preparing to run Visual Studio v12.0 'setup' mode to refresh its configuration. Installer.exe: #36: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 12.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 12.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True | | | 30 31 32 33 34 35 36 37 38 39 | Installer.exe: #30: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\12.0", writable = False Installer.exe: #31: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0", subKeyName = "DataProviders", writable = True Installer.exe: #32: RegistryHelper.DeleteSubKeyTree: rootKey = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0\DataProviders", subKeyName = "{0ebaab6e-ca80-4b4a-8ddf-cbe6bf058c70}" Installer.exe: #33: RegistryHelper.OpenSubKey: rootKey = "HKEY_LOCAL_MACHINE", subKeyName = "Software${wow64}\Microsoft\VisualStudio\12.0", writable = False Installer.exe: #34: RegistryHelper.GetValue: key = "HKEY_LOCAL_MACHINE\Software${wow64}\Microsoft\VisualStudio\12.0", name = "InstallDir", defaultValue = <null> Installer.exe: #35: Installer.RemoveVsDevEnvSetup: Preparing to run Visual Studio v12.0 'setup' mode to refresh its configuration. Installer.exe: #36: Installer.AddVsDevEnvSetup: fileName = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 12.0} Common7 IDE devenv.exe]]", arguments = "/setup", workingDirectory = "[file nativename [file join [expr {$is64 ? ${::env(ProgramFiles(x86))} : $::env(ProgramFiles)}] {Microsoft Visual Studio 12.0} Common7 IDE]]\", useShellExecute = False, redirectStandardOutput = True, redirectStandardError = True Installer.exe: #37: Installer.Main: subKeysCreated = 0, subKeysDeleted = 5, keyValuesRead = 5, keyValuesWritten = 0, keyValuesDeleted = 1 Installer.exe: #38: Installer.Main: filesCreated = 1, filesModified = 1, filesDeleted = 0 Installer.exe: #39: Installer.Main: Success. |
Changes to readme.htm.
︙ | ︙ | |||
141 142 143 144 145 146 147 | the DbProviderFactories methods, you must add the following segment into your application's app.config file:<br /> <pre> <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> | | | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 | the DbProviderFactories methods, you must add the following segment into your application's app.config file:<br /> <pre> <configuration> <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.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> </DbProviderFactories> </system.data> </configuration> </pre> <p> See the help documentation for further details on implementing both version-specific |
︙ | ︙ |
Changes to test/app.config.
1 2 3 4 | <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> | | | 1 2 3 4 5 6 7 8 | <configuration> <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.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> </DbProviderFactories> </system.data> </configuration> |
Changes to testlinq/2008/LINQ/App.config.
1 2 3 4 5 6 | <?xml version="1.0"?> <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <remove invariant="System.Data.SQLite.Linq" /> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | <?xml version="1.0"?> <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <remove invariant="System.Data.SQLite.Linq" /> <add name="SQLite Data Provider (LINQ)" invariant="System.Data.SQLite.Linq" description=".NET Framework Data Provider for SQLite (LINQ)" type="System.Data.SQLite.Linq.SQLiteProviderFactory, System.Data.SQLite.Linq, Version=1.0.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> </DbProviderFactories> </system.data> <connectionStrings> <add name="northwindEFEntities" connectionString="metadata=res://*/NorthwindModel.Linq.2008.csdl|res://*/NorthwindModel.Linq.2008.ssdl|res://*/NorthwindModel.Linq.2008.msl;provider=System.Data.SQLite.Linq;provider connection string="data source=.\northwindEF.db"" providerName="System.Data.EntityClient" /> </connectionStrings> </configuration> |
Changes to testlinq/2010/EF6/App.config.
1 2 3 4 5 6 7 8 9 | <?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" /> <remove invariant="System.Data.SQLite.EF6" /> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | <?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" /> <remove invariant="System.Data.SQLite.EF6" /> <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6, Version=1.0.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> </DbProviderFactories> </system.data> <connectionStrings> <add name="northwindEFEntities" connectionString="metadata=res://*/NorthwindModel.EF6.2010.csdl|res://*/NorthwindModel.EF6.2010.ssdl|res://*/NorthwindModel.EF6.2010.msl;provider=System.Data.SQLite.EF6;provider connection string="data source=.\northwindEF.db"" providerName="System.Data.EntityClient" /> </connectionStrings> <entityFramework> <providers> |
︙ | ︙ |
Changes to testlinq/2010/LINQ/App.config.
1 2 3 4 5 6 | <?xml version="1.0"?> <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <remove invariant="System.Data.SQLite.Linq" /> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | <?xml version="1.0"?> <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <remove invariant="System.Data.SQLite.Linq" /> <add name="SQLite Data Provider (LINQ)" invariant="System.Data.SQLite.Linq" description=".NET Framework Data Provider for SQLite (LINQ)" type="System.Data.SQLite.Linq.SQLiteProviderFactory, System.Data.SQLite.Linq, Version=1.0.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> </DbProviderFactories> </system.data> <connectionStrings> <add name="northwindEFEntities" connectionString="metadata=res://*/NorthwindModel.Linq.2010.csdl|res://*/NorthwindModel.Linq.2010.ssdl|res://*/NorthwindModel.Linq.2010.msl;provider=System.Data.SQLite.Linq;provider connection string="data source=.\northwindEF.db"" providerName="System.Data.EntityClient" /> </connectionStrings> </configuration> |
Changes to testlinq/2012/EF6/App.config.
1 2 3 4 5 6 7 8 9 | <?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" /> <remove invariant="System.Data.SQLite.EF6" /> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | <?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" /> <remove invariant="System.Data.SQLite.EF6" /> <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6, Version=1.0.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> </DbProviderFactories> </system.data> <connectionStrings> <add name="northwindEFEntities" connectionString="metadata=res://*/NorthwindModel.EF6.2012.csdl|res://*/NorthwindModel.EF6.2012.ssdl|res://*/NorthwindModel.EF6.2012.msl;provider=System.Data.SQLite.EF6;provider connection string="data source=.\northwindEF.db"" providerName="System.Data.EntityClient" /> </connectionStrings> <entityFramework> <providers> |
︙ | ︙ |
Changes to testlinq/2012/LINQ/App.config.
1 2 3 4 5 6 | <?xml version="1.0"?> <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <remove invariant="System.Data.SQLite.Linq" /> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | <?xml version="1.0"?> <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <remove invariant="System.Data.SQLite.Linq" /> <add name="SQLite Data Provider (LINQ)" invariant="System.Data.SQLite.Linq" description=".NET Framework Data Provider for SQLite (LINQ)" type="System.Data.SQLite.Linq.SQLiteProviderFactory, System.Data.SQLite.Linq, Version=1.0.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> </DbProviderFactories> </system.data> <connectionStrings> <add name="northwindEFEntities" connectionString="metadata=res://*/NorthwindModel.Linq.2012.csdl|res://*/NorthwindModel.Linq.2012.ssdl|res://*/NorthwindModel.Linq.2012.msl;provider=System.Data.SQLite.Linq;provider connection string="data source=.\northwindEF.db"" providerName="System.Data.EntityClient" /> </connectionStrings> </configuration> |
Changes to testlinq/2013/EF6/App.config.
1 2 3 4 5 6 7 8 9 | <?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" /> <remove invariant="System.Data.SQLite.EF6" /> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | <?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" /> <remove invariant="System.Data.SQLite.EF6" /> <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6, Version=1.0.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> </DbProviderFactories> </system.data> <connectionStrings> <add name="northwindEFEntities" connectionString="metadata=res://*/NorthwindModel.EF6.2013.csdl|res://*/NorthwindModel.EF6.2013.ssdl|res://*/NorthwindModel.EF6.2013.msl;provider=System.Data.SQLite.EF6;provider connection string="data source=.\northwindEF.db"" providerName="System.Data.EntityClient" /> </connectionStrings> <entityFramework> <providers> |
︙ | ︙ |
Changes to testlinq/2013/LINQ/App.config.
1 2 3 4 5 6 | <?xml version="1.0"?> <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <remove invariant="System.Data.SQLite.Linq" /> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | <?xml version="1.0"?> <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <remove invariant="System.Data.SQLite.Linq" /> <add name="SQLite Data Provider (LINQ)" invariant="System.Data.SQLite.Linq" description=".NET Framework Data Provider for SQLite (LINQ)" type="System.Data.SQLite.Linq.SQLiteProviderFactory, System.Data.SQLite.Linq, Version=1.0.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> </DbProviderFactories> </system.data> <connectionStrings> <add name="northwindEFEntities" connectionString="metadata=res://*/NorthwindModel.Linq.2013.csdl|res://*/NorthwindModel.Linq.2013.ssdl|res://*/NorthwindModel.Linq.2013.msl;provider=System.Data.SQLite.Linq;provider connection string="data source=.\northwindEF.db"" providerName="System.Data.EntityClient" /> </connectionStrings> </configuration> |
Changes to tools/install/Installer.cs.
︙ | ︙ | |||
93 94 95 96 97 98 99 | /////////////////////////////////////////////////////////////////////////// #region Public Enumerations [Flags()] public enum InstallFlags { | | | > > | | | | | | | | > > > > > > | > > > > > | < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 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 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 | /////////////////////////////////////////////////////////////////////////// #region Public Enumerations [Flags()] public enum InstallFlags { #region Normal Values None = 0x0, CoreGlobalAssemblyCache = 0x1, LinqGlobalAssemblyCache = 0x2, Ef6GlobalAssemblyCache = 0x4, AssemblyFolders = 0x8, DbProviderFactory = 0x10, VsPackage = 0x20, VsPackageGlobalAssemblyCache = 0x40, VsDataSource = 0x80, VsDataProvider = 0x100, VsDevEnvSetup = 0x200, #endregion /////////////////////////////////////////////////////////////////////// #region Composite Values FrameworkGlobalAssemblyCache = CoreGlobalAssemblyCache | LinqGlobalAssemblyCache | Ef6GlobalAssemblyCache, /////////////////////////////////////////////////////////////////////// Framework = FrameworkGlobalAssemblyCache | AssemblyFolders | DbProviderFactory, /////////////////////////////////////////////////////////////////////// Vs = VsPackage | VsPackageGlobalAssemblyCache | VsDataSource | VsDataProvider | VsDevEnvSetup, /////////////////////////////////////////////////////////////////////// AllGlobalAssemblyCache = FrameworkGlobalAssemblyCache | VsPackageGlobalAssemblyCache, /////////////////////////////////////////////////////////////////////// All = Framework | Vs, /////////////////////////////////////////////////////////////////////// AllExceptGlobalAssemblyCache = All & ~AllGlobalAssemblyCache, #endregion /////////////////////////////////////////////////////////////////////// #region Suggested Default Values Default = All #endregion } /////////////////////////////////////////////////////////////////////////// [Flags()] public enum ProviderFlags { #region Normal Values None = 0x0, SystemEf6MustBeGlobal = 0x1, DidLinqForceTrace = 0x2, DidEf6ForceTrace = 0x4, DidEf6ResolveTrace = 0x8, ForceLinqEnabled = 0x10, ForceLinqDisabled = 0x20, ForceEf6Enabled = 0x40, ForceEf6Disabled = 0x80, #endregion /////////////////////////////////////////////////////////////////////// #region Suggested Default Values Default = None #endregion } /////////////////////////////////////////////////////////////////////////// [Flags()] public enum TracePriority { #region Normal Values None = 0x0, Lowest = 0x1, Lower = 0x2, Low = 0x4, MediumLow = 0x8, Medium = 0x10, MediumHigh = 0x20, High = 0x40, Higher = 0x80, Highest = 0x100, #endregion /////////////////////////////////////////////////////////////////////// #region Suggested Default Flags Default = Medium #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region Installer Class #if NET_40 || NET_45 || NET_451 |
︙ | ︙ | |||
835 836 837 838 839 840 841 842 843 844 845 846 847 848 | } } #endregion /////////////////////////////////////////////////////////////////// #region Public "Registry" Methods public object GetValue( string keyName, string valueName, object defaultValue ) { CheckDisposed(); | > | 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 | } } #endregion /////////////////////////////////////////////////////////////////// #region Public "Registry" Methods #if false public object GetValue( string keyName, string valueName, object defaultValue ) { CheckDisposed(); |
︙ | ︙ | |||
876 877 878 879 880 881 882 883 884 885 886 887 888 889 | { CheckDisposed(); CheckReadOnly(); if (!whatIf) Registry.SetValue(keyName, valueName, value, valueKind); } #endregion /////////////////////////////////////////////////////////////////// #region Private Methods private void CheckReadOnly() { | > | 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 | { CheckDisposed(); CheckReadOnly(); if (!whatIf) Registry.SetValue(keyName, valueName, value, valueKind); } #endif #endregion /////////////////////////////////////////////////////////////////// #region Private Methods private void CheckReadOnly() { |
︙ | ︙ | |||
1486 1487 1488 1489 1490 1491 1492 | public static int SubKeysDeleted { get { return subKeysDeleted; } } /////////////////////////////////////////////////////////////////// | | > > > > > > > > | | | 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 | public static int SubKeysDeleted { get { return subKeysDeleted; } } /////////////////////////////////////////////////////////////////// private static int keyValuesRead; public static int KeyValuesRead { get { return keyValuesRead; } } /////////////////////////////////////////////////////////////////// private static int keyValuesWritten; public static int KeyValuesWritten { get { return keyValuesWritten; } } /////////////////////////////////////////////////////////////////// private static int keyValuesDeleted; public static int KeyValuesDeleted { |
︙ | ︙ | |||
1682 1683 1684 1685 1686 1687 1688 | if (verbose) TraceOps.DebugAndTrace(TracePriority.High, debugCallback, traceCallback, String.Format( "key = {0}, name = {1}, defaultValue = {2}", ForDisplay(key), ForDisplay(name), ForDisplay(defaultValue)), traceCategory); | | > > > > | 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 | if (verbose) TraceOps.DebugAndTrace(TracePriority.High, debugCallback, traceCallback, String.Format( "key = {0}, name = {1}, defaultValue = {2}", ForDisplay(key), ForDisplay(name), ForDisplay(defaultValue)), traceCategory); object value = key.GetValue(name, defaultValue); keyValuesRead++; return value; } /////////////////////////////////////////////////////////////////// [MethodImpl(MethodImplOptions.NoInlining)] public static void SetValue( MockRegistryKey key, |
︙ | ︙ | |||
1709 1710 1711 1712 1713 1714 1715 | "key = {0}, name = {1}, value = {2}", ForDisplay(key), ForDisplay(name), ForDisplay(value)), traceCategory); if (!whatIf) key.SetValue(name, value); | | | 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 | "key = {0}, name = {1}, value = {2}", ForDisplay(key), ForDisplay(name), ForDisplay(value)), traceCategory); if (!whatIf) key.SetValue(name, value); keyValuesWritten++; } /////////////////////////////////////////////////////////////////// [MethodImpl(MethodImplOptions.NoInlining)] public static void DeleteValue( MockRegistryKey key, |
︙ | ︙ | |||
1822 1823 1824 1825 1826 1827 1828 | // do nothing. } #endregion /////////////////////////////////////////////////////////////////// #region Public Properties | < < < < < < < < < | 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 | // do nothing. } #endregion /////////////////////////////////////////////////////////////////// #region Public Properties private string providerInvariantName; public string ProviderInvariantName { get { return providerInvariantName; } set { providerInvariantName = value; } } |
︙ | ︙ | |||
1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 | string designerFileName, string registryVersion, string configVersion, string vsVersionSuffix, string debugFormat, string traceFormat, InstallFlags installFlags, TracePriority debugPriority, TracePriority tracePriority, bool perUser, bool install, bool wow64, bool noRuntimeVersion, bool noDesktop, | > | 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 | string designerFileName, string registryVersion, string configVersion, string vsVersionSuffix, string debugFormat, string traceFormat, InstallFlags installFlags, ProviderFlags providerFlags, TracePriority debugPriority, TracePriority tracePriority, bool perUser, bool install, bool wow64, bool noRuntimeVersion, bool noDesktop, |
︙ | ︙ | |||
2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 | this.designerFileName = designerFileName; this.registryVersion = registryVersion; this.configVersion = configVersion; this.vsVersionSuffix = vsVersionSuffix; this.debugFormat = debugFormat; this.traceFormat = traceFormat; this.installFlags = installFlags; this.debugPriority = debugPriority; this.tracePriority = tracePriority; this.perUser = perUser; this.install = install; this.wow64 = wow64; this.noRuntimeVersion = noRuntimeVersion; this.noDesktop = noDesktop; | > | 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 | this.designerFileName = designerFileName; this.registryVersion = registryVersion; this.configVersion = configVersion; this.vsVersionSuffix = vsVersionSuffix; this.debugFormat = debugFormat; this.traceFormat = traceFormat; this.installFlags = installFlags; this.providerFlags = providerFlags; this.debugPriority = debugPriority; this.tracePriority = tracePriority; this.perUser = perUser; this.install = install; this.wow64 = wow64; this.noRuntimeVersion = noRuntimeVersion; this.noDesktop = noDesktop; |
︙ | ︙ | |||
2185 2186 2187 2188 2189 2190 2191 | } return null; } /////////////////////////////////////////////////////////////////// | | > > > > | | | > | | > > > | | | | > > > > > > > > > > > | | | 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 | } return null; } /////////////////////////////////////////////////////////////////// private static bool IsSystemEf6AssemblyAvailable( bool trace ) { if (systemEf6Assembly != null) return true; try { systemEf6Assembly = Assembly.ReflectionOnlyLoad( SystemEf6AssemblyName); if (systemEf6Assembly != null) { if (trace) { TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( "Entity Framework 6 assembly was " + "resolved to {0}.", ForDisplay( systemEf6Assembly.Location)), traceCategory); } return true; } } catch { // do nothing. } if (trace) { TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, "Entity Framework 6 assembly was not resolved.", traceCategory); } return false; } /////////////////////////////////////////////////////////////////// private static bool IsSystemEf6AssemblyGlobal() { if (systemEf6Assembly == null) return false; return systemEf6Assembly.GlobalAssemblyCache; } #endregion /////////////////////////////////////////////////////////////////// #region Public Static Methods public static void BreakIntoDebugger() { Console.WriteLine( "Attach a debugger to process {0} and press " + "any key to continue.", (thisProcess != null) ? thisProcess.Id.ToString() : "<unknown>"); try { Console.ReadKey(true); /* throw */ } catch (InvalidOperationException) // Console.ReadKey |
︙ | ︙ | |||
2260 2261 2262 2263 2264 2265 2266 | ref directory, ref coreFileName, ref linqFileName, ref ef6FileName, ref designerFileName); return new Configuration( thisAssembly, null, directory, coreFileName, linqFileName, ef6FileName, designerFileName, null, null, null, TraceOps.DebugFormat, TraceOps.TraceFormat, | | | | | | 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 | ref directory, ref coreFileName, ref linqFileName, ref ef6FileName, ref designerFileName); return new Configuration( thisAssembly, null, directory, coreFileName, linqFileName, ef6FileName, designerFileName, null, null, null, TraceOps.DebugFormat, TraceOps.TraceFormat, InstallFlags.Default, ProviderFlags.Default, TracePriority.Default, TracePriority.Default, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, true, false, false, false); } /////////////////////////////////////////////////////////////////// [MethodImpl(MethodImplOptions.NoInlining)] public static bool FromArgs( string[] args, |
︙ | ︙ | |||
2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 | return false; continue; } configuration.perUser = (bool)value; } else if (MatchOption(newArg, "registryVersion")) { configuration.registryVersion = text; } else if (MatchOption(newArg, "strict")) { bool? value = ParseBoolean(text); | > > > > > > > > > > > > > > > > > > > > > | 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 | return false; continue; } configuration.perUser = (bool)value; } else if (MatchOption(newArg, "providerFlags")) { object value = ParseEnum( typeof(ProviderFlags), text, true); if (value == null) { error = TraceOps.DebugAndTrace( TracePriority.Lowest, debugCallback, traceCallback, String.Format( "Invalid provider flags value: {0}", ForDisplay(text)), traceCategory); if (strict) return false; continue; } configuration.providerFlags = (ProviderFlags)value; } else if (MatchOption(newArg, "registryVersion")) { configuration.registryVersion = text; } else if (MatchOption(newArg, "strict")) { bool? value = ParseBoolean(text); |
︙ | ︙ | |||
3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 | return false; } #endregion /////////////////////////////////////////////////////////////////// #region Public Methods public bool HasFlags( InstallFlags hasFlags, bool all ) { if (all) return ((installFlags & hasFlags) == hasFlags); else return ((installFlags & hasFlags) != InstallFlags.None); } /////////////////////////////////////////////////////////////////// public bool IsLinqSupported() { // // 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 System.Data.SQLite.EF6 // assembly should be processed during the install. // If the target is Visual Studio 2005 or Visual | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > | | > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > | > | > | > | > > > > > > > > > | | | < < < < < < < < | 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 | return false; } #endregion /////////////////////////////////////////////////////////////////// #region Private Methods private string GetInvariantName() { return UseEf6Provider() ? Ef6InvariantName : InvariantName; } #endregion /////////////////////////////////////////////////////////////////// #region Public Methods public bool HasFlags( InstallFlags hasFlags, bool all ) { if (all) return ((installFlags & hasFlags) == hasFlags); else return ((installFlags & hasFlags) != InstallFlags.None); } /////////////////////////////////////////////////////////////////// public bool HasFlags( ProviderFlags hasFlags, bool all ) { if (all) return ((providerFlags & hasFlags) == hasFlags); else return ((providerFlags & hasFlags) != ProviderFlags.None); } /////////////////////////////////////////////////////////////////// public bool IsLinqSupported() { // // NOTE: Check to see if the caller has forced LINQ support to // be enabled -OR- disabled, thereby bypassing the need // for "automatic detection" by this method. // if (HasFlags(ProviderFlags.ForceLinqEnabled, true)) { if (!HasFlags(ProviderFlags.DidLinqForceTrace, true)) { TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, "Forced to enable support for \"Linq\".", traceCategory); providerFlags |= ProviderFlags.DidLinqForceTrace; } return true; } else if (HasFlags(ProviderFlags.ForceLinqDisabled, true)) { if (!HasFlags(ProviderFlags.DidLinqForceTrace, true)) { TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, "Forced to disable support for \"Linq\".", traceCategory); providerFlags |= ProviderFlags.DidLinqForceTrace; } return false; } // // 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: Check to see if the caller has forced EF6 support to // be enabled -OR- disabled, thereby bypassing the need // for "automatic detection" by this method. // if (HasFlags(ProviderFlags.ForceEf6Enabled, true)) { if (!HasFlags(ProviderFlags.DidEf6ForceTrace, true)) { TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, "Forced to enable support for \"Ef6\".", traceCategory); providerFlags |= ProviderFlags.DidEf6ForceTrace; } return true; } else if (HasFlags(ProviderFlags.ForceEf6Disabled, true)) { if (!HasFlags(ProviderFlags.DidEf6ForceTrace, true)) { TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, "Forced to disable support for \"Ef6\".", traceCategory); providerFlags |= ProviderFlags.DidEf6ForceTrace; } return false; } // // 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. // if (noNetFx40 && noNetFx45 && noNetFx451) return false; // // NOTE: Also, if the EF6 core assembly is unavailable, this // must return zero. // if (!IsSystemEf6AssemblyAvailable(!HasFlags( ProviderFlags.DidEf6ResolveTrace, true))) { providerFlags |= ProviderFlags.DidEf6ResolveTrace; return false; } // // NOTE: Finally, if the EF6 core assembly is not available // globally [and this is a requirement for the current // install], return zero. // return HasFlags(ProviderFlags.SystemEf6MustBeGlobal, true) ? IsSystemEf6AssemblyGlobal() : true; } /////////////////////////////////////////////////////////////////// private bool IsEf6AssemblyGlobal() { if (ef6AssemblyName == null) return false; Assembly assembly = Assembly.ReflectionOnlyLoad( ef6AssemblyName.ToString()); return (assembly != null) && assembly.GlobalAssemblyCache; } /////////////////////////////////////////////////////////////////// public bool UseEf6Provider() { // // NOTE: We cannot use the EF6 assembly as the provider if it // is not supported by this installation. // if (!IsEf6Supported()) return false; // // NOTE: For the EF6 assembly to be usable as a provider in // the machine configuration file, it must be in the // global assembly cache. // return IsEf6AssemblyGlobal(); } /////////////////////////////////////////////////////////////////// /* REQUIRED */ public AssemblyName GetCoreAssemblyName() /* throw */ { if (coreAssemblyName == null) { coreAssemblyName = AssemblyName.GetAssemblyName( CoreFileName); /* throw */ } return coreAssemblyName; } /////////////////////////////////////////////////////////////////// /* OPTIONAL */ public AssemblyName GetLinqAssemblyName() /* throw */ { if (IsLinqSupported() && (linqAssemblyName == null)) { linqAssemblyName = AssemblyName.GetAssemblyName( LinqFileName); /* throw */ } return linqAssemblyName; } /////////////////////////////////////////////////////////////////// /* OPTIONAL */ public AssemblyName GetEf6AssemblyName() /* throw */ { if (IsEf6Supported() && (ef6AssemblyName == null)) { ef6AssemblyName = AssemblyName.GetAssemblyName( Ef6FileName); /* throw */ } return ef6AssemblyName; } /////////////////////////////////////////////////////////////////// /* REQUIRED */ public AssemblyName GetDesignerAssemblyName() /* throw */ { if (designerAssemblyName == null) { designerAssemblyName = AssemblyName.GetAssemblyName( DesignerFileName); /* throw */ } return designerAssemblyName; } /////////////////////////////////////////////////////////////////// /* REQUIRED */ public AssemblyName GetProviderAssemblyName() /* throw */ { return UseEf6Provider() ? GetEf6AssemblyName() : GetCoreAssemblyName(); } /////////////////////////////////////////////////////////////////// public string GetConfigInvariantName() { return GetInvariantName(); } /////////////////////////////////////////////////////////////////// public string GetProviderInvariantName() { return GetInvariantName(); } /////////////////////////////////////////////////////////////////// public string GetFactoryTypeName() { return UseEf6Provider() ? Ef6FactoryTypeName : FactoryTypeName; } /////////////////////////////////////////////////////////////////// public void Dump( TraceCallback traceCallback ) |
︙ | ︙ | |||
3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 | traceCallback(String.Format(NameAndValueFormat, "TraceFormat", ForDisplay(traceFormat)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "InstallFlags", ForDisplay(installFlags)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "DebugPriority", ForDisplay(debugPriority)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "TracePriority", ForDisplay(tracePriority)), | > > > > | 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 | traceCallback(String.Format(NameAndValueFormat, "TraceFormat", ForDisplay(traceFormat)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "InstallFlags", ForDisplay(installFlags)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "ProviderFlags", ForDisplay(providerFlags)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "DebugPriority", ForDisplay(debugPriority)), traceCategory); traceCallback(String.Format(NameAndValueFormat, "TracePriority", ForDisplay(tracePriority)), |
︙ | ︙ | |||
3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 | "AssemblyConfiguration", ForDisplay(GetAssemblyConfiguration(assembly))), traceCategory); } /////////////////////////////////////////////////////////// traceCallback(String.Format(NameAndValueFormat, "IsLinqSupported", ForDisplay(IsLinqSupported())), traceCategory); traceCallback(String.Format(NameAndValueFormat, "IsEf6Supported", ForDisplay(IsEf6Supported())), traceCategory); /////////////////////////////////////////////////////////// traceCallback(String.Format(NameAndValueFormat, | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < | | < < < < < < > > > > | | | > > > > > > > | 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 | "AssemblyConfiguration", ForDisplay(GetAssemblyConfiguration(assembly))), traceCategory); } /////////////////////////////////////////////////////////// traceCallback(String.Format(NameAndValueFormat, "IsSystemEf6AssemblyAvailable", ForDisplay( IsSystemEf6AssemblyAvailable(false))), traceCategory); traceCallback(String.Format(NameAndValueFormat, "IsSystemEf6AssemblyGlobal", ForDisplay( IsSystemEf6AssemblyGlobal())), traceCategory); /////////////////////////////////////////////////////////// traceCallback(String.Format(NameAndValueFormat, "IsLinqSupported", ForDisplay(IsLinqSupported())), traceCategory); traceCallback(String.Format(NameAndValueFormat, "IsEf6Supported", ForDisplay(IsEf6Supported())), traceCategory); traceCallback(String.Format(NameAndValueFormat, "IsEf6AssemblyGlobal", ForDisplay( IsEf6AssemblyGlobal())), traceCategory); traceCallback(String.Format(NameAndValueFormat, "UseEf6Provider", ForDisplay(UseEf6Provider())), traceCategory); /////////////////////////////////////////////////////////// try { traceCallback(String.Format(NameAndValueFormat, "GetCoreAssemblyName", ForDisplay( GetCoreAssemblyName())), traceCategory); } catch (Exception e) { traceCallback(String.Format(NameAndValueFormat, "GetCoreAssemblyName", ForDisplay(e)), traceCategory); } /////////////////////////////////////////////////////////// try { traceCallback(String.Format(NameAndValueFormat, "GetLinqAssemblyName", ForDisplay( GetLinqAssemblyName())), traceCategory); } catch (Exception e) { traceCallback(String.Format(NameAndValueFormat, "GetLinqAssemblyName", ForDisplay(e)), traceCategory); } /////////////////////////////////////////////////////////// try { traceCallback(String.Format(NameAndValueFormat, "GetEf6AssemblyName", ForDisplay( GetEf6AssemblyName())), traceCategory); } catch (Exception e) { traceCallback(String.Format(NameAndValueFormat, "GetEf6AssemblyName", ForDisplay(e)), traceCategory); } /////////////////////////////////////////////////////////// try { traceCallback(String.Format(NameAndValueFormat, "GetDesignerAssemblyName", ForDisplay( GetDesignerAssemblyName())), traceCategory); } catch (Exception e) { traceCallback(String.Format(NameAndValueFormat, "GetDesignerAssemblyName", ForDisplay(e)), traceCategory); } /////////////////////////////////////////////////////////// traceCallback(String.Format(NameAndValueFormat, "GetInvariantName", ForDisplay(GetInvariantName())), traceCategory); traceCallback(String.Format(NameAndValueFormat, "GetConfigInvariantName", ForDisplay( GetConfigInvariantName())), traceCategory); traceCallback(String.Format(NameAndValueFormat, "GetProviderInvariantName", ForDisplay( GetProviderInvariantName())), traceCategory); traceCallback(String.Format(NameAndValueFormat, "GetFactoryTypeName", ForDisplay( GetFactoryTypeName())), traceCategory); /////////////////////////////////////////////////////////// try { traceCallback(String.Format(NameAndValueFormat, "GetProviderAssemblyName", ForDisplay( GetProviderAssemblyName())), traceCategory); } catch (Exception e) { traceCallback(String.Format(NameAndValueFormat, "GetProviderAssemblyName", ForDisplay(e)), traceCategory); } } } #endregion /////////////////////////////////////////////////////////////////// #region Public Properties |
︙ | ︙ | |||
3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 | private InstallFlags installFlags; public InstallFlags InstallFlags { get { return installFlags; } set { installFlags = value; } } /////////////////////////////////////////////////////////////////// private TracePriority debugPriority; public TracePriority DebugPriority { get { return debugPriority; } | > > > > > > > > > | 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 | private InstallFlags installFlags; public InstallFlags InstallFlags { get { return installFlags; } set { installFlags = value; } } /////////////////////////////////////////////////////////////////// private ProviderFlags providerFlags; public ProviderFlags ProviderFlags { get { return providerFlags; } set { providerFlags = value; } } /////////////////////////////////////////////////////////////////// private TracePriority debugPriority; public TracePriority DebugPriority { get { return debugPriority; } |
︙ | ︙ | |||
4489 4490 4491 4492 4493 4494 4495 | else { result = value.ToString(); if (result.Length == 0) return "<empty>"; | > > | > > | > | > | 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 | else { result = value.ToString(); if (result.Length == 0) return "<empty>"; if (type.IsSubclassOf(typeof(Exception))) { result = String.Format( "{0}{1}{0}", Environment.NewLine, result); } else if (!type.IsSubclassOf(typeof(ValueType))) { result = String.Format("\"{0}\"", result); } } return result; } #endregion /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
6194 6195 6196 6197 6198 6199 6200 | } #endregion /////////////////////////////////////////////////////////////////////// #region Visual Studio Package Handling private static void InitializeVsPackage( | < < | 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 | } #endregion /////////////////////////////////////////////////////////////////////// #region Visual Studio Package Handling private static void InitializeVsPackage( string providerInvariantName, string factoryTypeName, AssemblyName providerAssemblyName, AssemblyName designerAssemblyName, bool globalAssemblyCache, ref Package package ) { if (package == null) { package = new Package(); package.ProviderInvariantName = providerInvariantName; package.FactoryTypeName = factoryTypeName; package.ProviderAssemblyName = providerAssemblyName; package.DesignerAssemblyName = designerAssemblyName; package.GlobalAssemblyCache = globalAssemblyCache; package.AdoNetTechnologyId = new Guid( |
︙ | ︙ | |||
6755 6756 6757 6758 6759 6760 6761 | } } #endregion #endregion /////////////////////////////////////////////////////////////////////// | | | 7084 7085 7086 7087 7088 7089 7090 7091 7092 7093 7094 7095 7096 7097 7098 | } } #endregion #endregion /////////////////////////////////////////////////////////////////////// #region Installer Entry Point [MethodImpl(MethodImplOptions.NoInlining)] private static int Main( string[] args ) { #region Debugger Hook if (Environment.GetEnvironmentVariable("Break") != null) |
︙ | ︙ | |||
6798 6799 6800 6801 6802 6803 6804 6805 6806 6807 | return 1; /* FAILURE */ } #endregion /////////////////////////////////////////////////////////////// using (MockRegistry registry = new MockRegistry( configuration.WhatIf, false, false)) { | > > > > > > > > > | | | | | | | 7127 7128 7129 7130 7131 7132 7133 7134 7135 7136 7137 7138 7139 7140 7141 7142 7143 7144 7145 7146 7147 7148 7149 7150 7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 | return 1; /* FAILURE */ } #endregion /////////////////////////////////////////////////////////////// // // NOTE: Setup the "mock" registry per the "what-if" mode. // Since all registry access performed by this installer // uses this "mock" registry, it is impossible for any // actual system changes to occur unless "what-if" mode // is disabled. Furthermore, protections are in place // to prevent direct access to the wrapped registry keys // when "safe" mode is enabled. // using (MockRegistry registry = new MockRegistry( configuration.WhatIf, false, false)) { #region Assembly Name Checks // // NOTE: Query all the assembly names first, before making // any changes to the system, because these calls // will throw exceptions if any of the file names do // not point to a valid managed assembly. The values // of these local variables are never used after this // point; however, do not remove them. // AssemblyName coreAssemblyName = configuration.GetCoreAssemblyName(); /* NOT USED */ AssemblyName linqAssemblyName = configuration.GetLinqAssemblyName(); /* NOT USED */ |
︙ | ︙ | |||
6858 6859 6860 6861 6862 6863 6864 | Package package = null; FrameworkList frameworkList = null; VsList vsList = null; /////////////////////////////////////////////////////////// InitializeVsPackage( | < | | 7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 | Package package = null; FrameworkList frameworkList = null; VsList vsList = null; /////////////////////////////////////////////////////////// InitializeVsPackage( configuration.GetProviderInvariantName(), configuration.GetFactoryTypeName(), configuration.GetProviderAssemblyName(), configuration.GetDesignerAssemblyName(), configuration.HasFlags( InstallFlags.AllGlobalAssemblyCache, true) && configuration.HasFlags( InstallFlags.VsPackageGlobalAssemblyCache, true), ref package); /////////////////////////////////////////////////////////// InitializeFrameworkList(configuration.PerUser ? |
︙ | ︙ | |||
6894 6895 6896 6897 6898 6899 6900 | configuration.DesignerFileName, configuration.Install); #endregion /////////////////////////////////////////////////////////// #region .NET GAC Install/Remove if (configuration.HasFlags( | | > > > > | > | | > | > | | | | | | > > > > > > | > | > > > > > > > | > | > > > > | > > | > > | > > | > > > > > > > | > | > > > > > > > | > | > > > > > > > > | > | | > | > | | | | | > | 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 7268 7269 7270 7271 7272 7273 7274 7275 7276 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 7318 7319 7320 7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 7338 7339 7340 7341 7342 7343 7344 7345 7346 7347 7348 7349 7350 7351 7352 7353 7354 7355 7356 7357 7358 7359 7360 7361 7362 7363 7364 7365 7366 7367 7368 7369 7370 7371 7372 7373 7374 7375 7376 7377 7378 7379 7380 7381 7382 7383 7384 7385 7386 7387 7388 7389 7390 7391 7392 7393 7394 7395 7396 7397 7398 7399 7400 7401 7402 7403 7404 7405 7406 7407 7408 7409 7410 7411 7412 7413 7414 | configuration.DesignerFileName, configuration.Install); #endregion /////////////////////////////////////////////////////////// #region .NET GAC Install/Remove if (configuration.HasFlags( InstallFlags.AllGlobalAssemblyCache, false)) { Publish publish = null; if (!configuration.WhatIf) publish = new Publish(); if (configuration.Install) { if (configuration.HasFlags( InstallFlags.CoreGlobalAssemblyCache, true)) { if (!configuration.WhatIf) { /* throw */ publish.GacInstall( configuration.CoreFileName); } TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( "GacInstall: assemblyPath = {0}", ForDisplay(configuration.CoreFileName)), traceCategory); } /////////////////////////////////////////////////// if (configuration.HasFlags( InstallFlags.LinqGlobalAssemblyCache, true) && configuration.IsLinqSupported()) { if (!configuration.WhatIf) { /* throw */ publish.GacInstall( configuration.LinqFileName); } TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( "GacInstall: assemblyPath = {0}", ForDisplay(configuration.LinqFileName)), traceCategory); } /////////////////////////////////////////////////// if (configuration.HasFlags( InstallFlags.Ef6GlobalAssemblyCache, true) && configuration.IsEf6Supported()) { if (!configuration.WhatIf) { /* throw */ publish.GacInstall( configuration.Ef6FileName); } TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( "GacInstall: assemblyPath = {0}", ForDisplay(configuration.Ef6FileName)), traceCategory); } /////////////////////////////////////////////////// if (configuration.HasFlags( InstallFlags.VsPackageGlobalAssemblyCache, true)) { if (!configuration.WhatIf) { /* throw */ publish.GacInstall( configuration.DesignerFileName); } TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( "GacInstall: assemblyPath = {0}", ForDisplay(configuration.DesignerFileName)), traceCategory); } } else { if (configuration.HasFlags( InstallFlags.VsPackageGlobalAssemblyCache, true)) { if (!configuration.WhatIf) { /* throw */ publish.GacRemove( configuration.DesignerFileName); } TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( "GacRemove: assemblyPath = {0}", ForDisplay(configuration.DesignerFileName)), traceCategory); } /////////////////////////////////////////////////// if (configuration.HasFlags( InstallFlags.Ef6GlobalAssemblyCache, true) && configuration.IsEf6Supported()) { if (!configuration.WhatIf) { /* throw */ publish.GacRemove( configuration.Ef6FileName); } TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( "GacRemove: assemblyPath = {0}", ForDisplay(configuration.Ef6FileName)), traceCategory); } /////////////////////////////////////////////////// if (configuration.HasFlags( InstallFlags.LinqGlobalAssemblyCache, true) && configuration.IsLinqSupported()) { if (!configuration.WhatIf) { /* throw */ publish.GacRemove( configuration.LinqFileName); } TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( "GacRemove: assemblyPath = {0}", ForDisplay(configuration.LinqFileName)), traceCategory); } /////////////////////////////////////////////////// if (configuration.HasFlags( InstallFlags.CoreGlobalAssemblyCache, true)) { if (!configuration.WhatIf) { /* throw */ publish.GacRemove( configuration.CoreFileName); } TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( "GacRemove: assemblyPath = {0}", ForDisplay(configuration.CoreFileName)), traceCategory); } } } #endregion /////////////////////////////////////////////////////////// #region .NET AssemblyFolders |
︙ | ︙ | |||
7048 7049 7050 7051 7052 7053 7054 | InstallFlags.DbProviderFactory, true)) { bool saved = false; if (!ForEachFrameworkConfig(registry, frameworkList, ProcessDbProviderFactory, configuration.ConfigVersion, | | > | | 7445 7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 7460 7461 | InstallFlags.DbProviderFactory, true)) { bool saved = false; if (!ForEachFrameworkConfig(registry, frameworkList, ProcessDbProviderFactory, configuration.ConfigVersion, configuration.GetConfigInvariantName(), ProviderName, Description, package.FactoryTypeName, package.ProviderAssemblyName, directoryData, configuration.PerUser, NetFxIs32BitOnly || configuration.Wow64, configuration.ThrowOnMissing, configuration.WhatIf, configuration.Verbose, ref saved, ref error)) { |
︙ | ︙ | |||
7193 7194 7195 7196 7197 7198 7199 | /////////////////////////////////////////////////////////// #region Log Summary TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, String.Format( "subKeysCreated = {0}, subKeysDeleted = {1}, " + | > | | > | 7591 7592 7593 7594 7595 7596 7597 7598 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 | /////////////////////////////////////////////////////////// #region Log Summary TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, String.Format( "subKeysCreated = {0}, subKeysDeleted = {1}, " + "keyValuesRead = {2}, keyValuesWritten = {3}, " + "keyValuesDeleted = {4}", ForDisplay(RegistryHelper.SubKeysCreated), ForDisplay(RegistryHelper.SubKeysDeleted), ForDisplay(RegistryHelper.KeyValuesRead), ForDisplay(RegistryHelper.KeyValuesWritten), ForDisplay(RegistryHelper.KeyValuesDeleted)), traceCategory); TraceOps.DebugAndTrace(TracePriority.MediumHigh, debugCallback, traceCallback, String.Format( "filesCreated = {0}, filesModified = {1}, " + "filesDeleted = {2}", ForDisplay(filesCreated), |
︙ | ︙ |