multitarget the tests again

dadhi · dadhi · commit 3d9bfe70658c · 2025-04-26T11:14:43.000+02:00
diff --git a/build.bat b/build.bat
@@ -28,7 +28,9 @@ echo:
 echo:## Starting: TESTS...
 echo:
 
-dotnet run --no-build %LatestSupportedNetProp% %FrameworkParam% -c:Release --project test/FastExpressionCompiler.TestsRunner
+dotnet run --no-build net9.0 %FrameworkParam% -c:Release --project test/FastExpressionCompiler.TestsRunner
+dotnet run --no-build net8.0 %FrameworkParam% -c:Release --project test/FastExpressionCompiler.TestsRunner
+dotnet run --no-build net6.0 %FrameworkParam% -c:Release --project test/FastExpressionCompiler.TestsRunner
 if %ERRORLEVEL% neq 0 goto :error
 
 dotnet run --no-build -c:Release --project test/FastExpressionCompiler.TestsRunner.Net472
diff --git a/test/FastExpressionCompiler.ILDecoder/FastExpressionCompiler.ILDecoder.csproj b/test/FastExpressionCompiler.ILDecoder/FastExpressionCompiler.ILDecoder.csproj
@@ -1,9 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net7.0' ">net472;net7.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net8.0' ">net472;net8.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net9.0' ">net472;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net9.0' ">net472;net9.0;net8.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/FastExpressionCompiler.IssueTests/FastExpressionCompiler.IssueTests.csproj b/test/FastExpressionCompiler.IssueTests/FastExpressionCompiler.IssueTests.csproj
@@ -1,8 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net7.0' ">net472;net7.0</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net8.0' ">net472;net8.0</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net9.0' ">net472;net9.0</TargetFrameworks>
+        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net9.0' ">net472;net9.0;net8.0;net6.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/test/FastExpressionCompiler.IssueTests/Issue357_Invalid_program_exception.cs b/test/FastExpressionCompiler.IssueTests/Issue357_Invalid_program_exception.cs
@@ -1,10 +1,14 @@
-#if NET8_0_OR_GREATER && !LIGHT_EXPRESSION
-// NET Core only because the lambda expression may not apply the implicit conversion to Nullable
 using System;
 using System.Linq;
-using System.Linq.Expressions;
 
+#if LIGHT_EXPRESSION
+using static FastExpressionCompiler.LightExpression.Expression;
+namespace FastExpressionCompiler.LightExpression.IssueTests
+#else
+using System.Linq.Expressions;
+using static System.Linq.Expressions.Expression;
 namespace FastExpressionCompiler.IssueTests
+#endif
 {
     public class Issue357_Invalid_program_exception : ITest
     {
@@ -14,12 +18,13 @@ public int Run()
             return 1;
         }
 
-        static Expression<Func<ActionItem, bool>> Predicate(Id<AccountManager>? value) =>
+        static System.Linq.Expressions.Expression<Func<ActionItem, bool>> Predicate(Id<AccountManager>? value) =>
             x => x.AccountManagerId == value;
 
         public void Test1()
         {
-            var e = Predicate(null);
+            var e = Predicate(null).FromSysExpression();
+
             e.PrintCSharp();
             // var @cs = (Func<ActionItem, bool>)((ActionItem x) =>
             //      x.AccountManagerId == ((Int64?)default(c__DisplayClass1_0)/*Please provide the non-default value for the constant!*/.value));
@@ -81,4 +86,3 @@ public Id(long value)
         }
     }
 }
-#endif
diff --git a/test/FastExpressionCompiler.LightExpression.IssueTests/FastExpressionCompiler.LightExpression.IssueTests.csproj b/test/FastExpressionCompiler.LightExpression.IssueTests/FastExpressionCompiler.LightExpression.IssueTests.csproj
@@ -1,8 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net7.0' ">net472;net7.0</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net8.0' ">net472;net8.0</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net9.0' ">net472;net9.0</TargetFrameworks>
+        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net9.0' ">net472;net9.0;net8.0;net6.0</TargetFrameworks>
 
         <DefineConstants>LIGHT_EXPRESSION</DefineConstants>
     </PropertyGroup>
diff --git a/test/FastExpressionCompiler.LightExpression.UnitTests/FastExpressionCompiler.LightExpression.UnitTests.csproj b/test/FastExpressionCompiler.LightExpression.UnitTests/FastExpressionCompiler.LightExpression.UnitTests.csproj
@@ -1,8 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net7.0' ">net472;net7.0</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net8.0' ">net472;net8.0</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net9.0' ">net472;net9.0</TargetFrameworks>
+        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net9.0' ">net472;net9.0;net8.0;net6.0</TargetFrameworks>
 
         <DefineConstants>LIGHT_EXPRESSION</DefineConstants>
     </PropertyGroup>
diff --git a/test/FastExpressionCompiler.TestsRunner/FastExpressionCompiler.TestsRunner.csproj b/test/FastExpressionCompiler.TestsRunner/FastExpressionCompiler.TestsRunner.csproj
@@ -15,8 +15,4 @@
         <ProjectReference Include="..\FastExpressionCompiler.IssueTests\FastExpressionCompiler.IssueTests.csproj" />
         <ProjectReference Include="..\FastExpressionCompiler.LightExpression.IssueTests\FastExpressionCompiler.LightExpression.IssueTests.csproj" />
     </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="NUnit" Version="3.14.0"/>
-    </ItemGroup>
 </Project>
diff --git a/test/FastExpressionCompiler.TestsRunner/Program.cs b/test/FastExpressionCompiler.TestsRunner/Program.cs
@@ -289,9 +289,7 @@ void Run(Func<int> run, string name = null)
                 Run(new Issue355_Error_with_converting_to_from_signed_unsigned_integers().Run);
                 Run(new LightExpression.IssueTests.Issue355_Error_with_converting_to_from_signed_unsigned_integers().Run);
 
-#if NET8_0_OR_GREATER && !LIGHT_EXPRESSION
                 Run(new Issue357_Invalid_program_exception().Run);
-#endif
 
                 Run(new LightExpression.IssueTests.Issue363_ActionFunc16Generics().Run);
 
diff --git a/test/FastExpressionCompiler.UnitTests/FastExpressionCompiler.UnitTests.csproj b/test/FastExpressionCompiler.UnitTests/FastExpressionCompiler.UnitTests.csproj
@@ -1,8 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net7.0' ">net472;net7.0</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net8.0' ">net472;net8.0</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net9.0' ">net472;net9.0</TargetFrameworks>
+        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net9.0' ">net472;net9.0;net8.0;net6.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,14 @@`
`1`		`-#if NET8_0_OR_GREATER && !LIGHT_EXPRESSION`
`2`		`-// NET Core only because the lambda expression may not apply the implicit conversion to Nullable`
`3`	`1`	`using System;`
`4`	`2`	`using System.Linq;`
`5`		`-using System.Linq.Expressions;`
`6`	`3`
	`4`	`+#if LIGHT_EXPRESSION`
	`5`	`+using static FastExpressionCompiler.LightExpression.Expression;`
	`6`	`+namespace FastExpressionCompiler.LightExpression.IssueTests`
	`7`	`+#else`
	`8`	`+using System.Linq.Expressions;`
	`9`	`+using static System.Linq.Expressions.Expression;`
`7`	`10`	`namespace FastExpressionCompiler.IssueTests`
	`11`	`+#endif`
`8`	`12`	`{`
`9`	`13`	`public class Issue357_Invalid_program_exception : ITest`
`10`	`14`	`{`
`@@ -14,12 +18,13 @@ public int Run()`
`14`	`18`	`return 1;`
`15`	`19`	`}`
`16`	`20`
`17`		`- static Expression<Func<ActionItem, bool>> Predicate(Id<AccountManager>? value) =>`
	`21`	`+ static System.Linq.Expressions.Expression<Func<ActionItem, bool>> Predicate(Id<AccountManager>? value) =>`
`18`	`22`	`x => x.AccountManagerId == value;`
`19`	`23`
`20`	`24`	`public void Test1()`
`21`	`25`	`{`
`22`		`- var e = Predicate(null);`
	`26`	`+ var e = Predicate(null).FromSysExpression();`
	`27`	`+`
`23`	`28`	`e.PrintCSharp();`
`24`	`29`	`// var @cs = (Func<ActionItem, bool>)((ActionItem x) =>`
`25`	`30`	`// x.AccountManagerId == ((Int64?)default(c__DisplayClass1_0)/Please provide the non-default value for the constant!/.value));`
`@@ -81,4 +86,3 @@ public Id(long value)`
`81`	`86`	`}`
`82`	`87`	`}`
`83`	`88`	`}`
`84`		`-#endif`