SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Sipke Schoorstra 2019-11-06 21:11:56 +01:00
parent f9af5e71d6 7d4d0f919e
commit 94fa8d2281
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/Elsa.Core/Services/ActivityResolver.cs
View file

@ -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);
});
}

2
src/core/Elsa.Core/WorkflowBuilders/WorkflowBuilder.cs
View file

@ -80,7 +80,7 @@ namespace Elsa.WorkflowBuilders
var activityBuilder = new ActivityBuilder(this, activityBlueprint);
var activityDescriptor = ActivityDescriber.Describe<T>();
activity.Name = name;
activityBuilder.Name = name;
activityBuilder.DisplayName = activityDescriptor.DisplayName;
activityBuilder.Description = activityDescriptor.Description;
activityBuilders.Add(activityBuilder);

3
src/samples/Sample12/Program.cs
View file

@ -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<UserTaskWorkflow>()
.BuildServiceProvider();
}