Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix incorrect resource name for SR.resx in the VC 2010 mixed-mode assembly. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
55f56ce508ec2c279614c50f5b4760b7 |
User & Date: | mistachkin 2011-07-09 20:37:20 |
References
2011-08-30
| ||
15:18 | • Ticket [92153ffc91] 32 bit Framework 4 version error status still Open with 2 other changes artifact: d1b815daa9 user: mistachkin | |
15:17 | • Ticket [92153ffc91]: 4 changes artifact: 5b1a09cf80 user: mistachkin | |
Context
2011-07-09
| ||
21:10 | Modify unit test infrastructure to better support testing the mixed-mode assembly. check-in: 84821b2787 user: mistachkin tags: trunk | |
20:37 | Fix incorrect resource name for SR.resx in the VC 2010 mixed-mode assembly. check-in: 55f56ce508 user: mistachkin tags: trunk | |
18:10 | Remove NDEBUG from common defines. Move SQLITE_HAS_CODEC to 'extra' defines. check-in: 739ba4e18c user: mistachkin tags: trunk | |
Changes
Changes to SQLite.Interop/SQLite.Interop.2010.vcxproj.
︙ | ︙ | |||
456 457 458 459 460 461 462 | <ClInclude Include="src\win\interop.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="..\System.Data.SQLite\SR.resx"> | | | 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 | <ClInclude Include="src\win\interop.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="..\System.Data.SQLite\SR.resx"> <LogicalName>System.Data.SQLite.%(Filename).resources</LogicalName> <SubType>Designer</SubType> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugNativeOnly|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugNativeOnly|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNativeOnly|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNativeOnly|x64'">true</ExcludedFromBuild> </EmbeddedResource> </ItemGroup> |
︙ | ︙ |
Changes to Tests/basic.eagle.
︙ | ︙ | |||
46 47 48 49 50 51 52 | if {![haveConstraint file_[file tail $testLinqOutFile]]} then { checkForFile $test_channel $testLinqOutFile } ############################################################################### | | > > | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | if {![haveConstraint file_[file tail $testLinqOutFile]]} then { checkForFile $test_channel $testLinqOutFile } ############################################################################### runTest {test basic-1.1 {unit tests from the 'test' project} -setup { catch {file delete [file join [file dirname $testExeFile] Test.db3]} } -body { set code [catch { testExec $testExeFile [list -eventflags Wait -directory \ [file dirname $testExeFile] -stdout output -success 0] -autoRun } error] tlog "---- BEGIN STDOUT OUTPUT\n" tlog $output |
︙ | ︙ | |||
101 102 103 104 105 106 107 | unset -nocomplain code output error savedEncoding encoding } -constraints {eagle file_testlinq.exe file_northwindEF.db file_testlinq.out} \ -result {0 True {}}} ############################################################################### runTest {test basic-1.3 {SELECT scalar/reader, CREATE, INSERT} -setup { | | | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 | unset -nocomplain code output error savedEncoding encoding } -constraints {eagle file_testlinq.exe file_northwindEF.db file_testlinq.out} \ -result {0 True {}}} ############################################################################### runTest {test basic-1.3 {SELECT scalar/reader, CREATE, INSERT} -setup { setupDb [set fileName basic-1.3.db] } -body { set result [list] lappend result [sql execute -execute scalar $db \ "SELECT sqlite_source_id();"] sql execute $db "CREATE TABLE t1(x INTEGER PRIMARY KEY ASC, y, z);" |
︙ | ︙ | |||
125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | } -cleanup { cleanupDb $fileName unset -nocomplain name rows result db fileName } -constraints {eagle monoBug28 command.sql compile.DATA System.Data.SQLite} \ -match regexp -result {^\{\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [0-9a-f]{40}\}\ \{1 \{\{x 1\} \{y foo\} \{z 1234\}\}\} \{count 1\} \{names \{x y z\}\}$}} ############################################################################### unset -nocomplain testExeFile testLinqExeFile northwindEfDbFile testLinqOutFile ############################################################################### runSQLiteTestEpilogue runTestEpilogue | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | } -cleanup { cleanupDb $fileName unset -nocomplain name rows result db fileName } -constraints {eagle monoBug28 command.sql compile.DATA System.Data.SQLite} \ -match regexp -result {^\{\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [0-9a-f]{40}\}\ \{1 \{\{x 1\} \{y foo\} \{z 1234\}\}\} \{count 1\} \{names \{x y z\}\}$}} ############################################################################### runTest {test basic-1.4 {GetSchema with ReservedWords} -setup { setupDb [set fileName basic-1.4.db] } -body { set id [object invoke Interpreter.GetActive NextId] set dataSource [file join [getTemporaryPath] basic-1.4.db] unset -nocomplain results errors set code [compileCSharpWith [subst { using System.Data; using System.Data.SQLite; namespace _Dynamic${id} { public class Test${id} { public static DataTable GetReservedWords() { using (SQLiteConnection connection = new SQLiteConnection( "Data Source=${dataSource};")) { connection.Open(); return connection.GetSchema("ReservedWords"); } } public static void Main() { // do nothing. } } } }] results errors System.Data.SQLite.dll] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetReservedWords } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors dataSource id db fileName } -constraints {eagle monoBug28 command.sql compile.DATA System.Data.SQLite} \ -match regexp -result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0\ System#Data#DataTable#\d+$}} ############################################################################### unset -nocomplain testExeFile testLinqExeFile northwindEfDbFile testLinqOutFile ############################################################################### runSQLiteTestEpilogue runTestEpilogue |
Changes to Tests/common.eagle.
︙ | ︙ | |||
114 115 116 117 118 119 120 | # # NOTE: Create the base command to evaluate and add the property settings # that are almost always needed by our unit tests (i.e. the System # and System.Data assembly references). # set command [list compileCSharp $text results errors \ ReferencedAssemblies.Add System.dll ReferencedAssemblies.Add \ | | | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | # # NOTE: Create the base command to evaluate and add the property settings # that are almost always needed by our unit tests (i.e. the System # and System.Data assembly references). # set command [list compileCSharp $text results errors \ ReferencedAssemblies.Add System.dll ReferencedAssemblies.Add \ System.Data.dll ReferencedAssemblies.Add System.Xml.dll] # # NOTE: Add all the provided file names as assembly references. # foreach fileName $fileNames { lappend command ReferencedAssemblies.Add [getBuildFileName $fileName] } |
︙ | ︙ |