From f2aae986f4aa1fd7944ed309355753c25bcefeb8 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Sat, 12 Dec 2020 14:07:17 +0100 Subject: [PATCH] Use in-memory persistence by default --- Elsa.sln | 7 --- Elsa.sln.DotSettings | 1 + src/core/Elsa.Core/ElsaOptions.cs | 18 ++++++++ .../ElsaServiceCollectionExtensions.cs | 3 ++ .../InMemoryWorkflowDefinitionStore.cs | 0 .../InMemoryWorkflowInstanceStore.cs | 0 .../Elsa.Persistence.InMemory.csproj | 33 -------------- .../ServiceCollectionExtensions.cs | 19 -------- .../Elsa.Persistence.InMemory/icon.png | Bin 9825 -> 0 bytes .../ServiceCollectionExtensions.cs | 29 +++++++----- .../Elsa.Persistence.YesSql.csproj | 1 + ...ions.cs => ServiceCollectionExtensions.cs} | 42 ++++++++++-------- .../Startup.cs | 3 +- .../Elsa.Samples.CorrelationHttp.csproj | 1 - .../Elsa.Samples.CorrelationHttp/Startup.cs | 2 - .../Elsa.Samples.CustomActivities.csproj | 1 - .../Elsa.Samples.CustomActivities/Startup.cs | 3 -- ....Samples.ForkJoinTimerAndSignalHttp.csproj | 1 - .../Startup.cs | 2 - .../Elsa.Samples.HelloWorldHttp.csproj | 1 - .../Elsa.Samples.HelloWorldHttp/Startup.cs | 3 -- .../Elsa.Samples.Interrupts.csproj | 1 - .../aspnet/Elsa.Samples.Interrupts/Startup.cs | 2 - .../Elsa.Samples.ReadModelHttp.csproj | 3 +- .../Elsa.Samples.ReadModelHttp/Startup.cs | 2 - ...clarativeCompositeActivitiesConsole.csproj | 1 - .../Program.cs | 1 - .../Elsa.Samples.FileBasedWorkflow.csproj | 1 - .../Elsa.Samples.FileBasedWorkflow/Program.cs | 1 - .../Elsa.Samples.ForLoopConsole.csproj | 1 - .../Elsa.Samples.ForLoopConsole/Program.cs | 1 - .../Elsa.Samples.GoBackConsole.csproj | 1 - .../Elsa.Samples.GoBackConsole/Program.cs | 1 - .../Elsa.Samples.HelloWorldConsole.csproj | 1 - .../Elsa.Samples.HelloWorldConsole/Program.cs | 1 - .../Elsa.Samples.IfElseConsole.csproj | 1 - .../Elsa.Samples.IfElseConsole/Program.cs | 1 - ...grammaticCompositeActivitiesConsole.csproj | 1 - .../Program.cs | 1 - .../Elsa.Samples.ReadLineEchoConsole.csproj | 5 +-- .../Program.cs | 5 +-- .../Elsa.Samples.Serialization.csproj | 5 +-- .../Elsa.Samples.Serialization/Program.cs | 7 ++- .../Elsa.Samples.SignalingConsole.csproj | 5 +-- .../Elsa.Samples.SignalingConsole/Program.cs | 3 +- .../Elsa.Samples.WhileLoopConsole.csproj | 5 +-- .../Elsa.Samples.WhileLoopConsole/Program.cs | 3 +- .../Elsa.Samples.AzureServiceBusWorker.csproj | 7 ++- .../Program.cs | 1 - ...Samples.CustomAttributesChildWorker.csproj | 7 ++- .../Program.cs | 6 +-- .../Elsa.Samples.DistributedLock.csproj | 1 - .../Elsa.Samples.DistributedLock/Program.cs | 7 +-- ...Elsa.Samples.MultiTenantChildWorker.csproj | 1 - .../Program.cs | 6 +-- .../Elsa.Samples.RebusWorker.csproj | 1 - .../Elsa.Samples.RebusWorker/Program.cs | 11 ++--- ...Elsa.Samples.RunChildWorkflowWorker.csproj | 1 - .../Program.cs | 11 ++--- .../Elsa.Samples.Timers.csproj | 1 - .../worker/Elsa.Samples.Timers/Program.cs | 8 +--- .../Elsa.Samples.WhileLoopWorker.csproj | 1 - .../Elsa.Samples.WhileLoopWorker/Program.cs | 10 ++--- .../Elsa.Server.Host/Elsa.Server.Host.csproj | 2 +- src/server/Elsa.Server.Host/Startup.cs | 4 +- src/server/Elsa.Server.Host/appsettings.json | 6 --- .../Elsa.Testing.Shared.csproj | 1 - .../Unit/WorkflowsUnitTestBase.cs | 1 - 68 files changed, 105 insertions(+), 219 deletions(-) rename src/{persistence/Elsa.Persistence.InMemory => core/Elsa.Core/Persistence/InMemory}/InMemoryWorkflowDefinitionStore.cs (100%) rename src/{persistence/Elsa.Persistence.InMemory => core/Elsa.Core/Persistence/InMemory}/InMemoryWorkflowInstanceStore.cs (100%) delete mode 100644 src/persistence/Elsa.Persistence.InMemory/Elsa.Persistence.InMemory.csproj delete mode 100644 src/persistence/Elsa.Persistence.InMemory/ServiceCollectionExtensions.cs delete mode 100644 src/persistence/Elsa.Persistence.InMemory/icon.png rename src/persistence/Elsa.Persistence.YesSql/{IServiceCollectionExtensions.cs => ServiceCollectionExtensions.cs} (63%) diff --git a/Elsa.sln b/Elsa.sln index e5d92bec5..dc6dc0135 100644 --- a/Elsa.sln +++ b/Elsa.sln @@ -90,8 +90,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Activities.AzureServic EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "persistence", "persistence", "{5619F343-A270-4E31-9C52-7C85A4DD6D71}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Persistence.InMemory", "src\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj", "{BA9EE5A2-632F-4489-B59D-C7283960BCCA}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Persistence.YesSql", "src\persistence\Elsa.Persistence.YesSql\Elsa.Persistence.YesSql.csproj", "{7E14324E-7AD3-4498-AECE-C7B80FB691BC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Persistence.MongoDb", "src\persistence\Elsa.Persistence.MongoDb\Elsa.Persistence.MongoDb.csproj", "{09718131-4D0E-4EF3-B3FB-116EBE1D8702}" @@ -274,10 +272,6 @@ Global {DD607BC1-F9D9-4685-BC8F-A4056C2C31FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {DD607BC1-F9D9-4685-BC8F-A4056C2C31FA}.Release|Any CPU.ActiveCfg = Release|Any CPU {DD607BC1-F9D9-4685-BC8F-A4056C2C31FA}.Release|Any CPU.Build.0 = Release|Any CPU - {BA9EE5A2-632F-4489-B59D-C7283960BCCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA9EE5A2-632F-4489-B59D-C7283960BCCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA9EE5A2-632F-4489-B59D-C7283960BCCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA9EE5A2-632F-4489-B59D-C7283960BCCA}.Release|Any CPU.Build.0 = Release|Any CPU {7E14324E-7AD3-4498-AECE-C7B80FB691BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7E14324E-7AD3-4498-AECE-C7B80FB691BC}.Debug|Any CPU.Build.0 = Debug|Any CPU {7E14324E-7AD3-4498-AECE-C7B80FB691BC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -432,7 +426,6 @@ Global {AEA00027-F280-43A4-AC60-E2AF3014CF34} = {E42743A0-FBDD-4150-9D53-6000496D9B87} {E0090EF3-C4A7-4262-9300-1D395BE25DD0} = {22E75696-6FE9-436A-9097-EE21C603F818} {38429825-88AF-4F0D-9E7C-A58EC5C86DA0} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} - {BA9EE5A2-632F-4489-B59D-C7283960BCCA} = {38429825-88AF-4F0D-9E7C-A58EC5C86DA0} {09718131-4D0E-4EF3-B3FB-116EBE1D8702} = {38429825-88AF-4F0D-9E7C-A58EC5C86DA0} {7E14324E-7AD3-4498-AECE-C7B80FB691BC} = {38429825-88AF-4F0D-9E7C-A58EC5C86DA0} {164EB38A-D6D2-4092-8835-C944ECEE357C} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} diff --git a/Elsa.sln.DotSettings b/Elsa.sln.DotSettings index c25f6b660..1ccc569a3 100644 --- a/Elsa.sln.DotSettings +++ b/Elsa.sln.DotSettings @@ -4,4 +4,5 @@ True ExplicitlyExcluded + True True \ No newline at end of file diff --git a/src/core/Elsa.Core/ElsaOptions.cs b/src/core/Elsa.Core/ElsaOptions.cs index dd924745d..1a0355ace 100644 --- a/src/core/Elsa.Core/ElsaOptions.cs +++ b/src/core/Elsa.Core/ElsaOptions.cs @@ -2,6 +2,8 @@ using System; using Elsa.Caching; using Elsa.DistributedLock; using Elsa.Extensions; +using Elsa.Persistence; +using Elsa.Persistence.InMemory; using Elsa.Serialization; using Elsa.Services; using Microsoft.Extensions.DependencyInjection; @@ -22,6 +24,8 @@ namespace Elsa { Services = services; + WorkflowDefinitionStoreFactory = _ => new InMemoryWorkflowDefinitionStore(); + WorkflowInstanceStoreFactory = _ => new InMemoryWorkflowInstanceStore(); StorageFactory = sp => Storage.Net.StorageFactory.Blobs.InMemory(); DistributedLockProviderFactory = sp => new DefaultLockProvider(); SignalFactory = sp => new Signal(); @@ -49,6 +53,8 @@ namespace Elsa public IServiceCollection Services { get; } internal Func StorageFactory { get; set; } + internal Func WorkflowDefinitionStoreFactory { get; set; } + internal Func WorkflowInstanceStoreFactory { get; set; } internal Func DistributedLockProviderFactory { get; private set; } internal Func SignalFactory { get; private set; } internal Func CreateJsonSerializer { get; private set; } @@ -75,6 +81,18 @@ namespace Elsa StorageFactory = factory; return this; } + + public ElsaOptions UseWorkflowDefinitionStore(Func factory) + { + WorkflowDefinitionStoreFactory = factory; + return this; + } + + public ElsaOptions UseWorkflowInstanceStore(Func factory) + { + WorkflowInstanceStoreFactory = factory; + return this; + } public ElsaOptions UseAutoMapper(Action addAutoMapper) { diff --git a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs index 70a3156ee..f812d4143 100644 --- a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs +++ b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs @@ -40,6 +40,8 @@ namespace Microsoft.Extensions.DependencyInjection services .AddSingleton(options) + .AddScoped(options.WorkflowDefinitionStoreFactory) + .AddScoped(options.WorkflowInstanceStoreFactory) .AddSingleton(options.DistributedLockProviderFactory) .AddSingleton(options.SignalFactory) .AddSingleton(options.StorageFactory); @@ -105,6 +107,7 @@ namespace Microsoft.Extensions.DependencyInjection .AddSingleton() .AddWorkflowProvider() .AddWorkflowProvider() + .AddWorkflowProvider() .AddTransient() .AddTransient() .AddTransient>(sp => sp.GetRequiredService) diff --git a/src/persistence/Elsa.Persistence.InMemory/InMemoryWorkflowDefinitionStore.cs b/src/core/Elsa.Core/Persistence/InMemory/InMemoryWorkflowDefinitionStore.cs similarity index 100% rename from src/persistence/Elsa.Persistence.InMemory/InMemoryWorkflowDefinitionStore.cs rename to src/core/Elsa.Core/Persistence/InMemory/InMemoryWorkflowDefinitionStore.cs diff --git a/src/persistence/Elsa.Persistence.InMemory/InMemoryWorkflowInstanceStore.cs b/src/core/Elsa.Core/Persistence/InMemory/InMemoryWorkflowInstanceStore.cs similarity index 100% rename from src/persistence/Elsa.Persistence.InMemory/InMemoryWorkflowInstanceStore.cs rename to src/core/Elsa.Core/Persistence/InMemory/InMemoryWorkflowInstanceStore.cs diff --git a/src/persistence/Elsa.Persistence.InMemory/Elsa.Persistence.InMemory.csproj b/src/persistence/Elsa.Persistence.InMemory/Elsa.Persistence.InMemory.csproj deleted file mode 100644 index 125e6f34a..000000000 --- a/src/persistence/Elsa.Persistence.InMemory/Elsa.Persistence.InMemory.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - netstandard2.0 - latest - Elsa.Persistence.InMemory - 1.0.0 - Elsa Contributors - - Elsa is a set of workflow libraries and tools that enable super-fast workflowing capabilities in any .NET Core application. - This package provides a InMemory persistence provider. - - 2020 - https://github.com/elsa-workflows/elsa-core - https://github.com/elsa-workflows/elsa-core - GitHub - elsa, workflows, orchard - icon.png - enable - - - - - True - - - - - - - - - diff --git a/src/persistence/Elsa.Persistence.InMemory/ServiceCollectionExtensions.cs b/src/persistence/Elsa.Persistence.InMemory/ServiceCollectionExtensions.cs deleted file mode 100644 index f069de9ea..000000000 --- a/src/persistence/Elsa.Persistence.InMemory/ServiceCollectionExtensions.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Elsa.WorkflowProviders; - -using Microsoft.Extensions.DependencyInjection; - -namespace Elsa.Persistence.InMemory -{ - public static class ServiceCollectionExtensions - { - public static IServiceCollection AddElsaPersistenceInMemory(this IServiceCollection services) - { - // Scoped, because IMediator is registered as Scoped and IIdGenerator could also be registered as Scoped - services.AddScoped() - .AddScoped() - .AddWorkflowProvider(); - - return services; - } - } -} diff --git a/src/persistence/Elsa.Persistence.InMemory/icon.png b/src/persistence/Elsa.Persistence.InMemory/icon.png deleted file mode 100644 index 28dbaafbfe82119161a9b48c7e1fb59fef019c2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9825 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 Iv{~r?0hzVtHvj+t diff --git a/src/persistence/Elsa.Persistence.MongoDb/ServiceCollectionExtensions.cs b/src/persistence/Elsa.Persistence.MongoDb/ServiceCollectionExtensions.cs index 0270fbf82..7cbf17f78 100644 --- a/src/persistence/Elsa.Persistence.MongoDb/ServiceCollectionExtensions.cs +++ b/src/persistence/Elsa.Persistence.MongoDb/ServiceCollectionExtensions.cs @@ -1,4 +1,5 @@ using System; +using Elsa.Extensions; using Elsa.Persistence.MongoDb.Services; using Elsa.Runtime; using Elsa.WorkflowProviders; @@ -9,31 +10,35 @@ namespace Elsa.Persistence.MongoDb { public static class ServiceCollectionExtensions { - public static IServiceCollection AddElsaPersistenceMongoDb(this IServiceCollection services, Action configureOptions) + public static ElsaOptions UseMongoDbPersistence(this ElsaOptions elsa, Action configureOptions) { - AddCore(services); - services.Configure(configureOptions); + AddCore(elsa); + elsa.Services.Configure(configureOptions); - return services; + return elsa; } - public static IServiceCollection AddElsaPersistenceMongoDb(this IServiceCollection services, IConfiguration options) + public static ElsaOptions UseMongoDbPersistence(this ElsaOptions elsa, IConfiguration options) { - AddCore(services); - services.Configure(options); - return services; + AddCore(elsa); + elsa.Services.Configure(options); + return elsa; } - private static void AddCore(IServiceCollection services) + private static void AddCore(ElsaOptions elsa) { - services.AddScoped() - .AddScoped() + elsa.Services + .AddScoped() + .AddScoped() .AddScoped() .AddScoped(sp => sp.GetRequiredService().WorkflowDefinitions) .AddScoped(sp => sp.GetRequiredService().WorkflowInstances) - .AddWorkflowProvider() .AddStartupTask(); + elsa + .UseWorkflowDefinitionStore(sp => sp.GetRequiredService()) + .UseWorkflowInstanceStore(sp => sp.GetRequiredService()); + DatabaseRegister.RegisterMapsAndSerializers(); } } diff --git a/src/persistence/Elsa.Persistence.YesSql/Elsa.Persistence.YesSql.csproj b/src/persistence/Elsa.Persistence.YesSql/Elsa.Persistence.YesSql.csproj index faa0e7022..ebf3a5934 100644 --- a/src/persistence/Elsa.Persistence.YesSql/Elsa.Persistence.YesSql.csproj +++ b/src/persistence/Elsa.Persistence.YesSql/Elsa.Persistence.YesSql.csproj @@ -28,6 +28,7 @@ + diff --git a/src/persistence/Elsa.Persistence.YesSql/IServiceCollectionExtensions.cs b/src/persistence/Elsa.Persistence.YesSql/ServiceCollectionExtensions.cs similarity index 63% rename from src/persistence/Elsa.Persistence.YesSql/IServiceCollectionExtensions.cs rename to src/persistence/Elsa.Persistence.YesSql/ServiceCollectionExtensions.cs index 99a39b07b..458d2ce81 100644 --- a/src/persistence/Elsa.Persistence.YesSql/IServiceCollectionExtensions.cs +++ b/src/persistence/Elsa.Persistence.YesSql/ServiceCollectionExtensions.cs @@ -1,39 +1,41 @@ using System; +using System.Data; using System.Linq; - using Elsa.Data; using Elsa.Data.Services; using Elsa.Persistence.YesSql.Data; using Elsa.Persistence.YesSql.Indexes; using Elsa.Persistence.YesSql.Services; using Elsa.Runtime; -using Elsa.WorkflowProviders; - using Microsoft.Extensions.DependencyInjection; - using YesSql; using YesSql.Indexes; +using YesSql.Provider.Sqlite; namespace Elsa.Persistence.YesSql { - public static class IServiceCollectionExtensions + public static class ServiceCollectionExtensions { - public static IServiceCollection AddElsaPersistenceYesSql(this IServiceCollection services, Action configure) + public static ElsaOptions UseYesSqlPersistence(this ElsaOptions elsa) => elsa.UseYesSqlPersistence((_, config) => config.UseSqLite("Data Source=elsa.db;Cache=Shared", IsolationLevel.ReadUncommitted)); + + public static ElsaOptions UseYesSqlPersistence(this ElsaOptions elsa, Action configure) { // Scoped, because IMediator is registered as Scoped and IIdGenerator could also be registered as Scoped - services.AddScoped() - .AddScoped() - .AddWorkflowProvider() - .AddSingleton(sp => CreateStore(sp, configure)) - .AddScoped(CreateSession) - .AddScoped() - .AddStartupTask() - .AddStartupTask() - .AddDataMigration() - .AddIndexProvider() - .AddIndexProvider(); + elsa.Services + .AddScoped() + .AddScoped() + .AddSingleton(sp => CreateStore(sp, configure)) + .AddScoped(CreateSession) + .AddScoped() + .AddStartupTask() + .AddStartupTask() + .AddDataMigration() + .AddIndexProvider() + .AddIndexProvider(); - return services; + return elsa + .UseWorkflowDefinitionStore(sp => sp.GetRequiredService()) + .UseWorkflowInstanceStore(sp => sp.GetRequiredService()); } public static IServiceCollection AddIndexProvider(this IServiceCollection services) where T : class, IIndexProvider => services.AddSingleton(); @@ -68,4 +70,6 @@ namespace Elsa.Persistence.YesSql return session; } } -} + + +} \ No newline at end of file diff --git a/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Startup.cs b/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Startup.cs index 8e05d1456..3dab9d169 100644 --- a/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Startup.cs +++ b/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Startup.cs @@ -14,8 +14,7 @@ namespace Elsa.Samples.ContextualWorkflowHttp public void ConfigureServices(IServiceCollection services) { services - .AddElsa() - .AddElsaPersistenceYesSql((sp, config) => config.UseSqLite("Data Source=elsa.db;Cache=Shared", IsolationLevel.ReadUncommitted)) + .AddElsa(options => options.UseYesSqlPersistence()) .AddHttpActivities() .AddConsoleActivities() .AddDataMigration() 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 cc3f0c630..30563aa3f 100644 --- a/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Elsa.Samples.CorrelationHttp.csproj +++ b/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Elsa.Samples.CorrelationHttp.csproj @@ -7,7 +7,6 @@ - diff --git a/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Startup.cs b/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Startup.cs index 8607dae16..194b18331 100644 --- a/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Startup.cs +++ b/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Startup.cs @@ -1,4 +1,3 @@ -using Elsa.Persistence.InMemory; using Elsa.Samples.CorrelationHttp.Workflows; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; @@ -11,7 +10,6 @@ namespace Elsa.Samples.CorrelationHttp { services .AddElsa() - .AddElsaPersistenceInMemory() .AddHttpActivities() .AddConsoleActivities() .AddWorkflow(); 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 cc3f0c630..30563aa3f 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,6 @@ - diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivities/Startup.cs b/src/samples/aspnet/Elsa.Samples.CustomActivities/Startup.cs index 2eab94840..66432cddb 100644 --- a/src/samples/aspnet/Elsa.Samples.CustomActivities/Startup.cs +++ b/src/samples/aspnet/Elsa.Samples.CustomActivities/Startup.cs @@ -1,5 +1,3 @@ -using Elsa.Persistence.InMemory; - using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; @@ -11,7 +9,6 @@ namespace Elsa.Samples.CustomActivities { services .AddElsa() - .AddElsaPersistenceInMemory() .AddHttpActivities() .AddActivity() .AddWorkflow(); 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 44152dfae..57eec47d7 100644 --- a/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Elsa.Samples.ForkJoinTimerAndSignalHttp.csproj +++ b/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Elsa.Samples.ForkJoinTimerAndSignalHttp.csproj @@ -7,6 +7,5 @@ - diff --git a/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Startup.cs b/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Startup.cs index db42a50b3..6f224bc5d 100644 --- a/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Startup.cs +++ b/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Startup.cs @@ -1,4 +1,3 @@ -using Elsa.Persistence.InMemory; using Elsa.Samples.ForkJoinTimerAndSignalHttp.BackgroundTasks; using Elsa.Samples.ForkJoinTimerAndSignalHttp.Workflows; using Microsoft.AspNetCore.Builder; @@ -15,7 +14,6 @@ namespace Elsa.Samples.ForkJoinTimerAndSignalHttp services .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddTimerActivities() .AddHostedService>() 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 cc3f0c630..30563aa3f 100644 --- a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Elsa.Samples.HelloWorldHttp.csproj +++ b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Elsa.Samples.HelloWorldHttp.csproj @@ -7,7 +7,6 @@ - diff --git a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Startup.cs b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Startup.cs index ac068fb57..b0ee75523 100644 --- a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Startup.cs +++ b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Startup.cs @@ -1,5 +1,3 @@ -using Elsa.Persistence.InMemory; - using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; @@ -11,7 +9,6 @@ namespace Elsa.Samples.HelloWorldHttp { services .AddElsa() - .AddElsaPersistenceInMemory() .AddHttpActivities() .AddWorkflow(); } 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 5124a3b41..06e0c8e81 100644 --- a/src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj +++ b/src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj @@ -8,7 +8,6 @@ - diff --git a/src/samples/aspnet/Elsa.Samples.Interrupts/Startup.cs b/src/samples/aspnet/Elsa.Samples.Interrupts/Startup.cs index 00d194db9..19bb61269 100644 --- a/src/samples/aspnet/Elsa.Samples.Interrupts/Startup.cs +++ b/src/samples/aspnet/Elsa.Samples.Interrupts/Startup.cs @@ -1,4 +1,3 @@ -using Elsa.Persistence.InMemory; using Elsa.Samples.Interrupts.Activities; using Elsa.Samples.Interrupts.Workflows; using Microsoft.AspNetCore.Builder; @@ -15,7 +14,6 @@ namespace Elsa.Samples.Interrupts services .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddHttpActivities() .AddTimerActivities() 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 b004a9e65..30563aa3f 100644 --- a/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Elsa.Samples.ReadModelHttp.csproj +++ b/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Elsa.Samples.ReadModelHttp.csproj @@ -6,8 +6,7 @@ - - + diff --git a/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Startup.cs b/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Startup.cs index 6a55a1259..9d0b86c1a 100644 --- a/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Startup.cs +++ b/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Startup.cs @@ -1,4 +1,3 @@ -using Elsa.Persistence.InMemory; using Elsa.Samples.ReadModelHttp.Workflows; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; @@ -11,7 +10,6 @@ namespace Elsa.Samples.ReadModelHttp { services .AddElsa() - .AddElsaPersistenceInMemory() .AddHttpActivities() .AddConsoleActivities() .AddWorkflow(); 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 ad524e643..1e354fe70 100644 --- a/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Elsa.Samples.DeclarativeCompositeActivitiesConsole.csproj +++ b/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Elsa.Samples.DeclarativeCompositeActivitiesConsole.csproj @@ -12,7 +12,6 @@ - diff --git a/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs b/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs index a11899bef..4c18ac2ea 100644 --- a/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs +++ b/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs @@ -18,7 +18,6 @@ namespace Elsa.Samples.DeclarativeCompositeActivitiesConsole // Create a service container with Elsa services. var services = new ServiceCollection() .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .BuildServiceProvider(); 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 1ed5eb730..b5a89fc88 100644 --- a/src/samples/console/Elsa.Samples.FileBasedWorkflow/Elsa.Samples.FileBasedWorkflow.csproj +++ b/src/samples/console/Elsa.Samples.FileBasedWorkflow/Elsa.Samples.FileBasedWorkflow.csproj @@ -12,7 +12,6 @@ - diff --git a/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs b/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs index 0a8b234a2..16b0fc17b 100644 --- a/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs +++ b/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs @@ -22,7 +22,6 @@ namespace Elsa.Samples.FileBasedWorkflow // Create a service container with Elsa services. var services = new ServiceCollection() .AddElsa(options => options.UseStorage(() => StorageFactory.Blobs.DirectoryFiles(currentDirectory))) - .AddElsaPersistenceInMemory() .AddConsoleActivities() .BuildServiceProvider(); 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 b22c3b4a1..e4cdfd97b 100644 --- a/src/samples/console/Elsa.Samples.ForLoopConsole/Elsa.Samples.ForLoopConsole.csproj +++ b/src/samples/console/Elsa.Samples.ForLoopConsole/Elsa.Samples.ForLoopConsole.csproj @@ -12,7 +12,6 @@ - diff --git a/src/samples/console/Elsa.Samples.ForLoopConsole/Program.cs b/src/samples/console/Elsa.Samples.ForLoopConsole/Program.cs index db6c44fe6..5a47c41e7 100644 --- a/src/samples/console/Elsa.Samples.ForLoopConsole/Program.cs +++ b/src/samples/console/Elsa.Samples.ForLoopConsole/Program.cs @@ -16,7 +16,6 @@ namespace Elsa.Samples.ForLoopConsole // Create a service container with Elsa services. var services = new ServiceCollection() .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddWorkflow() .BuildServiceProvider(); diff --git a/src/samples/console/Elsa.Samples.GoBackConsole/Elsa.Samples.GoBackConsole.csproj b/src/samples/console/Elsa.Samples.GoBackConsole/Elsa.Samples.GoBackConsole.csproj index 132d8fd66..636f8d393 100644 --- a/src/samples/console/Elsa.Samples.GoBackConsole/Elsa.Samples.GoBackConsole.csproj +++ b/src/samples/console/Elsa.Samples.GoBackConsole/Elsa.Samples.GoBackConsole.csproj @@ -13,7 +13,6 @@ - diff --git a/src/samples/console/Elsa.Samples.GoBackConsole/Program.cs b/src/samples/console/Elsa.Samples.GoBackConsole/Program.cs index e52f23bbc..6db4abead 100644 --- a/src/samples/console/Elsa.Samples.GoBackConsole/Program.cs +++ b/src/samples/console/Elsa.Samples.GoBackConsole/Program.cs @@ -18,7 +18,6 @@ namespace Elsa.Samples.GoBackConsole // Create a service container with Elsa services. var services = new ServiceCollection() .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddActivity() .AddWorkflow() 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 b22c3b4a1..e4cdfd97b 100644 --- a/src/samples/console/Elsa.Samples.HelloWorldConsole/Elsa.Samples.HelloWorldConsole.csproj +++ b/src/samples/console/Elsa.Samples.HelloWorldConsole/Elsa.Samples.HelloWorldConsole.csproj @@ -12,7 +12,6 @@ - diff --git a/src/samples/console/Elsa.Samples.HelloWorldConsole/Program.cs b/src/samples/console/Elsa.Samples.HelloWorldConsole/Program.cs index b82ede3b3..7576103d1 100644 --- a/src/samples/console/Elsa.Samples.HelloWorldConsole/Program.cs +++ b/src/samples/console/Elsa.Samples.HelloWorldConsole/Program.cs @@ -13,7 +13,6 @@ namespace Elsa.Samples.HelloWorldConsole // Create a service container with Elsa services. var services = new ServiceCollection() .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddWorkflow() .AddAutoMapperProfiles() diff --git a/src/samples/console/Elsa.Samples.IfElseConsole/Elsa.Samples.IfElseConsole.csproj b/src/samples/console/Elsa.Samples.IfElseConsole/Elsa.Samples.IfElseConsole.csproj index 132d8fd66..636f8d393 100644 --- a/src/samples/console/Elsa.Samples.IfElseConsole/Elsa.Samples.IfElseConsole.csproj +++ b/src/samples/console/Elsa.Samples.IfElseConsole/Elsa.Samples.IfElseConsole.csproj @@ -13,7 +13,6 @@ - diff --git a/src/samples/console/Elsa.Samples.IfElseConsole/Program.cs b/src/samples/console/Elsa.Samples.IfElseConsole/Program.cs index 8692294fc..4ee11f8df 100644 --- a/src/samples/console/Elsa.Samples.IfElseConsole/Program.cs +++ b/src/samples/console/Elsa.Samples.IfElseConsole/Program.cs @@ -16,7 +16,6 @@ namespace Elsa.Samples.IfElseConsole // Create a service container with Elsa services. var services = new ServiceCollection() .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddWorkflow() .BuildServiceProvider(); 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 b22c3b4a1..e4cdfd97b 100644 --- a/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Elsa.Samples.ProgrammaticCompositeActivitiesConsole.csproj +++ b/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Elsa.Samples.ProgrammaticCompositeActivitiesConsole.csproj @@ -12,7 +12,6 @@ - diff --git a/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs b/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs index 89dd1b01a..1ad49f955 100644 --- a/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs +++ b/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs @@ -15,7 +15,6 @@ namespace Elsa.Samples.ProgrammaticCompositeActivitiesConsole // Create a service container with Elsa services. var services = new ServiceCollection() .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddActivity() .AddWorkflow() 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 b22c3b4a1..10f5960c5 100644 --- a/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Elsa.Samples.ReadLineEchoConsole.csproj +++ b/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Elsa.Samples.ReadLineEchoConsole.csproj @@ -7,12 +7,11 @@ - + - - + diff --git a/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Program.cs b/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Program.cs index 85968963c..2520b1ece 100644 --- a/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Program.cs +++ b/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Program.cs @@ -14,7 +14,6 @@ namespace Elsa.Samples.ReadLineEchoConsole // Create a service container with Elsa services. var services = new ServiceCollection() .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .BuildServiceProvider(); @@ -23,14 +22,14 @@ namespace Elsa.Samples.ReadLineEchoConsole await startupRunner.StartupAsync(); // Build a new workflow. - var workflow = services.GetService() + var workflow = services.GetRequiredService() .WriteLine("What's your name?") .ReadLine() .WriteLine(context => $"Greetings, {context.Input}!") .Build(); // Get a workflow runner. - var workflowRunner = services.GetService(); + var workflowRunner = services.GetRequiredService(); // Execute the workflow. await workflowRunner.RunWorkflowAsync(workflow); 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 60f5f467a..72fc1f925 100644 --- a/src/samples/console/Elsa.Samples.Serialization/Elsa.Samples.Serialization.csproj +++ b/src/samples/console/Elsa.Samples.Serialization/Elsa.Samples.Serialization.csproj @@ -7,12 +7,11 @@ - + - - + diff --git a/src/samples/console/Elsa.Samples.Serialization/Program.cs b/src/samples/console/Elsa.Samples.Serialization/Program.cs index 12dd3096a..a9d3d69a0 100644 --- a/src/samples/console/Elsa.Samples.Serialization/Program.cs +++ b/src/samples/console/Elsa.Samples.Serialization/Program.cs @@ -17,14 +17,13 @@ namespace Elsa.Samples.Serialization /// 3. Materialize a workflow definition model into a workflow blueprint. /// 4. Run a workflow blueprint. /// - class Program + internal class Program { - static async Task Main(string[] args) + private static async Task Main() { // Create a service container with Elsa services. var services = new ServiceCollection() .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .BuildServiceProvider(); @@ -50,7 +49,7 @@ namespace Elsa.Samples.Serialization Type = nameof(WriteLine), Properties = new ActivityDefinitionProperties { - [nameof(WriteLine.Text)] = new ActivityDefinitionPropertyValue + [nameof(WriteLine.Text)] = new() { Syntax = LiquidExpressionHandler.SyntaxName, Expression = "Hello World!", 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 b22c3b4a1..10f5960c5 100644 --- a/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj +++ b/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj @@ -7,12 +7,11 @@ - + - - + diff --git a/src/samples/console/Elsa.Samples.SignalingConsole/Program.cs b/src/samples/console/Elsa.Samples.SignalingConsole/Program.cs index 9a850b848..62b3312bc 100644 --- a/src/samples/console/Elsa.Samples.SignalingConsole/Program.cs +++ b/src/samples/console/Elsa.Samples.SignalingConsole/Program.cs @@ -10,14 +10,13 @@ namespace Elsa.Samples.SignalingConsole /// /// Demonstrates a workflow with a While looping construct. /// - static class Program + internal static class Program { private static async Task Main() { // Create a service container with Elsa services. var services = new ServiceCollection() .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddWorkflow() .BuildServiceProvider(); 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 b22c3b4a1..10f5960c5 100644 --- a/src/samples/console/Elsa.Samples.WhileLoopConsole/Elsa.Samples.WhileLoopConsole.csproj +++ b/src/samples/console/Elsa.Samples.WhileLoopConsole/Elsa.Samples.WhileLoopConsole.csproj @@ -7,12 +7,11 @@ - + - - + diff --git a/src/samples/console/Elsa.Samples.WhileLoopConsole/Program.cs b/src/samples/console/Elsa.Samples.WhileLoopConsole/Program.cs index f0b4a5b7c..269e5328a 100644 --- a/src/samples/console/Elsa.Samples.WhileLoopConsole/Program.cs +++ b/src/samples/console/Elsa.Samples.WhileLoopConsole/Program.cs @@ -9,14 +9,13 @@ namespace Elsa.Samples.WhileLoopConsole /// /// Demonstrates a workflow with a While looping construct. /// - static class Program + internal static class Program { private static async Task Main() { // Create a service container with Elsa services. var services = new ServiceCollection() .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .BuildServiceProvider(); 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 24977887d..94fafe95f 100644 --- a/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Elsa.Samples.AzureServiceBusWorker.csproj +++ b/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Elsa.Samples.AzureServiceBusWorker.csproj @@ -6,12 +6,11 @@ - + - - - + + diff --git a/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Program.cs b/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Program.cs index c7ab17730..aeb61a74e 100644 --- a/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Program.cs +++ b/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Program.cs @@ -20,7 +20,6 @@ namespace Elsa.Samples.AzureServiceBusWorker { services .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddTimerActivities() .AddAzureServiceBusActivities(options => options.ConnectionString = hostContext.Configuration.GetConnectionString("AzureServiceBus")) 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 0f6c54a63..df4539f84 100644 --- a/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Elsa.Samples.CustomAttributesChildWorker.csproj +++ b/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Elsa.Samples.CustomAttributesChildWorker.csproj @@ -7,12 +7,11 @@ - + - - - + + diff --git a/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Program.cs b/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Program.cs index 1fc6d0f69..122e03f42 100644 --- a/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Program.cs +++ b/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Program.cs @@ -1,4 +1,3 @@ -using Elsa.Persistence.InMemory; using Elsa.Samples.CustomAttributesChildWorker.Messages; using Elsa.Samples.CustomAttributesChildWorker.Workflows; using Microsoft.Extensions.DependencyInjection; @@ -13,14 +12,13 @@ namespace Elsa.Samples.CustomAttributesChildWorker CreateHostBuilder(args).Build().Run(); } - public static IHostBuilder CreateHostBuilder(string[] args) => + private static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureServices( - (hostContext, services) => + (_, services) => { services .AddElsa() - .AddElsaPersistenceInMemory() .AddTimerActivities() .AddConsoleActivities() .AddRebusActivities() 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 e05411161..5c4c3a7be 100644 --- a/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj +++ b/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj @@ -16,7 +16,6 @@ - diff --git a/src/samples/worker/Elsa.Samples.DistributedLock/Program.cs b/src/samples/worker/Elsa.Samples.DistributedLock/Program.cs index 1480fe9ca..692c449ae 100644 --- a/src/samples/worker/Elsa.Samples.DistributedLock/Program.cs +++ b/src/samples/worker/Elsa.Samples.DistributedLock/Program.cs @@ -1,5 +1,3 @@ -using Elsa.Persistence.InMemory; - using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using System.Threading.Tasks; @@ -14,14 +12,13 @@ namespace Elsa.Samples.DistributedLock { private static async Task Main() => await CreateHostBuilder().UseConsoleLifetime().Build().RunAsync(); - public static IHostBuilder CreateHostBuilder() => + private static IHostBuilder CreateHostBuilder() => Host.CreateDefaultBuilder() .ConfigureServices( - (hostContext, services) => + (_, services) => { services .AddElsa(options => options.UseRedisLockProvider("localhost:6379,abortConnect=false")) - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddTimerActivities() .AddWorkflow(); 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 7292594ea..40cc8357e 100644 --- a/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Elsa.Samples.MultiTenantChildWorker.csproj +++ b/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Elsa.Samples.MultiTenantChildWorker.csproj @@ -12,6 +12,5 @@ - diff --git a/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Program.cs b/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Program.cs index eae4f24a7..d51420ea7 100644 --- a/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Program.cs +++ b/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Program.cs @@ -1,4 +1,3 @@ -using Elsa.Persistence.InMemory; using Elsa.Samples.MultiTenantChildWorker.Messages; using Elsa.Samples.MultiTenantChildWorker.Workflows; using Microsoft.Extensions.DependencyInjection; @@ -13,14 +12,13 @@ namespace Elsa.Samples.MultiTenantChildWorker CreateHostBuilder(args).Build().Run(); } - public static IHostBuilder CreateHostBuilder(string[] args) => + private static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureServices( - (hostContext, services) => + (_, services) => { services .AddElsa() - .AddElsaPersistenceInMemory() .AddTimerActivities() .AddConsoleActivities() .AddRebusActivities() 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 ec785d4b0..48327090e 100644 --- a/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj +++ b/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj @@ -15,6 +15,5 @@ - diff --git a/src/samples/worker/Elsa.Samples.RebusWorker/Program.cs b/src/samples/worker/Elsa.Samples.RebusWorker/Program.cs index 56811f576..f1346dfca 100644 --- a/src/samples/worker/Elsa.Samples.RebusWorker/Program.cs +++ b/src/samples/worker/Elsa.Samples.RebusWorker/Program.cs @@ -1,4 +1,3 @@ -using Elsa.Persistence.InMemory; using Elsa.Samples.RebusWorker.Messages; using Elsa.Samples.RebusWorker.Workflows; using Microsoft.Extensions.DependencyInjection; @@ -8,18 +7,14 @@ namespace Elsa.Samples.RebusWorker { public class Program { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } + public static void Main(string[] args) => CreateHostBuilder(args).Build().Run(); - public static IHostBuilder CreateHostBuilder(string[] args) => + private static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) - .ConfigureServices((hostContext, services) => + .ConfigureServices((_, services) => { services .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddTimerActivities() .AddRebusActivities() 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 d65c9bd1d..0c4b09476 100644 --- a/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Elsa.Samples.RunChildWorkflowWorker.csproj +++ b/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Elsa.Samples.RunChildWorkflowWorker.csproj @@ -11,6 +11,5 @@ - diff --git a/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Program.cs b/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Program.cs index 2faaccae8..25eec5772 100644 --- a/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Program.cs +++ b/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Program.cs @@ -1,4 +1,3 @@ -using Elsa.Persistence.InMemory; using Elsa.Samples.RunChildWorkflowWorker.HostedServices; using Elsa.Samples.RunChildWorkflowWorker.Workflows; using Microsoft.Extensions.DependencyInjection; @@ -8,19 +7,15 @@ namespace Elsa.Samples.RunChildWorkflowWorker { public class Program { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } + public static void Main(string[] args) => CreateHostBuilder(args).Build().Run(); - public static IHostBuilder CreateHostBuilder(string[] args) => + private static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureServices( - (hostContext, services) => + (_, services) => { services .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddHostedService() .AddWorkflow() diff --git a/src/samples/worker/Elsa.Samples.Timers/Elsa.Samples.Timers.csproj b/src/samples/worker/Elsa.Samples.Timers/Elsa.Samples.Timers.csproj index f1b6377b0..72fc1f925 100644 --- a/src/samples/worker/Elsa.Samples.Timers/Elsa.Samples.Timers.csproj +++ b/src/samples/worker/Elsa.Samples.Timers/Elsa.Samples.Timers.csproj @@ -12,7 +12,6 @@ - diff --git a/src/samples/worker/Elsa.Samples.Timers/Program.cs b/src/samples/worker/Elsa.Samples.Timers/Program.cs index 9e6ccef91..a371509f7 100644 --- a/src/samples/worker/Elsa.Samples.Timers/Program.cs +++ b/src/samples/worker/Elsa.Samples.Timers/Program.cs @@ -1,7 +1,4 @@ using System.Threading.Tasks; - -using Elsa.Persistence.InMemory; - using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using NodaTime; @@ -12,14 +9,13 @@ namespace Elsa.Samples.Timers { private static async Task Main() => await CreateHostBuilder().UseConsoleLifetime().Build().RunAsync(); - public static IHostBuilder CreateHostBuilder() => + private static IHostBuilder CreateHostBuilder() => Host.CreateDefaultBuilder() .ConfigureServices( - (hostContext, services) => + (_, services) => { services .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddTimerActivities() .AddWorkflow() 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 d65c9bd1d..0c4b09476 100644 --- a/src/samples/worker/Elsa.Samples.WhileLoopWorker/Elsa.Samples.WhileLoopWorker.csproj +++ b/src/samples/worker/Elsa.Samples.WhileLoopWorker/Elsa.Samples.WhileLoopWorker.csproj @@ -11,6 +11,5 @@ - diff --git a/src/samples/worker/Elsa.Samples.WhileLoopWorker/Program.cs b/src/samples/worker/Elsa.Samples.WhileLoopWorker/Program.cs index 16ba5275e..fbf37c630 100644 --- a/src/samples/worker/Elsa.Samples.WhileLoopWorker/Program.cs +++ b/src/samples/worker/Elsa.Samples.WhileLoopWorker/Program.cs @@ -8,19 +8,15 @@ namespace Elsa.Samples.WhileLoopWorker { public class Program { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } + public static void Main(string[] args) => CreateHostBuilder(args).Build().Run(); - public static IHostBuilder CreateHostBuilder(string[] args) => + private static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureServices( - (hostContext, services) => + (_, services) => { services .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities() .AddTimerActivities() .AddSingleton() diff --git a/src/server/Elsa.Server.Host/Elsa.Server.Host.csproj b/src/server/Elsa.Server.Host/Elsa.Server.Host.csproj index 97db11fc8..6318391b0 100644 --- a/src/server/Elsa.Server.Host/Elsa.Server.Host.csproj +++ b/src/server/Elsa.Server.Host/Elsa.Server.Host.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/server/Elsa.Server.Host/Startup.cs b/src/server/Elsa.Server.Host/Startup.cs index 237ec82da..93a4473f0 100644 --- a/src/server/Elsa.Server.Host/Startup.cs +++ b/src/server/Elsa.Server.Host/Startup.cs @@ -26,11 +26,9 @@ namespace Elsa.Server.Host public void ConfigureServices(IServiceCollection services) { var elsaSection = Configuration.GetSection("Elsa"); - var connectionString = Configuration.GetConnectionString("Sqlite"); services - .AddElsa() - .AddElsaPersistenceYesSql((sp, config) => config.UseSqLite(connectionString, IsolationLevel.ReadUncommitted)); + .AddElsa(options => options.UseYesSqlPersistence()); services .AddElsaApiEndpoints() diff --git a/src/server/Elsa.Server.Host/appsettings.json b/src/server/Elsa.Server.Host/appsettings.json index dd6bab560..9a01e5fc6 100644 --- a/src/server/Elsa.Server.Host/appsettings.json +++ b/src/server/Elsa.Server.Host/appsettings.json @@ -7,9 +7,6 @@ } }, "AllowedHosts": "*", - "ConnectionStrings": { - "Sqlite": "Data Source=elsa.db;Cache=Shared" - }, "Elsa": { "Http": { "BaseUrl": "http://localhost:16398" @@ -18,9 +15,6 @@ "Host": "localhost", "Port": "2525", "DefaultSender": "noreply@acme.com" - }, - "Timers": { - "SweepInterval": "00:00:30" } } } diff --git a/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj b/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj index 8d93770d2..868ae0ed7 100644 --- a/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj +++ b/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj @@ -35,7 +35,6 @@ - diff --git a/test/shared/Elsa.Testing.Shared/Unit/WorkflowsUnitTestBase.cs b/test/shared/Elsa.Testing.Shared/Unit/WorkflowsUnitTestBase.cs index 35fe3a67b..3baf7f2ac 100644 --- a/test/shared/Elsa.Testing.Shared/Unit/WorkflowsUnitTestBase.cs +++ b/test/shared/Elsa.Testing.Shared/Unit/WorkflowsUnitTestBase.cs @@ -22,7 +22,6 @@ namespace Elsa.Testing.Shared.Unit var services = new ServiceCollection() .AddElsa() - .AddElsaPersistenceInMemory() .AddConsoleActivities(Console.In, new XunitConsoleForwarder(testOutputHelper)); configureServices?.Invoke(services);