Skip to content

Commit fd46084

Browse files
vivetvivet
authored
Upgraded to .NET 10 (#22)
* Upgraded to .NET 10
1 parent d62f217 commit fd46084

9 files changed

Lines changed: 102 additions & 145 deletions

File tree

‎.github/workflows/build-and-deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- master
99
env:
1010
APP_NAME: DynamicExpression
11-
VERSION: 9.0.3
11+
VERSION: 10.0.0
1212
NUGET_HOST: https://api.nuget.org/v3/index.json
1313
NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}
1414
jobs:
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v4
2626
- uses: actions/setup-dotnet@v3
2727
with:
28-
dotnet-version: 9.0.x
28+
dotnet-version: 10.0.x
2929

3030
- name: Build and Test
3131
shell: pwsh

‎.tests/Tests.DynamicExpression/CriteriaBuilderTest.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
using System;
22
using System.Collections.Generic;
3+
using DynamicExpression;
34
using DynamicExpression.Enums;
45
using Microsoft.VisualStudio.TestTools.UnitTesting;
56
using NetTopologySuite.Geometries;
67

7-
namespace DynamicExpression.Test;
8+
namespace Tests.DynamicExpression;
89

910
[TestClass]
1011
public class CriteriaBuilderTest
@@ -393,7 +394,7 @@ public void BuildWhenInAndArrayEnumTest()
393394

394395
Assert.IsNotNull(expression);
395396
Assert.IsNotNull(expression.Compile());
396-
Assert.AreEqual("value(DynamicExpression.Test.CriteriaBuilderTest+FlagsEnum[]).Contains(x.Flags)", expression.Body.ToString());
397+
Assert.AreEqual("value(Tests.DynamicExpression.CriteriaBuilderTest+FlagsEnum[]).Contains(x.Flags)", expression.Body.ToString());
397398
}
398399

399400
[TestMethod]

‎.tests/Tests.DynamicExpression/CriteriaExpressionTest.cs‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
using System.Linq;
2+
using DynamicExpression;
23
using DynamicExpression.Enums;
34
using Microsoft.VisualStudio.TestTools.UnitTesting;
45

5-
namespace DynamicExpression.Test;
6+
namespace Tests.DynamicExpression;
67

78
[TestClass]
89
public class CriteriaExpressionTest
@@ -17,7 +18,7 @@ public void ConstructorWhenEqualTest()
1718
Assert.IsNotNull(criteria);
1819
Assert.AreEqual("name", criteria.Property);
1920
Assert.AreEqual("value", criteria.Value);
20-
Assert.AreEqual(null, criteria.Value2);
21+
Assert.IsNull(criteria.Value2);
2122
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
2223
Assert.AreEqual(OperationType.Equal, criteria.OperationType);
2324
}
@@ -32,7 +33,7 @@ public void ConstructorWhenStartsWithTest()
3233
Assert.IsNotNull(criteria);
3334
Assert.AreEqual("name", criteria.Property);
3435
Assert.AreEqual("value", criteria.Value);
35-
Assert.AreEqual(null, criteria.Value2);
36+
Assert.IsNull(criteria.Value2);
3637
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
3738
Assert.AreEqual(OperationType.StartsWith, criteria.OperationType);
3839
}
@@ -47,7 +48,7 @@ public void ConstructorWhenEndWithTest()
4748
Assert.IsNotNull(criteria);
4849
Assert.AreEqual("name", criteria.Property);
4950
Assert.AreEqual("value", criteria.Value);
50-
Assert.AreEqual(null, criteria.Value2);
51+
Assert.IsNull(criteria.Value2);
5152
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
5253
Assert.AreEqual(OperationType.EndsWith, criteria.OperationType);
5354
}
@@ -62,7 +63,7 @@ public void ConstructorWhenGreaterThanTest()
6263
Assert.IsNotNull(criteria);
6364
Assert.AreEqual("Age", criteria.Property);
6465
Assert.AreEqual(1, criteria.Value);
65-
Assert.AreEqual(null, criteria.Value2);
66+
Assert.IsNull(criteria.Value2);
6667
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
6768
Assert.AreEqual(OperationType.GreaterThan, criteria.OperationType);
6869
}
@@ -77,7 +78,7 @@ public void ConstructorWhenGreaterThanOrEqualTest()
7778
Assert.IsNotNull(criteria);
7879
Assert.AreEqual("Age", criteria.Property);
7980
Assert.AreEqual(1, criteria.Value);
80-
Assert.AreEqual(null, criteria.Value2);
81+
Assert.IsNull(criteria.Value2);
8182
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
8283
Assert.AreEqual(OperationType.GreaterThanOrEqual, criteria.OperationType);
8384
}
@@ -92,7 +93,7 @@ public void ConstructorWhenLessThanTest()
9293
Assert.IsNotNull(criteria);
9394
Assert.AreEqual("Age", criteria.Property);
9495
Assert.AreEqual(1, criteria.Value);
95-
Assert.AreEqual(null, criteria.Value2);
96+
Assert.IsNull(criteria.Value2);
9697
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
9798
Assert.AreEqual(OperationType.LessThan, criteria.OperationType);
9899
}
@@ -107,7 +108,7 @@ public void ConstructorWhenLessThanOrEqualTest()
107108
Assert.IsNotNull(criteria);
108109
Assert.AreEqual("Age", criteria.Property);
109110
Assert.AreEqual(1, criteria.Value);
110-
Assert.AreEqual(null, criteria.Value2);
111+
Assert.IsNull(criteria.Value2);
111112
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
112113
Assert.AreEqual(OperationType.LessThanOrEqual, criteria.OperationType);
113114
}
@@ -136,8 +137,8 @@ public void ConstructorWhenIsNullTest()
136137
var criteria = expression.Criterias.FirstOrDefault();
137138
Assert.IsNotNull(criteria);
138139
Assert.AreEqual("Name", criteria.Property);
139-
Assert.AreEqual(null, criteria.Value);
140-
Assert.AreEqual(null, criteria.Value2);
140+
Assert.IsNull(criteria.Value);
141+
Assert.IsNull(criteria.Value2);
141142
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
142143
Assert.AreEqual(OperationType.IsNull, criteria.OperationType);
143144
}
@@ -151,8 +152,8 @@ public void ConstructorWhenIsNotNullTest()
151152
var criteria = expression.Criterias.FirstOrDefault();
152153
Assert.IsNotNull(criteria);
153154
Assert.AreEqual("Name", criteria.Property);
154-
Assert.AreEqual(null, criteria.Value);
155-
Assert.AreEqual(null, criteria.Value2);
155+
Assert.IsNull(criteria.Value);
156+
Assert.IsNull(criteria.Value2);
156157
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
157158
Assert.AreEqual(OperationType.IsNotNull, criteria.OperationType);
158159
}
@@ -166,8 +167,8 @@ public void ConstructorWhenIsEmptyTest()
166167
var criteria = expression.Criterias.FirstOrDefault();
167168
Assert.IsNotNull(criteria);
168169
Assert.AreEqual("Name", criteria.Property);
169-
Assert.AreEqual(null, criteria.Value);
170-
Assert.AreEqual(null, criteria.Value2);
170+
Assert.IsNull(criteria.Value);
171+
Assert.IsNull(criteria.Value2);
171172
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
172173
Assert.AreEqual(OperationType.IsEmpty, criteria.OperationType);
173174
}
@@ -181,8 +182,8 @@ public void ConstructorWhenIsNotEmptyTest()
181182
var criteria = expression.Criterias.FirstOrDefault();
182183
Assert.IsNotNull(criteria);
183184
Assert.AreEqual("Name", criteria.Property);
184-
Assert.AreEqual(null, criteria.Value);
185-
Assert.AreEqual(null, criteria.Value2);
185+
Assert.IsNull(criteria.Value);
186+
Assert.IsNull(criteria.Value2);
186187
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
187188
Assert.AreEqual(OperationType.IsNotEmpty, criteria.OperationType);
188189
}
@@ -196,8 +197,8 @@ public void ConstructorWhenIsNullOrWhiteSpaceTest()
196197
var criteria = expression.Criterias.FirstOrDefault();
197198
Assert.IsNotNull(criteria);
198199
Assert.AreEqual("Name", criteria.Property);
199-
Assert.AreEqual(null, criteria.Value);
200-
Assert.AreEqual(null, criteria.Value2);
200+
Assert.IsNull(criteria.Value);
201+
Assert.IsNull(criteria.Value2);
201202
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
202203
Assert.AreEqual(OperationType.IsNullOrWhiteSpace, criteria.OperationType);
203204
}
@@ -211,8 +212,8 @@ public void ConstructorWhenIsNotNullOrWhiteSpaceTest()
211212
var criteria = expression.Criterias.FirstOrDefault();
212213
Assert.IsNotNull(criteria);
213214
Assert.AreEqual("Name", criteria.Property);
214-
Assert.AreEqual(null, criteria.Value);
215-
Assert.AreEqual(null, criteria.Value2);
215+
Assert.IsNull(criteria.Value);
216+
Assert.IsNull(criteria.Value2);
216217
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
217218
Assert.AreEqual(OperationType.IsNotNullOrWhiteSpace, criteria.OperationType);
218219
}
@@ -228,7 +229,7 @@ public void ConstructorWhenInTest()
228229
Assert.IsNotNull(criteria);
229230
Assert.AreEqual("Name", criteria.Property);
230231
Assert.AreEqual(array, criteria.Value);
231-
Assert.AreEqual(null, criteria.Value2);
232+
Assert.IsNull(criteria.Value2);
232233
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
233234
Assert.AreEqual(OperationType.In, criteria.OperationType);
234235
}
@@ -244,7 +245,7 @@ public void ConstructorWhenNotInTest()
244245
Assert.IsNotNull(criteria);
245246
Assert.AreEqual("Name", criteria.Property);
246247
Assert.AreEqual(array, criteria.Value);
247-
Assert.AreEqual(null, criteria.Value2);
248+
Assert.IsNull(criteria.Value2);
248249
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
249250
Assert.AreEqual(OperationType.NotIn, criteria.OperationType);
250251
}
@@ -259,7 +260,7 @@ public void ConstructorWhenContainsTest()
259260
Assert.IsNotNull(criteria);
260261
Assert.AreEqual("Name", criteria.Property);
261262
Assert.AreEqual("value", criteria.Value);
262-
Assert.AreEqual(null, criteria.Value2);
263+
Assert.IsNull(criteria.Value2);
263264
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
264265
Assert.AreEqual(OperationType.Contains, criteria.OperationType);
265266
}
@@ -274,7 +275,7 @@ public void ConstructorWhenNotContainsTest()
274275
Assert.IsNotNull(criteria);
275276
Assert.AreEqual("Name", criteria.Property);
276277
Assert.AreEqual("value", criteria.Value);
277-
Assert.AreEqual(null, criteria.Value2);
278+
Assert.IsNull(criteria.Value2);
278279
Assert.AreEqual(LogicalType.And, criteria.LogicalType);
279280
Assert.AreEqual(OperationType.NotContains, criteria.OperationType);
280281
}

‎.tests/Tests.DynamicExpression/Extensions/QueryableExtensionsTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using DynamicExpression.Extensions;
77
using Microsoft.VisualStudio.TestTools.UnitTesting;
88

9-
namespace DynamicExpression.Test.Extensions;
9+
namespace Tests.DynamicExpression.Extensions;
1010

1111
[TestClass]
1212
public class QueryableExtensionsTest

‎.tests/Tests.DynamicExpression/Properties/DoNotParallelize.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
3+
[assembly: DoNotParallelize]

‎.tests/Tests.DynamicExpression/Tests.DynamicExpression.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
66
<WarningsAsErrors></WarningsAsErrors>
77
<NoWarn />
88
<LangVersion>latest</LangVersion>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
13-
<PackageReference Include="MSTest.TestAdapter" Version="3.10.4" />
14-
<PackageReference Include="MSTest.TestFramework" Version="3.10.4" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
13+
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
14+
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

0 commit comments

Comments
 (0)