Skip to content

Commit fcb1434

Browse files
danielgerlagdanielgerlag
authored
Merge pull request #712 from danielgerlag/revert-704-dotnet5
Revert "Update to Entity Framework 5"
2 parents 73b098e + a96d7f6 commit fcb1434

File tree

47 files changed

+159
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+159
-159
lines changed

‎src/WorkflowCore/WorkflowCore.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1717
<Description>Workflow Core is a light weight workflow engine targeting .NET Standard.</Description>
18-
<Version>3.3.3</Version>
19-
<AssemblyVersion>3.3.3.0</AssemblyVersion>
20-
<FileVersion>3.3.3.0</FileVersion>
18+
<Version>3.3.2</Version>
19+
<AssemblyVersion>3.3.2.0</AssemblyVersion>
20+
<FileVersion>3.3.2.0</FileVersion>
2121
<PackageReleaseNotes></PackageReleaseNotes>
2222
<PackageIconUrl>https://github.com/danielgerlag/workflow-core/raw/master/src/logo.png</PackageIconUrl>
23-
<PackageVersion>3.3.3</PackageVersion>
23+
<PackageVersion>3.3.2</PackageVersion>
2424
</PropertyGroup>
2525

2626
<ItemGroup>
2727
<PackageReference Include="ConcurrentHashSet" Version="1.1.0" />
28-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
30-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
31-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="5.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
29+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />
30+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
31+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="2.2.0" />
3232
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
3333
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.7.12" />
3434
<PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />

‎src/extensions/WorkflowCore.Users/WorkflowCore.Users.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1717
<Description>Provides extensions for Workflow Core to enable human workflows.</Description>
18-
<Version>2.1.2</Version>
19-
<AssemblyVersion>2.1.2.0</AssemblyVersion>
20-
<FileVersion>2.1.2.0</FileVersion>
18+
<Version>2.1.1</Version>
19+
<AssemblyVersion>2.1.1.0</AssemblyVersion>
20+
<FileVersion>2.1.1.0</FileVersion>
2121
</PropertyGroup>
2222

2323
<ItemGroup>
2424
<ProjectReference Include="..\..\WorkflowCore\WorkflowCore.csproj" />
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
2929
</ItemGroup>
3030

3131
</Project>

‎src/extensions/WorkflowCore.WebAPI/WorkflowCore.WebAPI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
17-
<Version>2.0.1</Version>
17+
<Version>2.0.0</Version>
1818
<Description>WebAPI wrapper for Workflow host</Description>
1919
</PropertyGroup>
2020

@@ -25,7 +25,7 @@
2525
<ItemGroup>
2626
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="1.1.3" />
2727
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
28-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
2929
</ItemGroup>
3030

3131
</Project>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<AssemblyTitle>Workflow Core EntityFramework Core Persistence Provider</AssemblyTitle>
55
<Authors>Daniel Gerlag</Authors>
6-
<TargetFramework>netstandard2.1</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>WorkflowCore.Persistence.EntityFramework</AssemblyName>
88
<PackageId>WorkflowCore.Persistence.EntityFramework</PackageId>
99
<PackageTags>workflow;.NET;Core;state machine;WorkflowCore;EntityFramework;EntityFrameworkCore</PackageTags>
@@ -14,20 +14,20 @@
1414
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
17-
<Version>3.3.3</Version>
17+
<Version>3.1.0</Version>
1818
<Description>Base package for Workflow-core peristence providers using entity framework</Description>
19-
<AssemblyVersion>3.3.3.0</AssemblyVersion>
20-
<FileVersion>3.3.3.0</FileVersion>
21-
<PackageVersion>3.3.3</PackageVersion>
19+
<AssemblyVersion>3.1.0.0</AssemblyVersion>
20+
<FileVersion>3.1.0.0</FileVersion>
21+
<PackageVersion>3.1.0</PackageVersion>
2222
</PropertyGroup>
2323

2424
<ItemGroup>
2525
<ProjectReference Include="..\..\WorkflowCore\WorkflowCore.csproj" />
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0" />
29+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.2" />
3131
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
3232
</ItemGroup>
3333

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AssemblyTitle>Workflow Core MySQL Persistence Provider</AssemblyTitle>
55
<VersionPrefix>1.0.0</VersionPrefix>
66
<Authors>Daniel Gerlag</Authors>
7-
<TargetFramework>netstandard2.1</TargetFramework>
7+
<TargetFramework>netstandard2.0</TargetFramework>
88
<AssemblyName>WorkflowCore.Persistence.MySQL</AssemblyName>
99
<PackageId>WorkflowCore.Persistence.MySQL</PackageId>
1010
<PackageTags>workflow;.NET;Core;state machine;WorkflowCore;MySQL</PackageTags>
@@ -16,17 +16,17 @@
1616
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1717
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1818
<Description>Provides support to persist workflows running on Workflow Core to a MySQL database.</Description>
19-
<Version>3.3.3</Version>
20-
<AssemblyVersion>3.3.3.0</AssemblyVersion>
21-
<FileVersion>3.3.3.0</FileVersion>
19+
<Version>3.0.1</Version>
20+
<AssemblyVersion>3.0.1.0</AssemblyVersion>
21+
<FileVersion>3.0.1.0</FileVersion>
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0">
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.2">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2828
</PackageReference>
29-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0-alpha.2" />
29+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1717
<Description>Provides support to persist workflows running on Workflow Core to a PostgreSQL database.</Description>
18-
<Version>3.3.3</Version>
19-
<AssemblyVersion>3.3.3.0</AssemblyVersion>
20-
<FileVersion>3.3.3.0</FileVersion>
21-
<PackageVersion>3.3.3</PackageVersion>
18+
<Version>3.1.0</Version>
19+
<AssemblyVersion>3.1.0.0</AssemblyVersion>
20+
<FileVersion>3.1.0.0</FileVersion>
21+
<PackageVersion>3.1.0</PackageVersion>
2222
</PropertyGroup>
2323

2424
<ItemGroup>
@@ -27,12 +27,12 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Npgsql" Version="5.0.0" />
31-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.0" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0">
30+
<PackageReference Include="Npgsql" Version="4.1.3.1" />
31+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.2" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.2">
3333
<PrivateAssets>All</PrivateAssets>
3434
</PackageReference>
35-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2">
3636
<PrivateAssets>all</PrivateAssets>
3737
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3838
</PackageReference>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,37 +28,37 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
2828
protected override void ConfigureSubscriptionStorage(EntityTypeBuilder<PersistedSubscription> builder)
2929
{
3030
builder.ToTable("Subscription", "wfc");
31-
builder.Property(x => x.PersistenceId).UseIdentityColumn();
31+
builder.Property(x => x.PersistenceId).UseSqlServerIdentityColumn();
3232
}
3333

3434
protected override void ConfigureWorkflowStorage(EntityTypeBuilder<PersistedWorkflow> builder)
3535
{
3636
builder.ToTable("Workflow", "wfc");
37-
builder.Property(x => x.PersistenceId).UseIdentityColumn();
37+
builder.Property(x => x.PersistenceId).UseSqlServerIdentityColumn();
3838
}
3939

4040
protected override void ConfigureExecutionPointerStorage(EntityTypeBuilder<PersistedExecutionPointer> builder)
4141
{
4242
builder.ToTable("ExecutionPointer", "wfc");
43-
builder.Property(x => x.PersistenceId).UseIdentityColumn();
43+
builder.Property(x => x.PersistenceId).UseSqlServerIdentityColumn();
4444
}
4545

4646
protected override void ConfigureExecutionErrorStorage(EntityTypeBuilder<PersistedExecutionError> builder)
4747
{
4848
builder.ToTable("ExecutionError", "wfc");
49-
builder.Property(x => x.PersistenceId).UseIdentityColumn();
49+
builder.Property(x => x.PersistenceId).UseSqlServerIdentityColumn();
5050
}
5151

5252
protected override void ConfigureExetensionAttributeStorage(EntityTypeBuilder<PersistedExtensionAttribute> builder)
5353
{
5454
builder.ToTable("ExtensionAttribute", "wfc");
55-
builder.Property(x => x.PersistenceId).UseIdentityColumn();
55+
builder.Property(x => x.PersistenceId).UseSqlServerIdentityColumn();
5656
}
5757

5858
protected override void ConfigureEventStorage(EntityTypeBuilder<PersistedEvent> builder)
5959
{
6060
builder.ToTable("Event", "wfc");
61-
builder.Property(x => x.PersistenceId).UseIdentityColumn();
61+
builder.Property(x => x.PersistenceId).UseSqlServerIdentityColumn();
6262
}
6363
}
6464
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AssemblyTitle>Workflow Core SQL Server Persistence Provider</AssemblyTitle>
55
<VersionPrefix>1.8.0</VersionPrefix>
66
<Authors>Daniel Gerlag</Authors>
7-
<TargetFramework>netstandard2.1</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>
@@ -15,11 +15,11 @@
1515
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1616
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1717
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
18-
<Version>3.3.3</Version>
18+
<Version>3.1.0</Version>
1919
<Description>Provides support to persist workflows running on Workflow Core to a SQL Server database.</Description>
20-
<AssemblyVersion>3.3.3.0</AssemblyVersion>
21-
<FileVersion>3.3.3.0</FileVersion>
22-
<PackageVersion>3.3.3</PackageVersion>
20+
<AssemblyVersion>3.1.0.0</AssemblyVersion>
21+
<FileVersion>3.1.0.0</FileVersion>
22+
<PackageVersion>3.1.0</PackageVersion>
2323
</PropertyGroup>
2424

2525
<ItemGroup>
@@ -28,11 +28,11 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0">
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.2">
3333
<PrivateAssets>All</PrivateAssets>
3434
</PackageReference>
35-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2">
3636
<PrivateAssets>all</PrivateAssets>
3737
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3838
</PackageReference>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AssemblyTitle>Workflow Core Sqlite Persistence Provider</AssemblyTitle>
55
<VersionPrefix>1.5.0</VersionPrefix>
66
<Authors>Daniel Gerlag</Authors>
7-
<TargetFramework>netstandard2.1</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>
@@ -16,10 +16,10 @@
1616
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1717
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1818
<Description>Provides support to persist workflows running on Workflow Core to a Sqlite database.</Description>
19-
<Version>3.3.3</Version>
20-
<AssemblyVersion>3.3.3.0</AssemblyVersion>
21-
<FileVersion>3.3.3.0</FileVersion>
22-
<PackageVersion>3.3.3</PackageVersion>
19+
<Version>3.1.0</Version>
20+
<AssemblyVersion>3.1.0.0</AssemblyVersion>
21+
<FileVersion>3.1.0.0</FileVersion>
22+
<PackageVersion>3.1.0</PackageVersion>
2323
</PropertyGroup>
2424

2525
<ItemGroup>
@@ -28,7 +28,7 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.2" />
3232
</ItemGroup>
3333

3434
</Project>

‎src/providers/WorkflowCore.Providers.AWS/WorkflowCore.Providers.AWS.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
<PackageProjectUrl>https://github.com/danielgerlag/workflow-core</PackageProjectUrl>
1212
<RepositoryUrl>https://github.com/danielgerlag/workflow-core.git</RepositoryUrl>
1313
<RepositoryType>git</RepositoryType>
14-
<Version>3.0.3</Version>
15-
<AssemblyVersion>3.0.3.0</AssemblyVersion>
16-
<PackageVersion>3.0.3</PackageVersion>
14+
<Version>3.0.2</Version>
15+
<AssemblyVersion>3.0.2.0</AssemblyVersion>
16+
<PackageVersion>3.0.2</PackageVersion>
1717
</PropertyGroup>
1818

1919
<ItemGroup>
2020
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.104.7" />
2121
<PackageReference Include="AWSSDK.Kinesis" Version="3.3.100.112" />
2222
<PackageReference Include="AWSSDK.SQS" Version="3.3.102.44" />
23-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
2424
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
2525
</ItemGroup>
2626

0 commit comments

Comments
 (0)