diff --git a/Samples.sln b/Samples.sln index cbaba9255..f34c9d386 100644 --- a/Samples.sln +++ b/Samples.sln @@ -84,8 +84,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.ForLoopConsole EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.ReadLineEchoConsole", "src\samples\Elsa.Samples.ReadLineEchoConsole\Elsa.Samples.ReadLineEchoConsole.csproj", "{867CB845-B803-4D40-9360-3D11ADBD9CE9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.YesSql.Provider.Sqlite.InMemory", "src\core\Elsa.YesSql.Provider.Sqlite.InMemory\Elsa.YesSql.Provider.Sqlite.InMemory.csproj", "{D0364288-3072-44F4-877C-7721C20BC27F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Core.IntegrationTests", "test\integration\Elsa.Core.IntegrationTests\Elsa.Core.IntegrationTests.csproj", "{4CB34AB3-01C9-4911-8914-EABAA744EAD3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "component", "component", "{FC47A50F-03B2-47D8-AAFB-075314FBA186}" @@ -223,10 +221,6 @@ Global {867CB845-B803-4D40-9360-3D11ADBD9CE9}.Debug|Any CPU.Build.0 = Debug|Any CPU {867CB845-B803-4D40-9360-3D11ADBD9CE9}.Release|Any CPU.ActiveCfg = Release|Any CPU {867CB845-B803-4D40-9360-3D11ADBD9CE9}.Release|Any CPU.Build.0 = Release|Any CPU - {D0364288-3072-44F4-877C-7721C20BC27F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0364288-3072-44F4-877C-7721C20BC27F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0364288-3072-44F4-877C-7721C20BC27F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0364288-3072-44F4-877C-7721C20BC27F}.Release|Any CPU.Build.0 = Release|Any CPU {4CB34AB3-01C9-4911-8914-EABAA744EAD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4CB34AB3-01C9-4911-8914-EABAA744EAD3}.Debug|Any CPU.Build.0 = Debug|Any CPU {4CB34AB3-01C9-4911-8914-EABAA744EAD3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -317,7 +311,6 @@ Global {150EF356-E8BC-4922-91C2-362017479409} = {7CD5C8D5-EC78-4A99-A514-F01CA7197AC8} {F755FB1F-72FB-4F7B-8270-F5F40F4D6952} = {5E5E1E84-DDBC-40D6-B891-0D563A15A44A} {867CB845-B803-4D40-9360-3D11ADBD9CE9} = {5E5E1E84-DDBC-40D6-B891-0D563A15A44A} - {D0364288-3072-44F4-877C-7721C20BC27F} = {35F44BE9-13D0-417C-A01A-F0787BEE6DC3} {4CB34AB3-01C9-4911-8914-EABAA744EAD3} = {0A3C36AB-2ACF-4175-A512-66B4C3DB9371} {FC47A50F-03B2-47D8-AAFB-075314FBA186} = {AB1AE008-6FD6-414C-8E88-D735F42E1FA6} {BB5819C7-434A-4AC5-8B0E-6C4FA672EBD5} = {FC47A50F-03B2-47D8-AAFB-075314FBA186} diff --git a/src/activities/Elsa.Activities.Timers/Triggers/InstantEventTrigger.cs b/src/activities/Elsa.Activities.Timers/Triggers/InstantEventTrigger.cs index 9db76e8da..a52a93ce7 100644 --- a/src/activities/Elsa.Activities.Timers/Triggers/InstantEventTrigger.cs +++ b/src/activities/Elsa.Activities.Timers/Triggers/InstantEventTrigger.cs @@ -1,7 +1,6 @@ using System.Threading; using System.Threading.Tasks; using Elsa.Extensions; -using Elsa.Indexes; using Elsa.Services; using Elsa.Triggers; using NodaTime; diff --git a/src/core/Elsa.Core/Elsa.Core.csproj b/src/core/Elsa.Core/Elsa.Core.csproj index 9361dfc71..2d276925f 100644 --- a/src/core/Elsa.Core/Elsa.Core.csproj +++ b/src/core/Elsa.Core/Elsa.Core.csproj @@ -65,7 +65,6 @@ - diff --git a/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/Elsa.YesSql.Provider.Sqlite.InMemory.csproj b/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/Elsa.YesSql.Provider.Sqlite.InMemory.csproj deleted file mode 100644 index 70c04998f..000000000 --- a/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/Elsa.YesSql.Provider.Sqlite.InMemory.csproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - netstandard2.0 - latest - 1.0.0 - Elsa Contributors - - Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application. - This package provides an in-memory Sqlite YesSQL provider, the default provider for Elsa. - - 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/core/Elsa.YesSql.Provider.Sqlite.InMemory/InMemorySqliteConnection.cs b/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/InMemorySqliteConnection.cs deleted file mode 100644 index 1d4b12260..000000000 --- a/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/InMemorySqliteConnection.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Microsoft.Data.Sqlite; - -namespace Elsa.YesSql.Provider.Sqlite.InMemory -{ - public class InMemorySqliteConnection : SqliteConnection - { - protected override void Dispose(bool disposing) - { - // Don't dispose anything. - } - } -} \ No newline at end of file diff --git a/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/InMemorySqliteDbProviderOptionsExtensions.cs b/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/InMemorySqliteDbProviderOptionsExtensions.cs deleted file mode 100644 index c14cf0013..000000000 --- a/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/InMemorySqliteDbProviderOptionsExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Data; -using YesSql; -using YesSql.Provider.Sqlite; - -namespace Elsa.YesSql.Provider.Sqlite.InMemory -{ - public static class InMemorySqliteDbProviderOptionsExtensions - { - public static IConfiguration RegisterInMemorySqlite(this IConfiguration configuration) - { - SqlDialectFactory.SqlDialects["inmemorysqliteconnection"] = new InMemorySqliteDialect(); - CommandInterpreterFactory.CommandInterpreters["inmemorysqliteconnection"] = d => new SqliteCommandInterpreter(d); - - return configuration; - } - - public static IConfiguration UseInMemorySqlite( - this IConfiguration configuration, - IsolationLevel isolationLevel = IsolationLevel.Serializable) - { - if (configuration == null) - { - throw new ArgumentNullException(nameof(configuration)); - } - - RegisterInMemorySqlite(configuration); - configuration.ConnectionFactory = new SingletonDbConnectionFactory("Filename=:memory:"); - configuration.IsolationLevel = isolationLevel; - - return configuration; - } - } -} \ No newline at end of file diff --git a/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/InMemorySqliteDialect.cs b/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/InMemorySqliteDialect.cs deleted file mode 100644 index 6c450bbe3..000000000 --- a/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/InMemorySqliteDialect.cs +++ /dev/null @@ -1,9 +0,0 @@ -using YesSql.Provider.Sqlite; - -namespace Elsa.YesSql.Provider.Sqlite.InMemory -{ - public class InMemorySqliteDialect : SqliteDialect - { - public override string Name => "InMemorySqlite"; - } -} diff --git a/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/SingletonDbConnectionFactory.cs b/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/SingletonDbConnectionFactory.cs deleted file mode 100644 index 156774a05..000000000 --- a/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/SingletonDbConnectionFactory.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Data.Common; -using YesSql; - -namespace Elsa.YesSql.Provider.Sqlite.InMemory -{ - public class SingletonDbConnectionFactory : IConnectionFactory - where TDbConnection : DbConnection, new() - { - private readonly string _connectionString; - private DbConnection _connection; - - public Type DbConnectionType => typeof(TDbConnection); - - public SingletonDbConnectionFactory(string connectionString) - { - _connectionString = connectionString; - } - - public DbConnection CreateConnection() - { - return _connection ??= new TDbConnection - { - ConnectionString = _connectionString - }; - } - } -} \ No newline at end of file diff --git a/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/icon.png b/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/icon.png deleted file mode 100644 index f978a2882..000000000 Binary files a/src/core/Elsa.YesSql.Provider.Sqlite.InMemory/icon.png and /dev/null differ diff --git a/src/samples/Elsa.Samples.WhileLoopWorker/Program.cs b/src/samples/Elsa.Samples.WhileLoopWorker/Program.cs index e3f4c13d2..f686b318f 100644 --- a/src/samples/Elsa.Samples.WhileLoopWorker/Program.cs +++ b/src/samples/Elsa.Samples.WhileLoopWorker/Program.cs @@ -3,7 +3,6 @@ using Elsa.Samples.WhileLoopWorker.Workflows; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using NodaTime; -using YesSql.Provider.Sqlite; namespace Elsa.Samples.WhileLoopWorker { @@ -20,7 +19,7 @@ namespace Elsa.Samples.WhileLoopWorker (hostContext, services) => { services - .AddElsa(options => options.UsePersistence(db => db.UseSqLite("Data Source=elsa.db;Cache=Shared"))) + .AddElsa() .AddConsoleActivities() .AddTimerActivities(options => options.SweepInterval = Duration.FromSeconds(1)) .AddSingleton()