SPRNET-1539 upgrade Quartz dependency to 2.2.1, use Spring.Scheduling.Quartz2 as package name
* replace lib dir NHibernate and Quartz dlls with NuGet references * update examples to prefer NuGet packages
This commit is contained in:
Marko Lahma
55
Spring.build
55
Spring.build
@@ -323,6 +323,11 @@ Commandline Examples:
|
||||
commandline="restore Spring.NET.2010.sln"
|
||||
workingdir="."
|
||||
failonerror="true" />
|
||||
<exec
|
||||
program=".nuget\nuget.exe"
|
||||
commandline="restore ${spring.basedir}\src\Spring\Spring.Web.Mvc5\packages.config -SolutionDirectory ${spring.basedir}"
|
||||
workingdir="."
|
||||
failonerror="true" />
|
||||
</target>
|
||||
|
||||
<target name="compile-build-3.5" description="Builds for .NET 3.5 if available">
|
||||
@@ -419,16 +424,16 @@ Commandline Examples:
|
||||
|
||||
<target name="compile-test"> <!-- used as configurable template by all compile-{net|mono|netcf}-x.x targets -->
|
||||
<property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
|
||||
<property name="nh32.lib.dir" value="${spring.basedir}/lib/NHibernate32/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
|
||||
<property name="nh33.lib.dir" value="${spring.basedir}/lib/NHibernate33/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
|
||||
<property name="quartz21.lib.dir" value="${spring.basedir}/lib/Quartz21/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
|
||||
<property name="nh32.lib.dir" value="${spring.basedir}/packages/NHibernate.3.2.0.4000/lib/Net35"/>
|
||||
<property name="iesi32.lib.dir" value="${spring.basedir}/packages/Iesi.Collections.3.2.0.4000/lib/Net35"/>
|
||||
<property name="nh33.lib.dir" value="${spring.basedir}/packages/NHibernate.3.3.3.4001/lib/Net35"/>
|
||||
<property name="iesi33.lib.dir" value="${spring.basedir}/packages/Iesi.Collections.3.3.3.4001/lib/Net35"/>
|
||||
<property name="quartz2.lib.dir" value="${spring.basedir}/packages/Quartz.2.2.1/lib/net35"/>
|
||||
|
||||
<!-- we use same libs for both 4.0 and 4.5 builds -->
|
||||
<if test="${nant.settings.currentframework == 'net-4.5'}">
|
||||
<if test="${nant.settings.currentframework == 'net-4.5' or nant.settings.currentframework == 'net-4.5'}">
|
||||
<property name="lib.dir" value="${spring.basedir}/lib/net/4.0"/>
|
||||
<property name="nh32.lib.dir" value="${spring.basedir}/lib/NHibernate32/net/4.0"/>
|
||||
<property name="nh33.lib.dir" value="${spring.basedir}/lib/NHibernate33/net/4.0"/>
|
||||
<property name="quartz21.lib.dir" value="${spring.basedir}/lib/Quartz21/net/4.0"/>
|
||||
<property name="quartz2.lib.dir" value="${spring.basedir}/packages/Quartz.2.2.1/lib/net40"/>
|
||||
</if>
|
||||
|
||||
|
||||
@@ -452,7 +457,7 @@ Commandline Examples:
|
||||
<nant buildfile="src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build" target="build" if="${build-testing-microsoft}"/>
|
||||
<nant buildfile="src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build" target="build" if="${build-ems and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5' )}"/>
|
||||
<nant buildfile="src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build" target="build" if="${build-nms}"/>
|
||||
<nant buildfile="src/Spring/Spring.Scheduling.Quartz21/Spring.Scheduling.Quartz21.build" target="build" if="${build-quartz}"/>
|
||||
<nant buildfile="src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build" target="build" if="${build-quartz}"/>
|
||||
<nant buildfile="src/Spring/Spring.Messaging/Spring.Messaging.build" target="build" if="${build-msmq}"/>
|
||||
<nant buildfile="src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build" target="build" if="${build-velocity}"/>
|
||||
<!--"Spring.ConversationWA.NH*.dll" should be at last to prevent the other assemblies are compiled with reference to this-->
|
||||
@@ -482,7 +487,7 @@ Commandline Examples:
|
||||
<nant buildfile="test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build" target="test" if="${build-ems}"/>
|
||||
<nant buildfile="test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build" target="test" if="${build-nms}"/>
|
||||
<nant buildfile="test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build" target="test" if="${build-nms}"/>
|
||||
<nant buildfile="test/Spring/Spring.Scheduling.Quartz21.Tests/Spring.Scheduling.Quartz21.Tests.build" target="test" if="${build-quartz}"/>
|
||||
<nant buildfile="test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.build" target="test" if="${build-quartz}"/>
|
||||
<nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-msmq}"/>
|
||||
<nant buildfile="test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build" target="test" if="${build-velocity}"/>
|
||||
<!--"Spring.ConversationWA.NH*.Tests.dll" should be at last to prevent the other tests are compiled with reference to this-->
|
||||
@@ -772,8 +777,8 @@ Commandline Examples:
|
||||
<delete dir="src/Spring/Spring.Messaging.Ems/bin" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Messaging/obj" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Messaging/bin" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Scheduling.Quartz21/obj" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Scheduling.Quartz21/bin" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Scheduling.Quartz2/obj" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Scheduling.Quartz2/bin" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Template.Velocity/obj" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Template.Velocity/bin" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Testing.NUnit/obj" failonerror="false"/>
|
||||
@@ -799,8 +804,8 @@ Commandline Examples:
|
||||
|
||||
<delete dir="test/Spring/Spring.Messaging.Ems.Integration.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Messaging.Ems.Integration.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Web.Mvc3.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Web.Mvc3.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Web.Mvc4.Tests/obj" failonerror="false"/>
|
||||
@@ -834,8 +839,8 @@ Commandline Examples:
|
||||
<delete dir="test/Spring/Spring.Messaging.Ems.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Messaging.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Messaging.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Scheduling.Quartz21.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Scheduling.Quartz21.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Scheduling.Quartz2.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Scheduling.Quartz2.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Template.Velocity.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Template.Velocity.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Web.Tests/obj" failonerror="false"/>
|
||||
@@ -861,8 +866,8 @@ Commandline Examples:
|
||||
</delete>
|
||||
<delete dir="test/Spring/Spring.Messaging.Ems.Integration.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Messaging.Ems.Integration.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/obj" failonerror="false"/>
|
||||
<delete failonerror="false">
|
||||
<fileset basedir="test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/wwwroot/bin">
|
||||
<include name="*.dll"/>
|
||||
@@ -1518,9 +1523,9 @@ Commandline Examples:
|
||||
<include name="*/*/Spring.Messaging.xml"/>
|
||||
<include name="*/*/Spring.Messaging.pdb"/>
|
||||
|
||||
<include name="*/*/Spring.Scheduling.Quartz21.dll"/>
|
||||
<include name="*/*/Spring.Scheduling.Quartz21.xml"/>
|
||||
<include name="*/*/Spring.Scheduling.Quartz21.pdb"/>
|
||||
<include name="*/*/Spring.Scheduling.Quartz2.dll"/>
|
||||
<include name="*/*/Spring.Scheduling.Quartz2.xml"/>
|
||||
<include name="*/*/Spring.Scheduling.Quartz2.pdb"/>
|
||||
|
||||
<include name="*/*/Spring.Template.Velocity.dll"/>
|
||||
<include name="*/*/Spring.Template.Velocity.xml"/>
|
||||
@@ -1545,9 +1550,9 @@ Commandline Examples:
|
||||
<include name="*/Spring.Services.xml"/>
|
||||
<include name="*/Spring.Services.pdb"/>
|
||||
|
||||
<include name="*/*/Spring.Scheduling.Quartz21.dll"/>
|
||||
<include name="*/*/Spring.Scheduling.Quartz21.xml"/>
|
||||
<include name="*/*/Spring.Scheduling.Quartz21.pdb"/>
|
||||
<include name="*/*/Spring.Scheduling.Quartz2.dll"/>
|
||||
<include name="*/*/Spring.Scheduling.Quartz2.xml"/>
|
||||
<include name="*/*/Spring.Scheduling.Quartz2.pdb"/>
|
||||
|
||||
<include name="*/Spring.Web.Extensions.dll"/>
|
||||
<include name="*/Spring.Web.Extensions.xml"/>
|
||||
@@ -1753,7 +1758,7 @@ Commandline Examples:
|
||||
<include name="src/Spring/Spring.Messaging/**"/>
|
||||
<include name="src/Spring/Spring.Messaging.Nms/**"/>
|
||||
<include name="src/Spring/Spring.Messaging.Ems/**"/>
|
||||
<include name="src/Spring/Spring.Scheduling.Quartz21/**"/>
|
||||
<include name="src/Spring/Spring.Scheduling.Quartz2/**"/>
|
||||
<include name="src/Spring/Spring.Template.Velocity/**"/>
|
||||
<include name="src/Spring/Spring.Testing.NUnit/**"/>
|
||||
<include name="src/Spring/Spring.Testing.Microsoft/**"/>
|
||||
@@ -1778,7 +1783,7 @@ Commandline Examples:
|
||||
<include name="test/Spring/Spring.Messaging.Nms.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Messaging.Nms.Integration.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Messaging.Ems.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Scheduling.Quartz21.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Scheduling.Quartz2.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Template.Velocity.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Testing.NUnit.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Testing.Microsoft.Tests/**"/>
|
||||
|
||||
Reference in New Issue
Block a user