Skip to content

Commit b3f610d

Browse files
sfmskywalkersfmskywalker
committed
Merge remote-tracking branch 'origin/develop/3.6.0'
2 parents 12b0c03 + e7a3fdd commit b3f610d

88 files changed

Lines changed: 446 additions & 274 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.build/ElsaCore.ProjectReferences.targets‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

3+
<!-- Elsa.Agents.Activities -->
4+
<ItemGroup Condition="'$(UseProjectReferences)' == 'true' and '$(MSBuildProjectName)' == 'Elsa.Agents.Activities'">
5+
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\core\src\modules\Elsa\Elsa.csproj"/>
6+
</ItemGroup>
7+
8+
<!-- Elsa.Agents.Api -->
9+
<ItemGroup Condition="'$(UseProjectReferences)' == 'true' and '$(MSBuildProjectName)' == 'Elsa.Agents.Api'">
10+
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\core\src\modules\Elsa\Elsa.csproj"/>
11+
</ItemGroup>
12+
13+
<!-- Elsa.Agents.Core -->
14+
<ItemGroup Condition="'$(UseProjectReferences)' == 'true' and '$(MSBuildProjectName)' == 'Elsa.Agents.Core'">
15+
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\core\src\modules\Elsa.Common\Elsa.Common.csproj"/>
16+
</ItemGroup>
17+
18+
<!-- Elsa.Agents.Persistence -->
19+
<ItemGroup Condition="'$(UseProjectReferences)' == 'true' and '$(MSBuildProjectName)' == 'Elsa.Agents.Persistence'">
20+
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\core\src\modules\Elsa.Common\Elsa.Common.csproj"/>
21+
</ItemGroup>
22+
323
<!-- Elsa.Actors.ProtoActor -->
424
<ItemGroup Condition="'$(UseProjectReferences)' == 'true' and '$(MSBuildProjectName)' == 'Elsa.Actors.ProtoActor'">
525
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\core\src\common\Elsa.Features\Elsa.Features.csproj"/>

‎.github/workflows/packages.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- 'main'
7+
- 'develop/*'
78
- 'bug/*'
89
- 'issue/*'
910
- 'patch/*'
@@ -30,7 +31,7 @@ jobs:
3031
PACKAGE_PREFIX=$(echo $BRANCH_NAME | rev | cut -d/ -f1 | rev | tr '_' '-')
3132
3233
# If the branch name is main, use the preview version. Otherwise, use the branch name as the version prefix.
33-
if [[ "${BRANCH_NAME}" == "main" || "${BRANCH_NAME}" =~ ^rc/ ]]; then
34+
if [[ "${BRANCH_NAME}" == "main" || "${BRANCH_NAME}" =~ ^develop/ ]]; then
3435
PACKAGE_PREFIX="preview"
3536
fi
3637

‎Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<PropertyGroup Label="PackageVersions">
4444
<ElsaVersion>3.7.0-preview.3055</ElsaVersion>
4545
<ElsaStudioVersion>3.6.0-preview.1029</ElsaStudioVersion>
46+
<MicrosoftVersion>9.0.6</MicrosoftVersion>
4647
</PropertyGroup>
4748

4849
<Import Project=".build\ElsaCore.ProjectReferences.targets" />

‎Directory.Packages.props‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -96,34 +96,34 @@
9696
<PackageVersion Include="MassTransit" Version="8.4.1" />
9797
<PackageVersion Include="MassTransit.Azure.ServiceBus.Core" Version="8.4.1" />
9898
<PackageVersion Include="MassTransit.RabbitMQ" Version="8.4.1" />
99-
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.5" />
100-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.5" />
101-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.5" PrivateAssets="all" />
102-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.5" />
103-
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="9.0.5" />
99+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="$(MicrosoftVersion)" />
100+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(MicrosoftVersion)" />
101+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(MicrosoftVersion)" PrivateAssets="all" />
102+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(MicrosoftVersion)" />
103+
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="$(MicrosoftVersion)" />
104104
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
105105
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.2" />
106-
<PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.5" />
107-
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="9.0.5" />
108-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
109-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.5" />
110-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
111-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.5" />
106+
<PackageVersion Include="Microsoft.Data.Sqlite" Version="$(MicrosoftVersion)" />
107+
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="$(MicrosoftVersion)" />
108+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftVersion)" />
109+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftVersion)" />
110+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftVersion)" />
111+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftVersion)" />
112112
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.6" />
113-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
114-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
115-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.5" />
116-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
117-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
118-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
119-
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.5" />
120-
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="9.0.5" />
121-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.5.0" />
122-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.5" />
123-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
124-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.5" />
125-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.5" />
126-
<PackageVersion Include="Microsoft.Extensions.Resilience" Version="9.5.0" />
113+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftVersion)" />
114+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftVersion)" />
115+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftVersion)" />
116+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftVersion)" />
117+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftVersion)" />
118+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftVersion)" />
119+
<PackageVersion Include="Microsoft.Extensions.Http" Version="$(MicrosoftVersion)" />
120+
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="$(MicrosoftVersion)" />
121+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.6.0" />
122+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftVersion)" />
123+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftVersion)" />
124+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftVersion)" />
125+
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftVersion)" />
126+
<PackageVersion Include="Microsoft.Extensions.Resilience" Version="9.6.0" />
127127
<PackageVersion Include="Microsoft.Identity.Client" Version="4.72.1" />
128128
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
129129
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.53.1" />
@@ -161,9 +161,9 @@
161161
<PackageVersion Include="SlackNet" Version="0.16.1" />
162162
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
163163
<PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
164-
<PackageVersion Include="System.Formats.Asn1" Version="9.0.5" />
164+
<PackageVersion Include="System.Formats.Asn1" Version="$(MicrosoftVersion)" />
165165
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
166-
<PackageVersion Include="System.Text.Json" Version="9.0.5" />
166+
<PackageVersion Include="System.Text.Json" Version="$(MicrosoftVersion)" />
167167
<PackageVersion Include="Testcontainers" Version="4.2.0" />
168168
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.4.0" />
169169
<PackageVersion Include="Testcontainers.RabbitMq" Version="4.4.0" />
@@ -179,6 +179,6 @@
179179
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.16" />
180180
</ItemGroup>
181181
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
182-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.5" />
182+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(MicrosoftVersion)" />
183183
</ItemGroup>
184184
</Project>

‎src/modules/agents/Elsa.Agents.Activities/Elsa.Agents.Activities.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Description>Provides Agent activities</Description>
55
<PackageTags>elsa extension module agents semantic kernel llm ai</PackageTags>
6-
</PropertyGroup>
7-
8-
<ItemGroup>
6+
</PropertyGroup>
7+
8+
<ItemGroup Label="Elsa" Condition="'$(UseProjectReferences)' != 'true'">
99
<PackageReference Include="Elsa" />
1010
</ItemGroup>
1111

‎src/modules/agents/Elsa.Agents.Api/Elsa.Agents.Api.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PackageTags>elsa extension module agents semantic kernel api llm ai</PackageTags>
66
</PropertyGroup>
77

8-
<ItemGroup>
8+
<ItemGroup Label="Elsa" Condition="'$(UseProjectReferences)' != 'true'">
99
<PackageReference Include="Elsa.Api.Common" />
1010
</ItemGroup>
1111

‎src/modules/agents/Elsa.Agents.Core/Elsa.Agents.Core.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Elsa.Common" />
1110
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
1211
<PackageReference Include="Microsoft.Extensions.Logging" />
1312
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
1413
<PackageReference Include="Microsoft.SemanticKernel" />
1514
<PackageReference Include="Microsoft.SemanticKernel.PromptTemplates.Handlebars" />
1615
</ItemGroup>
1716

17+
<ItemGroup Label="Elsa" Condition="'$(UseProjectReferences)' != 'true'">
18+
<PackageReference Include="Elsa.Common" />
19+
</ItemGroup>
20+
1821
<ItemGroup>
1922
<ProjectReference Include="..\Elsa.Agents.Models\Elsa.Agents.Models.csproj" />
2023
</ItemGroup>

‎src/modules/agents/Elsa.Agents.Persistence/Elsa.Agents.Persistence.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<Description>Provides Agents persistence services</Description>
55
<PackageTags>elsa extension module agents semantic kernel persistence llm ai</PackageTags>
66
</PropertyGroup>
7-
8-
<ItemGroup>
7+
8+
<ItemGroup Label="Elsa" Condition="'$(UseProjectReferences)' != 'true'">
99
<PackageReference Include="Elsa.Common" />
1010
</ItemGroup>
1111

‎src/modules/alterations/Elsa.Alterations/Services/DefaultAlterationRunner.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Elsa.Alterations.Middleware.Workflows;
55
using Elsa.Common;
66
using Elsa.Workflows;
7+
using Elsa.Workflows.CommitStates;
78
using Elsa.Workflows.Management;
89
using Elsa.Workflows.Pipelines.WorkflowExecution;
910
using Elsa.Workflows.Runtime;
@@ -17,6 +18,7 @@ public class DefaultAlterationRunner(
1718
IWorkflowExecutionPipeline workflowExecutionPipeline,
1819
IWorkflowDefinitionService workflowDefinitionService,
1920
IWorkflowStateExtractor workflowStateExtractor,
21+
ICommitStateHandler commitStateHandler,
2022
ISystemClock systemClock,
2123
IServiceProvider serviceProvider)
2224
: IAlterationRunner
@@ -81,8 +83,13 @@ public async Task<RunAlterationsResult> RunAsync(string workflowInstanceId, IEnu
8183

8284
// Extract workflow state.
8385
workflowState = workflowStateExtractor.Extract(workflowExecutionContext);
86+
87+
// Commit workflow state.
88+
await commitStateHandler.CommitAsync(workflowExecutionContext, workflowState, cancellationToken);
8489

8590
// Apply updated workflow state.
91+
// TODO: Importing back into the workflow runtime makes sense, but this also causes another SAVE ction of the workflow instance in the DB, which also happens in the previous step during the commit action.
92+
// Can we avoid this? Perhaps we need more granular control over when we purge and when we save to DB.
8693
await workflowClient.ImportStateAsync(workflowState, cancellationToken);
8794

8895
// Check if the workflow has scheduled work.

‎src/modules/persistence/Elsa.Persistence.EFCore.MySql/Migrations/Alterations/20231015122151_Initial.Designer.cs‎

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)