NH-3944 - Fix nuspec template for Relinq migration

Author: hazzik

src/NHibernate/Linq/NhLinqExpression.cs

@@ -41,7 +41,7 @@ public NhLinqExpression(Expression expression, ISessionFactoryImplementor sessio
 			_constantToParameterMap = ExpressionParameterVisitor.Visit(ref _expression, sessionFactory);
 
 			ParameterValuesByName = _constantToParameterMap.Values.ToDictionary(p => p.Name,
-																				p => System.Tuple.Create(p.Value, p.Type));
+				p => System.Tuple.Create(p.Value, p.Type));
 
 			Key = ExpressionKeyVisitor.Visit(_expression, _constantToParameterMap);
 
@@ -62,15 +62,15 @@ public IASTNode Translate(ISessionFactoryImplementor sessionFactory, bool filter
 			var requiredHqlParameters = new List<NamedParameterDescriptor>();
 			var querySourceNamer = new QuerySourceNamer();
 			var queryModel = NhRelinqQueryParser.Parse(_expression);
-			var visitorParameters = new VisitorParameters(sessionFactory, _constantToParameterMap, requiredHqlParameters, querySourceNamer);
+			var visitorParameters = new VisitorParameters(sessionFactory, _constantToParameterMap, requiredHqlParameters, querySourceNamer, ReturnType);
 
-			ExpressionToHqlTranslationResults = QueryModelVisitor.GenerateHqlQuery(queryModel, visitorParameters, true, ReturnType);
+			ExpressionToHqlTranslationResults = QueryModelVisitor.GenerateHqlQuery(queryModel, visitorParameters, true);
 
 			if (ExpressionToHqlTranslationResults.ExecuteResultTypeOverride != null)
 				Type = ExpressionToHqlTranslationResults.ExecuteResultTypeOverride;
 
 			ParameterDescriptors = requiredHqlParameters.AsReadOnly();
-			
+
 			return ExpressionToHqlTranslationResults.Statement.AstNode;
 		}
 

src/NHibernate/Linq/Visitors/HqlGeneratorExpressionVisitor.cs

@@ -496,7 +496,7 @@ protected HqlTreeNode VisitConditionalExpression(ConditionalExpression expressio
 
 		protected HqlTreeNode VisitSubQueryExpression(SubQueryExpression expression)
 		{
-			ExpressionToHqlTranslationResults query = QueryModelVisitor.GenerateHqlQuery(expression.QueryModel, _parameters, false, null);
+			ExpressionToHqlTranslationResults query = QueryModelVisitor.GenerateHqlQuery(expression.QueryModel, _parameters, false);
 			return query.Statement;
 		}
 

src/NHibernate/Linq/Visitors/QueryModelVisitor.cs

@@ -21,8 +21,7 @@ namespace NHibernate.Linq.Visitors
 {
 	public class QueryModelVisitor : QueryModelVisitorBase
 	{
-		public static ExpressionToHqlTranslationResults GenerateHqlQuery(QueryModel queryModel, VisitorParameters parameters, bool root,
-			NhLinqExpressionReturnType? rootReturnType)
+		public static ExpressionToHqlTranslationResults GenerateHqlQuery(QueryModel queryModel, VisitorParameters parameters, bool root)
 		{
 			NestedSelectRewriter.ReWrite(queryModel, parameters);
 
@@ -81,14 +80,14 @@ public static ExpressionToHqlTranslationResults GenerateHqlQuery(QueryModel quer
 			// Identify and name query sources
 			QuerySourceIdentifier.Visit(parameters.QuerySourceNamer, queryModel);
 
-			var visitor = new QueryModelVisitor(parameters, root, queryModel, rootReturnType, result);
+			var visitor = new QueryModelVisitor(parameters, root, queryModel, result);
 			visitor.Visit();
 
 			return visitor._hqlTree.GetTranslation();
 		}
 
 		private readonly IntermediateHqlTree _hqlTree;
-		private readonly NhLinqExpressionReturnType? _rootReturnType;
+		private readonly NhLinqExpressionReturnType _rootReturnType;
 		private static readonly ResultOperatorMap ResultOperatorMap;
 		private bool _serverSide = true;
 
@@ -129,11 +128,11 @@ static QueryModelVisitor()
 		}
 
 		private QueryModelVisitor(VisitorParameters visitorParameters, bool root, QueryModel queryModel,
-            NhLinqExpressionReturnType? rootReturnType, ResultOperatorRewriterResult rewrittenOperatorResult)
+			ResultOperatorRewriterResult rewrittenOperatorResult)
 		{
 			VisitorParameters = visitorParameters;
 			Model = queryModel;
-			_rootReturnType = root ? rootReturnType : null;
+			_rootReturnType = visitorParameters.RootReturnType;
 			RewrittenOperatorResult = rewrittenOperatorResult;
 			_hqlTree = new IntermediateHqlTree(root);
 		}
@@ -146,7 +145,7 @@ private void Visit()
 
 		private void AddAdditionalPostExecuteTransformer()
 		{
-			if (_rootReturnType == NhLinqExpressionReturnType.Scalar && Model.ResultTypeOverride != null &&
+			if (_hqlTree.IsRoot && _rootReturnType == NhLinqExpressionReturnType.Scalar && Model.ResultTypeOverride != null &&
 				Model.SelectClause.Selector.NodeType == ExpressionType.Extension &&
 				Model.SelectClause.Selector is NhExpression nhExpression)
 			{

src/NHibernate/Linq/Visitors/VisitorParameters.cs

@@ -17,6 +17,8 @@ public class VisitorParameters
 
 		public QuerySourceNamer QuerySourceNamer { get; }
 
+		public NhLinqExpressionReturnType RootReturnType { get; }
+
 		private readonly HashSet<WhereClause> _havingClauses = new HashSet<WhereClause>();
 		private readonly HashSet<AdditionalFromClause> _leftJoins = new HashSet<AdditionalFromClause>();
 		private readonly HashSet<WhereClause> _withClauses = new HashSet<WhereClause>();
@@ -26,12 +28,14 @@ public VisitorParameters(
 			ISessionFactoryImplementor sessionFactory,
 			IDictionary<ConstantExpression, NamedParameter> constantToParameterMap,
 			List<NamedParameterDescriptor> requiredHqlParameters,
-			QuerySourceNamer querySourceNamer)
+			QuerySourceNamer querySourceNamer,
+			NhLinqExpressionReturnType rootReturnType)
 		{
 			SessionFactory = sessionFactory;
 			ConstantToParameterMap = constantToParameterMap;
 			RequiredHqlParameters = requiredHqlParameters;
 			QuerySourceNamer = querySourceNamer;
+			RootReturnType = rootReturnType;
 		}
 
 		/// <summary>

src/NHibernate/NHibernate.nuspec.template

@@ -15,7 +15,8 @@
     <dependencies>
       <!-- Bet that if there is ever an Iesi.Collections 5.0, it would be incompatible. -->
       <dependency id="Iesi.Collections" version="[4,5)" />
-      <dependency id="Remotion.Linq" version="[1.15.15,2)" />
+      <dependency id="Remotion.Linq" version="[2.1.1, 3)" />
+      <dependency id="Remotion.Linq.EagerFetching" version="[2.0.1, 3)" />
     </dependencies>
     <projectUrl>
       http://nhibernate.info
@@ -34,4 +35,4 @@
     <file src="NHibernateXmlConfigurationTemplates\*" target="ConfigurationTemplates" />
     <file src="..\..\..\src\NHibernate\**\*.cs" target="src" />
   </files>
-</package>
+</package>