Add Concat, Union, Except and Intersect

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

@@ -26,7 +26,7 @@ namespace System.Linq.Dynamic.Core
     public static class DynamicQueryableExtensions
     {
 #if !(WINDOWS_APP45x || SILVERLIGHT)
-        private static readonly TraceSource TraceSource = new TraceSource(typeof(DynamicQueryableExtensions).Name);
+        private static readonly TraceSource TraceSource = new TraceSource(nameof(DynamicQueryableExtensions));
 #endif
 
         private static Expression OptimizeExpression(Expression expression)
@@ -76,7 +76,7 @@ public static object Aggregate([NotNull] this IQueryable source, [NotNull] strin
             {
                 ParameterInfo lastParameter = m.GetParameters().LastOrDefault();
 
-                return lastParameter != null ? TypeHelper.GetUnderlyingType(lastParameter.ParameterType) == property.PropertyType : false;
+                return lastParameter != null && TypeHelper.GetUnderlyingType(lastParameter.ParameterType) == property.PropertyType;
             });
 
             // Sum, Average

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

@@ -1836,7 +1836,7 @@ Expression ParseEnumerable(Expression instance, Type elementType, string methodN
             }
             else
             {
-                if (new[] { "Contains", "Take", "Skip", "DefaultIfEmpty" }.Contains(methodName))
+                if (new[] { "Concat", "Contains", "DefaultIfEmpty", "Except", "Intersect", "Skip", "Take", "Union" }.Contains(methodName))
                 {
                     args = new[] { instance, args[0] };
                 }

src/System.Linq.Dynamic.Core/Parser/SupportedMethods/IEnumerableSignatures.cs

@@ -1,4 +1,6 @@
-namespace System.Linq.Dynamic.Core.Parser.SupportedMethods
+using System.Collections;
+
+namespace System.Linq.Dynamic.Core.Parser.SupportedMethods
 {
     internal interface IEnumerableSignatures
     {
@@ -17,18 +19,21 @@ internal interface IEnumerableSignatures
         void Average(long selector);
         void Cast(string type);
         void Cast(Type type);
+        void Concat(IEnumerable enumerable);
         void Contains(object selector);
         void Count();
         void Count(bool predicate);
         void DefaultIfEmpty();
         void DefaultIfEmpty(object defaultValue);
         void Distinct();
+        void Except(IEnumerable enumerable);
         void First();
         void First(bool predicate);
         void FirstOrDefault();
         void FirstOrDefault(bool predicate);
         void GroupBy(object keySelector);
         void GroupBy(object keySelector, object elementSelector);
+        void Intersect(IEnumerable enumerable);
         void Last();
         void Last(bool predicate);
         void LastOrDefault();
@@ -63,6 +68,7 @@ internal interface IEnumerableSignatures
         void TakeWhile(bool predicate);
         void ThenBy(object selector);
         void ThenByDescending(object selector);
+        void Union(IEnumerable enumerable);
         void Where(bool predicate);
 
         // Executors

src/System.Linq.Dynamic.Core/Parser/SupportedMethods/IQueryableSignatures.cs

@@ -1,4 +1,6 @@
-namespace System.Linq.Dynamic.Core.Parser.SupportedMethods
+using System.Collections;
+
+namespace System.Linq.Dynamic.Core.Parser.SupportedMethods
 {
     internal interface IQueryableSignatures
     {
@@ -15,19 +17,22 @@ internal interface IQueryableSignatures
         void Average(int selector);
         void Average(long? selector);
         void Average(long selector);
+        void Concat(IEnumerable enumerable);
         void Cast(string type);
         void Cast(Type type);
         void Count();
         void Count(bool predicate);
         void DefaultIfEmpty();
         void DefaultIfEmpty(object defaultValue);
         void Distinct();
+        void Except(IEnumerable enumerable);
         void First();
         void First(bool predicate);
         void FirstOrDefault();
         void FirstOrDefault(bool predicate);
         void GroupBy(object keySelector);
         void GroupBy(object keySelector, object elementSelector);
+        void Intersect(IEnumerable enumerable);
         void Last();
         void Last(bool predicate);
         void LastOrDefault();
@@ -62,6 +67,7 @@ internal interface IQueryableSignatures
         void TakeWhile(bool predicate);
         void ThenBy(object selector);
         void ThenByDescending(object selector);
+        void Union(IEnumerable enumerable);
         void Where(bool predicate);
     }
 }

test/System.Linq.Dynamic.Core.Tests/Parser/ExpressionParserTests.TypeAccess.cs

@@ -54,8 +54,6 @@ public void ParseTypeAccess_Via_Constructor_String_To_DateTime_Valid()
 
         [Theory]
         [InlineData(null)]
-        [InlineData(1.1d)]
-        [InlineData(1.1f)]
         [InlineData("\"abc\"")]
         public void ParseTypeAccess_Via_Constructor_Any_To_DateTime_Invalid(object any)
         {

test/System.Linq.Dynamic.Core.Tests/QueryableTests.Concat.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using FluentAssertions;
+using Xunit;
+
+namespace System.Linq.Dynamic.Core.Tests
+{
+    public partial class QueryableTests
+    {
+        [Fact]
+        public void Concat_Dynamic_ListOfStrings()
+        {
+            // Arrange
+            var list1 = new List<bool> { true };
+            var list2 = new List<string> { "User3", "User4" };
+            var list3 = new List<string> { "User5", "User6", "User7" };
+
+            // Act
+            var testQuery = list1.AsQueryable().Select("@0.Concat(@1).ToList()", list2, list3);
+
+            // Assert
+            var result = testQuery.ToDynamicArray<List<string>>();
+            result.First().Should().BeEquivalentTo(list2.Concat(list3));
+        }
+    }
+}

test/System.Linq.Dynamic.Core.Tests/QueryableTests.Except.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using FluentAssertions;
+using Xunit;
+
+namespace System.Linq.Dynamic.Core.Tests
+{
+    public partial class QueryableTests
+    {
+        [Fact]
+        public void Except_Dynamic_ListOfStrings()
+        {
+            // Arrange
+            var list1 = new List<bool> { true };
+            var list2 = new List<string> { "User3", "User4" };
+            var list3 = new List<string> { "User3", "User6", "User7" };
+
+            // Act
+            var testQuery = list1.AsQueryable().Select("@0.Except(@1).ToList()", list2, list3);
+
+            // Assert
+            var result = testQuery.ToDynamicArray<List<string>>();
+            result.First().Should().BeEquivalentTo(list2.Except(list3));
+        }
+    }
+}

test/System.Linq.Dynamic.Core.Tests/QueryableTests.Intersect.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using FluentAssertions;
+using Xunit;
+
+namespace System.Linq.Dynamic.Core.Tests
+{
+    public partial class QueryableTests
+    {
+        [Fact]
+        public void Intersect_Dynamic_ListOfStrings()
+        {
+            // Arrange
+            var list1 = new List<bool> { true };
+            var list2 = new List<string> { "User3", "User4" };
+            var list3 = new List<string> { "User3", "User6", "User7" };
+
+            // Act
+            var testQuery = list1.AsQueryable().Select("@0.Intersect(@1).ToList()", list2, list3);
+
+            // Assert
+            var result = testQuery.ToDynamicArray<List<string>>();
+            result.First().Should().BeEquivalentTo(list2.Intersect(list3));
+        }
+    }
+}

test/System.Linq.Dynamic.Core.Tests/QueryableTests.Union.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using FluentAssertions;
+using Xunit;
+
+namespace System.Linq.Dynamic.Core.Tests
+{
+    public partial class QueryableTests
+    {
+        [Fact]
+        public void Union_Dynamic_ListOfStrings()
+        {
+            // Arrange
+            var list1 = new List<bool> { true };
+            var list2 = new List<string> { "User3", "User4" };
+            var list3 = new List<string> { "User3", "User6", "User7" };
+
+            // Act
+            var testQuery = list1.AsQueryable().Select("@0.Union(@1).ToList()", list2, list3);
+
+            // Assert
+            var result = testQuery.ToDynamicArray<List<string>>();
+            result.First().Should().BeEquivalentTo(list2.Union(list3));
+        }
+    }
+}

version.xml

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <PatchVersion>9</PatchVersion>
+    <PatchVersion>10-preview-01</PatchVersion>
   </PropertyGroup>
 </Project>