Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix build on .NET 1.1, removed NH.Search from the default build

SVN: branches/1.2.x@3136
  • Loading branch information...
commit d071e1c274404ac2b395f404c9ffe64f2f96572a 1 parent 2aac2ee
Sergey Koshcheyev authored
View
6 default.build
@@ -37,8 +37,11 @@
<include name="NHibernate.Mapping.Attributes/NHibernate.Mapping.Attributes.build" />
<include name="NHibernate.Mapping.Attributes.Test/NHibernate.Mapping.Attributes.Test.build" />
<include name="NHibernate.Tasks/NHibernate.Tasks.build" />
+ <!--
+ Removed until build works on .NET 1.1:
<include name="NHibernate.Search/NHibernate.Search.build" />
<include name="NHibernate.Search.Tests/NHibernate.Search.Tests.build" />
+ -->
<include name="NHibernate.Tool.hbm2net/NHibernate.Tool.hbm2net.build" />
<include name="NHibernate.Tool.hbm2net.Console/NHibernate.Tool.hbm2net.Console.build" />
<include name="NHibernate.Tool.hbm2net.Tests/NHibernate.Tool.hbm2net.Tests.build" />
@@ -58,7 +61,10 @@
<include name="NHibernate.Caches.SysCache.Tests/NHibernate.Caches.SysCache.Tests.build" />
<include name="NHibernate.Caches.Prevalence.Tests/NHibernate.Caches.Prevalence.Tests.build" />
<include name="NHibernate.Mapping.Attributes.Test/NHibernate.Mapping.Attributes.Test.build" />
+ <!--
+ Removed until build works on .NET 1.1:
<include name="NHibernate.Search.Tests/NHibernate.Search.Tests.build" />
+ -->
<include name="NHibernate.Tool.hbm2net.Tests/NHibernate.Tool.hbm2net.Tests.build" />
<include name="NHibernate.UserTypes.Tests/NHibernate.UserTypes.Tests.build" />
<include name="Nullables.Tests/Nullables.Tests.build" />
View
11 src/NHibernate/Dialect/MsSql2005Dialect.cs
@@ -137,7 +137,11 @@ public override SqlString GetLimitString(SqlString querySqlString, int offset, i
while ((currentIndex = selectString.IndexOf(",", lastIndex)) != -1)
{
string columnAndAlias = selectString.Substring(lastIndex, currentIndex - lastIndex);
+#if NET_2_0
int seperatorPosition = columnAndAlias.IndexOf(" as ", StringComparison.InvariantCultureIgnoreCase);
+#else
+ int seperatorPosition = columnAndAlias.ToLower(System.Globalization.CultureInfo.InvariantCulture).IndexOf(" as ");
+#endif
string columnOrAliasName;
if (seperatorPosition != -1)
{
@@ -179,7 +183,12 @@ private static int GetFromIndex(SqlString querySqlString)
int fromIndex = querySqlString.IndexOfCaseInsensitive(subselect);
if (fromIndex == -1)
{
- fromIndex = querySqlString.ToString().ToLowerInvariant().IndexOf(subselect.ToLowerInvariant());
+#if NET_2_0
+ fromIndex = querySqlString.ToString().IndexOf(subselect, StringComparison.InvariantCultureIgnoreCase);
+#else
+ fromIndex = querySqlString.ToString().ToLower(System.Globalization.CultureInfo.InvariantCulture)
+ .IndexOf(subselect.ToLower(System.Globalization.CultureInfo.InvariantCulture));
+#endif
}
return fromIndex;
}
View
13 src/NHibernate/Expression/InExpression.cs
@@ -112,11 +112,14 @@ public override TypedValue[] GetTypedValues(ICriteria criteria, ICriteriaQuery c
return (TypedValue[]) list.ToArray(typeof(TypedValue));
}
- public object[] Values
- {
- get { return _values; }
- protected set { _values = value; }
- }
+ public object[] Values
+ {
+ get { return _values; }
+#if NET_2_0
+ protected
+#endif
+ set { _values = value; }
+ }
/// <summary></summary>
public override string ToString()
Please sign in to comment.
Something went wrong with that request. Please try again.