diff --git a/src-console/ConsoleAppEF2.0.2_InMemory/Program.cs b/src-console/ConsoleAppEF2.0.2_InMemory/Program.cs index bb7c4486a..f89c8d087 100644 --- a/src-console/ConsoleAppEF2.0.2_InMemory/Program.cs +++ b/src-console/ConsoleAppEF2.0.2_InMemory/Program.cs @@ -24,8 +24,12 @@ public string GetDisplayName(bool a, bool b, bool c) } } - class C : AbstractDynamicLinqCustomTypeProvider, IDynamicLinkCustomTypeProvider + class C : AbstractDynamicLinqCustomTypeProvider, IDynamicLinqCustomTypeProvider { + public C() : base(new List<Type>()) + { + } + public HashSet<Type> GetCustomTypes() { // https://stackoverflow.com/a/2384679/255966 diff --git a/src-console/ConsoleAppEF2.0/Program.cs b/src-console/ConsoleAppEF2.0/Program.cs index 65fae7a7b..9848fd40e 100644 --- a/src-console/ConsoleAppEF2.0/Program.cs +++ b/src-console/ConsoleAppEF2.0/Program.cs @@ -14,8 +14,12 @@ namespace ConsoleAppEF2 { class Program { - class C : AbstractDynamicLinqCustomTypeProvider, IDynamicLinkCustomTypeProvider + class C : AbstractDynamicLinqCustomTypeProvider, IDynamicLinqCustomTypeProvider { + public C() : base(new List<Type>()) + { + } + public HashSet<Type> GetCustomTypes() { // https://stackoverflow.com/a/2384679/255966 diff --git a/src-console/ConsoleAppEF2.1.1/Program.cs b/src-console/ConsoleAppEF2.1.1/Program.cs index 99553a8dd..967f7f94a 100644 --- a/src-console/ConsoleAppEF2.1.1/Program.cs +++ b/src-console/ConsoleAppEF2.1.1/Program.cs @@ -15,8 +15,11 @@ namespace ConsoleAppEF211 { class Program { - class C : AbstractDynamicLinqCustomTypeProvider, IDynamicLinkCustomTypeProvider + class C : AbstractDynamicLinqCustomTypeProvider, IDynamicLinqCustomTypeProvider { + public C() : base(new List<Type>()) + { + } public HashSet<Type> GetCustomTypes() { // https://stackoverflow.com/a/2384679/255966 diff --git a/src-console/ConsoleAppEF2.1/Program.cs b/src-console/ConsoleAppEF2.1/Program.cs index b63663294..181ee690f 100644 --- a/src-console/ConsoleAppEF2.1/Program.cs +++ b/src-console/ConsoleAppEF2.1/Program.cs @@ -10,7 +10,7 @@ namespace ConsoleAppEF21 { class Program { - //class C : AbstractDynamicLinqCustomTypeProvider, IDynamicLinkCustomTypeProvider + //class C : AbstractDynamicLinqCustomTypeProvider, IDynamicLinqCustomTypeProvider //{ // public HashSet<Type> GetCustomTypes() // { diff --git a/src/System.Linq.Dynamic.Core/CustomTypeProviders/DefaultDynamicLinqCustomTypeProvider.cs b/src/System.Linq.Dynamic.Core/CustomTypeProviders/DefaultDynamicLinqCustomTypeProvider.cs index 0e4da9b6f..0b08d877e 100644 --- a/src/System.Linq.Dynamic.Core/CustomTypeProviders/DefaultDynamicLinqCustomTypeProvider.cs +++ b/src/System.Linq.Dynamic.Core/CustomTypeProviders/DefaultDynamicLinqCustomTypeProvider.cs @@ -12,7 +12,7 @@ namespace System.Linq.Dynamic.Core.CustomTypeProviders; /// /// This class is used as default for full .NET Framework and .NET Core App 2.x and higher. /// </summary> -public class DefaultDynamicLinqCustomTypeProvider : AbstractDynamicLinqCustomTypeProvider, IDynamicLinkCustomTypeProvider +public class DefaultDynamicLinqCustomTypeProvider : AbstractDynamicLinqCustomTypeProvider, IDynamicLinqCustomTypeProvider { private readonly IAssemblyHelper _assemblyHelper; private readonly bool _cacheCustomTypes; diff --git a/src/System.Linq.Dynamic.Core/ParsingConfig.cs b/src/System.Linq.Dynamic.Core/ParsingConfig.cs index 4886577b3..66bb53fd6 100644 --- a/src/System.Linq.Dynamic.Core/ParsingConfig.cs +++ b/src/System.Linq.Dynamic.Core/ParsingConfig.cs @@ -13,7 +13,7 @@ namespace System.Linq.Dynamic.Core; /// </summary> public class ParsingConfig { - private IDynamicLinkCustomTypeProvider? _customTypeProvider; + private IDynamicLinqCustomTypeProvider? _customTypeProvider; private IExpressionPromoter? _expressionPromoter; private IQueryableAnalyzer? _queryableAnalyzer; @@ -52,9 +52,9 @@ public class ParsingConfig public bool IsCaseSensitive { get; set; } /// <summary> - /// Gets or sets the <see cref="IDynamicLinkCustomTypeProvider"/>. + /// Gets or sets the <see cref="IDynamicLinqCustomTypeProvider"/>. /// </summary> - public IDynamicLinkCustomTypeProvider? CustomTypeProvider + public IDynamicLinqCustomTypeProvider? CustomTypeProvider { get { diff --git a/test-xamarin/WindowsUniversalTestApp14393/WindowsAppCustomTypeProvider.cs b/test-xamarin/WindowsUniversalTestApp14393/WindowsAppCustomTypeProvider.cs index bdb6b4964..e637a5f62 100644 --- a/test-xamarin/WindowsUniversalTestApp14393/WindowsAppCustomTypeProvider.cs +++ b/test-xamarin/WindowsUniversalTestApp14393/WindowsAppCustomTypeProvider.cs @@ -8,7 +8,7 @@ namespace WindowsUniversalTestApp14393 { - class WindowsAppCustomTypeProvider : AbstractDynamicLinqCustomTypeProvider, IDynamicLinkCustomTypeProvider + class WindowsAppCustomTypeProvider : AbstractDynamicLinqCustomTypeProvider, IDynamicLinqCustomTypeProvider { public HashSet<Type> GetCustomTypes() { diff --git a/test-xamarin/WindowsUniversalTestApp16299/WindowsAppCustomTypeProvider.cs b/test-xamarin/WindowsUniversalTestApp16299/WindowsAppCustomTypeProvider.cs index 7952b3e7b..7e7c47478 100644 --- a/test-xamarin/WindowsUniversalTestApp16299/WindowsAppCustomTypeProvider.cs +++ b/test-xamarin/WindowsUniversalTestApp16299/WindowsAppCustomTypeProvider.cs @@ -8,7 +8,7 @@ namespace WindowsUniversalTestApp16299 { - class WindowsAppCustomTypeProvider : AbstractDynamicLinqCustomTypeProvider, IDynamicLinkCustomTypeProvider + class WindowsAppCustomTypeProvider : AbstractDynamicLinqCustomTypeProvider, IDynamicLinqCustomTypeProvider { public HashSet<Type> GetCustomTypes() { diff --git a/test/System.Linq.Dynamic.Core.Tests/DynamicExpressionParserTests.cs b/test/System.Linq.Dynamic.Core.Tests/DynamicExpressionParserTests.cs index 9260cf8d7..f56283c0c 100644 --- a/test/System.Linq.Dynamic.Core.Tests/DynamicExpressionParserTests.cs +++ b/test/System.Linq.Dynamic.Core.Tests/DynamicExpressionParserTests.cs @@ -637,7 +637,7 @@ public void DynamicExpressionParser_ParseLambda_IQueryable() public void DynamicExpressionParser_ParseLambda_Issue58() { // Arrange - var customTypeProvider = new Mock<IDynamicLinkCustomTypeProvider>(); + var customTypeProvider = new Mock<IDynamicLinqCustomTypeProvider>(); customTypeProvider.Setup(c => c.GetCustomTypes()).Returns([typeof(MyClass)]); var config = new ParsingConfig { @@ -1774,7 +1774,7 @@ public void DynamicExpressionParser_ParseLambda_StringEquals_WithMemberString() public void DynamicExpressionParser_ParseLambda_NullPropagation_InstanceMethod_0_Arguments() { // Arrange - var customTypeProvider = new Mock<IDynamicLinkCustomTypeProvider>(); + var customTypeProvider = new Mock<IDynamicLinqCustomTypeProvider>(); customTypeProvider.Setup(c => c.GetCustomTypes()).Returns([typeof(Foo)]); var config = new ParsingConfig { @@ -1797,7 +1797,7 @@ public void DynamicExpressionParser_ParseLambda_NullPropagation_InstanceMethod_0 public void DynamicExpressionParser_ParseLambda_NullPropagation_InstanceMethod_1_Argument() { // Arrange - var customTypeProvider = new Mock<IDynamicLinkCustomTypeProvider>(); + var customTypeProvider = new Mock<IDynamicLinqCustomTypeProvider>(); customTypeProvider.Setup(c => c.GetCustomTypes()).Returns([typeof(Foo)]); var config = new ParsingConfig { @@ -1820,7 +1820,7 @@ public void DynamicExpressionParser_ParseLambda_NullPropagation_InstanceMethod_1 public void DynamicExpressionParser_ParseLambda_NullPropagation_InstanceMethod_2_Arguments() { // Arrange - var customTypeProvider = new Mock<IDynamicLinkCustomTypeProvider>(); + var customTypeProvider = new Mock<IDynamicLinqCustomTypeProvider>(); customTypeProvider.Setup(c => c.GetCustomTypes()).Returns([typeof(Foo)]); var config = new ParsingConfig { diff --git a/test/System.Linq.Dynamic.Core.Tests/ExpressionTests.MethodCall.cs b/test/System.Linq.Dynamic.Core.Tests/ExpressionTests.MethodCall.cs index 067900742..dc7d60fe4 100644 --- a/test/System.Linq.Dynamic.Core.Tests/ExpressionTests.MethodCall.cs +++ b/test/System.Linq.Dynamic.Core.Tests/ExpressionTests.MethodCall.cs @@ -12,7 +12,7 @@ public partial class ExpressionTests { private static ParsingConfig CreateParsingConfigForMethodCallTests() { - var customTypeProvider = new Mock<IDynamicLinkCustomTypeProvider>(); + var customTypeProvider = new Mock<IDynamicLinqCustomTypeProvider>(); customTypeProvider.Setup(c => c.GetCustomTypes()).Returns(new HashSet<Type> { typeof(User), typeof(Methods), typeof(Foo) }); return new ParsingConfig { diff --git a/test/System.Linq.Dynamic.Core.Tests/ExpressionTests.cs b/test/System.Linq.Dynamic.Core.Tests/ExpressionTests.cs index 74abc9cd7..7190cbd1f 100644 --- a/test/System.Linq.Dynamic.Core.Tests/ExpressionTests.cs +++ b/test/System.Linq.Dynamic.Core.Tests/ExpressionTests.cs @@ -339,7 +339,7 @@ public void ExpressionTests_Cast_To_FullTypeNullableEnum_Using_DynamicLinqType() public void ExpressionTests_Cast_To_Enum_Using_CustomTypeProvider() { // Arrange - var dynamicLinqCustomTypeProviderMock = new Mock<IDynamicLinkCustomTypeProvider>(); + var dynamicLinqCustomTypeProviderMock = new Mock<IDynamicLinqCustomTypeProvider>(); dynamicLinqCustomTypeProviderMock.Setup(d => d.GetCustomTypes()).Returns(new HashSet<Type> { typeof(SimpleValuesModelEnum) }); var config = new ParsingConfig { @@ -380,7 +380,7 @@ public void ExpressionTests_Cast_To_NullableEnum_Using_DynamicLinqType() public void ExpressionTests_Cast_To_NullableEnum_Using_CustomTypeProvider() { // Arrange - var dynamicLinqCustomTypeProviderMock = new Mock<IDynamicLinkCustomTypeProvider>(); + var dynamicLinqCustomTypeProviderMock = new Mock<IDynamicLinqCustomTypeProvider>(); dynamicLinqCustomTypeProviderMock.Setup(d => d.GetCustomTypes()).Returns(new HashSet<Type> { typeof(SimpleValuesModelEnum), diff --git a/test/System.Linq.Dynamic.Core.Tests/Parser/ExpressionParserTests.cs b/test/System.Linq.Dynamic.Core.Tests/Parser/ExpressionParserTests.cs index 644f6ef1e..5770152b8 100644 --- a/test/System.Linq.Dynamic.Core.Tests/Parser/ExpressionParserTests.cs +++ b/test/System.Linq.Dynamic.Core.Tests/Parser/ExpressionParserTests.cs @@ -13,7 +13,7 @@ namespace System.Linq.Dynamic.Core.Tests.Parser; public partial class ExpressionParserTests { - private readonly Mock<IDynamicLinkCustomTypeProvider> _dynamicTypeProviderMock; + private readonly Mock<IDynamicLinqCustomTypeProvider> _dynamicTypeProviderMock; private readonly ParsingConfig _parsingConfig; @@ -34,7 +34,7 @@ public class MyView public ExpressionParserTests() { - _dynamicTypeProviderMock = new Mock<IDynamicLinkCustomTypeProvider>(); + _dynamicTypeProviderMock = new Mock<IDynamicLinqCustomTypeProvider>(); _dynamicTypeProviderMock.Setup(dt => dt.GetCustomTypes()).Returns(new HashSet<Type>() { typeof(Company), typeof(MainCompany) }); _dynamicTypeProviderMock.Setup(dt => dt.ResolveType(typeof(Company).FullName!)).Returns(typeof(Company)); _dynamicTypeProviderMock.Setup(dt => dt.ResolveType(typeof(MainCompany).FullName!)).Returns(typeof(MainCompany)); diff --git a/test/System.Linq.Dynamic.Core.Tests/Parser/ExpressionPromoterTests.cs b/test/System.Linq.Dynamic.Core.Tests/Parser/ExpressionPromoterTests.cs index f500a5b87..267ea9994 100644 --- a/test/System.Linq.Dynamic.Core.Tests/Parser/ExpressionPromoterTests.cs +++ b/test/System.Linq.Dynamic.Core.Tests/Parser/ExpressionPromoterTests.cs @@ -15,11 +15,11 @@ public class SampleDto } private readonly Mock<IExpressionPromoter> _expressionPromoterMock; - private readonly Mock<IDynamicLinkCustomTypeProvider> _dynamicLinkCustomTypeProviderMock; + private readonly Mock<IDynamicLinqCustomTypeProvider> _dynamicLinkCustomTypeProviderMock; public ExpressionPromoterTests() { - _dynamicLinkCustomTypeProviderMock = new Mock<IDynamicLinkCustomTypeProvider>(); + _dynamicLinkCustomTypeProviderMock = new Mock<IDynamicLinqCustomTypeProvider>(); _dynamicLinkCustomTypeProviderMock.Setup(d => d.GetCustomTypes()).Returns(new HashSet<Type>()); _dynamicLinkCustomTypeProviderMock.Setup(d => d.ResolveType(It.IsAny<string>())).Returns(typeof(SampleDto)); diff --git a/test/System.Linq.Dynamic.Core.Tests/Parser/TypeFinderTests.cs b/test/System.Linq.Dynamic.Core.Tests/Parser/TypeFinderTests.cs index a4175e0a0..2d639a2b4 100644 --- a/test/System.Linq.Dynamic.Core.Tests/Parser/TypeFinderTests.cs +++ b/test/System.Linq.Dynamic.Core.Tests/Parser/TypeFinderTests.cs @@ -16,7 +16,7 @@ public class TypeFinderTests public TypeFinderTests() { - var dynamicTypeProviderMock = new Mock<IDynamicLinkCustomTypeProvider>(); + var dynamicTypeProviderMock = new Mock<IDynamicLinqCustomTypeProvider>(); dynamicTypeProviderMock.Setup(dt => dt.ResolveType(typeof(BaseEmployee).FullName!)).Returns(typeof(BaseEmployee)); dynamicTypeProviderMock.Setup(dt => dt.ResolveType(typeof(Boss).FullName!)).Returns(typeof(Boss)); dynamicTypeProviderMock.Setup(dt => dt.ResolveType(typeof(Worker).FullName!)).Returns(typeof(Worker)); diff --git a/test/System.Linq.Dynamic.Core.Tests/QueryableTests.Methods.cs b/test/System.Linq.Dynamic.Core.Tests/QueryableTests.Methods.cs index 04b14dd4a..01f79daaf 100644 --- a/test/System.Linq.Dynamic.Core.Tests/QueryableTests.Methods.cs +++ b/test/System.Linq.Dynamic.Core.Tests/QueryableTests.Methods.cs @@ -11,7 +11,7 @@ public partial class QueryableTests public void CallMethod() { // Arrange - var customTypeProvider = new Mock<IDynamicLinkCustomTypeProvider>(); + var customTypeProvider = new Mock<IDynamicLinqCustomTypeProvider>(); customTypeProvider.Setup(c => c.GetCustomTypes()).Returns(new HashSet<Type> { typeof(Test) }); var config = new ParsingConfig { @@ -30,7 +30,7 @@ public void CallMethod() public void CallMethodWhichReturnsNullable() { // Arrange - var customTypeProvider = new Mock<IDynamicLinkCustomTypeProvider>(); + var customTypeProvider = new Mock<IDynamicLinqCustomTypeProvider>(); customTypeProvider.Setup(c => c.GetCustomTypes()).Returns(new HashSet<Type> { typeof(Test) }); var config = new ParsingConfig { @@ -49,7 +49,7 @@ public void CallMethodWhichReturnsNullable() public void CallMethodWhichReturnsNullable_WithValue() { // Arrange - var customTypeProvider = new Mock<IDynamicLinkCustomTypeProvider>(); + var customTypeProvider = new Mock<IDynamicLinqCustomTypeProvider>(); customTypeProvider.Setup(c => c.GetCustomTypes()).Returns(new HashSet<Type> { typeof(Test) }); var config = new ParsingConfig { diff --git a/test/System.Linq.Dynamic.Core.Tests/TestClasses/TestCustomTypeProvider.cs b/test/System.Linq.Dynamic.Core.Tests/TestClasses/TestCustomTypeProvider.cs index ccb883c18..b18139652 100644 --- a/test/System.Linq.Dynamic.Core.Tests/TestClasses/TestCustomTypeProvider.cs +++ b/test/System.Linq.Dynamic.Core.Tests/TestClasses/TestCustomTypeProvider.cs @@ -5,7 +5,7 @@ namespace System.Linq.Dynamic.Core.Tests { - public class TestCustomTypeProvider : AbstractDynamicLinqCustomTypeProvider, IDynamicLinkCustomTypeProvider + public class TestCustomTypeProvider : AbstractDynamicLinqCustomTypeProvider, IDynamicLinqCustomTypeProvider { private HashSet<Type>? _customTypes;