Skip to content

Commit 618b3a0

Browse files
StefHStefH
authored
Fix DynamicIndex implementation (#480)
1 parent 9888d0d commit 618b3a0

38 files changed

+740
-680
lines changed

‎.github/workflows/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
- name: Build Projects
1313
run: |
1414
dotnet build ./src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj -c Release -p:buildType=azure-pipelines-ci
15+
16+
- name: Run Tests netcoreapp31
17+
run: |
18+
dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj -c Release -f netcoreapp31 -p:buildType=azure-pipelines-ci
1519
1620
- name: Run Tests net452
1721
run: |
1822
dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj -c Release -f net452 -p:buildType=azure-pipelines-ci
19-
20-
- name: Run Tests netcoreapp31
21-
run: |
22-
dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj -c Release -f netcoreapp31 -p:buildType=azure-pipelines-ci

‎System.Linq.Dynamic.Core.sln

+60-38
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1212
.deployment = .deployment
1313
azure-pipelines.yml = azure-pipelines.yml
1414
CHANGELOG.md = CHANGELOG.md
15+
.github\workflows\ci.yml = .github\workflows\ci.yml
1516
Directory.Build.props = Directory.Build.props
1617
GitHubReleaseNotes.txt = GitHubReleaseNotes.txt
1718
LICENSE = LICENSE
@@ -50,12 +51,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp_net452_EF6", "sr
5051
EndProject
5152
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_netcore2.0_EF2.0.2_InMemory", "src-console\ConsoleAppEF2.0.2_InMemory\ConsoleApp_netcore2.0_EF2.0.2_InMemory.csproj", "{437473EE-7FBB-4C28-96EC-41E1AEE161F3}"
5253
EndProject
53-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MemoryLeakTest167", "src-console\MemoryLeakTest167\MemoryLeakTest167.csproj", "{AD4F83E5-4240-485D-BB5C-F43974F716E4}"
54-
EndProject
5554
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_netcore2.0_EF2.1", "src-console\ConsoleAppEF2.1\ConsoleApp_netcore2.0_EF2.1.csproj", "{EDF434F6-70C0-4005-B63E-0C365B3DA42A}"
5655
EndProject
57-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_netcore2.1_EF2.1.1_InMemory", "src-console\ConsoleAppEF2.1.1_InMemory\ConsoleApp_netcore2.1_EF2.1.1_InMemory.csproj", "{E4286D1D-A98C-4516-9E47-CBF9739448DA}"
58-
EndProject
5956
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_netcore2.1_EF2.1.1", "src-console\ConsoleAppEF2.1.1\ConsoleApp_netcore2.1_EF2.1.1.csproj", "{F1880F07-238F-4A3A-9E58-141350665E1F}"
6057
EndProject
6158
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppPerformanceTest236", "src-console\ConsoleAppPerformanceTest236\ConsoleAppPerformanceTest236.csproj", "{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}"
@@ -101,6 +98,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressionSample.UWP", "tes
10198
EndProject
10299
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestSLDC", "test-xamarin\TestSLDC\TestSLDC.csproj", "{C530A693-66FD-48A9-B42A-D613BB4CB754}"
103100
EndProject
101+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_net5.0_EF5_InMemory", "src-console\ConsoleAppEF5_InMemory\ConsoleApp_net5.0_EF5_InMemory.csproj", "{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}"
102+
EndProject
103+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_netcore3.1_nhibernate", "src-console\ConsoleAppEF3.1_nhibernate\ConsoleApp_netcore3.1_nhibernate.csproj", "{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}"
104+
EndProject
104105
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSLDC.Android", "test-xamarin\TestSLDC.Android\TestSLDC.Android.csproj", "{85D70423-5800-41E9-B7D5-244AAF051A85}"
105106
EndProject
106107
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressionSample.Android", "test-xamarin\ExpressionSample\ExpressionSample.Android\ExpressionSample.Android.csproj", "{CE0965F5-C4DD-4CAB-94C6-FE260775D2B3}"
@@ -291,22 +292,6 @@ Global
291292
{437473EE-7FBB-4C28-96EC-41E1AEE161F3}.Release|x64.Build.0 = Release|Any CPU
292293
{437473EE-7FBB-4C28-96EC-41E1AEE161F3}.Release|x86.ActiveCfg = Release|Any CPU
293294
{437473EE-7FBB-4C28-96EC-41E1AEE161F3}.Release|x86.Build.0 = Release|Any CPU
294-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
295-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
296-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|ARM.ActiveCfg = Debug|Any CPU
297-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|ARM.Build.0 = Debug|Any CPU
298-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|x64.ActiveCfg = Debug|Any CPU
299-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|x64.Build.0 = Debug|Any CPU
300-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|x86.ActiveCfg = Debug|Any CPU
301-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|x86.Build.0 = Debug|Any CPU
302-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
303-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|Any CPU.Build.0 = Release|Any CPU
304-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|ARM.ActiveCfg = Release|Any CPU
305-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|ARM.Build.0 = Release|Any CPU
306-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|x64.ActiveCfg = Release|Any CPU
307-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|x64.Build.0 = Release|Any CPU
308-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|x86.ActiveCfg = Release|Any CPU
309-
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|x86.Build.0 = Release|Any CPU
310295
{EDF434F6-70C0-4005-B63E-0C365B3DA42A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
311296
{EDF434F6-70C0-4005-B63E-0C365B3DA42A}.Debug|Any CPU.Build.0 = Debug|Any CPU
312297
{EDF434F6-70C0-4005-B63E-0C365B3DA42A}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -323,22 +308,6 @@ Global
323308
{EDF434F6-70C0-4005-B63E-0C365B3DA42A}.Release|x64.Build.0 = Release|Any CPU
324309
{EDF434F6-70C0-4005-B63E-0C365B3DA42A}.Release|x86.ActiveCfg = Release|Any CPU
325310
{EDF434F6-70C0-4005-B63E-0C365B3DA42A}.Release|x86.Build.0 = Release|Any CPU
326-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
327-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
328-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|ARM.ActiveCfg = Debug|Any CPU
329-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|ARM.Build.0 = Debug|Any CPU
330-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|x64.ActiveCfg = Debug|Any CPU
331-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|x64.Build.0 = Debug|Any CPU
332-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|x86.ActiveCfg = Debug|Any CPU
333-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|x86.Build.0 = Debug|Any CPU
334-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
335-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|Any CPU.Build.0 = Release|Any CPU
336-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|ARM.ActiveCfg = Release|Any CPU
337-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|ARM.Build.0 = Release|Any CPU
338-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|x64.ActiveCfg = Release|Any CPU
339-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|x64.Build.0 = Release|Any CPU
340-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|x86.ActiveCfg = Release|Any CPU
341-
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|x86.Build.0 = Release|Any CPU
342311
{F1880F07-238F-4A3A-9E58-141350665E1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
343312
{F1880F07-238F-4A3A-9E58-141350665E1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
344313
{F1880F07-238F-4A3A-9E58-141350665E1F}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -355,6 +324,26 @@ Global
355324
{F1880F07-238F-4A3A-9E58-141350665E1F}.Release|x64.Build.0 = Release|Any CPU
356325
{F1880F07-238F-4A3A-9E58-141350665E1F}.Release|x86.ActiveCfg = Release|Any CPU
357326
{F1880F07-238F-4A3A-9E58-141350665E1F}.Release|x86.Build.0 = Release|Any CPU
327+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|Any CPU.ActiveCfg = Debug|x86
328+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|ARM.ActiveCfg = Debug|ARM
329+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|ARM.Build.0 = Debug|ARM
330+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|ARM.Deploy.0 = Debug|ARM
331+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x64.ActiveCfg = Debug|x64
332+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x64.Build.0 = Debug|x64
333+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x64.Deploy.0 = Debug|x64
334+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x86.ActiveCfg = Debug|x86
335+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x86.Build.0 = Debug|x86
336+
{926D446C-8358-465A-AFAC-2F9078C22262}.Debug|x86.Deploy.0 = Debug|x86
337+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|Any CPU.ActiveCfg = Release|x86
338+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|ARM.ActiveCfg = Release|ARM
339+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|ARM.Build.0 = Release|ARM
340+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|ARM.Deploy.0 = Release|ARM
341+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x64.ActiveCfg = Release|x64
342+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x64.Build.0 = Release|x64
343+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x64.Deploy.0 = Release|x64
344+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x86.ActiveCfg = Release|x86
345+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x86.Build.0 = Release|x86
346+
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x86.Deploy.0 = Release|x86
358347
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
359348
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Debug|Any CPU.Build.0 = Debug|Any CPU
360349
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -647,6 +636,38 @@ Global
647636
{CE0965F5-C4DD-4CAB-94C6-FE260775D2B3}.Release|x86.ActiveCfg = Release|Any CPU
648637
{CE0965F5-C4DD-4CAB-94C6-FE260775D2B3}.Release|x86.Build.0 = Release|Any CPU
649638
{CE0965F5-C4DD-4CAB-94C6-FE260775D2B3}.Release|x86.Deploy.0 = Release|Any CPU
639+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
640+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
641+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|ARM.ActiveCfg = Debug|Any CPU
642+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|ARM.Build.0 = Debug|Any CPU
643+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|x64.ActiveCfg = Debug|Any CPU
644+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|x64.Build.0 = Debug|Any CPU
645+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|x86.ActiveCfg = Debug|Any CPU
646+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|x86.Build.0 = Debug|Any CPU
647+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
648+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|Any CPU.Build.0 = Release|Any CPU
649+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|ARM.ActiveCfg = Release|Any CPU
650+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|ARM.Build.0 = Release|Any CPU
651+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|x64.ActiveCfg = Release|Any CPU
652+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|x64.Build.0 = Release|Any CPU
653+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|x86.ActiveCfg = Release|Any CPU
654+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|x86.Build.0 = Release|Any CPU
655+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
656+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
657+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|ARM.ActiveCfg = Debug|Any CPU
658+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|ARM.Build.0 = Debug|Any CPU
659+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|x64.ActiveCfg = Debug|Any CPU
660+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|x64.Build.0 = Debug|Any CPU
661+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|x86.ActiveCfg = Debug|Any CPU
662+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|x86.Build.0 = Debug|Any CPU
663+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
664+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|Any CPU.Build.0 = Release|Any CPU
665+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|ARM.ActiveCfg = Release|Any CPU
666+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|ARM.Build.0 = Release|Any CPU
667+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|x64.ActiveCfg = Release|Any CPU
668+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|x64.Build.0 = Release|Any CPU
669+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|x86.ActiveCfg = Release|Any CPU
670+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|x86.Build.0 = Release|Any CPU
650671
EndGlobalSection
651672
GlobalSection(SolutionProperties) = preSolution
652673
HideSolutionNode = FALSE
@@ -663,10 +684,9 @@ Global
663684
{E587974C-19A9-426A-A952-216D5F883EB6} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
664685
{5DC68E83-ABE0-4887-B17E-1ED4EEE89C2C} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
665686
{437473EE-7FBB-4C28-96EC-41E1AEE161F3} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
666-
{AD4F83E5-4240-485D-BB5C-F43974F716E4} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
667687
{EDF434F6-70C0-4005-B63E-0C365B3DA42A} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
668-
{E4286D1D-A98C-4516-9E47-CBF9739448DA} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
669688
{F1880F07-238F-4A3A-9E58-141350665E1F} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
689+
{926D446C-8358-465A-AFAC-2F9078C22262} = {ECA5702B-5D32-4888-A34E-9461FC533F23}
670690
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
671691
{36B101B1-720B-4770-B222-C6ADD464F9EC} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
672692
{D3804228-91F4-4502-9595-39584EA20000} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
@@ -684,6 +704,8 @@ Global
684704
{C530A693-66FD-48A9-B42A-D613BB4CB754} = {ECA5702B-5D32-4888-A34E-9461FC533F23}
685705
{85D70423-5800-41E9-B7D5-244AAF051A85} = {ECA5702B-5D32-4888-A34E-9461FC533F23}
686706
{CE0965F5-C4DD-4CAB-94C6-FE260775D2B3} = {ECA5702B-5D32-4888-A34E-9461FC533F23}
707+
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
708+
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
687709
EndGlobalSection
688710
GlobalSection(ExtensibilityGlobals) = postSolution
689711
SolutionGuid = {94C56722-194E-4B8B-BC23-B3F754E89A20}

‎src-console/ConsoleAppEF2.0/Database/ProductDynamic.cs

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
using System.Collections.Generic;
2+
using System.ComponentModel.DataAnnotations;
3+
using System.ComponentModel.DataAnnotations.Schema;
4+
5+
namespace ConsoleAppEF2.Database
6+
{
7+
public class ProductDynamic
8+
{
9+
[Key]
10+
public int Key { get; set; }
11+
12+
[NotMapped]
13+
public dynamic Properties { get; set; }
14+
15+
public Dictionary<string, object> Dict { get; set; }
16+
}
17+
}

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

-30
This file was deleted.

0 commit comments

Comments
 (0)