fixing broken build due to new NUnit update and stale assembly binding redirects
This commit is contained in:
sbohlen
@@ -1,114 +1,115 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="hibernate-configuration"
|
||||
<configSections>
|
||||
<section name="hibernate-configuration"
|
||||
type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate" />
|
||||
<section name="log4net"
|
||||
<section name="log4net"
|
||||
type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
|
||||
</configSections>
|
||||
</configSections>
|
||||
|
||||
<connectionStrings>
|
||||
<add name="TestConnectionString"
|
||||
<connectionStrings>
|
||||
<add name="TestConnectionString"
|
||||
connectionString="TestConnectionString-TestConnectionString" />
|
||||
</connectionStrings>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
|
||||
</connectionStrings>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
|
||||
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" />
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
|
||||
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" />
|
||||
</assemblyBinding>
|
||||
</assemblyBinding>
|
||||
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<!-- 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" />
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<!-- 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" />
|
||||
|
||||
<!-- Spring.NET uses a new version of NUnit -->
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="2.5.2.9222"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<!-- Spring.NET uses a new version of NUnit -->
|
||||
<dependentAssembly>
|
||||
<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>
|
||||
</assemblyBinding>
|
||||
|
||||
</runtime>
|
||||
</runtime>
|
||||
|
||||
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
|
||||
<bytecode-provider type="lcg"/>
|
||||
<reflection-optimizer use="true"/>
|
||||
<session-factory name="NHibernate.Test">
|
||||
<property name="connection.provider">NHibernate.Test.DebugConnectionProvider, NHibernate.Test</property>
|
||||
<property name="cache.provider_class">NHibernate.Cache.HashtableCacheProvider, NHibernate</property>
|
||||
<property name="cache.use_query_cache">true</property>
|
||||
<property name="query.startup_check">false</property>
|
||||
<!--
|
||||
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
|
||||
<bytecode-provider type="lcg"/>
|
||||
<reflection-optimizer use="true"/>
|
||||
<session-factory name="NHibernate.Test">
|
||||
<property name="connection.provider">NHibernate.Test.DebugConnectionProvider, NHibernate.Test</property>
|
||||
<property name="cache.provider_class">NHibernate.Cache.HashtableCacheProvider, NHibernate</property>
|
||||
<property name="cache.use_query_cache">true</property>
|
||||
<property name="query.startup_check">false</property>
|
||||
<!--
|
||||
The valid strings for Isolation can be found in the documentation for the System.Data.IsolationLevel
|
||||
Enumeration documentation.
|
||||
Use the member names - not the values.
|
||||
-->
|
||||
<property name="adonet.batch_size">10</property>
|
||||
<property name="connection.isolation">ReadCommitted</property>
|
||||
<property name="hbm2ddl.keywords">none</property>
|
||||
<property name="format_sql">true</property>
|
||||
<property name="adonet.batch_size">10</property>
|
||||
<property name="connection.isolation">ReadCommitted</property>
|
||||
<property name="hbm2ddl.keywords">none</property>
|
||||
<property name="format_sql">true</property>
|
||||
|
||||
<!-- This is the System.Data.dll provider for MSSQL Server -->
|
||||
<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property>
|
||||
<property name="dialect">NHibernate.Dialect.MsSql2005Dialect</property>
|
||||
<property name="connection.connection_string">Server=SPRINGQA;initial catalog=nhibernate;Integrated Security=SSPI</property>
|
||||
<!-- This is the System.Data.dll provider for MSSQL Server -->
|
||||
<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property>
|
||||
<property name="dialect">NHibernate.Dialect.MsSql2005Dialect</property>
|
||||
<property name="connection.connection_string">Server=SPRINGQA;initial catalog=nhibernate;Integrated Security=SSPI</property>
|
||||
|
||||
<property name="show_sql">false</property>
|
||||
<property name="use_outer_join">true</property>
|
||||
<property name="command_timeout">444</property>
|
||||
<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
|
||||
<property name="adonet.wrap_result_sets">false</property>
|
||||
<property name="show_sql">false</property>
|
||||
<property name="use_outer_join">true</property>
|
||||
<property name="command_timeout">444</property>
|
||||
<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</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">Spring.Data.NHibernate.Bytecode.ProxyFactoryFactory, Spring.Data.NHibernate21</property>
|
||||
</session-factory>
|
||||
</hibernate-configuration>
|
||||
<property name="proxyfactory.factory_class">Spring.Data.NHibernate.Bytecode.ProxyFactoryFactory, Spring.Data.NHibernate21</property>
|
||||
</session-factory>
|
||||
</hibernate-configuration>
|
||||
|
||||
<log4net>
|
||||
<!-- Define some output appenders -->
|
||||
<appender name="trace"
|
||||
type="log4net.Appender.TraceAppender, log4net">
|
||||
<layout type="log4net.Layout.PatternLayout,log4net">
|
||||
<param name="ConversionPattern"
|
||||
value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n" />
|
||||
</layout>
|
||||
</appender>
|
||||
<log4net>
|
||||
<!-- Define some output appenders -->
|
||||
<appender name="trace"
|
||||
type="log4net.Appender.TraceAppender, log4net">
|
||||
<layout type="log4net.Layout.PatternLayout,log4net">
|
||||
<param name="ConversionPattern"
|
||||
value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n" />
|
||||
</layout>
|
||||
</appender>
|
||||
|
||||
<appender name="console"
|
||||
type="log4net.Appender.ConsoleAppender, log4net">
|
||||
<layout type="log4net.Layout.PatternLayout,log4net">
|
||||
<param name="ConversionPattern"
|
||||
value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n" />
|
||||
</layout>
|
||||
</appender>
|
||||
<appender name="console"
|
||||
type="log4net.Appender.ConsoleAppender, log4net">
|
||||
<layout type="log4net.Layout.PatternLayout,log4net">
|
||||
<param name="ConversionPattern"
|
||||
value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n" />
|
||||
</layout>
|
||||
</appender>
|
||||
|
||||
<root>
|
||||
<priority value="WARN" />
|
||||
<appender-ref ref="trace" />
|
||||
<appender-ref ref="console" />
|
||||
</root>
|
||||
<root>
|
||||
<priority value="WARN" />
|
||||
<appender-ref ref="trace" />
|
||||
<appender-ref ref="console" />
|
||||
</root>
|
||||
|
||||
<logger name="NHibernate.Hql.Ast.ANTLR">
|
||||
<priority value="OFF" />
|
||||
</logger>
|
||||
<logger name="NHibernate.Hql.Ast.ANTLR">
|
||||
<priority value="OFF" />
|
||||
</logger>
|
||||
|
||||
<logger name="NHibernate.SQL">
|
||||
<level value="OFF" />
|
||||
</logger>
|
||||
<logger name="NHibernate.SQL">
|
||||
<level value="OFF" />
|
||||
</logger>
|
||||
|
||||
<logger name="NHibernate.AdoNet.AbstractBatcher">
|
||||
<level value="OFF" />
|
||||
</logger>
|
||||
<logger name="NHibernate.AdoNet.AbstractBatcher">
|
||||
<level value="OFF" />
|
||||
</logger>
|
||||
|
||||
<logger name="NHibernate.Tool.hbm2ddl.SchemaExport">
|
||||
<level value="ERROR" />
|
||||
</logger>
|
||||
<logger name="NHibernate.Tool.hbm2ddl.SchemaExport">
|
||||
<level value="ERROR" />
|
||||
</logger>
|
||||
|
||||
</log4net>
|
||||
</log4net>
|
||||
</configuration>
|
||||
@@ -1,77 +1,77 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<sectionGroup name="common">
|
||||
<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
|
||||
</sectionGroup>
|
||||
<sectionGroup name="spring">
|
||||
<section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
<configSections>
|
||||
<sectionGroup name="common">
|
||||
<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
|
||||
</sectionGroup>
|
||||
<sectionGroup name="spring">
|
||||
<section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
|
||||
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" />
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
|
||||
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" />
|
||||
</assemblyBinding>
|
||||
</assemblyBinding>
|
||||
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<!-- 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" />
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<!-- 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" />
|
||||
|
||||
<!-- Spring.NET uses a new version of NUnit -->
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="2.5.2.9222"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<!-- Spring.NET uses a new version of NUnit -->
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
|
||||
<bindingRedirect oldVersion="*" newVersion="2.5.7.10213" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
|
||||
</runtime>
|
||||
</runtime>
|
||||
|
||||
<common>
|
||||
<logging>
|
||||
<common>
|
||||
<logging>
|
||||
<!--
|
||||
<factoryAdapter type="Common.Logging.Simple.ConsoleOutLoggerFactoryAdapter, Common.Logging">
|
||||
<arg key="level" value="INFO" />
|
||||
</factoryAdapter>
|
||||
<factoryAdapter type="Common.Logging.Simple.ConsoleOutLoggerFactoryAdapter, Common.Logging">
|
||||
<arg key="level" value="INFO" />
|
||||
</factoryAdapter>
|
||||
-->
|
||||
|
||||
<factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
|
||||
<arg key="level" value="INFO" />
|
||||
</factoryAdapter>
|
||||
|
||||
|
||||
<factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
|
||||
<arg key="level" value="INFO" />
|
||||
</factoryAdapter>
|
||||
|
||||
|
||||
<!--
|
||||
<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
|
||||
<arg key="configType" value="FILE-WATCH"/>
|
||||
<arg key="configFile" value="~/Config/Log4Net.xml"/>
|
||||
</factoryAdapter>
|
||||
-->
|
||||
<!--
|
||||
<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
|
||||
<arg key="configType" value="FILE-WATCH"/>
|
||||
<arg key="configFile" value="~/Config/Log4Net.xml"/>
|
||||
</factoryAdapter>
|
||||
-->
|
||||
|
||||
</logging>
|
||||
</common>
|
||||
</logging>
|
||||
</common>
|
||||
|
||||
<!--
|
||||
<common>
|
||||
<logging>
|
||||
<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net129">
|
||||
<arg key="configType" value="EXTERNAL" />
|
||||
</factoryAdapter>
|
||||
</logging>
|
||||
</common>
|
||||
-->
|
||||
<!--
|
||||
<common>
|
||||
<logging>
|
||||
<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net129">
|
||||
<arg key="configType" value="EXTERNAL" />
|
||||
</factoryAdapter>
|
||||
</logging>
|
||||
</common>
|
||||
-->
|
||||
|
||||
<spring>
|
||||
<parsers>
|
||||
<parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" />
|
||||
<parser type="Spring.Transaction.Config.TxNamespaceParser, Spring.Data" />
|
||||
</parsers>
|
||||
</spring>
|
||||
<spring>
|
||||
<parsers>
|
||||
<parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" />
|
||||
<parser type="Spring.Transaction.Config.TxNamespaceParser, Spring.Data" />
|
||||
</parsers>
|
||||
</spring>
|
||||
|
||||
</configuration>
|
||||
|
||||
@@ -79,7 +79,7 @@ limitations under the License.
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<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>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
||||
Reference in New Issue
Block a user