Upgrade NUnit to 2.5.5.
Fixes [AMQNET-263]. (See https://issues.apache.org/activemq/browse/AMQNET-263)
diff --git a/nant-common.xml b/nant-common.xml
index b916d17..e4d8738 100644
--- a/nant-common.xml
+++ b/nant-common.xml
@@ -323,6 +323,7 @@
output="${build.bin.dir}/${project.name}.Test.dll" doc="${build.bin.dir}/${project.name}.Test.xml">
<nowarn>
<warning number="1591" /> <!-- do not report warnings for missing XML comments -->
+ <warning number="3016" /> <!-- do not report warnings for array parameters -->
</nowarn>
<sources failonempty="true">
<include name="src/test/csharp/**.cs" />
@@ -334,6 +335,7 @@
output="${build.bin.dir}/${project.name}.Test.dll" doc="${build.bin.dir}/${project.name}.Test.xml">
<nowarn>
<warning number="1591" /> <!-- do not report warnings for missing XML comments -->
+ <warning number="3016" /> <!-- do not report warnings for array parameters -->
</nowarn>
<sources failonempty="true">
<include name="src/test/csharp/**.cs" />
diff --git a/nant.build b/nant.build
index d9f247c..1d28231 100644
--- a/nant.build
+++ b/nant.build
@@ -29,7 +29,6 @@
<!-- Repository organized as: organization/module/version/plaform/artifact, platform might be something like 'all' or 'net-2.0/release' -->
<property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
- <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
<property name="Apache.NMS.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.dll" dynamic="true" />
<property name="Apache.NMS.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.pdb" dynamic="true" />
<property name="Apache.NMS.Test.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll" dynamic="true" />
@@ -58,8 +57,8 @@
<!-- Property grouping for 'vendor.nunit.org' -->
<property name="vendor.nunit.org.name" value="NUnit" />
<property name="vendor.nunit.org.group" value="org.nunit" />
- <property name="vendor.nunit.org.version" value="2.4.8" />
- <property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
+ <property name="vendor.nunit.org.version" value="2.5.5" />
+ <property name="vendor.nunit.org.filenames" value="nunit.framework.dll" />
</target>
<target name="dependency-init" description="Initializes build dependencies">
@@ -80,7 +79,6 @@
<include name="${Apache.NMS.Test.dll}" />
<include name="${build.bin.dir}/${project.name}.dll" />
<include name="${nunit.dll}" />
- <include name="${nunit.extensions.dll}" />
</assemblyfileset>
<fileset id="content.filenames">
@@ -92,7 +90,6 @@
<include name="${Apache.NMS.Test.dll}" />
<include name="${Apache.NMS.Test.pdb}" />
<include name="${nunit.dll}" />
- <include name="${nunit.extensions.dll}" />
<include name="${NUnit.Projectfile}" />
</fileset>
diff --git a/vs2008-msmq-test.csproj b/vs2008-msmq-test.csproj
index ea54c4b..685f1fc 100644
--- a/vs2008-msmq-test.csproj
+++ b/vs2008-msmq-test.csproj
@@ -46,6 +46,7 @@
<OutputPath>build\net-2.0\debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET,NET_2_0</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <NoWarn>3016</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -54,6 +55,7 @@
<DefineConstants>TRACE;NET,NET_2_0</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<DebugType>full</DebugType>
+ <NoWarn>3016</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -68,10 +70,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>lib\NUnit\net-2.0\nunit.framework.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework.extensions, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>lib\NUnit\net-2.0\nunit.framework.extensions.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Messaging" />
<Reference Include="System.Xml" />
