Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing broken build due to new NUnit update and stale assembly binding redirects

Browse Source
This commit is contained in:
sbohlen
2010-09-21 19:42:15 +00:00
parent 2b7f0f5f94
commit bd46aeb575
3 changed files with 143 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
test/Spring/Spring.Data.NHibernate21.Integration.Tests/NHibernate.Test.dll.config
View File

@@ -1,114 +1,115 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<configuration> <configuration>
<configSections> <configSections>
<section name="hibernate-configuration" <section name="hibernate-configuration"
type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate" /> type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate" />
<section name="log4net" <section name="log4net"
type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
</configSections> </configSections>
<connectionStrings> <connectionStrings>
<add name="TestConnectionString" <add name="TestConnectionString"
connectionString="TestConnectionString-TestConnectionString" /> connectionString="TestConnectionString-TestConnectionString" />
</connectionStrings> </connectionStrings>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
applies-to="v1.1.4322"> applies-to="v1.1.4322">
<qualifyAssembly partialName="System.Web" <qualifyAssembly partialName="System.Web"
fullName="System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> fullName="System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</assemblyBinding> </assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
applies-to="v2.0.50727"> applies-to="v2.0.50727">
<qualifyAssembly partialName="System.Web" <qualifyAssembly partialName="System.Web"
fullName="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> fullName="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</assemblyBinding> </assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<!-- The assembly binding for FirebirdClient ADO.NET 2.0 DataProvider --> <!-- The assembly binding for FirebirdClient ADO.NET 2.0 DataProvider -->
<qualifyAssembly partialName="FirebirdSql.Data.FirebirdClient" fullName="FirebirdSql.Data.FirebirdClient, Version=2.1.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c" /> <qualifyAssembly partialName="FirebirdSql.Data.FirebirdClient" fullName="FirebirdSql.Data.FirebirdClient, Version=2.1.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c" />
<!-- Spring.NET uses a new version of NUnit --> <!-- Spring.NET uses a new version of NUnit -->
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" /> <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="2.5.2.9222"/> <!--<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="2.5.2.9222"/>-->
</dependentAssembly> <bindingRedirect oldVersion="*" newVersion="2.5.7.10213" />
</assemblyBinding> </dependentAssembly>
</assemblyBinding>
</runtime> </runtime>
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2"> <hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
<bytecode-provider type="lcg"/> <bytecode-provider type="lcg"/>
<reflection-optimizer use="true"/> <reflection-optimizer use="true"/>
<session-factory name="NHibernate.Test"> <session-factory name="NHibernate.Test">
<property name="connection.provider">NHibernate.Test.DebugConnectionProvider, NHibernate.Test</property> <property name="connection.provider">NHibernate.Test.DebugConnectionProvider, NHibernate.Test</property>
<property name="cache.provider_class">NHibernate.Cache.HashtableCacheProvider, NHibernate</property> <property name="cache.provider_class">NHibernate.Cache.HashtableCacheProvider, NHibernate</property>
<property name="cache.use_query_cache">true</property> <property name="cache.use_query_cache">true</property>
<property name="query.startup_check">false</property> <property name="query.startup_check">false</property>
<!-- <!--
The valid strings for Isolation can be found in the documentation for the System.Data.IsolationLevel The valid strings for Isolation can be found in the documentation for the System.Data.IsolationLevel
Enumeration documentation. Enumeration documentation.
Use the member names - not the values. Use the member names - not the values.
--> -->
<property name="adonet.batch_size">10</property> <property name="adonet.batch_size">10</property>
<property name="connection.isolation">ReadCommitted</property> <property name="connection.isolation">ReadCommitted</property>
<property name="hbm2ddl.keywords">none</property> <property name="hbm2ddl.keywords">none</property>
<property name="format_sql">true</property> <property name="format_sql">true</property>
<!-- This is the System.Data.dll provider for MSSQL Server --> <!-- This is the System.Data.dll provider for MSSQL Server -->
<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property> <property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property>
<property name="dialect">NHibernate.Dialect.MsSql2005Dialect</property> <property name="dialect">NHibernate.Dialect.MsSql2005Dialect</property>
<property name="connection.connection_string">Server=SPRINGQA;initial catalog=nhibernate;Integrated Security=SSPI</property> <property name="connection.connection_string">Server=SPRINGQA;initial catalog=nhibernate;Integrated Security=SSPI</property>
<property name="show_sql">false</property> <property name="show_sql">false</property>
<property name="use_outer_join">true</property> <property name="use_outer_join">true</property>
<property name="command_timeout">444</property> <property name="command_timeout">444</property>
<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property> <property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
<property name="adonet.wrap_result_sets">false</property> <property name="adonet.wrap_result_sets">false</property>
<!-- <property name="proxyfactory.factory_class">NHibernate.ByteCode.LinFu.ProxyFactoryFactory, NHibernate.ByteCode.LinFu</property>--> <!-- <property name="proxyfactory.factory_class">NHibernate.ByteCode.LinFu.ProxyFactoryFactory, NHibernate.ByteCode.LinFu</property>-->
<property name="proxyfactory.factory_class">Spring.Data.NHibernate.Bytecode.ProxyFactoryFactory, Spring.Data.NHibernate21</property> <property name="proxyfactory.factory_class">Spring.Data.NHibernate.Bytecode.ProxyFactoryFactory, Spring.Data.NHibernate21</property>
</session-factory> </session-factory>
</hibernate-configuration> </hibernate-configuration>
<log4net> <log4net>
<!-- Define some output appenders --> <!-- Define some output appenders -->
<appender name="trace" <appender name="trace"
type="log4net.Appender.TraceAppender, log4net"> type="log4net.Appender.TraceAppender, log4net">
<layout type="log4net.Layout.PatternLayout,log4net"> <layout type="log4net.Layout.PatternLayout,log4net">
<param name="ConversionPattern" <param name="ConversionPattern"
value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n" /> value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n" />
</layout> </layout>
</appender> </appender>
<appender name="console" <appender name="console"
type="log4net.Appender.ConsoleAppender, log4net"> type="log4net.Appender.ConsoleAppender, log4net">
<layout type="log4net.Layout.PatternLayout,log4net"> <layout type="log4net.Layout.PatternLayout,log4net">
<param name="ConversionPattern" <param name="ConversionPattern"
value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n" /> value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n" />
</layout> </layout>
</appender> </appender>
<root> <root>
<priority value="WARN" /> <priority value="WARN" />
<appender-ref ref="trace" /> <appender-ref ref="trace" />
<appender-ref ref="console" /> <appender-ref ref="console" />
</root> </root>
<logger name="NHibernate.Hql.Ast.ANTLR"> <logger name="NHibernate.Hql.Ast.ANTLR">
<priority value="OFF" /> <priority value="OFF" />
</logger> </logger>
<logger name="NHibernate.SQL"> <logger name="NHibernate.SQL">
<level value="OFF" /> <level value="OFF" />
</logger> </logger>
<logger name="NHibernate.AdoNet.AbstractBatcher"> <logger name="NHibernate.AdoNet.AbstractBatcher">
<level value="OFF" /> <level value="OFF" />
</logger> </logger>
<logger name="NHibernate.Tool.hbm2ddl.SchemaExport"> <logger name="NHibernate.Tool.hbm2ddl.SchemaExport">
<level value="ERROR" /> <level value="ERROR" />
</logger> </logger>
</log4net> </log4net>
</configuration> </configuration>

116
test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.dll.config
View File

@@ -1,77 +1,77 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<configuration> <configuration>
<configSections> <configSections>
<sectionGroup name="common"> <sectionGroup name="common">
<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" /> <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
</sectionGroup> </sectionGroup>
<sectionGroup name="spring"> <sectionGroup name="spring">
<section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" /> <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
applies-to="v1.1.4322"> applies-to="v1.1.4322">
<qualifyAssembly partialName="System.Web" <qualifyAssembly partialName="System.Web"
fullName="System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> fullName="System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</assemblyBinding> </assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
applies-to="v2.0.50727"> applies-to="v2.0.50727">
<qualifyAssembly partialName="System.Web" <qualifyAssembly partialName="System.Web"
fullName="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> fullName="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</assemblyBinding> </assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<!-- The assembly binding for FirebirdClient ADO.NET 2.0 DataProvider --> <!-- The assembly binding for FirebirdClient ADO.NET 2.0 DataProvider -->
<qualifyAssembly partialName="FirebirdSql.Data.FirebirdClient" fullName="FirebirdSql.Data.FirebirdClient, Version=2.1.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c" /> <qualifyAssembly partialName="FirebirdSql.Data.FirebirdClient" fullName="FirebirdSql.Data.FirebirdClient, Version=2.1.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c" />
<!-- Spring.NET uses a new version of NUnit --> <!-- Spring.NET uses a new version of NUnit -->
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" /> <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="2.5.2.9222"/> <bindingRedirect oldVersion="*" newVersion="2.5.7.10213" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<common> <common>
<logging> <logging>
<!-- <!--
<factoryAdapter type="Common.Logging.Simple.ConsoleOutLoggerFactoryAdapter, Common.Logging"> <factoryAdapter type="Common.Logging.Simple.ConsoleOutLoggerFactoryAdapter, Common.Logging">
<arg key="level" value="INFO" /> <arg key="level" value="INFO" />
</factoryAdapter> </factoryAdapter>
--> -->
<factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging"> <factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
<arg key="level" value="INFO" /> <arg key="level" value="INFO" />
</factoryAdapter> </factoryAdapter>
<!-- <!--
<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net"> <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
<arg key="configType" value="FILE-WATCH"/> <arg key="configType" value="FILE-WATCH"/>
<arg key="configFile" value="~/Config/Log4Net.xml"/> <arg key="configFile" value="~/Config/Log4Net.xml"/>
</factoryAdapter> </factoryAdapter>
--> -->
</logging> </logging>
</common> </common>
<!-- <!--
<common> <common>
<logging> <logging>
<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net129"> <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net129">
<arg key="configType" value="EXTERNAL" /> <arg key="configType" value="EXTERNAL" />
</factoryAdapter> </factoryAdapter>
</logging> </logging>
</common> </common>
--> -->
<spring> <spring>
<parsers> <parsers>
<parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" /> <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" />
<parser type="Spring.Transaction.Config.TxNamespaceParser, Spring.Data" /> <parser type="Spring.Transaction.Config.TxNamespaceParser, Spring.Data" />
</parsers> </parsers>
</spring> </spring>
</configuration> </configuration>

2
test/Spring/Spring.Data.Tests/Spring.Data.Tests.dll.config
View File

@@ -79,7 +79,7 @@ limitations under the License.
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" /> <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
<bindingRedirect oldVersion="2.5.2.9222" newVersion="2.5.7.10213" /> <bindingRedirect oldVersion="*" newVersion="2.5.7.10213" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>