From 68ffd91ccc4078f6a8fa95159e9c3afe9974b43c Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Tue, 10 Aug 2021 12:06:21 +0200 Subject: [PATCH] Fix warnings --- .../Elsa.DistributedLocking.Redis.csproj | 8 ++++---- .../Elsa.Samples.MassTransitRabbitMq.csproj | 4 ++++ .../Elsa.Samples.CustomActivityOutcomes.csproj | 4 ++-- .../Elsa.Samples.RpaWebConsole.csproj | 1 + .../Startup.cs | 7 +++++++ .../Elsa.Samples.Persistence.EntityFramework.csproj | 4 ++++ .../Elsa.Core.IntegrationTests.csproj | 1 + .../Elsa.Testing.Shared/Elsa.Testing.Shared.csproj | 1 + .../Helpers/AddExpressionToActivityState.cs | 11 ++++------- 9 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/locking/Elsa.DistributedLocking.Redis/Elsa.DistributedLocking.Redis.csproj b/src/locking/Elsa.DistributedLocking.Redis/Elsa.DistributedLocking.Redis.csproj index 1c0ba47cd..eafdda9ca 100644 --- a/src/locking/Elsa.DistributedLocking.Redis/Elsa.DistributedLocking.Redis.csproj +++ b/src/locking/Elsa.DistributedLocking.Redis/Elsa.DistributedLocking.Redis.csproj @@ -13,12 +13,12 @@ elsa, workflows, distributed lock, redis - - - - + + + + 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 4d829f3b2..5f59d53c3 100644 --- a/src/samples/aspnet/Elsa.Samples.MassTransitRabbitMq/Elsa.Samples.MassTransitRabbitMq.csproj +++ b/src/samples/aspnet/Elsa.Samples.MassTransitRabbitMq/Elsa.Samples.MassTransitRabbitMq.csproj @@ -11,4 +11,8 @@ + + + + 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 ea178ffd8..814e937af 100644 --- a/src/samples/console/Elsa.Samples.CustomActivityOutcomes/Elsa.Samples.CustomActivityOutcomes.csproj +++ b/src/samples/console/Elsa.Samples.CustomActivityOutcomes/Elsa.Samples.CustomActivityOutcomes.csproj @@ -7,11 +7,11 @@ - + - + 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 30fd15ab9..610fd95bc 100644 --- a/src/samples/console/Elsa.Samples.RpaWebConsole/Elsa.Samples.RpaWebConsole.csproj +++ b/src/samples/console/Elsa.Samples.RpaWebConsole/Elsa.Samples.RpaWebConsole.csproj @@ -8,6 +8,7 @@ + diff --git a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Startup.cs b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Startup.cs index bf08549cf..5cfb8a6c0 100644 --- a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Startup.cs +++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Startup.cs @@ -1,6 +1,8 @@ using Elsa; +using Elsa.Caching.Rebus.Extensions; using Elsa.Persistence.EntityFramework.Core.Extensions; using Elsa.Persistence.EntityFramework.Sqlite; +using Elsa.Rebus.AzureServiceBus; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; @@ -25,10 +27,14 @@ namespace ElsaDashboard.Samples.AspNetCore.Monolith // Elsa Server. var elsaSection = Configuration.GetSection("Elsa"); + + var serviceBusConnectionString = Configuration.GetConnectionString("ASB"); services .AddElsa(options => options .UseEntityFrameworkPersistence(ef => ef.UseSqlite()) + .UseAzureServiceBus(serviceBusConnectionString) + .UseRebusCacheSignal() .AddConsoleActivities() .AddHttpActivities(elsaSection.GetSection("Server").Bind) .AddEmailActivities(elsaSection.GetSection("Smtp").Bind) @@ -36,6 +42,7 @@ namespace ElsaDashboard.Samples.AspNetCore.Monolith .AddJavaScriptActivities() .AddActivitiesFrom() .AddFeatures(new[] { typeof(Startup) }, Configuration) + .WithContainerName(elsaSection.GetSection("Server:ContainerName").Get()) ); services 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 d5e5f2883..91030016d 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 @@ -15,4 +15,8 @@ + + + + diff --git a/test/integration/Elsa.Core.IntegrationTests/Elsa.Core.IntegrationTests.csproj b/test/integration/Elsa.Core.IntegrationTests/Elsa.Core.IntegrationTests.csproj index c7ad83f02..ac48ec51c 100644 --- a/test/integration/Elsa.Core.IntegrationTests/Elsa.Core.IntegrationTests.csproj +++ b/test/integration/Elsa.Core.IntegrationTests/Elsa.Core.IntegrationTests.csproj @@ -13,6 +13,7 @@ + diff --git a/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj b/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj index b13ba0ff5..e9c40a4a6 100644 --- a/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj +++ b/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj @@ -18,6 +18,7 @@ + diff --git a/test/shared/Elsa.Testing.Shared/Helpers/AddExpressionToActivityState.cs b/test/shared/Elsa.Testing.Shared/Helpers/AddExpressionToActivityState.cs index 16d41d469..75edb9cd3 100644 --- a/test/shared/Elsa.Testing.Shared/Helpers/AddExpressionToActivityState.cs +++ b/test/shared/Elsa.Testing.Shared/Helpers/AddExpressionToActivityState.cs @@ -9,14 +9,11 @@ namespace Elsa.Testing.Shared.Helpers { public class AddExpressionToActivityState : Activity { - private IExpressionEvaluator _expressionEvaluator; - private AssertableActivityState _activityState; + private readonly IExpressionEvaluator _expressionEvaluator; + private readonly AssertableActivityState _activityState; - [ActivityInput] - public string Expression { get; set; } - - [ActivityInput] - public string ExpressionSyntax { get; set; } + [ActivityInput] public string Expression { get; set; } = default!; + [ActivityInput] public string ExpressionSyntax { get; set; } = default!; public AddExpressionToActivityState(IExpressionEvaluator evaluator, AssertableActivityState activityState) {