Skip to content

Upgraded to .NET 10 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vivet merged 2 commits into from
Dec 28, 2025
Merged

Upgraded to .NET 10 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b97427
Upgraded to .NET 10
vivet Dec 28, 2025
e08d5b5
Fixed tests
vivet Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-and-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- master
env:
APP_NAME: DynamicExpression
VERSION: 9.0.3
VERSION: 10.0.0
NUGET_HOST: https://api.nuget.org/v3/index.json
NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}
jobs:
Expand All @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v3
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x

- name: Build and Test
shell: pwsh
Expand Down
5 changes: 3 additions & 2 deletions .tests/Tests.DynamicExpression/CriteriaBuilderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using System;
using System.Collections.Generic;
using DynamicExpression;
using DynamicExpression.Enums;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using NetTopologySuite.Geometries;

namespace DynamicExpression.Test;
namespace Tests.DynamicExpression;

[TestClass]
public class CriteriaBuilderTest
Expand Down Expand Up @@ -393,7 +394,7 @@ public void BuildWhenInAndArrayEnumTest()

Assert.IsNotNull(expression);
Assert.IsNotNull(expression.Compile());
Assert.AreEqual("value(DynamicExpression.Test.CriteriaBuilderTest+FlagsEnum[]).Contains(x.Flags)", expression.Body.ToString());
Assert.AreEqual("value(Tests.DynamicExpression.CriteriaBuilderTest+FlagsEnum[]).Contains(x.Flags)", expression.Body.ToString());
}

[TestMethod]
Expand Down
49 changes: 25 additions & 24 deletions .tests/Tests.DynamicExpression/CriteriaExpressionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
using System.Linq;
using DynamicExpression;
using DynamicExpression.Enums;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace DynamicExpression.Test;
namespace Tests.DynamicExpression;

[TestClass]
public class CriteriaExpressionTest
Expand All @@ -17,7 +18,7 @@ public void ConstructorWhenEqualTest()
Assert.IsNotNull(criteria);
Assert.AreEqual("name", criteria.Property);
Assert.AreEqual("value", criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.Equal, criteria.OperationType);
}
Expand All @@ -32,7 +33,7 @@ public void ConstructorWhenStartsWithTest()
Assert.IsNotNull(criteria);
Assert.AreEqual("name", criteria.Property);
Assert.AreEqual("value", criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.StartsWith, criteria.OperationType);
}
Expand All @@ -47,7 +48,7 @@ public void ConstructorWhenEndWithTest()
Assert.IsNotNull(criteria);
Assert.AreEqual("name", criteria.Property);
Assert.AreEqual("value", criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.EndsWith, criteria.OperationType);
}
Expand All @@ -62,7 +63,7 @@ public void ConstructorWhenGreaterThanTest()
Assert.IsNotNull(criteria);
Assert.AreEqual("Age", criteria.Property);
Assert.AreEqual(1, criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.GreaterThan, criteria.OperationType);
}
Expand All @@ -77,7 +78,7 @@ public void ConstructorWhenGreaterThanOrEqualTest()
Assert.IsNotNull(criteria);
Assert.AreEqual("Age", criteria.Property);
Assert.AreEqual(1, criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.GreaterThanOrEqual, criteria.OperationType);
}
Expand All @@ -92,7 +93,7 @@ public void ConstructorWhenLessThanTest()
Assert.IsNotNull(criteria);
Assert.AreEqual("Age", criteria.Property);
Assert.AreEqual(1, criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.LessThan, criteria.OperationType);
}
Expand All @@ -107,7 +108,7 @@ public void ConstructorWhenLessThanOrEqualTest()
Assert.IsNotNull(criteria);
Assert.AreEqual("Age", criteria.Property);
Assert.AreEqual(1, criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.LessThanOrEqual, criteria.OperationType);
}
Expand Down Expand Up @@ -136,8 +137,8 @@ public void ConstructorWhenIsNullTest()
var criteria = expression.Criterias.FirstOrDefault();
Assert.IsNotNull(criteria);
Assert.AreEqual("Name", criteria.Property);
Assert.AreEqual(null, criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.IsNull, criteria.OperationType);
}
Expand All @@ -151,8 +152,8 @@ public void ConstructorWhenIsNotNullTest()
var criteria = expression.Criterias.FirstOrDefault();
Assert.IsNotNull(criteria);
Assert.AreEqual("Name", criteria.Property);
Assert.AreEqual(null, criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.IsNotNull, criteria.OperationType);
}
Expand All @@ -166,8 +167,8 @@ public void ConstructorWhenIsEmptyTest()
var criteria = expression.Criterias.FirstOrDefault();
Assert.IsNotNull(criteria);
Assert.AreEqual("Name", criteria.Property);
Assert.AreEqual(null, criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.IsEmpty, criteria.OperationType);
}
Expand All @@ -181,8 +182,8 @@ public void ConstructorWhenIsNotEmptyTest()
var criteria = expression.Criterias.FirstOrDefault();
Assert.IsNotNull(criteria);
Assert.AreEqual("Name", criteria.Property);
Assert.AreEqual(null, criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.IsNotEmpty, criteria.OperationType);
}
Expand All @@ -196,8 +197,8 @@ public void ConstructorWhenIsNullOrWhiteSpaceTest()
var criteria = expression.Criterias.FirstOrDefault();
Assert.IsNotNull(criteria);
Assert.AreEqual("Name", criteria.Property);
Assert.AreEqual(null, criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.IsNullOrWhiteSpace, criteria.OperationType);
}
Expand All @@ -211,8 +212,8 @@ public void ConstructorWhenIsNotNullOrWhiteSpaceTest()
var criteria = expression.Criterias.FirstOrDefault();
Assert.IsNotNull(criteria);
Assert.AreEqual("Name", criteria.Property);
Assert.AreEqual(null, criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.IsNotNullOrWhiteSpace, criteria.OperationType);
}
Expand All @@ -228,7 +229,7 @@ public void ConstructorWhenInTest()
Assert.IsNotNull(criteria);
Assert.AreEqual("Name", criteria.Property);
Assert.AreEqual(array, criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.In, criteria.OperationType);
}
Expand All @@ -244,7 +245,7 @@ public void ConstructorWhenNotInTest()
Assert.IsNotNull(criteria);
Assert.AreEqual("Name", criteria.Property);
Assert.AreEqual(array, criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.NotIn, criteria.OperationType);
}
Expand All @@ -259,7 +260,7 @@ public void ConstructorWhenContainsTest()
Assert.IsNotNull(criteria);
Assert.AreEqual("Name", criteria.Property);
Assert.AreEqual("value", criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.Contains, criteria.OperationType);
}
Expand All @@ -274,7 +275,7 @@ public void ConstructorWhenNotContainsTest()
Assert.IsNotNull(criteria);
Assert.AreEqual("Name", criteria.Property);
Assert.AreEqual("value", criteria.Value);
Assert.AreEqual(null, criteria.Value2);
Assert.IsNull(criteria.Value2);
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
Assert.AreEqual(OperationType.NotContains, criteria.OperationType);
}
Expand Down
2 changes: 1 addition & 1 deletion .tests/Tests.DynamicExpression/Extensions/QueryableExtensionsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using DynamicExpression.Extensions;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace DynamicExpression.Test.Extensions;
namespace Tests.DynamicExpression.Extensions;

[TestClass]
public class QueryableExtensionsTest
Expand Down
3 changes: 3 additions & 0 deletions .tests/Tests.DynamicExpression/Properties/DoNotParallelize.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;

[assembly: DoNotParallelize]
8 changes: 4 additions & 4 deletions .tests/Tests.DynamicExpression/Tests.DynamicExpression.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors></WarningsAsErrors>
<NoWarn />
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.10.4" />
<PackageReference Include="MSTest.TestFramework" Version="3.10.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading