Skip to content

Commit 4bf2e04

Browse files
StefHStefH
authored
Update dependencies (Newtonsoft.Json and more) (#612)
* Update dependencies (Newtonsoft.Json and more) * fix tests * .
1 parent 60be036 commit 4bf2e04

File tree

156 files changed

+33740
-28060
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+33740
-28060
lines changed

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

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32
using System.Linq;
43
using System.Linq.Dynamic.Core;
5-
using System.Linq.Expressions;
6-
using Newtonsoft.Json;
74

85
namespace Z.Dynamic.Core.Lab
96
{
10-
class Program
11-
{
7+
class Program
8+
{
129
public class Foo
1310
{
1411
public string? Bar { get; set; }
@@ -19,9 +16,9 @@ static void Main(string[] args)
1916
{
2017
var expression = "np(Bar.Length)";
2118

22-
var results = (new List<Foo>() { new Foo()}).AsQueryable().Select("np(Baz().Length)").ToDynamicList();
19+
var results = (new List<Foo>() { new Foo() }).AsQueryable().Select("np(Baz().Length)").ToDynamicList();
20+
2321

24-
2522

2623

2724
Request_LambdaAddFunc.Execute();
@@ -53,5 +50,5 @@ static void Main(string[] args)
5350

5451
//Request_Dictionary.Execute();
5552
}
56-
}
57-
}
53+
}
54+
}

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

+3-13
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
using System;
2-
using System.Collections;
3-
using System.Collections.Generic;
1+
using System.Collections.Generic;
42
using System.Linq;
53
using System.Linq.Dynamic.Core;
6-
using System.Linq.Dynamic.Core.Parser;
7-
using System.Linq.Expressions;
8-
using System.Text;
94

105
namespace Z.Dynamic.Core.Lab
116
{
@@ -24,28 +19,23 @@ public class Order
2419

2520
public static void Execute()
2621
{
27-
List<Customer> customers = new List<Customer>()
22+
var customers = new List<Customer>()
2823
{
2924
new Customer() { City = "ZZZ1", CompanyName = "ZZZ", Orders = new Dictionary<string, Order>() },
3025
new Customer() { City = "ZZZ2", CompanyName = "ZZZ", Orders = new Dictionary<string, Order>() },
3126
new Customer() { City = "ZZZ3", CompanyName = "ZZZ", Orders = new Dictionary<string, Order>() }
3227
};
3328
customers.ForEach(x => x.Orders.Add(x.City + "TEST", new Order()));
3429

35-
36-
3730
var query = customers.AsQueryable()
3831
.Where("Orders.ContainsKey(\"ZZZ2TEST\")", "ZZZ", 1)
3932
.OrderBy("CompanyName")
4033
.Select("new(City as City, Phone)").ToDynamicList();
4134

42-
43-
44-
4535
var data = customers.AsQueryable()
4636
.Where("Orders.ContainsKey(it.City + \"TEST\")")
4737
.OrderBy("City")
4838
.Select("new(City as City, Phone)").ToDynamicList();
4939
}
5040
}
51-
}
41+
}

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32
using System.Linq.Dynamic.Core;
43
using System.Linq.Dynamic.Core.CustomTypeProviders;
54
using System.Linq.Expressions;
6-
using System.Text;
75

86
namespace Z.Dynamic.Core.Lab
97
{
@@ -25,4 +23,4 @@ public static void Execute()
2523
var x2 = lambda.DynamicInvoke(CreateDicParameter("John"));
2624
}
2725
}
28-
}
26+
}

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

+4-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
using System;
2-
using System.Collections;
3-
using System.Collections.Generic;
1+
using System.Collections.Generic;
42
using System.Linq;
53
using System.Linq.Dynamic.Core;
64
using System.Linq.Dynamic.Core.CustomTypeProviders;
7-
using System.Linq.Dynamic.Core.Parser;
8-
using System.Linq.Expressions;
9-
using System.Text;
105

116
namespace Z.Dynamic.Core.Lab
127
{
@@ -48,9 +43,6 @@ public static string[] ConvertToArray(int a, params string[] values)
4843

4944
public class Request_DynamicLinqType
5045
{
51-
52-
53-
5446
public static void Execute()
5547
{
5648
var externals = new Dictionary<string, object>
@@ -66,14 +58,14 @@ public static void Execute()
6658
//LambdaExpression expression = DynamicExpressionParser.ParseLambda(null, query, externals);
6759
//Delegate del = expression.Compile();
6860
//var result = del.DynamicInvoke();
69-
61+
7062
var config = new ParsingConfig();
7163

7264
//var list = new[] { new X { }, new X { Values = new[] { "a", "b" } } }.AsQueryable();
7365
//var result = list.Select("Utils.ConvertToArray(Values)").ToDynamicList<string[]>();
7466

7567

76-
var list = new[] { new X { Test = 1}, new X { Test = 2}}.AsQueryable();
68+
var list = new[] { new X { Test = 1 }, new X { Test = 2 } }.AsQueryable();
7769
var result = list.Select("Test.IncrementMe(5)").ToDynamicList<int>();
7870
}
7971

@@ -83,4 +75,4 @@ public class X
8375
public string[] Values { get; set; }
8476
}
8577
}
86-
}
78+
}

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Linq.Dynamic.Core;
5-
using System.Text;
65

76
namespace Z.Dynamic.Core.Lab
87
{
@@ -21,12 +20,12 @@ public class Order
2120

2221
public static void Execute()
2322
{
24-
List<Customer> customers = new List<Customer>() { new Customer() { City = "ZZZ" }, new Customer() { City = "ZzZ" } };
23+
var customers = new List<Customer>() { new Customer() { City = "ZZZ" }, new Customer() { City = "ZzZ" } };
2524
var check = customers.GroupBy(x => x.City, StringComparer.InvariantCultureIgnoreCase).ToList();
2625

2726
var query = customers.AsQueryable().GroupBy("City", StringComparer.InvariantCultureIgnoreCase).ToDynamicList();
2827
var queray = customers.AsQueryable().GroupBy("City", "new(CompanyName as Name, Phone)", StringComparer.InvariantCultureIgnoreCase).ToDynamicList();
2928
var queraay = customers.AsQueryable().GroupBy("City", "new(CompanyName as Name, Phone)" ).ToDynamicList();
3029
}
3130
}
32-
}
31+
}

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Linq.Dynamic.Core;
43
using System.Linq.Expressions;
5-
using System.Text;
64

75
namespace Z.Dynamic.Core.Lab
86
{
@@ -16,4 +14,4 @@ public static void Execute()
1614
var r1 = expression2(3);
1715
}
1816
}
19-
}
17+
}

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

+12-11
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.Globalization;
44
using System.Linq;
55
using System.Linq.Dynamic.Core;
6-
using System.Text;
76

87
namespace Z.Dynamic.Core.Lab
98
{
@@ -22,21 +21,23 @@ public class Order
2221

2322
public static void Execute()
2423
{
25-
List<Customer> customers = new List<Customer>() { new Customer() { CompanyName = "Ååå"} ,
26-
new Customer() { CompanyName = "Bbb" } ,
27-
new Customer() { CompanyName = "Ååå" } ,
28-
new Customer() { CompanyName = "Bbb" } ,
29-
new Customer() { CompanyName = "Aaa" },
30-
new Customer() { CompanyName = "Aaa" },
31-
};
24+
var customers = new List<Customer>
25+
{
26+
new Customer { CompanyName = "Ååå" },
27+
new Customer { CompanyName = "Bbb" },
28+
new Customer { CompanyName = "Ååå" },
29+
new Customer { CompanyName = "Bbb" },
30+
new Customer { CompanyName = "Aaa" },
31+
new Customer { CompanyName = "Aaa" }
32+
};
3233

33-
CultureInfo culture = new CultureInfo("nb-NO");
34+
var culture = new CultureInfo("nb-NO");
3435
var test1 = customers.AsQueryable().OrderBy(x => x.CompanyName, StringComparer.Create(culture, true)).ToList();
3536
var test2 = customers.AsQueryable().OrderBy(x => x.CompanyName).ToList();
3637
var test3 = customers.AsQueryable()
3738
.OrderBy("City").ThenBy("CompanyName", StringComparer.Create(culture, true)).ToDynamicList();
38-
var test4 = customers.AsQueryable()
39-
.OrderBy("CompanyName", StringComparer.Create(culture, true)).ToDynamicList();
39+
var test4 = customers.AsQueryable()
40+
.OrderBy("CompanyName", StringComparer.Create(culture, true)).ToDynamicList();
4041
}
4142
}
4243
}

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

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using System;
2+
using System.Collections;
23
using System.Collections.Generic;
3-
using System.Linq;
44
using System.Linq.Dynamic.Core;
5-
using System.Collections;
65
using System.Linq.Expressions;
7-
using System.Text;
86

97
namespace Z.Dynamic.Core.Lab
108
{
@@ -19,20 +17,20 @@ class DataClass
1917
public static void Execute()
2018
{
2119

22-
bool isTrue = true;
20+
var isTrue = true;
2321
var abc = new List<DataClass>() { new DataClass() { IsTrue = false, Name = "1" } };
2422
var x = new List<ParameterExpression>();
2523
x.Add(Expression.Parameter(isTrue.GetType(), "isTrue"));
26-
x.Add(Expression.Parameter(abc.GetType(), "abc"));
24+
x.Add(Expression.Parameter(abc.GetType(), "abc"));
2725

2826
var config = new ParsingConfig();
29-
string query = "abc.Where(IsTrue == true)";
27+
var query = "abc.Where(IsTrue == true)";
3028
config.IsCaseSensitive = true;
3129
var e = DynamicExpressionParser.ParseLambda(config, x.ToArray(), null, query);
32-
Delegate del = e.Compile();
33-
var result = ((IEnumerable)del.DynamicInvoke(isTrue, abc)).GetEnumerator();
30+
var del = e.Compile();
31+
var result = ((IEnumerable)del.DynamicInvoke(isTrue, abc)).GetEnumerator();
3432
result.MoveNext();
3533
var t = result.Current;
3634
}
3735
}
38-
}
36+
}

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Linq.Dynamic.Core;
44
using System.Linq.Expressions;
5-
using System.Text;
65

76
namespace Z.Dynamic.Core.Lab
87
{
@@ -15,10 +14,10 @@ public static void Execute()
1514
x.Add(Expression.Parameter(strArray.GetType(), "strArray"));
1615

1716
var config = new ParsingConfig();
18-
string query = "string.Join(\",\" , strArray)";
17+
var query = "string.Join(\",\" , strArray)";
1918

2019
var e = DynamicExpressionParser.ParseLambda(config, x.ToArray(), null, query);
21-
Delegate del = e.Compile();
20+
var del = e.Compile();
2221
var result = del.DynamicInvoke(strArray);
2322

2423
//var intArray = new[] { 1, 2, 3, 4 };
@@ -33,4 +32,4 @@ public static void Execute()
3332
//var result = del.DynamicInvoke(intArray);
3433
}
3534
}
36-
}
35+
}

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

+5-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.Collections.Generic;
44
using System.Linq.Dynamic.Core;
55
using System.Linq.Expressions;
6-
using System.Text;
76

87
namespace Z.Dynamic.Core.Lab
98
{
@@ -19,17 +18,17 @@ class DataClass
1918
public static void Execute()
2019
{
2120

22-
bool isTrue = true;
21+
var isTrue = true;
2322
var abc = new List<DataClass>() { new DataClass() { IsTrue = true, Name = "1" } };
24-
var x = new List<ParameterExpression>();
23+
var x = new List<ParameterExpression>();
2524
x.Add(Expression.Parameter(abc.GetType(), "abc"));
2625

2726
var config = new ParsingConfig();
28-
string query = "abc.Where(IsTrue == true)";
27+
var query = "abc.Where(IsTrue == true)";
2928
config.IsCaseSensitive = true;
3029
var e = DynamicExpressionParser.ParseLambda(config, x.ToArray(), null, query);
31-
Delegate del = e.Compile();
32-
var result = ((IEnumerable)del.DynamicInvoke( abc)).GetEnumerator();
30+
var del = e.Compile();
31+
var result = ((IEnumerable)del.DynamicInvoke(abc)).GetEnumerator();
3332
result.MoveNext();
3433
var t = result.Current;
3534
}

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32
using System.Linq;
4-
using System.Text;
53
using System.Linq.Dynamic.Core;
64

75
namespace Z.Dynamic.Core.Lab
@@ -13,15 +11,15 @@ public class Customer
1311
public string City { get; set; }
1412
public List<Order> Orders { get; set; }
1513
public string CompanyName { get; set; }
16-
public string Phone { get; set; }
14+
public string Phone { get; set; }
1715
}
1816
public class Order
19-
{
17+
{
2018
}
2119

2220
public static void Execute()
2321
{
24-
List<Customer> customers = new List<Customer>() {new Customer() {City = "ZZZ", CompanyName = "ZZZ", Orders = new List<Order>() {new Order()}, Phone = "555 5555"}};
22+
var customers = new List<Customer>() { new Customer() { City = "ZZZ", CompanyName = "ZZZ", Orders = new List<Order>() { new Order() }, Phone = "555 5555" } };
2523

2624
var query = customers.AsQueryable()
2725
.Where("City == @0 and Orders.Count >= @1", "ZZZ", 1)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
9+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1010
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
1111
</ItemGroup>
1212

0 commit comments

Comments
 (0)