Skip to content

Commit 0e2e1ee

Browse files
StefHStefH
authored
Update EntityFramework to version 6.5 to fix CVE (#819)
1 parent 2097d7c commit 0e2e1ee

37 files changed

+96
-1188
lines changed

‎System.Linq.Dynamic.Core.sln

-76
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2626
version.xml = version.xml
2727
EndProjectSection
2828
EndProject
29-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.DynamicLinq.Tests.net452", "test\EntityFramework.DynamicLinq.Tests.net452\EntityFramework.DynamicLinq.Tests.net452.csproj", "{6B45E89C-0788-4942-924F-EF6397114BD1}"
30-
EndProject
3129
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Dynamic.Core", "src\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj", "{D3804228-91F4-4502-9595-39584E510002}"
3230
EndProject
3331
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.DynamicLinq", "src\EntityFramework.DynamicLinq\EntityFramework.DynamicLinq.csproj", "{D3804228-91F4-4502-9595-39584E510000}"
@@ -47,10 +45,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test-xamarin", "test-xamari
4745
EndProject
4846
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_netcore2.0_EF2.0.1", "src-console\ConsoleAppEF2.0\ConsoleApp_netcore2.0_EF2.0.1.csproj", "{60CE11E0-E057-45A2-8F8A-73B1BD045BFB}"
4947
EndProject
50-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp_net40_sqlite_original", "src-console\System.Linq.Dynamic.Core.ConsoleTestApp.net40\ConsoleApp_net40_sqlite_original.csproj", "{0EB12661-F5CF-4071-9812-F4C8AF3D4531}"
51-
EndProject
52-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp_net40_sqlite", "src-console\ConsoleApp_net40_sqlite\ConsoleApp_net40_sqlite.csproj", "{E587974C-19A9-426A-A952-216D5F883EB6}"
53-
EndProject
5448
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp_net452_EF6", "src-console\ConsoleApp_net452_EF6\ConsoleApp_net452_EF6.csproj", "{5DC68E83-ABE0-4887-B17E-1ED4EEE89C2C}"
5549
EndProject
5650
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}"
@@ -84,10 +78,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docfx", "docfx", "{012536E6
8478
docfx\toc.yml = docfx\toc.yml
8579
EndProjectSection
8680
EndProject
87-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lab", "lab", "{E97833C1-77B6-44E2-8793-C1F952CA936F}"
88-
EndProject
89-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Z.Dynamic.Core.Lab", "Z.Dynamic.Core.Lab\Z.Dynamic.Core.Lab.csproj", "{CDD8D5BF-A212-43DD-B043-4B7242C553E0}"
90-
EndProject
9181
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3", "src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3.csproj", "{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}"
9282
EndProject
9383
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5", "src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5.csproj", "{D3804228-91F4-4502-9595-39584E519901}"
@@ -167,20 +157,6 @@ Global
167157
Release|x86 = Release|x86
168158
EndGlobalSection
169159
GlobalSection(ProjectConfigurationPlatforms) = postSolution
170-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
171-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
172-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Debug|ARM.ActiveCfg = Debug|Any CPU
173-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Debug|x64.ActiveCfg = Debug|Any CPU
174-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Debug|x64.Build.0 = Debug|Any CPU
175-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Debug|x86.ActiveCfg = Debug|Any CPU
176-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Debug|x86.Build.0 = Debug|Any CPU
177-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
178-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Release|Any CPU.Build.0 = Release|Any CPU
179-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Release|ARM.ActiveCfg = Release|Any CPU
180-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Release|x64.ActiveCfg = Release|Any CPU
181-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Release|x64.Build.0 = Release|Any CPU
182-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Release|x86.ActiveCfg = Release|Any CPU
183-
{6B45E89C-0788-4942-924F-EF6397114BD1}.Release|x86.Build.0 = Release|Any CPU
184160
{D3804228-91F4-4502-9595-39584E510002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
185161
{D3804228-91F4-4502-9595-39584E510002}.Debug|Any CPU.Build.0 = Debug|Any CPU
186162
{D3804228-91F4-4502-9595-39584E510002}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -277,38 +253,6 @@ Global
277253
{60CE11E0-E057-45A2-8F8A-73B1BD045BFB}.Release|x64.Build.0 = Release|Any CPU
278254
{60CE11E0-E057-45A2-8F8A-73B1BD045BFB}.Release|x86.ActiveCfg = Release|Any CPU
279255
{60CE11E0-E057-45A2-8F8A-73B1BD045BFB}.Release|x86.Build.0 = Release|Any CPU
280-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
281-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|Any CPU.Build.0 = Debug|Any CPU
282-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|ARM.ActiveCfg = Debug|Any CPU
283-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|ARM.Build.0 = Debug|Any CPU
284-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|x64.ActiveCfg = Debug|Any CPU
285-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|x64.Build.0 = Debug|Any CPU
286-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|x86.ActiveCfg = Debug|Any CPU
287-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Debug|x86.Build.0 = Debug|Any CPU
288-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Release|Any CPU.ActiveCfg = Release|Any CPU
289-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Release|Any CPU.Build.0 = Release|Any CPU
290-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Release|ARM.ActiveCfg = Release|Any CPU
291-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Release|ARM.Build.0 = Release|Any CPU
292-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Release|x64.ActiveCfg = Release|Any CPU
293-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Release|x64.Build.0 = Release|Any CPU
294-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Release|x86.ActiveCfg = Release|Any CPU
295-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531}.Release|x86.Build.0 = Release|Any CPU
296-
{E587974C-19A9-426A-A952-216D5F883EB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
297-
{E587974C-19A9-426A-A952-216D5F883EB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
298-
{E587974C-19A9-426A-A952-216D5F883EB6}.Debug|ARM.ActiveCfg = Debug|Any CPU
299-
{E587974C-19A9-426A-A952-216D5F883EB6}.Debug|ARM.Build.0 = Debug|Any CPU
300-
{E587974C-19A9-426A-A952-216D5F883EB6}.Debug|x64.ActiveCfg = Debug|Any CPU
301-
{E587974C-19A9-426A-A952-216D5F883EB6}.Debug|x64.Build.0 = Debug|Any CPU
302-
{E587974C-19A9-426A-A952-216D5F883EB6}.Debug|x86.ActiveCfg = Debug|Any CPU
303-
{E587974C-19A9-426A-A952-216D5F883EB6}.Debug|x86.Build.0 = Debug|Any CPU
304-
{E587974C-19A9-426A-A952-216D5F883EB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
305-
{E587974C-19A9-426A-A952-216D5F883EB6}.Release|Any CPU.Build.0 = Release|Any CPU
306-
{E587974C-19A9-426A-A952-216D5F883EB6}.Release|ARM.ActiveCfg = Release|Any CPU
307-
{E587974C-19A9-426A-A952-216D5F883EB6}.Release|ARM.Build.0 = Release|Any CPU
308-
{E587974C-19A9-426A-A952-216D5F883EB6}.Release|x64.ActiveCfg = Release|Any CPU
309-
{E587974C-19A9-426A-A952-216D5F883EB6}.Release|x64.Build.0 = Release|Any CPU
310-
{E587974C-19A9-426A-A952-216D5F883EB6}.Release|x86.ActiveCfg = Release|Any CPU
311-
{E587974C-19A9-426A-A952-216D5F883EB6}.Release|x86.Build.0 = Release|Any CPU
312256
{5DC68E83-ABE0-4887-B17E-1ED4EEE89C2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
313257
{5DC68E83-ABE0-4887-B17E-1ED4EEE89C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
314258
{5DC68E83-ABE0-4887-B17E-1ED4EEE89C2C}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -485,22 +429,6 @@ Global
485429
{CD80A3AC-B0E1-45ED-BE07-DE6A0F1D4CD8}.Release|x64.Build.0 = Release|Any CPU
486430
{CD80A3AC-B0E1-45ED-BE07-DE6A0F1D4CD8}.Release|x86.ActiveCfg = Release|Any CPU
487431
{CD80A3AC-B0E1-45ED-BE07-DE6A0F1D4CD8}.Release|x86.Build.0 = Release|Any CPU
488-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
489-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
490-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Debug|ARM.ActiveCfg = Debug|Any CPU
491-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Debug|ARM.Build.0 = Debug|Any CPU
492-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Debug|x64.ActiveCfg = Debug|Any CPU
493-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Debug|x64.Build.0 = Debug|Any CPU
494-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Debug|x86.ActiveCfg = Debug|Any CPU
495-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Debug|x86.Build.0 = Debug|Any CPU
496-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
497-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|Any CPU.Build.0 = Release|Any CPU
498-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|ARM.ActiveCfg = Release|Any CPU
499-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|ARM.Build.0 = Release|Any CPU
500-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|x64.ActiveCfg = Release|Any CPU
501-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|x64.Build.0 = Release|Any CPU
502-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|x86.ActiveCfg = Release|Any CPU
503-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0}.Release|x86.Build.0 = Release|Any CPU
504432
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
505433
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
506434
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -974,15 +902,12 @@ Global
974902
HideSolutionNode = FALSE
975903
EndGlobalSection
976904
GlobalSection(NestedProjects) = preSolution
977-
{6B45E89C-0788-4942-924F-EF6397114BD1} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
978905
{D3804228-91F4-4502-9595-39584E510002} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
979906
{D3804228-91F4-4502-9595-39584E510000} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
980907
{D3804228-91F4-4502-9595-39584E510001} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
981908
{912FBF24-3CAE-4A50-B5EA-E525B9FAEC80} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
982909
{BF97CB1B-5043-4256-8F42-CF3A4F3863BE} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
983910
{60CE11E0-E057-45A2-8F8A-73B1BD045BFB} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
984-
{0EB12661-F5CF-4071-9812-F4C8AF3D4531} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
985-
{E587974C-19A9-426A-A952-216D5F883EB6} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
986911
{5DC68E83-ABE0-4887-B17E-1ED4EEE89C2C} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
987912
{437473EE-7FBB-4C28-96EC-41E1AEE161F3} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
988913
{EDF434F6-70C0-4005-B63E-0C365B3DA42A} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
@@ -994,7 +919,6 @@ Global
994919
{D160E2CF-A7E1-4DDE-9AB8-8CFB0087DCEB} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
995920
{0034821E-740D-4553-821B-14CE9213C43C} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}
996921
{CD80A3AC-B0E1-45ED-BE07-DE6A0F1D4CD8} = {122BC4FA-7563-4E35-9D17-077F16F1629F}
997-
{CDD8D5BF-A212-43DD-B043-4B7242C553E0} = {E97833C1-77B6-44E2-8793-C1F952CA936F}
998922
{7994FECC-965C-4A5D-8B0E-1A6EA769D4BE} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
999923
{D3804228-91F4-4502-9595-39584E519901} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
1000924
{B3D1A89E-CE12-4A0D-B23E-8970D681C719} = {7971CAEB-B9F2-416B-966D-2D697C4C1E62}

‎Z.Dynamic.Core.Lab/Program.cs

-54
This file was deleted.

‎Z.Dynamic.Core.Lab/Request_AddMethod.cs

-41
This file was deleted.

‎Z.Dynamic.Core.Lab/Request_Dictionary.cs

-26
This file was deleted.

‎Z.Dynamic.Core.Lab/Request_DynamicLinqType.cs

-78
This file was deleted.

‎Z.Dynamic.Core.Lab/Request_GroupBy_IEqualityComparer.cs

-31
This file was deleted.

‎Z.Dynamic.Core.Lab/Request_LambdaAddFunc.cs

-17
This file was deleted.

0 commit comments

Comments
 (0)