elsa-core/src/modules/Elsa.Workflows.Core
Sipke Schoorstra 730c01d9b0
Refactors and clarifies Flowchart merge modes (#6993)
* Refactors and clarifies Flowchart merge modes

Improves the clarity and functionality of Flowchart merge modes by:

- Renaming `None` to `Stream` for opportunistic execution.
- Introducing `Merge` for waiting on activated branches only.
- Enhancing `Converge` to be the strictest mode, requiring all inbound connections.
- Providing more detailed descriptions for each mode, emphasizing their behavior and use cases in flow-based terminology.
- Updates default merge mode to Stream

This provides better control over synchronization and execution behavior in workflows.

* Refactor `ActivityExtensions` to improve formatting, fix indentation, and align comments for improved readability and consistency

* Update flowchart tests: replace `SetMergeMode(MergeMode.None)` with `SetMergeMode(null)` and remove unused `Elsa.Workflows` imports.

* Restore None value for Flowchart MergeMode enum (#7107)

* Initial plan

* Add None value to MergeMode enum for backward compatibility

Co-authored-by: sfmskywalker <938393+sfmskywalker@users.noreply.github.com>

* Fix API client GetMergeMode to maintain non-nullable return type

Co-authored-by: sfmskywalker <938393+sfmskywalker@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: sfmskywalker <938393+sfmskywalker@users.noreply.github.com>

* [WIP] Address feedback on flowchart merge modes refactor (#7106)

* Initial plan

* Fix misleading documentation for Merge mode to match actual implementation

Co-authored-by: sfmskywalker <938393+sfmskywalker@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: sfmskywalker <938393+sfmskywalker@users.noreply.github.com>

* Update test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JoinBehaviors/ForkDecisionJoinTests.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JoinBehaviors/ForkDecisionJoinTests.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update test scenarios for implicit join behavior in `ForkDecisionJoinTests`. Updated file references for merge and stream join modes.

---------

Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: sfmskywalker <938393+sfmskywalker@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-11-25 21:06:00 +01:00
..
Abstractions Improving behaviour of Run Asynchronously property for the TaskActivityAttribute 2025-08-05 13:50:35 +02:00
ActivationValidators Update namespaces and correct merge artefacts 2024-10-11 20:41:49 +02:00
Activities Refactors and clarifies Flowchart merge modes (#6993) 2025-11-25 21:06:00 +01:00
Attributes Merge 3.5.1 into 3.6.0 (#6907) 2025-09-13 13:05:52 +02:00
Behaviors Refactor activity execution record capturing (#6836) 2025-08-04 08:44:42 +02:00
Builders Addresses warnings and enforces null safety (#7051) 2025-11-12 16:56:31 +01:00
CommitStates Remove default commit strategy (#6599) 2025-04-18 09:26:29 +02:00
Constants Add Fault Code, Category and Type (#5362) 2024-05-10 15:30:32 +02:00
Contexts Addresses warnings and enforces null safety (#7051) 2025-11-12 16:56:31 +01:00
Contracts Add Elsa Script DSL (#7076) 2025-11-25 19:57:50 +01:00
Enums Refactor activity execution state tracking 2025-02-22 19:45:44 +01:00
Exceptions Throw InputEvaluationException for input evaluation errors 2025-09-16 20:37:05 +02:00
Expressions Retranslating comment in english (#6910) 2025-09-15 18:49:11 +02:00
Extensions Add Elsa Script DSL (#7076) 2025-11-25 19:57:50 +01:00
Features Add Elsa Script DSL (#7076) 2025-11-25 19:57:50 +01:00
Handlers Remove obsolete properties and refactor activity evaluation (#6603) 2025-04-18 16:21:25 +02:00
Helpers Update namespaces and correct merge artefacts 2024-10-11 20:41:49 +02:00
IncidentStrategies Update namespaces and correct merge artefacts 2024-10-11 20:41:49 +02:00
LogPersistence Introduce Log Persistence Strategy (#6057) 2024-10-25 19:41:10 +02:00
Memory Merge branch 'rc/3.4.0' 2025-04-01 10:23:04 +02:00
Middleware Addresses warnings and enforces null safety (#7051) 2025-11-12 16:56:31 +01:00
Models Add Elsa Script DSL (#7076) 2025-11-25 19:57:50 +01:00
Notifications Refactor activity execution record capturing (#6836) 2025-08-04 08:44:42 +02:00
Options Add support for passing initial variables 2025-03-08 11:47:58 +01:00
Pipelines Refactors extension methods to instance methods (#7089) 2025-11-25 14:53:18 +01:00
PortResolvers Update namespaces and correct merge artefacts 2024-10-11 20:41:49 +02:00
Serialization Add Elsa Script DSL (#7076) 2025-11-25 19:57:50 +01:00
Services Add Elsa Script DSL (#7076) 2025-11-25 19:57:50 +01:00
Signals Refactor activity execution record capturing (#6836) 2025-08-04 08:44:42 +02:00
State Adds activity execution metadata support (#6699) 2025-05-30 15:37:57 +02:00
UIHints Addresses warnings and enforces null safety (#7050) 2025-11-12 15:53:23 +01:00
VariableStorageDrivers Addresses warnings and enforces null safety (#7051) 2025-11-12 16:56:31 +01:00
Elsa.Workflows.Core.csproj 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) 2025-11-21 20:55:30 +01:00
Elsa.Workflows.Core.csproj.DotSettings Refactor commit strategy architecture for flexibility. 2025-01-30 15:14:58 +01:00
FodyWeavers.xml
IsExternalInit.cs