From e608eee968a0b45f2672415e578fcea6e04a6132 Mon Sep 17 00:00:00 2001 From: jasonmwebb-lv <97196139+jasonmwebb-lv@users.noreply.github.com> Date: Sun, 24 Mar 2024 18:20:41 -0600 Subject: [PATCH] Dev (#113) * EventRouter Updates * Updated dependencies to latest and fixed MassTransit example. * Updated MassTransit test projects. * Promoted EventHandling assembly to RCommon.Core as it is becoming more essential to have loosely coupled events locally in RCommon as well as in dependencies! * Removed deprecated project. --------- Co-authored-by: Jason Webb <46631010+JasonMWebb@users.noreply.github.com> --- ...aveManagement.Application.UnitTests.csproj | 7 ++- .../CreateLeaveRequestCommandHandler.cs | 1 - .../HR.LeaveManagement.Application.csproj | 1 - .../HR.LeaveManagement.Identity.csproj | 9 ++-- .../HR.LeaveManagement.MVC.csproj | 6 +-- .../Middleware/RequestMiddleware.cs | 6 +-- .../Services/AuthenticationService.cs | 10 ++-- .../AuditableDbContext.cs | 1 - .../LeaveManagementDbContext.cs | 1 - ...ples.EventHandling.InMemoryEventBus.csproj | 2 +- Examples/Examples.sln | 6 --- .../Examples.Messaging.MassTransit.csproj | 1 - .../Program.cs | 17 ++----- .../TestEventHandler.cs | 1 + .../Worker.cs | 43 ++++++++++++++++ .../RCommon.ApplicationServices.csproj | 2 +- .../RCommon.Authorization.Web.csproj | 2 +- .../Configuration/RCommonBuilder.cs | 6 +++ .../EventHandlingBuilderExtensions.cs | 10 +--- .../EventHandling}/IAsyncEvent.cs | 0 .../EventHandling}/IEventBus.cs | 0 .../EventHandling}/IEventHandlingBuilder.cs | 0 .../EventHandling}/ISerializableEvent.cs | 0 .../EventHandling}/ISyncEvent.cs | 0 .../EventHandling}/InMemoryEventBus.cs | 0 .../EventHandling}/InMemoryEventBusBuilder.cs | 0 .../EventHandling}/Producers/EventRouter.cs | 3 -- .../Producers/IEventProducer.cs | 0 .../EventHandling}/Producers/IEventRouter.cs | 0 .../PublishWithEventBusEventProducer.cs | 0 .../UnsupportedEventProducerException.cs | 0 .../IDynamicDistributedEventHandler.cs | 0 .../EventHandling}/Subscribers/ISubscriber.cs | 0 Src/RCommon.Core/RCommon.Core.csproj | 8 +-- Src/RCommon.Dapper/RCommon.Dapper.csproj | 2 +- Src/RCommon.EfCore/RCommon.EFCore.csproj | 7 ++- Src/RCommon.EfCore/RCommonDbContext.cs | 1 - Src/RCommon.Emailing/RCommon.Emailing.csproj | 2 +- Src/RCommon.Entities/InMemoryEventTracker.cs | 1 - Src/RCommon.Entities/RCommon.Entities.csproj | 4 +- .../RCommon.EventHandling.csproj | 51 ------------------- Src/RCommon.Linq2Db/RCommon.Linq2Db.csproj | 2 +- Src/RCommon.Linq2Db/RCommonDataConnection.cs | 1 - .../PublishWithMassTransitEventProducer.cs | 2 - .../RCommon.MassTransit.csproj | 8 +-- Src/RCommon.Mediator/RCommon.Mediator.csproj | 11 ++-- Src/RCommon.Mediatr/RCommon.MediatR.csproj | 2 +- Src/RCommon.Models/RCommon.Models.csproj | 2 +- .../RCommon.Persistence.csproj | 2 +- Src/RCommon.Persistence/Sql/RDbConnection.cs | 1 - Src/RCommon.Security/RCommon.Security.csproj | 2 +- Src/RCommon.SendGrid/RCommon.SendGrid.csproj | 4 +- Src/RCommon.Web/RCommon.Web.csproj | 4 +- .../RCommon.Wolverine.csproj | 7 ++- Src/RCommon.sln | 7 --- .../RCommon.DotNet6.Tests.csproj | 5 +- .../RCommon.DotNet7.Tests.csproj | 7 ++- .../RCommon.DotNet8.Tests.csproj | 10 ++-- .../RCommon.Emailing.SendGrid.Tests.csproj | 10 ++-- .../RCommon.Emailing.Tests.csproj | 12 ++--- .../RCommon.Mediator.MediatR.Tests.csproj | 14 ++--- ...RCommon.Messaging.MassTransit.Tests.csproj | 7 ++- .../RCommon.Messaging.Wolverine.Tests.csproj | 6 +-- .../RCommon.Persistence.Dapper.Tests.csproj | 14 ++--- .../TestDbConnection.cs | 1 - .../RCommon.Persistence.EFCore.Tests.csproj | 6 +-- .../RCommon.Persistence.Linq2Db.Tests.csproj | 2 +- .../TestDataConnection.cs | 1 - .../RCommon.Security.Tests.csproj | 4 +- .../EFConfigurations/TestDbContext.cs | 1 - .../RCommon.TestBase.Data.csproj | 6 +-- .../RCommon.TestBase/RCommon.TestBase.csproj | 2 +- 72 files changed, 161 insertions(+), 213 deletions(-) create mode 100644 Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/Worker.cs rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/EventHandlingBuilderExtensions.cs (91%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/IAsyncEvent.cs (100%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/IEventBus.cs (100%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/IEventHandlingBuilder.cs (100%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/ISerializableEvent.cs (100%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/ISyncEvent.cs (100%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/InMemoryEventBus.cs (100%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/InMemoryEventBusBuilder.cs (100%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/Producers/EventRouter.cs (89%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/Producers/IEventProducer.cs (100%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/Producers/IEventRouter.cs (100%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/Producers/PublishWithEventBusEventProducer.cs (100%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/Producers/UnsupportedEventProducerException.cs (100%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/Subscribers/IDynamicDistributedEventHandler.cs (100%) rename Src/{RCommon.EventHandling => RCommon.Core/EventHandling}/Subscribers/ISubscriber.cs (100%) delete mode 100644 Src/RCommon.EventHandling/RCommon.EventHandling.csproj diff --git a/Examples/CleanWithCQRS/HR.LeaveManagement.Application.UnitTests/HR.LeaveManagement.Application.UnitTests.csproj b/Examples/CleanWithCQRS/HR.LeaveManagement.Application.UnitTests/HR.LeaveManagement.Application.UnitTests.csproj index f34052c9..7a2ac640 100644 --- a/Examples/CleanWithCQRS/HR.LeaveManagement.Application.UnitTests/HR.LeaveManagement.Application.UnitTests.csproj +++ b/Examples/CleanWithCQRS/HR.LeaveManagement.Application.UnitTests/HR.LeaveManagement.Application.UnitTests.csproj @@ -1,4 +1,4 @@ - + net8.0; @@ -9,21 +9,20 @@ - + - - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Examples/CleanWithCQRS/HR.LeaveManagement.Application/Features/LeaveRequests/Handlers/Commands/CreateLeaveRequestCommandHandler.cs b/Examples/CleanWithCQRS/HR.LeaveManagement.Application/Features/LeaveRequests/Handlers/Commands/CreateLeaveRequestCommandHandler.cs index 18b0328d..a628844a 100644 --- a/Examples/CleanWithCQRS/HR.LeaveManagement.Application/Features/LeaveRequests/Handlers/Commands/CreateLeaveRequestCommandHandler.cs +++ b/Examples/CleanWithCQRS/HR.LeaveManagement.Application/Features/LeaveRequests/Handlers/Commands/CreateLeaveRequestCommandHandler.cs @@ -15,7 +15,6 @@ using HR.LeaveManagement.Application.Models; using Microsoft.AspNetCore.Http; using System.Security.Claims; -using System.IdentityModel.Tokens.Jwt; using HR.LeaveManagement.Application.Constants; using RCommon.Persistence; using RCommon.Security.Users; diff --git a/Examples/CleanWithCQRS/HR.LeaveManagement.Application/HR.LeaveManagement.Application.csproj b/Examples/CleanWithCQRS/HR.LeaveManagement.Application/HR.LeaveManagement.Application.csproj index e63fdedc..6826a06b 100644 --- a/Examples/CleanWithCQRS/HR.LeaveManagement.Application/HR.LeaveManagement.Application.csproj +++ b/Examples/CleanWithCQRS/HR.LeaveManagement.Application/HR.LeaveManagement.Application.csproj @@ -10,7 +10,6 @@ - diff --git a/Examples/CleanWithCQRS/HR.LeaveManagement.Identity/HR.LeaveManagement.Identity.csproj b/Examples/CleanWithCQRS/HR.LeaveManagement.Identity/HR.LeaveManagement.Identity.csproj index e72a5bce..dc53618a 100644 --- a/Examples/CleanWithCQRS/HR.LeaveManagement.Identity/HR.LeaveManagement.Identity.csproj +++ b/Examples/CleanWithCQRS/HR.LeaveManagement.Identity/HR.LeaveManagement.Identity.csproj @@ -7,14 +7,13 @@ - + - + - - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Examples/CleanWithCQRS/HR.LeaveManagement.MVC/HR.LeaveManagement.MVC.csproj b/Examples/CleanWithCQRS/HR.LeaveManagement.MVC/HR.LeaveManagement.MVC.csproj index 8064780d..fab773d9 100644 --- a/Examples/CleanWithCQRS/HR.LeaveManagement.MVC/HR.LeaveManagement.MVC.csproj +++ b/Examples/CleanWithCQRS/HR.LeaveManagement.MVC/HR.LeaveManagement.MVC.csproj @@ -8,10 +8,10 @@ - + - - + + diff --git a/Examples/CleanWithCQRS/HR.LeaveManagement.MVC/Middleware/RequestMiddleware.cs b/Examples/CleanWithCQRS/HR.LeaveManagement.MVC/Middleware/RequestMiddleware.cs index 7df745c8..151f6b1a 100644 --- a/Examples/CleanWithCQRS/HR.LeaveManagement.MVC/Middleware/RequestMiddleware.cs +++ b/Examples/CleanWithCQRS/HR.LeaveManagement.MVC/Middleware/RequestMiddleware.cs @@ -7,9 +7,9 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.JsonWebTokens; using System; using System.Collections.Generic; -using System.IdentityModel.Tokens.Jwt; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; @@ -39,8 +39,8 @@ public async Task InvokeAsync(HttpContext httpContext) if (tokenExists) { var token = _localStorageService.GetStorageValue("token"); - JwtSecurityTokenHandler tokenHandler = new(); - var tokenContent = tokenHandler.ReadJwtToken(token); + JsonWebTokenHandler tokenHandler = new(); + var tokenContent = tokenHandler.ReadJsonWebToken(token); var expiry = tokenContent.ValidTo; if (expiry < DateTime.UtcNow) { diff --git a/Examples/CleanWithCQRS/HR.LeaveManagement.MVC/Services/AuthenticationService.cs b/Examples/CleanWithCQRS/HR.LeaveManagement.MVC/Services/AuthenticationService.cs index 5fd7db48..0f1bb470 100644 --- a/Examples/CleanWithCQRS/HR.LeaveManagement.MVC/Services/AuthenticationService.cs +++ b/Examples/CleanWithCQRS/HR.LeaveManagement.MVC/Services/AuthenticationService.cs @@ -5,9 +5,9 @@ using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Components.Authorization; using Microsoft.AspNetCore.Http; +using Microsoft.IdentityModel.JsonWebTokens; using System; using System.Collections.Generic; -using System.IdentityModel.Tokens.Jwt; using System.Linq; using System.Net.Http.Headers; using System.Security.Claims; @@ -19,7 +19,7 @@ public class AuthenticationService : BaseHttpService, IAuthenticationService { private readonly IHttpContextAccessor _httpContextAccessor; private readonly IMapper _mapper; - private JwtSecurityTokenHandler _tokenHandler; + private JsonWebTokenHandler _tokenHandler; public AuthenticationService(IClient client, ILocalStorageService localStorage, IHttpContextAccessor httpContextAccessor, IMapper mapper) @@ -27,7 +27,7 @@ public AuthenticationService(IClient client, ILocalStorageService localStorage, { this._httpContextAccessor = httpContextAccessor; this._mapper = mapper; - this._tokenHandler = new JwtSecurityTokenHandler(); + this._tokenHandler = new JsonWebTokenHandler(); } public async Task Authenticate(string email, string password) @@ -40,7 +40,7 @@ public async Task Authenticate(string email, string password) if (authenticationResponse.Token != string.Empty) { //Get Claims from token and Build auth user object - var tokenContent = _tokenHandler.ReadJwtToken(authenticationResponse.Token); + var tokenContent = _tokenHandler.ReadJsonWebToken(authenticationResponse.Token); var claims = ParseClaims(tokenContent); var user = new ClaimsPrincipal(new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme)); var login = _httpContextAccessor.HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, user); @@ -76,7 +76,7 @@ public async Task Logout() await _httpContextAccessor.HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); } - private IList ParseClaims(JwtSecurityToken tokenContent) + private IList ParseClaims(JsonWebToken tokenContent) { var claims = tokenContent.Claims.ToList(); claims.Add(new Claim(ClaimTypes.Name, tokenContent.Subject)); diff --git a/Examples/CleanWithCQRS/HR.LeaveManagement.Persistence/AuditableDbContext.cs b/Examples/CleanWithCQRS/HR.LeaveManagement.Persistence/AuditableDbContext.cs index a3642ddc..2ed7a4a3 100644 --- a/Examples/CleanWithCQRS/HR.LeaveManagement.Persistence/AuditableDbContext.cs +++ b/Examples/CleanWithCQRS/HR.LeaveManagement.Persistence/AuditableDbContext.cs @@ -2,7 +2,6 @@ using Microsoft.EntityFrameworkCore; using RCommon; using RCommon.Entities; -using RCommon.Mediator; using RCommon.Persistence.EFCore; using RCommon.Security.Users; using System; diff --git a/Examples/CleanWithCQRS/HR.LeaveManagement.Persistence/LeaveManagementDbContext.cs b/Examples/CleanWithCQRS/HR.LeaveManagement.Persistence/LeaveManagementDbContext.cs index 2f2626e9..27946cbb 100644 --- a/Examples/CleanWithCQRS/HR.LeaveManagement.Persistence/LeaveManagementDbContext.cs +++ b/Examples/CleanWithCQRS/HR.LeaveManagement.Persistence/LeaveManagementDbContext.cs @@ -3,7 +3,6 @@ using Microsoft.EntityFrameworkCore; using RCommon; using RCommon.Entities; -using RCommon.Mediator; using RCommon.Security.Users; using System; using System.Collections.Generic; diff --git a/Examples/EventHandling/Examples.EventHandling.InMemoryEventBus/Examples.EventHandling.InMemoryEventBus.csproj b/Examples/EventHandling/Examples.EventHandling.InMemoryEventBus/Examples.EventHandling.InMemoryEventBus.csproj index 75a0461b..72373041 100644 --- a/Examples/EventHandling/Examples.EventHandling.InMemoryEventBus/Examples.EventHandling.InMemoryEventBus.csproj +++ b/Examples/EventHandling/Examples.EventHandling.InMemoryEventBus/Examples.EventHandling.InMemoryEventBus.csproj @@ -8,7 +8,7 @@ - + diff --git a/Examples/Examples.sln b/Examples/Examples.sln index d59cf860..f93bdbd4 100644 --- a/Examples/Examples.sln +++ b/Examples/Examples.sln @@ -93,8 +93,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.Messaging.MassTran EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.Messaging.Wolverine", "Messaging\Samples.Messaging.WolverineRabbitMq\Examples.Messaging.Wolverine.csproj", "{B792333E-245B-48F0-A88E-F36EEF1F7C11}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RCommon.EventHandling", "..\Src\RCommon.EventHandling\RCommon.EventHandling.csproj", "{8D143FCC-AD56-4CE7-9AFA-24144BFF1C56}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Providers", "Providers", "{3199F749-0082-41D0-91D3-ECED117F8B08}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RCommon.DotNet6.Tests", "..\Tests\RCommon.DotNet6.Tests\RCommon.DotNet6.Tests.csproj", "{B93C2373-7ADD-4D1F-B8CB-8FF32EAF364E}" @@ -271,10 +269,6 @@ Global {B792333E-245B-48F0-A88E-F36EEF1F7C11}.Debug|Any CPU.Build.0 = Debug|Any CPU {B792333E-245B-48F0-A88E-F36EEF1F7C11}.Release|Any CPU.ActiveCfg = Release|Any CPU {B792333E-245B-48F0-A88E-F36EEF1F7C11}.Release|Any CPU.Build.0 = Release|Any CPU - {8D143FCC-AD56-4CE7-9AFA-24144BFF1C56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D143FCC-AD56-4CE7-9AFA-24144BFF1C56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D143FCC-AD56-4CE7-9AFA-24144BFF1C56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D143FCC-AD56-4CE7-9AFA-24144BFF1C56}.Release|Any CPU.Build.0 = Release|Any CPU {B93C2373-7ADD-4D1F-B8CB-8FF32EAF364E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B93C2373-7ADD-4D1F-B8CB-8FF32EAF364E}.Debug|Any CPU.Build.0 = Debug|Any CPU {B93C2373-7ADD-4D1F-B8CB-8FF32EAF364E}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/Examples.Messaging.MassTransit.csproj b/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/Examples.Messaging.MassTransit.csproj index e18bf7d4..e7798218 100644 --- a/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/Examples.Messaging.MassTransit.csproj +++ b/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/Examples.Messaging.MassTransit.csproj @@ -8,7 +8,6 @@ - diff --git a/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/Program.cs b/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/Program.cs index ce5fcc00..d56dbd20 100644 --- a/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/Program.cs +++ b/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/Program.cs @@ -33,20 +33,13 @@ eventHandling.AddProducer(); eventHandling.AddSubscriber(); }); - + services.AddHostedService(); }).Build(); - Console.WriteLine("Example Starting"); - var eventProducers = host.Services.GetServices(); - var testEvent = new TestEvent(DateTime.Now, Guid.NewGuid()); - - foreach (var producer in eventProducers) - { - Console.WriteLine($"Producer: {producer}"); - await producer.ProduceEventAsync(testEvent); - } - Console.WriteLine("Example Complete"); - Console.ReadLine(); + + + + await host.RunAsync(); } catch (Exception ex) { diff --git a/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/TestEventHandler.cs b/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/TestEventHandler.cs index aa1b9c11..9c616965 100644 --- a/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/TestEventHandler.cs +++ b/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/TestEventHandler.cs @@ -19,6 +19,7 @@ public TestEventHandler() public async Task HandleAsync(TestEvent notification, CancellationToken cancellationToken = default) { Console.WriteLine("I just handled this event {0}", new object[] { notification.ToString() }); + Console.WriteLine("Example Complete"); await Task.CompletedTask; } } diff --git a/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/Worker.cs b/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/Worker.cs new file mode 100644 index 00000000..e7582148 --- /dev/null +++ b/Examples/Messaging/Samples.Messaging.MassTransitRabbitMq/Worker.cs @@ -0,0 +1,43 @@ +using MassTransit; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; +using RCommon.EventHandling.Producers; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; + +namespace Examples.Messaging.MassTransit +{ + public class Worker : BackgroundService + { + private readonly IServiceProvider _serviceProvider; + private readonly ILogger _logger; + + public Worker(ILogger logger, IServiceProvider serviceProvider) + { + _logger = logger; + _serviceProvider = serviceProvider; + } + + protected override async Task ExecuteAsync(CancellationToken stoppingToken) + { + while (!stoppingToken.IsCancellationRequested) + { + Console.WriteLine("Example Starting"); + var eventProducers = _serviceProvider.GetServices(); + var testEvent = new TestEvent(DateTime.Now, Guid.NewGuid()); + + foreach (var producer in eventProducers) + { + Console.WriteLine($"Producer: {producer}"); + await producer.ProduceEventAsync(testEvent); + } + await Task.Delay(5000, stoppingToken); + + } + } + } +} diff --git a/Src/RCommon.ApplicationServices/RCommon.ApplicationServices.csproj b/Src/RCommon.ApplicationServices/RCommon.ApplicationServices.csproj index 57a661fb..17d0dc69 100644 --- a/Src/RCommon.ApplicationServices/RCommon.ApplicationServices.csproj +++ b/Src/RCommon.ApplicationServices/RCommon.ApplicationServices.csproj @@ -10,7 +10,7 @@ A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. Jason Webb RCommon - 2.0.0.0 + 2.0.0.1 GitHub RCommon, application services, CQRS, auto web api, commands, command handlers, queries, query handlers, command bus, query bus, c#, .NET Apache-2.0 diff --git a/Src/RCommon.Authorization.Web/RCommon.Authorization.Web.csproj b/Src/RCommon.Authorization.Web/RCommon.Authorization.Web.csproj index d4fa0b8c..d4399453 100644 --- a/Src/RCommon.Authorization.Web/RCommon.Authorization.Web.csproj +++ b/Src/RCommon.Authorization.Web/RCommon.Authorization.Web.csproj @@ -2,7 +2,7 @@ net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. diff --git a/Src/RCommon.Core/Configuration/RCommonBuilder.cs b/Src/RCommon.Core/Configuration/RCommonBuilder.cs index da053687..99851809 100644 --- a/Src/RCommon.Core/Configuration/RCommonBuilder.cs +++ b/Src/RCommon.Core/Configuration/RCommonBuilder.cs @@ -1,6 +1,8 @@ using System; using Microsoft.Extensions.DependencyInjection; using System.Reflection; +using RCommon.EventHandling; +using RCommon.EventHandling.Producers; namespace RCommon { @@ -18,6 +20,10 @@ public RCommonBuilder(IServiceCollection services) { Guard.Against(services == null, "IServiceCollection cannot be null"); Services = services; + + // Event Bus + Services.AddSingleton(); // Set up default event bus + Services.AddSingleton(); } public IRCommonBuilder WithSequentialGuidGenerator(Action actions) diff --git a/Src/RCommon.EventHandling/EventHandlingBuilderExtensions.cs b/Src/RCommon.Core/EventHandling/EventHandlingBuilderExtensions.cs similarity index 91% rename from Src/RCommon.EventHandling/EventHandlingBuilderExtensions.cs rename to Src/RCommon.Core/EventHandling/EventHandlingBuilderExtensions.cs index cedaffe1..6a4f29d2 100644 --- a/Src/RCommon.EventHandling/EventHandlingBuilderExtensions.cs +++ b/Src/RCommon.Core/EventHandling/EventHandlingBuilderExtensions.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; +using RCommon.EventHandling; using RCommon.EventHandling.Producers; using RCommon.EventHandling.Subscribers; using System; @@ -10,7 +11,7 @@ using System.Threading; using System.Threading.Tasks; -namespace RCommon.EventHandling +namespace RCommon { public static class EventHandlingBuilderExtensions { @@ -23,13 +24,6 @@ public static IRCommonBuilder WithEventHandling(this IRCommonBuilder builder) public static IRCommonBuilder WithEventHandling(this IRCommonBuilder builder, Action actions) where T : IEventHandlingBuilder { - - // Event Bus - builder.Services.AddSingleton(); - - // Event Routing - builder.Services.AddTransient(); - // Event Handling Configurations var eventHandlingConfig = (T)Activator.CreateInstance(typeof(T), new object[] { builder }); actions(eventHandlingConfig); diff --git a/Src/RCommon.EventHandling/IAsyncEvent.cs b/Src/RCommon.Core/EventHandling/IAsyncEvent.cs similarity index 100% rename from Src/RCommon.EventHandling/IAsyncEvent.cs rename to Src/RCommon.Core/EventHandling/IAsyncEvent.cs diff --git a/Src/RCommon.EventHandling/IEventBus.cs b/Src/RCommon.Core/EventHandling/IEventBus.cs similarity index 100% rename from Src/RCommon.EventHandling/IEventBus.cs rename to Src/RCommon.Core/EventHandling/IEventBus.cs diff --git a/Src/RCommon.EventHandling/IEventHandlingBuilder.cs b/Src/RCommon.Core/EventHandling/IEventHandlingBuilder.cs similarity index 100% rename from Src/RCommon.EventHandling/IEventHandlingBuilder.cs rename to Src/RCommon.Core/EventHandling/IEventHandlingBuilder.cs diff --git a/Src/RCommon.EventHandling/ISerializableEvent.cs b/Src/RCommon.Core/EventHandling/ISerializableEvent.cs similarity index 100% rename from Src/RCommon.EventHandling/ISerializableEvent.cs rename to Src/RCommon.Core/EventHandling/ISerializableEvent.cs diff --git a/Src/RCommon.EventHandling/ISyncEvent.cs b/Src/RCommon.Core/EventHandling/ISyncEvent.cs similarity index 100% rename from Src/RCommon.EventHandling/ISyncEvent.cs rename to Src/RCommon.Core/EventHandling/ISyncEvent.cs diff --git a/Src/RCommon.EventHandling/InMemoryEventBus.cs b/Src/RCommon.Core/EventHandling/InMemoryEventBus.cs similarity index 100% rename from Src/RCommon.EventHandling/InMemoryEventBus.cs rename to Src/RCommon.Core/EventHandling/InMemoryEventBus.cs diff --git a/Src/RCommon.EventHandling/InMemoryEventBusBuilder.cs b/Src/RCommon.Core/EventHandling/InMemoryEventBusBuilder.cs similarity index 100% rename from Src/RCommon.EventHandling/InMemoryEventBusBuilder.cs rename to Src/RCommon.Core/EventHandling/InMemoryEventBusBuilder.cs diff --git a/Src/RCommon.EventHandling/Producers/EventRouter.cs b/Src/RCommon.Core/EventHandling/Producers/EventRouter.cs similarity index 89% rename from Src/RCommon.EventHandling/Producers/EventRouter.cs rename to Src/RCommon.Core/EventHandling/Producers/EventRouter.cs index 88044fb7..58a2a514 100644 --- a/Src/RCommon.EventHandling/Producers/EventRouter.cs +++ b/Src/RCommon.Core/EventHandling/Producers/EventRouter.cs @@ -15,12 +15,9 @@ public class EventRouter : IEventRouter { private readonly IServiceProvider _serviceProvider; - //private readonly IEventProducerRegistry _eventProducerRegistry; - public EventRouter(IServiceProvider serviceProvider) { this._serviceProvider = serviceProvider; - //_eventProducerRegistry = eventProducerRegistry ?? throw new ArgumentNullException(nameof(eventProducerRegistry)); } public async Task RouteEvents(IEnumerable localEvents) diff --git a/Src/RCommon.EventHandling/Producers/IEventProducer.cs b/Src/RCommon.Core/EventHandling/Producers/IEventProducer.cs similarity index 100% rename from Src/RCommon.EventHandling/Producers/IEventProducer.cs rename to Src/RCommon.Core/EventHandling/Producers/IEventProducer.cs diff --git a/Src/RCommon.EventHandling/Producers/IEventRouter.cs b/Src/RCommon.Core/EventHandling/Producers/IEventRouter.cs similarity index 100% rename from Src/RCommon.EventHandling/Producers/IEventRouter.cs rename to Src/RCommon.Core/EventHandling/Producers/IEventRouter.cs diff --git a/Src/RCommon.EventHandling/Producers/PublishWithEventBusEventProducer.cs b/Src/RCommon.Core/EventHandling/Producers/PublishWithEventBusEventProducer.cs similarity index 100% rename from Src/RCommon.EventHandling/Producers/PublishWithEventBusEventProducer.cs rename to Src/RCommon.Core/EventHandling/Producers/PublishWithEventBusEventProducer.cs diff --git a/Src/RCommon.EventHandling/Producers/UnsupportedEventProducerException.cs b/Src/RCommon.Core/EventHandling/Producers/UnsupportedEventProducerException.cs similarity index 100% rename from Src/RCommon.EventHandling/Producers/UnsupportedEventProducerException.cs rename to Src/RCommon.Core/EventHandling/Producers/UnsupportedEventProducerException.cs diff --git a/Src/RCommon.EventHandling/Subscribers/IDynamicDistributedEventHandler.cs b/Src/RCommon.Core/EventHandling/Subscribers/IDynamicDistributedEventHandler.cs similarity index 100% rename from Src/RCommon.EventHandling/Subscribers/IDynamicDistributedEventHandler.cs rename to Src/RCommon.Core/EventHandling/Subscribers/IDynamicDistributedEventHandler.cs diff --git a/Src/RCommon.EventHandling/Subscribers/ISubscriber.cs b/Src/RCommon.Core/EventHandling/Subscribers/ISubscriber.cs similarity index 100% rename from Src/RCommon.EventHandling/Subscribers/ISubscriber.cs rename to Src/RCommon.Core/EventHandling/Subscribers/ISubscriber.cs diff --git a/Src/RCommon.Core/RCommon.Core.csproj b/Src/RCommon.Core/RCommon.Core.csproj index 44c404d8..03ccc6fd 100644 --- a/Src/RCommon.Core/RCommon.Core.csproj +++ b/Src/RCommon.Core/RCommon.Core.csproj @@ -2,7 +2,7 @@ net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. @@ -26,7 +26,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/Src/RCommon.Dapper/RCommon.Dapper.csproj b/Src/RCommon.Dapper/RCommon.Dapper.csproj index bca88cab..cf5c6fbd 100644 --- a/Src/RCommon.Dapper/RCommon.Dapper.csproj +++ b/Src/RCommon.Dapper/RCommon.Dapper.csproj @@ -2,7 +2,7 @@ net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. diff --git a/Src/RCommon.EfCore/RCommon.EFCore.csproj b/Src/RCommon.EfCore/RCommon.EFCore.csproj index 381d1efe..aa800b09 100644 --- a/Src/RCommon.EfCore/RCommon.EFCore.csproj +++ b/Src/RCommon.EfCore/RCommon.EFCore.csproj @@ -3,7 +3,7 @@ enable net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. @@ -35,9 +35,8 @@ - - - + + diff --git a/Src/RCommon.EfCore/RCommonDbContext.cs b/Src/RCommon.EfCore/RCommonDbContext.cs index 8a97914b..96c8d194 100644 --- a/Src/RCommon.EfCore/RCommonDbContext.cs +++ b/Src/RCommon.EfCore/RCommonDbContext.cs @@ -3,7 +3,6 @@ using RCommon.Entities; using RCommon.Core.Threading; using RCommon.Persistence; -using RCommon.Mediator; using System; using System.Collections.Generic; using System.Data; diff --git a/Src/RCommon.Emailing/RCommon.Emailing.csproj b/Src/RCommon.Emailing/RCommon.Emailing.csproj index 589e46b5..73b13226 100644 --- a/Src/RCommon.Emailing/RCommon.Emailing.csproj +++ b/Src/RCommon.Emailing/RCommon.Emailing.csproj @@ -13,7 +13,7 @@ RCommon, emailing, email abstractions, smtp true GitHub - 2.0.0.0 + 2.0.0.1 Apache-2.0 diff --git a/Src/RCommon.Entities/InMemoryEventTracker.cs b/Src/RCommon.Entities/InMemoryEventTracker.cs index 6cfe4a63..fd1de29e 100644 --- a/Src/RCommon.Entities/InMemoryEventTracker.cs +++ b/Src/RCommon.Entities/InMemoryEventTracker.cs @@ -1,5 +1,4 @@ using RCommon.EventHandling.Producers; -using RCommon.Mediator; using System; using System.Collections.Generic; using System.Linq; diff --git a/Src/RCommon.Entities/RCommon.Entities.csproj b/Src/RCommon.Entities/RCommon.Entities.csproj index dd0354ed..6649257e 100644 --- a/Src/RCommon.Entities/RCommon.Entities.csproj +++ b/Src/RCommon.Entities/RCommon.Entities.csproj @@ -2,7 +2,7 @@ net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. @@ -20,8 +20,6 @@ - - diff --git a/Src/RCommon.EventHandling/RCommon.EventHandling.csproj b/Src/RCommon.EventHandling/RCommon.EventHandling.csproj deleted file mode 100644 index 5da95ba1..00000000 --- a/Src/RCommon.EventHandling/RCommon.EventHandling.csproj +++ /dev/null @@ -1,51 +0,0 @@ - - - - net6.0;net7.0;net8.0; - 2.0.0.0 - Jason Webb - RCommon - A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. - - https://github.com/Reactor2Team/RCommon - https://github.com/Reactor2Team/RCommon - rcommon-icon.png - RCommon, event handling, event bus, event producer, event subscribers, pub/sub, distributed events, c#, .NET - true - 2.0.0.0 - 2.0.0.0 - - Apache-2.0 - - - - - \ - True - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Src/RCommon.Linq2Db/RCommon.Linq2Db.csproj b/Src/RCommon.Linq2Db/RCommon.Linq2Db.csproj index eb50af65..99993373 100644 --- a/Src/RCommon.Linq2Db/RCommon.Linq2Db.csproj +++ b/Src/RCommon.Linq2Db/RCommon.Linq2Db.csproj @@ -2,7 +2,7 @@ net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. diff --git a/Src/RCommon.Linq2Db/RCommonDataConnection.cs b/Src/RCommon.Linq2Db/RCommonDataConnection.cs index edc7e23c..75af0681 100644 --- a/Src/RCommon.Linq2Db/RCommonDataConnection.cs +++ b/Src/RCommon.Linq2Db/RCommonDataConnection.cs @@ -4,7 +4,6 @@ using Microsoft.Extensions.Options; using RCommon.Entities; using RCommon.Persistence; -using RCommon.Mediator; using System; using System.Collections.Generic; using System.Data.Common; diff --git a/Src/RCommon.MassTransit/Producers/PublishWithMassTransitEventProducer.cs b/Src/RCommon.MassTransit/Producers/PublishWithMassTransitEventProducer.cs index 27028020..bdd7c36a 100644 --- a/Src/RCommon.MassTransit/Producers/PublishWithMassTransitEventProducer.cs +++ b/Src/RCommon.MassTransit/Producers/PublishWithMassTransitEventProducer.cs @@ -11,12 +11,10 @@ namespace RCommon.MassTransit.Producers { public class PublishWithMassTransitEventProducer : IEventProducer { - //private readonly IPublishEndpoint _publishEndpoint; private readonly IBus _bus; public PublishWithMassTransitEventProducer(IBus bus) { - // _publishEndpoint = publishEndpoint; _bus = bus; } diff --git a/Src/RCommon.MassTransit/RCommon.MassTransit.csproj b/Src/RCommon.MassTransit/RCommon.MassTransit.csproj index 9ea3263f..faff7dbf 100644 --- a/Src/RCommon.MassTransit/RCommon.MassTransit.csproj +++ b/Src/RCommon.MassTransit/RCommon.MassTransit.csproj @@ -1,8 +1,8 @@ - + net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. @@ -28,11 +28,11 @@ - + - + diff --git a/Src/RCommon.Mediator/RCommon.Mediator.csproj b/Src/RCommon.Mediator/RCommon.Mediator.csproj index ce7528f1..622592c9 100644 --- a/Src/RCommon.Mediator/RCommon.Mediator.csproj +++ b/Src/RCommon.Mediator/RCommon.Mediator.csproj @@ -2,7 +2,7 @@ net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. @@ -11,7 +11,7 @@ https://github.com/Reactor2Team/RCommon rcommon-icon.png RCommon, language extensions, generic factories, abstractions, c#, .NET - false + true 2.0.0.0 2.0.0.0 @@ -36,9 +36,8 @@ - - - - + + + diff --git a/Src/RCommon.Mediatr/RCommon.MediatR.csproj b/Src/RCommon.Mediatr/RCommon.MediatR.csproj index da4b774e..3fe05d2b 100644 --- a/Src/RCommon.Mediatr/RCommon.MediatR.csproj +++ b/Src/RCommon.Mediatr/RCommon.MediatR.csproj @@ -2,7 +2,7 @@ net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. diff --git a/Src/RCommon.Models/RCommon.Models.csproj b/Src/RCommon.Models/RCommon.Models.csproj index fbcb7b30..a0c929af 100644 --- a/Src/RCommon.Models/RCommon.Models.csproj +++ b/Src/RCommon.Models/RCommon.Models.csproj @@ -2,7 +2,7 @@ net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. diff --git a/Src/RCommon.Persistence/RCommon.Persistence.csproj b/Src/RCommon.Persistence/RCommon.Persistence.csproj index 10d42187..066feb0e 100644 --- a/Src/RCommon.Persistence/RCommon.Persistence.csproj +++ b/Src/RCommon.Persistence/RCommon.Persistence.csproj @@ -2,7 +2,7 @@ net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. diff --git a/Src/RCommon.Persistence/Sql/RDbConnection.cs b/Src/RCommon.Persistence/Sql/RDbConnection.cs index 4f37f867..8935938f 100644 --- a/Src/RCommon.Persistence/Sql/RDbConnection.cs +++ b/Src/RCommon.Persistence/Sql/RDbConnection.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.Extensions.Options; using RCommon.Entities; -using RCommon.Mediator; namespace RCommon.Persistence.Sql { diff --git a/Src/RCommon.Security/RCommon.Security.csproj b/Src/RCommon.Security/RCommon.Security.csproj index 05082992..58226c77 100644 --- a/Src/RCommon.Security/RCommon.Security.csproj +++ b/Src/RCommon.Security/RCommon.Security.csproj @@ -2,7 +2,7 @@ net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. diff --git a/Src/RCommon.SendGrid/RCommon.SendGrid.csproj b/Src/RCommon.SendGrid/RCommon.SendGrid.csproj index a9b76396..52c7279f 100644 --- a/Src/RCommon.SendGrid/RCommon.SendGrid.csproj +++ b/Src/RCommon.SendGrid/RCommon.SendGrid.csproj @@ -14,13 +14,13 @@ RCommon, emailing, sendgrid true GitHub - 2.0.0.0 + 2.0.0.1 Apache-2.0 - + diff --git a/Src/RCommon.Web/RCommon.Web.csproj b/Src/RCommon.Web/RCommon.Web.csproj index d74a4209..e44736ec 100644 --- a/Src/RCommon.Web/RCommon.Web.csproj +++ b/Src/RCommon.Web/RCommon.Web.csproj @@ -2,7 +2,7 @@ net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. @@ -27,7 +27,7 @@ - + diff --git a/Src/RCommon.Wolverine/RCommon.Wolverine.csproj b/Src/RCommon.Wolverine/RCommon.Wolverine.csproj index 0e8c940a..2b16db62 100644 --- a/Src/RCommon.Wolverine/RCommon.Wolverine.csproj +++ b/Src/RCommon.Wolverine/RCommon.Wolverine.csproj @@ -2,7 +2,7 @@ net6.0;net7.0;net8.0; - 2.0.0.0 + 2.0.0.1 Jason Webb RCommon A cohesive set of infrastructure libraries for .NET 6, .NET 7, and .NET 8 that utilizes abstractions for persistence, unit of work/transactions, distributed events, distributed transactions, and more. @@ -34,16 +34,15 @@ - + - + - diff --git a/Src/RCommon.sln b/Src/RCommon.sln index 3e77ada9..7352d80f 100644 --- a/Src/RCommon.sln +++ b/Src/RCommon.sln @@ -71,8 +71,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RCommon.Wolverine", "RCommo EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Event Handling", "Event Handling", "{6D73446A-6E32-4324-B524-E054334B394B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RCommon.EventHandling", "RCommon.EventHandling\RCommon.EventHandling.csproj", "{ACD50AC9-613C-4DAD-8576-440CB85159BC}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -179,10 +177,6 @@ Global {397769BB-08F3-44DE-9BE6-90A73E0ABB76}.Debug|Any CPU.Build.0 = Debug|Any CPU {397769BB-08F3-44DE-9BE6-90A73E0ABB76}.Release|Any CPU.ActiveCfg = Release|Any CPU {397769BB-08F3-44DE-9BE6-90A73E0ABB76}.Release|Any CPU.Build.0 = Release|Any CPU - {ACD50AC9-613C-4DAD-8576-440CB85159BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACD50AC9-613C-4DAD-8576-440CB85159BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACD50AC9-613C-4DAD-8576-440CB85159BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACD50AC9-613C-4DAD-8576-440CB85159BC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -210,7 +204,6 @@ Global {CEDE1A60-3F6C-4F16-AC75-4477A646AD0D} = {EF78B8EE-80FF-45DE-9B82-352953B361A8} {FC484848-D719-4AAD-91B0-EDDC434F946E} = {EF78B8EE-80FF-45DE-9B82-352953B361A8} {397769BB-08F3-44DE-9BE6-90A73E0ABB76} = {6D73446A-6E32-4324-B524-E054334B394B} - {ACD50AC9-613C-4DAD-8576-440CB85159BC} = {6D73446A-6E32-4324-B524-E054334B394B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0B0CD26D-8067-4667-863E-6B0EE7EDAA42} diff --git a/Tests/RCommon.DotNet6.Tests/RCommon.DotNet6.Tests.csproj b/Tests/RCommon.DotNet6.Tests/RCommon.DotNet6.Tests.csproj index 47221121..97872e38 100644 --- a/Tests/RCommon.DotNet6.Tests/RCommon.DotNet6.Tests.csproj +++ b/Tests/RCommon.DotNet6.Tests/RCommon.DotNet6.Tests.csproj @@ -9,9 +9,9 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -25,7 +25,6 @@ - diff --git a/Tests/RCommon.DotNet7.Tests/RCommon.DotNet7.Tests.csproj b/Tests/RCommon.DotNet7.Tests/RCommon.DotNet7.Tests.csproj index 920b06f9..1bc66911 100644 --- a/Tests/RCommon.DotNet7.Tests/RCommon.DotNet7.Tests.csproj +++ b/Tests/RCommon.DotNet7.Tests/RCommon.DotNet7.Tests.csproj @@ -10,13 +10,13 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -30,7 +30,6 @@ - diff --git a/Tests/RCommon.DotNet8.Tests/RCommon.DotNet8.Tests.csproj b/Tests/RCommon.DotNet8.Tests/RCommon.DotNet8.Tests.csproj index 2f62e146..8359d838 100644 --- a/Tests/RCommon.DotNet8.Tests/RCommon.DotNet8.Tests.csproj +++ b/Tests/RCommon.DotNet8.Tests/RCommon.DotNet8.Tests.csproj @@ -11,13 +11,16 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + all runtime; build; native; contentfiles; analyzers; buildtransitive - @@ -28,7 +31,6 @@ - diff --git a/Tests/RCommon.Emailing.SendGrid.Tests/RCommon.Emailing.SendGrid.Tests.csproj b/Tests/RCommon.Emailing.SendGrid.Tests/RCommon.Emailing.SendGrid.Tests.csproj index e2ae468d..cb97ddd7 100644 --- a/Tests/RCommon.Emailing.SendGrid.Tests/RCommon.Emailing.SendGrid.Tests.csproj +++ b/Tests/RCommon.Emailing.SendGrid.Tests/RCommon.Emailing.SendGrid.Tests.csproj @@ -8,16 +8,16 @@ - + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Tests/RCommon.Emailing.Tests/RCommon.Emailing.Tests.csproj b/Tests/RCommon.Emailing.Tests/RCommon.Emailing.Tests.csproj index 1a320d02..dd4053af 100644 --- a/Tests/RCommon.Emailing.Tests/RCommon.Emailing.Tests.csproj +++ b/Tests/RCommon.Emailing.Tests/RCommon.Emailing.Tests.csproj @@ -1,4 +1,4 @@ - + net8.0; @@ -8,15 +8,15 @@ - + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Tests/RCommon.Mediator.MediatR.Tests/RCommon.Mediator.MediatR.Tests.csproj b/Tests/RCommon.Mediator.MediatR.Tests/RCommon.Mediator.MediatR.Tests.csproj index 048c3ead..34c53a27 100644 --- a/Tests/RCommon.Mediator.MediatR.Tests/RCommon.Mediator.MediatR.Tests.csproj +++ b/Tests/RCommon.Mediator.MediatR.Tests/RCommon.Mediator.MediatR.Tests.csproj @@ -1,4 +1,4 @@ - + net8.0; @@ -9,16 +9,16 @@ - - + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Tests/RCommon.Messaging.MassTransit.Tests/RCommon.Messaging.MassTransit.Tests.csproj b/Tests/RCommon.Messaging.MassTransit.Tests/RCommon.Messaging.MassTransit.Tests.csproj index 9480eddc..cac74dca 100644 --- a/Tests/RCommon.Messaging.MassTransit.Tests/RCommon.Messaging.MassTransit.Tests.csproj +++ b/Tests/RCommon.Messaging.MassTransit.Tests/RCommon.Messaging.MassTransit.Tests.csproj @@ -9,15 +9,14 @@ - - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Tests/RCommon.Messaging.Wolverine.Tests/RCommon.Messaging.Wolverine.Tests.csproj b/Tests/RCommon.Messaging.Wolverine.Tests/RCommon.Messaging.Wolverine.Tests.csproj index fd6185af..1b033561 100644 --- a/Tests/RCommon.Messaging.Wolverine.Tests/RCommon.Messaging.Wolverine.Tests.csproj +++ b/Tests/RCommon.Messaging.Wolverine.Tests/RCommon.Messaging.Wolverine.Tests.csproj @@ -10,13 +10,13 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Tests/RCommon.Persistence.Dapper.Tests/RCommon.Persistence.Dapper.Tests.csproj b/Tests/RCommon.Persistence.Dapper.Tests/RCommon.Persistence.Dapper.Tests.csproj index efe72375..41c7122b 100644 --- a/Tests/RCommon.Persistence.Dapper.Tests/RCommon.Persistence.Dapper.Tests.csproj +++ b/Tests/RCommon.Persistence.Dapper.Tests/RCommon.Persistence.Dapper.Tests.csproj @@ -7,22 +7,22 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/Tests/RCommon.Persistence.Dapper.Tests/TestDbConnection.cs b/Tests/RCommon.Persistence.Dapper.Tests/TestDbConnection.cs index bbc4978e..112aa9d0 100644 --- a/Tests/RCommon.Persistence.Dapper.Tests/TestDbConnection.cs +++ b/Tests/RCommon.Persistence.Dapper.Tests/TestDbConnection.cs @@ -2,7 +2,6 @@ using Microsoft.Extensions.Options; using RCommon.Entities; using RCommon.Persistence.Sql; -using RCommon.Mediator; using System; using System.Collections.Generic; using System.Text; diff --git a/Tests/RCommon.Persistence.EFCore.Tests/RCommon.Persistence.EFCore.Tests.csproj b/Tests/RCommon.Persistence.EFCore.Tests/RCommon.Persistence.EFCore.Tests.csproj index 3159f759..a26fc29a 100644 --- a/Tests/RCommon.Persistence.EFCore.Tests/RCommon.Persistence.EFCore.Tests.csproj +++ b/Tests/RCommon.Persistence.EFCore.Tests/RCommon.Persistence.EFCore.Tests.csproj @@ -9,12 +9,12 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Tests/RCommon.Persistence.Linq2Db.Tests/RCommon.Persistence.Linq2Db.Tests.csproj b/Tests/RCommon.Persistence.Linq2Db.Tests/RCommon.Persistence.Linq2Db.Tests.csproj index 3e6a25e4..f44c9aef 100644 --- a/Tests/RCommon.Persistence.Linq2Db.Tests/RCommon.Persistence.Linq2Db.Tests.csproj +++ b/Tests/RCommon.Persistence.Linq2Db.Tests/RCommon.Persistence.Linq2Db.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/Tests/RCommon.Persistence.Linq2Db.Tests/TestDataConnection.cs b/Tests/RCommon.Persistence.Linq2Db.Tests/TestDataConnection.cs index eb4ef91b..9f0e2cfe 100644 --- a/Tests/RCommon.Persistence.Linq2Db.Tests/TestDataConnection.cs +++ b/Tests/RCommon.Persistence.Linq2Db.Tests/TestDataConnection.cs @@ -2,7 +2,6 @@ using LinqToDB.Configuration; using Microsoft.Extensions.Options; using RCommon.Entities; -using RCommon.Mediator; using RCommon.TestBase.Entities; using System; using System.Collections.Generic; diff --git a/Tests/RCommon.Security.Tests/RCommon.Security.Tests.csproj b/Tests/RCommon.Security.Tests/RCommon.Security.Tests.csproj index 002e0be3..85046e8b 100644 --- a/Tests/RCommon.Security.Tests/RCommon.Security.Tests.csproj +++ b/Tests/RCommon.Security.Tests/RCommon.Security.Tests.csproj @@ -8,7 +8,7 @@ - + @@ -19,7 +19,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/RCommon.TestBase.Data/EFConfigurations/TestDbContext.cs b/Tests/RCommon.TestBase.Data/EFConfigurations/TestDbContext.cs index fad0a53b..fdf90947 100644 --- a/Tests/RCommon.TestBase.Data/EFConfigurations/TestDbContext.cs +++ b/Tests/RCommon.TestBase.Data/EFConfigurations/TestDbContext.cs @@ -23,7 +23,6 @@ using Microsoft.Extensions.Logging.Console; using RCommon.Entities; using RCommon.Persistence; -using RCommon.Mediator; using RCommon.Persistence.EFCore; using RCommon.TestBase; using RCommon.TestBase.Entities; diff --git a/Tests/RCommon.TestBase.Data/RCommon.TestBase.Data.csproj b/Tests/RCommon.TestBase.Data/RCommon.TestBase.Data.csproj index da42ca47..93d92847 100644 --- a/Tests/RCommon.TestBase.Data/RCommon.TestBase.Data.csproj +++ b/Tests/RCommon.TestBase.Data/RCommon.TestBase.Data.csproj @@ -7,12 +7,12 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Tests/RCommon.TestBase/RCommon.TestBase.csproj b/Tests/RCommon.TestBase/RCommon.TestBase.csproj index 83e6765f..dbe1c7da 100644 --- a/Tests/RCommon.TestBase/RCommon.TestBase.csproj +++ b/Tests/RCommon.TestBase/RCommon.TestBase.csproj @@ -7,7 +7,7 @@ - +