Merge branch 'master' into stef-PredefinedMethodsHelper

Author: StefH

README.md

@@ -47,7 +47,7 @@ public class MyCustomClass
 }
 ```
 If it's not possible to add that attribute, you need to implement a custom [CustomTypeProvider](https://dynamic-linq.net/advanced-configuration#customtypeprovider) and set this to the `ParsingConfig` and provide that config to all dynamic calls.
-Or provide a list of addtional types in the [DefaultDynamicLinqCustomTypeProvider.cs](https://github.com/zzzprojects/System.Linq.Dynamic.Core/blob/master/src/System.Linq.Dynamic.Core/CustomTypeProviders/DefaultDynamicLinqCustomTypeProvider.cs).
+Or provide a list of additional types in the [DefaultDynamicLinqCustomTypeProvider.cs](https://github.com/zzzprojects/System.Linq.Dynamic.Core/blob/master/src/System.Linq.Dynamic.Core/CustomTypeProviders/DefaultDynamicLinqCustomTypeProvider.cs).
 
 ### v1.6.0
 #### Change 1
@@ -61,6 +61,11 @@ Which means that only properties and fields can be used in the `OrderBy` / `Then
 This is done to mitigate the risk of calling methods or other expressions in the `OrderBy` / `ThenBy` which could lead to security issues.
 To allow these methods set `RestrictOrderByToPropertyOrField` to `false` in the `ParsingConfig` and provide that config to all dynamic calls.
 
+#### Change 3
+The `DefaultDynamicLinqCustomTypeProvider` has been changed to only return types which have the `[DynamicLinqType]` attribute applied.
+If it's not possible to add that attribute, you need to implement a custom [CustomTypeProvider](https://dynamic-linq.net/advanced-configuration#customtypeprovider) and set this to the `ParsingConfig` and provide that config to all dynamic calls.
+Or provide a list of additional types in the [DefaultDynamicLinqCustomTypeProvider.cs](https://github.com/zzzprojects/System.Linq.Dynamic.Core/blob/master/src/System.Linq.Dynamic.Core/CustomTypeProviders/DefaultDynamicLinqCustomTypeProvider.cs).
+
 ---
 
 ## Useful links

src/System.Linq.Dynamic.Core/CustomTypeProviders/AbstractDynamicLinqCustomTypeProvider.cs

@@ -66,16 +66,11 @@ protected Type[] FindTypesMarkedWithDynamicLinqTypeAttribute(IEnumerable<Assembl
         Check.NotNull(assemblies);
         Check.NotEmpty(simpleTypeName);
 
-        var types = FindTypesMarkedWithDynamicLinqTypeAttribute(assemblies);
+        var types = FindTypesMarkedWithDynamicLinqTypeAttribute(assemblies).Union(AdditionalTypes);
         var fullNames = types.Select(t => t.FullName!).Distinct().ToArray();
         var firstMatchingFullname = fullNames.FirstOrDefault(fn => fn.EndsWith($".{simpleTypeName}"));
 
-        if (firstMatchingFullname == null)
-        {
-            return null;
-        }
-
-        return types.FirstOrDefault(t => t.FullName == firstMatchingFullname);
+        return firstMatchingFullname == null ? null : types.FirstOrDefault(t => t.FullName == firstMatchingFullname);
     }
 
 #if (UAP10_0 || NETSTANDARD)

test/System.Linq.Dynamic.Core.Tests/CustomTypeProviders/DefaultDynamicLinqCustomTypeProviderTests.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq.Dynamic.Core.CustomTypeProviders;
+using System.Linq.Dynamic.Core.Tests.TestClasses;
 using FluentAssertions;
 using NFluent;
 using Xunit;
@@ -61,4 +62,34 @@ public void DefaultDynamicLinqCustomTypeProvider_ResolveType_DefinedReturnsType(
         // Assert
         Check.That(result).IsNotNull();
     }
+
+    [Fact]
+    public void DefaultDynamicLinqCustomTypeProvider_ResolveTypeBySimpleName_UsesAdditionalTypes()
+    {
+        // Act
+        var result = _sut.ResolveTypeBySimpleName(nameof(TestClassWithDynamicLinqAttribute));
+
+        // Assert
+        Check.That(result).IsNotNull();
+    }
+
+    [Fact]
+    public void DefaultDynamicLinqCustomTypeProvider_ResolveTypeBySimpleName_UsesTypesMarkedWithDynamicLinqTypeAttribute()
+    {
+        // Act
+        var result = _sut.ResolveTypeBySimpleName(nameof(DirectoryInfo));
+
+        // Assert
+        Check.That(result).IsNotNull();
+    }
+
+    [Fact]
+    public void DefaultDynamicLinqCustomTypeProvider_ResolveTypeBySimpleName_UnknownReturnsNull()
+    {
+        // Act
+        var result = _sut.ResolveTypeBySimpleName("Dummy123");
+
+        // Assert
+        Check.That(result).IsNull();
+    }
 }

test/System.Linq.Dynamic.Core.Tests/TestClasses/TestClassWithDynamicLinqAttribute.cs

@@ -0,0 +1,8 @@
+using System.Linq.Dynamic.Core.CustomTypeProviders;
+
+namespace System.Linq.Dynamic.Core.Tests.TestClasses;
+
+[DynamicLinqType]
+internal class TestClassWithDynamicLinqAttribute
+{
+}