NH-3807 - Handle new overloads of String.Trim*() in .NET Core 2.0.

Author: ngbrown

src/NHibernate.Test/Async/Linq/FunctionTests.cs

@@ -323,6 +323,11 @@ public async Task TrimAsync()
 				Assert.AreEqual(1, await (session.Query<AnotherEntity>().CountAsync(e => e.Input.TrimStart('h') == "eh")));
 				Assert.AreEqual(1, await (session.Query<AnotherEntity>().CountAsync(e => e.Input.TrimEnd('h') == "he")));
 
+				// Check when passed as array (new overloads in .NET Core App 2.0).
+				Assert.AreEqual(1, await (session.Query<AnotherEntity>().CountAsync(e => e.Input.Trim(new [] { 'h' }) == "e")));
+				Assert.AreEqual(1, await (session.Query<AnotherEntity>().CountAsync(e => e.Input.TrimStart(new[] { 'h' }) == "eh")));
+				Assert.AreEqual(1, await (session.Query<AnotherEntity>().CountAsync(e => e.Input.TrimEnd(new[] { 'h' }) == "he")));
+
 				// Let it rollback to get rid of temporary changes.
 			}
 		}

src/NHibernate.Test/Linq/FunctionTests.cs

@@ -305,6 +305,11 @@ public void Trim()
 				Assert.AreEqual(1, session.Query<AnotherEntity>().Count(e => e.Input.TrimStart('h') == "eh"));
 				Assert.AreEqual(1, session.Query<AnotherEntity>().Count(e => e.Input.TrimEnd('h') == "he"));
 
+				// Check when passed as array (new overloads in .NET Core App 2.0).
+				Assert.AreEqual(1, session.Query<AnotherEntity>().Count(e => e.Input.Trim(new [] { 'h' }) == "e"));
+				Assert.AreEqual(1, session.Query<AnotherEntity>().Count(e => e.Input.TrimStart(new[] { 'h' }) == "eh"));
+				Assert.AreEqual(1, session.Query<AnotherEntity>().Count(e => e.Input.TrimEnd(new[] { 'h' }) == "he"));
+
 				// Let it rollback to get rid of temporary changes.
 			}
 		}

src/NHibernate/Linq/Functions/StringGenerator.cs

@@ -6,6 +6,7 @@
 using NHibernate.Hql.Ast;
 using NHibernate.Linq.Visitors;
 using NHibernate.Util;
+using System.Linq;
 
 namespace NHibernate.Linq.Functions
 {
@@ -241,13 +242,7 @@ public class TrimGenerator : BaseHqlGeneratorForMethod
 	{
 		public TrimGenerator()
 		{
-			SupportedMethods = new[]
-									{
-										ReflectHelper.GetMethodDefinition<string>(s => s.Trim()),
-										ReflectHelper.GetMethodDefinition<string>(s => s.Trim('a')),
-										ReflectHelper.GetMethodDefinition<string>(s => s.TrimStart('a')),
-										ReflectHelper.GetMethodDefinition<string>(s => s.TrimEnd('a'))
-									};
+			SupportedMethods = typeof(string).GetMethods().Where(x => new[] { "Trim", "TrimStart", "TrimEnd" }.Contains(x.Name)).ToArray();
 		}
 
 		public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, ReadOnlyCollection<Expression> arguments, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
@@ -262,8 +257,20 @@ public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject,
 
 			string trimChars = "";
 			if (method.GetParameters().Length > 0)
-				foreach (char c in (char[])((ConstantExpression)arguments[0]).Value)
-					trimChars += c;
+			{
+				object argumentValue = ((ConstantExpression)arguments[0]).Value;
+				if (argumentValue is char)
+				{
+					trimChars += (char)argumentValue;
+				}
+				else
+				{
+					foreach (char c in (char[])argumentValue)
+					{
+						trimChars += c;
+					}
+				}
+			}
 
 
 			if (trimChars == "")