Dev

Build/Build.cs

@@ -130,11 +130,12 @@ protected override void OnBuildInitialized()
 
     Target Pack => _ => _
         .DependsOn(Compile)
+        .Requires(() => GitRepository.IsOnMainBranch())
         .Executes(() =>
         {
             Log.Information("Generating NuGet packages for projects in solution");
             int commitNum = 0;
-            string NuGetVersionCustom = "2.0.0.869";
+            string NuGetVersionCustom = "2.0.0.870";
 
 
             //if it's not a tagged release - append the commit number to the package version
@@ -157,8 +158,7 @@ protected override void OnBuildInitialized()
             {
                 Log.Information("Project: {0}", project.Name);
             }
-            //Log.Information("Project: {0}", Solution.GetProject("RCommon.Emailing"));
-            //var path = projects.FirstOrDefault(x => x.Name == "RCommon.Emailing").Path.ToString();
+
             DotNetTasks
                 .DotNetPack(_ => _
                     .SetPackageId("RCommon.Emailing")
@@ -470,6 +470,7 @@ protected override void OnBuildInitialized()
 
     Target Push => _ => _
        .DependsOn(Pack)
+       .Requires(() => GitRepository.IsOnMainBranch())
        .Requires(() => NuGetApiUrl)
        .Requires(() => NUGETAPIKEY)
        .Requires(() => Configuration.Equals(Configuration.Release))

Src/RCommon.Core/Configuration/RCommonBuilder.cs

@@ -22,7 +22,7 @@ public RCommonBuilder(IServiceCollection services)
             Services = services;
 
             // Event Bus
-            services.AddScoped<IEventBus>(sp =>
+            services.AddSingleton<IEventBus>(sp =>
             {
                 return new InMemoryEventBus(sp, services);
             });

Src/RCommon.Core/EventHandling/InMemoryEventBusBuilder.cs

@@ -14,11 +14,6 @@ public InMemoryEventBusBuilder(IRCommonBuilder builder)
         {
             Services = builder.Services;
 
-            /*builder.Services.AddSingleton<IEventBus>(sp =>
-            {
-                return new InMemoryEventBus(sp, builder.Services);
-            });*/
-
         }
 
         public IServiceCollection Services { get; }

Src/RCommon.Core/EventHandling/Producers/PublishWithEventBusEventProducer.cs

@@ -18,11 +18,14 @@ public PublishWithEventBusEventProducer(IEventBus eventBus, ILogger<PublishWithE
             _eventBus = eventBus ?? throw new ArgumentNullException(nameof(eventBus));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
+
         public async Task ProduceEventAsync<T>(T @event, CancellationToken cancellationToken = default) 
             where T : ISerializableEvent
         {
             Guard.IsNotNull(@event, nameof(@event));
-            _logger.LogInformation("{0} publishing event: {1}", new object[] { this.GetGenericTypeName(), @event });
+            _logger.LogInformation("{0} publishing event: {1}", new object[] { this.GetGenericTypeName(), @event.GetGenericTypeName() });
+
+            // This should already be using a Scoped publish method
             await _eventBus.PublishAsync(@event);
         }
     }

Src/RCommon.Core/Extensions/ILoggerExtensions.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using System.Diagnostics;
+
+namespace Microsoft.Extensions.Logging
+{
+    public static class ILoggerExtensions
+    {
+
+        public static void LogInformation(this ILogger logger, string? message, object[]? @params, bool outputToConsole = false)
+        {
+            logger.LogInformation(message, @params);
+
+            if (outputToConsole)
+            {
+                OutputToConsole(message, @params);
+            }
+        }
+
+        public static void LogInformation(this ILogger logger, EventId eventId, string? message, object[]? @params, bool outputToConsole = false)
+        {
+            logger.LogInformation(eventId, message, @params);
+
+            if (outputToConsole)
+            {
+                OutputToConsole(message, @params);
+            }
+        }
+
+        public static void LogInformation(this ILogger logger, Exception exception, string? message, object[]? @params, bool outputToConsole = false)
+        {
+            logger.LogInformation(exception, message, @params);
+
+            if (outputToConsole)
+            {
+                OutputToConsole(message, @params);
+            }
+        }
+
+        public static void LogInformation(this ILogger logger, EventId eventId, Exception exception, string? message, object[]? @params, bool outputToConsole = false)
+        {
+            logger.LogInformation(eventId, exception, message, @params);
+
+            if (outputToConsole)
+            {
+                OutputToConsole(message, @params);
+            }
+        }
+
+        private static void OutputToConsole(string? message, object[]? @params)
+        {
+            System.Console.WriteLine(message, @params);
+        }
+    }
+}

Src/RCommon.MassTransit/MassTransitEventHandlingBuilderExtensions.cs

@@ -74,8 +74,8 @@ public static IRCommonBuilder WithEventHandling<T>(this IRCommonBuilder builder,
         {
 
             // MassTransit Event Bus
-            builder.Services.AddTransient(typeof(IMassTransitEventHandler<>), typeof(MassTransitEventHandler<>));
-            builder.Services.AddTransient(typeof(MassTransitEventHandler<>));
+            builder.Services.AddScoped(typeof(IMassTransitEventHandler<>), typeof(MassTransitEventHandler<>));
+            builder.Services.AddScoped(typeof(MassTransitEventHandler<>));
             builder.AddMassTransit(actions);
 
             return builder;

Src/RCommon.MassTransit/Producers/PublishWithMassTransitEventProducer.cs

@@ -1,4 +1,5 @@
 using MassTransit;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using RCommon.EventHandling;
 using RCommon.EventHandling.Producers;
@@ -14,18 +15,24 @@ public class PublishWithMassTransitEventProducer : IEventProducer
     {
         private readonly IBus _bus;
         private readonly ILogger<PublishWithMassTransitEventProducer> _logger;
+        private readonly IServiceProvider _serviceProvider;
 
-        public PublishWithMassTransitEventProducer(IBus bus, ILogger<PublishWithMassTransitEventProducer> logger)
+        public PublishWithMassTransitEventProducer(IBus bus, ILogger<PublishWithMassTransitEventProducer> logger, IServiceProvider serviceProvider)
         {
             _bus = bus ?? throw new ArgumentNullException(nameof(bus));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
         }
 
         public async Task ProduceEventAsync<T>(T @event, CancellationToken cancellationToken = default) where T : ISerializableEvent
         {
             Guard.IsNotNull(@event, nameof(@event));
-            _logger.LogInformation("{0} publishing event: {1}", new object[] { this.GetGenericTypeName(), @event });
-            await _bus.Publish(@event, cancellationToken);
+
+            using (IServiceScope scope = _serviceProvider.CreateScope())
+            {
+                _logger.LogInformation("{0} publishing event: {1}", new object[] { this.GetGenericTypeName(), @event });
+                await _bus.Publish(@event, cancellationToken);
+            }
         }
     }
 }

Src/RCommon.MassTransit/Producers/SendWithMassTransitEventProducer.cs

@@ -1,4 +1,5 @@
 using MassTransit;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using RCommon.EventHandling;
 using RCommon.EventHandling.Producers;
@@ -15,18 +16,23 @@ public class SendWithMassTransitEventProducer : IEventProducer
 
         private readonly IBus _bus;
         private readonly ILogger<PublishWithMassTransitEventProducer> _logger;
+        private readonly IServiceProvider _serviceProvider;
 
-        public SendWithMassTransitEventProducer(IBus bus, ILogger<PublishWithMassTransitEventProducer> logger)
+        public SendWithMassTransitEventProducer(IBus bus, ILogger<PublishWithMassTransitEventProducer> logger, IServiceProvider serviceProvider)
         {
             _bus = bus ?? throw new ArgumentNullException(nameof(bus));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
         }
 
         public async Task ProduceEventAsync<T>(T @event, CancellationToken cancellationToken = default) where T : ISerializableEvent
         {
             Guard.IsNotNull(@event, nameof(@event));
-            _logger.LogInformation("{0} sending event: {1}", new object[] { this.GetGenericTypeName(), @event });
-            await _bus.Send(@event, cancellationToken);
+            using (IServiceScope scope = _serviceProvider.CreateScope())
+            {
+                _logger.LogInformation("{0} sending event: {1}", new object[] { this.GetGenericTypeName(), @event });
+                await _bus.Send(@event, cancellationToken);
+            }
         }
     }
 }

Src/RCommon.MassTransit/Subscribers/MassTransitEventHandler.cs

@@ -1,4 +1,5 @@
 using MassTransit;
+using Microsoft.Extensions.Logging;
 using RCommon.EventHandling;
 using RCommon.EventHandling.Subscribers;
 using System;
@@ -12,16 +13,18 @@ namespace RCommon.MassTransit.Subscribers
     public class MassTransitEventHandler<TEvent> : IMassTransitEventHandler<TEvent>, IConsumer<TEvent>
         where TEvent : class, ISerializableEvent
     {
+        private readonly ILogger<MassTransitEventHandler<TEvent>> _logger;
         private readonly ISubscriber<TEvent> _subscriber;
 
-        public MassTransitEventHandler(ISubscriber<TEvent> subscriber)
+        public MassTransitEventHandler(ILogger<MassTransitEventHandler<TEvent>> logger, ISubscriber<TEvent> subscriber)
         {
-            _subscriber = subscriber;
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _subscriber = subscriber ?? throw new ArgumentNullException(nameof(subscriber));
         }
 
         public async Task Consume(ConsumeContext<TEvent> context)
         {
-            Console.WriteLine("{0} handling event {1} from MassTransit", new object[] { this.GetGenericTypeName(), context.Message });
+            _logger.LogDebug("{0} handling event {1}", new object[] { this.GetGenericTypeName(), context.Message });
             await _subscriber.HandleAsync(context.Message);
         }
     }

Src/RCommon.Mediatr/Producers/PublishWithMediatREventProducer.cs

@@ -1,4 +1,5 @@
 using MediatR;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using RCommon.EventHandling;
 using RCommon.EventHandling.Producers;
@@ -16,19 +17,24 @@ public class PublishWithMediatREventProducer : IEventProducer
     {
         private readonly IMediatorService _mediatorService;
         private readonly ILogger<PublishWithMediatREventProducer> _logger;
+        private readonly IServiceProvider _serviceProvider;
 
-        public PublishWithMediatREventProducer(IMediatorService mediatorService, ILogger<PublishWithMediatREventProducer> logger)
+        public PublishWithMediatREventProducer(IMediatorService mediatorService, ILogger<PublishWithMediatREventProducer> logger, IServiceProvider serviceProvider)
         {
             _mediatorService = mediatorService ?? throw new ArgumentNullException(nameof(mediatorService));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
         }
 
         public async Task ProduceEventAsync<TEvent>(TEvent @event, CancellationToken cancellationToken = default)
             where TEvent : ISerializableEvent
         {
             Guard.IsNotNull(@event, nameof(@event));
-            _logger.LogInformation("{0} publishing event: {1}", new object[] { this.GetGenericTypeName(), @event });
-            await _mediatorService.Publish(@event, cancellationToken);
+            using (IServiceScope scope = _serviceProvider.CreateScope())
+            {
+                _logger.LogInformation("{0} publishing event: {1}", new object[] { this.GetGenericTypeName(), @event.GetGenericTypeName() });
+                await _mediatorService.Publish(@event, cancellationToken);
+            }
         }
     }
 }

Src/RCommon.Mediatr/Producers/SendWithMediatREventProducer.cs

@@ -9,26 +9,32 @@
 using RCommon.MediatR.Subscribers;
 using RCommon.Mediator;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace RCommon.MediatR.Producers
 {
     public class SendWithMediatREventProducer : IEventProducer
     {
         private readonly IMediatorService _mediatorService;
         private readonly ILogger<SendWithMediatREventProducer> _logger;
+        private readonly IServiceProvider _serviceProvider;
 
-        public SendWithMediatREventProducer(IMediatorService mediatorService, ILogger<SendWithMediatREventProducer> logger)
+        public SendWithMediatREventProducer(IMediatorService mediatorService, ILogger<SendWithMediatREventProducer> logger, IServiceProvider serviceProvider)
         {
             _mediatorService = mediatorService ?? throw new ArgumentNullException(nameof(mediatorService));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
         }
 
         public async Task ProduceEventAsync<TEvent>(TEvent @event, CancellationToken cancellationToken = default) 
             where TEvent : ISerializableEvent
         {
             Guard.IsNotNull(@event, nameof(@event));
-            _logger.LogInformation("{0} sending event: {1}", new object[] { this.GetGenericTypeName(), @event });
-            await _mediatorService.Send(@event, cancellationToken);
+            using (IServiceScope scope = _serviceProvider.CreateScope())
+            {
+                _logger.LogInformation("{0} sending event: {1}", new object[] { this.GetGenericTypeName(), @event.GetGenericTypeName() });
+                await _mediatorService.Send(@event, cancellationToken);
+            }
         }
     }
 }

Src/RCommon.Wolverine/Producers/PublishWithWolverineEventProducer.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Configuration;
 using RCommon.EventHandling;
 using RCommon.EventHandling.Producers;
@@ -15,18 +16,23 @@ public class PublishWithWolverineEventProducer : IEventProducer
     {
         private readonly IMessageBus _messageBus;
         private readonly ILogger<PublishWithWolverineEventProducer> _logger;
+        private readonly IServiceProvider _serviceProvider;
 
-        public PublishWithWolverineEventProducer(IMessageBus messageBus, ILogger<PublishWithWolverineEventProducer> logger)
+        public PublishWithWolverineEventProducer(IMessageBus messageBus, ILogger<PublishWithWolverineEventProducer> logger, IServiceProvider serviceProvider)
         {
             _messageBus = messageBus ?? throw new ArgumentNullException(nameof(messageBus));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
         } 
 
         public async Task ProduceEventAsync<T>(T @event, CancellationToken cancellationToken = default) where T : ISerializableEvent
         {
             Guard.IsNotNull(@event, nameof(@event));
-            _logger.LogInformation("{0} publishing event: {1}", new object[] { this.GetGenericTypeName(), @event });
-            await _messageBus.PublishAsync<T>(@event);
+            using (IServiceScope scope = _serviceProvider.CreateScope())
+            {
+                _logger.LogInformation("{0} publishing event: {1}", new object[] { this.GetGenericTypeName(), @event.GetGenericTypeName() });
+                await _messageBus.PublishAsync<T>(@event);
+            }
         }
     }
 }

Src/RCommon.Wolverine/Producers/SendWithWolverineEventProducer.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using RCommon.EventHandling;
 using RCommon.EventHandling.Producers;
 using System;
@@ -14,19 +15,24 @@ public class SendWithWolverineEventProducer : IEventProducer
     {
         private readonly IMessageBus _messageBus;
         private readonly ILogger<SendWithWolverineEventProducer> _logger;
+        private readonly IServiceProvider _serviceProvider;
 
-        public SendWithWolverineEventProducer(IMessageBus messageBus, ILogger<SendWithWolverineEventProducer> logger)
+        public SendWithWolverineEventProducer(IMessageBus messageBus, ILogger<SendWithWolverineEventProducer> logger, IServiceProvider serviceProvider)
         {
             _messageBus = messageBus ?? throw new ArgumentNullException(nameof(messageBus));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
         }
 
 
         public async Task ProduceEventAsync<T>(T @event, CancellationToken cancellationToken = default) where T : ISerializableEvent
         {
             Guard.IsNotNull(@event, nameof(@event));
-            _logger.LogInformation("{0} sending event: {1}", new object[] { this.GetGenericTypeName(), @event });
-            await _messageBus.SendAsync(@event);
+            using (IServiceScope scope = _serviceProvider.CreateScope())
+            {
+                _logger.LogInformation("{0} sending event: {1}", new object[] { this.GetGenericTypeName(), @event.GetGenericTypeName() });
+                await _messageBus.SendAsync(@event);
+            }
         }
     }
 }