Xamarin fix Enum (#481)

* repro

* fix code

Author: StefH

System.Linq.Dynamic.Core.sln

@@ -76,7 +76,7 @@ protected Type ResolveTypeBySimpleName([NotNull] IEnumerable<Assembly> assemblie
             return null;
         }
 
-#if (WINDOWS_APP || DOTNET5_1 || UAP10_0 || NETSTANDARD)
+#if (WINDOWS_APP || UAP10_0 || NETSTANDARD)
         /// <summary>
         /// Gets the assembly types annotated with <see cref="DynamicLinqTypeAttribute"/> in an Exception friendly way.
         /// </summary>

src-android/TestSLDC/MainPage.xaml.cs

@@ -29,7 +29,7 @@ public Assembly[] GetAssemblies()
             return assemblies.ToArray();
         }
 
-#elif DOTNET5_1 || WINDOWS_APP || UAP10_0 || NETSTANDARD || WPSL
+#elif WINDOWS_APP || UAP10_0 || NETSTANDARD || WPSL
         public Assembly[] GetAssemblies()
         {
             throw new NotSupportedException();

src/System.Linq.Dynamic.Core/CustomTypeProviders/AbstractDynamicLinqCustomTypeProvider.cs

@@ -33,14 +33,14 @@ public static class DynamicClassFactory
         private static readonly CustomAttributeBuilder DebuggerHiddenAttributeBuilder = new CustomAttributeBuilder(typeof(DebuggerHiddenAttribute).GetConstructor(EmptyTypes), new object[0]);
 
         private static readonly ConstructorInfo ObjectCtor = typeof(object).GetConstructor(EmptyTypes);
-#if WINDOWS_APP || DOTNET5_1 || UAP10_0 || NETSTANDARD
+#if WINDOWS_APP ||  UAP10_0 || NETSTANDARD
         private static readonly MethodInfo ObjectToString = typeof(object).GetMethod("ToString", BindingFlags.Instance | BindingFlags.Public);
 #else
         private static readonly MethodInfo ObjectToString = typeof(object).GetMethod("ToString", BindingFlags.Instance | BindingFlags.Public, null, EmptyTypes, null);
 #endif
 
         private static readonly ConstructorInfo StringBuilderCtor = typeof(StringBuilder).GetConstructor(EmptyTypes);
-#if WINDOWS_APP || DOTNET5_1 || UAP10_0 || NETSTANDARD
+#if WINDOWS_APP ||  UAP10_0 || NETSTANDARD
         private static readonly MethodInfo StringBuilderAppendString = typeof(StringBuilder).GetMethod("Append", new[] { typeof(string) });
         private static readonly MethodInfo StringBuilderAppendObject = typeof(StringBuilder).GetMethod("Append", new[] { typeof(object) });
 #else
@@ -50,7 +50,7 @@ public static class DynamicClassFactory
 
         private static readonly Type EqualityComparer = typeof(EqualityComparer<>);
         private static readonly Type EqualityComparerGenericArgument = EqualityComparer.GetGenericArguments()[0];
-#if WINDOWS_APP || DOTNET5_1 || UAP10_0 || NETSTANDARD
+#if WINDOWS_APP ||  UAP10_0 || NETSTANDARD
         private static readonly MethodInfo EqualityComparerDefault = EqualityComparer.GetMethod("get_Default", BindingFlags.Static | BindingFlags.Public);
         private static readonly MethodInfo EqualityComparerEquals = EqualityComparer.GetMethod("Equals", new[] { EqualityComparerGenericArgument, EqualityComparerGenericArgument });
         private static readonly MethodInfo EqualityComparerGetHashCode = EqualityComparer.GetMethod("GetHashCode", new[] { EqualityComparerGenericArgument });

src/System.Linq.Dynamic.Core/DefaultAssemblyHelper.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-#if !(SILVERLIGHT || WINDOWS_APP || DOTNET5_1 || UAP10_0 || NETSTANDARD || PORTABLE || WPSL)
+#if !(SILVERLIGHT || WINDOWS_APP ||  UAP10_0 || NETSTANDARD || PORTABLE || WPSL)
 using System.Runtime.Serialization;
 #endif
 
@@ -9,7 +9,7 @@ namespace System.Linq.Dynamic.Core.Exceptions
     /// <summary>
     /// Represents errors that occur while parsing dynamic linq string expressions.
     /// </summary>
-#if !(SILVERLIGHT || WINDOWS_APP || DOTNET5_1 || UAP10_0 || NETSTANDARD || PORTABLE || WPSL || NETSTANDARD2_0)
+#if !(SILVERLIGHT || WINDOWS_APP ||  UAP10_0 || NETSTANDARD || PORTABLE || WPSL || NETSTANDARD2_0)
     [Serializable]
 #endif
     public sealed class ParseException : Exception
@@ -39,7 +39,7 @@ public override string ToString()
             return string.Format(CultureInfo.CurrentCulture, Res.ParseExceptionFormat, Message, Position);
         }
 
-#if !(SILVERLIGHT || WINDOWS_APP || DOTNET5_1 || UAP10_0 || NETSTANDARD || PORTABLE || WPSL || NETSTANDARD2_0)
+#if !(SILVERLIGHT || WINDOWS_APP ||  UAP10_0 || NETSTANDARD || PORTABLE || WPSL || NETSTANDARD2_0)
         ParseException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {

src/System.Linq.Dynamic.Core/DynamicClassFactory.cs

@@ -2064,7 +2064,7 @@ static Exception IncompatibleOperandsError(string opName, Expression left, Expre
 
         static MemberInfo FindPropertyOrField(Type type, string memberName, bool staticAccess, ParsingConfig ParsingConfig)
         {
-#if !(NETFX_CORE || WINDOWS_APP || DOTNET5_1 || UAP10_0 || NETSTANDARD)
+#if !(NETFX_CORE || WINDOWS_APP ||  UAP10_0 || NETSTANDARD)
             BindingFlags flags = BindingFlags.Public | BindingFlags.DeclaredOnly | (staticAccess ? BindingFlags.Static : BindingFlags.Instance);
             foreach (Type t in TypeHelper.GetSelfAndBaseTypes(type))
             {

src/System.Linq.Dynamic.Core/Exceptions/ParseException.cs

@@ -43,7 +43,7 @@ public virtual Expression Promote(Expression expr, Type type, bool exact, bool c
                         Type target = TypeHelper.GetNonNullableType(type);
                         object value = null;
 
-#if !(NETFX_CORE || WINDOWS_APP || DOTNET5_1 || UAP10_0 || NETSTANDARD)
+#if !(NETFX_CORE || WINDOWS_APP || UAP10_0 || NETSTANDARD)
                         switch (Type.GetTypeCode(ce.Type))
                         {
                             case TypeCode.Int32:
@@ -70,12 +70,14 @@ public virtual Expression Promote(Expression expr, Type type, bool exact, bool c
 #else
                         if (ce.Type == typeof(int) || ce.Type == typeof(uint) || ce.Type == typeof(long) || ce.Type == typeof(ulong))
                         {
-                            value = _numberParser.ParseNumber(text, target);
-
-                            // Make sure an enum value stays an enum value
+                            // If target is an enum value, just use the Value from the ConstantExpression
                             if (target.GetTypeInfo().IsEnum)
                             {
-                                value = Enum.ToObject(target, value);
+                                value = Enum.ToObject(target, ce.Value);
+                            }
+                            else
+                            {
+                                value = _numberParser.ParseNumber(text, target);
                             }
                         }
                         else if (ce.Type == typeof(double))

src/System.Linq.Dynamic.Core/Parser/ExpressionParser.cs

@@ -25,7 +25,7 @@ public object ParseNumber(string text, Type type)
         {
             try
             {
-#if !(NETFX_CORE || WINDOWS_APP || DOTNET5_1 || UAP10_0 || NETSTANDARD)
+#if !(NETFX_CORE || WINDOWS_APP || UAP10_0 || NETSTANDARD)
                 switch (Type.GetTypeCode(TypeHelper.GetNonNullableType(type)))
                 {
                     case TypeCode.SByte:

src/System.Linq.Dynamic.Core/Parser/ExpressionPromoter.cs

@@ -49,7 +49,7 @@ internal static class PredefinedTypesHelper
 
         static PredefinedTypesHelper()
         {
-#if !(NET35 || SILVERLIGHT || NETFX_CORE || WINDOWS_APP || DOTNET5_1 || UAP10_0 || NETSTANDARD)
+#if !(NET35 || SILVERLIGHT || NETFX_CORE || WINDOWS_APP ||  UAP10_0 || NETSTANDARD)
             //System.Data.Entity is always here, so overwrite short name of it with EntityFramework if EntityFramework is found.
             //EF5(or 4.x??), System.Data.Objects.DataClasses.EdmFunctionAttribute
             //There is also an System.Data.Entity, Version=3.5.0.0, but no Functions.