NBB refactor messaging data contracts, process manager state, cleanup…

… unused features (#112) * Removed EventStoreHost and GetEventStore * Removed SerializedMessage, IMessage * Removed NBB.Resiliency project * Moved resiliency policies to messaging host * Process manager state refactoring * Moved messaging data contracts to MessagingAbstractions
osstotalsoft · Jan 19, 2021 · f88d694 · f88d694
1 parent 4b1952d
commit f88d694
Show file tree

Hide file tree

Showing 109 changed files with 188 additions and 1,360 deletions.
diff --git a/NBB.EventStore.slnf b/NBB.EventStore.slnf
@@ -5,17 +5,14 @@
       "src\\EventStore\\NBB.EventStore.Abstractions\\NBB.EventStore.Abstractions.csproj",
       "src\\EventStore\\NBB.EventStore.AdoNet.Migrations\\NBB.EventStore.AdoNet.Migrations.csproj",
       "src\\EventStore\\NBB.EventStore.AdoNet\\NBB.EventStore.AdoNet.csproj",
-      "src\\EventStore\\NBB.EventStore.Host\\NBB.EventStore.Host.csproj",
       "src\\EventStore\\NBB.EventStore.InMemory\\NBB.EventStore.InMemory.csproj",
       "src\\EventStore\\NBB.EventStore.MessagingExtensions\\NBB.EventStore.MessagingExtensions.csproj",
-      "src\\EventStore\\NBB.EventStore\\NBB.EventStore.csproj",
-      "src\\EventStore\\NBB.GetEventStore\\NBB.GetEventStore.csproj",
+      "src\\EventStore\\NBB.EventStore\\NBB.EventStore.csproj",      
       "src\\EventStore\\NBB.SQLStreamStore.Migrations\\NBB.SQLStreamStore.Migrations.csproj",
       "src\\EventStore\\NBB.SQLStreamStore\\NBB.SQLStreamStore.csproj",
       "test\\Integration\\NBB.EventStore.IntegrationTests\\NBB.EventStore.IntegrationTests.csproj",
       "test\\UnitTests\\EventStore\\NBB.EventStore.InMemory.Tests\\NBB.EventStore.InMemory.Tests.csproj",
-      "test\\UnitTests\\EventStore\\NBB.EventStore.Tests\\NBB.EventStore.Tests.csproj",
-      "test\\UnitTests\\EventStore\\NBB.GetEventStore.Tests\\NBB.GetEventStore.Tests.csproj"
+      "test\\UnitTests\\EventStore\\NBB.EventStore.Tests\\NBB.EventStore.Tests.csproj"      
     ]
   }
 }
diff --git a/NBB.Messaging.slnf b/NBB.Messaging.slnf
@@ -3,7 +3,6 @@
     "path": "NBB.sln",
     "projects": [
       "src\\Messaging\\NBB.Messaging.Abstractions\\NBB.Messaging.Abstractions.csproj",
-      "src\\Messaging\\NBB.Messaging.DataContracts\\NBB.Messaging.DataContracts.csproj",
       "src\\Messaging\\NBB.Messaging.Effects\\NBB.Messaging.Effects.csproj",
       "src\\Messaging\\NBB.Messaging.Host\\NBB.Messaging.Host.csproj",
       "src\\Messaging\\NBB.Messaging.InProcessMessaging\\NBB.Messaging.InProcessMessaging.csproj",

diff --git a/NBB.sln b/NBB.sln
@@ -102,8 +102,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{14726095-D
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.Core.Abstractions", "src\Core\NBB.Core.Abstractions\NBB.Core.Abstractions.csproj", "{2F591414-63E0-4CD8-AA1E-11132CC20EA9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.Messaging.DataContracts", "src\Messaging\NBB.Messaging.DataContracts\NBB.Messaging.DataContracts.csproj", "{602F852F-77EE-4335-BA45-170C32440575}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EventStore", "EventStore", "{20C8482D-1525-47B0-B78B-09632892E8E4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.EventStore.Abstractions", "src\EventStore\NBB.EventStore.Abstractions\NBB.EventStore.Abstractions.csproj", "{7197E4CE-120D-4601-AA8B-F65B8DB2E883}"
@@ -124,8 +122,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.Messaging.Nats", "src\M
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.Messaging.Abstractions.Tests", "test\UnitTests\Messaging\NBB.Messaging.Abstractions.Tests\NBB.Messaging.Abstractions.Tests.csproj", "{65743F60-F511-41E1-959B-D29FA3DB404D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.GetEventStore", "src\EventStore\NBB.GetEventStore\NBB.GetEventStore.csproj", "{86A0DCDE-225B-4140-8195-A96F744573F0}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Monolith", "Monolith", "{34929B8F-4ED5-499C-A3AC-7ABE0F2F8FFE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.Mono", "samples\Monolith\NBB.Mono\NBB.Mono.csproj", "{34A864A3-C25C-4DFA-BCE8-173F72B572A3}"
@@ -134,8 +130,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.Messaging.InProcessMess
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.Messaging.InProcessMessaging.Tests", "test\UnitTests\Messaging\NBB.Messaging.InProcessMessaging.Tests\NBB.Messaging.InProcessMessaging.Tests.csproj", "{2E99F025-BDC0-430E-AD2A-C81141AC2BCA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.GetEventStore.Tests", "test\UnitTests\EventStore\NBB.GetEventStore.Tests\NBB.GetEventStore.Tests.csproj", "{4831DD42-C73B-47DE-B5F6-9701F9773AD0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.SQLStreamStore", "src\EventStore\NBB.SQLStreamStore\NBB.SQLStreamStore.csproj", "{88B831EC-0DFE-40D7-9449-C4BDAE5B5512}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.SQLStreamStore.Migrations", "src\EventStore\NBB.SQLStreamStore.Migrations\NBB.SQLStreamStore.Migrations.csproj", "{FC77C6B6-EAB3-4CC0-8BB0-535BC4CB2C5B}"
@@ -182,12 +176,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.Core.DependencyInjectio
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.Messaging.Host", "src\Messaging\NBB.Messaging.Host\NBB.Messaging.Host.csproj", "{B15B9803-EB9D-4BA2-9B09-ACAE8F11252D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.EventStore.Host", "src\EventStore\NBB.EventStore.Host\NBB.EventStore.Host.csproj", "{6CBD9972-ABB1-4E15-8FB7-8F377A081490}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Resiliency", "Resiliency", "{A6E20C85-DEC2-4540-83FA-84636CAEE734}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.Resiliency", "src\Resiliency\NBB.Resiliency\NBB.Resiliency.csproj", "{4A9EFAB3-B798-4323-86C0-39D4C2C67C86}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocFx", "docs\DocFx\DocFx.csproj", "{7C3851B7-151E-4DB4-8DC8-DED438D2A998}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBB.Messaging.DataContracts.Tests", "test\UnitTests\Messaging\NBB.Messaging.DataContracts.Tests\NBB.Messaging.DataContracts.Tests.csproj", "{D4F5F69C-9A9F-425C-8DBA-B8053AE506B5}"
@@ -433,10 +421,6 @@ Global
 		{2F591414-63E0-4CD8-AA1E-11132CC20EA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F591414-63E0-4CD8-AA1E-11132CC20EA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2F591414-63E0-4CD8-AA1E-11132CC20EA9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{602F852F-77EE-4335-BA45-170C32440575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{602F852F-77EE-4335-BA45-170C32440575}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{602F852F-77EE-4335-BA45-170C32440575}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{602F852F-77EE-4335-BA45-170C32440575}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7197E4CE-120D-4601-AA8B-F65B8DB2E883}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7197E4CE-120D-4601-AA8B-F65B8DB2E883}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7197E4CE-120D-4601-AA8B-F65B8DB2E883}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -465,10 +449,6 @@ Global
 		{65743F60-F511-41E1-959B-D29FA3DB404D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{65743F60-F511-41E1-959B-D29FA3DB404D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{65743F60-F511-41E1-959B-D29FA3DB404D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86A0DCDE-225B-4140-8195-A96F744573F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86A0DCDE-225B-4140-8195-A96F744573F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86A0DCDE-225B-4140-8195-A96F744573F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86A0DCDE-225B-4140-8195-A96F744573F0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{34A864A3-C25C-4DFA-BCE8-173F72B572A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{34A864A3-C25C-4DFA-BCE8-173F72B572A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{34A864A3-C25C-4DFA-BCE8-173F72B572A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -481,10 +461,6 @@ Global
 		{2E99F025-BDC0-430E-AD2A-C81141AC2BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E99F025-BDC0-430E-AD2A-C81141AC2BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E99F025-BDC0-430E-AD2A-C81141AC2BCA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4831DD42-C73B-47DE-B5F6-9701F9773AD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4831DD42-C73B-47DE-B5F6-9701F9773AD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4831DD42-C73B-47DE-B5F6-9701F9773AD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4831DD42-C73B-47DE-B5F6-9701F9773AD0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{88B831EC-0DFE-40D7-9449-C4BDAE5B5512}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{88B831EC-0DFE-40D7-9449-C4BDAE5B5512}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{88B831EC-0DFE-40D7-9449-C4BDAE5B5512}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -549,14 +525,6 @@ Global
 		{B15B9803-EB9D-4BA2-9B09-ACAE8F11252D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B15B9803-EB9D-4BA2-9B09-ACAE8F11252D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B15B9803-EB9D-4BA2-9B09-ACAE8F11252D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6CBD9972-ABB1-4E15-8FB7-8F377A081490}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CBD9972-ABB1-4E15-8FB7-8F377A081490}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CBD9972-ABB1-4E15-8FB7-8F377A081490}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6CBD9972-ABB1-4E15-8FB7-8F377A081490}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A9EFAB3-B798-4323-86C0-39D4C2C67C86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A9EFAB3-B798-4323-86C0-39D4C2C67C86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A9EFAB3-B798-4323-86C0-39D4C2C67C86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A9EFAB3-B798-4323-86C0-39D4C2C67C86}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7C3851B7-151E-4DB4-8DC8-DED438D2A998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7C3851B7-151E-4DB4-8DC8-DED438D2A998}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4F5F69C-9A9F-425C-8DBA-B8053AE506B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -778,7 +746,6 @@ Global
 		{5169916E-092C-431A-8577-50F2713C10CB} = {A820C4C2-1472-46ED-BA95-47B588B1D7AF}
 		{14726095-DA28-43A6-A9A9-F16C605932E1} = {7311E32F-C1B0-41C9-B5F1-DE9EBB6ABB55}
 		{2F591414-63E0-4CD8-AA1E-11132CC20EA9} = {14726095-DA28-43A6-A9A9-F16C605932E1}
-		{602F852F-77EE-4335-BA45-170C32440575} = {584C62C0-2AE6-4DD6-9BCF-8FF28B7122CE}
 		{20C8482D-1525-47B0-B78B-09632892E8E4} = {7311E32F-C1B0-41C9-B5F1-DE9EBB6ABB55}
 		{7197E4CE-120D-4601-AA8B-F65B8DB2E883} = {20C8482D-1525-47B0-B78B-09632892E8E4}
 		{DD1FF81B-107E-4874-BD37-6E84EAD78EDD} = {20C8482D-1525-47B0-B78B-09632892E8E4}
@@ -788,12 +755,10 @@ Global
 		{25A21016-7DF7-4884-9241-AC21D7D35ABE} = {20C8482D-1525-47B0-B78B-09632892E8E4}
 		{3C1C5EBB-A1C4-4B27-A3B2-C99DF646273E} = {584C62C0-2AE6-4DD6-9BCF-8FF28B7122CE}
 		{65743F60-F511-41E1-959B-D29FA3DB404D} = {A4361674-5AB7-442D-8DA7-7187C9BCA38F}
-		{86A0DCDE-225B-4140-8195-A96F744573F0} = {20C8482D-1525-47B0-B78B-09632892E8E4}
 		{34929B8F-4ED5-499C-A3AC-7ABE0F2F8FFE} = {D28298B7-63A2-4751-BEB9-C3C30F2E7107}
 		{34A864A3-C25C-4DFA-BCE8-173F72B572A3} = {34929B8F-4ED5-499C-A3AC-7ABE0F2F8FFE}
 		{5104F8FE-CF32-4B6A-93FB-B6A651FB9444} = {584C62C0-2AE6-4DD6-9BCF-8FF28B7122CE}
 		{2E99F025-BDC0-430E-AD2A-C81141AC2BCA} = {A4361674-5AB7-442D-8DA7-7187C9BCA38F}
-		{4831DD42-C73B-47DE-B5F6-9701F9773AD0} = {0407911F-89FC-4138-BD4D-D4CFCFBB5DC1}
 		{88B831EC-0DFE-40D7-9449-C4BDAE5B5512} = {20C8482D-1525-47B0-B78B-09632892E8E4}
 		{FC77C6B6-EAB3-4CC0-8BB0-535BC4CB2C5B} = {20C8482D-1525-47B0-B78B-09632892E8E4}
 		{FA224C96-29E2-45F8-9CB9-B61636664F06} = {20C8482D-1525-47B0-B78B-09632892E8E4}
@@ -817,9 +782,6 @@ Global
 		{329C3A29-B023-478C-9D73-91621B101F81} = {F031DBDA-5D3F-4CE6-B133-09CE7E212584}
 		{4B368840-DA86-48FA-969D-A086F016BB7A} = {14726095-DA28-43A6-A9A9-F16C605932E1}
 		{B15B9803-EB9D-4BA2-9B09-ACAE8F11252D} = {584C62C0-2AE6-4DD6-9BCF-8FF28B7122CE}
-		{6CBD9972-ABB1-4E15-8FB7-8F377A081490} = {20C8482D-1525-47B0-B78B-09632892E8E4}
-		{A6E20C85-DEC2-4540-83FA-84636CAEE734} = {7311E32F-C1B0-41C9-B5F1-DE9EBB6ABB55}
-		{4A9EFAB3-B798-4323-86C0-39D4C2C67C86} = {A6E20C85-DEC2-4540-83FA-84636CAEE734}
 		{7C3851B7-151E-4DB4-8DC8-DED438D2A998} = {C5410077-1E20-4DC2-8AB2-AB40CA80C4AF}
 		{D4F5F69C-9A9F-425C-8DBA-B8053AE506B5} = {A4361674-5AB7-442D-8DA7-7187C9BCA38F}
 		{E6C9D6ED-2405-45C6-898A-EE7CE9D7D5B2} = {A4361674-5AB7-442D-8DA7-7187C9BCA38F}

diff --git a/...BB.Contracts/NBB.Contracts.Application.Commands/NBB.Contracts.Application.Commands.csproj b/...BB.Contracts/NBB.Contracts.Application.Commands/NBB.Contracts.Application.Commands.csproj
@@ -21,7 +21,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Application\NBB.Application.MediatR\NBB.Application.MediatR.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Messaging\NBB.Messaging.DataContracts\NBB.Messaging.DataContracts.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...ices/NBB.Contracts/NBB.Contracts.PublishedLanguage/NBB.Contracts.PublishedLanguage.csproj b/...ices/NBB.Contracts/NBB.Contracts.PublishedLanguage/NBB.Contracts.PublishedLanguage.csproj
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Application\NBB.Application.MediatR\NBB.Application.MediatR.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Messaging\NBB.Messaging.DataContracts\NBB.Messaging.DataContracts.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MicroServices/NBB.Contracts/NBB.Contracts.Worker/NBB.Contracts.Worker.csproj b/samples/MicroServices/NBB.Contracts/NBB.Contracts.Worker/NBB.Contracts.Worker.csproj
@@ -39,7 +39,6 @@
     <ProjectReference Include="..\..\..\..\src\Correlation\NBB.Correlation.Serilog\NBB.Correlation.Serilog.csproj" />
     <ProjectReference Include="..\..\..\..\src\EventStore\NBB.EventStore.AdoNet\NBB.EventStore.AdoNet.csproj" />
     <ProjectReference Include="..\..\..\..\src\EventStore\NBB.EventStore\NBB.EventStore.csproj" />
-    <ProjectReference Include="..\..\..\..\src\EventStore\NBB.GetEventStore\NBB.GetEventStore.csproj" />
     <ProjectReference Include="..\..\..\..\src\Messaging\NBB.Messaging.Host\NBB.Messaging.Host.csproj" />
     <ProjectReference Include="..\..\..\..\src\Messaging\NBB.Messaging.MultiTenancy\NBB.Messaging.MultiTenancy.csproj" />
     <ProjectReference Include="..\..\..\..\src\Messaging\NBB.Messaging.Nats\NBB.Messaging.Nats.csproj" />

diff --git a/samples/MicroServices/NBB.Contracts/NBB.Contracts.Worker/Program.cs b/samples/MicroServices/NBB.Contracts/NBB.Contracts.Worker/Program.cs
@@ -14,7 +14,6 @@
 using NBB.Messaging.Host.Builder;
 using NBB.Messaging.Host.MessagingPipeline;
 using NBB.Messaging.Nats;
-using NBB.Resiliency;
 using Serilog;
 using Serilog.Events;
 using System.IO;
@@ -76,8 +75,6 @@ public static async Task Main(string[] _args)
                         .WithNewtownsoftJsonEventStoreSeserializer(new[] { new SingleValueObjectConverter() })
                         .WithAdoNetEventRepository();
 
-                    services.AddResiliency();
-
                     services.AddMessagingHost()
                         .AddSubscriberServices(config =>
                             config.FromMediatRHandledCommands().AddAllClasses())

diff --git a/...s/NBB.Invoices/NBB.Invoices.Application.Commands/NBB.Invoices.Application.Commands.csproj b/...s/NBB.Invoices/NBB.Invoices.Application.Commands/NBB.Invoices.Application.Commands.csproj
@@ -21,7 +21,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Application\NBB.Application.MediatR\NBB.Application.MediatR.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Messaging\NBB.Messaging.DataContracts\NBB.Messaging.DataContracts.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...ervices/NBB.Invoices/NBB.Invoices.PublishedLanguage/NBB.Invoices.PublishedLanguage.csproj b/...ervices/NBB.Invoices/NBB.Invoices.PublishedLanguage/NBB.Invoices.PublishedLanguage.csproj
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Application\NBB.Application.MediatR\NBB.Application.MediatR.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Messaging\NBB.Messaging.DataContracts\NBB.Messaging.DataContracts.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MicroServices/NBB.Invoices/NBB.Invoices.Worker/Program.cs b/samples/MicroServices/NBB.Invoices/NBB.Invoices.Worker/Program.cs
@@ -17,7 +17,6 @@
 using NBB.Messaging.Host.Builder;
 using NBB.Messaging.Host.MessagingPipeline;
 using NBB.Messaging.Nats;
-using NBB.Resiliency;
 using Serilog;
 using Serilog.Events;
 using Serilog.Sinks.MSSqlServer;
@@ -73,8 +72,6 @@ public static async Task Main(string[] _args)
                     .WithNewtownsoftJsonEventStoreSeserializer(new[] {new SingleValueObjectConverter()})
                     .WithAdoNetEventRepository();
 
-                services.AddResiliency();
-
                 services.AddMessagingHost()
                     .AddSubscriberServices(config => config
                         .FromMediatRHandledCommands().AddAllClasses()

diff --git a/...s/NBB.Payments/NBB.Payments.Application.Commands/NBB.Payments.Application.Commands.csproj b/...s/NBB.Payments/NBB.Payments.Application.Commands/NBB.Payments.Application.Commands.csproj
@@ -21,7 +21,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Application\NBB.Application.MediatR\NBB.Application.MediatR.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Messaging\NBB.Messaging.DataContracts\NBB.Messaging.DataContracts.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...ervices/NBB.Payments/NBB.Payments.PublishedLanguage/NBB.Payments.PublishedLanguage.csproj b/...ervices/NBB.Payments/NBB.Payments.PublishedLanguage/NBB.Payments.PublishedLanguage.csproj
@@ -17,7 +17,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Application\NBB.Application.MediatR\NBB.Application.MediatR.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Messaging\NBB.Messaging.DataContracts\NBB.Messaging.DataContracts.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MicroServices/NBB.Payments/NBB.Payments.Worker/Program.cs b/samples/MicroServices/NBB.Payments/NBB.Payments.Worker/Program.cs
@@ -17,7 +17,6 @@
 using NBB.Messaging.Nats;
 using NBB.Payments.Application.CommandHandlers;
 using NBB.Payments.Data;
-using NBB.Resiliency;
 using Serilog;
 using Serilog.Events;
 using Serilog.Sinks.MSSqlServer;
@@ -75,8 +74,6 @@ public static async Task Main(string[] _args)
                         .WithNewtownsoftJsonEventStoreSeserializer(new[] {new SingleValueObjectConverter()})
                         .WithAdoNetEventRepository();
 
-                    services.AddResiliency();
-
                     services.AddMessagingHost()
                         .AddSubscriberServices(config => config
                             .FromMediatRHandledCommands().AddAllClasses()

diff --git a/samples/Monolith/NBB.Mono/Startup.cs b/samples/Monolith/NBB.Mono/Startup.cs
@@ -21,7 +21,6 @@
 using NBB.Core.DependencyInjection;
 using NBB.Domain;
 using NBB.Messaging.Host;
-using NBB.Resiliency;
 using Microsoft.Extensions.Hosting;
 using NBB.Messaging.Host.MessagingPipeline;
 using NBB.Messaging.Host.Builder;
@@ -60,8 +59,6 @@ public void ConfigureServices(IServiceCollection services)
                 .WithNewtownsoftJsonEventStoreSeserializer(new[] { new SingleValueObjectConverter() })
                 .WithAdoNetEventRepository();
 
-            services.AddResiliency();
-
             services.AddMessagingHost()
                 .AddSubscriberServices(config => config
                     .FromMediatRHandledCommands().AddAllClasses()

diff --git a/samples/Orchestration/ProcessManagerSample/MessageMiddlewares/SubscriberLoggingMiddleware.cs b/samples/Orchestration/ProcessManagerSample/MessageMiddlewares/SubscriberLoggingMiddleware.cs
@@ -3,7 +3,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using NBB.Core.Pipeline;
-using NBB.Messaging.DataContracts;
+using NBB.Messaging.Abstractions;
 
 namespace ProcessManagerSample.MessageMiddlewares
 {

diff --git a/samples/Orchestration/ProcessManagerSample/OrderProcessManager.cs b/samples/Orchestration/ProcessManagerSample/OrderProcessManager.cs
@@ -31,12 +31,7 @@ public OrderProcessManager(IMapper mapper)
                 .Then(OrderCreatedHandler);
 
             When<OrderPaymentCreated>()
-                .SetState((received, state) =>
-                {
-                    var newState = state.Data;
-                    newState.OrderId = Guid.NewGuid();
-                    return newState;
-                })
+                .SetState((received, state) => state.Data with {OrderId = Guid.NewGuid()})
                 .Then((orderCreated, data) =>
                 {
                     var q1 = Mediator.SendQuery(new GetClientQuery());

diff --git a/samples/Orchestration/ProcessManagerSample/OrderProcessManagerData.cs b/samples/Orchestration/ProcessManagerSample/OrderProcessManagerData.cs
@@ -2,9 +2,9 @@
 
 namespace ProcessManagerSample
 {
-    public struct OrderProcessManagerData
+    public record OrderProcessManagerData
     {
-        public Guid OrderId { get; set; }
-        public bool IsPaid { get; set; }
+        public Guid OrderId { get; init; }
+        public bool IsPaid { get; init; }
     }
 }
diff --git a/samples/Orchestration/ProcessManagerSample/ProcessManagerSample.csproj b/samples/Orchestration/ProcessManagerSample/ProcessManagerSample.csproj
@@ -28,7 +28,6 @@
     <ProjectReference Include="..\..\..\src\Core\NBB.Core.Abstractions\NBB.Core.Abstractions.csproj" />
     <ProjectReference Include="..\..\..\src\EventStore\NBB.EventStore.Abstractions\NBB.EventStore.Abstractions.csproj" />
     <ProjectReference Include="..\..\..\src\EventStore\NBB.EventStore.AdoNet\NBB.EventStore.AdoNet.csproj" />
-    <ProjectReference Include="..\..\..\src\Messaging\NBB.Messaging.DataContracts\NBB.Messaging.DataContracts.csproj" />
     <ProjectReference Include="..\..\..\src\Messaging\NBB.Messaging.Effects\NBB.Messaging.Effects.csproj" />
     <ProjectReference Include="..\..\..\src\Messaging\NBB.Messaging.Host\NBB.Messaging.Host.csproj" />
     <ProjectReference Include="..\..\..\src\Messaging\NBB.Messaging.InProcessMessaging\NBB.Messaging.InProcessMessaging.csproj" />

diff --git a/samples/Orchestration/ProcessManagerSample/Program.cs b/samples/Orchestration/ProcessManagerSample/Program.cs
@@ -32,7 +32,7 @@ static async Task<int> Main(string[] args)
 
 
                     Console.ReadKey();
-                    var orderId = Guid.Empty;
+                    var orderId = Guid.NewGuid();
                     var pub = host.Services.GetRequiredService<IMessageBusPublisher>();
                     await pub.PublishAsync(new OrderCreated(orderId, 100, 0,0));
                     Console.ReadKey();