Merge pull request #1752 from lbargaoanu/VBProjectToParameters

Consider VB closures

Author: jbogard

src/AutoMapper/QueryableExtensions/ExpressionBuilder.cs

@@ -9,6 +9,7 @@
 
 namespace AutoMapper.QueryableExtensions
 {
+    using System.Runtime.CompilerServices;
     using Configuration;
     using Execution;
 
@@ -264,15 +265,21 @@ public ConstantExpressionReplacementVisitor(
 
             protected override Expression VisitMember(MemberExpression node)
             {
-                if (!node.Member.DeclaringType.Name.Contains("<>"))
-                    return base.VisitMember(node);
-
-                if (!_paramValues.ContainsKey(node.Member.Name))
+                if(!node.Member.DeclaringType.Has<CompilerGeneratedAttribute>())
+                {
                     return base.VisitMember(node);
-
-                return Expression.Convert(
-                    Expression.Constant(_paramValues[node.Member.Name]),
-                    node.Member.GetMemberType());
+                }
+                object parameterValue;
+                var parameterName = node.Member.Name;
+                if(!_paramValues.TryGetValue(parameterName, out parameterValue))
+                {
+                    const string VBPrefix = "$VB$Local_";
+                    if(!parameterName.StartsWith(VBPrefix, StringComparison.Ordinal) || !_paramValues.TryGetValue(parameterName.Substring(VBPrefix.Length), out parameterValue))
+                    {
+                        return base.VisitMember(node);
+                    }
+                }
+                return Convert(Constant(parameterValue), node.Member.GetMemberType());
             }
         }
 

src/AutoMapper/TypeExtensions.cs

@@ -10,7 +10,12 @@ namespace AutoMapper
 #endif
 
     internal static class TypeExtensions
-    {
+    {
+        public static bool Has<TAttribute>(this Type type) where TAttribute : Attribute
+        {
+            return type.GetTypeInfo().IsDefined(typeof(TAttribute), inherit: false);
+        }
+
         public static Type GetGenericTypeDefinitionIfGeneric(this Type type)
         {
             return type.IsGenericType() ? type.GetGenericTypeDefinition() : type;