From d5ccd79ed6beda795cbe6c4ad3853e0638824bda Mon Sep 17 00:00:00 2001 From: Hendrik Bulens Date: Thu, 14 Nov 2024 08:48:47 +0100 Subject: [PATCH] Target .NET 9 --- src/core/Dime.Rules.csproj | 4 ++-- src/core/ValidationEngine.cs | 4 ++-- src/test/Dime.Rules.Tests.csproj | 12 ++++++------ src/test/ValidationEngineTests.cs | 18 +++++++++--------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/core/Dime.Rules.csproj b/src/core/Dime.Rules.csproj index 0e86863..8a7e7da 100644 --- a/src/core/Dime.Rules.csproj +++ b/src/core/Dime.Rules.csproj @@ -1,14 +1,14 @@  - net8.0 + net8.0;net9.0 Dime Software Dime Software Validation Rules A simple validation rule engine https://github.com/dimesoftware/maps https://cdn.dime-software.com/dime-software/logo-shape.png - 1.1.0 + 1.2.0 true true en diff --git a/src/core/ValidationEngine.cs b/src/core/ValidationEngine.cs index 19dad45..b4a03a1 100644 --- a/src/core/ValidationEngine.cs +++ b/src/core/ValidationEngine.cs @@ -14,8 +14,8 @@ public ValidationEngine(params ValidationRule[] rules) public virtual ValidationResult Validate(T item) { - ValidationResult validationResult = new ValidationResult { IsValid = true }; - List messages = new List(); + ValidationResult validationResult = new() { IsValid = true }; + List messages = []; foreach (ValidationRule rule in _rules .Select(rule => new { rule, isValid = rule.ExecuteRule(item) }) .Where(t => !t.isValid) diff --git a/src/test/Dime.Rules.Tests.csproj b/src/test/Dime.Rules.Tests.csproj index 2f7dcb6..1c3ea0a 100644 --- a/src/test/Dime.Rules.Tests.csproj +++ b/src/test/Dime.Rules.Tests.csproj @@ -1,19 +1,19 @@  - net8.0 + net8.0;net9.0 Dime.Rules.Tests Dime.Rules.Tests - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/src/test/ValidationEngineTests.cs b/src/test/ValidationEngineTests.cs index bc3aa45..b20c4c9 100644 --- a/src/test/ValidationEngineTests.cs +++ b/src/test/ValidationEngineTests.cs @@ -10,10 +10,10 @@ public class ValidationEngineTests [TestMethod] public void ValidationEngine_Validate_Null_ShouldFail() { - ValidationRule rule1 = new ValidationRule(x => x != null, "Item cannot be null"); - ValidationRule rule2 = new ValidationRule(x => x.IsActive, "IsActive needs to be true"); + ValidationRule rule1 = new(x => x != null, "Item cannot be null"); + ValidationRule rule2 = new(x => x.IsActive, "IsActive needs to be true"); - ValidationEngine engine = new ValidationEngine(rule1, rule2); + ValidationEngine engine = new(rule1, rule2); ValidationResult runResult = engine.Validate(null); Assert.IsTrue(!runResult.IsValid); @@ -24,10 +24,10 @@ public void ValidationEngine_Validate_Null_ShouldFail() [TestMethod] public void ValidationEngine_Validate_Inactive_ShouldFail() { - ValidationRule rule1 = new ValidationRule(x => x != null, "Item cannot be null"); - ValidationRule rule2 = new ValidationRule(x => x.IsActive, "IsActive needs to be true"); + ValidationRule rule1 = new(x => x != null, "Item cannot be null"); + ValidationRule rule2 = new(x => x.IsActive, "IsActive needs to be true"); - ValidationEngine engine = new ValidationEngine(rule1, rule2); + ValidationEngine engine = new(rule1, rule2); ValidationResult runResult = engine.Validate(new Customer()); Assert.IsTrue(!runResult.IsValid); @@ -38,10 +38,10 @@ public void ValidationEngine_Validate_Inactive_ShouldFail() [TestMethod] public void ValidationEngine_ValidData_ShouldPass() { - ValidationRule rule1 = new ValidationRule(x => x != null, "Item cannot be null"); - ValidationRule rule2 = new ValidationRule(x => x.IsActive, "IsActive needs to be true"); + ValidationRule rule1 = new(x => x != null, "Item cannot be null"); + ValidationRule rule2 = new(x => x.IsActive, "IsActive needs to be true"); - ValidationEngine engine = new ValidationEngine(rule1, rule2); + ValidationEngine engine = new(rule1, rule2); ValidationResult runResult = engine.Validate(new Customer { IsActive = true }); Assert.IsTrue(runResult.IsValid);