asulwer · asulwer · Nov 16, 2024 · Nov 15, 2024 · JasonBoggsAtHMSdotCom · Nov 15, 2024
diff --git a/src/RulesEngine/Actions/ActionBase.cs b/src/RulesEngine/Actions/ActionBase.cs
@@ -4,7 +4,6 @@
 using RulesEngine.Models;
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace RulesEngine.Actions

diff --git a/src/RulesEngine/Actions/EvaluateRuleAction.cs b/src/RulesEngine/Actions/EvaluateRuleAction.cs
@@ -3,10 +3,8 @@
 
 using RulesEngine.ExpressionBuilders;
 using RulesEngine.Models;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace RulesEngine.Actions

diff --git a/src/RulesEngine/Actions/ExpressionOutputAction.cs b/src/RulesEngine/Actions/ExpressionOutputAction.cs
@@ -3,7 +3,6 @@
 
 using RulesEngine.ExpressionBuilders;
 using RulesEngine.Models;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace RulesEngine.Actions

diff --git a/src/RulesEngine/Exceptions/ExpressionParserException.cs b/src/RulesEngine/Exceptions/ExpressionParserException.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace RulesEngine.Exceptions
 {

diff --git a/src/RulesEngine/Exceptions/RuleException.cs b/src/RulesEngine/Exceptions/RuleException.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace RulesEngine.Exceptions
 {

diff --git a/src/RulesEngine/Exceptions/ScopedParamException.cs b/src/RulesEngine/Exceptions/ScopedParamException.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace RulesEngine.Exceptions
 {

diff --git a/src/RulesEngine/ExpressionBuilders/LambdaExpressionBuilder.cs b/src/RulesEngine/ExpressionBuilders/LambdaExpressionBuilder.cs
@@ -6,7 +6,6 @@
 using RulesEngine.Models;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Dynamic.Core.Exceptions;
 using System.Linq.Expressions;
 

diff --git a/src/RulesEngine/ExpressionBuilders/RuleExpressionParser.cs b/src/RulesEngine/ExpressionBuilders/RuleExpressionParser.cs
@@ -2,7 +2,6 @@
 //  Licensed under the MIT License.
 
 using FastExpressionCompiler;
-using RulesEngine.HelperFunctions;
 using RulesEngine.Models;
 using System;
 using System.Collections.Generic;

diff --git a/src/RulesEngine/Extensions/EnumerableExtensions.cs b/src/RulesEngine/Extensions/EnumerableExtensions.cs
@@ -1,11 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace RulesEngine.Extensions
 {

diff --git a/src/RulesEngine/Extensions/ListofRuleResultTreeExtension.cs b/src/RulesEngine/Extensions/ListofRuleResultTreeExtension.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Linq;
 
-
 namespace RulesEngine.Extensions
 {
     public static class ListofRuleResultTreeExtension

diff --git a/src/RulesEngine/HelperFunctions/ExpressionUtils.cs b/src/RulesEngine/HelperFunctions/ExpressionUtils.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Linq;
 
 namespace RulesEngine.HelperFunctions

diff --git a/src/RulesEngine/HelperFunctions/Helpers.cs b/src/RulesEngine/HelperFunctions/Helpers.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 
 namespace RulesEngine.HelperFunctions
 {

diff --git a/src/RulesEngine/HelperFunctions/MemCache.cs b/src/RulesEngine/HelperFunctions/MemCache.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 

diff --git a/src/RulesEngine/Models/ImplicitObject.cs b/src/RulesEngine/Models/ImplicitObject.cs
@@ -4,16 +4,11 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-using System.Diagnostics.CodeAnalysis;
-
 namespace RulesEngine.Models
 {
     [ExcludeFromCodeCoverage]
     public class ImplicitObject
     {
-
-        #region Implicit Operators
-
         public static implicit operator ImplicitObject(bool value) => default;
 
         public static implicit operator ImplicitObject(bool? value) => default;
@@ -35,8 +30,5 @@ public class ImplicitObject
         public static implicit operator ImplicitObject(float value) => default;
 
         public static implicit operator ImplicitObject(float? value) => default;
-
-        #endregion
-
     }
 }
diff --git a/src/RulesEngine/Models/RuleExpressionParameter.cs b/src/RulesEngine/Models/RuleExpressionParameter.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 //  Licensed under the MIT License.
 
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq.Expressions;
 

diff --git a/src/RulesEngine/Models/RuleParameter.cs b/src/RulesEngine/Models/RuleParameter.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using FastExpressionCompiler;
 using RulesEngine.HelperFunctions;
 using System;
 using System.Linq;

diff --git a/src/RulesEngine/Models/RuleResultTree.cs b/src/RulesEngine/Models/RuleResultTree.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using RulesEngine.HelperFunctions;
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 

diff --git a/src/RulesEngine/RulesEngine.cs b/src/RulesEngine/RulesEngine.cs
@@ -459,10 +459,12 @@ private static string UpdateErrorMessage(string errorMessage, IDictionary<string
 
             if (model != null)
             {
-                using var jDoc = JsonSerializer.SerializeToDocument(model);
-                errorMessage = jDoc.RootElement.TryGetProperty(propertyName, out var jElement) ? 
-                    errorMessage.Replace($"$({property})", jElement.GetRawText() ?? $"({property})") : 
-                    errorMessage.Replace($"$({property})", $"({property})");
+                using (var jDoc = JsonSerializer.SerializeToDocument(model))
+                {
+                    errorMessage = jDoc.RootElement.TryGetProperty(propertyName, out var jElement) ?
+                        errorMessage.Replace($"$({property})", jElement.GetRawText() ?? $"({property})") :
+                        errorMessage.Replace($"$({property})", $"({property})");
+                }
             }
 
             return errorMessage;

diff --git a/src/RulesEngine/RulesEngine.csproj b/src/RulesEngine/RulesEngine.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Nullable>disable</Nullable>
-    <Version>6.0.5</Version>
+    <Version>6.0.6</Version>
     <PackageId>RulesEngineEx</PackageId>
 	<PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/asulwer/RulesEngine</PackageProjectUrl>

diff --git a/test/RulesEngine.UnitTest/NestedRulesTest.cs b/test/RulesEngine.UnitTest/NestedRulesTest.cs
                Assert.All(andResults,
                    c => {
                        Assert.Equal(c.IsSuccess, c.ChildResults.Last().IsSuccess);
                        Assert.Single(c.ChildResults.Where(d => c.IsSuccess == d.IsSuccess));
                        Assert.True(c.ChildResults.SkipLast(1).All(d => d.IsSuccess == true));
                    });

                Assert.All(orResults,
                    c => {
                        Assert.Equal(c.IsSuccess, c.ChildResults.Last().IsSuccess);
                        Assert.Single(c.ChildResults.Where(d => c.IsSuccess == d.IsSuccess));
                        Assert.True(c.ChildResults.SkipLast(1).All(d => d.IsSuccess == false));
                    });
            }
                Assert.All(andResults,
                    c => {
                        Assert.Equal(c.IsSuccess, c.ChildResults.Last().IsSuccess);
                        Assert.Single(c.ChildResults.Where(d => c.IsSuccess == d.IsSuccess));
                        Assert.True(c.ChildResults.SkipLast(1).All(d => d.IsSuccess == true));
                    });

                Assert.All(orResults,
                    c => {
                        Assert.Equal(c.IsSuccess, c.ChildResults.Last().IsSuccess);
                        Assert.Single(c.ChildResults.Where(d => c.IsSuccess == d.IsSuccess));
                        Assert.True(c.ChildResults.SkipLast(1).All(d => d.IsSuccess == false));
                    });
            }
	Assert.All(andResults,
	c => {
	Assert.Equal(c.IsSuccess, c.ChildResults.Last().IsSuccess);
	Assert.Single(c.ChildResults.Where(d => c.IsSuccess == d.IsSuccess));
Check warning on line 47 in test/RulesEngine.UnitTest/NestedRulesTest.cs GitHub Actions / build `Do not use a Where clause to filter before calling Assert.Single. Use the overload of Assert.Single that accepts a filtering function. (https://xunit.net/xunit.analyzers/rules/xUnit2031)` Check warning on line 47 in test/RulesEngine.UnitTest/NestedRulesTest.cs GitHub Actions / build `Do not use a Where clause to filter before calling Assert.Single. Use the overload of Assert.Single that accepts a filtering function. (https://xunit.net/xunit.analyzers/rules/xUnit2031)`
	Assert.True(c.ChildResults.SkipLast(1).All(d => d.IsSuccess == true));
	});

	Assert.All(orResults,
	c => {
	Assert.Equal(c.IsSuccess, c.ChildResults.Last().IsSuccess);
	Assert.Single(c.ChildResults.Where(d => c.IsSuccess == d.IsSuccess));
Check warning on line 54 in test/RulesEngine.UnitTest/NestedRulesTest.cs GitHub Actions / build `Do not use a Where clause to filter before calling Assert.Single. Use the overload of Assert.Single that accepts a filtering function. (https://xunit.net/xunit.analyzers/rules/xUnit2031)` Check warning on line 54 in test/RulesEngine.UnitTest/NestedRulesTest.cs GitHub Actions / build `Do not use a Where clause to filter before calling Assert.Single. Use the overload of Assert.Single that accepts a filtering function. (https://xunit.net/xunit.analyzers/rules/xUnit2031)`
	Assert.True(c.ChildResults.SkipLast(1).All(d => d.IsSuccess == false));
	});
	}
	Assert.All(andResults,
	c => {
	Assert.Equal(c.IsSuccess, c.ChildResults.Last().IsSuccess);
	Assert.Single(c.ChildResults.Where(d => c.IsSuccess == d.IsSuccess));
Check warning on line 243 in test/RulesEngine.UnitTest/NestedRulesTest.cs GitHub Actions / build `Do not use a Where clause to filter before calling Assert.Single. Use the overload of Assert.Single that accepts a filtering function. (https://xunit.net/xunit.analyzers/rules/xUnit2031)` Check warning on line 243 in test/RulesEngine.UnitTest/NestedRulesTest.cs GitHub Actions / build `Do not use a Where clause to filter before calling Assert.Single. Use the overload of Assert.Single that accepts a filtering function. (https://xunit.net/xunit.analyzers/rules/xUnit2031)`
	Assert.True(c.ChildResults.SkipLast(1).All(d => d.IsSuccess == true));
	});

	Assert.All(orResults,
	c => {
	Assert.Equal(c.IsSuccess, c.ChildResults.Last().IsSuccess);
	Assert.Single(c.ChildResults.Where(d => c.IsSuccess == d.IsSuccess));
Check warning on line 250 in test/RulesEngine.UnitTest/NestedRulesTest.cs GitHub Actions / build `Do not use a Where clause to filter before calling Assert.Single. Use the overload of Assert.Single that accepts a filtering function. (https://xunit.net/xunit.analyzers/rules/xUnit2031)` Check warning on line 250 in test/RulesEngine.UnitTest/NestedRulesTest.cs GitHub Actions / build `Do not use a Where clause to filter before calling Assert.Single. Use the overload of Assert.Single that accepts a filtering function. (https://xunit.net/xunit.analyzers/rules/xUnit2031)`
	Assert.True(c.ChildResults.SkipLast(1).All(d => d.IsSuccess == false));
	});
	}