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

SVN: branches/1.2.x@3136
nhibernate · Nov 24, 2007 · d071e1c · d071e1c
1 parent 2aac2ee
commit d071e1c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/default.build b/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" />

diff --git a/src/NHibernate/Dialect/MsSql2005Dialect.cs b/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;
 		}

diff --git a/src/NHibernate/Expression/InExpression.cs b/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()