Skip to content

Commit d0a3d9a

Browse files
committed
Fix build+tests for nullable & namespace
1 parent ee81191 commit d0a3d9a

File tree

10 files changed

+100
-99
lines changed

10 files changed

+100
-99
lines changed

Z.Dynamic.Core.Lab/Z.Dynamic.Core.Lab.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
<ProjectReference Include="..\src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj" />
1515
</ItemGroup>
1616

17-
</Project>
17+
</Project>

src/EntityFramework.DynamicLinq/EntityFramework.DynamicLinq.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
1111
<ProjectGuid>{D3804228-91F4-4502-9595-39584E510000}</ProjectGuid>
1212
<TargetFrameworks>net45;net452;net46;netstandard2.1</TargetFrameworks>
13+
<LangVersion>10</LangVersion>
1314
<Version>1.2.$(PatchVersion)</Version>
1415
</PropertyGroup>
1516

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
1111
<ProjectGuid>{D3804228-91F4-4502-9595-39584E510001}</ProjectGuid>
1212
<TargetFrameworks>netstandard2.0</TargetFrameworks>
13+
<LangVersion>10</LangVersion>
1314
<Version>2.2.$(PatchVersion)</Version>
1415
</PropertyGroup>
1516

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
1111
<ProjectGuid>{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}</ProjectGuid>
1212
<TargetFrameworks>netstandard2.0</TargetFrameworks>
13+
<LangVersion>10</LangVersion>
1314
<Version>3.2.$(PatchVersion)</Version>
1415
</PropertyGroup>
1516

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
1111
<ProjectGuid>{D3804228-91F4-4502-9595-39584E519901}</ProjectGuid>
1212
<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
13+
<LangVersion>10</LangVersion>
1314
<Version>5.2.$(PatchVersion)</Version>
1415
</PropertyGroup>
1516

src/Z.EntityFramework.Classic.DynamicLinq/Z.EntityFramework.Classic.DynamicLinq.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<PackageTags>system;linq;dynamic;Z.EntityFramework;core;async;classic</PackageTags>
1111
<ProjectGuid>{D3804228-91F4-4502-9595-39584Ea20000}</ProjectGuid>
1212
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
13+
<LangVersion>10</LangVersion>
1314
<Version>1.2.$(PatchVersion)</Version>
1415
</PropertyGroup>
1516

test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<Authors>Stef Heyenrath</Authors>
55
<TargetFramework>net461</TargetFramework>
6+
<LangVersion>10</LangVersion>
67
<DefineConstants>EF;NET461</DefineConstants>
78
<AssemblyName>EntityFramework.DynamicLinq.Tests</AssemblyName>
89
<PackageId>EntityFramework.DynamicLinq.Tests</PackageId>

test/System.Linq.Dynamic.Core.Tests.Net5/System.Linq.Dynamic.Core.Tests.Net5.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net5.0</TargetFramework>
5+
<LangVersion>10</LangVersion>
56
<AssemblyName>System.Linq.Dynamic.Core.Tests</AssemblyName>
67
<DebugType>full</DebugType>
78
<SignAssembly>True</SignAssembly>

test/System.Linq.Dynamic.Core.Tests/DynamicClassTest.cs

Lines changed: 89 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -2,100 +2,101 @@
22
using FluentAssertions;
33
using Xunit;
44

5-
namespace System.Linq.Dynamic.Core.Tests;
6-
7-
public class DynamicClassTest
5+
namespace System.Linq.Dynamic.Core.Tests
86
{
9-
[Fact]
10-
public void DynamicClass_GetProperties_Should_Work()
7+
public class DynamicClassTest
118
{
12-
// Arrange
13-
var range = new List<object>
9+
[Fact]
10+
public void DynamicClass_GetProperties_Should_Work()
1411
{
15-
new { FieldName = "TestFieldName", Value = 3.14159 }
16-
};
17-
18-
// Act
19-
var rangeResult = range.AsQueryable().Select("new(FieldName as FieldName)").ToDynamicList();
20-
var item = rangeResult.First();
21-
22-
var call = () => item.GetDynamicMemberNames();
23-
call.Should().NotThrow();
24-
}
25-
26-
[Fact]
27-
public void DynamicClass_GetPropertyValue_Should_Work()
28-
{
29-
// Arrange
30-
var test = "Test";
31-
var range = new List<object>
12+
// Arrange
13+
var range = new List<object>
14+
{
15+
new { FieldName = "TestFieldName", Value = 3.14159 }
16+
};
17+
18+
// Act
19+
var rangeResult = range.AsQueryable().Select("new(FieldName as FieldName)").ToDynamicList();
20+
var item = rangeResult.First();
21+
22+
var call = () => item.GetDynamicMemberNames();
23+
call.Should().NotThrow();
24+
}
25+
26+
[Fact]
27+
public void DynamicClass_GetPropertyValue_Should_Work()
3228
{
33-
new { FieldName = test, Value = 3.14159 }
34-
};
35-
36-
// Act
37-
var rangeResult = range.AsQueryable().Select("new(FieldName as FieldName)").ToDynamicList();
38-
var item = rangeResult.First();
39-
40-
var value = item.FieldName as string;
41-
value.Should().Be(test);
42-
}
43-
44-
[Fact]
45-
public void DynamicClass_GettingValue_ByIndex_Should_Work()
46-
{
47-
// Arrange
48-
var test = "Test";
49-
var range = new List<object>
29+
// Arrange
30+
var test = "Test";
31+
var range = new List<object>
32+
{
33+
new { FieldName = test, Value = 3.14159 }
34+
};
35+
36+
// Act
37+
var rangeResult = range.AsQueryable().Select("new(FieldName as FieldName)").ToDynamicList();
38+
var item = rangeResult.First();
39+
40+
var value = item.FieldName as string;
41+
value.Should().Be(test);
42+
}
43+
44+
[Fact]
45+
public void DynamicClass_GettingValue_ByIndex_Should_Work()
5046
{
51-
new { FieldName = test, Value = 3.14159 }
52-
};
53-
54-
// Act
55-
var rangeResult = range.AsQueryable().Select("new(FieldName as FieldName)").ToDynamicList();
56-
var item = rangeResult.First();
57-
58-
var value = item["FieldName"] as string;
59-
value.Should().Be(test);
60-
}
61-
62-
[Fact]
63-
public void DynamicClass_SettingExistingPropertyValue_ByIndex_Should_Work()
64-
{
65-
// Arrange
66-
var test = "Test";
67-
var newTest = "abc";
68-
var range = new List<object>
47+
// Arrange
48+
var test = "Test";
49+
var range = new List<object>
50+
{
51+
new { FieldName = test, Value = 3.14159 }
52+
};
53+
54+
// Act
55+
var rangeResult = range.AsQueryable().Select("new(FieldName as FieldName)").ToDynamicList();
56+
var item = rangeResult.First();
57+
58+
var value = item["FieldName"] as string;
59+
value.Should().Be(test);
60+
}
61+
62+
[Fact]
63+
public void DynamicClass_SettingExistingPropertyValue_ByIndex_Should_Work()
6964
{
70-
new { FieldName = test, Value = 3.14159 }
71-
};
72-
73-
// Act
74-
var rangeResult = range.AsQueryable().Select("new(FieldName as FieldName)").ToDynamicList();
75-
var item = rangeResult.First();
76-
77-
item["FieldName"] = newTest;
78-
var value = item["FieldName"] as string;
79-
value.Should().Be(newTest);
80-
}
81-
82-
[Fact]
83-
public void DynamicClass_SettingNewProperty_ByIndex_Should_Work()
84-
{
85-
// Arrange
86-
var test = "Test";
87-
var newTest = "abc";
88-
var range = new List<object>
65+
// Arrange
66+
var test = "Test";
67+
var newTest = "abc";
68+
var range = new List<object>
69+
{
70+
new { FieldName = test, Value = 3.14159 }
71+
};
72+
73+
// Act
74+
var rangeResult = range.AsQueryable().Select("new(FieldName as FieldName)").ToDynamicList();
75+
var item = rangeResult.First();
76+
77+
item["FieldName"] = newTest;
78+
var value = item["FieldName"] as string;
79+
value.Should().Be(newTest);
80+
}
81+
82+
[Fact]
83+
public void DynamicClass_SettingNewProperty_ByIndex_Should_Work()
8984
{
90-
new { FieldName = test, Value = 3.14159 }
91-
};
92-
93-
// Act
94-
var rangeResult = range.AsQueryable().Select("new(FieldName as FieldName)").ToDynamicList();
95-
var item = rangeResult.First();
96-
97-
item["X"] = newTest;
98-
var value = item["X"] as string;
99-
value.Should().Be(newTest);
85+
// Arrange
86+
var test = "Test";
87+
var newTest = "abc";
88+
var range = new List<object>
89+
{
90+
new { FieldName = test, Value = 3.14159 }
91+
};
92+
93+
// Act
94+
var rangeResult = range.AsQueryable().Select("new(FieldName as FieldName)").ToDynamicList();
95+
var item = rangeResult.First();
96+
97+
item["X"] = newTest;
98+
var value = item["X"] as string;
99+
value.Should().Be(newTest);
100+
}
100101
}
101102
}

test/System.Linq.Dynamic.Core.Tests/Parser/MethodFinderTest.cs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
1+
using System.Linq.Dynamic.Core.Parser;
62
using System.Linq.Expressions;
7-
using static System.Console;
8-
using static System.Linq.Expressions.Expression;
9-
using System.Linq.Dynamic.Core.Parser;
10-
using System.Linq.Dynamic.Core;
113
using Xunit;
4+
using static System.Linq.Expressions.Expression;
125

136
namespace System.Linq.Dynamic.Core.Tests.Parser
147
{
@@ -27,4 +20,4 @@ public void MethodsOfDynamicLinqAndSystemLinqShouldBeEqual()
2720
Assert.Equal(((MethodCallExpression)expr.Body).Method.DeclaringType, ((MethodCallExpression)expr1).Method.DeclaringType);
2821
}
2922
}
30-
}
23+
}

0 commit comments

Comments
 (0)