Skip to content

Commit 9ad1a75

Browse files
committed
Made NH3 the only supported version for 2.0 line
1 parent 7ec03ad commit 9ad1a75

39 files changed

+6602
-110901
lines changed

RakeFile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ namespace :source do
5656
end
5757

5858
task :nhibernate_version, :nhibernate_version do |t,args|
59-
args.with_defaults :nhibernate_version => ENV['nhibernate_version'] || '2.1'
59+
args.with_defaults :nhibernate_version => ENV['nhibernate_version'] || '3.0'
6060

6161
raise "Unknown NHibernate version #{args.nhibernate_version} (check your tools/NHibernate folder)" unless File.directory? "tools/NHibernate/#{args.nhibernate_version}"
6262

@@ -71,7 +71,7 @@ namespace :source do
7171

7272
desc 'Compile the source'
7373
msbuild :compile, [:nhibernate_version] => :nhibernate_version do |msb,args|
74-
args.with_defaults :nhibernate_version => ENV['nhibernate_version'] || '2.1'
74+
args.with_defaults :nhibernate_version => ENV['nhibernate_version'] || '3.0'
7575

7676
nh_version_precompiler_switch = 'NH' + args.nhibernate_version.gsub('.', '')
7777

src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -359,23 +359,13 @@ public Object NullSafeGet(IDataReader rs, string[] names, ISessionImplementor se
359359
return (first == null && second == null) ? null : new string[] { first, second };
360360
}
361361

362-
#if NH30
363362
public void NullSafeSet(IDbCommand st, Object value, int index, bool[] unknown, ISessionImplementor session)
364363
{
365364
DoubleString ds = value as DoubleString ?? new DoubleString();
366365

367366
NHibernateUtil.String.NullSafeSet(st, ds.s1, index, session);
368367
NHibernateUtil.String.NullSafeSet(st, ds.s2, index + 1, session);
369368
}
370-
#else
371-
public void NullSafeSet(IDbCommand st, Object value, int index, ISessionImplementor session)
372-
{
373-
DoubleString ds = value as DoubleString ?? new DoubleString();
374-
375-
NHibernateUtil.String.NullSafeSet(st, ds.s1, index, session);
376-
NHibernateUtil.String.NullSafeSet(st, ds.s2, index + 1, session);
377-
}
378-
#endif
379369

380370
public string[] PropertyNames
381371
{
-114 KB
Binary file not shown.

tools/NHibernate/2.1/Castle.Core.dll

-76 KB
Binary file not shown.

tools/NHibernate/2.1/Castle.Core.xml

Lines changed: 0 additions & 3197 deletions
This file was deleted.

tools/NHibernate/2.1/Castle.DynamicProxy.license.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.
-108 KB
Binary file not shown.

tools/NHibernate/2.1/Castle.DynamicProxy2.xml

Lines changed: 0 additions & 1249 deletions
This file was deleted.
-32 KB
Binary file not shown.

tools/NHibernate/2.1/Iesi.Collections.xml

Lines changed: 0 additions & 1903 deletions
This file was deleted.

0 commit comments

Comments
 (0)