upgrade to NUnit 3.5

* upgrade nuget.exe and use single installation in build-support directory
* migrate to preferred automatic visual studio package restore mode
* fix various issues with NHibernate build configuration
* fix building of MVC projects when MVC libs not present

Author: lahma

.gitignore

@@ -22,6 +22,8 @@ _ReSharper*/
 *.resharper
 *.sln.DotSettings
 [Tt]est[Rr]esult*
+.idea
+.vs
 
 #Project files
 [Bb]uild/
@@ -75,3 +77,4 @@ PrecompiledWeb
 /.project
 /examples/Spring/Spring.Mvc3QuickStart/packages
 /examples/Spring/Spring.Mvc4QuickStart/packages
+/src/Spring/Spring.Testing.NUnit3/Spring.Testing.NUnit3.xml

.nuget/NuGet.exe

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit.Runners" version="2.6.1" />
+  <package id="NUnit.ConsoleRunner" version="3.5.0" />
+  <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.5.0" />
 </packages>

.nuget/NuGet.targets

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.25807.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F04753EF-7A1B-4837-AB63-8C0821E8155D}"
 	ProjectSection(SolutionItems) = preProject
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		readme.txt = readme.txt
 		Spring.build = Spring.build
 		Spring.include = Spring.include
-		TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2010", "src\Spring\Spring.Core\Spring.Core.2010.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
@@ -90,9 +89,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHi
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{79F495DF-83D6-435E-A20E-47800F6F8FE7}"
 	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
+		.nuget\packages.config = .nuget\packages.config
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Mvc5.2010", "src\Spring\Spring.Web.Mvc5\Spring.Web.Mvc5.2010.csproj", "{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}"
@@ -108,6 +105,7 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Template.Velocity.Castle.2010", "src\Spring\Spring.Template.Velocity.Castle\Spring.Template.Velocity.Castle.2010.csproj", "{250601C0-A4AC-41FE-B484-51A9B0D5473D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Template.Velocity.Castle.Tests.2010", "test\Spring\Spring.Template.Velocity.Castle.Tests\Spring.Template.Velocity.Castle.Tests.2010.csproj", "{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests", "test\Spring\Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests\Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.csproj", "{DE276F7C-4564-49EC-AABC-B964EC3D1626}"
 EndProject
 Global
@@ -579,7 +577,7 @@ Global
 		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Debug|Any CPU.Build.0 = Debug|Any CPU

.nuget/packages.config

@@ -111,6 +111,7 @@ Commandline Examples:
   <property name="spring.basedir" value="${project::get-base-directory()}"/>
   <property name="spring.nonredistdir" value="${spring.basedir}\..\..\nonredist"/>
   <property name="tool.dir" value="${project::get-base-directory()}\build-support\tools"/>
+  <property name="nuget.exe" value="${tool.dir}\NuGet\NuGet.exe"/>
 
   <!--Support for Windows XP in other languages. In Portuguese, for example, is "c:\Arquivos de Programs"-->
   <property name="programfiles" value="C:\Program Files"/>
@@ -319,77 +320,77 @@ Commandline Examples:
 
   <target name="restore-nuget-packages" description="Restores NuGet packages that solution(s) reference">
 	<exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore Spring.NET.2010.sln" 
 	  workingdir="."
 	  failonerror="true" />
 	<exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\Spring.Calculator\Spring.Calculator.2010.sln" 
 	  workingdir="."
 	  failonerror="true" />
 	<exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\Spring.CodeConfig.Migration\Spring.CodeConfig.Migration.2010.sln"
 	  workingdir="."
 	  failonerror="true" />
 	  <exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\Spring.Data.NHibernate.Northwind\Spring.Northwind.2010.sln" 
 	  workingdir="."
 	  failonerror="true" />
 	<exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2010.sln" 
 	  workingdir="."
 	  failonerror="true" />
 	<exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\Spring.IoCQuickStart.MovieFinder\Spring.IocQuickStart.MovieFinder.2010.sln" 
 	  workingdir="."
 	  failonerror="true" />
 	<exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\Spring.MsmqQuickStart\Spring.MsmqQuickStart.2010.sln" 
 	  workingdir="."
 	  failonerror="true" />	  
 	<exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\Spring.Mvc3QuickStart\Spring.Mvc3QuickStart.sln" 
 	  workingdir="."
 	  failonerror="true" />
 	<exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\Spring.Mvc4QuickStart\Spring.Mvc4QuickStart.sln" 
 	  workingdir="."
 	  failonerror="true" />
 	<exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\Spring.Mvc5QuickStart\Spring.Mvc5QuickStart.sln" 
 	  workingdir="."
 	  failonerror="true" />
 	<exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\Spring.NmsQuickStart\Spring.NmsQuickStart.2010.sln" 
 	  workingdir="."
 	  failonerror="true" />
 	 <exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\Spring.Scheduling.Quartz.Example\Spring.Scheduling.Quartz.Example.2010.sln" 
 	  workingdir="."
 	  failonerror="true" />
 	 <exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2010.sln" 
 	  workingdir="."
 	  failonerror="true" />
 	 <exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\Spring.WebQuickStart\Spring.WebQuickStart.2010.sln" 
 	  workingdir="."
 	  failonerror="true" />
 	  <exec 
-	  program=".nuget\nuget.exe"
+	  program="${nuget.exe}"
 	  commandline="restore ${spring.basedir}\examples\Spring\SpringAir\SpringAir.2010.sln" 
 	  workingdir="."
 	  failonerror="true" />
@@ -494,24 +495,21 @@ Commandline Examples:
     <property name="nh4.lib.dir" value="${spring.basedir}/packages/NHibernate.4.0.3.4000/lib/Net40"/>
     <property name="iesi4.lib.dir" value="${spring.basedir}/packages/Iesi.Collections.4.0.1.4000/lib/Net40"/>
     <property name="quartz2.lib.dir" value="${spring.basedir}/packages/Quartz.2.3.1/lib/net35"/>
-	<property name="nunit.lib.dir" value="${spring.basedir}/packages/NUnit.2.6.3/lib"/>
-	
+	<property name="nunit.lib.dir" value="${spring.basedir}/packages/NUnit.3.5.0/lib/net35"/>
 
 	<property name="common.logging.lib.dir" value="${spring.basedir}/packages/Common.Logging.3.0.0/lib/net35"/>
 	<property name="common.logging.core.lib.dir" value="${spring.basedir}/packages/Common.Logging.Core.3.0.0/lib/net35"/>
 
+	<!-- we use same libs for both 4.0 and 4.5 builds -->
 	<if test="${nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}">
 		<property name="common.logging.lib.dir" value="${spring.basedir}/packages/Common.Logging.3.0.0/lib/net40"/>
 		<property name="common.logging.core.lib.dir" value="${spring.basedir}/packages/Common.Logging.Core.3.0.0/lib/net40"/>
-	</if>
-	
-	<!-- we use same libs for both 4.0 and 4.5 builds -->
-	<if test="${nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}">
 		<property name="lib.dir" value="${spring.basedir}/lib/net/4.0"/>
+        <property name="nunit.lib.dir" value="${spring.basedir}/packages/NUnit.3.5.0/lib/net40"/>
 		<property name="quartz2.lib.dir" value="${spring.basedir}/packages/Quartz.2.3.1/lib/net40"/>
 	</if>
 
-	
+
 	<call target="copylibtobin"/>
 
     <!-- build assemblies -->
@@ -548,12 +546,13 @@ Commandline Examples:
 
     <nant buildfile="test/Spring/Spring.Data.NHibernate3.Tests/Spring.Data.NHibernate3.Tests.build" target="test" if="${build-data}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.build" target="test" if="${build-data}"/>
-    <nant buildfile="test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.build" target="test" if="${build-data}"/>
+    <nant buildfile="test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5')}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5' )}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5' )}"/>
 
-    <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
-    <nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web}"/>
+    <!-- newer NUnit runners cannot handle test properly, so running just the build target -->
+    <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="build" if="${build-services}"/>
+    <nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web and nant.settings.currentframework != 'net-3.5'}"/>
 	<nant buildfile="test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}"/>
 	<nant buildfile="test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}"/>
 	<nant buildfile="test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.5'}"/>