Merge tag '4.0.4.GA'

# Conflicts: #	src/NHibernate/Impl/ExpressionProcessor.cs

Author: hazzik

build-common/common.xml

@@ -60,7 +60,7 @@
 effectively SP0).
 -->
 
-<property name="project.version" value="4.0.3.GA" overwrite="false" />
+<property name="project.version" value="4.0.4.GA" overwrite="false" />
 
 <!-- This version number should be changed if, but only if, there are incompatible
  changes compared to the previous version. -->

releasenotes.txt

@@ -1,6 +1,12 @@
-Build 4.0.3.GA
+Build 4.0.4.GA
 =============================
 
+** Bug
+ * [NH-3795] - C# compiler "Roslyn" regression
+
+
+Build 4.0.3.GA
+=============================
 
 ** Bug
  * [NH-2504] - Can't use Cacheable with Group By

src/NHibernate.Test/NHSpecificTest/NH3795/Fixture.cs

@@ -0,0 +1,137 @@
+using System.Collections;
+using NHibernate.DomainModel;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3795
+{
+/// <summary>
+/// Tests in this class only failed when the code was build with the Roslyn compiler which is included in Visual Studio 2015
+/// </summary>
+[TestFixture]
+public class Fixture : TestCase
+{
+protected Child childAliasField = null;
+protected A aAliasField = null;
+
+protected override IList Mappings
+{
+get { return new[] {"ParentChild.hbm.xml", "ABC.hbm.xml"}; }
+}
+
+[Test]
+public void TestFieldAliasInQueryOver()
+{
+using (var s = sessions.OpenSession())
+{
+A rowalias = null;
+s.QueryOver(() => aAliasField)
+.SelectList(list => list
+.Select(() => aAliasField.Id).WithAlias(() => rowalias.Id))
+.List();
+}
+}
+
+[Test]
+public void TestFieldAliasInQueryOverWithConversion()
+{
+using (var s = sessions.OpenSession())
+{
+B rowalias = null;
+s.QueryOver(() => aAliasField)
+.SelectList(list => list
+.Select(() => ((B)aAliasField).Count).WithAlias(() => rowalias.Count))
+.List();
+}
+}
+
+[Test]
+public void TestFieldAliasInJoinAlias()
+{
+using (var s = sessions.OpenSession())
+{
+Child rowalias = null;
+s.QueryOver<Parent>()
+.JoinAlias(p => p.Child, () => childAliasField)
+.SelectList(list => list
+.Select(() => childAliasField.Id).WithAlias(() => rowalias.Id))
+.List();
+}
+}
+
+[Test]
+public void TestFieldAliasInJoinQueryOver()
+{
+using (var s = sessions.OpenSession())
+{
+Child rowalias = null;
+s.QueryOver<Parent>()
+.JoinQueryOver(p => p.Child, () => childAliasField)
+.SelectList(list => list
+.Select(() => childAliasField.Id).WithAlias(() => rowalias.Id))
+.List();
+}
+}
+
+[Test]
+public void TestAliasInQueryOver()
+{
+Child childAlias = null;
+A aAlias = null;
+using (var s = sessions.OpenSession())
+{
+A rowalias = null;
+s.QueryOver(() => aAlias)
+.SelectList(list => list
+.Select(() => aAlias.Id).WithAlias(() => rowalias.Id))
+.List();
+}
+}
+
+[Test]
+public void TestAliasInQueryOverWithConversion()
+{
+Child childAlias = null;
+A aAlias = null;
+using (var s = sessions.OpenSession())
+{
+B rowalias = null;
+s.QueryOver(() => aAlias)
+.SelectList(list => list
+.Select(() => ((B) aAlias).Count).WithAlias(() => rowalias.Count))
+.List();
+}
+}
+
+[Test]
+public void TestAliasInJoinAlias()
+{
+Child childAlias = null;
+A aAlias = null;
+using (var s = sessions.OpenSession())
+{
+Child rowalias = null;
+s.QueryOver<Parent>()
+.JoinAlias(p => p.Child, () => childAlias)
+.SelectList(list => list
+.Select(() => childAlias.Id).WithAlias(() => rowalias.Id))
+.List();
+}
+}
+
+[Test]
+public void TestAliasInJoinQueryOver()
+{
+Child childAlias = null;
+A aAlias = null;
+using (var s = sessions.OpenSession())
+{
+Child rowalias = null;
+s.QueryOver<Parent>()
+.JoinQueryOver(p => p.Child, () => childAlias)
+.SelectList(list => list
+.Select(() => childAlias.Id).WithAlias(() => rowalias.Id))
+.List();
+}
+}
+}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -871,6 +871,7 @@
  <Compile Include="NHSpecificTest\NH3634\PersonMapper.cs" />
  <Compile Include="NHSpecificTest\NH3727\Entity.cs" />
  <Compile Include="NHSpecificTest\NH3727\FixtureByCode.cs" />
+ <Compile Include="NHSpecificTest\NH3795\Fixture.cs" />
  <Compile Include="NHSpecificTest\NH646\Domain.cs" />
  <Compile Include="NHSpecificTest\NH646\Fixture.cs" />
  <Compile Include="NHSpecificTest\NH3234\Fixture.cs" />

src/NHibernate/Impl/ExpressionProcessor.cs

@@ -4,7 +4,8 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-
+using System.Runtime.CompilerServices;
+using System.Text.RegularExpressions;
 using NHibernate.Criterion;
 using NHibernate.Util;
 using Expression = System.Linq.Expressions.Expression;
@@ -290,6 +291,21 @@ public static ProjectionInfo FindMemberProjection(Expression expression)
 return ProjectionInfo.ForProperty(FindMemberExpression(expression));
 }
 
+//http://stackoverflow.com/a/2509524/259946
+private static readonly Regex GeneratedMemberNameRegex = new Regex(@"^(CS\$)?<\w*>[1-9a-s]__[a-zA-Z]+[0-9]*$", RegexOptions.Compiled | RegexOptions.Singleline);
+
+private static bool IsCompilerGeneratedMemberExpressionOfCompilerGeneratedClass(Expression expression)
+{
+var memberExpression = expression as MemberExpression;
+if (memberExpression != null && memberExpression.Member.DeclaringType != null)
+{
+return Attribute.GetCustomAttribute(memberExpression.Member.DeclaringType, typeof(CompilerGeneratedAttribute)) != null 
+&& GeneratedMemberNameRegex.IsMatch(memberExpression.Member.Name);
+}
+
+return false;
+}
+
 /// <summary>
 /// Retrieves the name of the property from a member expression
 /// </summary>
@@ -314,6 +330,11 @@ public static string FindMemberExpression(Expression expression)
 return FindMemberExpression(parentExpression);
 }
 
+if (IsCompilerGeneratedMemberExpressionOfCompilerGeneratedClass(parentExpression))
+{
+return memberExpression.Member.Name;
+}
+
 return FindMemberExpression(parentExpression) + "." + memberExpression.Member.Name;
 }
 if (IsConversion(parentExpression.NodeType))