Skip to content

Upgrade projects to target .NET 10, add conditional System.Linq.Async dependencies for compatibility with earlier frameworks, and update project files for consistency across the solution. #7062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sfmskywalker merged 3 commits into from
Nov 21, 2025
Merged

Upgrade projects to target .NET 10, add conditional System.Linq.Async dependencies for compatibility with earlier frameworks, and update project files for consistency across the solution. #7062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ec5c17
Upgrade projects to target .NET 10, add conditional `System.Linq.Asyn…
sfmskywalker Nov 14, 2025
59e1ece
Suppress null comparison warning in `WorkflowDefinitionStore` and rem…
sfmskywalker Nov 14, 2025
fc09396
Refactor performance test projects to remove xUnit references and upd…
sfmskywalker Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<PropertyGroup Label="TargetFrameworks">
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup Label="Files">
Expand Down
2 changes: 1 addition & 1 deletion src/apps/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
4 changes: 4 additions & 0 deletions src/modules/Elsa.Expressions.JavaScript/Elsa.Expressions.JavaScript.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@

<ItemGroup>
<PackageReference Include="Jint" />
</ItemGroup>

<!-- System.Linq.Async only for .NET 8 and 9 - .NET 10 has native async LINQ support -->
<ItemGroup Condition="'$(TargetFramework)' != 'net10.0'">
<PackageReference Include="System.Linq.Async" />
</ItemGroup>

Expand Down
2 changes: 2 additions & 0 deletions src/modules/Elsa.Persistence.EFCore/Modules/Management/WorkflowDefinitionStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,9 @@ private IQueryable<WorkflowDefinition> Filter(IQueryable<WorkflowDefinition> que
if (filter.IsSystem != null)
queryable = filter.IsSystem == true
? queryable.Where(x => x.IsSystem == true)
#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
: queryable.Where(x => x.IsSystem == false || x.IsSystem == null!);
#pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'

if (filter.IsReadonly != null) queryable = queryable.Where(x => x.IsReadonly == filter.IsReadonly);
return queryable;
Expand Down
4 changes: 4 additions & 0 deletions src/modules/Elsa.Workflows.Core/Elsa.Workflows.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
<PackageReference Include="Microsoft.Extensions.Options" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="ShortGuid" />
</ItemGroup>

<!-- System.Linq.Async only for .NET 8 and 9 - .NET 10 has native async LINQ support -->
<ItemGroup Condition="'$(TargetFramework)' != 'net10.0'">
<PackageReference Include="System.Linq.Async" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
1 change: 0 additions & 1 deletion test/component/Elsa.Workflows.ComponentTests/Elsa.Workflows.ComponentTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
1 change: 0 additions & 1 deletion test/integration/Elsa.Activities.IntegrationTests/Elsa.Activities.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Include>[Elsa.Workflows.Core]*</Include>
<Threshold>25</Threshold>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion test/integration/Elsa.JavaScript.IntegrationTests/Elsa.JavaScript.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Include>[Elsa.Expressions.JavaScript]*</Include>
</PropertyGroup>

Expand Down
1 change: 0 additions & 1 deletion test/integration/Elsa.Resilience.IntegrationTests/Elsa.Resilience.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Include>[Elsa.Resilience]*,[Elsa.Http]*,[Elsa.Workflows.Core]*</Include>
</PropertyGroup>

Expand Down
38 changes: 34 additions & 4 deletions test/performance/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,37 @@
<Project>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet"/>
</ItemGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>

<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<OutputType>Exe</OutputType>
<CollectCoverage>false</CollectCoverage>
<!-- This is a BenchmarkDotNet performance test, not an xUnit test -->
<IsTestProject>false</IsTestProject>
</PropertyGroup>

<!-- Remove xUnit packages inherited from test/Directory.Build.props -->
<ItemGroup>
<PackageReference Remove="Microsoft.NET.Test.Sdk"/>
<PackageReference Remove="xunit"/>
<PackageReference Remove="xunit.runner.visualstudio"/>
<PackageReference Remove="Microsoft.AspNetCore.Mvc.Testing"/>
<PackageReference Remove="Moq"/>
<PackageReference Remove="NSubstitute"/>
<PackageReference Remove="coverlet.msbuild"/>
<PackageReference Remove="coverlet.collector"/>
<PackageReference Remove="GitHubActionsTestLogger"/>
</ItemGroup>

<!-- Remove xUnit usings -->
<ItemGroup>
<Using Remove="Xunit"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet"/>
</ItemGroup>

</Project>
10 changes: 1 addition & 9 deletions test/performance/Elsa.Workflows.PerformanceTests/Elsa.Workflows.PerformanceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<OutputType>Exe</OutputType>
<CollectCoverage>false</CollectCoverage>
</PropertyGroup>


<ItemGroup>
<ProjectReference Include="..\..\..\src\modules\Elsa\Elsa.csproj" />
Expand Down