Added dotnet5.4 (issue #6)

StefH · StefH · commit 8f797f0c53af · 2016-04-21T17:56:32.000+02:00
diff --git a/README.md b/README.md
@@ -7,8 +7,9 @@ The following frameworks are supported:
 - net40
 - net45x
 - net46x
-- dnxcore45x
+- dnx45x
 - dnxcore50
+- dotnet54
 
 <br>
 This fork takes the basic library to a new level.  Contains XML Documentation and examples on how to use Dynamic Linq. Also adds unit testing to help ensure that it works properly.
diff --git a/src/System.Linq.Dynamic.Core/AppDomain.cs b/src/System.Linq.Dynamic.Core/AppDomain.cs
@@ -1,4 +1,4 @@
-﻿#if DNXCORE50 || NETFX || NETSTANDARD
+﻿#if DNXCORE50 || DOTNET5_4 || NETFX || NETSTANDARD
 using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -23,7 +23,7 @@ public Assembly[] GetAssemblies()
         {
             return new List<Assembly>().ToArray(); // TODO
         }
-#elif DNXCORE50
+#elif DNXCORE50 || DOTNET5_4
         public Assembly[] GetAssemblies()
         {
             var assemblyNames = PlatformServices.Default.LibraryManager.GetLibraries().SelectMany(lib => lib.Assemblies).Distinct().ToArray();
diff --git a/src/System.Linq.Dynamic.Core/GroupResult.cs b/src/System.Linq.Dynamic.Core/GroupResult.cs
@@ -10,7 +10,7 @@ namespace System.Linq.Dynamic.Core
     public class GroupResult
     {
         /// <summary>
-        /// The key value of the group. (TODO : check for DNXCORE50)
+        /// The key value of the group. (TODO : check for DNXCORE50 || DOTNET5_4)
         /// </summary>
 #if NET35
         public object Key { get; internal set; }
diff --git a/src/System.Linq.Dynamic.Core/project.json b/src/System.Linq.Dynamic.Core/project.json
@@ -8,7 +8,7 @@
     "owners": [ "Stef Heyenrath" ],
     "projectUrl": "https://github.com/StefH/System.Linq.Dynamic.Core",
     "licenseUrl": "https://github.com/StefH/System.Linq.Dynamic.Core/blob/master/licence.txt",
-    "releaseNotes": "Fixed issue #1, #2 and #4",
+    "releaseNotes": "Fixed issues",
 
     "compilationOptions": {
     },
@@ -92,6 +92,38 @@
 
                 "System.Threading": "4.0.11-beta-*"
             }
+        },
+        "dotnet54": {
+            "dependencies": {
+                "Microsoft.CSharp": "4.0.1-beta-*",
+
+                "System.Collections.Concurrent": "4.0.11-beta-*",
+
+                "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final",
+
+                "System.Runtime.Extensions": "4.0.11-beta-*",
+                "System.Runtime.InteropServices": "4.0.21-beta-*",
+                "System.Runtime.Loader": "4.0.0-beta-*",
+
+                "System.Runtime.Serialization.Primitives": "4.1.0-beta-*",
+                "System.Runtime.Serialization.Xml": "4.1.0-beta-*",
+
+                "System.Reflection.Primitives": "4.0.1-beta-*",
+                "System.Reflection.TypeExtensions": "4.1.0-beta-*",
+                "System.Reflection.Emit": "4.0.1-beta-*",
+
+                "System.Linq": "4.0.1-beta-*",
+                "System.Linq.Expressions": "4.0.11-beta-*",
+                "System.Linq.Queryable": "4.0.1-beta-*",
+
+                "System.Globalization": "4.0.11-beta-*",
+
+                "System.Diagnostics.Debug": "4.0.11-beta-*",
+                "System.Diagnostics.Tools": "4.0.1-beta-*",
+                "System.Diagnostics.Tracing": "4.0.21-beta-*",
+
+                "System.Threading": "4.0.11-beta-*"
+            }
         }
     }
 }
diff --git a/test/System.Linq.Dynamic.Core.Tests/BasicTests.cs b/test/System.Linq.Dynamic.Core.Tests/BasicTests.cs
@@ -234,7 +234,7 @@ public void First_AsStringExpression()
             var testResult = testListQry.OrderBy("Roles.First().Name").Select("Id");
 
             //Assert
-#if NET35 || DNX452 || DNXCORE50
+#if NET35 || DNX452 || DNXCORE50 || DOTNET5_4
             Assert.Equal(realResult, testResult.Cast<Guid>().ToArray());
 #else
             Assert.Equal(realResult, testResult.ToDynamicArray().Cast<Guid>());
@@ -254,7 +254,7 @@ public void Single_AsStringExpression()
             var testResult = testListQry.OrderBy("Roles.Single().Name").Select("Id");
 
             //Assert
-#if NET35 || DNX452 || DNXCORE50
+#if NET35 || DNX452 || DNXCORE50 || DOTNET5_4
             Assert.Equal(realResult, testResult.Cast<Guid>().ToArray());
 #else
             Assert.Equal(realResult, testResult.ToDynamicArray());
diff --git a/test/System.Linq.Dynamic.Core.Tests/DynamicTests.cs b/test/System.Linq.Dynamic.Core.Tests/DynamicTests.cs
@@ -186,7 +186,7 @@ public void Select()
             //Assert
             Assert.Equal(range.Select(x => x * x).ToArray(), rangeResult.Cast<int>().ToArray());
 
-#if NET35 || DNXCORE50
+#if NET35 || DNXCORE50 || DOTNET5_4
             Assert.Equal(testList.Select(x => x.UserName).ToArray(), userNames.AsEnumerable().Cast<string>().ToArray());
             Assert.Equal(
                 testList.Select(x => "{ UserName = " + x.UserName + ", MyFirstName = " + x.Profile.FirstName + " }").ToArray(),
@@ -348,7 +348,7 @@ public void Join()
             //Assert
             var realResult = realQuery.ToArray();
 
-#if DNXCORE50
+#if DNXCORE50 || DOTNET5_4
             var dynamicResult = dynamicQuery.ToDynamicArray<DynamicClass>();
 
             Assert.Equal(realResult.Length, dynamicResult.Length);
diff --git a/test/System.Linq.Dynamic.Core.Tests/InternalTests.cs b/test/System.Linq.Dynamic.Core.Tests/InternalTests.cs
@@ -1,12 +1,12 @@
-﻿#if !(NET35 || NET452 || DNX452 || DNXCORE50 || NETSTANDARD)
+﻿#if !(NET35 || NET452 || DNX452 || DNXCORE50 || DOTNET5_4 || NETSTANDARD)
 using System.Threading.Tasks;
 #endif
 
 namespace System.Linq.Dynamic.Core.Tests
 {
     public class InternalTests
     {
-#if !(NET452 || NET35|| DNX452 || DNXCORE50 || NETSTANDARD)
+#if !(NET452 || NET35|| DNX452 || DNXCORE50 || DOTNET5_4 || NETSTANDARD)
         [Fact]
         public void ClassFactory_LoadTest()
         {
diff --git a/test2/DynamicLib/DynamicClassFactory.cs b/test2/DynamicLib/DynamicClassFactory.cs
@@ -26,14 +26,14 @@ public static class DynamicClassFactory
         private static readonly CustomAttributeBuilder DebuggerHiddenAttributeBuilder = new CustomAttributeBuilder(typeof(DebuggerHiddenAttribute).GetConstructor(Type.EmptyTypes), new object[0]);
 
         private static readonly ConstructorInfo ObjectCtor = typeof(object).GetConstructor(Type.EmptyTypes);
-#if DNXCORE50
+#if DNXCORE50 || DOTNET5_4
         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, Type.EmptyTypes, null);
 #endif
 
         private static readonly ConstructorInfo StringBuilderCtor = typeof(StringBuilder).GetConstructor(Type.EmptyTypes);
-#if DNXCORE50
+#if DNXCORE50 || DOTNET5_4
         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
@@ -43,7 +43,7 @@ public static class DynamicClassFactory
 
         private static readonly Type EqualityComparer = typeof(EqualityComparer<>);
 
-#if DNXCORE50
+#if DNXCORE50 || DOTNET5_4
         private static readonly Type EqualityComparerGenericArgument = TypeExtensions.GetGenericArguments(EqualityComparer)[0];
         private static readonly MethodInfo EqualityComparerDefault = EqualityComparer.GetMethod("get_Default", BindingFlags.Static | BindingFlags.Public);
         private static readonly MethodInfo EqualityComparerEquals = EqualityComparer.GetMethod("Equals", new[] { EqualityComparerGenericArgument, EqualityComparerGenericArgument });
@@ -254,7 +254,7 @@ public static Type CreateType(IList<DynamicProperty> properties)
 
                         for (int i = 0; i < names.Length; i++)
                         {
-#if DNXCORE50
+#if DNXCORE50 || DOTNET5_4
                             Type equalityComparerT = EqualityComparer.MakeGenericType(generics[i].AsType());
 #else
                             Type equalityComparerT = EqualityComparer.MakeGenericType(generics[i]);
@@ -290,7 +290,7 @@ public static Type CreateType(IList<DynamicProperty> properties)
                             ilgeneratorToString.Emit(OpCodes.Ldloc_0);
                             ilgeneratorToString.Emit(OpCodes.Ldarg_0);
                             ilgeneratorToString.Emit(OpCodes.Ldfld, fields[i]);
-#if DNXCORE50
+#if DNXCORE50 || DOTNET5_4
                             ilgeneratorToString.Emit(OpCodes.Box, generics[i].AsType());
 #else
                             ilgeneratorToString.Emit(OpCodes.Box, generics[i]);
@@ -333,7 +333,7 @@ public static Type CreateType(IList<DynamicProperty> properties)
                         ilgeneratorToString.Emit(OpCodes.Callvirt, ObjectToString);
                         ilgeneratorToString.Emit(OpCodes.Ret);
 
-#if DNXCORE50
+#if DNXCORE50 || DOTNET5_4
                         type = tb.CreateTypeInfo().AsType();
 #else
                         type = tb.CreateType();

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if DNXCORE50 \|\| NETFX \|\| NETSTANDARD`
	`1`	`+#if DNXCORE50 \|\| DOTNET5_4 \|\| NETFX \|\| NETSTANDARD`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Reflection;`
`4`	`4`	`using System.Reflection.Emit;`
`@@ -23,7 +23,7 @@ public Assembly[] GetAssemblies()`
`23`	`23`	`{`
`24`	`24`	`return new List<Assembly>().ToArray(); // TODO`
`25`	`25`	`}`
`26`		`-#elif DNXCORE50`
	`26`	`+#elif DNXCORE50 \|\| DOTNET5_4`
`27`	`27`	`public Assembly[] GetAssemblies()`
`28`	`28`	`{`
`29`	`29`	`var assemblyNames = PlatformServices.Default.LibraryManager.GetLibraries().SelectMany(lib => lib.Assemblies).Distinct().ToArray();`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace System.Linq.Dynamic.Core`
`10`	`10`	`public class GroupResult`
`11`	`11`	`{`
`12`	`12`	`/// <summary>`
`13`		`- /// The key value of the group. (TODO : check for DNXCORE50)`
	`13`	`+ /// The key value of the group. (TODO : check for DNXCORE50 \|\| DOTNET5_4)`
`14`	`14`	`/// </summary>`
`15`	`15`	`#if NET35`
`16`	`16`	`public object Key { get; internal set; }`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`		`-#if !(NET35 \|\| NET452 \|\| DNX452 \|\| DNXCORE50 \|\| NETSTANDARD)`
	`1`	`+#if !(NET35 \|\| NET452 \|\| DNX452 \|\| DNXCORE50 \|\| DOTNET5_4 \|\| NETSTANDARD)`
`2`	`2`	`using System.Threading.Tasks;`
`3`	`3`	`#endif`
`4`	`4`
`5`	`5`	`namespace System.Linq.Dynamic.Core.Tests`
`6`	`6`	`{`
`7`	`7`	`public class InternalTests`
`8`	`8`	`{`
`9`		`-#if !(NET452 \|\| NET35\|\| DNX452 \|\| DNXCORE50 \|\| NETSTANDARD)`
	`9`	`+#if !(NET452 \|\| NET35\|\| DNX452 \|\| DNXCORE50 \|\| DOTNET5_4 \|\| NETSTANDARD)`
`10`	`10`	`[Fact]`
`11`	`11`	`public void ClassFactory_LoadTest()`
`12`	`12`	`{`