diff --git a/src/activities/webhooks/Elsa.Activities.Webhooks/Elsa.Activities.Webhooks.csproj b/src/activities/webhooks/Elsa.Activities.Webhooks/Elsa.Activities.Webhooks.csproj
index 911e7bf4d..7a10e1f99 100644
--- a/src/activities/webhooks/Elsa.Activities.Webhooks/Elsa.Activities.Webhooks.csproj
+++ b/src/activities/webhooks/Elsa.Activities.Webhooks/Elsa.Activities.Webhooks.csproj
@@ -1,7 +1,7 @@
-
-
+
+
net5.0
@@ -13,33 +13,20 @@
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Documents/WebhookDefinitionDocument.cs b/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Documents/WebhookDefinitionDocument.cs
index 9a2bd98a5..3f51036c7 100644
--- a/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Documents/WebhookDefinitionDocument.cs
+++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Documents/WebhookDefinitionDocument.cs
@@ -4,12 +4,12 @@ namespace Elsa.Webhooks.Persistence.YesSql.Documents
{
public class WebhookDefinitionDocument : YesSqlDocument
{
- public string Id { get; set; } = default!;
+ public string WebhookDefinitionId { get; set; } = default!;
public string? TenantId { get; set; }
- public string? Name { get; set; }
- public string? Path { get; set; }
+ public string Name { get; set; } = default!;
+ public string Path { get; set; } = default!;
public string? Description { get; set; }
public string? PayloadTypeName { get; set; }
public bool IsEnabled { get; set; }
}
-}
+}
\ No newline at end of file
diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Indexes/WebhookDefinitionIndex.cs b/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Indexes/WebhookDefinitionIndex.cs
index f851dacac..3c9ae4194 100644
--- a/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Indexes/WebhookDefinitionIndex.cs
+++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Indexes/WebhookDefinitionIndex.cs
@@ -6,7 +6,7 @@ namespace Elsa.Webhooks.Persistence.YesSql.Indexes
{
public class WebhookDefinitionIndex : MapIndex
{
- public string Id { get; set; } = default!;
+ public string WebhookDefinitionId { get; set; } = default!;
public string? TenantId { get; set; }
public bool IsEnabled { get; set; }
}
@@ -21,11 +21,11 @@ namespace Elsa.Webhooks.Persistence.YesSql.Indexes
.Map(
webhookDefinition => new WebhookDefinitionIndex
{
- Id = webhookDefinition.Id,
+ WebhookDefinitionId = webhookDefinition.WebhookDefinitionId,
TenantId = webhookDefinition.TenantId,
IsEnabled = webhookDefinition.IsEnabled
}
);
}
}
-}
+}
\ No newline at end of file
diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Migrations.cs b/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Migrations.cs
index d0a4c2f8f..7a76e8f6c 100644
--- a/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Migrations.cs
+++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Migrations.cs
@@ -11,7 +11,7 @@ namespace Elsa.Webhooks.Persistence.YesSql
{
SchemaBuilder.CreateMapIndexTable(
table => table
- .Column(nameof(WebhookDefinitionIndex.Id))
+ .Column(nameof(WebhookDefinitionIndex.WebhookDefinitionId))
.Column(nameof(WebhookDefinitionIndex.TenantId))
.Column(nameof(WebhookDefinitionIndex.IsEnabled)),
CollectionNames.WebhookDefinitions);
diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Stores/YesSqlWebhookDefinitionStore.cs b/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Stores/YesSqlWebhookDefinitionStore.cs
index 49615e52f..497977e51 100644
--- a/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Stores/YesSqlWebhookDefinitionStore.cs
+++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Stores/YesSqlWebhookDefinitionStore.cs
@@ -12,7 +12,7 @@ using AutoMapper;
using Elsa.Webhooks.Models;
using Microsoft.Extensions.Logging;
using YesSql;
-using IIdGenerator = Elsa.Services.IIdGenerator;
+using IIdGenerator = Elsa.Services.IIdGenerator;
namespace Elsa.Webhooks.Persistence.YesSql.Stores
{
@@ -22,13 +22,13 @@ namespace Elsa.Webhooks.Persistence.YesSql.Stores
{
}
- protected override async Task FindDocumentAsync(ISession session, WebhookDefinition entity, CancellationToken cancellationToken) => await Query(session, x => x.Id == entity.Id).FirstOrDefaultAsync();
+ protected override async Task FindDocumentAsync(ISession session, WebhookDefinition entity, CancellationToken cancellationToken) => await Query(session, x => x.WebhookDefinitionId == entity.Id).FirstOrDefaultAsync();
protected override IQuery MapSpecification(ISession session, ISpecification specification)
{
return specification switch
{
- EntityIdSpecification s => Query(session, x => x.Id == s.Id),
+ EntityIdSpecification s => Query(session, x => x.WebhookDefinitionId == s.Id),
_ => AutoMapSpecification(session, specification)
};
}
diff --git a/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Elsa.Samples.ContextualWorkflowHttp.csproj b/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Elsa.Samples.ContextualWorkflowHttp.csproj
index 124e8d9b8..735b39ef3 100644
--- a/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Elsa.Samples.ContextualWorkflowHttp.csproj
+++ b/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Elsa.Samples.ContextualWorkflowHttp.csproj
@@ -7,13 +7,14 @@
-
+
+
-
-
-
+
+
+
diff --git a/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Elsa.Samples.CorrelationHttp.csproj b/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Elsa.Samples.CorrelationHttp.csproj
index e3991bb51..7d078d8ec 100644
--- a/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Elsa.Samples.CorrelationHttp.csproj
+++ b/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Elsa.Samples.CorrelationHttp.csproj
@@ -5,6 +5,10 @@
false
+
+
+
+
diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivities/Elsa.Samples.CustomActivities.csproj b/src/samples/aspnet/Elsa.Samples.CustomActivities/Elsa.Samples.CustomActivities.csproj
index 380c570bf..6aed84ad7 100644
--- a/src/samples/aspnet/Elsa.Samples.CustomActivities/Elsa.Samples.CustomActivities.csproj
+++ b/src/samples/aspnet/Elsa.Samples.CustomActivities/Elsa.Samples.CustomActivities.csproj
@@ -6,6 +6,10 @@
enable
+
+
+
+
diff --git a/src/samples/aspnet/Elsa.Samples.DocumentApproval/Elsa.Samples.DocumentApproval.csproj b/src/samples/aspnet/Elsa.Samples.DocumentApproval/Elsa.Samples.DocumentApproval.csproj
index 9416619a2..3f8fbc4c5 100644
--- a/src/samples/aspnet/Elsa.Samples.DocumentApproval/Elsa.Samples.DocumentApproval.csproj
+++ b/src/samples/aspnet/Elsa.Samples.DocumentApproval/Elsa.Samples.DocumentApproval.csproj
@@ -5,6 +5,10 @@
false
+
+
+
+
diff --git a/src/samples/aspnet/Elsa.Samples.FaultyWorkflows/Elsa.Samples.FaultyWorkflows.csproj b/src/samples/aspnet/Elsa.Samples.FaultyWorkflows/Elsa.Samples.FaultyWorkflows.csproj
index 059bb62d1..cb6c26ccc 100644
--- a/src/samples/aspnet/Elsa.Samples.FaultyWorkflows/Elsa.Samples.FaultyWorkflows.csproj
+++ b/src/samples/aspnet/Elsa.Samples.FaultyWorkflows/Elsa.Samples.FaultyWorkflows.csproj
@@ -5,6 +5,10 @@
false
+
+
+
+
diff --git a/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Elsa.Samples.ForkJoinTimerAndSignalHttp.csproj b/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Elsa.Samples.ForkJoinTimerAndSignalHttp.csproj
index 49aed3f69..56529ecfc 100644
--- a/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Elsa.Samples.ForkJoinTimerAndSignalHttp.csproj
+++ b/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Elsa.Samples.ForkJoinTimerAndSignalHttp.csproj
@@ -4,6 +4,10 @@
net5.0
false
+
+
+
+
diff --git a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Elsa.Samples.HelloWorldHttp.csproj b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Elsa.Samples.HelloWorldHttp.csproj
index e3991bb51..7d078d8ec 100644
--- a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Elsa.Samples.HelloWorldHttp.csproj
+++ b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Elsa.Samples.HelloWorldHttp.csproj
@@ -5,6 +5,10 @@
false
+
+
+
+
diff --git a/src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj b/src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj
index 7b5879414..935662465 100644
--- a/src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj
+++ b/src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj
@@ -6,6 +6,10 @@
false
+
+
+
+
diff --git a/src/samples/aspnet/Elsa.Samples.InvokeWorkflowFromController/Elsa.Samples.InvokeWorkflowFromController.csproj b/src/samples/aspnet/Elsa.Samples.InvokeWorkflowFromController/Elsa.Samples.InvokeWorkflowFromController.csproj
index e3991bb51..7d078d8ec 100644
--- a/src/samples/aspnet/Elsa.Samples.InvokeWorkflowFromController/Elsa.Samples.InvokeWorkflowFromController.csproj
+++ b/src/samples/aspnet/Elsa.Samples.InvokeWorkflowFromController/Elsa.Samples.InvokeWorkflowFromController.csproj
@@ -5,6 +5,10 @@
false
+
+
+
+
diff --git a/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Elsa.Samples.ReadModelHttp.csproj b/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Elsa.Samples.ReadModelHttp.csproj
index e3991bb51..7d078d8ec 100644
--- a/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Elsa.Samples.ReadModelHttp.csproj
+++ b/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Elsa.Samples.ReadModelHttp.csproj
@@ -5,6 +5,10 @@
false
+
+
+
+
diff --git a/src/samples/aspnet/Elsa.Samples.SendHttp/Elsa.Samples.SendHttp.csproj b/src/samples/aspnet/Elsa.Samples.SendHttp/Elsa.Samples.SendHttp.csproj
index f8ceca7a9..d4482b672 100644
--- a/src/samples/aspnet/Elsa.Samples.SendHttp/Elsa.Samples.SendHttp.csproj
+++ b/src/samples/aspnet/Elsa.Samples.SendHttp/Elsa.Samples.SendHttp.csproj
@@ -4,6 +4,10 @@
net5.0
+
+
+
+
diff --git a/src/samples/aspnet/Elsa.Samples.SignalApi/Elsa.Samples.SignalApi.csproj b/src/samples/aspnet/Elsa.Samples.SignalApi/Elsa.Samples.SignalApi.csproj
index 49aed3f69..44c7a950f 100644
--- a/src/samples/aspnet/Elsa.Samples.SignalApi/Elsa.Samples.SignalApi.csproj
+++ b/src/samples/aspnet/Elsa.Samples.SignalApi/Elsa.Samples.SignalApi.csproj
@@ -5,6 +5,10 @@
false
+
+
+
+