diff --git a/Directory.Build.props b/Directory.Build.props index 9a87e6582..8bd04fe24 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ Elsa Workflows Community - 2024 + 2025 https://github.com/elsa-workflows/elsa-core https://github.com/elsa-workflows/elsa-core @@ -37,8 +37,4 @@ $(NoWarn);IL2026;IL2046;IL2057;IL2067;IL2070;IL2072;IL2075;IL2087;IL2091 - - 3.6.0-preview.1018 - 3.6.0-preview.28 - \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index 1a8054f2b..7510cde91 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,185 +1,225 @@ - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/_build.csproj b/build/_build.csproj index 465dc8f65..0e27141ab 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -3,7 +3,7 @@ Exe net9.0 - + CS0649;CS0169;CA1050;CA1822;CA2211;IDE1006 .. .. @@ -24,7 +24,7 @@ - + diff --git a/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj b/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj index ce9d79c76..2f3bf9e38 100644 --- a/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj +++ b/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj @@ -1,77 +1,85 @@  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/apps/Elsa.Server.Web/Extensions/MultitenantConnectionStringServiceProviderExtensions.cs b/src/apps/Elsa.Server.Web/Extensions/MultitenantConnectionStringServiceProviderExtensions.cs index 0cc7a9c41..9c5fabbc8 100644 --- a/src/apps/Elsa.Server.Web/Extensions/MultitenantConnectionStringServiceProviderExtensions.cs +++ b/src/apps/Elsa.Server.Web/Extensions/MultitenantConnectionStringServiceProviderExtensions.cs @@ -1,5 +1,5 @@ using Elsa.Common.Multitenancy; -using Elsa.EntityFrameworkCore.Extensions; +using Elsa.Persistence.EFCore.Extensions; namespace Elsa.Server.Web.Extensions; diff --git a/src/apps/Elsa.Server.Web/Program.cs b/src/apps/Elsa.Server.Web/Program.cs index 28fb61c49..8c64a538b 100644 --- a/src/apps/Elsa.Server.Web/Program.cs +++ b/src/apps/Elsa.Server.Web/Program.cs @@ -5,28 +5,26 @@ using Elsa.Caching.Options; using Elsa.Common.Codecs; using Elsa.Common.DistributedHosting.DistributedLocks; using Elsa.Common.RecurringTasks; -using Elsa.Dapper.Extensions; -using Elsa.Dapper.Services; using Elsa.DropIns.Extensions; -using Elsa.EntityFrameworkCore.Extensions; -using Elsa.EntityFrameworkCore.Modules.Alterations; -using Elsa.EntityFrameworkCore.Modules.Identity; -using Elsa.EntityFrameworkCore.Modules.Management; -using Elsa.EntityFrameworkCore.Modules.Runtime; -using Elsa.EntityFrameworkCore.Modules.Tenants; using Elsa.Expressions.Helpers; using Elsa.Extensions; using Elsa.Features.Services; using Elsa.Identity.Multitenancy; -using Elsa.Kafka; -using Elsa.MassTransit.Extensions; -using Elsa.MongoDb.Extensions; -using Elsa.MongoDb.Modules.Alterations; -using Elsa.MongoDb.Modules.Identity; -using Elsa.MongoDb.Modules.Management; -using Elsa.MongoDb.Modules.Runtime; -using Elsa.MongoDb.Modules.Tenants; using Elsa.OpenTelemetry.Middleware; +using Elsa.Persistence.Dapper.Extensions; +using Elsa.Persistence.Dapper.Services; +using Elsa.Persistence.EFCore.Extensions; +using Elsa.Persistence.EFCore.Modules.Alterations; +using Elsa.Persistence.EFCore.Modules.Identity; +using Elsa.Persistence.EFCore.Modules.Management; +using Elsa.Persistence.EFCore.Modules.Runtime; +using Elsa.Persistence.EFCore.Modules.Tenants; +using Elsa.Persistence.MongoDb.Extensions; +using Elsa.Persistence.MongoDb.Modules.Alterations; +using Elsa.Persistence.MongoDb.Modules.Identity; +using Elsa.Persistence.MongoDb.Modules.Management; +using Elsa.Persistence.MongoDb.Modules.Runtime; +using Elsa.Persistence.MongoDb.Modules.Tenants; using Elsa.Retention.Extensions; using Elsa.Retention.Models; using Elsa.Secrets.Extensions; @@ -35,6 +33,13 @@ using Elsa.Secrets.Persistence; using Elsa.Server.Web; using Elsa.Server.Web.Extensions; using Elsa.Server.Web.Filters; +using Elsa.ServiceBus.Kafka; +using Elsa.ServiceBus.MassTransit.Extensions; +using Elsa.Sql.Extensions; +using Elsa.Sql.MySql; +using Elsa.Sql.Sqlite; +using Elsa.Sql.PostgreSql; +using Elsa.Sql.SqlServer; using Elsa.Tenants.AspNetCore; using Elsa.Tenants.Extensions; using Elsa.Workflows; @@ -328,7 +333,7 @@ services if (sqlDatabaseProvider == SqlDatabaseProvider.SqlServer) { //ef.UseSqlServer(sqlServerConnectionString, new ElsaDbContextOptions); - var migrationsAssembly = typeof(Elsa.EntityFrameworkCore.SqlServer.IdentityDbContextFactory).Assembly; + var migrationsAssembly = typeof(Elsa.Persistence.EFCore.SqlServer.IdentityDbContextFactory).Assembly; var connectionString = sqlServerConnectionString; ef.DbContextOptionsBuilder = (_, db) => db.UseElsaSqlServer(migrationsAssembly, connectionString, null, configure => configure.CommandTimeout(60000)); } @@ -424,17 +429,17 @@ services options.AppendScript("string Greet(string name) => $\"Hello {name}!\";"); options.AppendScript("string SayHelloWorld() => Greet(\"World\");"); }) - .UseJavaScript(options => - { - options.AllowClrAccess = true; - options.DisableWrappers = disableVariableWrappers; - options.DisableVariableCopying = disableVariableCopying; - options.ConfigureEngine(engine => - { - engine.Execute("function greet(name) { return `Hello ${name}!`; }"); - engine.Execute("function sayHelloWorld() { return greet('World'); }"); - }); - }) + //.UseJavaScript(options => + //{ + // options.AllowClrAccess = true; + // options.DisableWrappers = disableVariableWrappers; + // options.DisableVariableCopying = disableVariableCopying; + // options.ConfigureEngine(engine => + // { + // engine.Execute("function greet(name) { return `Hello ${name}!`; }"); + // engine.Execute("function sayHelloWorld() { return greet('World'); }"); + // }); + //}) .UsePython(python => { python.PythonOptions += options => @@ -458,6 +463,16 @@ services if (useCaching) http.UseCache(); }) + .UseSql(options => + { + options.Clients = client => + { + client.Register("MySql"); + client.Register("PostgreSql"); + client.Register("Sqlite"); + client.Register("Sql Server"); + }; + }) .UseEmail(email => email.ConfigureOptions = options => configuration.GetSection("Smtp").Bind(options)) .UseAlterations(alterations => { diff --git a/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj b/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj index 3ea5601f3..0a49cfc26 100644 --- a/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj +++ b/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj @@ -7,48 +7,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/apps/Elsa.ServerAndStudio.Web/Program.cs b/src/apps/Elsa.ServerAndStudio.Web/Program.cs index 01b787cad..be6a4cc96 100644 --- a/src/apps/Elsa.ServerAndStudio.Web/Program.cs +++ b/src/apps/Elsa.ServerAndStudio.Web/Program.cs @@ -1,19 +1,18 @@ using Elsa.Agents; -using Elsa.EntityFrameworkCore.Extensions; -using Elsa.EntityFrameworkCore.Modules.Management; -using Elsa.EntityFrameworkCore.Modules.Runtime; -using Elsa.MassTransit.Options; +using Elsa.Expressions.JavaScript.Libraries.Extensions; using Elsa.Extensions; -using Elsa.JavaScript.Libraries.Extensions; -using Elsa.ServerAndStudio.Web.Extensions; -using Elsa.MassTransit.Extensions; +using Elsa.Persistence.EFCore.Extensions; +using Elsa.Persistence.EFCore.Modules.Management; +using Elsa.Persistence.EFCore.Modules.Runtime; using Elsa.ServerAndStudio.Web.Enums; +using Elsa.ServerAndStudio.Web.Extensions; +using Elsa.ServiceBus.MassTransit.Extensions; +using Elsa.ServiceBus.MassTransit.Options; using Medallion.Threading.FileSystem; using Microsoft.AspNetCore.Mvc; using Microsoft.Data.Sqlite; -using WebhooksCore.Options; -using Elsa.Connections.Middleware; using Proto.Persistence.Sqlite; +using WebhooksCore.Options; const bool useMassTransit = true; const bool useProtoActor = true; diff --git a/src/common/Elsa.Testing.Shared.Component/Elsa.Testing.Shared.Component.csproj b/src/common/Elsa.Testing.Shared.Component/Elsa.Testing.Shared.Component.csproj index 3e0b5a475..3d81bda8f 100644 --- a/src/common/Elsa.Testing.Shared.Component/Elsa.Testing.Shared.Component.csproj +++ b/src/common/Elsa.Testing.Shared.Component/Elsa.Testing.Shared.Component.csproj @@ -1,4 +1,4 @@ - + @@ -9,19 +9,19 @@ + + + + + - - - - - diff --git a/src/common/Elsa.Testing.Shared.Integration/Elsa.Testing.Shared.Integration.csproj b/src/common/Elsa.Testing.Shared.Integration/Elsa.Testing.Shared.Integration.csproj index 06b02b196..a7a737194 100644 --- a/src/common/Elsa.Testing.Shared.Integration/Elsa.Testing.Shared.Integration.csproj +++ b/src/common/Elsa.Testing.Shared.Integration/Elsa.Testing.Shared.Integration.csproj @@ -4,22 +4,22 @@ Provides common utilities that are helpful when writing integration tests against Elsa Workflows functionality. - elsa, integration testing + elsa integration testing Elsa.Testing.Shared - + + + + + + - - - - - diff --git a/src/common/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj b/src/common/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj index ceabd4472..3e79f6559 100644 --- a/src/common/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj +++ b/src/common/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj @@ -8,17 +8,17 @@ + + + + + - - - - - diff --git a/src/modules/Elsa.Http/Elsa.Http.csproj b/src/modules/Elsa.Http/Elsa.Http.csproj index 0c7e66c0c..c6c6b1037 100644 --- a/src/modules/Elsa.Http/Elsa.Http.csproj +++ b/src/modules/Elsa.Http/Elsa.Http.csproj @@ -9,9 +9,7 @@ - - @@ -21,8 +19,10 @@ - - + + + + diff --git a/src/modules/Elsa.Http/Features/HttpJavaScriptFeature.cs b/src/modules/Elsa.Http/Features/HttpJavaScriptFeature.cs index 9bd7bbf58..94990c3f1 100644 --- a/src/modules/Elsa.Http/Features/HttpJavaScriptFeature.cs +++ b/src/modules/Elsa.Http/Features/HttpJavaScriptFeature.cs @@ -2,7 +2,7 @@ using Elsa.Features.Abstractions; using Elsa.Features.Attributes; using Elsa.Features.Services; using Elsa.Http.Scripting.JavaScript; -using Elsa.Scripting.JavaScript.Features; +using Elsa.Expressions.JavaScript.Features; using Microsoft.Extensions.DependencyInjection; namespace Elsa.Http.Features; diff --git a/src/modules/Elsa.Http/Scripting/JavaScript/HttpJavaScriptHandler.cs b/src/modules/Elsa.Http/Scripting/JavaScript/HttpJavaScriptHandler.cs index 08be48ac6..b3b064804 100644 --- a/src/modules/Elsa.Http/Scripting/JavaScript/HttpJavaScriptHandler.cs +++ b/src/modules/Elsa.Http/Scripting/JavaScript/HttpJavaScriptHandler.cs @@ -1,9 +1,9 @@ using Elsa.Extensions; using Elsa.Http.Resilience; -using Elsa.Scripting.JavaScript.Notifications; -using Elsa.Scripting.JavaScript.TypeDefinitions.Builders; -using Elsa.Scripting.JavaScript.TypeDefinitions.Contracts; -using Elsa.Scripting.JavaScript.TypeDefinitions.Models; +using Elsa.Expressions.JavaScript.Notifications; +using Elsa.Expressions.JavaScript.TypeDefinitions.Builders; +using Elsa.Expressions.JavaScript.TypeDefinitions.Contracts; +using Elsa.Expressions.JavaScript.TypeDefinitions.Models; using Elsa.Mediator.Contracts; using Elsa.Workflows; using JetBrains.Annotations; diff --git a/src/modules/Elsa.Tenants.AspNetCore/Elsa.Tenants.AspNetCore.csproj b/src/modules/Elsa.Tenants.AspNetCore/Elsa.Tenants.AspNetCore.csproj index 66c5aa27f..af3fe69b5 100644 --- a/src/modules/Elsa.Tenants.AspNetCore/Elsa.Tenants.AspNetCore.csproj +++ b/src/modules/Elsa.Tenants.AspNetCore/Elsa.Tenants.AspNetCore.csproj @@ -12,6 +12,7 @@ + diff --git a/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj b/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj index 94828c0a3..dbb0d719b 100644 --- a/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj +++ b/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj @@ -1,4 +1,4 @@ - + @@ -6,11 +6,11 @@ elsa module workflows api - + + - diff --git a/src/modules/Elsa.Workflows.Management/Elsa.Workflows.Management.csproj b/src/modules/Elsa.Workflows.Management/Elsa.Workflows.Management.csproj index c2f98f223..bf2ba1d1a 100644 --- a/src/modules/Elsa.Workflows.Management/Elsa.Workflows.Management.csproj +++ b/src/modules/Elsa.Workflows.Management/Elsa.Workflows.Management.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/modules/Elsa.Workflows.Management/Features/DslIntegrationFeature.cs b/src/modules/Elsa.Workflows.Management/Features/DslIntegrationFeature.cs index a2a778a7b..70bc9483f 100644 --- a/src/modules/Elsa.Workflows.Management/Features/DslIntegrationFeature.cs +++ b/src/modules/Elsa.Workflows.Management/Features/DslIntegrationFeature.cs @@ -1,5 +1,5 @@ -using Elsa.Dsl.Features; -using Elsa.Dsl.Models; +using Elsa.Expressions.Dsl.Features; +using Elsa.Expressions.Dsl.Models; using Elsa.Features.Abstractions; using Elsa.Features.Attributes; using Elsa.Features.Services; diff --git a/src/modules/Elsa.Workflows.Management/HostedServices/MapActivityDslFunctionsHostedService.cs b/src/modules/Elsa.Workflows.Management/HostedServices/MapActivityDslFunctionsHostedService.cs index e188cb1df..557a347d7 100644 --- a/src/modules/Elsa.Workflows.Management/HostedServices/MapActivityDslFunctionsHostedService.cs +++ b/src/modules/Elsa.Workflows.Management/HostedServices/MapActivityDslFunctionsHostedService.cs @@ -1,4 +1,4 @@ -using Elsa.Dsl.Contracts; +using Elsa.Expressions.Dsl.Contracts; using Elsa.Workflows.Management.Options; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; diff --git a/src/modules/Elsa.Workflows.Management/Options/DslIntegrationOptions.cs b/src/modules/Elsa.Workflows.Management/Options/DslIntegrationOptions.cs index 356f9089e..37f4a0dc1 100644 --- a/src/modules/Elsa.Workflows.Management/Options/DslIntegrationOptions.cs +++ b/src/modules/Elsa.Workflows.Management/Options/DslIntegrationOptions.cs @@ -1,4 +1,4 @@ -using Elsa.Dsl.Models; +using Elsa.Expressions.Dsl.Models; namespace Elsa.Workflows.Management.Options; diff --git a/src/modules/Elsa.Workflows.Runtime/Elsa.Workflows.Runtime.csproj b/src/modules/Elsa.Workflows.Runtime/Elsa.Workflows.Runtime.csproj index 64647ed1b..c25e07d24 100644 --- a/src/modules/Elsa.Workflows.Runtime/Elsa.Workflows.Runtime.csproj +++ b/src/modules/Elsa.Workflows.Runtime/Elsa.Workflows.Runtime.csproj @@ -1,4 +1,4 @@ - + @@ -8,19 +8,19 @@ - - - - + + + + - - + + - - + + diff --git a/test/component/Elsa.Workflows.ComponentTests/Elsa.Workflows.ComponentTests.csproj b/test/component/Elsa.Workflows.ComponentTests/Elsa.Workflows.ComponentTests.csproj index fc4ba4f47..132156285 100644 --- a/test/component/Elsa.Workflows.ComponentTests/Elsa.Workflows.ComponentTests.csproj +++ b/test/component/Elsa.Workflows.ComponentTests/Elsa.Workflows.ComponentTests.csproj @@ -13,11 +13,14 @@ + + + + - - + + - diff --git a/test/component/Elsa.Workflows.ComponentTests/Helpers/Consumers/WorkflowDefinitionEventConsumer.cs b/test/component/Elsa.Workflows.ComponentTests/Helpers/Consumers/WorkflowDefinitionEventConsumer.cs index 9a637faff..278367f5d 100644 --- a/test/component/Elsa.Workflows.ComponentTests/Helpers/Consumers/WorkflowDefinitionEventConsumer.cs +++ b/test/component/Elsa.Workflows.ComponentTests/Helpers/Consumers/WorkflowDefinitionEventConsumer.cs @@ -1,4 +1,4 @@ -using Elsa.MassTransit.Messages; +using Elsa.ServiceBus.MassTransit.Messages; using Elsa.Testing.Shared; using Elsa.Testing.Shared.Services; using Hangfire.Annotations; diff --git a/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/WorkflowServer.cs b/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/WorkflowServer.cs index 67f5b73d8..3fe67b19b 100644 --- a/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/WorkflowServer.cs +++ b/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/WorkflowServer.cs @@ -1,14 +1,14 @@ using System.Reflection; using Elsa.Alterations.Extensions; using Elsa.Caching; -using Elsa.EntityFrameworkCore.Extensions; -using Elsa.EntityFrameworkCore.Modules.Alterations; -using Elsa.EntityFrameworkCore.Modules.Identity; -using Elsa.EntityFrameworkCore.Modules.Management; -using Elsa.EntityFrameworkCore.Modules.Runtime; using Elsa.Extensions; using Elsa.Identity.Providers; -using Elsa.MassTransit.Extensions; +using Elsa.Persistence.EFCore.Extensions; +using Elsa.Persistence.EFCore.Modules.Alterations; +using Elsa.Persistence.EFCore.Modules.Identity; +using Elsa.Persistence.EFCore.Modules.Management; +using Elsa.Persistence.EFCore.Modules.Runtime; +using Elsa.ServiceBus.MassTransit.Extensions; using Elsa.Testing.Shared.Handlers; using Elsa.Testing.Shared.Services; using Elsa.Workflows.ComponentTests.Consumers; @@ -96,14 +96,14 @@ public class WorkflowServer(Infrastructure infrastructure, string url) : WebAppl { distributedCaching.UseMassTransit(); }); - elsa.UseJavaScript(options => - { - options.AllowClrAccess = true; - options.ConfigureEngine(engine => - { - engine.SetValue("getStaticValue", () => StaticValueHolder.Value); - }); - }); + //elsa.UseJavaScript(options => + //{ + // options.AllowClrAccess = true; + // options.ConfigureEngine(engine => + // { + // engine.SetValue("getStaticValue", () => StaticValueHolder.Value); + // }); + //}); elsa.UseAlterations(alterations => { alterations.UseEntityFrameworkCore(ef => ef.UsePostgreSql(dbConnectionString)); diff --git a/test/component/Elsa.Workflows.ComponentTests/Scenarios/JavaScriptVariables/JavaScriptVariablesWorkflow1.cs b/test/component/Elsa.Workflows.ComponentTests/Scenarios/JavaScriptVariables/JavaScriptVariablesWorkflow1.cs index 530fa8736..416711bc9 100644 --- a/test/component/Elsa.Workflows.ComponentTests/Scenarios/JavaScriptVariables/JavaScriptVariablesWorkflow1.cs +++ b/test/component/Elsa.Workflows.ComponentTests/Scenarios/JavaScriptVariables/JavaScriptVariablesWorkflow1.cs @@ -1,5 +1,5 @@ using Elsa.Extensions; -using Elsa.JavaScript.Activities; +using Elsa.Expressions.JavaScript.Activities; namespace Elsa.Workflows.ComponentTests.Scenarios.JavaScriptVariables; diff --git a/test/component/Elsa.Workflows.ComponentTests/Scenarios/JavaScriptVariables/JavaScriptVariablesWorkflow2.cs b/test/component/Elsa.Workflows.ComponentTests/Scenarios/JavaScriptVariables/JavaScriptVariablesWorkflow2.cs index 23a2e00ce..38a96625b 100644 --- a/test/component/Elsa.Workflows.ComponentTests/Scenarios/JavaScriptVariables/JavaScriptVariablesWorkflow2.cs +++ b/test/component/Elsa.Workflows.ComponentTests/Scenarios/JavaScriptVariables/JavaScriptVariablesWorkflow2.cs @@ -1,5 +1,5 @@ using Elsa.Extensions; -using Elsa.JavaScript.Activities; +using Elsa.Expressions.JavaScript.Activities; namespace Elsa.Workflows.ComponentTests.Scenarios.JavaScriptVariables; diff --git a/test/component/Elsa.Workflows.ComponentTests/Scenarios/JavaScriptVariables/JavaScriptVariablesWorkflow3.cs b/test/component/Elsa.Workflows.ComponentTests/Scenarios/JavaScriptVariables/JavaScriptVariablesWorkflow3.cs index b62061c67..5fa37ae88 100644 --- a/test/component/Elsa.Workflows.ComponentTests/Scenarios/JavaScriptVariables/JavaScriptVariablesWorkflow3.cs +++ b/test/component/Elsa.Workflows.ComponentTests/Scenarios/JavaScriptVariables/JavaScriptVariablesWorkflow3.cs @@ -1,5 +1,5 @@ using Elsa.Extensions; -using Elsa.JavaScript.Activities; +using Elsa.Expressions.JavaScript.Activities; namespace Elsa.Workflows.ComponentTests.Scenarios.JavaScriptVariables; diff --git a/test/integration/Elsa.JavaScript.IntegrationTests/Elsa.JavaScript.IntegrationTests.csproj b/test/integration/Elsa.JavaScript.IntegrationTests/Elsa.JavaScript.IntegrationTests.csproj index d82fe514d..fa80c09c2 100644 --- a/test/integration/Elsa.JavaScript.IntegrationTests/Elsa.JavaScript.IntegrationTests.csproj +++ b/test/integration/Elsa.JavaScript.IntegrationTests/Elsa.JavaScript.IntegrationTests.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/integration/Elsa.JavaScript.IntegrationTests/JsonConverterTest.cs b/test/integration/Elsa.JavaScript.IntegrationTests/JsonConverterTest.cs index 011e92d32..e1d080af5 100644 --- a/test/integration/Elsa.JavaScript.IntegrationTests/JsonConverterTest.cs +++ b/test/integration/Elsa.JavaScript.IntegrationTests/JsonConverterTest.cs @@ -3,13 +3,13 @@ using System.Numerics; using System.Text.Json; using Elsa.Common.Converters; using Elsa.Expressions.Models; -using Elsa.JavaScript.Contracts; +using Elsa.Expressions.JavaScript.Contracts; using Elsa.Testing.Shared; using Microsoft.Extensions.DependencyInjection; using Xunit; using Xunit.Abstractions; -namespace Elsa.JavaScript.IntegrationTests; +namespace Elsa.Expressions.JavaScript.IntegrationTests; public class JsonConverterTest(ITestOutputHelper testOutputHelper) { private readonly IServiceProvider _serviceProvider = new TestApplicationBuilder(testOutputHelper).Build(); diff --git a/test/integration/Elsa.JavaScript.IntegrationTests/JsonElementConverterTests.cs b/test/integration/Elsa.JavaScript.IntegrationTests/JsonElementConverterTests.cs index c2c57695f..fb490adcb 100644 --- a/test/integration/Elsa.JavaScript.IntegrationTests/JsonElementConverterTests.cs +++ b/test/integration/Elsa.JavaScript.IntegrationTests/JsonElementConverterTests.cs @@ -1,13 +1,13 @@ using System.Text.Json; using Elsa.Expressions.Models; -using Elsa.JavaScript.Contracts; +using Elsa.Expressions.JavaScript.Contracts; using Elsa.Testing.Shared; using Elsa.Workflows.Memory; using Microsoft.Extensions.DependencyInjection; using Xunit; using Xunit.Abstractions; -namespace Elsa.JavaScript.IntegrationTests; +namespace Elsa.Expressions.JavaScript.IntegrationTests; public class JsonElementConverterTests(ITestOutputHelper testOutputHelper) { diff --git a/test/integration/Elsa.JavaScript.IntegrationTests/ToJsonTests.cs b/test/integration/Elsa.JavaScript.IntegrationTests/ToJsonTests.cs index 2e1caced0..384b4ec0d 100644 --- a/test/integration/Elsa.JavaScript.IntegrationTests/ToJsonTests.cs +++ b/test/integration/Elsa.JavaScript.IntegrationTests/ToJsonTests.cs @@ -1,13 +1,13 @@ using System.Text.Json; using Elsa.Expressions.Models; -using Elsa.JavaScript.Contracts; +using Elsa.Expressions.JavaScript.Contracts; using Elsa.Testing.Shared; using Elsa.Workflows.Memory; using Microsoft.Extensions.DependencyInjection; using Xunit; using Xunit.Abstractions; -namespace Elsa.JavaScript.IntegrationTests; +namespace Elsa.Expressions.JavaScript.IntegrationTests; public class ToJsonTests(ITestOutputHelper testOutputHelper) { diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Elsa.Workflows.IntegrationTests.csproj b/test/integration/Elsa.Workflows.IntegrationTests/Elsa.Workflows.IntegrationTests.csproj index 331bcbc4a..ad5750086 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Elsa.Workflows.IntegrationTests.csproj +++ b/test/integration/Elsa.Workflows.IntegrationTests/Elsa.Workflows.IntegrationTests.csproj @@ -1,20 +1,20 @@ - + {ca65b7d5-57e8-4932-b8b8-732d040c9b3a} - - + - + + diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/Composites/Workflows.cs b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/Composites/Workflows.cs index e70ea8733..b2b91a705 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/Composites/Workflows.cs +++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/Composites/Workflows.cs @@ -1,5 +1,5 @@ using Elsa.Extensions; -using Elsa.JavaScript.Activities; +using Elsa.Expressions.JavaScript.Activities; using Elsa.Workflows.Activities; using Elsa.Workflows.Memory; using Elsa.Workflows.Models; diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/HttpRequestWithLiquid/JavascriptAndLiquidWorkflow.cs b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/HttpRequestWithLiquid/JavascriptAndLiquidWorkflow.cs index c0e95dd3f..8a8f0fed1 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/HttpRequestWithLiquid/JavascriptAndLiquidWorkflow.cs +++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/HttpRequestWithLiquid/JavascriptAndLiquidWorkflow.cs @@ -1,5 +1,5 @@ using Elsa.Expressions.Models; -using Elsa.JavaScript.Activities; +using Elsa.Expressions.JavaScript.Activities; using Elsa.Workflows.Activities; using Elsa.Workflows.Memory; diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JavaScriptFunctions/BytesAndStringEncodingTests.cs b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JavaScriptFunctions/BytesAndStringEncodingTests.cs index 73092ab57..2479c8fa0 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JavaScriptFunctions/BytesAndStringEncodingTests.cs +++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JavaScriptFunctions/BytesAndStringEncodingTests.cs @@ -1,7 +1,7 @@ using System.Text; using Elsa.Expressions.Models; using Elsa.Extensions; -using Elsa.JavaScript.Contracts; +using Elsa.Expressions.JavaScript.Contracts; using Elsa.Testing.Shared; using Microsoft.Extensions.DependencyInjection; using Xunit.Abstractions; diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JavaScriptListsAndArrays/Tests.cs b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JavaScriptListsAndArrays/Tests.cs index 1bb11cac9..d0a8781fb 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JavaScriptListsAndArrays/Tests.cs +++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JavaScriptListsAndArrays/Tests.cs @@ -1,7 +1,7 @@ using System.Dynamic; using Elsa.Expressions.Models; using Elsa.Extensions; -using Elsa.JavaScript.Contracts; +using Elsa.Expressions.JavaScript.Contracts; using Elsa.Testing.Shared; using Microsoft.Extensions.DependencyInjection; using Xunit.Abstractions; diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JavaScriptNativeVariables/Workflows.cs b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JavaScriptNativeVariables/Workflows.cs index 821fd3339..81506e995 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JavaScriptNativeVariables/Workflows.cs +++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JavaScriptNativeVariables/Workflows.cs @@ -1,5 +1,5 @@ -using Elsa.JavaScript.Activities; -using Elsa.JavaScript.Models; +using Elsa.Expressions.JavaScript.Activities; +using Elsa.Expressions.JavaScript.Models; using Elsa.Workflows.Activities; namespace Elsa.Workflows.IntegrationTests.Scenarios.JavaScriptNativeVariables; diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JsonObjectToObjectRemainsJsonObject/Workflows/TestWorkflow.cs b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JsonObjectToObjectRemainsJsonObject/Workflows/TestWorkflow.cs index 4aae7f595..145d71c91 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JsonObjectToObjectRemainsJsonObject/Workflows/TestWorkflow.cs +++ b/test/integration/Elsa.Workflows.IntegrationTests/Scenarios/JsonObjectToObjectRemainsJsonObject/Workflows/TestWorkflow.cs @@ -1,6 +1,6 @@ using System.Text.Json.Nodes; using Elsa.Expressions.Models; -using Elsa.JavaScript.Models; +using Elsa.Expressions.JavaScript.Models; using Elsa.Workflows.Activities; using Elsa.Workflows.IntegrationTests.Scenarios.JsonObjectToObjectRemainsJsonObject.Activities;