From bf2fc3df7b0213258f743382e3c29db658f3210e Mon Sep 17 00:00:00 2001
From: lahma <marko.lahma@gmail.com>
Date: Fri, 24 Jul 2009 15:42:43 +0000
Subject: [PATCH] Set Spring.build to allow compilation on x64 machines with
 NAnt 0.86 (sysinfo failonerror=false) and fixed NHibernate test build file

---
 Spring.build                                                    | 2 +-
 .../Data/NHibernate/LocalSessionFactoryObjectTests.cs           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Spring.build b/Spring.build
index 6c1c0251..97dc8a8a 100644
--- a/Spring.build
+++ b/Spring.build
@@ -48,7 +48,7 @@ Build properties that may be set:
   <!-- change this to sync the sdk doc version generated -->
   <property name="package.version.docs" value="${package.version}" />
   <!-- make system environment variables available as NAnt properties -->
-  <sysinfo/>
+  <sysinfo failonerror="false" />
 
   <property name="project.company" value="SpringSource"/>
   <property name="project.copyright" value="Copyright 2002-2009 Spring.NET Framework Team."/>
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
index 43fa6730..6fc9cf4d 100644
--- a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
@@ -23,7 +23,9 @@
 using System.Collections;
 using System.IO;
 using NHibernate;
+#if NH_2_1
 using NHibernate.ByteCode.LinFu;
+#endif
 using NHibernate.Cfg;
 using NHibernate.Connection;
 using NHibernate.Dialect;