update Spring.Web.Conversation.NHibernate tests to use SQLite 1.0.91.0 dynamic interop assembly resolution to handle running properly on both x86 and x64 processor architectures
This commit is contained in:
sbohlen
@@ -92,7 +92,7 @@
|
||||
<assemblyIdentity name="System.Data.SQLite"
|
||||
publicKeyToken="db937bc2d44ff139"
|
||||
culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.90.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.91.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
<assemblyIdentity name="System.Data.SQLite"
|
||||
publicKeyToken="db937bc2d44ff139"
|
||||
culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.90.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.91.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||
</Reference>
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Data.SQLite, Version=1.0.80.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
|
||||
<Reference Include="System.Data.SQLite, Version=1.0.91.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>lib\net\2.0\System.Data.SQLite.dll</HintPath>
|
||||
</Reference>
|
||||
|
||||
@@ -92,25 +92,24 @@
|
||||
</fileset>
|
||||
</move>
|
||||
|
||||
<!--conditional copies of dll's that can break the build's or test's of other projects (COPY)-->
|
||||
<!--temporary copies of "System.Data.SQLite.dll" because it is 32bit and causes problems in the compilation of the other test projects. It occurs in 64-bit Windows environment.-->
|
||||
<property name="no.preexisting.sqlite" value="${not file::exists('${current.bin.dir}/System.Data.SQLite.dll')}"/>
|
||||
<copy todir="${current.bin.dir}">
|
||||
<!--
|
||||
System.Data.SQLite.dll requires an x86 and an x64 folder directly underneath its own location so that it can
|
||||
dynamically load the appropriate Interop assembly for the running processor architecture.
|
||||
|
||||
The 'intended' deployment mechanism for System.Data.SQLite.dll is an XCOPY of the folder structure to
|
||||
the runtime location of the app. This task reproduces that XCOPY result by recursively copying the entirety
|
||||
of the necessary SQLite folder structure into the /bin/ dir of the website content that's eventually
|
||||
passed through NUnitASP during the test-run.
|
||||
-->
|
||||
<copy todir="${current.bin.dir}/Data/Spring/Conversation/WebConversationStateTest/bin">
|
||||
<fileset basedir="${project::get-base-directory()}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}">
|
||||
<include name="System.Data.SQLite.dll" if="${no.preexisting.sqlite}"/>
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!-- property name="test.assemblyname" value="${project::get-name()}" / -->
|
||||
<call target="common.run-tests" />
|
||||
|
||||
<!--conditional copies of dll's that can break the build's or test's of other projects (DELETE)-->
|
||||
<delete>
|
||||
<fileset basedir="${current.bin.dir}">
|
||||
<include name="System.Data.SQLite.dll" if="${no.preexisting.sqlite}"/>
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<!--moving temporary files that break the build or test of this project (UNDO MOVE)-->
|
||||
<move todir="${current.bin.dir}">
|
||||
<fileset basedir="${current.bin.dir}/nunitaspex_excluded">
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.90.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.91.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -92,7 +92,7 @@
|
||||
<assemblyIdentity name="System.Data.SQLite"
|
||||
publicKeyToken="db937bc2d44ff139"
|
||||
culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.80.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.91.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
<assemblyIdentity name="System.Data.SQLite"
|
||||
publicKeyToken="db937bc2d44ff139"
|
||||
culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.80.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.91.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
||||
@@ -95,25 +95,24 @@
|
||||
</fileset>
|
||||
</move>
|
||||
|
||||
<!--conditional copies of dll's that can break the build's or test's of other projects (COPY)-->
|
||||
<!--temporary copies of "System.Data.SQLite.dll" because it is 32bit and causes problems in the compilation of the other test projects. It occurs in 64-bit Windows environment.-->
|
||||
<property name="no.preexisting.sqlite" value="${not file::exists('${current.bin.dir}/System.Data.SQLite.dll')}"/>
|
||||
<copy todir="${current.bin.dir}">
|
||||
<!--
|
||||
System.Data.SQLite.dll requires an x86 and an x64 folder directly underneath its own location so that it can
|
||||
dynamically load the appropriate Interop assembly for the running processor architecture.
|
||||
|
||||
The 'intended' deployment mechanism for System.Data.SQLite.dll is an XCOPY of the folder structure to
|
||||
the runtime location of the app. This task reproduces that XCOPY result by recursively copying the entirety
|
||||
of the necessary SQLite folder structure into the /bin/ dir of the website content that's eventually
|
||||
passed through NUnitASP during the test-run.
|
||||
-->
|
||||
<copy todir="${current.bin.dir}/Data/Spring/Conversation/WebConversationStateTest/bin">
|
||||
<fileset basedir="${project::get-base-directory()}/../Spring.Web.Conversation.NHibernate32.Tests/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}">
|
||||
<include name="System.Data.SQLite.dll" if="${no.preexisting.sqlite}"/>
|
||||
<include name="**/*" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
|
||||
<!-- property name="test.assemblyname" value="${project::get-name()}" / -->
|
||||
<call target="common.run-tests" />
|
||||
|
||||
<!--conditional copies of dll's that can break the build's or test's of other projects (DELETE)-->
|
||||
<delete>
|
||||
<fileset basedir="${current.bin.dir}">
|
||||
<include name="System.Data.SQLite.dll" if="${no.preexisting.sqlite}"/>
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<!--moving temporary files that break the build or test of this project (UNDO MOVE)-->
|
||||
<move todir="${current.bin.dir}">
|
||||
<fileset basedir="${current.bin.dir}/nunitaspex_excluded">
|
||||
|
||||
Reference in New Issue
Block a user