Merge branch 'master' of https://github.com/DigitalFlow/Xrm-Templatin…

…g-Language
XRM-OSS · May 7, 2020 · 7c1cf78 · 7c1cf78
2 parents 72af8a1 + 85a7dfb
commit 7c1cf78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.fsx b/build.fsx
@@ -35,7 +35,7 @@ let sha = Git.Information.getCurrentHash()
 // version info
 let major = "3"
 let minor = "6"
-let patch = "0"
+let patch = "1"
 
 // Follow SemVer scheme: http://semver.org/
 let asmVersion = major + "." + minor + "." + patch

diff --git a/src/lib/Xrm.Oss.XTL.Interpreter/FunctionHandlers.cs b/src/lib/Xrm.Oss.XTL.Interpreter/FunctionHandlers.cs
@@ -157,7 +157,7 @@ private static int Compare(List<ValueExpression> parameters)
 
         public static FunctionHandler And = (primary, service, tracing, organizationConfig, parameters) =>
         {
-            if (parameters.Count != 2)
+            if (parameters.Count < 2)
             {
                 throw new InvalidPluginExecutionException("And expects at least 2 conditions!");
             }
@@ -177,7 +177,7 @@ private static int Compare(List<ValueExpression> parameters)
 
         public static FunctionHandler Or = (primary, service, tracing, organizationConfig, parameters) =>
         {
-            if (parameters.Count != 2)
+            if (parameters.Count < 2)
             {
                 throw new InvalidPluginExecutionException("Or expects at least 2 conditions!");
             }
@@ -920,4 +920,4 @@ private static T CheckedCast<T>(object input, string errorMessage, bool failOnEr
         };
     }
 }
-#pragma warning restore S1104 // Fields should not have public accessibility
+#pragma warning restore S1104 // Fields should not have public accessibility