Skip to content

Commit e7cb1a1

Browse files
StefHCopilot
StefH
and
Copilot
authored
.NET 10 (#957)
* Add examples for .NET 10 * net10 * Update src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore10/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore10.csproj Co-authored-by: Copilot <[email protected]> * Update src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj Co-authored-by: Copilot <[email protected]> * . * Run Tests .NET 10 (with Coverage) * ... * , * [Fact(Skip = "Fails sometimes in GitHub CI build")] --------- Co-authored-by: Copilot <[email protected]>
1 parent 49a69cc commit e7cb1a1

File tree

36 files changed

+580
-68
lines changed

36 files changed

+580
-68
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222

2323
- uses: actions/setup-dotnet@v4
2424
with:
25-
dotnet-version: '9.0.x'
25+
dotnet-version: '10.0.x'
2626

2727
- name: Build
2828
run: |
2929
dotnet build ./src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj -c Release -p:buildType=azure-pipelines-ci
3030
31-
- name: Run Tests EFCore net9.0
31+
- name: Run Tests EFCore net10.0
3232
run: |
3333
dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj -c Release -p:buildType=azure-pipelines-ci
3434
@@ -76,39 +76,24 @@ jobs:
7676
- name: Build
7777
run: |
7878
dotnet build ./src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj -c Debug -p:buildType=azure-pipelines-ci
79-
80-
- name: Run Tests EF net8.0 (with Coverage)
79+
80+
- name: Run Tests EFCore .NET 10 (with Coverage)
8181
run: |
82-
dotnet-coverage collect 'dotnet test ./test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj --configuration Debug --framework net8.0 -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-ef.xml
82+
dotnet-coverage collect 'dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj --configuration Debug -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-efcore.xml
8383
84-
- name: Run Tests EFCore net8.0 (with Coverage)
84+
- name: Run Tests EF .NET 10 (with Coverage)
8585
run: |
86-
dotnet-coverage collect 'dotnet test ./test/System.Linq.Dynamic.Core.Tests.Net8/System.Linq.Dynamic.Core.Tests.Net8.csproj --configuration Debug --framework net8.0 -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-efcore.xml
86+
dotnet-coverage collect 'dotnet test ./test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj --configuration Debug --framework net10.0 -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-ef.xml
8787
88-
- name: Run Tests Newtonsoft.Json .NET 8 (with Coverage)
88+
- name: Run Tests Newtonsoft.Json .NET 10 (with Coverage)
8989
run: |
90-
dotnet-coverage collect 'dotnet test ./test/System.Linq.Dynamic.Core.NewtonsoftJson.Tests/System.Linq.Dynamic.Core.NewtonsoftJson.Tests.csproj --configuration Debug --framework net8.0 -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-newtonsoftjson.xml
90+
dotnet-coverage collect 'dotnet test ./test/System.Linq.Dynamic.Core.NewtonsoftJson.Tests/System.Linq.Dynamic.Core.NewtonsoftJson.Tests.csproj --configuration Debug --framework net10.0 -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-newtonsoftjson.xml
9191
92-
- name: Run Tests System.Text.Json .NET 8 (with Coverage)
92+
- name: Run Tests System.Text.Json .NET 10 (with Coverage)
9393
run: |
94-
dotnet-coverage collect 'dotnet test ./test/System.Linq.Dynamic.Core.SystemTextJson.Tests/System.Linq.Dynamic.Core.SystemTextJson.Tests.csproj --configuration Debug --framework net8.0 -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-systemtextjson.xml
94+
dotnet-coverage collect 'dotnet test ./test/System.Linq.Dynamic.Core.SystemTextJson.Tests/System.Linq.Dynamic.Core.SystemTextJson.Tests.csproj --configuration Debug --framework net10.0 -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-systemtextjson.xml
9595
9696
- name: End analysis on SonarCloud
9797
if: ${{ steps.secret-check.outputs.run_analysis == 'true' }}
9898
run: |
99-
dotnet sonarscanner end /d:sonar.token=${{ secrets.SONAR_TOKEN }}
100-
101-
# - name: Run Tests EFCore net8.0
102-
# run: |
103-
# dotnet test ./test/System.Linq.Dynamic.Core.Tests.Net7/System.Linq.Dynamic.Core.Tests.Net8.csproj -c Release -p:buildType=azure-pipelines-ci
104-
# continue-on-error: true
105-
106-
# - name: Run Tests EFCore net7.0
107-
# run: |
108-
# dotnet test ./test/System.Linq.Dynamic.Core.Tests.Net7/System.Linq.Dynamic.Core.Tests.Net7.csproj -c Release -p:buildType=azure-pipelines-ci
109-
# continue-on-error: true
110-
111-
# - name: Run Tests EFCore net6.0
112-
# run: |
113-
# dotnet test ./test/System.Linq.Dynamic.Core.Tests.Net6/System.Linq.Dynamic.Core.Tests.Net6.csproj -c Release -p:buildType=azure-pipelines-ci
114-
# continue-on-error: true
99+
dotnet sonarscanner end /d:sonar.token=${{ secrets.SONAR_TOKEN }}

‎System.Linq.Dynamic.Core.sln‎

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.31606.5
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.0.11205.157 d18.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8463ED7E-69FB-49AE-85CF-0791AFD98E38}"
77
ProjectSection(SolutionItems) = preProject
@@ -161,6 +161,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Dynamic.Core.Te
161161
EndProject
162162
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleAppPerformanceTest", "src-console\ConsoleAppPerformanceTest\ConsoleAppPerformanceTest.csproj", "{067C00CF-29FA-4643-814D-3A3C3C84634F}"
163163
EndProject
164+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp_net10", "src-console\ConsoleApp_net10\ConsoleApp_net10.csproj", "{34C58129-07DB-287E-A29B-FA8EE8BAEB05}"
165+
EndProject
166+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.EntityFrameworkCore.DynamicLinq.EFCore10", "src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore10\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore10.csproj", "{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}"
167+
EndProject
168+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Dynamic.Core.Tests.Net9", "test\System.Linq.Dynamic.Core.Tests.Net9\System.Linq.Dynamic.Core.Tests.Net9.csproj", "{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}"
169+
EndProject
164170
Global
165171
GlobalSection(SolutionConfigurationPlatforms) = preSolution
166172
Debug|Any CPU = Debug|Any CPU
@@ -1057,6 +1063,54 @@ Global
10571063
{067C00CF-29FA-4643-814D-3A3C3C84634F}.Release|x64.Build.0 = Release|Any CPU
10581064
{067C00CF-29FA-4643-814D-3A3C3C84634F}.Release|x86.ActiveCfg = Release|Any CPU
10591065
{067C00CF-29FA-4643-814D-3A3C3C84634F}.Release|x86.Build.0 = Release|Any CPU
1066+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1067+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Debug|Any CPU.Build.0 = Debug|Any CPU
1068+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Debug|ARM.ActiveCfg = Debug|Any CPU
1069+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Debug|ARM.Build.0 = Debug|Any CPU
1070+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Debug|x64.ActiveCfg = Debug|Any CPU
1071+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Debug|x64.Build.0 = Debug|Any CPU
1072+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Debug|x86.ActiveCfg = Debug|Any CPU
1073+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Debug|x86.Build.0 = Debug|Any CPU
1074+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Release|Any CPU.ActiveCfg = Release|Any CPU
1075+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Release|Any CPU.Build.0 = Release|Any CPU
1076+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Release|ARM.ActiveCfg = Release|Any CPU
1077+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Release|ARM.Build.0 = Release|Any CPU
1078+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Release|x64.ActiveCfg = Release|Any CPU
1079+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Release|x64.Build.0 = Release|Any CPU
1080+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Release|x86.ActiveCfg = Release|Any CPU
1081+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05}.Release|x86.Build.0 = Release|Any CPU
1082+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1083+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Debug|Any CPU.Build.0 = Debug|Any CPU
1084+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Debug|ARM.ActiveCfg = Debug|Any CPU
1085+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Debug|ARM.Build.0 = Debug|Any CPU
1086+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Debug|x64.ActiveCfg = Debug|Any CPU
1087+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Debug|x64.Build.0 = Debug|Any CPU
1088+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Debug|x86.ActiveCfg = Debug|Any CPU
1089+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Debug|x86.Build.0 = Debug|Any CPU
1090+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Release|Any CPU.ActiveCfg = Release|Any CPU
1091+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Release|Any CPU.Build.0 = Release|Any CPU
1092+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Release|ARM.ActiveCfg = Release|Any CPU
1093+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Release|ARM.Build.0 = Release|Any CPU
1094+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Release|x64.ActiveCfg = Release|Any CPU
1095+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Release|x64.Build.0 = Release|Any CPU
1096+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Release|x86.ActiveCfg = Release|Any CPU
1097+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520}.Release|x86.Build.0 = Release|Any CPU
1098+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1099+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
1100+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Debug|ARM.ActiveCfg = Debug|Any CPU
1101+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Debug|ARM.Build.0 = Debug|Any CPU
1102+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Debug|x64.ActiveCfg = Debug|Any CPU
1103+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Debug|x64.Build.0 = Debug|Any CPU
1104+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Debug|x86.ActiveCfg = Debug|Any CPU
1105+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Debug|x86.Build.0 = Debug|Any CPU
1106+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
1107+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Release|Any CPU.Build.0 = Release|Any CPU
1108+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Release|ARM.ActiveCfg = Release|Any CPU
1109+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Release|ARM.Build.0 = Release|Any CPU
1110+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Release|x64.ActiveCfg = Release|Any CPU
1111+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Release|x64.Build.0 = Release|Any CPU
1112+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Release|x86.ActiveCfg = Release|Any CPU
1113+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2}.Release|x86.Build.0 = Release|Any CPU
10601114
EndGlobalSection
10611115
GlobalSection(SolutionProperties) = preSolution
10621116
HideSolutionNode = FALSE
@@ -1117,6 +1171,9 @@ Global
11171171
{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
11181172
{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
11191173
{067C00CF-29FA-4643-814D-3A3C3C84634F} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
1174+
{34C58129-07DB-287E-A29B-FA8EE8BAEB05} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
1175+
{1CD58B7F-CF5D-4F38-A5E0-9FE2D5216520} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
1176+
{00C5928F-3846-5C1A-6AFB-DFD2149EA3E2} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
11201177
EndGlobalSection
11211178
GlobalSection(ExtensibilityGlobals) = postSolution
11221179
SolutionGuid = {94C56722-194E-4B8B-BC23-B3F754E89A20}

‎src-console/ConsoleAppEF2.0.2_InMemory/ConsoleApp_netcore2.0_EF2.0.2_InMemory.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<ItemGroup>
2020
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.2" />
2121
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.2" />
22-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
22+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src-console/ConsoleAppEF2.0/ConsoleApp_netcore2.0_EF2.0.1.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1" />
1313
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1" />
1414
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.1" />
15-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
15+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src-console/ConsoleAppEF2.1.1/ConsoleApp_netcore2.1_EF2.1.1.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1" />
1919
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.1" />
2020
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
21-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
21+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎src-console/ConsoleAppEF2.1/ConsoleApp_netcore2.0_EF2.1.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.1" />
1717
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1" />
1818
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
19-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
19+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎src-console/ConsoleAppEF3.1/ConsoleApp_netcore3.1_EF3.1.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0" />
2121
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
2222
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
23-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
23+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎src-console/ConsoleAppEF5/ConsoleApp_net5.0_EF5.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0" />
2020
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
2121
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
22-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
22+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src-console/ConsoleAppEF5_InMemory/ConsoleApp_net5.0_EF5_InMemory.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
1616
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
17-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
17+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src-console/ConsoleAppEF6_InMemory/ConsoleApp_net6.0_EF6_InMemory.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
1616
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
17-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
17+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

0 commit comments

Comments
 (0)