Skip to content
This repository was archived by the owner on Apr 11, 2024. It is now read-only.

Commit 85b8451

Browse files
prochnowcprochnowc
authored
Merge pull request #22 from AppCoreNet/dev
Merge 'dev' to 'master'.
2 parents b1c41c4 + 8eca104 commit 85b8451

188 files changed

Lines changed: 3035 additions & 1505 deletions

File tree

Some content is hidden

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

AppCore.Events.sln renamed to AppCore.EventModel.sln

Lines changed: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,39 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29102.190
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31717.71
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.Events.Abstractions", "src\AppCore.Events.Abstractions\AppCore.Events.Abstractions.csproj", "{609D2506-8909-4814-929F-59BC262E5913}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.Abstractions", "src\AppCore.EventModel.Abstractions\AppCore.EventModel.Abstractions.csproj", "{609D2506-8909-4814-929F-59BC262E5913}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.Events", "src\AppCore.Events\AppCore.Events.csproj", "{18153F6D-A037-40B7-B5D4-5383255BD89D}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel", "src\AppCore.EventModel\AppCore.EventModel.csproj", "{18153F6D-A037-40B7-B5D4-5383255BD89D}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.Events.Logging", "src\AppCore.Events.Logging\AppCore.Events.Logging.csproj", "{30A20DAF-1CA8-4538-9489-A0238A583BC5}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.Logging", "src\AppCore.EventModel.Logging\AppCore.EventModel.Logging.csproj", "{30A20DAF-1CA8-4538-9489-A0238A583BC5}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.Events.Tests", "test\AppCore.Events.Tests\AppCore.Events.Tests.csproj", "{E0698B78-612C-44EB-81D4-E2BA9EDCB933}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.Tests", "test\AppCore.EventModel.Tests\AppCore.EventModel.Tests.csproj", "{E0698B78-612C-44EB-81D4-E2BA9EDCB933}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.Events.Formatters.NewtonsoftJson", "src\AppCore.Events.Formatters.NewtonsoftJson\AppCore.Events.Formatters.NewtonsoftJson.csproj", "{CD1E2BC7-735F-4333-88FC-CFBD0D311F6C}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.NewtonsoftJson", "src\AppCore.EventModel.NewtonsoftJson\AppCore.EventModel.NewtonsoftJson.csproj", "{CD1E2BC7-735F-4333-88FC-CFBD0D311F6C}"
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.Events.Storage.Abstractions", "src\AppCore.Events.Storage.Abstractions\AppCore.Events.Storage.Abstractions.csproj", "{69F56F13-DA52-45A8-A596-DEC19C2774C4}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.Store.Abstractions", "src\AppCore.EventModel.Store.Abstractions\AppCore.EventModel.Store.Abstractions.csproj", "{69F56F13-DA52-45A8-A596-DEC19C2774C4}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.Events.Storage", "src\AppCore.Events.Storage\AppCore.Events.Storage.csproj", "{6BF073F8-70AF-47AE-9AF9-782E35404A2E}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.Store", "src\AppCore.EventModel.Store\AppCore.EventModel.Store.csproj", "{6BF073F8-70AF-47AE-9AF9-782E35404A2E}"
1919
EndProject
20-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.Events.Storage.Tests", "test\AppCore.Events.Storage.Tests\AppCore.Events.Storage.Tests.csproj", "{C6E2D0D2-1908-4F20-831C-46327C4B2AA5}"
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.Store.Tests", "test\AppCore.EventModel.Store.Tests\AppCore.EventModel.Store.Tests.csproj", "{C6E2D0D2-1908-4F20-831C-46327C4B2AA5}"
2121
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.Events.EntityFrameworkCore3.SqlServer", "src\AppCore.Events.EntityFrameworkCore3.SqlServer\AppCore.Events.EntityFrameworkCore3.SqlServer.csproj", "{A5C60F54-23BB-4E07-92E3-B57AC8EA709E}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.EFCore.SqlServer", "src\AppCore.EventModel.EFCore.SqlServer\AppCore.EventModel.EFCore.SqlServer.csproj", "{A5C60F54-23BB-4E07-92E3-B57AC8EA709E}"
2323
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppCore.Events.EntityFrameworkCore3", "src\AppCore.Events.EntityFrameworkCore3\AppCore.Events.EntityFrameworkCore3.csproj", "{97932B36-F306-4918-BC81-5A237BBAEDD0}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.EFCore", "src\AppCore.EventModel.EFCore\AppCore.EventModel.EFCore.csproj", "{97932B36-F306-4918-BC81-5A237BBAEDD0}"
2525
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppCore.Events.EntityFrameworkCore3.MySql", "src\AppCore.Events.EntityFrameworkCore3.MySql\AppCore.Events.EntityFrameworkCore3.MySql.csproj", "{D03851E0-52F8-468E-98B0-EBC06D2BE120}"
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.EFCore.MySql", "src\AppCore.EventModel.EFCore.MySql\AppCore.EventModel.EFCore.MySql.csproj", "{D03851E0-52F8-468E-98B0-EBC06D2BE120}"
27+
EndProject
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.EFCore.PostgreSql", "src\AppCore.EventModel.EFCore.PostgreSql\AppCore.EventModel.EFCore.PostgreSql.csproj", "{0EBF460A-3075-43CF-B04F-943196FA3944}"
29+
EndProject
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.EFCore.Tests", "test\AppCore.EventModel.EFCore.Tests\AppCore.EventModel.EFCore.Tests.csproj", "{3914B193-0FBA-425A-921C-9402D44CFBC2}"
31+
EndProject
32+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.EFCore.PostgreSql.Tests", "test\AppCore.EventModel.EFCore.PostgreSql.Tests\AppCore.EventModel.EFCore.PostgreSql.Tests.csproj", "{2E9C7C0F-7A30-4EA0-8612-A4B33E1DC2A7}"
33+
EndProject
34+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.EFCore.MySql.Tests", "test\AppCore.EventModel.EFCore.MySql.Tests\AppCore.EventModel.EFCore.MySql.Tests.csproj", "{A3441E49-0F2E-48D8-AAD8-E7310B1E79A2}"
35+
EndProject
36+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCore.EventModel.EFCore.SqlServer.Tests", "test\AppCore.EventModel.EFCore.SqlServer.Tests\AppCore.EventModel.EFCore.SqlServer.Tests.csproj", "{09217A6E-AA2B-4D8E-A033-A5919EED5599}"
2737
EndProject
2838
Global
2939
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -75,6 +85,26 @@ Global
7585
{D03851E0-52F8-468E-98B0-EBC06D2BE120}.Debug|Any CPU.Build.0 = Debug|Any CPU
7686
{D03851E0-52F8-468E-98B0-EBC06D2BE120}.Release|Any CPU.ActiveCfg = Release|Any CPU
7787
{D03851E0-52F8-468E-98B0-EBC06D2BE120}.Release|Any CPU.Build.0 = Release|Any CPU
88+
{0EBF460A-3075-43CF-B04F-943196FA3944}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
89+
{0EBF460A-3075-43CF-B04F-943196FA3944}.Debug|Any CPU.Build.0 = Debug|Any CPU
90+
{0EBF460A-3075-43CF-B04F-943196FA3944}.Release|Any CPU.ActiveCfg = Release|Any CPU
91+
{0EBF460A-3075-43CF-B04F-943196FA3944}.Release|Any CPU.Build.0 = Release|Any CPU
92+
{3914B193-0FBA-425A-921C-9402D44CFBC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
93+
{3914B193-0FBA-425A-921C-9402D44CFBC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
94+
{3914B193-0FBA-425A-921C-9402D44CFBC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
95+
{3914B193-0FBA-425A-921C-9402D44CFBC2}.Release|Any CPU.Build.0 = Release|Any CPU
96+
{2E9C7C0F-7A30-4EA0-8612-A4B33E1DC2A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
97+
{2E9C7C0F-7A30-4EA0-8612-A4B33E1DC2A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
98+
{2E9C7C0F-7A30-4EA0-8612-A4B33E1DC2A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
99+
{2E9C7C0F-7A30-4EA0-8612-A4B33E1DC2A7}.Release|Any CPU.Build.0 = Release|Any CPU
100+
{A3441E49-0F2E-48D8-AAD8-E7310B1E79A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
101+
{A3441E49-0F2E-48D8-AAD8-E7310B1E79A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
102+
{A3441E49-0F2E-48D8-AAD8-E7310B1E79A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
103+
{A3441E49-0F2E-48D8-AAD8-E7310B1E79A2}.Release|Any CPU.Build.0 = Release|Any CPU
104+
{09217A6E-AA2B-4D8E-A033-A5919EED5599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
105+
{09217A6E-AA2B-4D8E-A033-A5919EED5599}.Debug|Any CPU.Build.0 = Debug|Any CPU
106+
{09217A6E-AA2B-4D8E-A033-A5919EED5599}.Release|Any CPU.ActiveCfg = Release|Any CPU
107+
{09217A6E-AA2B-4D8E-A033-A5919EED5599}.Release|Any CPU.Build.0 = Release|Any CPU
78108
EndGlobalSection
79109
GlobalSection(SolutionProperties) = preSolution
80110
HideSolutionNode = FALSE

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<Authors>AppCore .NET Contributors</Authors>
44
<Company>The AppCore .NET project</Company>
5-
<Product>AppCore .NET Events</Product>
5+
<Product>AppCore .NET event model</Product>
66
<Copyright>Copyright (c) 2018-2020 the AppCore .NET project</Copyright>
77
<Version>1.0.0</Version>
88
<PackageLicenseUrl>https://github.com/AppCoreNet/Events/blob/dev/LICENSE</PackageLicenseUrl>

‎README.md‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
AppCore .NET Events
1+
AppCore .NET event model
22
-------------------
33

4-
[![Build Status](https://dev.azure.com/AppCoreNet/Events/_apis/build/status/AppCoreNet.Events%20CI?branchName=dev)](https://dev.azure.com/AppCoreNet/Events/_build/latest?definitionId=5&branchName=dev)
5-
![Azure DevOps tests (compact)](https://img.shields.io/azure-devops/tests/AppCoreNet/Events/5?compact_message)
6-
![Azure DevOps coverage (branch)](https://img.shields.io/azure-devops/coverage/AppCoreNet/Events/5/dev)
7-
![Nuget](https://img.shields.io/nuget/v/AppCore.Events.Abstractions)
4+
[![Build Status](https://dev.azure.com/AppCoreNet/EventModel/_apis/build/status/AppCoreNet.EventModel%20CI?branchName=dev)](https://dev.azure.com/AppCoreNet/EventModel/_build/latest?definitionId=5&branchName=dev)
5+
![Azure DevOps tests (compact)](https://img.shields.io/azure-devops/tests/AppCoreNet/EventModel/5?compact_message)
6+
![Azure DevOps coverage (branch)](https://img.shields.io/azure-devops/coverage/AppCoreNet/EventModel/5/dev)
7+
![Nuget](https://img.shields.io/nuget/v/AppCore.EventModel.Abstractions)
88

99
This repository includes projects containing abstractions and implementations of the event framework.
1010

@@ -15,15 +15,17 @@ as you keep the copyright notice intact when redistributing or otherwise reusing
1515

1616
Latest development packages can be found on [MyGet](https://www.myget.org/gallery/appcorenet).
1717

18-
Package | Description
19-
-------------------------------------------|-----------------------------------------------------------------------------
20-
`AppCore.Events` | Provides event framework default implementations.
21-
`AppCore.Events.Abstractions` | Provides the public API of the event framework.
22-
`AppCore.Events.Formatters.NewtonsoftJson` | JSON serialization support for events.
23-
`AppCore.Events.Logging` | Adds logging of events.
24-
`AppCore.Events.EntityFrameworkCore3.SqlServer` | Adds support for queing events using SQL Server via EF Core.
25-
`AppCore.Events.Storage` | Event store default implementation.
26-
`AppCore.Events.Storage.Abstractions` | Provides the public API for the event store.
18+
Package | Description
19+
---------------------------------------------------|-----------------------------------------------------------------------------
20+
`AppCore.EventModel` | Provides event framework default implementations.
21+
`AppCore.EventModel.Abstractions` | Provides the public API of the event framework.
22+
`AppCore.EventModel.NewtonsoftJson` | JSON serialization support for events.
23+
`AppCore.EventModel.Logging` | Adds logging of events.
24+
`AppCore.EventModel.EntityFrameworkCore.SqlServer` | Adds support for queing events using SQL Server via EF Core.
25+
`AppCore.EventModel.EntityFrameworkCore.MySql` | Adds support for queing events using MySql via EF Core.
26+
`AppCore.EventModel.EntityFrameworkCore.PostgreSql`| Adds support for queing events using PostgreSql via EF Core.
27+
`AppCore.EventModel.Store` | Event store default implementation.
28+
`AppCore.EventModel.Store.Abstractions` | Provides the public API for the event store.
2729

2830
## Contributing
2931

‎azure-pipelines.ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ jobs:
1616
- template: build/shared/azure-pipelines/jobs.yml
1717
parameters:
1818
configuration: $(configuration)
19+
testFilter: 'Category!=Integration'

‎azure-pipelines.release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ jobs:
1414
- template: build/shared/azure-pipelines/jobs.yml
1515
parameters:
1616
configuration: $(configuration)
17+
testFilter: 'Category!=Integration'

‎build.cake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#addin "nuget:?package=Cake.Figlet&version=1.3.1"
1+
#addin "nuget:?package=Cake.Figlet&version=2.0.1"
22

33
#load "build/shared/cake/common.cake"
44
#load "build/shared/cake/dotnetcore.cake"
@@ -8,7 +8,7 @@ Setup<BuildParameters>(context =>
88
var parameters = BuildParameters.Create(Context);
99
parameters.Initialize();
1010

11-
Information(Figlet("AppCore.Events"));
11+
Information(Figlet("AppCore.EventModel"));
1212
Information($"Version: {parameters.Version.InformationalVersion}");
1313

1414
return parameters;

‎build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $ErrorActionPreference = "Stop"
88

99
$ToolsPath = Join-Path $PSScriptRoot "build" -Resolve | Join-Path -ChildPath "tools"
1010
$Cake = Join-Path $ToolsPath "dotnet-cake"
11-
$CakeVersion = "0.37.0"
11+
$CakeVersion = "1.1.0"
1212
$CakeArgs = @("--paths_tools=$ToolsPath")
1313

1414
function Exec {

‎build/dependency-versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<PropertyGroup>
3-
<AppCore_Shared_Version>0.2.0</AppCore_Shared_Version>
4-
<AppCore_DI_Version>0.2.0</AppCore_DI_Version>
5-
<AppCore_Logging_Version>0.2.0</AppCore_Logging_Version>
6-
<AppCore_Data_Version>0.2.0</AppCore_Data_Version>
7-
<AppCore_Hosting_Version>0.2.0</AppCore_Hosting_Version>
3+
<AppCore_Shared_Version>0.3.0</AppCore_Shared_Version>
4+
<AppCore_DI_Version>0.3.0</AppCore_DI_Version>
5+
<AppCore_Data_Version>0.3.0</AppCore_Data_Version>
6+
<AppCore_Hosting_Version>0.3.0</AppCore_Hosting_Version>
7+
<Microsoft_Extensions_Version>[2.1.0,7.0.0)</Microsoft_Extensions_Version>
88
</PropertyGroup>
99
</Project>

‎build/shared/azure-pipelines/build-steps.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
parameters:
22
configuration: 'Debug'
3+
testFilter: ''
34

45
steps:
56
- pwsh: ./build.ps1 --configuration='${{ parameters.configuration }}'
67
displayName: Build
7-
- pwsh: ./build.ps1 --target=Test --skip-target='Build' --configuration='${{ parameters.configuration }}' --artifactsDir='$(Build.ArtifactStagingDirectory)'
8+
- pwsh: ./build.ps1 --target=Test --skip-target='Build' --configuration='${{ parameters.configuration }}' --test-filter='${{ parameters.testFilter }}' --artifactsDir='$(Build.ArtifactStagingDirectory)'
89
displayName: Run Tests
910
- task: PublishTestResults@2
1011
displayName: Publish Test Results

‎build/shared/azure-pipelines/install-steps.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
steps:
22
- task: UseDotNet@2
3-
displayName: 'Install .NET Core Runtime 2.1'
3+
displayName: 'Install .NET Core SDK 2.1'
44
inputs:
55
version: '2.1.x'
6-
packageType: runtime
76
- task: UseDotNet@2
87
displayName: 'Install .NET Core SDK 3.1'
98
inputs:
109
version: '3.1.x'
10+
- task: UseDotNet@2
11+
displayName: 'Install .NET Core SDK 5'
12+
inputs:
13+
version: '5.0.x'
1114
- task: NuGetToolInstaller@1
1215
displayName: 'Install NuGet 5.4'
1316
inputs:

0 commit comments

Comments
 (0)