Skip to content

Commit cd550fc

Browse files
danielgerlagdanielgerlag
authored
Merge pull request #91 from danielgerlag/ef-net-standard2
Migrate EF projects to EF Core 2.0
2 parents d3dd913 + 24e3420 commit cd550fc

File tree

30 files changed

+162
-197
lines changed

30 files changed

+162
-197
lines changed

‎src/WorkflowCore/WorkflowCore.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<AssemblyTitle>Workflow Core</AssemblyTitle>
5-
<VersionPrefix>1.1.0</VersionPrefix>
5+
<VersionPrefix>1.4.0</VersionPrefix>
66
<Authors>Daniel Gerlag</Authors>
77
<TargetFramework>netstandard1.3</TargetFramework>
88
<AssemblyName>WorkflowCore</AssemblyName>
@@ -12,8 +12,6 @@
1212
<PackageLicenseUrl>https://github.com/danielgerlag/workflow-core/blob/master/LICENSE.md</PackageLicenseUrl>
1313
<RepositoryType>git</RepositoryType>
1414
<RepositoryUrl>https://github.com/danielgerlag/workflow-core.git</RepositoryUrl>
15-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
16-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
1715
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1816
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1917
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>

‎src/providers/WorkflowCore.Persistence.EntityFramework/WorkflowCore.Persistence.EntityFramework.csproj‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,30 @@
44
<AssemblyTitle>Workflow Core EntityFramework Core Persistence Provider</AssemblyTitle>
55
<VersionPrefix>1.1.0</VersionPrefix>
66
<Authors>Daniel Gerlag</Authors>
7-
<TargetFramework>netstandard1.3</TargetFramework>
7+
<TargetFramework>netstandard2.0</TargetFramework>
88
<AssemblyName>WorkflowCore.Persistence.EntityFramework</AssemblyName>
99
<PackageId>WorkflowCore.Persistence.EntityFramework</PackageId>
1010
<PackageTags>workflow;.NET;Core;state machine;WorkflowCore;EntityFramework;EntityFrameworkCore</PackageTags>
1111
<PackageProjectUrl>https://github.com/danielgerlag/workflow-core</PackageProjectUrl>
1212
<PackageLicenseUrl>https://github.com/danielgerlag/workflow-core/blob/master/LICENSE.md</PackageLicenseUrl>
1313
<RepositoryType>git</RepositoryType>
14-
<RepositoryUrl>https://github.com/danielgerlag/workflow-core.git</RepositoryUrl>
15-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
16-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
14+
<RepositoryUrl>https://github.com/danielgerlag/workflow-core.git</RepositoryUrl>
1715
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1816
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1917
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
20-
<Version>1.4.0</Version>
18+
<Version>1.5.0</Version>
2119
<Description>Base package for Workflow-core peristence providers using entity framework</Description>
22-
<AssemblyVersion>1.4.0.0</AssemblyVersion>
23-
<FileVersion>1.4.0.0</FileVersion>
20+
<AssemblyVersion>1.5.0.0</AssemblyVersion>
21+
<FileVersion>1.5.0.0</FileVersion>
2422
</PropertyGroup>
2523

2624
<ItemGroup>
2725
<ProjectReference Include="..\..\WorkflowCore\WorkflowCore.csproj" />
2826
</ItemGroup>
2927

3028
<ItemGroup>
31-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.2" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="1.1.2" />
29+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.1" />
3331
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
3432
</ItemGroup>
3533

‎src/providers/WorkflowCore.Persistence.PostgreSQL/MigrationContextFactory.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
using Microsoft.EntityFrameworkCore.Infrastructure;
2-
using System;
3-
using System.Collections.Generic;
4-
using System.Linq;
5-
using System.Threading.Tasks;
1+
using System;
2+
using Microsoft.EntityFrameworkCore.Design;
63

74
namespace WorkflowCore.Persistence.PostgreSQL
85
{
9-
public class MigrationContextFactory : IDbContextFactory<PostgresPersistenceProvider>
6+
public class MigrationContextFactory : IDesignTimeDbContextFactory<PostgresPersistenceProvider>
107
{
11-
public PostgresPersistenceProvider Create(DbContextFactoryOptions options)
8+
public PostgresPersistenceProvider CreateDbContext(string[] args)
129
{
1310
return new PostgresPersistenceProvider(@"Server=127.0.0.1;Port=5432;Database=workflow;User Id=postgres;Password=password;", true, true);
1411
}

‎src/providers/WorkflowCore.Persistence.PostgreSQL/PostgresPersistenceProvider.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,37 +27,37 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
2727

2828
protected override void ConfigureSubscriptionStorage(EntityTypeBuilder<PersistedSubscription> builder)
2929
{
30-
builder.ForNpgsqlToTable("Subscription", "wfc");
30+
builder.ToTable("Subscription", "wfc");
3131
builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
3232
}
3333

3434
protected override void ConfigureWorkflowStorage(EntityTypeBuilder<PersistedWorkflow> builder)
3535
{
36-
builder.ForNpgsqlToTable("Workflow", "wfc");
36+
builder.ToTable("Workflow", "wfc");
3737
builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
3838
}
3939

4040
protected override void ConfigureExecutionPointerStorage(EntityTypeBuilder<PersistedExecutionPointer> builder)
4141
{
42-
builder.ForNpgsqlToTable("ExecutionPointer", "wfc");
42+
builder.ToTable("ExecutionPointer", "wfc");
4343
builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
4444
}
4545

4646
protected override void ConfigureExecutionErrorStorage(EntityTypeBuilder<PersistedExecutionError> builder)
4747
{
48-
builder.ForNpgsqlToTable("ExecutionError", "wfc");
48+
builder.ToTable("ExecutionError", "wfc");
4949
builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
5050
}
5151

5252
protected override void ConfigureExetensionAttributeStorage(EntityTypeBuilder<PersistedExtensionAttribute> builder)
5353
{
54-
builder.ForNpgsqlToTable("ExtensionAttribute", "wfc");
54+
builder.ToTable("ExtensionAttribute", "wfc");
5555
builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
5656
}
5757

5858
protected override void ConfigureEventStorage(EntityTypeBuilder<PersistedEvent> builder)
5959
{
60-
builder.ForNpgsqlToTable("Event", "wfc");
60+
builder.ToTable("Event", "wfc");
6161
builder.Property(x => x.PersistenceId).ValueGeneratedOnAdd();
6262
}
6363
}

‎src/providers/WorkflowCore.Persistence.PostgreSQL/WorkflowCore.Persistence.PostgreSQL.csproj‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,23 @@
22

33
<PropertyGroup>
44
<AssemblyTitle>Workflow Core PostgreSQL Persistence Provider</AssemblyTitle>
5-
<VersionPrefix>1.1.0</VersionPrefix>
5+
<VersionPrefix>1.5.0</VersionPrefix>
66
<Authors>Daniel Gerlag</Authors>
7-
<TargetFramework>netstandard1.3</TargetFramework>
7+
<TargetFramework>netstandard2.0</TargetFramework>
88
<AssemblyName>WorkflowCore.Persistence.PostgreSQL</AssemblyName>
99
<PackageId>WorkflowCore.Persistence.PostgreSQL</PackageId>
1010
<PackageTags>workflow;.NET;Core;state machine;WorkflowCore;PostgreSQL</PackageTags>
1111
<PackageProjectUrl>https://github.com/danielgerlag/workflow-core</PackageProjectUrl>
1212
<PackageLicenseUrl>https://github.com/danielgerlag/workflow-core/blob/master/LICENSE.md</PackageLicenseUrl>
1313
<RepositoryType>git</RepositoryType>
1414
<RepositoryUrl>https://github.com/danielgerlag/workflow-core.git</RepositoryUrl>
15-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
16-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
1715
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1816
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1917
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
2018
<Description>Provides support to persist workflows running on Workflow Core to a PostgreSQL database.</Description>
21-
<Version>1.4.0</Version>
22-
<AssemblyVersion>1.4.0.0</AssemblyVersion>
23-
<FileVersion>1.4.0.0</FileVersion>
19+
<Version>1.5.0</Version>
20+
<AssemblyVersion>1.5.0.0</AssemblyVersion>
21+
<FileVersion>1.5.0.0</FileVersion>
2422
</PropertyGroup>
2523

2624
<ItemGroup>
@@ -29,13 +27,13 @@
2927
</ItemGroup>
3028

3129
<ItemGroup>
32-
<PackageReference Include="Npgsql" Version="3.2.4.1" />
33-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="1.1.0" />
34-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.1">
30+
<PackageReference Include="Npgsql" Version="3.2.6" />
31+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.0.0" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1">
3533
<PrivateAssets>All</PrivateAssets>
3634
</PackageReference>
37-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" />
38-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0" />
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.1" />
36+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.1" />
3937
</ItemGroup>
4038

4139
<ItemGroup>

‎src/providers/WorkflowCore.Persistence.SqlServer/MigrationContextFactory.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
using Microsoft.EntityFrameworkCore.Infrastructure;
2-
using System;
3-
using System.Collections.Generic;
4-
using System.Linq;
5-
using System.Threading.Tasks;
1+
using System;
2+
using Microsoft.EntityFrameworkCore.Design;
63

74
namespace WorkflowCore.Persistence.SqlServer
85
{
9-
public class MigrationContextFactory : IDbContextFactory<SqlServerPersistenceProvider>
6+
public class MigrationContextFactory : IDesignTimeDbContextFactory<SqlServerPersistenceProvider>
107
{
11-
public SqlServerPersistenceProvider Create(DbContextFactoryOptions options)
8+
public SqlServerPersistenceProvider CreateDbContext(string[] args)
129
{
1310
return new SqlServerPersistenceProvider(@"Server=.;Database=WorkflowCore;Trusted_Connection=True;", true, true);
1411
}

‎src/providers/WorkflowCore.Persistence.SqlServer/SqlServerPersistenceprovider.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,37 +30,37 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
3030

3131
protected override void ConfigureSubscriptionStorage(EntityTypeBuilder<PersistedSubscription> builder)
3232
{
33-
builder.ForSqlServerToTable("Subscription", "wfc");
33+
builder.ToTable("Subscription", "wfc");
3434
builder.Property(x => x.PersistenceId).UseSqlServerIdentityColumn();
3535
}
3636

3737
protected override void ConfigureWorkflowStorage(EntityTypeBuilder<PersistedWorkflow> builder)
3838
{
39-
builder.ForSqlServerToTable("Workflow", "wfc");
39+
builder.ToTable("Workflow", "wfc");
4040
builder.Property(x => x.PersistenceId).UseSqlServerIdentityColumn();
4141
}
4242

4343
protected override void ConfigureExecutionPointerStorage(EntityTypeBuilder<PersistedExecutionPointer> builder)
4444
{
45-
builder.ForSqlServerToTable("ExecutionPointer", "wfc");
45+
builder.ToTable("ExecutionPointer", "wfc");
4646
builder.Property(x => x.PersistenceId).UseSqlServerIdentityColumn();
4747
}
4848

4949
protected override void ConfigureExecutionErrorStorage(EntityTypeBuilder<PersistedExecutionError> builder)
5050
{
51-
builder.ForSqlServerToTable("ExecutionError", "wfc");
51+
builder.ToTable("ExecutionError", "wfc");
5252
builder.Property(x => x.PersistenceId).UseSqlServerIdentityColumn();
5353
}
5454

5555
protected override void ConfigureExetensionAttributeStorage(EntityTypeBuilder<PersistedExtensionAttribute> builder)
5656
{
57-
builder.ForSqlServerToTable("ExtensionAttribute", "wfc");
57+
builder.ToTable("ExtensionAttribute", "wfc");
5858
builder.Property(x => x.PersistenceId).UseSqlServerIdentityColumn();
5959
}
6060

6161
protected override void ConfigureEventStorage(EntityTypeBuilder<PersistedEvent> builder)
6262
{
63-
builder.ForSqlServerToTable("Event", "wfc");
63+
builder.ToTable("Event", "wfc");
6464
builder.Property(x => x.PersistenceId).UseSqlServerIdentityColumn();
6565
}
6666
}

‎src/providers/WorkflowCore.Persistence.SqlServer/WorkflowCore.Persistence.SqlServer.csproj‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,23 @@
22

33
<PropertyGroup>
44
<AssemblyTitle>Workflow Core SQL Server Persistence Provider</AssemblyTitle>
5-
<VersionPrefix>1.1.0</VersionPrefix>
5+
<VersionPrefix>1.5.0</VersionPrefix>
66
<Authors>Daniel Gerlag</Authors>
7-
<TargetFramework>netstandard1.3</TargetFramework>
7+
<TargetFramework>netstandard2.0</TargetFramework>
88
<AssemblyName>WorkflowCore.Persistence.SqlServer</AssemblyName>
99
<PackageId>WorkflowCore.Persistence.SqlServer</PackageId>
1010
<PackageTags>workflow;.NET;Core;state machine;WorkflowCore</PackageTags>
1111
<PackageProjectUrl>https://github.com/danielgerlag/workflow-core</PackageProjectUrl>
1212
<PackageLicenseUrl>https://github.com/danielgerlag/workflow-core/blob/master/LICENSE.md</PackageLicenseUrl>
1313
<RepositoryType>git</RepositoryType>
1414
<RepositoryUrl>https://github.com/danielgerlag/workflow-core.git</RepositoryUrl>
15-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
16-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
1715
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1816
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1917
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
20-
<Version>1.4.0</Version>
18+
<Version>1.5.0</Version>
2119
<Description>Provides support to persist workflows running on Workflow Core to a SQL Server database.</Description>
22-
<AssemblyVersion>1.4.0.0</AssemblyVersion>
23-
<FileVersion>1.4.0.0</FileVersion>
20+
<AssemblyVersion>1.5.0.0</AssemblyVersion>
21+
<FileVersion>1.5.0.0</FileVersion>
2422
</PropertyGroup>
2523

2624
<ItemGroup>
@@ -29,11 +27,11 @@
2927
</ItemGroup>
3028

3129
<ItemGroup>
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" />
33-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.1">
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1">
3432
<PrivateAssets>All</PrivateAssets>
3533
</PackageReference>
36-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" />
34+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.1" />
3735
</ItemGroup>
3836

3937
<ItemGroup>

‎src/providers/WorkflowCore.Persistence.Sqlite/SqlitePersistenceProvider.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,32 +27,32 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
2727

2828
protected override void ConfigureSubscriptionStorage(EntityTypeBuilder<PersistedSubscription> builder)
2929
{
30-
builder.ForSqliteToTable("Subscription");
30+
builder.ToTable("Subscription");
3131
}
3232

3333
protected override void ConfigureWorkflowStorage(EntityTypeBuilder<PersistedWorkflow> builder)
3434
{
35-
builder.ForSqliteToTable("Workflow");
35+
builder.ToTable("Workflow");
3636
}
3737

3838
protected override void ConfigureExecutionPointerStorage(EntityTypeBuilder<PersistedExecutionPointer> builder)
3939
{
40-
builder.ForSqliteToTable("ExecutionPointer");
40+
builder.ToTable("ExecutionPointer");
4141
}
4242

4343
protected override void ConfigureExecutionErrorStorage(EntityTypeBuilder<PersistedExecutionError> builder)
4444
{
45-
builder.ForSqliteToTable("ExecutionError");
45+
builder.ToTable("ExecutionError");
4646
}
4747

4848
protected override void ConfigureExetensionAttributeStorage(EntityTypeBuilder<PersistedExtensionAttribute> builder)
4949
{
50-
builder.ForSqliteToTable("ExtensionAttribute");
50+
builder.ToTable("ExtensionAttribute");
5151
}
5252

5353
protected override void ConfigureEventStorage(EntityTypeBuilder<PersistedEvent> builder)
5454
{
55-
builder.ForSqliteToTable("Event");
55+
builder.ToTable("Event");
5656
}
5757
}
5858
}

‎src/providers/WorkflowCore.Persistence.Sqlite/WorkflowCore.Persistence.Sqlite.csproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,23 @@
22

33
<PropertyGroup>
44
<AssemblyTitle>Workflow Core Sqlite Persistence Provider</AssemblyTitle>
5-
<VersionPrefix>1.1.0</VersionPrefix>
5+
<VersionPrefix>1.5.0</VersionPrefix>
66
<Authors>Daniel Gerlag</Authors>
7-
<TargetFramework>netstandard1.3</TargetFramework>
7+
<TargetFramework>netstandard2.0</TargetFramework>
88
<AssemblyName>WorkflowCore.Persistence.Sqlite</AssemblyName>
99
<PackageId>WorkflowCore.Persistence.Sqlite</PackageId>
1010
<PackageTags>workflow;.NET;Core;state machine;WorkflowCore;Sqlite</PackageTags>
1111
<PackageProjectUrl>https://github.com/danielgerlag/workflow-core</PackageProjectUrl>
1212
<PackageLicenseUrl>https://github.com/danielgerlag/workflow-core/blob/master/LICENSE.md</PackageLicenseUrl>
1313
<RepositoryType>git</RepositoryType>
1414
<RepositoryUrl>https://github.com/danielgerlag/workflow-core.git</RepositoryUrl>
15-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
16-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
1715
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1816
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1917
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
2018
<Description>Provides support to persist workflows running on Workflow Core to a Sqlite database.</Description>
21-
<Version>1.3.0</Version>
22-
<AssemblyVersion>1.3.0.0</AssemblyVersion>
23-
<FileVersion>1.3.0.0</FileVersion>
19+
<Version>1.5.0</Version>
20+
<AssemblyVersion>1.5.0.0</AssemblyVersion>
21+
<FileVersion>1.5.0.0</FileVersion>
2422
</PropertyGroup>
2523

2624
<ItemGroup>
@@ -29,7 +27,7 @@
2927
</ItemGroup>
3028

3129
<ItemGroup>
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="1.1.2" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" />
3331
</ItemGroup>
3432

3533
</Project>

0 commit comments

Comments
 (0)