Bump System.Linq.Dynamic.Core from 1.3.8 to 1.6.0.1 #376 (#377)

* Bump System.Linq.Dynamic.Core from 1.3.8 to 1.6.0.1   #376

Adjust PassNullParameter test, add new case, comment out failing case.
See also CVE-2024-51417 zzzprojects/System.Linq.Dynamic.Core#867

* refactor FormulaEvaluatorTest test to Theory

* Remove ignored test

---------

Co-authored-by: Aleksei <pankraty@gmail.com>

Author: jafin

ClosedXML.Report/ClosedXML.Report.csproj

@@ -40,7 +40,7 @@
     <PackageReference Include="ClosedXML" Version="0.102.2" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="morelinq" Version="4.1.0" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.8" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.1" />
   </ItemGroup>
 
 </Project>

ClosedXML.Report/FormulaEvaluator.cs

@@ -1,10 +1,10 @@
 using ClosedXML.Report.Utils;
-using DocumentFormat.OpenXml.Bibliography;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Linq.Dynamic.Core.Exceptions;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Text.RegularExpressions;
@@ -134,7 +134,7 @@ public class Parameter
     {
         public Parameter(string name, object value)
         {
-            ParameterExpression = Expression.Parameter(value?.GetType() ?? typeof(string), name);
+            ParameterExpression = Expression.Parameter(value?.GetType() ?? typeof(object), name);
             Value = value;
         }
 

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

@@ -23,7 +23,7 @@
     <PackageReference Include="NSubstitute" Version="5.1.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.8" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.1" />
     <PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
     <PackageReference Include="System.ServiceModel.Primitives" Version="8.0.0" />

tests/ClosedXML.Report.Tests/FormulaEvaluatorTests.cs

@@ -51,13 +51,14 @@ public void MultipleExpressionsWithNullResult()
             eval.Evaluate("{{b}}{{a}}").Should().Be("1");
         }
 
-        [Fact]
-        public void PassNullParameter()
+        [Theory,
+        InlineData("{{\"Hello \"+a}}","Hello "),
+        InlineData("{{\"City: \"+Iif(a==null, string.Empty, a.City)}}","City: ")
+        ]
+        public void PassNullParameter(string formula, object expected)
         {
             var eval = new FormulaEvaluator();
-            eval.Evaluate("{{\"Hello \"+a}}", new Parameter("a", null)).Should().Be("Hello ");
-            eval.Evaluate("{{1+a}}", new Parameter("a", null)).Should().Be(null);
-            //TODO: eval.Evaluate("{{\"City: \"+Iif(a==null, string.Empty, a.City}}", new Parameter("a", null)).Should().Be("City: ");
+            eval.Evaluate(formula, new Parameter("a", null)).Should().Be(expected);
         }
 
         [Fact]