Added example with AndAlso and OrElse (#12)

demo/DemoApp/DemoApp.csproj

@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <StartupObject>DemoApp.NestedInputDemo</StartupObject>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <StartupObject>DemoApp.Program</StartupObject>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="RulesEngine" Version="1.0.1" />
+    <ProjectReference Include="../../src/RulesEngine/RulesEngine/RulesEngine.csproj" />
   </ItemGroup>
   
   <ItemGroup>

demo/DemoApp/Workflows/Discount.json

@@ -35,12 +35,57 @@
         "Expression": "input1.loyalityFactor > 3 AND input1.totalPurchasesToDate >= 50000 AND input1.totalPurchasesToDate <= 100000 AND input2.totalOrders > 5 AND input3.noOfVisitsPerMonth > 15"
       },
       {
-        "RuleName": "GiveDiscount35",
+        "RuleName": "GiveDiscount30NestedOrExample",
+        "SuccessEvent": "30",
+        "ErrorMessage": "One or more adjust rules failed.",
+        "ErrorType": "Error",
+        "Operator": "OrElse",
+        "Rules":[
+          {
+            "RuleName": "IsLoyalAndHasGoodSpend",
+            "ErrorMessage": "One or more adjust rules failed.",
+            "ErrorType": "Error",
+            "RuleExpressionType": "LambdaExpression",
+            "Expression": "input1.loyalityFactor > 3 AND input1.totalPurchasesToDate >= 50000 AND input1.totalPurchasesToDate <= 100000"
+          },
+          {
+            "RuleName": "OrHasHighNumberOfTotalOrders",
+            "ErrorMessage": "One or more adjust rules failed.",
+            "ErrorType": "Error",
+            "RuleExpressionType": "LambdaExpression",
+            "Expression": "input2.totalOrders > 15"
+          }
+        ]
+      },
+      {
+        "RuleName": "GiveDiscount35NestedAndExample",
         "SuccessEvent": "35",
         "ErrorMessage": "One or more adjust rules failed.",
         "ErrorType": "Error",
-        "RuleExpressionType": "LambdaExpression",
-        "Expression": "input1.loyalityFactor > 3 AND input1.totalPurchasesToDate >= 100000 AND input2.totalOrders > 15 AND input3.noOfVisitsPerMonth > 25"
+        "Operator": "AndAlso",
+        "Rules": [
+          {
+            "RuleName": "IsLoyal",
+            "ErrorMessage": "One or more adjust rules failed.",
+            "ErrorType": "Error",
+            "RuleExpressionType": "LambdaExpression",
+            "Expression": "input1.loyalityFactor > 3"
+          },
+          {
+            "RuleName": "AndHasTotalPurchased100000",
+            "ErrorMessage": "One or more adjust rules failed.",
+            "ErrorType": "Error",
+            "RuleExpressionType": "LambdaExpression",
+            "Expression": "input1.totalPurchasesToDate >= 100000"
+          },
+          {
+            "RuleName": "AndOtherConditions",
+            "ErrorMessage": "One or more adjust rules failed.",
+            "ErrorType": "Error",
+            "RuleExpressionType": "LambdaExpression",
+            "Expression": "input2.totalOrders > 15 AND input3.noOfVisitsPerMonth > 25"
+          }
+        ]
       }
     ]
   }

global.json

@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "3.1.101"
+  }
+}