#192 (#207)

* appveyor. Fix zip name for signed artifacts

* #192 Upgrade DynamicLinq refference

Author: b0bi79

ClosedXML.Report/ClosedXML.Report.csproj

@@ -61,8 +61,8 @@
   <ItemGroup>
     <PackageReference Include="ClosedXML.Signed" Version="0.95.0" Condition="'$(Configuration)'=='Release.Signed'" />
     <PackageReference Include="ClosedXML" Version="0.95.0" Condition="'$(Configuration)'!='Release.Signed'" />
-    <PackageReference Include="morelinq" Version="2.9.0" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.1.1" />
+    <PackageReference Include="morelinq" Version="2.10.0" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.10" />
   </ItemGroup>
 
 </Project>

tests/ClosedXML.Report.Tests/ClosedXML.Report.Tests.csproj

@@ -36,7 +36,7 @@
     <PackageReference Include="linq2db.t4models" Version="1.0.7.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NSubstitute" Version="1.10.0.0" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.1.1" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.10" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.assert" Version="2.4.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />

tests/ClosedXML.Report.Tests/FormulaEvaluatorTests.cs

@@ -1,6 +1,8 @@
 using ClosedXML.Report.Utils;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Linq.Dynamic.Core.CustomTypeProviders;
 using System.Linq.Dynamic.Core.Exceptions;
 using System.Linq.Expressions;
 using FluentAssertions;
@@ -97,11 +99,65 @@ public void ExpressionParseTestNullPropagation()
             eval.Evaluate(@"{{np(b.Manager.Name, null)}}").Should().BeNull();
         }
 
+        [Fact(Skip = "It doesn't work yet")]
+        public void EvalDictionaryParams()
+        {
+            Parameter CreateDicParameter(string name) => new Parameter("item", new Dictionary<string, object>
+                {{"Name", new Dictionary<string, object> {{"FirstName", name }}}});
+
+            var eval = new FormulaEvaluator();
+            eval.Evaluate("{{item.Name.FirstName}}", CreateDicParameter("Julio")).Should().Be("Julio");
+            eval.Evaluate("{{item.Name.FirstName}}", CreateDicParameter("John")).Should().Be("John");
+        }
+
+        [Fact(Skip = "It doesn't work yet")]
+        public void EvalDictionaryParams2()
+        {
+            object CreateDicParameter(string name) => new Dictionary<string, object>
+                {{"Name", new Dictionary<string, object> {{"FirstName", name }}}};
+
+            var config = new ParsingConfig()
+            {
+                CustomTypeProvider = new DefaultDynamicLinqCustomTypeProvider()
+            };
+            var parType = new Dictionary<string, object>().GetType();
+            var lambda = DynamicExpressionParser.ParseLambda(config, new [] {Expression.Parameter(parType, "item")}, typeof(object), "item.Name.FirstName").Compile();
+            lambda.DynamicInvoke(CreateDicParameter("Julio")).Should().Be("Julio");
+            lambda.DynamicInvoke(CreateDicParameter("John")).Should().Be("John");
+        }
+
+        [Fact]
+        public void UsingDynamicLinqTypeTest()
+        {
+            var eval = new FormulaEvaluator();
+            eval.AddVariable("a", "1");
+            eval.Evaluate("{{EvaluateUtils.ParseAsInt(a).IncrementMe()}}").Should().Be(2);
+        }
+
         class Customer
         {
             public int Id { get; set; }
             public string Name { get; set; }
             public Customer Manager { get; set; }
         }
     }
+
+    [DynamicLinqType]
+    public static class EvaluateUtils
+    {
+        public static int ParseAsInt(string value)
+        {
+            if (value == null)
+            {
+                return 0;
+            }
+
+            return int.Parse(value);
+        }
+
+        public static int IncrementMe(this int values)
+        {
+            return values + 1;
+        }
+    }
 }