Updated NHibernate 3.x assemblies to 3.2

Author: jagregory

RakeFile

@@ -3,6 +3,8 @@ gem 'albacore', '=0.2.4'
 require 'albacore'
 require 'tools/albacore/nuspec_patch'
 
+NH_VERSION = '3.x'
+
 def get_version
   ENV['BUILD_NUMBER'] || '1.3.0.0'
 end
@@ -57,7 +59,7 @@ namespace :source do
   end
 
   task :nhibernate_version, :nhibernate_version do |t,args|
-	args.with_defaults :nhibernate_version => ENV['nhibernate_version'] || '2.1'
+	args.with_defaults :nhibernate_version => ENV['nhibernate_version'] || NH_VERSION
 
 	raise "Unknown NHibernate version #{args.nhibernate_version} (check your tools/NHibernate folder)" unless File.directory? "tools/NHibernate/#{args.nhibernate_version}"
 
@@ -72,7 +74,7 @@ namespace :source do
 
   desc 'Compile the source'
   msbuild :compile, [:nhibernate_version] => :nhibernate_version do |msb,args|
-	args.with_defaults :nhibernate_version => ENV['nhibernate_version'] || '2.1'
+	args.with_defaults :nhibernate_version => ENV['nhibernate_version'] || NH_VERSION
 
 	nh_version_precompiler_switch = 'NH' +  args.nhibernate_version.gsub('.', '')
 

src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs

@@ -359,16 +359,16 @@ public Object NullSafeGet(IDataReader rs, string[] names, ISessionImplementor se
             return (first == null && second == null) ? null : new string[] { first, second };
         }
 
-#if NH3x
-        public void NullSafeSet(IDbCommand st, Object value, int index, bool[] unknown, ISessionImplementor session)
+#if NH21
+        public void NullSafeSet(IDbCommand st, Object value, int index, ISessionImplementor session)
         {
             DoubleString ds = value as DoubleString ?? new DoubleString();
 
             NHibernateUtil.String.NullSafeSet(st, ds.s1, index, session);
             NHibernateUtil.String.NullSafeSet(st, ds.s2, index + 1, session);
         }
 #else
-        public void NullSafeSet(IDbCommand st, Object value, int index, ISessionImplementor session)
+        public void NullSafeSet(IDbCommand st, Object value, int index, bool[] unknown, ISessionImplementor session)
         {
             DoubleString ds = value as DoubleString ?? new DoubleString();
 

src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhere.cs

@@ -7,15 +7,19 @@ public class SQLAnywhereConfiguration : PersistenceConfiguration<SQLAnywhereConf
     {
         protected SQLAnywhereConfiguration()
         {
-            Driver<ASA10ClientDriver>();
+#if NH21
+            Driver<ASA10ClientDriver>();
+#else
+            Driver<SybaseSQLAnywhereDriver>();
+#endif
         }
 
         public static SQLAnywhereConfiguration SQLAnywhere9
         {
             get { return new SQLAnywhereConfiguration().Dialect<SybaseASA9Dialect>(); }
         }
 
-#if NH3x
+#if !NH21
         public static SQLAnywhereConfiguration SQLAnywhere10
         {
             get { return new SQLAnywhereConfiguration().Dialect<SybaseSQLAnywhere10Dialect>(); }