diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index a3b389069..83e247208 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -143,3 +143,20 @@ jobs: run: dotnet build --no-restore - name: Elasticsearch Tests run: dotnet test test/WorkflowCore.Tests.Elasticsearch --no-build --verbosity normal -p:ParallelizeTestCollections=false + Oracle-Tests: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: | + 6.0.x + 8.0.x + 9.0.x + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build --no-restore + - name: Oracle Tests + run: dotnet test test/WorkflowCore.Tests.Oracle --no-build --verbosity normal -p:ParallelizeTestCollections=false diff --git a/README.md b/README.md index 1eeb0fa66..0429fb597 100644 --- a/README.md +++ b/README.md @@ -140,6 +140,7 @@ There are several persistence providers available as separate Nuget packages. * [Sqlite](src/providers/WorkflowCore.Persistence.Sqlite) * [MySQL](src/providers/WorkflowCore.Persistence.MySQL) * [Redis](src/providers/WorkflowCore.Providers.Redis) +* [Oracle](src/providers/WorkflowCore.Persistence.Oracle) ## Search diff --git a/docs/persistence.md b/docs/persistence.md index 8a7fe55fd..00799090a 100644 --- a/docs/persistence.md +++ b/docs/persistence.md @@ -11,3 +11,4 @@ There are several persistence providers available as separate Nuget packages. * [Amazon DynamoDB](https://github.com/danielgerlag/workflow-core/tree/master/src/providers/WorkflowCore.Providers.AWS) * [Cosmos DB](https://github.com/danielgerlag/workflow-core/tree/master/src/providers/WorkflowCore.Providers.Azure) * [Redis](https://github.com/danielgerlag/workflow-core/tree/master/src/providers/WorkflowCore.Providers.Redis) +* [Oracle](https://github.com/danielgerlag/workflow-core/tree/master/src/providers/WorkflowCore.Persistence.Oracle) \ No newline at end of file diff --git a/src/providers/WorkflowCore.Persistence.Oracle/MigrationContextFactory.cs b/src/providers/WorkflowCore.Persistence.Oracle/MigrationContextFactory.cs index 687109711..f5a37a5f9 100644 --- a/src/providers/WorkflowCore.Persistence.Oracle/MigrationContextFactory.cs +++ b/src/providers/WorkflowCore.Persistence.Oracle/MigrationContextFactory.cs @@ -1,7 +1,4 @@ -using System; -using System.Linq; - -using Microsoft.EntityFrameworkCore.Design; +using Microsoft.EntityFrameworkCore.Design; namespace WorkflowCore.Persistence.Oracle { diff --git a/src/providers/WorkflowCore.Persistence.Oracle/OracleContext.cs b/src/providers/WorkflowCore.Persistence.Oracle/OracleContext.cs index b8fadcdf7..d6619c4b3 100644 --- a/src/providers/WorkflowCore.Persistence.Oracle/OracleContext.cs +++ b/src/providers/WorkflowCore.Persistence.Oracle/OracleContext.cs @@ -1,8 +1,6 @@ using System; -using System.Linq; using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata.Builders; using Oracle.EntityFrameworkCore.Infrastructure; diff --git a/src/providers/WorkflowCore.Persistence.Oracle/OracleContextFactory.cs b/src/providers/WorkflowCore.Persistence.Oracle/OracleContextFactory.cs index 54c70d6dc..e2d9c6e1a 100644 --- a/src/providers/WorkflowCore.Persistence.Oracle/OracleContextFactory.cs +++ b/src/providers/WorkflowCore.Persistence.Oracle/OracleContextFactory.cs @@ -1,7 +1,4 @@ using System; -using System.Linq; - -using Microsoft.EntityFrameworkCore.Infrastructure; using Oracle.EntityFrameworkCore.Infrastructure; diff --git a/src/providers/WorkflowCore.Persistence.Oracle/README.md b/src/providers/WorkflowCore.Persistence.Oracle/README.md index 0e4957eea..1dd74ee7c 100644 --- a/src/providers/WorkflowCore.Persistence.Oracle/README.md +++ b/src/providers/WorkflowCore.Persistence.Oracle/README.md @@ -17,3 +17,15 @@ Use the .UseOracle extension method when building your service provider. ```C# services.AddWorkflow(x => x.UseOracle(@"Server=127.0.0.1;Database=workflow;User=root;Password=password;", true, true)); ``` + +You can also add specific database version compatibility if needed. + +```C# +services.AddWorkflow(x => + { + x.UseOracle(connectionString, false, true, options => + { + options.UseOracleSQLCompatibility(OracleSQLCompatibility.DatabaseVersion19); + }); + }); +``` \ No newline at end of file diff --git a/src/providers/WorkflowCore.Persistence.Oracle/ServiceCollectionExtensions.cs b/src/providers/WorkflowCore.Persistence.Oracle/ServiceCollectionExtensions.cs index 4a46b0e5c..704916fbe 100644 --- a/src/providers/WorkflowCore.Persistence.Oracle/ServiceCollectionExtensions.cs +++ b/src/providers/WorkflowCore.Persistence.Oracle/ServiceCollectionExtensions.cs @@ -1,7 +1,4 @@ using System; -using System.Linq; - -using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.Extensions.DependencyInjection; using Oracle.EntityFrameworkCore.Infrastructure; @@ -14,10 +11,10 @@ namespace WorkflowCore.Persistence.Oracle { public static class ServiceCollectionExtensions { - public static WorkflowOptions UseOracle(this WorkflowOptions options, string connectionString, bool canCreateDB, bool canMigrateDB, Action mysqlOptionsAction = null) + public static WorkflowOptions UseOracle(this WorkflowOptions options, string connectionString, bool canCreateDB, bool canMigrateDB, Action oracleOptionsAction = null) { - options.UsePersistence(sp => new EntityFrameworkPersistenceProvider(new OracleContextFactory(connectionString, mysqlOptionsAction), canCreateDB, canMigrateDB)); - options.Services.AddTransient(sp => new WorkflowPurger(new OracleContextFactory(connectionString, mysqlOptionsAction))); + options.UsePersistence(sp => new EntityFrameworkPersistenceProvider(new OracleContextFactory(connectionString, oracleOptionsAction), canCreateDB, canMigrateDB)); + options.Services.AddTransient(sp => new WorkflowPurger(new OracleContextFactory(connectionString, oracleOptionsAction))); return options; } } diff --git a/src/providers/WorkflowCore.Persistence.Oracle/WorkflowCore.Persistence.Oracle.csproj b/src/providers/WorkflowCore.Persistence.Oracle/WorkflowCore.Persistence.Oracle.csproj index 898f7fab2..e49e1a88a 100644 --- a/src/providers/WorkflowCore.Persistence.Oracle/WorkflowCore.Persistence.Oracle.csproj +++ b/src/providers/WorkflowCore.Persistence.Oracle/WorkflowCore.Persistence.Oracle.csproj @@ -1,40 +1,50 @@  - - Workflow Core Oracle Persistence Provider - 1.0.0 - Christian Jundt - net6.0 - WorkflowCore.Persistence.Oracle - WorkflowCore.Persistence.Oracle - workflow;.NET;Core;state machine;WorkflowCore;Oracle - https://github.com/danielgerlag/workflow-core - https://github.com/danielgerlag/workflow-core/blob/master/LICENSE.md - git - https://github.com/danielgerlag/workflow-core.git - false - false - false - Provides support to persist workflows running on Workflow Core to a Oracle database. - + + Workflow Core Oracle Persistence Provider + 1.0.0 + Christian Jundt + net6.0;net8.0 + WorkflowCore.Persistence.Oracle + WorkflowCore.Persistence.Oracle + workflow;.NET;Core;state machine;WorkflowCore;Oracle + https://github.com/danielgerlag/workflow-core + https://github.com/danielgerlag/workflow-core/blob/master/LICENSE.md + git + https://github.com/danielgerlag/workflow-core.git + false + false + false + Provides support to persist workflows running on Workflow Core to a Oracle database. + - - - - All - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - 7.21.13 - - + + + All + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + - - - - + + + All + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + 7.21.13 + + + + + + + diff --git a/test/WorkflowCore.Tests.Oracle/OraclePersistenceProviderFixture.cs b/test/WorkflowCore.Tests.Oracle/OraclePersistenceProviderFixture.cs index c4445f005..a87c11bad 100644 --- a/test/WorkflowCore.Tests.Oracle/OraclePersistenceProviderFixture.cs +++ b/test/WorkflowCore.Tests.Oracle/OraclePersistenceProviderFixture.cs @@ -1,8 +1,6 @@ -using System; -using WorkflowCore.Interface; +using WorkflowCore.Interface; using WorkflowCore.Persistence.EntityFramework.Services; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using WorkflowCore.UnitTests; using Xunit; using Xunit.Abstractions; @@ -12,7 +10,7 @@ namespace WorkflowCore.Tests.Oracle [Collection("Oracle collection")] public class OraclePersistenceProviderFixture : BasePersistenceFixture { - private readonly IPersistenceProvider _subject; + private readonly EntityFrameworkPersistenceProvider _subject; protected override IPersistenceProvider Subject => _subject; public OraclePersistenceProviderFixture(OracleDockerSetup dockerSetup, ITestOutputHelper output) diff --git a/test/WorkflowCore.Tests.Oracle/OracleSetup.cs b/test/WorkflowCore.Tests.Oracle/OracleSetup.cs index 8b35d9aa2..a5ee262ec 100644 --- a/test/WorkflowCore.Tests.Oracle/OracleSetup.cs +++ b/test/WorkflowCore.Tests.Oracle/OracleSetup.cs @@ -1,26 +1,34 @@ -using System; -using System.Threading.Tasks; - +using System.Threading.Tasks; +using Testcontainers.Oracle; using Xunit; namespace WorkflowCore.Tests.Oracle { public class OracleDockerSetup : IAsyncLifetime { - public static string ConnectionString => "Data Source=(DESCRIPTION = (ADDRESS_LIST = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) ) (CONNECT_DATA = (SERVICE_NAME = ORCLPDB1) ) );User ID=TEST_WF;Password=test;"; + private readonly OracleContainer _oracleContainer; - public async Task InitializeAsync() + public static string ConnectionString { get; private set; } + + public OracleDockerSetup() { + _oracleContainer = new OracleBuilder() + .WithImage("gvenzl/oracle-free:latest") + .WithUsername("TEST_WF") + .WithPassword("test") + .Build(); } - public Task DisposeAsync() + public async Task InitializeAsync() { - return Task.CompletedTask; + await _oracleContainer.StartAsync(); + // Build connection string manually since TestContainers might not provide Oracle-specific format + ConnectionString = $"Data Source=localhost:{_oracleContainer.GetMappedPublicPort(1521)}/FREEPDB1;User Id=TEST_WF;Password=test;"; } + + public async Task DisposeAsync() => await _oracleContainer.DisposeAsync(); } [CollectionDefinition("Oracle collection")] - public class OracleCollection : ICollectionFixture - { - } + public class OracleCollection : ICollectionFixture { } } \ No newline at end of file diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleActivityScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleActivityScenario.cs index eeae8ea66..7bf8ae2d6 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleActivityScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleActivityScenario.cs @@ -1,8 +1,6 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; @@ -10,7 +8,7 @@ namespace WorkflowCore.Tests.Oracle.Scenarios { [Collection("Oracle collection")] public class OracleActivityScenario : ActivityScenario - { + { protected override void ConfigureServices(IServiceCollection services) { services.AddWorkflow(x => x.UseOracle(OracleDockerSetup.ConnectionString, true, true)); diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleBasicScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleBasicScenario.cs index 8cb898583..a7f8bb940 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleBasicScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleBasicScenario.cs @@ -1,8 +1,6 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; @@ -10,7 +8,7 @@ namespace WorkflowCore.Tests.Oracle.Scenarios { [Collection("Oracle collection")] public class OracleBasicScenario : BasicScenario - { + { protected override void ConfigureServices(IServiceCollection services) { services.AddWorkflow(x => x.UseOracle(OracleDockerSetup.ConnectionString, true, true)); diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleDataScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleDataScenario.cs index f71630c93..136b54a3e 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleDataScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleDataScenario.cs @@ -1,8 +1,6 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; @@ -10,7 +8,7 @@ namespace WorkflowCore.Tests.Oracle.Scenarios { [Collection("Oracle collection")] public class OracleDataScenario : DataIOScenario - { + { protected override void ConfigureServices(IServiceCollection services) { services.AddWorkflow(x => x.UseOracle(OracleDockerSetup.ConnectionString, true, true)); diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleDelayScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleDelayScenario.cs index 55062f0c3..22a582f0d 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleDelayScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleDelayScenario.cs @@ -2,7 +2,6 @@ using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; @@ -10,7 +9,7 @@ namespace WorkflowCore.Tests.Oracle.Scenarios { [Collection("Oracle collection")] public class OracleDelayScenario : DelayScenario - { + { protected override void ConfigureServices(IServiceCollection services) { services.AddWorkflow(cfg => diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleDynamicDataScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleDynamicDataScenario.cs index e59f51d51..5ab8b940b 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleDynamicDataScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleDynamicDataScenario.cs @@ -1,8 +1,6 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleEventScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleEventScenario.cs index ac987c341..a38290065 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleEventScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleEventScenario.cs @@ -1,8 +1,6 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; @@ -10,7 +8,7 @@ namespace WorkflowCore.Tests.Oracle.Scenarios { [Collection("Oracle collection")] public class OracleEventScenario : EventScenario - { + { protected override void ConfigureServices(IServiceCollection services) { services.AddWorkflow(x => x.UseOracle(OracleDockerSetup.ConnectionString, true, true)); diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleForeachScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleForeachScenario.cs index fb2fcc965..023920ba1 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleForeachScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleForeachScenario.cs @@ -1,8 +1,6 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; @@ -10,7 +8,7 @@ namespace WorkflowCore.Tests.Oracle.Scenarios { [Collection("Oracle collection")] public class OracleForeachScenario : ForeachScenario - { + { protected override void ConfigureServices(IServiceCollection services) { services.AddWorkflow(x => x.UseOracle(OracleDockerSetup.ConnectionString, true, true)); diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleForkScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleForkScenario.cs index d525de700..bbe85a909 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleForkScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleForkScenario.cs @@ -1,8 +1,6 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; @@ -10,7 +8,7 @@ namespace WorkflowCore.Tests.Oracle.Scenarios { [Collection("Oracle collection")] public class OracleForkScenario : ForkScenario - { + { protected override void Configure(IServiceCollection services) { services.AddWorkflow(x => x.UseOracle(OracleDockerSetup.ConnectionString, true, true)); diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleIfScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleIfScenario.cs index c090f89d1..cab8004bd 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleIfScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleIfScenario.cs @@ -1,8 +1,6 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; @@ -10,7 +8,7 @@ namespace WorkflowCore.Tests.Oracle.Scenarios { [Collection("Oracle collection")] public class OracleIfScenario : IfScenario - { + { protected override void ConfigureServices(IServiceCollection services) { services.AddWorkflow(x => x.UseOracle(OracleDockerSetup.ConnectionString, true, true)); diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleRetrySagaScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleRetrySagaScenario.cs index 01c651a7c..21bf5dbef 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleRetrySagaScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleRetrySagaScenario.cs @@ -1,8 +1,6 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; @@ -10,7 +8,7 @@ namespace WorkflowCore.Tests.Oracle.Scenarios { [Collection("Oracle collection")] public class OracleRetrySagaScenario : RetrySagaScenario - { + { protected override void ConfigureServices(IServiceCollection services) { services.AddWorkflow(x => x.UseOracle(OracleDockerSetup.ConnectionString, true, true)); diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleSagaScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleSagaScenario.cs index 7775638c2..ea093b222 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleSagaScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleSagaScenario.cs @@ -1,8 +1,6 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; @@ -10,7 +8,7 @@ namespace WorkflowCore.Tests.Oracle.Scenarios { [Collection("Oracle collection")] public class OracleSagaScenario : SagaScenario - { + { protected override void ConfigureServices(IServiceCollection services) { services.AddWorkflow(x => x.UseOracle(OracleDockerSetup.ConnectionString, true, true)); diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleUserScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleUserScenario.cs index 0e5861f6d..60ab568b2 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleUserScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleUserScenario.cs @@ -1,8 +1,6 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; @@ -10,7 +8,7 @@ namespace WorkflowCore.Tests.Oracle.Scenarios { [Collection("Oracle collection")] public class OracleUserScenario : UserScenario - { + { protected override void ConfigureServices(IServiceCollection services) { services.AddWorkflow(x => x.UseOracle(OracleDockerSetup.ConnectionString, true, true)); diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleWhenScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleWhenScenario.cs index b8671695e..d12490f59 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleWhenScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleWhenScenario.cs @@ -1,8 +1,6 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; @@ -10,7 +8,7 @@ namespace WorkflowCore.Tests.Oracle.Scenarios { [Collection("Oracle collection")] public class OracleWhenScenario : WhenScenario - { + { protected override void ConfigureServices(IServiceCollection services) { services.AddWorkflow(x => x.UseOracle(OracleDockerSetup.ConnectionString, true, true)); diff --git a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleWhileScenario.cs b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleWhileScenario.cs index 0b4b01467..45f5eebdd 100644 --- a/test/WorkflowCore.Tests.Oracle/Scenarios/OracleWhileScenario.cs +++ b/test/WorkflowCore.Tests.Oracle/Scenarios/OracleWhileScenario.cs @@ -1,8 +1,6 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using WorkflowCore.IntegrationTests.Scenarios; using WorkflowCore.Persistence.Oracle; -using WorkflowCore.Tests.Oracle; using Xunit; @@ -10,7 +8,7 @@ namespace WorkflowCore.Tests.Oracle.Scenarios { [Collection("Oracle collection")] public class OracleWhileScenario : WhileScenario - { + { protected override void ConfigureServices(IServiceCollection services) { services.AddWorkflow(x => x.UseOracle(OracleDockerSetup.ConnectionString, true, true)); diff --git a/test/WorkflowCore.Tests.Oracle/WorkflowCore.Tests.Oracle.csproj b/test/WorkflowCore.Tests.Oracle/WorkflowCore.Tests.Oracle.csproj index db77aa957..b3b68406c 100644 --- a/test/WorkflowCore.Tests.Oracle/WorkflowCore.Tests.Oracle.csproj +++ b/test/WorkflowCore.Tests.Oracle/WorkflowCore.Tests.Oracle.csproj @@ -1,7 +1,7 @@  - net6.0 + net6.0;net8.0 WorkflowCore.Tests.Oracle WorkflowCore.Tests.Oracle true @@ -10,6 +10,10 @@ false + + + +