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

SPRNET-1372

Browse Source 
Initial support for native .NET 4 compilation introduced
This commit is contained in:
sbohlen
2010-09-24 21:27:51 +00:00
parent 70d2b5413f
commit 6ee2ae5ee2
104 changed files with 252548 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
View File

@@ -42,6 +42,8 @@
<include name="*.dll" />
<exclude name="${project::get-name()}.dll" />
<exclude name="CloverRuntime.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
</csc>
<copy todir="${current.bin.dir}">

1
test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
View File

@@ -330,6 +330,7 @@
<Compile Include="Objects\Factory\Config\ConfigSectionVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\ConnectionStringsVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\DelegateObjectFactoryConfigurerTests.cs" />
<Compile Include="Objects\Factory\Config\DictionaryVariableSourceTests.cs" />
<Compile Include="Objects\Factory\Config\ObjectDefinitionVisitorTests.cs" />
<Compile Include="Objects\Factory\Config\ResourceHandlerConfigurerTests.cs" />
<Compile Include="Objects\Factory\Config\PropertyFileVariableSourceTests.cs" />

6
test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
View File

@@ -61,6 +61,7 @@
<include name="*.dll" />
<exclude name="${project::get-name()}.dll" />
<exclude name="CloverRuntime.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
</csc>
@@ -98,6 +99,11 @@
<copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
tofile="${current.bin.dir}/${project::get-name()}.dll.config"
if="${framework::get-target-framework() == 'net-2.0'}"/>
<copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
tofile="${current.bin.dir}/${project::get-name()}.dll.config"
if="${framework::get-target-framework() == 'net-4.0'}"/>
<copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
tofile="${current.bin.dir}/${project::get-name()}.dll.config"

1
test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
View File

@@ -38,6 +38,7 @@
<include name="System.Logging.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Data.OracleClient.dll" />
<exclude name="${project::get-name()}.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
</csc>
</target>

1
test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build
View File

@@ -37,6 +37,7 @@
<exclude name="Spring.Data.NHibernate20.dll" />
<exclude name="Spring.Data.NHibernate21.dll" />
<exclude name="CloverRuntime.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
<resources prefix="Spring" dynamicprefix="true" failonempty="true">
<include name="**/*.xml" />

1
test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.build
View File

@@ -40,6 +40,7 @@
<exclude name="Spring.Data.NHibernate20*.dll" />
<exclude name="Spring.Data.NHibernate21*.dll" />
<exclude name="Spring.Data.NHibernate*.Tests.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
<resources prefix="Spring" dynamicprefix="true" failonempty="true">
<include name="**/*.xml" />

1
test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build
View File

@@ -43,6 +43,7 @@
<exclude name="Spring.Data.NHibernate12*.dll" />
<exclude name="Spring.Data.NHibernate21*.dll" />
<exclude name="Spring.Data.NHibernate*.Tests.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
<resources prefix="Spring" dynamicprefix="true" failonempty="true">
<include name="**/*.xml" />

1
test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.build
View File

@@ -44,6 +44,7 @@
<exclude name="Spring.Data.NHibernate12*.dll" />
<exclude name="Spring.Data.NHibernate21*.dll" />
<exclude name="Spring.Data.NHibernate*.Tests.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
<resources prefix="Spring" dynamicprefix="true" failonempty="true">
<include name="**/*.xml" />

1
test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.build
View File

@@ -43,6 +43,7 @@
<exclude name="Spring.Data.NHibernate12*.dll" />
<exclude name="Spring.Data.NHibernate20*.dll" />
<exclude name="Spring.Data.NHibernate*.Tests.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
<resources prefix="Spring" dynamicprefix="true" failonempty="true">
<include name="**/*.xml" />

1
test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.build
View File

@@ -44,6 +44,7 @@
<exclude name="Spring.Data.NHibernate12*.dll" />
<exclude name="Spring.Data.NHibernate20*.dll" />
<exclude name="Spring.Data.NHibernate*.Tests.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
<resources prefix="Spring" dynamicprefix="true" failonempty="true">
<include name="**/*.xml" />

1
test/Spring/Spring.Data.NHibernate30.Integration.Tests/Spring.Data.NHibernate30.Integration.Tests.build
View File

@@ -38,6 +38,7 @@
<exclude name="Spring.Data.NHibernate20.dll" />
<exclude name="Spring.Data.NHibernate21.dll" />
<exclude name="CloverRuntime.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
<resources prefix="Spring" dynamicprefix="true" failonempty="true">
<include name="**/*.xml" />

1
test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.build
View File

@@ -37,6 +37,7 @@
<exclude name="Spring.Data.NHibernate20.dll" />
<exclude name="Spring.Data.NHibernate30.dll" />
<exclude name="CloverRuntime.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
<resources prefix="Spring" dynamicprefix="true" failonempty="true">
<include name="**/*.xml" />

1
test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
View File

@@ -38,6 +38,7 @@
<include name="Common.Logging.dll" if="${nant.settings.currentframework == 'mono-2.0'}"/>
<exclude name="${project::get-name()}.dll" />
<exclude name="CloverRuntime.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
</csc>

1
test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build
View File

@@ -31,6 +31,7 @@
<include name="System.EnterpriseServices.dll" />
<include name="*.dll" />
<include name="Spring.Messaging.Ems.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
<resources prefix="Spring" dynamicprefix="true" failonempty="true">
<include name="**/*.xml" />

1
test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build
View File

@@ -31,6 +31,7 @@
<include name="*.dll" />
<exclude name="${project::get-name()}.dll" />
<exclude name="CloverRuntime.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
</csc>

2
test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build
View File

@@ -31,6 +31,8 @@
<include name="System.EnterpriseServices.dll" />
<include name="*.dll" />
<include name="Spring.Messaging.Nms.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
<exclude if="${net-4.0}" name="Spring.Messaging.Nms.Integration.Tests.dll" />
</references>
<resources prefix="Spring" dynamicprefix="true" failonempty="true">
<include name="**/*.xml" />

1
test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build
View File

@@ -31,6 +31,7 @@
<include name="*.dll" />
<exclude name="${project::get-name()}.dll" />
<exclude name="CloverRuntime.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
</csc>

1
test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build
View File

@@ -31,6 +31,7 @@
<include name="*.dll" />
<exclude name="${project::get-name()}.dll" />
<exclude name="CloverRuntime.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
</csc>

1
test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.build
View File

@@ -27,6 +27,7 @@
<references basedir="${current.bin.dir}">
<include name="*.dll" />
<exclude name="${project::get-name()}.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
</csc>
<copy todir="${current.bin.dir}">

1
test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build
View File

@@ -27,6 +27,7 @@
<references basedir="${current.bin.dir}">
<include name="*.dll" />
<exclude name="${project::get-name()}.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
</csc>
<copy todir="${current.bin.dir}">

1
test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
View File

@@ -54,6 +54,7 @@
<include if="${net-3.0.installed and net-3.0}" name="${net-3.0.ReferenceInstallPath}\System.ServiceModel.dll" />
<exclude name="${project::get-name()}.dll" />
<exclude name="CloverRuntime.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
</csc>
<copy todir="${current.bin.dir}">

1
test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
View File

@@ -28,6 +28,7 @@
<include name="*.dll" />
<include name="Nvelocity.dll" />
<exclude name="${project::get-name()}.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
<resources prefix="Spring" dynamicprefix="true" failonempty="true">
<include name="**/*.xml" />

1
test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build
View File

@@ -36,6 +36,7 @@
<include name="*.dll" />
<exclude name="${project::get-name()}.dll" />
<exclude name="CloverRuntime.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
</csc>

1
test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build
View File

@@ -31,6 +31,7 @@
<include name="*.dll" />
<exclude name="${project::get-name()}.dll" />
<exclude name="CloverRuntime.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
</csc>

1
test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
View File

@@ -44,6 +44,7 @@
<exclude name="${project::get-name()}.dll" />
<exclude name="CloverRuntime.dll" />
<include name="${lib.dir}/nunit.core.interfaces.dll" />
<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
</references>
</csc>
<copy todir="${current.bin.dir}">

4
test/Spring/Spring.Web.Tests/Web/Support/PageHandlerFactoryTests.cs
View File

@@ -106,6 +106,7 @@ namespace Spring.Web.Support
}
}
#if !NET_4_0
/// <summary>
/// Tests the behavior of our PageHandlerFactory class
/// </summary>
@@ -114,6 +115,7 @@ namespace Spring.Web.Support
{
Host.Execute(new TestAction(PageHandlerFactoryBehavesLikeSystemPageHandlerFactoryImpl));
}
#endif
public static void PageHandlerFactoryBehavesLikeSystemPageHandlerFactoryImpl()
{
@@ -138,7 +140,7 @@ namespace Spring.Web.Support
}
}
#if NET_2_0
#if NET_2_0 && ! NET_4_0
[Test]
public void TransferAfterSetResult()
{