Skip to content

Commit

Permalink
Target .NET 9
Browse files Browse the repository at this point in the history
  • Loading branch information
hbulens committed Nov 14, 2024
1 parent 93e6aba commit d5ccd79
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions src/core/Dime.Rules.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<Authors>Dime Software</Authors>
<Company>Dime Software</Company>
<Product>Validation Rules</Product>
<Description>A simple validation rule engine</Description>
<PackageProjectUrl>https://github.com/dimesoftware/maps</PackageProjectUrl>
<PackageIconUrl>https://cdn.dime-software.com/dime-software/logo-shape.png</PackageIconUrl>
<Version>1.1.0</Version>
<Version>1.2.0</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<IncludeSymbols>true</IncludeSymbols>
<NeutralLanguage>en</NeutralLanguage>
Expand Down
4 changes: 2 additions & 2 deletions src/core/ValidationEngine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ public ValidationEngine(params ValidationRule<T>[] rules)

public virtual ValidationResult Validate(T item)
{
ValidationResult validationResult = new ValidationResult { IsValid = true };
List<string> messages = new List<string>();
ValidationResult validationResult = new() { IsValid = true };
List<string> messages = [];
foreach (ValidationRule<T> rule in _rules
.Select(rule => new { rule, isValid = rule.ExecuteRule(item) })
.Where(t => !t.isValid)
Expand Down
12 changes: 6 additions & 6 deletions src/test/Dime.Rules.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<AssemblyName>Dime.Rules.Tests</AssemblyName>
<PackageId>Dime.Rules.Tests</PackageId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeCoverage" Version="17.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
<PackageReference Include="Microsoft.CodeCoverage" Version="17.11.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
</ItemGroup>

<ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions src/test/ValidationEngineTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ public class ValidationEngineTests
[TestMethod]
public void ValidationEngine_Validate_Null_ShouldFail()
{
ValidationRule<Customer> rule1 = new ValidationRule<Customer>(x => x != null, "Item cannot be null");
ValidationRule<Customer> rule2 = new ValidationRule<Customer>(x => x.IsActive, "IsActive needs to be true");
ValidationRule<Customer> rule1 = new(x => x != null, "Item cannot be null");
ValidationRule<Customer> rule2 = new(x => x.IsActive, "IsActive needs to be true");

ValidationEngine<Customer> engine = new ValidationEngine<Customer>(rule1, rule2);
ValidationEngine<Customer> engine = new(rule1, rule2);
ValidationResult runResult = engine.Validate(null);

Assert.IsTrue(!runResult.IsValid);
Expand All @@ -24,10 +24,10 @@ public void ValidationEngine_Validate_Null_ShouldFail()
[TestMethod]
public void ValidationEngine_Validate_Inactive_ShouldFail()
{
ValidationRule<Customer> rule1 = new ValidationRule<Customer>(x => x != null, "Item cannot be null");
ValidationRule<Customer> rule2 = new ValidationRule<Customer>(x => x.IsActive, "IsActive needs to be true");
ValidationRule<Customer> rule1 = new(x => x != null, "Item cannot be null");
ValidationRule<Customer> rule2 = new(x => x.IsActive, "IsActive needs to be true");

ValidationEngine<Customer> engine = new ValidationEngine<Customer>(rule1, rule2);
ValidationEngine<Customer> engine = new(rule1, rule2);
ValidationResult runResult = engine.Validate(new Customer());

Assert.IsTrue(!runResult.IsValid);
Expand All @@ -38,10 +38,10 @@ public void ValidationEngine_Validate_Inactive_ShouldFail()
[TestMethod]
public void ValidationEngine_ValidData_ShouldPass()
{
ValidationRule<Customer> rule1 = new ValidationRule<Customer>(x => x != null, "Item cannot be null");
ValidationRule<Customer> rule2 = new ValidationRule<Customer>(x => x.IsActive, "IsActive needs to be true");
ValidationRule<Customer> rule1 = new(x => x != null, "Item cannot be null");
ValidationRule<Customer> rule2 = new(x => x.IsActive, "IsActive needs to be true");

ValidationEngine<Customer> engine = new ValidationEngine<Customer>(rule1, rule2);
ValidationEngine<Customer> engine = new(rule1, rule2);
ValidationResult runResult = engine.Validate(new Customer { IsActive = true });

Assert.IsTrue(runResult.IsValid);
Expand Down

0 comments on commit d5ccd79

Please sign in to comment.