,

Author: StefH

test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net461;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net461;net8.0;net9.0;net10.0</TargetFrameworks>
         <DebugType>full</DebugType>
         <DefineConstants>EF;NET461</DefineConstants>
         <AssemblyName>EntityFramework.DynamicLinq.Tests</AssemblyName>
@@ -58,20 +58,25 @@
         <Reference Include="System" />
         <Reference Include="Microsoft.CSharp" />
         <PackageReference Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.1" />
-        <PackageReference Include="LinqKit.EntityFramework" Version="1.1.15" />
+        <PackageReference Include="LinqKit.EntityFramework" Version="1.3.9" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
-        <PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="8.1.6" />
+        <PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="8.1.9" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
-        <PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="9.0.6" />
+        <PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="9.0.9" />
     </ItemGroup>
 
-    <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0' ">
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" />
+        <PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="10.0.9" />
+    </ItemGroup>
+
+    <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net10.0' ">
         <DefineConstants>$(DefineConstants);AspNetCoreIdentity</DefineConstants>
     </PropertyGroup>
 

test/System.Linq.Dynamic.Core.SystemTextJson.Tests/Extensions/JsonDocumentExtensionsTests.cs

@@ -1,7 +1,7 @@
 using System.Linq.Dynamic.Core.SystemTextJson.Extensions;
 using System.Text;
 using System.Text.Json;
-using FluentAssertions;
+using AwesomeAssertions;
 using Xunit;
 
 namespace System.Linq.Dynamic.Core.SystemTextJson.Tests.Extensions;

test/System.Linq.Dynamic.Core.Tests/DynamicClassTest.cs

@@ -109,7 +109,11 @@ public void DynamicClass_GetPropertyValue_Should_Work()
         value.Should().Be(test);
     }
 
+#if NET461
+    [Fact(Skip = "Does not work for .NET 4.6.1")]
+#else
     [Fact]
+#endif
     public void DynamicClass_GettingValue_ByIndex_Should_Work()
     {
         // Arrange
@@ -127,7 +131,11 @@ public void DynamicClass_GettingValue_ByIndex_Should_Work()
         value.Should().Be(test);
     }
 
+#if NET461
+    [Fact(Skip = "Does not work for .NET 4.6.1")]
+#else
     [Fact]
+#endif
     public void DynamicClass_SettingExistingPropertyValue_ByIndex_Should_Work()
     {
         // Arrange
@@ -151,7 +159,11 @@ public void DynamicClass_SettingExistingPropertyValue_ByIndex_Should_Work()
         value.Should().Be(newValue);
     }
 
+#if NET461
+    [Fact(Skip = "Does not work for .NET 4.6.1")]
+#else
     [Fact]
+#endif
     public void DynamicClass_SettingNewProperty_ByIndex_Should_Work()
     {
         // Arrange

test/System.Linq.Dynamic.Core.Tests/QueryableTests.Where.cs

@@ -157,8 +157,9 @@ public void Where_Dynamic_Exceptions()
         Assert.Throws<ArgumentNullException>(() => qry.Where((string?)null));
         Assert.Throws<ArgumentException>(() => qry.Where(""));
         Assert.Throws<ArgumentException>(() => qry.Where(" "));
-        var parsingConfigException = Assert.Throws<ArgumentException>(() => qry.Where("UserName == \"x\"", ParsingConfig.Default));
-        Assert.Equal("The ParsingConfig should be provided as first argument to this method. (Parameter 'args')", parsingConfigException.Message);
+
+        Action act = () => qry.Where("UserName == \"x\"", ParsingConfig.Default);
+        act.Should().Throw<ArgumentException>().WithMessage("The ParsingConfig should be provided as first argument to this method.*");
     }
 
     [Fact]