Skip to content
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.

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

Fix DynamicIndex implementation #480

Merged
merged 23 commits into from
Feb 12, 2021
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
- name: Build Projects
run: |
dotnet build ./src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj -c Release -p:buildType=azure-pipelines-ci

- name: Run Tests netcoreapp31
run: |
dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj -c Release -f netcoreapp31 -p:buildType=azure-pipelines-ci

- name: Run Tests net452
run: |
dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj -c Release -f net452 -p:buildType=azure-pipelines-ci

- name: Run Tests netcoreapp31
run: |
dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj -c Release -f netcoreapp31 -p:buildType=azure-pipelines-ci
96 changes: 39 additions & 57 deletions System.Linq.Dynamic.Core.sln
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.deployment = .deployment
azure-pipelines.yml = azure-pipelines.yml
CHANGELOG.md = CHANGELOG.md
.github\workflows\ci.yml = .github\workflows\ci.yml
Directory.Build.props = Directory.Build.props
GitHubReleaseNotes.txt = GitHubReleaseNotes.txt
LICENSE = LICENSE
Expand Down Expand Up @@ -50,21 +51,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp_net452_EF6", "sr
EndProject
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}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MemoryLeakTest167", "src-console\MemoryLeakTest167\MemoryLeakTest167.csproj", "{AD4F83E5-4240-485D-BB5C-F43974F716E4}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsUniversalTestApp14393", "test-uap\WindowsUniversalTestApp14393\WindowsUniversalTestApp14393.csproj", "{926D446C-8358-465A-AFAC-2F9078C22262}"
ProjectSection(ProjectDependencies) = postProject
{D3804228-91F4-4502-9595-39584E510002} = {D3804228-91F4-4502-9595-39584E510002}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppPerformanceTest236", "src-console\ConsoleAppPerformanceTest236\ConsoleAppPerformanceTest236.csproj", "{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp_net452_EF6_Effort", "src-console\ConsoleApp_net452_EF6_Effort\ConsoleApp_net452_EF6_Effort.csproj", "{36B101B1-720B-4770-B222-C6ADD464F9EC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Z.EntityFramework.Classic.DynamicLinq", "src\Z.EntityFramework.Classic.DynamicLinq\Z.EntityFramework.Classic.DynamicLinq.csproj", "{D3804228-91F4-4502-9595-39584EA20000}"
Expand Down Expand Up @@ -106,6 +101,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.EntityFrameworkCo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_net5.0_EF5", "src-console\ConsoleAppEF5\ConsoleApp_net5.0_EF5.csproj", "{B3D1A89E-CE12-4A0D-B23E-8970D681C719}"
EndProject
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}"
EndProject
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}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -292,22 +291,6 @@ Global
{437473EE-7FBB-4C28-96EC-41E1AEE161F3}.Release|x64.Build.0 = Release|Any CPU
{437473EE-7FBB-4C28-96EC-41E1AEE161F3}.Release|x86.ActiveCfg = Release|Any CPU
{437473EE-7FBB-4C28-96EC-41E1AEE161F3}.Release|x86.Build.0 = Release|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|ARM.ActiveCfg = Debug|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|ARM.Build.0 = Debug|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|x64.ActiveCfg = Debug|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|x64.Build.0 = Debug|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|x86.ActiveCfg = Debug|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Debug|x86.Build.0 = Debug|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|Any CPU.Build.0 = Release|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|ARM.ActiveCfg = Release|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|ARM.Build.0 = Release|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|x64.ActiveCfg = Release|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|x64.Build.0 = Release|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|x86.ActiveCfg = Release|Any CPU
{AD4F83E5-4240-485D-BB5C-F43974F716E4}.Release|x86.Build.0 = Release|Any CPU
{EDF434F6-70C0-4005-B63E-0C365B3DA42A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EDF434F6-70C0-4005-B63E-0C365B3DA42A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EDF434F6-70C0-4005-B63E-0C365B3DA42A}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand All @@ -324,22 +307,6 @@ Global
{EDF434F6-70C0-4005-B63E-0C365B3DA42A}.Release|x64.Build.0 = Release|Any CPU
{EDF434F6-70C0-4005-B63E-0C365B3DA42A}.Release|x86.ActiveCfg = Release|Any CPU
{EDF434F6-70C0-4005-B63E-0C365B3DA42A}.Release|x86.Build.0 = Release|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|ARM.ActiveCfg = Debug|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|ARM.Build.0 = Debug|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|x64.ActiveCfg = Debug|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|x64.Build.0 = Debug|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|x86.ActiveCfg = Debug|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Debug|x86.Build.0 = Debug|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|Any CPU.Build.0 = Release|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|ARM.ActiveCfg = Release|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|ARM.Build.0 = Release|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|x64.ActiveCfg = Release|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|x64.Build.0 = Release|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|x86.ActiveCfg = Release|Any CPU
{E4286D1D-A98C-4516-9E47-CBF9739448DA}.Release|x86.Build.0 = Release|Any CPU
{F1880F07-238F-4A3A-9E58-141350665E1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F1880F07-238F-4A3A-9E58-141350665E1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F1880F07-238F-4A3A-9E58-141350665E1F}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -376,22 +343,6 @@ Global
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x86.ActiveCfg = Release|x86
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x86.Build.0 = Release|x86
{926D446C-8358-465A-AFAC-2F9078C22262}.Release|x86.Deploy.0 = Release|x86
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Debug|ARM.ActiveCfg = Debug|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Debug|ARM.Build.0 = Debug|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Debug|x64.ActiveCfg = Debug|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Debug|x64.Build.0 = Debug|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Debug|x86.ActiveCfg = Debug|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Debug|x86.Build.0 = Debug|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Release|Any CPU.Build.0 = Release|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Release|ARM.ActiveCfg = Release|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Release|ARM.Build.0 = Release|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Release|x64.ActiveCfg = Release|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Release|x64.Build.0 = Release|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Release|x86.ActiveCfg = Release|Any CPU
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84}.Release|x86.Build.0 = Release|Any CPU
{36B101B1-720B-4770-B222-C6ADD464F9EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36B101B1-720B-4770-B222-C6ADD464F9EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36B101B1-720B-4770-B222-C6ADD464F9EC}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -608,6 +559,38 @@ Global
{B3D1A89E-CE12-4A0D-B23E-8970D681C719}.Release|x64.Build.0 = Release|Any CPU
{B3D1A89E-CE12-4A0D-B23E-8970D681C719}.Release|x86.ActiveCfg = Release|Any CPU
{B3D1A89E-CE12-4A0D-B23E-8970D681C719}.Release|x86.Build.0 = Release|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|ARM.ActiveCfg = Debug|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|ARM.Build.0 = Debug|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|x64.ActiveCfg = Debug|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|x64.Build.0 = Debug|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|x86.ActiveCfg = Debug|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Debug|x86.Build.0 = Debug|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|Any CPU.Build.0 = Release|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|ARM.ActiveCfg = Release|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|ARM.Build.0 = Release|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|x64.ActiveCfg = Release|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|x64.Build.0 = Release|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|x86.ActiveCfg = Release|Any CPU
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC}.Release|x86.Build.0 = Release|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|ARM.ActiveCfg = Debug|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|ARM.Build.0 = Debug|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|x64.ActiveCfg = Debug|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|x64.Build.0 = Debug|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|x86.ActiveCfg = Debug|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Debug|x86.Build.0 = Debug|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|Any CPU.Build.0 = Release|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|ARM.ActiveCfg = Release|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|ARM.Build.0 = Release|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|x64.ActiveCfg = Release|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|x64.Build.0 = Release|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|x86.ActiveCfg = Release|Any CPU
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -624,12 +607,9 @@ Global
{E587974C-19A9-426A-A952-216D5F883EB6} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{5DC68E83-ABE0-4887-B17E-1ED4EEE89C2C} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{437473EE-7FBB-4C28-96EC-41E1AEE161F3} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{AD4F83E5-4240-485D-BB5C-F43974F716E4} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{EDF434F6-70C0-4005-B63E-0C365B3DA42A} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{E4286D1D-A98C-4516-9E47-CBF9739448DA} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{F1880F07-238F-4A3A-9E58-141350665E1F} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{926D446C-8358-465A-AFAC-2F9078C22262} = {ECA5702B-5D32-4888-A34E-9461FC533F23}
{E9C52E5E-28DC-4D45-B9AB-1B2CF2924A84} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{36B101B1-720B-4770-B222-C6ADD464F9EC} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{D3804228-91F4-4502-9595-39584EA20000} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
{0077F262-D69B-44D2-8A7C-87D8D19022A6} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
Expand All @@ -643,6 +623,8 @@ Global
{85D70423-5800-41E9-B7D5-244AAF051A85} = {F5534C59-3A41-4A33-9E43-5CE0082A957F}
{D3804228-91F4-4502-9595-39584E519901} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
{B3D1A89E-CE12-4A0D-B23E-8970D681C719} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{1D30F4EB-3CD9-446C-BDFB-107F79F05BBC} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
{38FDDF50-5F86-4B6D-9062-F687C6FD41A8} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {94C56722-194E-4B8B-BC23-B3F754E89A20}
Expand Down
17 changes: 17 additions & 0 deletions src-console/ConsoleAppEF2.0/Database/ProductDynamic.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

namespace ConsoleAppEF2.Database
{
public class ProductDynamic
{
[Key]
public int Key { get; set; }

[NotMapped]
public dynamic Properties { get; set; }

public Dictionary<string, object> Dict { get; set; }
}
}

This file was deleted.

Loading