From 323852a4a7a63f94b8238f59f726897f3654b834 Mon Sep 17 00:00:00 2001 From: swimmesberger Date: Fri, 12 Jan 2024 10:20:46 +0100 Subject: [PATCH 1/6] Upgrade project build to .net8 --- docker/Dockerfile | 6 +++--- docker/Dockerfile-elsa-dashboard | 6 +++--- docker/Dockerfile-elsa-dashboard-and-server | 6 +++--- docker/Dockerfile-elsa-server | 4 ++-- .../Elsa.Activities.Http.OpenApi.csproj | 2 +- .../Elsa.Activities.Http.csproj | 9 ++++---- .../Elsa.Activities.Kafka.csproj | 2 +- .../Elsa.Activities.RabbitMq.csproj | 4 ++-- .../Elsa.Activities.Sql.csproj | 2 +- .../Elsa.Activities.Telnyx.csproj | 4 ++-- .../Elsa.Activities.Temporal.Quartz.csproj | 2 +- .../Elsa.Activities.Webhooks.csproj | 4 ++-- .../Elsa.Webhooks.Api.csproj | 2 +- ...ks.Persistence.EntityFramework.Core.csproj | 2 +- ...s.Persistence.EntityFramework.MySql.csproj | 10 ++++++++- ...sistence.EntityFramework.PostgreSql.csproj | 10 ++++++++- ...rsistence.EntityFramework.SqlServer.csproj | 11 ++++++++-- ....Persistence.EntityFramework.Sqlite.csproj | 10 ++++++++- .../Elsa.Webhooks.Persistence.MongoDb.csproj | 2 +- .../Elsa.Webhooks.Persistence.YesSql.csproj | 2 +- .../Elsa.Abstractions.csproj | 10 ++++----- src/core/Elsa.Core/Elsa.Core.csproj | 21 +++++++++---------- .../ElsaDashboard/ElsaDashboard.Web.csproj | 2 +- .../Elsa.Designer.Components.Web.csproj | 5 ++++- .../Elsa.DataMasking.Core.csproj | 4 ++-- .../Elsa.Retention/Elsa.Retention.csproj | 4 ++-- .../Elsa.Secrets.Api/Elsa.Secrets.Api.csproj | 2 +- .../Elsa.Secrets.Http.csproj | 4 ++-- ...ts.Persistence.EntityFramework.Core.csproj | 2 +- ...s.Persistence.EntityFramework.MySql.csproj | 2 +- ...rsistence.EntityFramework.SqlServer.csproj | 6 +++++- ....Persistence.EntityFramework.Sqlite.csproj | 2 +- .../Elsa.Secrets.Persistence.MongoDb.csproj | 2 +- .../Elsa.Secrets.Sql/Elsa.Secrets.Sql.csproj | 4 ++-- .../secrets/Elsa.Secrets/Elsa.Secrets.csproj | 4 ++-- .../Elsa.WorkflowSettings.Api.csproj | 2 +- ...gs.Persistence.EntityFramework.Core.csproj | 2 +- ...s.Persistence.EntityFramework.MySql.csproj | 2 +- ...sistence.EntityFramework.PostgreSql.csproj | 10 ++++++++- ...rsistence.EntityFramework.SqlServer.csproj | 10 ++++++++- ....Persistence.EntityFramework.Sqlite.csproj | 10 ++++++++- ...WorkflowSettings.Persistence.YesSql.csproj | 2 +- .../Elsa.WorkflowTesting.Api.csproj | 2 +- .../Elsa.WorkflowTesting.csproj | 2 +- ...sa.Persistence.EntityFramework.Core.csproj | 7 ++++++- ...a.Persistence.EntityFramework.MySql.csproj | 10 ++++++++- ....Persistence.EntityFramework.Oracle.csproj | 10 ++++++++- ...sistence.EntityFramework.PostgreSql.csproj | 10 ++++++++- ...rsistence.EntityFramework.SqlServer.csproj | 10 ++++++++- ....Persistence.EntityFramework.Sqlite.csproj | 9 +++++++- ...lsa.Samples.BuildAndDispatchConsole.csproj | 4 ++-- ...amples.CustomOutcomeActivityConsole.csproj | 4 ++-- ...clarativeCompositeActivitiesConsole.csproj | 4 ++-- .../Elsa.Samples.Elasticsearch.csproj | 4 ++-- .../Elsa.Samples.EntityChanged.csproj | 4 ++-- .../Elsa.Samples.FileBasedWorkflow.csproj | 4 ++-- .../Elsa.Samples.ForEachLoopConsole.csproj | 4 ++-- .../Elsa.Samples.ForLoopConsole.csproj | 4 ++-- .../Elsa.Samples.HappinessConsole.csproj | 4 ++-- .../Elsa.Samples.HelloWorldConsole.csproj | 4 ++-- .../Elsa.Samples.IfThenElse.csproj | 4 ++-- ...grammaticCompositeActivitiesConsole.csproj | 6 +++--- .../Elsa.Samples.ReadLineEchoConsole.csproj | 4 ++-- .../Elsa.Samples.RpaWebConsole.csproj | 4 ++-- .../Elsa.Samples.SignalingConsole.csproj | 4 ++-- .../Elsa.Samples.SwitchConsole.csproj | 4 ++-- .../Elsa.Samples.UserTaskConsole.csproj | 4 ++-- .../Elsa.Samples.WhileLoopConsole.csproj | 4 ++-- ...Samples.Persistence.EntityFramework.csproj | 5 ++++- .../Elsa.Server.Api/Elsa.Server.Api.csproj | 6 +++++- .../Elsa.Rebus.RabbitMq.csproj | 2 +- .../Elsa.ComponentTests.csproj | 2 +- .../Elsa.Core.IntegrationTests.csproj | 8 +++---- .../Elsa.Testing.Shared.csproj | 10 ++++----- .../unit/Elsa.UnitTests/Elsa.UnitTests.csproj | 4 ++-- 75 files changed, 248 insertions(+), 135 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 795f1060e4..9753c3ee6e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ # This dockerfile requires that all NPM packages there installed and build. -FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim-amd64 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim-amd64 AS build WORKDIR /source # restore packages @@ -15,10 +15,10 @@ COPY *.props ./ # build and publish (UseAppHost=false created platform independent binaries) WORKDIR /source/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith RUN dotnet build "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/build -RUN dotnet publish "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net7.0 +RUN dotnet publish "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net8.0 # move binaries into smaller base image -FROM mcr.microsoft.com/dotnet/aspnet:7.0-bullseye-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0-bullseye-slim AS base WORKDIR /app COPY --from=build /app/publish ./ diff --git a/docker/Dockerfile-elsa-dashboard b/docker/Dockerfile-elsa-dashboard index 7399aff2e6..65864b22dc 100644 --- a/docker/Dockerfile-elsa-dashboard +++ b/docker/Dockerfile-elsa-dashboard @@ -12,7 +12,7 @@ WORKDIR /app/designer/bindings/aspnet/Elsa.Designer.Components.Web RUN npm install --force RUN npm run build -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim AS build WORKDIR /source # restore packages @@ -28,10 +28,10 @@ COPY --from=client-build /app/designer/bindings/aspnet/Elsa.Designer.Components. # build and publish (UseAppHost=false created platform independent binaries) WORKDIR /source/src/dashboards/ElsaDashboard RUN dotnet build "ElsaDashboard.Web.csproj" -c Release -o /app/build -RUN dotnet publish "ElsaDashboard.Web.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net7.0 +RUN dotnet publish "ElsaDashboard.Web.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net8.0 # move binaries into smaller base image -FROM mcr.microsoft.com/dotnet/aspnet:7.0-bullseye-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0-bullseye-slim AS base WORKDIR /app COPY --from=build /app/publish ./ diff --git a/docker/Dockerfile-elsa-dashboard-and-server b/docker/Dockerfile-elsa-dashboard-and-server index 3f490f879d..004be21219 100644 --- a/docker/Dockerfile-elsa-dashboard-and-server +++ b/docker/Dockerfile-elsa-dashboard-and-server @@ -12,7 +12,7 @@ WORKDIR /app/designer/bindings/aspnet/Elsa.Designer.Components.Web RUN npm install --force RUN npm run build -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim AS build WORKDIR /source # restore packages @@ -25,10 +25,10 @@ RUN dotnet restore "./src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.Asp # build and publish (UseAppHost=false creates platform independent binaries) WORKDIR /source/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith RUN dotnet build "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/build -RUN dotnet publish "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net7.0 +RUN dotnet publish "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net8.0 # move binaries into smaller base image -FROM mcr.microsoft.com/dotnet/aspnet:7.0-bullseye-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0-bullseye-slim AS base WORKDIR /app COPY --from=build /app/publish ./ diff --git a/docker/Dockerfile-elsa-server b/docker/Dockerfile-elsa-server index e6cfc6272c..54c3a2d4bc 100644 --- a/docker/Dockerfile-elsa-server +++ b/docker/Dockerfile-elsa-server @@ -1,6 +1,6 @@ FROM --platform=$BUILDPLATFORM node:19.2-alpine as client-build -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim AS build WORKDIR /source # restore packages @@ -15,7 +15,7 @@ RUN dotnet build "Elsa.Samples.Server.Host.csproj" -c Release -o /app/build RUN dotnet publish "Elsa.Samples.Server.Host.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore # move binaries into smaller base image -FROM mcr.microsoft.com/dotnet/aspnet:7.0-bullseye-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0-bullseye-slim AS base WORKDIR /app COPY --from=build /app/publish ./ diff --git a/src/activities/Elsa.Activities.Http.OpenApi/Elsa.Activities.Http.OpenApi.csproj b/src/activities/Elsa.Activities.Http.OpenApi/Elsa.Activities.Http.OpenApi.csproj index facae96b65..777c08ee27 100644 --- a/src/activities/Elsa.Activities.Http.OpenApi/Elsa.Activities.Http.OpenApi.csproj +++ b/src/activities/Elsa.Activities.Http.OpenApi/Elsa.Activities.Http.OpenApi.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides Swashbuckle filters that include HTTP Endpoint activities. diff --git a/src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj b/src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj index c9701f6e19..3abbfd4522 100644 --- a/src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj +++ b/src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides the following Console activities: @@ -21,6 +21,10 @@ + + + + @@ -34,13 +38,10 @@ - - - diff --git a/src/activities/Elsa.Activities.Kafka/Elsa.Activities.Kafka.csproj b/src/activities/Elsa.Activities.Kafka/Elsa.Activities.Kafka.csproj index a24a7fe74e..6e47b3b88f 100644 --- a/src/activities/Elsa.Activities.Kafka/Elsa.Activities.Kafka.csproj +++ b/src/activities/Elsa.Activities.Kafka/Elsa.Activities.Kafka.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides activities to send and receive messages using Kafka. diff --git a/src/activities/Elsa.Activities.RabbitMq/Elsa.Activities.RabbitMq.csproj b/src/activities/Elsa.Activities.RabbitMq/Elsa.Activities.RabbitMq.csproj index f95c67ed20..ebb310861f 100644 --- a/src/activities/Elsa.Activities.RabbitMq/Elsa.Activities.RabbitMq.csproj +++ b/src/activities/Elsa.Activities.RabbitMq/Elsa.Activities.RabbitMq.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides activities to send and receive messages using Rabbit MQ. @@ -17,7 +17,7 @@ - + diff --git a/src/activities/Elsa.Activities.Sql/Elsa.Activities.Sql.csproj b/src/activities/Elsa.Activities.Sql/Elsa.Activities.Sql.csproj index 34da17fba0..4b1bfeca32 100644 --- a/src/activities/Elsa.Activities.Sql/Elsa.Activities.Sql.csproj +++ b/src/activities/Elsa.Activities.Sql/Elsa.Activities.Sql.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides activities to run SQL queries on given database using an connection string. diff --git a/src/activities/Elsa.Activities.Telnyx/Elsa.Activities.Telnyx.csproj b/src/activities/Elsa.Activities.Telnyx/Elsa.Activities.Telnyx.csproj index 20eb29ee56..84729a66a0 100644 --- a/src/activities/Elsa.Activities.Telnyx/Elsa.Activities.Telnyx.csproj +++ b/src/activities/Elsa.Activities.Telnyx/Elsa.Activities.Telnyx.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides activities to integrate with Telnyx. @@ -28,7 +28,7 @@ - + diff --git a/src/activities/Elsa.Activities.Temporal.Quartz/Elsa.Activities.Temporal.Quartz.csproj b/src/activities/Elsa.Activities.Temporal.Quartz/Elsa.Activities.Temporal.Quartz.csproj index b572e6e1c9..d8bc67654e 100644 --- a/src/activities/Elsa.Activities.Temporal.Quartz/Elsa.Activities.Temporal.Quartz.csproj +++ b/src/activities/Elsa.Activities.Temporal.Quartz/Elsa.Activities.Temporal.Quartz.csproj @@ -12,7 +12,7 @@ - + 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 c2daa19997..6a4502ceab 100644 --- a/src/activities/webhooks/Elsa.Activities.Webhooks/Elsa.Activities.Webhooks.csproj +++ b/src/activities/webhooks/Elsa.Activities.Webhooks/Elsa.Activities.Webhooks.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides Webhook activities. @@ -14,7 +14,7 @@ - + diff --git a/src/activities/webhooks/Elsa.Webhooks.Api/Elsa.Webhooks.Api.csproj b/src/activities/webhooks/Elsa.Webhooks.Api/Elsa.Webhooks.Api.csproj index 8d3ec4f482..bd794e924c 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Api/Elsa.Webhooks.Api.csproj +++ b/src/activities/webhooks/Elsa.Webhooks.Api/Elsa.Webhooks.Api.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides Webhook API endpoints for managing webhook definitions. diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Core/Elsa.Webhooks.Persistence.EntityFramework.Core.csproj b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Core/Elsa.Webhooks.Persistence.EntityFramework.Core.csproj index 96930b8d22..679583a2e1 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Core/Elsa.Webhooks.Persistence.EntityFramework.Core.csproj +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Core/Elsa.Webhooks.Persistence.EntityFramework.Core.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides Webhook EF Core persistence. diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.MySql/Elsa.Webhooks.Persistence.EntityFramework.MySql.csproj b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.MySql/Elsa.Webhooks.Persistence.EntityFramework.MySql.csproj index 91db892385..c9b1f3ad92 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.MySql/Elsa.Webhooks.Persistence.EntityFramework.MySql.csproj +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.MySql/Elsa.Webhooks.Persistence.EntityFramework.MySql.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides the MySql EF Core provider for Webhook persistence. @@ -36,6 +36,14 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.PostgreSql/Elsa.Webhooks.Persistence.EntityFramework.PostgreSql.csproj b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.PostgreSql/Elsa.Webhooks.Persistence.EntityFramework.PostgreSql.csproj index a255b68c71..1a73463a27 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.PostgreSql/Elsa.Webhooks.Persistence.EntityFramework.PostgreSql.csproj +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.PostgreSql/Elsa.Webhooks.Persistence.EntityFramework.PostgreSql.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides the PostgreSQL EF Core provider for Webhook persistence. @@ -36,6 +36,14 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.SqlServer/Elsa.Webhooks.Persistence.EntityFramework.SqlServer.csproj b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.SqlServer/Elsa.Webhooks.Persistence.EntityFramework.SqlServer.csproj index 2e42966035..eaf6578109 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.SqlServer/Elsa.Webhooks.Persistence.EntityFramework.SqlServer.csproj +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.SqlServer/Elsa.Webhooks.Persistence.EntityFramework.SqlServer.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides the SqlServer EF Core provider for Webhook persistence. @@ -35,8 +35,15 @@ - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Sqlite/Elsa.Webhooks.Persistence.EntityFramework.Sqlite.csproj b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Sqlite/Elsa.Webhooks.Persistence.EntityFramework.Sqlite.csproj index ad5ea96af1..108be3c454 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Sqlite/Elsa.Webhooks.Persistence.EntityFramework.Sqlite.csproj +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Sqlite/Elsa.Webhooks.Persistence.EntityFramework.Sqlite.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides the Sqlite EF Core provider for Webhook persistence. @@ -36,6 +36,14 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.MongoDb/Elsa.Webhooks.Persistence.MongoDb.csproj b/src/activities/webhooks/Elsa.Webhooks.Persistence.MongoDb/Elsa.Webhooks.Persistence.MongoDb.csproj index fa6ec34bde..54c6091032 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.MongoDb/Elsa.Webhooks.Persistence.MongoDb.csproj +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.MongoDb/Elsa.Webhooks.Persistence.MongoDb.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides the MongoDB provider for Webhook persistence. diff --git a/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Elsa.Webhooks.Persistence.YesSql.csproj b/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Elsa.Webhooks.Persistence.YesSql.csproj index b802c8e351..9531d5ac32 100644 --- a/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Elsa.Webhooks.Persistence.YesSql.csproj +++ b/src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Elsa.Webhooks.Persistence.YesSql.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides the YesSQL provider for Webhook persistence. diff --git a/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj b/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj index 6bdffb6b6d..4cba19dfe5 100644 --- a/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj +++ b/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj @@ -15,17 +15,17 @@ - + - + - - + + - + diff --git a/src/core/Elsa.Core/Elsa.Core.csproj b/src/core/Elsa.Core/Elsa.Core.csproj index 939992b613..49040632c9 100644 --- a/src/core/Elsa.Core/Elsa.Core.csproj +++ b/src/core/Elsa.Core/Elsa.Core.csproj @@ -17,23 +17,22 @@ - - + - + - - - - - - - - + + + + + + + + diff --git a/src/dashboards/ElsaDashboard/ElsaDashboard.Web.csproj b/src/dashboards/ElsaDashboard/ElsaDashboard.Web.csproj index 007beb5c56..41a256da7b 100644 --- a/src/dashboards/ElsaDashboard/ElsaDashboard.Web.csproj +++ b/src/dashboards/ElsaDashboard/ElsaDashboard.Web.csproj @@ -1,7 +1,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 diff --git a/src/designer/bindings/aspnet/Elsa.Designer.Components.Web/Elsa.Designer.Components.Web.csproj b/src/designer/bindings/aspnet/Elsa.Designer.Components.Web/Elsa.Designer.Components.Web.csproj index b8b37c2582..0bfd241321 100644 --- a/src/designer/bindings/aspnet/Elsa.Designer.Components.Web/Elsa.Designer.Components.Web.csproj +++ b/src/designer/bindings/aspnet/Elsa.Designer.Components.Web/Elsa.Designer.Components.Web.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides ASP.NET Core component bindings for the Elsa Designer web component. @@ -28,4 +28,7 @@ + + + diff --git a/src/modules/datamasking/Elsa.DataMasking.Core/Elsa.DataMasking.Core.csproj b/src/modules/datamasking/Elsa.DataMasking.Core/Elsa.DataMasking.Core.csproj index ecd1acd328..d9ce397e85 100644 --- a/src/modules/datamasking/Elsa.DataMasking.Core/Elsa.DataMasking.Core.csproj +++ b/src/modules/datamasking/Elsa.DataMasking.Core/Elsa.DataMasking.Core.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/modules/retention/Elsa.Retention/Elsa.Retention.csproj b/src/modules/retention/Elsa.Retention/Elsa.Retention.csproj index 2e8fe5ff2f..127a4ba757 100644 --- a/src/modules/retention/Elsa.Retention/Elsa.Retention.csproj +++ b/src/modules/retention/Elsa.Retention/Elsa.Retention.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/modules/secrets/Elsa.Secrets.Api/Elsa.Secrets.Api.csproj b/src/modules/secrets/Elsa.Secrets.Api/Elsa.Secrets.Api.csproj index 7ccaeb3a5a..2e3e4d13d3 100644 --- a/src/modules/secrets/Elsa.Secrets.Api/Elsa.Secrets.Api.csproj +++ b/src/modules/secrets/Elsa.Secrets.Api/Elsa.Secrets.Api.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa Secrets API is an optional part of Elsa Workflows. diff --git a/src/modules/secrets/Elsa.Secrets.Http/Elsa.Secrets.Http.csproj b/src/modules/secrets/Elsa.Secrets.Http/Elsa.Secrets.Http.csproj index 40692745e5..8fead44a35 100644 --- a/src/modules/secrets/Elsa.Secrets.Http/Elsa.Secrets.Http.csproj +++ b/src/modules/secrets/Elsa.Secrets.Http/Elsa.Secrets.Http.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa Secrets is an optional part of Elsa Workflows. @@ -12,7 +12,7 @@ - + diff --git a/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.Core/Elsa.Secrets.Persistence.EntityFramework.Core.csproj b/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.Core/Elsa.Secrets.Persistence.EntityFramework.Core.csproj index bf5810e75a..c55e69a88c 100644 --- a/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.Core/Elsa.Secrets.Persistence.EntityFramework.Core.csproj +++ b/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.Core/Elsa.Secrets.Persistence.EntityFramework.Core.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa Secrets Entity Framework Core is an optional part of Elsa Workflows. diff --git a/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.MySql/Elsa.Secrets.Persistence.EntityFramework.MySql.csproj b/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.MySql/Elsa.Secrets.Persistence.EntityFramework.MySql.csproj index 4569d7bb05..f93eaf0d8f 100644 --- a/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.MySql/Elsa.Secrets.Persistence.EntityFramework.MySql.csproj +++ b/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.MySql/Elsa.Secrets.Persistence.EntityFramework.MySql.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa Secrets Entity Framework MySql is an optional part of Elsa Workflows. diff --git a/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.SqlServer/Elsa.Secrets.Persistence.EntityFramework.SqlServer.csproj b/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.SqlServer/Elsa.Secrets.Persistence.EntityFramework.SqlServer.csproj index 0947aa2838..c771ffb3f0 100644 --- a/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.SqlServer/Elsa.Secrets.Persistence.EntityFramework.SqlServer.csproj +++ b/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.SqlServer/Elsa.Secrets.Persistence.EntityFramework.SqlServer.csproj @@ -4,7 +4,7 @@ - net7.0;net5.0;net6.0; + net7.0;net5.0;net6.0;net7.0;net8.0 Elsa Secrets Entity Framework SqlServer is an optional part of Elsa Workflows. @@ -28,6 +28,10 @@ + + + + diff --git a/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.Sqlite/Elsa.Secrets.Persistence.EntityFramework.Sqlite.csproj b/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.Sqlite/Elsa.Secrets.Persistence.EntityFramework.Sqlite.csproj index f5da950bf1..8fd3516310 100644 --- a/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.Sqlite/Elsa.Secrets.Persistence.EntityFramework.Sqlite.csproj +++ b/src/modules/secrets/Elsa.Secrets.Persistence.EntityFramework.Sqlite/Elsa.Secrets.Persistence.EntityFramework.Sqlite.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa Secrets Entity Framework SQLite is an optional part of Elsa Workflows. diff --git a/src/modules/secrets/Elsa.Secrets.Persistence.MongoDb/Elsa.Secrets.Persistence.MongoDb.csproj b/src/modules/secrets/Elsa.Secrets.Persistence.MongoDb/Elsa.Secrets.Persistence.MongoDb.csproj index 2daef632d7..7d2b75820c 100644 --- a/src/modules/secrets/Elsa.Secrets.Persistence.MongoDb/Elsa.Secrets.Persistence.MongoDb.csproj +++ b/src/modules/secrets/Elsa.Secrets.Persistence.MongoDb/Elsa.Secrets.Persistence.MongoDb.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 enable enable diff --git a/src/modules/secrets/Elsa.Secrets.Sql/Elsa.Secrets.Sql.csproj b/src/modules/secrets/Elsa.Secrets.Sql/Elsa.Secrets.Sql.csproj index 67e2a9e1d0..f102f9fdd4 100644 --- a/src/modules/secrets/Elsa.Secrets.Sql/Elsa.Secrets.Sql.csproj +++ b/src/modules/secrets/Elsa.Secrets.Sql/Elsa.Secrets.Sql.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa Secrets is an optional part of Elsa Workflows. @@ -12,7 +12,7 @@ - + diff --git a/src/modules/secrets/Elsa.Secrets/Elsa.Secrets.csproj b/src/modules/secrets/Elsa.Secrets/Elsa.Secrets.csproj index 6c1b5119a4..11048db423 100644 --- a/src/modules/secrets/Elsa.Secrets/Elsa.Secrets.csproj +++ b/src/modules/secrets/Elsa.Secrets/Elsa.Secrets.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa Secrets is an optional part of Elsa Workflows. @@ -12,7 +12,7 @@ - + diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings.Api/Elsa.WorkflowSettings.Api.csproj b/src/modules/workflowsettings/Elsa.WorkflowSettings.Api/Elsa.WorkflowSettings.Api.csproj index e37c74f63a..c0942b8cd6 100644 --- a/src/modules/workflowsettings/Elsa.WorkflowSettings.Api/Elsa.WorkflowSettings.Api.csproj +++ b/src/modules/workflowsettings/Elsa.WorkflowSettings.Api/Elsa.WorkflowSettings.Api.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 latest enable diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.Core/Elsa.WorkflowSettings.Persistence.EntityFramework.Core.csproj b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.Core/Elsa.WorkflowSettings.Persistence.EntityFramework.Core.csproj index c9354c19f4..cf89f203d4 100644 --- a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.Core/Elsa.WorkflowSettings.Persistence.EntityFramework.Core.csproj +++ b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.Core/Elsa.WorkflowSettings.Persistence.EntityFramework.Core.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa Workflow Settings is an optional part of Elsa Workflows. This package provides Entity Framework Core entities used by the Workflow Settings persistence EF Core providers. diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.MySql/Elsa.WorkflowSettings.Persistence.EntityFramework.MySql.csproj b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.MySql/Elsa.WorkflowSettings.Persistence.EntityFramework.MySql.csproj index 8719d5d5ff..4cf286c1e0 100644 --- a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.MySql/Elsa.WorkflowSettings.Persistence.EntityFramework.MySql.csproj +++ b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.MySql/Elsa.WorkflowSettings.Persistence.EntityFramework.MySql.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa Workflow Settings is an optional part of Elsa Workflows. This package provides Entity Framework Core migrations for the MySql database provider. diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.PostgreSql/Elsa.WorkflowSettings.Persistence.EntityFramework.PostgreSql.csproj b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.PostgreSql/Elsa.WorkflowSettings.Persistence.EntityFramework.PostgreSql.csproj index 6168cde0fd..e0d25740fa 100644 --- a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.PostgreSql/Elsa.WorkflowSettings.Persistence.EntityFramework.PostgreSql.csproj +++ b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.PostgreSql/Elsa.WorkflowSettings.Persistence.EntityFramework.PostgreSql.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa Workflow Settings is an optional part of Elsa Workflows. This package provides Entity Framework Core migrations for the PostgreSql database provider. @@ -36,6 +36,14 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.SqlServer/Elsa.WorkflowSettings.Persistence.EntityFramework.SqlServer.csproj b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.SqlServer/Elsa.WorkflowSettings.Persistence.EntityFramework.SqlServer.csproj index 11994aaf4a..98c310a8dd 100644 --- a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.SqlServer/Elsa.WorkflowSettings.Persistence.EntityFramework.SqlServer.csproj +++ b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.SqlServer/Elsa.WorkflowSettings.Persistence.EntityFramework.SqlServer.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa Workflow Settings is an optional part of Elsa Workflows. This package provides Entity Framework Core migrations for the SQL Server database provider. @@ -36,6 +36,14 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite.csproj b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite.csproj index 4fcf012c59..a9643c950d 100644 --- a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite.csproj +++ b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa Workflow Settings is an optional part of Elsa Workflows. This package provides Entity Framework Core migrations for the Sqlite database provider. @@ -36,6 +36,14 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.YesSql/Elsa.WorkflowSettings.Persistence.YesSql.csproj b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.YesSql/Elsa.WorkflowSettings.Persistence.YesSql.csproj index cf98485ac3..14e6abce0a 100644 --- a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.YesSql/Elsa.WorkflowSettings.Persistence.YesSql.csproj +++ b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.YesSql/Elsa.WorkflowSettings.Persistence.YesSql.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa Workflow Settings is an optional part of Elsa Workflows. This package provides a YesSql persistence provider. diff --git a/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj index 4797b61ce4..e22f6d2341 100644 --- a/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj +++ b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 diff --git a/src/modules/workflowtesting/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj b/src/modules/workflowtesting/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj index e9c494cd86..fdf7fcd734 100644 --- a/src/modules/workflowtesting/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj +++ b/src/modules/workflowtesting/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Elsa.Persistence.EntityFramework.Core.csproj b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Elsa.Persistence.EntityFramework.Core.csproj index 8b529100b2..f5470f8917 100644 --- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Elsa.Persistence.EntityFramework.Core.csproj +++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Elsa.Persistence.EntityFramework.Core.csproj @@ -4,7 +4,7 @@ - netstandard2.1;net6.0;net7.0 + netstandard2.1;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides Entity Framework Core entities used by the various Elsa persistence EF Core providers. @@ -27,6 +27,11 @@ + + + + + diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.MySql/Elsa.Persistence.EntityFramework.MySql.csproj b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.MySql/Elsa.Persistence.EntityFramework.MySql.csproj index 2fdc9a7c1e..61fb7132dd 100644 --- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.MySql/Elsa.Persistence.EntityFramework.MySql.csproj +++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.MySql/Elsa.Persistence.EntityFramework.MySql.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides Entity Framework Core migrations for the MySql database provider. @@ -40,6 +40,14 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Oracle/Elsa.Persistence.EntityFramework.Oracle.csproj b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Oracle/Elsa.Persistence.EntityFramework.Oracle.csproj index 6ebc491d82..6652704862 100644 --- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Oracle/Elsa.Persistence.EntityFramework.Oracle.csproj +++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Oracle/Elsa.Persistence.EntityFramework.Oracle.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides Entity Framework Core migrations for the Oracle database provider. @@ -40,4 +40,12 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.PostgreSql/Elsa.Persistence.EntityFramework.PostgreSql.csproj b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.PostgreSql/Elsa.Persistence.EntityFramework.PostgreSql.csproj index d4e089f481..b5f09d85d9 100644 --- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.PostgreSql/Elsa.Persistence.EntityFramework.PostgreSql.csproj +++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.PostgreSql/Elsa.Persistence.EntityFramework.PostgreSql.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides Entity Framework Core migrations for the PostgreSql database provider. @@ -40,4 +40,12 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.SqlServer/Elsa.Persistence.EntityFramework.SqlServer.csproj b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.SqlServer/Elsa.Persistence.EntityFramework.SqlServer.csproj index a652a10527..a6e6c1b702 100644 --- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.SqlServer/Elsa.Persistence.EntityFramework.SqlServer.csproj +++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.SqlServer/Elsa.Persistence.EntityFramework.SqlServer.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides Entity Framework Core migrations for the SQL Server database provider. @@ -35,6 +35,14 @@ + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Sqlite/Elsa.Persistence.EntityFramework.Sqlite.csproj b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Sqlite/Elsa.Persistence.EntityFramework.Sqlite.csproj index b9a1df51f5..99785d3221 100644 --- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Sqlite/Elsa.Persistence.EntityFramework.Sqlite.csproj +++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Sqlite/Elsa.Persistence.EntityFramework.Sqlite.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides Entity Framework Core migrations for the Sqlite database provider. @@ -40,4 +40,11 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/src/samples/console/Elsa.Samples.BuildAndDispatchConsole/Elsa.Samples.BuildAndDispatchConsole.csproj b/src/samples/console/Elsa.Samples.BuildAndDispatchConsole/Elsa.Samples.BuildAndDispatchConsole.csproj index e3c630ba3c..9728973d74 100644 --- a/src/samples/console/Elsa.Samples.BuildAndDispatchConsole/Elsa.Samples.BuildAndDispatchConsole.csproj +++ b/src/samples/console/Elsa.Samples.BuildAndDispatchConsole/Elsa.Samples.BuildAndDispatchConsole.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.CustomOutcomeActivityConsole/Elsa.Samples.CustomOutcomeActivityConsole.csproj b/src/samples/console/Elsa.Samples.CustomOutcomeActivityConsole/Elsa.Samples.CustomOutcomeActivityConsole.csproj index 44be4bea1e..b024d8ada2 100644 --- a/src/samples/console/Elsa.Samples.CustomOutcomeActivityConsole/Elsa.Samples.CustomOutcomeActivityConsole.csproj +++ b/src/samples/console/Elsa.Samples.CustomOutcomeActivityConsole/Elsa.Samples.CustomOutcomeActivityConsole.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Elsa.Samples.DeclarativeCompositeActivitiesConsole.csproj b/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Elsa.Samples.DeclarativeCompositeActivitiesConsole.csproj index e3c630ba3c..9728973d74 100644 --- a/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Elsa.Samples.DeclarativeCompositeActivitiesConsole.csproj +++ b/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Elsa.Samples.DeclarativeCompositeActivitiesConsole.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.Elasticsearch/Elsa.Samples.Elasticsearch.csproj b/src/samples/console/Elsa.Samples.Elasticsearch/Elsa.Samples.Elasticsearch.csproj index a448424a3d..cda95ab3fa 100644 --- a/src/samples/console/Elsa.Samples.Elasticsearch/Elsa.Samples.Elasticsearch.csproj +++ b/src/samples/console/Elsa.Samples.Elasticsearch/Elsa.Samples.Elasticsearch.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.EntityChanged/Elsa.Samples.EntityChanged.csproj b/src/samples/console/Elsa.Samples.EntityChanged/Elsa.Samples.EntityChanged.csproj index a20659243e..2b33a9867c 100644 --- a/src/samples/console/Elsa.Samples.EntityChanged/Elsa.Samples.EntityChanged.csproj +++ b/src/samples/console/Elsa.Samples.EntityChanged/Elsa.Samples.EntityChanged.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.FileBasedWorkflow/Elsa.Samples.FileBasedWorkflow.csproj b/src/samples/console/Elsa.Samples.FileBasedWorkflow/Elsa.Samples.FileBasedWorkflow.csproj index 93c964ac25..90aeeb5e98 100644 --- a/src/samples/console/Elsa.Samples.FileBasedWorkflow/Elsa.Samples.FileBasedWorkflow.csproj +++ b/src/samples/console/Elsa.Samples.FileBasedWorkflow/Elsa.Samples.FileBasedWorkflow.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.ForEachLoopConsole/Elsa.Samples.ForEachLoopConsole.csproj b/src/samples/console/Elsa.Samples.ForEachLoopConsole/Elsa.Samples.ForEachLoopConsole.csproj index e3c630ba3c..9728973d74 100644 --- a/src/samples/console/Elsa.Samples.ForEachLoopConsole/Elsa.Samples.ForEachLoopConsole.csproj +++ b/src/samples/console/Elsa.Samples.ForEachLoopConsole/Elsa.Samples.ForEachLoopConsole.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.ForLoopConsole/Elsa.Samples.ForLoopConsole.csproj b/src/samples/console/Elsa.Samples.ForLoopConsole/Elsa.Samples.ForLoopConsole.csproj index e3c630ba3c..9728973d74 100644 --- a/src/samples/console/Elsa.Samples.ForLoopConsole/Elsa.Samples.ForLoopConsole.csproj +++ b/src/samples/console/Elsa.Samples.ForLoopConsole/Elsa.Samples.ForLoopConsole.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.HappinessConsole/Elsa.Samples.HappinessConsole.csproj b/src/samples/console/Elsa.Samples.HappinessConsole/Elsa.Samples.HappinessConsole.csproj index 9c154cac7c..b5b6b2efb8 100644 --- a/src/samples/console/Elsa.Samples.HappinessConsole/Elsa.Samples.HappinessConsole.csproj +++ b/src/samples/console/Elsa.Samples.HappinessConsole/Elsa.Samples.HappinessConsole.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.HelloWorldConsole/Elsa.Samples.HelloWorldConsole.csproj b/src/samples/console/Elsa.Samples.HelloWorldConsole/Elsa.Samples.HelloWorldConsole.csproj index 44be4bea1e..b024d8ada2 100644 --- a/src/samples/console/Elsa.Samples.HelloWorldConsole/Elsa.Samples.HelloWorldConsole.csproj +++ b/src/samples/console/Elsa.Samples.HelloWorldConsole/Elsa.Samples.HelloWorldConsole.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.IfThenElse/Elsa.Samples.IfThenElse.csproj b/src/samples/console/Elsa.Samples.IfThenElse/Elsa.Samples.IfThenElse.csproj index e3c630ba3c..9728973d74 100644 --- a/src/samples/console/Elsa.Samples.IfThenElse/Elsa.Samples.IfThenElse.csproj +++ b/src/samples/console/Elsa.Samples.IfThenElse/Elsa.Samples.IfThenElse.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Elsa.Samples.ProgrammaticCompositeActivitiesConsole.csproj b/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Elsa.Samples.ProgrammaticCompositeActivitiesConsole.csproj index c11256517d..9917098ae1 100644 --- a/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Elsa.Samples.ProgrammaticCompositeActivitiesConsole.csproj +++ b/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Elsa.Samples.ProgrammaticCompositeActivitiesConsole.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Elsa.Samples.ReadLineEchoConsole.csproj b/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Elsa.Samples.ReadLineEchoConsole.csproj index e3c630ba3c..9728973d74 100644 --- a/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Elsa.Samples.ReadLineEchoConsole.csproj +++ b/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Elsa.Samples.ReadLineEchoConsole.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.RpaWebConsole/Elsa.Samples.RpaWebConsole.csproj b/src/samples/console/Elsa.Samples.RpaWebConsole/Elsa.Samples.RpaWebConsole.csproj index dc56575223..d8c7b14efb 100644 --- a/src/samples/console/Elsa.Samples.RpaWebConsole/Elsa.Samples.RpaWebConsole.csproj +++ b/src/samples/console/Elsa.Samples.RpaWebConsole/Elsa.Samples.RpaWebConsole.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj b/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj index e3c630ba3c..9728973d74 100644 --- a/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj +++ b/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.SwitchConsole/Elsa.Samples.SwitchConsole.csproj b/src/samples/console/Elsa.Samples.SwitchConsole/Elsa.Samples.SwitchConsole.csproj index 9c154cac7c..b5b6b2efb8 100644 --- a/src/samples/console/Elsa.Samples.SwitchConsole/Elsa.Samples.SwitchConsole.csproj +++ b/src/samples/console/Elsa.Samples.SwitchConsole/Elsa.Samples.SwitchConsole.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.UserTaskConsole/Elsa.Samples.UserTaskConsole.csproj b/src/samples/console/Elsa.Samples.UserTaskConsole/Elsa.Samples.UserTaskConsole.csproj index 6f0cbe1994..db11c92198 100644 --- a/src/samples/console/Elsa.Samples.UserTaskConsole/Elsa.Samples.UserTaskConsole.csproj +++ b/src/samples/console/Elsa.Samples.UserTaskConsole/Elsa.Samples.UserTaskConsole.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/samples/console/Elsa.Samples.WhileLoopConsole/Elsa.Samples.WhileLoopConsole.csproj b/src/samples/console/Elsa.Samples.WhileLoopConsole/Elsa.Samples.WhileLoopConsole.csproj index e3c630ba3c..9728973d74 100644 --- a/src/samples/console/Elsa.Samples.WhileLoopConsole/Elsa.Samples.WhileLoopConsole.csproj +++ b/src/samples/console/Elsa.Samples.WhileLoopConsole/Elsa.Samples.WhileLoopConsole.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/persistence/Elsa.Samples.Persistence.EntityFramework/Elsa.Samples.Persistence.EntityFramework.csproj b/src/samples/persistence/Elsa.Samples.Persistence.EntityFramework/Elsa.Samples.Persistence.EntityFramework.csproj index 29945b0c7b..bc695b8810 100644 --- a/src/samples/persistence/Elsa.Samples.Persistence.EntityFramework/Elsa.Samples.Persistence.EntityFramework.csproj +++ b/src/samples/persistence/Elsa.Samples.Persistence.EntityFramework/Elsa.Samples.Persistence.EntityFramework.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net7.0 + net6.0;net7.0;net8.0 false @@ -23,4 +23,7 @@ + + + diff --git a/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj b/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj index 6f661bc4d1..9aa867f797 100644 --- a/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj +++ b/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0;net7.0 + net5.0;net6.0;net7.0;net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides API endpoints to interact with the workflow host. @@ -25,6 +25,10 @@ + + + + diff --git a/src/servicebus/Elsa.Rebus.RabbitMq/Elsa.Rebus.RabbitMq.csproj b/src/servicebus/Elsa.Rebus.RabbitMq/Elsa.Rebus.RabbitMq.csproj index 25d0f73787..f435d4d766 100644 --- a/src/servicebus/Elsa.Rebus.RabbitMq/Elsa.Rebus.RabbitMq.csproj +++ b/src/servicebus/Elsa.Rebus.RabbitMq/Elsa.Rebus.RabbitMq.csproj @@ -17,7 +17,7 @@ - + diff --git a/test/component/Elsa.ComponentTests/Elsa.ComponentTests.csproj b/test/component/Elsa.ComponentTests/Elsa.ComponentTests.csproj index d511428ad4..81bf9ce890 100644 --- a/test/component/Elsa.ComponentTests/Elsa.ComponentTests.csproj +++ b/test/component/Elsa.ComponentTests/Elsa.ComponentTests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 false enable diff --git a/test/integration/Elsa.Core.IntegrationTests/Elsa.Core.IntegrationTests.csproj b/test/integration/Elsa.Core.IntegrationTests/Elsa.Core.IntegrationTests.csproj index a471e5db8a..3d078fa099 100644 --- a/test/integration/Elsa.Core.IntegrationTests/Elsa.Core.IntegrationTests.csproj +++ b/test/integration/Elsa.Core.IntegrationTests/Elsa.Core.IntegrationTests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 false enable @@ -13,7 +13,7 @@ - + @@ -27,10 +27,10 @@ - + - + diff --git a/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj b/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj index 1ab20dfebc..0a35cc46c3 100644 --- a/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj +++ b/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. This package provides test helpers. @@ -12,13 +12,13 @@ - - + + - - + + diff --git a/test/unit/Elsa.UnitTests/Elsa.UnitTests.csproj b/test/unit/Elsa.UnitTests/Elsa.UnitTests.csproj index f6eff937ed..495bcdca16 100644 --- a/test/unit/Elsa.UnitTests/Elsa.UnitTests.csproj +++ b/test/unit/Elsa.UnitTests/Elsa.UnitTests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 false Elsa @@ -22,7 +22,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + From 908ce2394a9811bcad0cc2a4df539d0df832e776 Mon Sep 17 00:00:00 2001 From: swimmesberger Date: Fri, 12 Jan 2024 10:25:33 +0100 Subject: [PATCH 2/6] More package updates --- src/core/Elsa/Elsa.csproj | 2 +- .../Elsa.Indexing.Elasticsearch.csproj | 2 +- .../Elsa.WorkflowSettings/Elsa.WorkflowSettings.csproj | 2 +- .../Elsa.Samples.ContextualWorkflowHttp.csproj | 2 +- .../Elsa.Samples.CorrelationHttp.csproj | 2 +- .../Elsa.Samples.CustomActivities.csproj | 2 +- .../Elsa.Samples.DocumentApproval.csproj | 2 +- .../Elsa.Samples.ExtendHttpEndpoint.csproj | 2 +- .../Elsa.Samples.FaultyWorkflows.csproj | 2 +- .../Elsa.Samples.ForkJoinTimerAndSignalHttp.csproj | 2 +- .../Elsa.Samples.HelloWorldHttp.csproj | 2 +- .../Elsa.Samples.HttpEndpointSecurity.csproj | 2 +- .../Elsa.Samples.InfiniteLoopDetection.csproj | 2 +- .../Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj | 2 +- .../Elsa.Samples.InvokeWorkflowFromController.csproj | 2 +- .../Elsa.Samples.MassTransitRabbitMq.csproj | 2 +- .../Elsa.Samples.NestedForks/Elsa.Samples.NestedForks.csproj | 2 +- .../Elsa.Samples.ReadModelHttp.csproj | 2 +- .../aspnet/Elsa.Samples.SendHttp/Elsa.Samples.SendHttp.csproj | 2 +- .../Elsa.Samples.SignalApi/Elsa.Samples.SignalApi.csproj | 2 +- .../Elsa.Samples.UniqueCorrelatedWorkflows.csproj | 2 +- .../Elsa.Samples.CompensationConsole.csproj | 2 +- .../Elsa.Samples.CustomActivityOutcomes.csproj | 2 +- .../console/Elsa.Samples.Forks/Elsa.Samples.Forks.csproj | 2 +- .../Elsa.Samples.ReadLineToFile.csproj | 2 +- .../Elsa.Samples.Serialization.csproj | 4 ++-- .../ElsaDashboard.Samples.AspNetCore.Monolith.csproj | 2 +- .../ElsaDashboard.Samples.AspNetCore.SubPath.csproj | 2 +- .../Elsa.Samples.Persistence.EntityFramework.csproj | 4 ++-- .../Elsa.Samples.Persistence.YesSql.csproj | 2 +- .../Elsa.Samples.AzureServiceBusWorker.csproj | 4 ++-- .../Elsa.Samples.BreakLoop/Elsa.Samples.BreakLoop.csproj | 4 ++-- .../Elsa.Samples.CustomAttributesChildWorker.csproj | 4 ++-- .../Elsa.Samples.DistributedLock.csproj | 4 ++-- .../worker/Elsa.Samples.Faulting/Elsa.Samples.Faulting.csproj | 4 ++-- .../Elsa.Samples.MqttWorker/Elsa.Samples.MqttWorker.csproj | 2 +- .../Elsa.Samples.MultiTenantChildWorker.csproj | 4 ++-- .../Elsa.Samples.RabbitMqWorker.csproj | 4 ++-- .../Elsa.Samples.RebusErrorWorker.csproj | 4 ++-- .../Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj | 4 ++-- .../Elsa.Samples.RunChildWorkflowWorker.csproj | 4 ++-- .../Elsa.Samples.Timers.Hangfire.csproj | 4 ++-- .../Elsa.Samples.Timers.Quartz.csproj | 4 ++-- .../Elsa.Samples.WatchDirectoryWorker.csproj | 4 ++-- .../Elsa.Samples.WhileLoopWorker.csproj | 4 ++-- src/server/Elsa.Server.Api/Elsa.Server.Api.csproj | 2 +- 46 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/core/Elsa/Elsa.csproj b/src/core/Elsa/Elsa.csproj index 2e5f0c3bd8..ddec2e2df8 100644 --- a/src/core/Elsa/Elsa.csproj +++ b/src/core/Elsa/Elsa.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/indexing/Elsa.Indexing.Elasticsearch/Elsa.Indexing.Elasticsearch.csproj b/src/indexing/Elsa.Indexing.Elasticsearch/Elsa.Indexing.Elasticsearch.csproj index 5357cd7ce1..053688a1e1 100644 --- a/src/indexing/Elsa.Indexing.Elasticsearch/Elsa.Indexing.Elasticsearch.csproj +++ b/src/indexing/Elsa.Indexing.Elasticsearch/Elsa.Indexing.Elasticsearch.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings/Elsa.WorkflowSettings.csproj b/src/modules/workflowsettings/Elsa.WorkflowSettings/Elsa.WorkflowSettings.csproj index 2df170f35f..754f9f31e9 100644 --- a/src/modules/workflowsettings/Elsa.WorkflowSettings/Elsa.WorkflowSettings.csproj +++ b/src/modules/workflowsettings/Elsa.WorkflowSettings/Elsa.WorkflowSettings.csproj @@ -13,7 +13,7 @@ - + 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 2c0b5b9203..1a43461475 100644 --- a/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Elsa.Samples.ContextualWorkflowHttp.csproj +++ b/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Elsa.Samples.ContextualWorkflowHttp.csproj @@ -7,7 +7,7 @@ - + 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 025635c8f0..e0d2620609 100644 --- a/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Elsa.Samples.CorrelationHttp.csproj +++ b/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Elsa.Samples.CorrelationHttp.csproj @@ -6,7 +6,7 @@ - + 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 4a82653c3b..23ef1ca944 100644 --- a/src/samples/aspnet/Elsa.Samples.CustomActivities/Elsa.Samples.CustomActivities.csproj +++ b/src/samples/aspnet/Elsa.Samples.CustomActivities/Elsa.Samples.CustomActivities.csproj @@ -7,7 +7,7 @@ - + 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 ccdbf0a786..6017330f5b 100644 --- a/src/samples/aspnet/Elsa.Samples.DocumentApproval/Elsa.Samples.DocumentApproval.csproj +++ b/src/samples/aspnet/Elsa.Samples.DocumentApproval/Elsa.Samples.DocumentApproval.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/samples/aspnet/Elsa.Samples.ExtendHttpEndpoint/Elsa.Samples.ExtendHttpEndpoint.csproj b/src/samples/aspnet/Elsa.Samples.ExtendHttpEndpoint/Elsa.Samples.ExtendHttpEndpoint.csproj index 3d148230ee..a6f4b5cc0e 100644 --- a/src/samples/aspnet/Elsa.Samples.ExtendHttpEndpoint/Elsa.Samples.ExtendHttpEndpoint.csproj +++ b/src/samples/aspnet/Elsa.Samples.ExtendHttpEndpoint/Elsa.Samples.ExtendHttpEndpoint.csproj @@ -6,7 +6,7 @@ - + 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 83a1dcbf8a..9877b79fd2 100644 --- a/src/samples/aspnet/Elsa.Samples.FaultyWorkflows/Elsa.Samples.FaultyWorkflows.csproj +++ b/src/samples/aspnet/Elsa.Samples.FaultyWorkflows/Elsa.Samples.FaultyWorkflows.csproj @@ -6,7 +6,7 @@ - + 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 b27e00efc3..02a42f1048 100644 --- a/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Elsa.Samples.ForkJoinTimerAndSignalHttp.csproj +++ b/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Elsa.Samples.ForkJoinTimerAndSignalHttp.csproj @@ -6,7 +6,7 @@ - + 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 025635c8f0..e0d2620609 100644 --- a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Elsa.Samples.HelloWorldHttp.csproj +++ b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Elsa.Samples.HelloWorldHttp.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/samples/aspnet/Elsa.Samples.HttpEndpointSecurity/Elsa.Samples.HttpEndpointSecurity.csproj b/src/samples/aspnet/Elsa.Samples.HttpEndpointSecurity/Elsa.Samples.HttpEndpointSecurity.csproj index c6d8823a15..396f85174b 100644 --- a/src/samples/aspnet/Elsa.Samples.HttpEndpointSecurity/Elsa.Samples.HttpEndpointSecurity.csproj +++ b/src/samples/aspnet/Elsa.Samples.HttpEndpointSecurity/Elsa.Samples.HttpEndpointSecurity.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/samples/aspnet/Elsa.Samples.InfiniteLoopDetection/Elsa.Samples.InfiniteLoopDetection.csproj b/src/samples/aspnet/Elsa.Samples.InfiniteLoopDetection/Elsa.Samples.InfiniteLoopDetection.csproj index 310f5244cd..e12b47b335 100644 --- a/src/samples/aspnet/Elsa.Samples.InfiniteLoopDetection/Elsa.Samples.InfiniteLoopDetection.csproj +++ b/src/samples/aspnet/Elsa.Samples.InfiniteLoopDetection/Elsa.Samples.InfiniteLoopDetection.csproj @@ -6,7 +6,7 @@ - + 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 63d1cb412f..8065477d80 100644 --- a/src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj +++ b/src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj @@ -7,7 +7,7 @@ - + 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 025635c8f0..e0d2620609 100644 --- a/src/samples/aspnet/Elsa.Samples.InvokeWorkflowFromController/Elsa.Samples.InvokeWorkflowFromController.csproj +++ b/src/samples/aspnet/Elsa.Samples.InvokeWorkflowFromController/Elsa.Samples.InvokeWorkflowFromController.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/samples/aspnet/Elsa.Samples.MassTransitRabbitMq/Elsa.Samples.MassTransitRabbitMq.csproj b/src/samples/aspnet/Elsa.Samples.MassTransitRabbitMq/Elsa.Samples.MassTransitRabbitMq.csproj index b21b044e6a..54d50849d1 100644 --- a/src/samples/aspnet/Elsa.Samples.MassTransitRabbitMq/Elsa.Samples.MassTransitRabbitMq.csproj +++ b/src/samples/aspnet/Elsa.Samples.MassTransitRabbitMq/Elsa.Samples.MassTransitRabbitMq.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/samples/aspnet/Elsa.Samples.NestedForks/Elsa.Samples.NestedForks.csproj b/src/samples/aspnet/Elsa.Samples.NestedForks/Elsa.Samples.NestedForks.csproj index e97371928c..56038a80ce 100644 --- a/src/samples/aspnet/Elsa.Samples.NestedForks/Elsa.Samples.NestedForks.csproj +++ b/src/samples/aspnet/Elsa.Samples.NestedForks/Elsa.Samples.NestedForks.csproj @@ -6,7 +6,7 @@ - + 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 025635c8f0..e0d2620609 100644 --- a/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Elsa.Samples.ReadModelHttp.csproj +++ b/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Elsa.Samples.ReadModelHttp.csproj @@ -6,7 +6,7 @@ - + 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 da6f94d3c3..829a706c02 100644 --- a/src/samples/aspnet/Elsa.Samples.SendHttp/Elsa.Samples.SendHttp.csproj +++ b/src/samples/aspnet/Elsa.Samples.SendHttp/Elsa.Samples.SendHttp.csproj @@ -5,7 +5,7 @@ - + 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 7fba9e392f..ca0acdc16b 100644 --- a/src/samples/aspnet/Elsa.Samples.SignalApi/Elsa.Samples.SignalApi.csproj +++ b/src/samples/aspnet/Elsa.Samples.SignalApi/Elsa.Samples.SignalApi.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/samples/aspnet/Elsa.Samples.UniqueCorrelatedWorkflows/Elsa.Samples.UniqueCorrelatedWorkflows.csproj b/src/samples/aspnet/Elsa.Samples.UniqueCorrelatedWorkflows/Elsa.Samples.UniqueCorrelatedWorkflows.csproj index e97371928c..56038a80ce 100644 --- a/src/samples/aspnet/Elsa.Samples.UniqueCorrelatedWorkflows/Elsa.Samples.UniqueCorrelatedWorkflows.csproj +++ b/src/samples/aspnet/Elsa.Samples.UniqueCorrelatedWorkflows/Elsa.Samples.UniqueCorrelatedWorkflows.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/samples/console/Elsa.Samples.CompensationConsole/Elsa.Samples.CompensationConsole.csproj b/src/samples/console/Elsa.Samples.CompensationConsole/Elsa.Samples.CompensationConsole.csproj index fac4c70635..fb5afa4e46 100644 --- a/src/samples/console/Elsa.Samples.CompensationConsole/Elsa.Samples.CompensationConsole.csproj +++ b/src/samples/console/Elsa.Samples.CompensationConsole/Elsa.Samples.CompensationConsole.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/samples/console/Elsa.Samples.CustomActivityOutcomes/Elsa.Samples.CustomActivityOutcomes.csproj b/src/samples/console/Elsa.Samples.CustomActivityOutcomes/Elsa.Samples.CustomActivityOutcomes.csproj index 2ea0e7f26c..136de0b408 100644 --- a/src/samples/console/Elsa.Samples.CustomActivityOutcomes/Elsa.Samples.CustomActivityOutcomes.csproj +++ b/src/samples/console/Elsa.Samples.CustomActivityOutcomes/Elsa.Samples.CustomActivityOutcomes.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/samples/console/Elsa.Samples.Forks/Elsa.Samples.Forks.csproj b/src/samples/console/Elsa.Samples.Forks/Elsa.Samples.Forks.csproj index a43b545ae7..9cb67169f9 100644 --- a/src/samples/console/Elsa.Samples.Forks/Elsa.Samples.Forks.csproj +++ b/src/samples/console/Elsa.Samples.Forks/Elsa.Samples.Forks.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/samples/console/Elsa.Samples.ReadLineToFile/Elsa.Samples.ReadLineToFile.csproj b/src/samples/console/Elsa.Samples.ReadLineToFile/Elsa.Samples.ReadLineToFile.csproj index 6c59c01724..f558a2c30b 100644 --- a/src/samples/console/Elsa.Samples.ReadLineToFile/Elsa.Samples.ReadLineToFile.csproj +++ b/src/samples/console/Elsa.Samples.ReadLineToFile/Elsa.Samples.ReadLineToFile.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/samples/console/Elsa.Samples.Serialization/Elsa.Samples.Serialization.csproj b/src/samples/console/Elsa.Samples.Serialization/Elsa.Samples.Serialization.csproj index 54520682b7..450d63ddf1 100644 --- a/src/samples/console/Elsa.Samples.Serialization/Elsa.Samples.Serialization.csproj +++ b/src/samples/console/Elsa.Samples.Serialization/Elsa.Samples.Serialization.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj index 59e0bd43c6..49b7b7b69d 100644 --- a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj +++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/ElsaDashboard.Samples.AspNetCore.SubPath.csproj b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/ElsaDashboard.Samples.AspNetCore.SubPath.csproj index d3cf067f58..2c39aa3eb2 100644 --- a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/ElsaDashboard.Samples.AspNetCore.SubPath.csproj +++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/ElsaDashboard.Samples.AspNetCore.SubPath.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/samples/persistence/Elsa.Samples.Persistence.EntityFramework/Elsa.Samples.Persistence.EntityFramework.csproj b/src/samples/persistence/Elsa.Samples.Persistence.EntityFramework/Elsa.Samples.Persistence.EntityFramework.csproj index bc695b8810..548aeb8438 100644 --- a/src/samples/persistence/Elsa.Samples.Persistence.EntityFramework/Elsa.Samples.Persistence.EntityFramework.csproj +++ b/src/samples/persistence/Elsa.Samples.Persistence.EntityFramework/Elsa.Samples.Persistence.EntityFramework.csproj @@ -16,11 +16,11 @@ - + - + diff --git a/src/samples/persistence/Elsa.Samples.Persistence.YesSql/Elsa.Samples.Persistence.YesSql.csproj b/src/samples/persistence/Elsa.Samples.Persistence.YesSql/Elsa.Samples.Persistence.YesSql.csproj index 5660988550..2704682739 100644 --- a/src/samples/persistence/Elsa.Samples.Persistence.YesSql/Elsa.Samples.Persistence.YesSql.csproj +++ b/src/samples/persistence/Elsa.Samples.Persistence.YesSql/Elsa.Samples.Persistence.YesSql.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Elsa.Samples.AzureServiceBusWorker.csproj b/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Elsa.Samples.AzureServiceBusWorker.csproj index 1943167bd8..cfba210160 100644 --- a/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Elsa.Samples.AzureServiceBusWorker.csproj +++ b/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Elsa.Samples.AzureServiceBusWorker.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/samples/worker/Elsa.Samples.BreakLoop/Elsa.Samples.BreakLoop.csproj b/src/samples/worker/Elsa.Samples.BreakLoop/Elsa.Samples.BreakLoop.csproj index e80e7c4edd..b7805c0274 100644 --- a/src/samples/worker/Elsa.Samples.BreakLoop/Elsa.Samples.BreakLoop.csproj +++ b/src/samples/worker/Elsa.Samples.BreakLoop/Elsa.Samples.BreakLoop.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Elsa.Samples.CustomAttributesChildWorker.csproj b/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Elsa.Samples.CustomAttributesChildWorker.csproj index dd970e082b..61628d2bcc 100644 --- a/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Elsa.Samples.CustomAttributesChildWorker.csproj +++ b/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Elsa.Samples.CustomAttributesChildWorker.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj b/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj index 12d6a8b57b..dce09baf20 100644 --- a/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj +++ b/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj @@ -7,9 +7,9 @@ - + - + diff --git a/src/samples/worker/Elsa.Samples.Faulting/Elsa.Samples.Faulting.csproj b/src/samples/worker/Elsa.Samples.Faulting/Elsa.Samples.Faulting.csproj index 49438f7968..fbad83edec 100644 --- a/src/samples/worker/Elsa.Samples.Faulting/Elsa.Samples.Faulting.csproj +++ b/src/samples/worker/Elsa.Samples.Faulting/Elsa.Samples.Faulting.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/samples/worker/Elsa.Samples.MqttWorker/Elsa.Samples.MqttWorker.csproj b/src/samples/worker/Elsa.Samples.MqttWorker/Elsa.Samples.MqttWorker.csproj index 38c7155e23..d5d61b3055 100644 --- a/src/samples/worker/Elsa.Samples.MqttWorker/Elsa.Samples.MqttWorker.csproj +++ b/src/samples/worker/Elsa.Samples.MqttWorker/Elsa.Samples.MqttWorker.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Elsa.Samples.MultiTenantChildWorker.csproj b/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Elsa.Samples.MultiTenantChildWorker.csproj index 33c590276b..bd98bef461 100644 --- a/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Elsa.Samples.MultiTenantChildWorker.csproj +++ b/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Elsa.Samples.MultiTenantChildWorker.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/samples/worker/Elsa.Samples.RabbitMqWorker/Elsa.Samples.RabbitMqWorker.csproj b/src/samples/worker/Elsa.Samples.RabbitMqWorker/Elsa.Samples.RabbitMqWorker.csproj index 443b0ec65a..7f904e3c6e 100644 --- a/src/samples/worker/Elsa.Samples.RabbitMqWorker/Elsa.Samples.RabbitMqWorker.csproj +++ b/src/samples/worker/Elsa.Samples.RabbitMqWorker/Elsa.Samples.RabbitMqWorker.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/samples/worker/Elsa.Samples.RebusErrorWorker/Elsa.Samples.RebusErrorWorker.csproj b/src/samples/worker/Elsa.Samples.RebusErrorWorker/Elsa.Samples.RebusErrorWorker.csproj index 45f7dddcc5..b067f12e27 100644 --- a/src/samples/worker/Elsa.Samples.RebusErrorWorker/Elsa.Samples.RebusErrorWorker.csproj +++ b/src/samples/worker/Elsa.Samples.RebusErrorWorker/Elsa.Samples.RebusErrorWorker.csproj @@ -6,9 +6,9 @@ - + - + diff --git a/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj b/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj index 968b5f245e..d43d677f34 100644 --- a/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj +++ b/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj @@ -6,9 +6,9 @@ - + - + diff --git a/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Elsa.Samples.RunChildWorkflowWorker.csproj b/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Elsa.Samples.RunChildWorkflowWorker.csproj index bf9122e6df..b6e2645ee6 100644 --- a/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Elsa.Samples.RunChildWorkflowWorker.csproj +++ b/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Elsa.Samples.RunChildWorkflowWorker.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/samples/worker/Elsa.Samples.Timers.Hangfire/Elsa.Samples.Timers.Hangfire.csproj b/src/samples/worker/Elsa.Samples.Timers.Hangfire/Elsa.Samples.Timers.Hangfire.csproj index db338e294f..63822997c1 100644 --- a/src/samples/worker/Elsa.Samples.Timers.Hangfire/Elsa.Samples.Timers.Hangfire.csproj +++ b/src/samples/worker/Elsa.Samples.Timers.Hangfire/Elsa.Samples.Timers.Hangfire.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/samples/worker/Elsa.Samples.Timers.Quartz/Elsa.Samples.Timers.Quartz.csproj b/src/samples/worker/Elsa.Samples.Timers.Quartz/Elsa.Samples.Timers.Quartz.csproj index 7b6109ebc7..81f54b1b1b 100644 --- a/src/samples/worker/Elsa.Samples.Timers.Quartz/Elsa.Samples.Timers.Quartz.csproj +++ b/src/samples/worker/Elsa.Samples.Timers.Quartz/Elsa.Samples.Timers.Quartz.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/samples/worker/Elsa.Samples.WatchDirectoryWorker/Elsa.Samples.WatchDirectoryWorker.csproj b/src/samples/worker/Elsa.Samples.WatchDirectoryWorker/Elsa.Samples.WatchDirectoryWorker.csproj index cf6652dc78..cb4ef90708 100644 --- a/src/samples/worker/Elsa.Samples.WatchDirectoryWorker/Elsa.Samples.WatchDirectoryWorker.csproj +++ b/src/samples/worker/Elsa.Samples.WatchDirectoryWorker/Elsa.Samples.WatchDirectoryWorker.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/src/samples/worker/Elsa.Samples.WhileLoopWorker/Elsa.Samples.WhileLoopWorker.csproj b/src/samples/worker/Elsa.Samples.WhileLoopWorker/Elsa.Samples.WhileLoopWorker.csproj index e80e7c4edd..b7805c0274 100644 --- a/src/samples/worker/Elsa.Samples.WhileLoopWorker/Elsa.Samples.WhileLoopWorker.csproj +++ b/src/samples/worker/Elsa.Samples.WhileLoopWorker/Elsa.Samples.WhileLoopWorker.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj b/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj index 9aa867f797..949c85277e 100644 --- a/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj +++ b/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj @@ -39,7 +39,7 @@ - + From 22acf44cddb283a1d7a91f6fad8fa523323a5d2f Mon Sep 17 00:00:00 2001 From: swimmesberger Date: Fri, 12 Jan 2024 10:48:46 +0100 Subject: [PATCH 3/6] Fixed rebus dependency --- src/core/Elsa.Core/Elsa.Core.csproj | 4 ++-- .../Elsa.Samples.RebusErrorWorker.csproj | 2 +- .../Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj | 2 +- .../Elsa.Rebus.AzureServiceBus.csproj | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/Elsa.Core/Elsa.Core.csproj b/src/core/Elsa.Core/Elsa.Core.csproj index 49040632c9..15dd71fb63 100644 --- a/src/core/Elsa.Core/Elsa.Core.csproj +++ b/src/core/Elsa.Core/Elsa.Core.csproj @@ -37,10 +37,10 @@ - + - + diff --git a/src/samples/worker/Elsa.Samples.RebusErrorWorker/Elsa.Samples.RebusErrorWorker.csproj b/src/samples/worker/Elsa.Samples.RebusErrorWorker/Elsa.Samples.RebusErrorWorker.csproj index b067f12e27..529ad7dd17 100644 --- a/src/samples/worker/Elsa.Samples.RebusErrorWorker/Elsa.Samples.RebusErrorWorker.csproj +++ b/src/samples/worker/Elsa.Samples.RebusErrorWorker/Elsa.Samples.RebusErrorWorker.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj b/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj index d43d677f34..56fcb9bcd3 100644 --- a/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj +++ b/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/servicebus/Elsa.Rebus.AzureServiceBus/Elsa.Rebus.AzureServiceBus.csproj b/src/servicebus/Elsa.Rebus.AzureServiceBus/Elsa.Rebus.AzureServiceBus.csproj index b961281f81..6a7fc2e5e0 100644 --- a/src/servicebus/Elsa.Rebus.AzureServiceBus/Elsa.Rebus.AzureServiceBus.csproj +++ b/src/servicebus/Elsa.Rebus.AzureServiceBus/Elsa.Rebus.AzureServiceBus.csproj @@ -17,7 +17,7 @@ - + From 11fe0fe5d3e830b9fc2123aa80a9638b502843e2 Mon Sep 17 00:00:00 2001 From: swimmesberger Date: Fri, 12 Jan 2024 12:02:14 +0100 Subject: [PATCH 4/6] Fixed version condition --- ...a.WorkflowSettings.Persistence.EntityFramework.Sqlite.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite.csproj b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite.csproj index a9643c950d..c611a4540a 100644 --- a/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite.csproj +++ b/src/modules/workflowsettings/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite/Elsa.WorkflowSettings.Persistence.EntityFramework.Sqlite.csproj @@ -36,7 +36,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From f707a38a4a710336f1bf85b34659a6f8657a3887 Mon Sep 17 00:00:00 2001 From: swimmesberger Date: Fri, 12 Jan 2024 12:29:30 +0100 Subject: [PATCH 5/6] Fixed integration tests --- src/core/Elsa.Core/Options/ElsaOptions.cs | 2 +- .../EntityFrameworkIntegrationTests.cs | 19 +++++++++----- .../InMemory/InMemoryStoreIntegrationTests.cs | 19 +++++++++----- .../MongoDb/MongoDbIntegrationTests.cs | 21 +++++++++------ ...tainDuplicateActivitiesIntegrationTests.cs | 19 +++++++++----- .../PostgresSqlYesSqlIntegrationTests.cs | 21 +++++++++------ .../JavaScriptExpressionsIntegrationTests.cs | 26 +++++++++++-------- 7 files changed, 78 insertions(+), 49 deletions(-) diff --git a/src/core/Elsa.Core/Options/ElsaOptions.cs b/src/core/Elsa.Core/Options/ElsaOptions.cs index 263e47f859..9804315c0a 100644 --- a/src/core/Elsa.Core/Options/ElsaOptions.cs +++ b/src/core/Elsa.Core/Options/ElsaOptions.cs @@ -94,7 +94,7 @@ private static void ConfigureInMemoryServiceBusEndpoint(ServiceBusEndpointConfig context.Configurer .Subscriptions(s => s.StoreInMemory(store)) - .Transport(t => t.UseInMemoryTransport(transport, queueName)); + .Transport(t => t.UseInMemoryTransport(transport, queueName, registerSubscriptionStorage: false)); } } } \ No newline at end of file diff --git a/test/integration/Elsa.Core.IntegrationTests/Persistence/EntityFramework/EntityFrameworkIntegrationTests.cs b/test/integration/Elsa.Core.IntegrationTests/Persistence/EntityFramework/EntityFrameworkIntegrationTests.cs index 1cb13336e5..1906d76d90 100644 --- a/test/integration/Elsa.Core.IntegrationTests/Persistence/EntityFramework/EntityFrameworkIntegrationTests.cs +++ b/test/integration/Elsa.Core.IntegrationTests/Persistence/EntityFramework/EntityFrameworkIntegrationTests.cs @@ -51,24 +51,29 @@ public void DbContextShouldNotBeCreatedFromPoolWhenSetUpWithoutPooling(ServiceCo class HostedWorkflowRunner : IHostedService { - readonly IBuildsAndStartsWorkflow _workflowRunner; - readonly IWorkflowInstanceStore _instanceStore; + private readonly IServiceScopeFactory _scopeFactory; public async Task StartAsync(CancellationToken cancellationToken) { - var runWorkflowResult = await _workflowRunner.BuildAndStartWorkflowAsync(cancellationToken: cancellationToken); + await using var serviceScope = _scopeFactory.CreateAsyncScope(); + var runWorkflowResult = await serviceScope + .ServiceProvider + .GetRequiredService() + .BuildAndStartWorkflowAsync(cancellationToken: cancellationToken); var instance = runWorkflowResult.WorkflowInstance!; - var retrievedInstance = await _instanceStore.FindByIdAsync(instance.Id, cancellationToken); + var retrievedInstance = await serviceScope + .ServiceProvider + .GetRequiredService() + .FindByIdAsync(instance.Id, cancellationToken); Assert.NotNull(retrievedInstance); } public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask; - public HostedWorkflowRunner(IBuildsAndStartsWorkflow workflowRunner, IWorkflowInstanceStore instanceStore) + public HostedWorkflowRunner(IServiceScopeFactory scopeFactory) { - _workflowRunner = workflowRunner ?? throw new System.ArgumentNullException(nameof(workflowRunner)); - _instanceStore = instanceStore ?? throw new System.ArgumentNullException(nameof(instanceStore)); + _scopeFactory = scopeFactory ?? throw new System.ArgumentNullException(nameof(scopeFactory)); } } } diff --git a/test/integration/Elsa.Core.IntegrationTests/Persistence/InMemory/InMemoryStoreIntegrationTests.cs b/test/integration/Elsa.Core.IntegrationTests/Persistence/InMemory/InMemoryStoreIntegrationTests.cs index 7a6a9d8bb1..edbe399bd5 100644 --- a/test/integration/Elsa.Core.IntegrationTests/Persistence/InMemory/InMemoryStoreIntegrationTests.cs +++ b/test/integration/Elsa.Core.IntegrationTests/Persistence/InMemory/InMemoryStoreIntegrationTests.cs @@ -56,14 +56,20 @@ public async Task APersistableOnWorkflowBurstWorkflowInstanceShouldBeRoundTrippa class HostedWorkflowRunner : IHostedService where TWorkflow : PersistableWorkflow { - readonly IBuildsAndStartsWorkflow _workflowRunner; - readonly IWorkflowInstanceStore _instanceStore; + private readonly IServiceScopeFactory _scopeFactory; public async Task StartAsync(CancellationToken cancellationToken) { - var runWorkflowResult = await _workflowRunner.BuildAndStartWorkflowAsync(cancellationToken: cancellationToken); + await using var serviceScope = _scopeFactory.CreateAsyncScope(); + var runWorkflowResult = await serviceScope + .ServiceProvider + .GetRequiredService() + .BuildAndStartWorkflowAsync(cancellationToken: cancellationToken); var instance = runWorkflowResult.WorkflowInstance!; - var retrievedInstance = await _instanceStore.FindByIdAsync(instance.Id, cancellationToken); + var retrievedInstance = await serviceScope + .ServiceProvider + .GetRequiredService() + .FindByIdAsync(instance.Id, cancellationToken); // An instance should totally be retrieved from the store Assert.NotNull(retrievedInstance); @@ -73,10 +79,9 @@ public async Task StartAsync(CancellationToken cancellationToken) public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask; - public HostedWorkflowRunner(IBuildsAndStartsWorkflow workflowRunner, IWorkflowInstanceStore instanceStore) + public HostedWorkflowRunner(IServiceScopeFactory scopeFactory) { - _workflowRunner = workflowRunner ?? throw new System.ArgumentNullException(nameof(workflowRunner)); - _instanceStore = instanceStore ?? throw new System.ArgumentNullException(nameof(instanceStore)); + _scopeFactory = scopeFactory ?? throw new System.ArgumentNullException(nameof(scopeFactory)); } } } diff --git a/test/integration/Elsa.Core.IntegrationTests/Persistence/MongoDb/MongoDbIntegrationTests.cs b/test/integration/Elsa.Core.IntegrationTests/Persistence/MongoDb/MongoDbIntegrationTests.cs index b1bb34e302..08c7c60e4e 100644 --- a/test/integration/Elsa.Core.IntegrationTests/Persistence/MongoDb/MongoDbIntegrationTests.cs +++ b/test/integration/Elsa.Core.IntegrationTests/Persistence/MongoDb/MongoDbIntegrationTests.cs @@ -24,24 +24,29 @@ public async Task APersistableWorkflowInstanceWithDefaultPersistenceBehaviourSho class HostedWorkflowRunner : IHostedService { - readonly IBuildsAndStartsWorkflow _workflowRunner; - readonly IWorkflowInstanceStore _instanceStore; - + private readonly IServiceScopeFactory _scopeFactory; + public async Task StartAsync(CancellationToken cancellationToken) { - var runWorkflowResult = await _workflowRunner.BuildAndStartWorkflowAsync(); + await using var serviceScope = _scopeFactory.CreateAsyncScope(); + var runWorkflowResult = await serviceScope + .ServiceProvider + .GetRequiredService() + .BuildAndStartWorkflowAsync(cancellationToken: cancellationToken); var instance = runWorkflowResult.WorkflowInstance!; - var retrievedInstance = await _instanceStore.FindByIdAsync(instance.Id); + var retrievedInstance = await serviceScope + .ServiceProvider + .GetRequiredService() + .FindByIdAsync(instance.Id, cancellationToken); Assert.NotNull(retrievedInstance); } public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask; - public HostedWorkflowRunner(IBuildsAndStartsWorkflow workflowRunner, IWorkflowInstanceStore instanceStore) + public HostedWorkflowRunner(IServiceScopeFactory scopeFactory) { - _workflowRunner = workflowRunner ?? throw new System.ArgumentNullException(nameof(workflowRunner)); - _instanceStore = instanceStore ?? throw new System.ArgumentNullException(nameof(instanceStore)); + _scopeFactory = scopeFactory ?? throw new System.ArgumentNullException(nameof(scopeFactory)); } } } diff --git a/test/integration/Elsa.Core.IntegrationTests/Persistence/WorkflowMayContainDuplicateActivitiesIntegrationTests.cs b/test/integration/Elsa.Core.IntegrationTests/Persistence/WorkflowMayContainDuplicateActivitiesIntegrationTests.cs index 62f46f0376..ccff844c22 100644 --- a/test/integration/Elsa.Core.IntegrationTests/Persistence/WorkflowMayContainDuplicateActivitiesIntegrationTests.cs +++ b/test/integration/Elsa.Core.IntegrationTests/Persistence/WorkflowMayContainDuplicateActivitiesIntegrationTests.cs @@ -57,24 +57,29 @@ async Task PerformTest(ElsaHostBuilderBuilder hostBuilderBuilder) private class HostedWorkflowRunner : IHostedService where TWorkflow : DuplicateActivitiesWorkflow { - private readonly IBuildsAndStartsWorkflow _workflowRunner; - private readonly IWorkflowInstanceStore _instanceStore; + private readonly IServiceScopeFactory _scopeFactory; public async Task StartAsync(CancellationToken cancellationToken) { - var runWorkflowResult = await _workflowRunner.BuildAndStartWorkflowAsync(cancellationToken: cancellationToken); + await using var serviceScope = _scopeFactory.CreateAsyncScope(); + var runWorkflowResult = await serviceScope + .ServiceProvider + .GetRequiredService() + .BuildAndStartWorkflowAsync(cancellationToken: cancellationToken); var instance = runWorkflowResult.WorkflowInstance!; - var retrievedInstance = await _instanceStore.FindByIdAsync(instance.Id, cancellationToken); + var retrievedInstance = await serviceScope + .ServiceProvider + .GetRequiredService() + .FindByIdAsync(instance.Id, cancellationToken); Assert.NotNull(retrievedInstance); } public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask; - public HostedWorkflowRunner(IBuildsAndStartsWorkflow workflowRunner, IWorkflowInstanceStore instanceStore) + public HostedWorkflowRunner(IServiceScopeFactory scopeFactory) { - _workflowRunner = workflowRunner ?? throw new System.ArgumentNullException(nameof(workflowRunner)); - _instanceStore = instanceStore ?? throw new System.ArgumentNullException(nameof(instanceStore)); + _scopeFactory = scopeFactory ?? throw new System.ArgumentNullException(nameof(scopeFactory)); } } } diff --git a/test/integration/Elsa.Core.IntegrationTests/Persistence/YesSql/PostgresSqlYesSqlIntegrationTests.cs b/test/integration/Elsa.Core.IntegrationTests/Persistence/YesSql/PostgresSqlYesSqlIntegrationTests.cs index 44febc5835..22486163a2 100644 --- a/test/integration/Elsa.Core.IntegrationTests/Persistence/YesSql/PostgresSqlYesSqlIntegrationTests.cs +++ b/test/integration/Elsa.Core.IntegrationTests/Persistence/YesSql/PostgresSqlYesSqlIntegrationTests.cs @@ -24,24 +24,29 @@ public async Task APersistableWorkflowInstanceWithDefaultPersistenceBehaviourSho class HostedWorkflowRunner : IHostedService { - readonly IBuildsAndStartsWorkflow _workflowRunner; - readonly IWorkflowInstanceStore _instanceStore; + private readonly IServiceScopeFactory _scopeFactory; public async Task StartAsync(CancellationToken cancellationToken) { - var runWorkflowResult = await _workflowRunner.BuildAndStartWorkflowAsync(cancellationToken: cancellationToken); + await using var serviceScope = _scopeFactory.CreateAsyncScope(); + var runWorkflowResult = await serviceScope + .ServiceProvider + .GetRequiredService() + .BuildAndStartWorkflowAsync(cancellationToken: cancellationToken); var instance = runWorkflowResult.WorkflowInstance!; - var retrievedInstance = await _instanceStore.FindByIdAsync(instance.Id, cancellationToken); + var retrievedInstance = await serviceScope + .ServiceProvider + .GetRequiredService() + .FindByIdAsync(instance.Id, cancellationToken); Assert.NotNull(retrievedInstance); } public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask; - - public HostedWorkflowRunner(IBuildsAndStartsWorkflow workflowRunner, IWorkflowInstanceStore instanceStore) + + public HostedWorkflowRunner(IServiceScopeFactory scopeFactory) { - _workflowRunner = workflowRunner ?? throw new System.ArgumentNullException(nameof(workflowRunner)); - _instanceStore = instanceStore ?? throw new System.ArgumentNullException(nameof(instanceStore)); + _scopeFactory = scopeFactory ?? throw new System.ArgumentNullException(nameof(scopeFactory)); } } } diff --git a/test/integration/Elsa.Core.IntegrationTests/Scripting/JavaScript/JavaScriptExpressionsIntegrationTests.cs b/test/integration/Elsa.Core.IntegrationTests/Scripting/JavaScript/JavaScriptExpressionsIntegrationTests.cs index fff6432d4d..6b8e844b96 100644 --- a/test/integration/Elsa.Core.IntegrationTests/Scripting/JavaScript/JavaScriptExpressionsIntegrationTests.cs +++ b/test/integration/Elsa.Core.IntegrationTests/Scripting/JavaScript/JavaScriptExpressionsIntegrationTests.cs @@ -139,16 +139,21 @@ public void Build(IWorkflowBuilder builder) } } - private class HostedWorkflowRunner : IHostedService - { - private readonly IStartsWorkflow _workflowRunner; + private class HostedWorkflowRunner : IHostedService { + private readonly IServiceScopeFactory _scopeFactory; private readonly IContentSerializer _serializer; - private readonly IWorkflowBlueprintMaterializer _materializer; public async Task StartAsync(CancellationToken cancellationToken) { - var workflow = await GetWorkflowBlueprintAsync(GetWorkflowDefinition()); - var runWorkflowResult = await _workflowRunner.StartWorkflowAsync(workflow, cancellationToken: cancellationToken); + await using var serviceScope = _scopeFactory.CreateAsyncScope(); + var workflow = await GetWorkflowBlueprintAsync( + serviceScope.ServiceProvider.GetRequiredService(), + GetWorkflowDefinition() + ); + var runWorkflowResult = await serviceScope + .ServiceProvider + .GetRequiredService() + .StartWorkflowAsync(workflow, cancellationToken: cancellationToken); var workflowInstance = runWorkflowResult.WorkflowInstance!; Assert.NotNull(workflowInstance); @@ -157,11 +162,11 @@ public async Task StartAsync(CancellationToken cancellationToken) public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask; - private async Task GetWorkflowBlueprintAsync(WorkflowDefinition workflowDefinition) + private async Task GetWorkflowBlueprintAsync(IWorkflowBlueprintMaterializer materializer, WorkflowDefinition workflowDefinition) { var json = _serializer.Serialize(workflowDefinition); var deserializedWorkflowDefinition = _serializer.Deserialize(json); - return await _materializer.CreateWorkflowBlueprintAsync(deserializedWorkflowDefinition); + return await materializer.CreateWorkflowBlueprintAsync(deserializedWorkflowDefinition); } private static WorkflowDefinition GetWorkflowDefinition() @@ -204,11 +209,10 @@ private static WorkflowDefinition GetWorkflowDefinition() }; } - public HostedWorkflowRunner(IStartsWorkflow workflowRunner, IContentSerializer serializer, IWorkflowBlueprintMaterializer materializer) + public HostedWorkflowRunner(IServiceScopeFactory scopeFactory, IContentSerializer serializer) { - _workflowRunner = workflowRunner ?? throw new System.ArgumentNullException(nameof(workflowRunner)); + _scopeFactory = scopeFactory ?? throw new System.ArgumentNullException(nameof(scopeFactory)); _serializer = serializer ?? throw new System.ArgumentNullException(nameof(serializer)); - _materializer = materializer ?? throw new System.ArgumentNullException(nameof(materializer)); } } } From 852837cf1ab29c209d3e37e280c56f9918f5c97d Mon Sep 17 00:00:00 2001 From: swimmesberger Date: Mon, 15 Jan 2024 19:43:01 +0100 Subject: [PATCH 6/6] Fixed docker image references --- docker/Dockerfile | 4 ++-- docker/Dockerfile-elsa-dashboard | 4 ++-- docker/Dockerfile-elsa-dashboard-and-server | 4 ++-- docker/Dockerfile-elsa-server | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9753c3ee6e..aa4d2b2c50 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ # This dockerfile requires that all NPM packages there installed and build. -FROM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim-amd64 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS build WORKDIR /source # restore packages @@ -18,7 +18,7 @@ RUN dotnet build "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release - RUN dotnet publish "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net8.0 # move binaries into smaller base image -FROM mcr.microsoft.com/dotnet/aspnet:8.0-bullseye-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim AS base WORKDIR /app COPY --from=build /app/publish ./ diff --git a/docker/Dockerfile-elsa-dashboard b/docker/Dockerfile-elsa-dashboard index 65864b22dc..a688277681 100644 --- a/docker/Dockerfile-elsa-dashboard +++ b/docker/Dockerfile-elsa-dashboard @@ -12,7 +12,7 @@ WORKDIR /app/designer/bindings/aspnet/Elsa.Designer.Components.Web RUN npm install --force RUN npm run build -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build WORKDIR /source # restore packages @@ -31,7 +31,7 @@ RUN dotnet build "ElsaDashboard.Web.csproj" -c Release -o /app/build RUN dotnet publish "ElsaDashboard.Web.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net8.0 # move binaries into smaller base image -FROM mcr.microsoft.com/dotnet/aspnet:8.0-bullseye-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim AS base WORKDIR /app COPY --from=build /app/publish ./ diff --git a/docker/Dockerfile-elsa-dashboard-and-server b/docker/Dockerfile-elsa-dashboard-and-server index 004be21219..f53f272c06 100644 --- a/docker/Dockerfile-elsa-dashboard-and-server +++ b/docker/Dockerfile-elsa-dashboard-and-server @@ -12,7 +12,7 @@ WORKDIR /app/designer/bindings/aspnet/Elsa.Designer.Components.Web RUN npm install --force RUN npm run build -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build WORKDIR /source # restore packages @@ -28,7 +28,7 @@ RUN dotnet build "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release - RUN dotnet publish "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net8.0 # move binaries into smaller base image -FROM mcr.microsoft.com/dotnet/aspnet:8.0-bullseye-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim AS base WORKDIR /app COPY --from=build /app/publish ./ diff --git a/docker/Dockerfile-elsa-server b/docker/Dockerfile-elsa-server index 54c3a2d4bc..4d685dcc30 100644 --- a/docker/Dockerfile-elsa-server +++ b/docker/Dockerfile-elsa-server @@ -1,6 +1,6 @@ FROM --platform=$BUILDPLATFORM node:19.2-alpine as client-build -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build WORKDIR /source # restore packages @@ -15,7 +15,7 @@ RUN dotnet build "Elsa.Samples.Server.Host.csproj" -c Release -o /app/build RUN dotnet publish "Elsa.Samples.Server.Host.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore # move binaries into smaller base image -FROM mcr.microsoft.com/dotnet/aspnet:8.0-bullseye-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim AS base WORKDIR /app COPY --from=build /app/publish ./