Fix broken test

Author: maca88

src/NHibernate.Test/Linq/ParameterTypeLocatorTests.cs

@@ -415,7 +415,7 @@ private void AssertResult(
 					CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
 					var expressionText = pair.Key.ToString();
 					Assert.That(expectedResults.ContainsKey(expressionText), Is.True, $"{expressionText} constant is not expected");
-					Assert.That(expectedResults[expressionText](pair.Value.Type), Is.True, $"Invalid type, actual type: {pair.Value?.Name ?? "null"}");
+					Assert.That(expectedResults[expressionText](pair.Value.Type), Is.True, $"Invalid type, actual type: {pair.Value?.Type?.Name ?? "null"}");
 				}
 				finally
 				{

src/NHibernate/Linq/NhLinqExpression.cs

@@ -8,7 +8,6 @@
 using NHibernate.Linq.Visitors;
 using NHibernate.Param;
 using NHibernate.Type;
-using Remotion.Linq;
 
 namespace NHibernate.Linq
 {

src/NHibernate/Linq/Visitors/ExpressionKeyVisitor.cs

@@ -207,18 +207,19 @@ protected override Expression VisitMember(MemberExpression expression)
 			return expression;
 		}
 
+#if NETCOREAPP2_0
 		protected override Expression VisitInvocation(InvocationExpression expression)
 		{
 			if (ExpressionsHelper.TryGetDynamicMemberBinder(expression, out var memberBinder))
 			{
 				Visit(expression.Arguments[1]);
-				_string.Append(".");
-				_string.Append(memberBinder.Name);
+				FormatBinder(memberBinder);
 				return expression;
 			}
 
 			return base.VisitInvocation(expression);
 		}
+#endif
 
 		protected override Expression VisitMethodCall(MethodCallExpression expression)
 		{
@@ -279,8 +280,8 @@ protected override Expression VisitQuerySourceReference(Remotion.Linq.Clauses.Ex
 
 		protected override Expression VisitDynamic(DynamicExpression expression)
 		{
-			FormatBinder(expression.Binder);
 			Visit(expression.Arguments, AppendCommas);
+			FormatBinder(expression.Binder);
 			return expression;
 		}
 

src/NHibernate/Linq/Visitors/ExpressionParameterVisitor.cs

@@ -106,6 +106,7 @@ protected override Expression VisitMethodCall(MethodCallExpression expression)
 			return base.VisitMethodCall(expression);
 		}
 
+#if NETCOREAPP2_0
 		protected override Expression VisitInvocation(InvocationExpression expression)
 		{
 			if (ExpressionsHelper.TryGetDynamicMemberBinder(expression, out _))
@@ -117,6 +118,7 @@ protected override Expression VisitInvocation(InvocationExpression expression)
 
 			return base.VisitInvocation(expression);
 		}
+#endif
 
 		protected override Expression VisitConstant(ConstantExpression expression)
 		{

src/NHibernate/Linq/Visitors/HqlGeneratorExpressionVisitor.cs

@@ -226,13 +226,14 @@ private HqlTreeNode VisitNhNominated(NhNominatedExpression nhNominatedExpression
 
 		private HqlTreeNode VisitInvocationExpression(InvocationExpression expression)
 		{
+#if NETCOREAPP2_0
 			if (ExpressionsHelper.TryGetDynamicMemberBinder(expression, out var binder))
 			{
 				return _hqlTreeBuilder.Dot(
 					VisitExpression(expression.Arguments[1]).AsExpression(),
 					_hqlTreeBuilder.Ident(binder.Name));
 			}
-
+#endif
 			return VisitExpression(expression.Expression);
 		}
 

src/NHibernate/Linq/Visitors/ParameterTypeLocator.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Dynamic;
 using System.Linq.Expressions;
 using NHibernate.Engine;
 using NHibernate.Param;
@@ -289,9 +290,13 @@ private bool IsDynamicMember(Expression expression)
 			{
 				switch (expression)
 				{
+#if NETCOREAPP2_0
 					case InvocationExpression invocationExpression:
 						// session.Query<Product>().Where("Properties.Name == @0", "First Product")
 						return ExpressionsHelper.TryGetDynamicMemberBinder(invocationExpression, out _);
+#endif
+					case DynamicExpression dynamicExpression:
+						return dynamicExpression.Binder is GetMemberBinder;
 					case MethodCallExpression methodCallExpression:
 						// session.Query<Product>() where p.Properties["Name"] == "First Product" select p
 						return VisitorUtil.TryGetPotentialDynamicComponentDictionaryMember(methodCallExpression, out _);

src/NHibernate/Util/ExpressionsHelper.cs

@@ -16,6 +16,7 @@
 using NHibernate.Type;
 using Remotion.Linq.Clauses;
 using Remotion.Linq.Clauses.Expressions;
+using Remotion.Linq.Parsing;
 
 namespace NHibernate.Util
 {
@@ -31,6 +32,7 @@ public static MemberInfo DecodeMemberAccessExpression<TEntity, TResult>(Expressi
 			return ((MemberExpression)expression.Body).Member;
 		}
 
+#if NETCOREAPP2_0
 		/// <summary>
 		/// Try to retrieve <see cref="GetMemberBinder"/> from a reduced <see cref="ExpressionType.Dynamic"/> expression.
 		/// </summary>
@@ -39,7 +41,9 @@ public static MemberInfo DecodeMemberAccessExpression<TEntity, TResult>(Expressi
 		/// <returns>Whether the binder was found.</returns>
 		internal static bool TryGetDynamicMemberBinder(InvocationExpression expression, out GetMemberBinder memberBinder)
 		{
-			// This is an ugly workaround for dynamic expressions.
+			// This is an ugly workaround for dynamic expressions in .NET Core. In .NET Core a dynamic expression is reduced
+			// when first visited by a expression visitor that is not a DynamicExpressionVisitor, where in .NET Framework it is never reduced.
+			// As RelinqExpressionVisitor does not extend DynamicExpressionVisitor, we will always have a reduced dynamic expression in .NET Core.
 			// Unfortunately we can not tap into the expression tree earlier to intercept the dynamic expression
 			if (expression.Arguments.Count == 2 &&
 			    expression.Arguments[0] is ConstantExpression constant &&
@@ -53,6 +57,7 @@ constant.Value is CallSite site &&
 			memberBinder = null;
 			return false;
 		}
+#endif
 
 		/// <summary>
 		/// Check whether the given expression represent a variable.
@@ -659,6 +664,7 @@ protected override Expression VisitMember(MemberExpression node)
 				return base.Visit(node.Expression);
 			}
 
+#if NETCOREAPP2_0
 			protected override Expression VisitInvocation(InvocationExpression node)
 			{
 				if (TryGetDynamicMemberBinder(node, out var binder))
@@ -669,7 +675,21 @@ protected override Expression VisitInvocation(InvocationExpression node)
 					return base.Visit(node.Arguments[1]);
 				}
 
-				return base.Visit(node);
+				return base.VisitInvocation(node);
+			}
+#endif
+
+			protected override Expression VisitDynamic(DynamicExpression node)
+			{
+				if (node.Binder is GetMemberBinder binder)
+				{
+					_memberPaths.Push(new MemberMetadata(binder.Name, _convertType, _hasIndexer));
+					_convertType = null;
+					_hasIndexer = false;
+					return base.Visit(node.Arguments[0]);
+				}
+
+				return Visit(node);
 			}
 
 			protected override Expression VisitQuerySourceReference(QuerySourceReferenceExpression node)