From 6e352ebed37e48940649f443173a1c0e9b68ae28 Mon Sep 17 00:00:00 2001 From: James Doran Date: Tue, 5 Nov 2019 10:48:02 +1030 Subject: [PATCH 1/2] Fixed issue where named activities couldn't be used with Then() (#129) --- src/core/Elsa.Core/WorkflowBuilders/WorkflowBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/Elsa.Core/WorkflowBuilders/WorkflowBuilder.cs b/src/core/Elsa.Core/WorkflowBuilders/WorkflowBuilder.cs index cf15dedcf..d22f4f32f 100644 --- a/src/core/Elsa.Core/WorkflowBuilders/WorkflowBuilder.cs +++ b/src/core/Elsa.Core/WorkflowBuilders/WorkflowBuilder.cs @@ -80,7 +80,7 @@ namespace Elsa.WorkflowBuilders var activityBuilder = new ActivityBuilder(this, activityBlueprint); var activityDescriptor = ActivityDescriber.Describe(); - activity.Name = name; + activityBuilder.Name = name; activityBuilder.DisplayName = activityDescriptor.DisplayName; activityBuilder.Description = activityDescriptor.Description; activityBuilders.Add(activityBuilder); From 7d4d0f919eea2ee8203341369468a24ee2f60334 Mon Sep 17 00:00:00 2001 From: James Doran Date: Tue, 5 Nov 2019 10:49:20 +1030 Subject: [PATCH 2/2] Fixed bug where multiple activity registrations of the same type would cause duplicate key exception (#128) * Fixed issue in ActivityResolver where multiple registrations of the same workflow type would cause dup key exception * Updated Sample12 to remove AddUserTaskActivities() call, as this is now done in AddElsa() --- src/core/Elsa.Core/Services/ActivityResolver.cs | 2 +- src/samples/Sample12/Program.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/Elsa.Core/Services/ActivityResolver.cs b/src/core/Elsa.Core/Services/ActivityResolver.cs index 88e19ed65..e50ccbfcc 100644 --- a/src/core/Elsa.Core/Services/ActivityResolver.cs +++ b/src/core/Elsa.Core/Services/ActivityResolver.cs @@ -18,7 +18,7 @@ namespace Elsa.Services () => { var activities = activitiesFunc(); - return activities.Select(x => x.GetType()).ToDictionary(x => x.Name); + return activities.Select(x => x.GetType()).Distinct().ToDictionary(x => x.Name); }); } diff --git a/src/samples/Sample12/Program.cs b/src/samples/Sample12/Program.cs index 904e0ef80..b39044c5d 100644 --- a/src/samples/Sample12/Program.cs +++ b/src/samples/Sample12/Program.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Threading.Tasks; using Elsa.Activities.Console.Extensions; @@ -48,7 +48,6 @@ namespace Sample12 return new ServiceCollection() .AddElsa() .AddConsoleActivities() - .AddUserTaskActivities() .AddWorkflow() .BuildServiceProvider(); }