Merge pull request #142 from codingseb/dev

Version 1.4.38.0

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -1530,6 +1530,46 @@ public static IEnumerable<TestCaseData> TestCasesForExceptionThrowingEvaluation
 
                 #endregion
 
+                #region OptionInlineNamespacesEvaluationRule
+
+                evaluator = new ExpressionEvaluator()
+                {
+                    OptionInlineNamespacesEvaluationRule = InlineNamespacesEvaluationRule.BlockAll
+                };
+
+                yield return new TestCaseData(evaluator, "new System.Collections.Generic.List<string>(){\"-\"}", typeof(ExpressionEvaluatorSyntaxErrorException))
+                    .SetCategory("Options")
+                    .SetCategory("InlineNamespacesEvaluationRule.BlockAll")
+                    .SetCategory("OptionInlineNamespacesEvaluationRule");
+                
+                evaluator = new ExpressionEvaluator()
+                {
+                    OptionInlineNamespacesEvaluationRule = InlineNamespacesEvaluationRule.AllowOnlyInlineNamespacesList
+                };
+
+                evaluator.InlineNamespacesList = evaluator.Namespaces.ToList();
+
+                evaluator.InlineNamespacesList.Remove("System.Collections.Generic");
+
+                yield return new TestCaseData(evaluator, "new System.Collections.Generic.List<string>()", typeof(ExpressionEvaluatorSyntaxErrorException))
+                    .SetCategory("Options")
+                    .SetCategory("InlineNamespacesEvaluationRule.AllowOnlyInlineNamespacesList")
+                    .SetCategory("OptionInlineNamespacesEvaluationRule");
+                
+                evaluator = new ExpressionEvaluator()
+                {
+                    OptionInlineNamespacesEvaluationRule = InlineNamespacesEvaluationRule.BlockOnlyInlineNamespacesList
+                };
+
+                evaluator.InlineNamespacesList = evaluator.Namespaces.ToList();
+                
+                yield return new TestCaseData(evaluator, "new System.Collections.Generic.List<string>(){ \"\" }", typeof(ExpressionEvaluatorSyntaxErrorException))
+                    .SetCategory("Options")
+                    .SetCategory("InlineNamespacesEvaluationRule.BlockOnlyInlineNamespacesList")
+                    .SetCategory("OptionInlineNamespacesEvaluationRule");
+
+                #endregion
+
                 #endregion
 
                 #region TypesToBlock
@@ -1626,7 +1666,7 @@ public void Evaluate_NewDateTime_When_OptionInlineNamespacesEvaluationActive_is_
         {
             ExpressionEvaluator evaluator = new ExpressionEvaluator()
             {
-                OptionInlineNamespacesEvaluationActive = false,
+                OptionInlineNamespacesEvaluationRule = InlineNamespacesEvaluationRule.BlockAll,
             };
 
             DateTime? dateTime = evaluator.Evaluate<DateTime>("new DateTime(2022,1,20)");
@@ -1649,7 +1689,7 @@ public void Evaluate_NewDateTime_When_OptionInlineNamespacesEvaluationActive_is_
         {
             ExpressionEvaluator evaluator = new ExpressionEvaluator()
             {
-                OptionInlineNamespacesEvaluationActive = true,
+                OptionInlineNamespacesEvaluationRule = InlineNamespacesEvaluationRule.AllowAll,
             };
 
             DateTime? dateTime = evaluator.Evaluate<DateTime>("new DateTime(2022,1,20)");

CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj

@@ -5,9 +5,9 @@
     <Product>CodingSeb.ExpressionEvaluator</Product>
     <Description>A Simple Math and Pseudo C# Expression Evaluator in One C# File. Can also execute small C# like scripts</Description>
     <Copyright>Copyright © Coding Seb 2017</Copyright>
-    <Version>1.4.37.0</Version>
-    <AssemblyVersion>1.4.37.0</AssemblyVersion>
-    <FileVersion>1.4.37.0</FileVersion>
+    <Version>1.4.38.0</Version>
+    <AssemblyVersion>1.4.38.0</AssemblyVersion>
+    <FileVersion>1.4.38.0</FileVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <Authors>Coding Seb</Authors>
     <PackageId>CodingSeb.ExpressionEvaluator</PackageId>
@@ -19,7 +19,13 @@
     <PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
     <PackageIcon>Icon.png</PackageIcon>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>* Correction of the explicit cast between primitive types and rounding numbers before (int)3.6 -&gt; 4 now (int)3.6 -&gt; 3</PackageReleaseNotes>
+    <PackageReleaseNotes>* OptionInlineNamespacesEvaluationActive become OptionInlineNamespacesEvaluationRule and allow more possibilities with the addition of InlineNamespacesList
+   This option can now be one of those :
+   - InlineNamespacesEvaluationRule.AllowAll
+   - InlineNamespacesEvaluationRule.AllowOnlyInlineNamespacesList
+   - InlineNamespacesEvaluationRule.BlockOnlyInlineNamespacesList
+   - InlineNamespacesEvaluationRule.BlockAll
+* Throw better exception and get better exception context with ExceptionDispatchInfo on TargetInvocationException.InnerException and BubbleExceptionContainer</PackageReleaseNotes>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <RepositoryUrl>https://github.com/codingseb/ExpressionEvaluator</RepositoryUrl>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>