Messagebus dispatch messages in its own scope

src/BuildingBlocks/EventBus/EventBus.Tests/InMemory_SubscriptionManager_Tests.cs

@@ -18,7 +18,7 @@ namespace EventBus.Tests
         public void After_One_Event_Subscription_Should_Contain_The_Event()
         {
             var manager = new InMemoryEventBusSubscriptionsManager();
-            manager.AddSubscription<TestIntegrationEvent,TestIntegrationEventHandler>(() => new TestIntegrationEventHandler());
+            manager.AddSubscription<TestIntegrationEvent,TestIntegrationEventHandler>();
             Assert.True(manager.HasSubscriptionsForEvent<TestIntegrationEvent>());
         }
 
@@ -26,7 +26,7 @@ namespace EventBus.Tests
         public void After_All_Subscriptions_Are_Deleted_Event_Should_No_Longer_Exists()
         {
             var manager = new InMemoryEventBusSubscriptionsManager();
-            manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(() => new TestIntegrationEventHandler());
+            manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>();
             manager.RemoveSubscription<TestIntegrationEvent, TestIntegrationEventHandler>();
             Assert.False(manager.HasSubscriptionsForEvent<TestIntegrationEvent>());
         }
@@ -37,7 +37,7 @@ namespace EventBus.Tests
             bool raised = false;
             var manager = new InMemoryEventBusSubscriptionsManager();
             manager.OnEventRemoved += (o, e) => raised = true;
-            manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(() => new TestIntegrationEventHandler());
+            manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>();
             manager.RemoveSubscription<TestIntegrationEvent, TestIntegrationEventHandler>();
             Assert.True(raised);
         }
@@ -46,8 +46,8 @@ namespace EventBus.Tests
         public void Get_Handlers_For_Event_Should_Return_All_Handlers()
         {
             var manager = new InMemoryEventBusSubscriptionsManager();
-            manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(() => new TestIntegrationEventHandler());
-            manager.AddSubscription<TestIntegrationEvent, TestIntegrationOtherEventHandler>(() => new TestIntegrationOtherEventHandler());
+            manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>();
+            manager.AddSubscription<TestIntegrationEvent, TestIntegrationOtherEventHandler>();
             var handlers = manager.GetHandlersForEvent<TestIntegrationEvent>();
             Assert.Equal(2, handlers.Count());
         }

src/BuildingBlocks/EventBus/EventBus/Abstractions/IEventBus.cs

@@ -5,10 +5,10 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions
 {
     public interface IEventBus
     {
-        void Subscribe<T, TH>(Func<TH> handler)
+        void Subscribe<T, TH>()
             where T : IntegrationEvent
             where TH : IIntegrationEventHandler<T>;
-        void SubscribeDynamic<TH>(string eventName, Func<TH> handler)
+        void SubscribeDynamic<TH>(string eventName)
             where TH : IDynamicIntegrationEventHandler;
 
         void UnsubscribeDynamic<TH>(string eventName)

src/BuildingBlocks/EventBus/EventBus/IEventBusSubscriptionsManager.cs

@@ -10,10 +10,10 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus
     {
         bool IsEmpty { get; }
         event EventHandler<string> OnEventRemoved;
-        void AddDynamicSubscription<TH>(string eventName, Func<TH> handler)
+        void AddDynamicSubscription<TH>(string eventName)
            where TH : IDynamicIntegrationEventHandler;
 
-        void AddSubscription<T, TH>(Func<TH> handler)
+        void AddSubscription<T, TH>()
            where T : IntegrationEvent
            where TH : IIntegrationEventHandler<T>;
 

src/BuildingBlocks/EventBus/EventBus/InMemoryEventBusSubscriptionsManager.cs

@@ -26,34 +26,41 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus
         public bool IsEmpty => !_handlers.Keys.Any();
         public void Clear() => _handlers.Clear();
 
-        public void AddDynamicSubscription<TH>(string eventName, Func<TH> handler)
+        public void AddDynamicSubscription<TH>(string eventName)
             where TH : IDynamicIntegrationEventHandler
         {
-            DoAddSubscription(handler, eventName, isDynamic: true);
+            DoAddSubscription(typeof(TH), eventName, isDynamic: true);
         }
 
-        public void AddSubscription<T, TH>(Func<TH> handler)
+        public void AddSubscription<T, TH>()
             where T : IntegrationEvent
             where TH : IIntegrationEventHandler<T>
         {
             var eventName = GetEventKey<T>();
-            DoAddSubscription(handler, eventName, isDynamic: false);
+            DoAddSubscription(typeof(TH), eventName, isDynamic: false);
             _eventTypes.Add(typeof(T));
         }
 
-        private void DoAddSubscription(Delegate handler, string eventName, bool isDynamic)
+        private void DoAddSubscription(Type handlerType, string eventName, bool isDynamic)
         {
             if (!HasSubscriptionsForEvent(eventName))
             {
                 _handlers.Add(eventName, new List<SubscriptionInfo>());
             }
+
+            if (_handlers[eventName].Any(s => s.HandlerType == handlerType))
+            {
+                throw new ArgumentException(
+                    $"Handler Type {handlerType.Name} already registered for '{eventName}'", nameof(handlerType));
+            }
+
             if (isDynamic)
             {
-                _handlers[eventName].Add(SubscriptionInfo.Dynamic(handler));
+                _handlers[eventName].Add(SubscriptionInfo.Dynamic(handlerType));
             }
             else
             {
-                _handlers[eventName].Add(SubscriptionInfo.Typed(handler));
+                _handlers[eventName].Add(SubscriptionInfo.Typed(handlerType));
             }
         }
 
@@ -115,7 +122,7 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus
         private SubscriptionInfo FindDynamicSubscriptionToRemove<TH>(string eventName)
             where TH : IDynamicIntegrationEventHandler
         {
-            return DoFindHandlerToRemove(eventName, typeof(TH));
+            return DoFindSubscriptionToRemove(eventName, typeof(TH));
         }
 
 
@@ -124,25 +131,18 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus
              where TH : IIntegrationEventHandler<T>
         {
             var eventName = GetEventKey<T>();
-            return DoFindHandlerToRemove(eventName, typeof(TH));
+            return DoFindSubscriptionToRemove(eventName, typeof(TH));
         }
 
-        private SubscriptionInfo DoFindHandlerToRemove(string eventName, Type handlerType)
+        private SubscriptionInfo DoFindSubscriptionToRemove(string eventName, Type handlerType)
         {
             if (!HasSubscriptionsForEvent(eventName))
             {
                 return null;
             }
-            foreach (var subscription in _handlers[eventName])
-            {
-                var genericArgs = subscription.Factory.GetType().GetGenericArguments();
-                if (genericArgs.SingleOrDefault() == handlerType)
-                {
-                    return subscription;
-                }
-            }
 
-            return null;
+            return _handlers[eventName].SingleOrDefault(s => s.HandlerType == handlerType);
+
         }
 
         public bool HasSubscriptionsForEvent<T>() where T : IntegrationEvent

src/BuildingBlocks/EventBus/EventBus/SubscriptionInfo.cs

@@ -7,21 +7,21 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus
         public class SubscriptionInfo
         {
             public bool IsDynamic { get; }
-            public Delegate Factory { get; }
+            public Type HandlerType{ get; }
 
-            private SubscriptionInfo(bool isDynamic, Delegate factory)
+            private SubscriptionInfo(bool isDynamic, Type handlerType)
             {
                 IsDynamic = isDynamic;
-                Factory = factory;
+                HandlerType = handlerType;
             }
 
-            public static SubscriptionInfo Dynamic(Delegate factory)
+            public static SubscriptionInfo Dynamic(Type handlerType)
             {
-                return new SubscriptionInfo(true, factory);
+                return new SubscriptionInfo(true, handlerType);
             }
-            public static SubscriptionInfo Typed(Delegate factory)
+            public static SubscriptionInfo Typed(Type handlerType)
             {
-                return new SubscriptionInfo(false, factory);
+                return new SubscriptionInfo(false, handlerType);
             }
         }
     }

src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs

@@ -1,4 +1,5 @@
-using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
+using Autofac;
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
 using Microsoft.Extensions.Logging;
@@ -26,17 +27,20 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
         private readonly IRabbitMQPersistentConnection _persistentConnection;
         private readonly ILogger<EventBusRabbitMQ> _logger;
         private readonly IEventBusSubscriptionsManager _subsManager;
-             
+        private readonly ILifetimeScope _autofac;
+        private readonly string AUTOFAC_SCOPE_NAME = "eshop_event_bus";
 
         private IModel _consumerChannel;
         private string _queueName;
 
-        public EventBusRabbitMQ(IRabbitMQPersistentConnection persistentConnection, ILogger<EventBusRabbitMQ> logger, IEventBusSubscriptionsManager subsManager)
+        public EventBusRabbitMQ(IRabbitMQPersistentConnection persistentConnection, ILogger<EventBusRabbitMQ> logger,
+            ILifetimeScope autofac, IEventBusSubscriptionsManager subsManager)
         {
             _persistentConnection = persistentConnection ?? throw new ArgumentNullException(nameof(persistentConnection));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _subsManager = subsManager ?? new InMemoryEventBusSubscriptionsManager();
             _consumerChannel = CreateConsumerChannel();
+            _autofac = autofac;
 
             _subsManager.OnEventRemoved += SubsManager_OnEventRemoved;
         }
@@ -97,20 +101,20 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
             }
         }
 
-        public void SubscribeDynamic<TH>(string eventName, Func<TH> handler)
-            where TH: IDynamicIntegrationEventHandler
+        public void SubscribeDynamic<TH>(string eventName)
+            where TH : IDynamicIntegrationEventHandler
         {
             DoInternalSubscription(eventName);
-            _subsManager.AddDynamicSubscription<TH>(eventName,handler);
+            _subsManager.AddDynamicSubscription<TH>(eventName);
         }
 
-        public void Subscribe<T, TH>(Func<TH> handler)
+        public void Subscribe<T, TH>()
             where T : IntegrationEvent
             where TH : IIntegrationEventHandler<T>
         {
             var eventName = _subsManager.GetEventKey<T>();
             DoInternalSubscription(eventName);
-            _subsManager.AddSubscription<T, TH>(handler);
+            _subsManager.AddSubscription<T, TH>();
         }
 
         private void DoInternalSubscription(string eventName)
@@ -140,7 +144,7 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
         }
 
         public void UnsubscribeDynamic<TH>(string eventName)
-            where TH: IDynamicIntegrationEventHandler
+            where TH : IDynamicIntegrationEventHandler
         {
             _subsManager.RemoveDynamicSubscription<TH>(eventName);
         }
@@ -195,25 +199,28 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
         private async Task ProcessEvent(string eventName, string message)
         {
 
+
             if (_subsManager.HasSubscriptionsForEvent(eventName))
             {
-                var subscriptions = _subsManager.GetHandlersForEvent(eventName);
-
-                foreach (var subscription in subscriptions)
+                using (var scope = _autofac.BeginLifetimeScope(AUTOFAC_SCOPE_NAME))
                 {
-                    if (subscription.IsDynamic)
-                    {
-                        var handler = subscription.Factory.DynamicInvoke() as IDynamicIntegrationEventHandler;
-                        dynamic eventData = JObject.Parse(message);
-                        await handler.Handle(eventData);
-                    }
-                    else
+                    var subscriptions = _subsManager.GetHandlersForEvent(eventName);
+                    foreach (var subscription in subscriptions)
                     {
-                        var eventType = _subsManager.GetEventTypeByName(eventName);
-                        var integrationEvent = JsonConvert.DeserializeObject(message, eventType);
-                        var handler = subscription.Factory.DynamicInvoke();
-                        var concreteType = typeof(IIntegrationEventHandler<>).MakeGenericType(eventType);
-                        await (Task)concreteType.GetMethod("Handle").Invoke(handler, new object[] { integrationEvent });
+                        if (subscription.IsDynamic)
+                        { 
+                            var handler = scope.ResolveOptional(subscription.HandlerType) as IDynamicIntegrationEventHandler;
+                            dynamic eventData = JObject.Parse(message);
+                            await handler.Handle(eventData);
+                        }
+                        else
+                        {
+                            var eventType = _subsManager.GetEventTypeByName(eventName);
+                            var integrationEvent = JsonConvert.DeserializeObject(message, eventType);
+                            var handler = scope.ResolveOptional(subscription.HandlerType);
+                            var concreteType = typeof(IIntegrationEventHandler<>).MakeGenericType(eventType);
+                            await (Task)concreteType.GetMethod("Handle").Invoke(handler, new object[] { integrationEvent });
+                        }
                     }
                 }
             }

src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Autofac" Version="4.5.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="Polly" Version="5.0.6" />

src/Services/Basket/Basket.API/Basket.API.csproj

@@ -22,6 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.0.0" />
     <PackageReference Include="System.Threading" Version="4.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />

src/Services/Basket/Basket.API/Startup.cs

@@ -23,6 +23,8 @@ using System.Threading.Tasks;
 using System;
 using Microsoft.eShopOnContainers.Services.Basket.API.Services;
 using Microsoft.AspNetCore.Http;
+using Autofac;
+using Autofac.Extensions.DependencyInjection;
 
 namespace Microsoft.eShopOnContainers.Services.Basket.API
 {
@@ -41,7 +43,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
         public IConfigurationRoot Configuration { get; }
 
         // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
+        public IServiceProvider ConfigureServices(IServiceCollection services)
         {
 
             services.AddHealthChecks(checks =>
@@ -112,6 +114,10 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
             services.AddTransient<IBasketRepository, RedisBasketRepository>();
             services.AddTransient<IIdentityService, IdentityService>();
             RegisterServiceBus(services);
+
+            var container = new ContainerBuilder();
+            container.Populate(services);
+            return new AutofacServiceProvider(container.Build());
         }
 
         private void RegisterServiceBus(IServiceCollection services)
@@ -167,11 +173,8 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
 
             var eventBus = app.ApplicationServices.GetRequiredService<IEventBus>();
 
-            eventBus.Subscribe<ProductPriceChangedIntegrationEvent, ProductPriceChangedIntegrationEventHandler>
-                (() => app.ApplicationServices.GetRequiredService<ProductPriceChangedIntegrationEventHandler>());
-
-            eventBus.Subscribe<OrderStartedIntegrationEvent, OrderStartedIntegrationEventHandler>
-                (() => app.ApplicationServices.GetRequiredService<OrderStartedIntegrationEventHandler>());
+            eventBus.Subscribe<ProductPriceChangedIntegrationEvent, ProductPriceChangedIntegrationEventHandler>();
+            eventBus.Subscribe<OrderStartedIntegrationEvent, OrderStartedIntegrationEventHandler>();
         }
     }
 }

src/Services/Catalog/Catalog.API/Catalog.API.csproj

@@ -29,6 +29,7 @@
 
 
   <ItemGroup>
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="1.1.1" />

src/Services/Catalog/Catalog.API/Startup.cs

@@ -1,5 +1,7 @@
 namespace Microsoft.eShopOnContainers.Services.Catalog.API
 {
+    using Autofac;
+    using Autofac.Extensions.DependencyInjection;
     using global::Catalog.API.Infrastructure.Filters;
     using global::Catalog.API.IntegrationEvents;
     using Microsoft.AspNetCore.Builder;
@@ -44,7 +46,7 @@
             Configuration = builder.Build();
         }
 
-        public void ConfigureServices(IServiceCollection services)
+        public IServiceProvider ConfigureServices(IServiceCollection services)
         {
             // Add framework services.
 
@@ -118,6 +120,10 @@
 
             services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
             services.AddSingleton<IEventBus, EventBusRabbitMQ>();
+
+            var container = new ContainerBuilder();
+            container.Populate(services);
+            return new AutofacServiceProvider(container.Build());
         }
 
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)

src/Services/Identity/Identity.API/Identity.API.csproj

@@ -14,6 +14,7 @@
   </PropertyGroup>
   
   <ItemGroup>
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="1.1.0" />

src/Services/Identity/Identity.API/Startup.cs

@@ -19,6 +19,8 @@ using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.HealthChecks;
 using Identity.API.Certificate;
+using Autofac.Extensions.DependencyInjection;
+using Autofac;
 
 namespace eShopOnContainers.Identity
 {
@@ -44,7 +46,7 @@ namespace eShopOnContainers.Identity
         public IConfigurationRoot Configuration { get; }
 
         // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
+        public IServiceProvider ConfigureServices(IServiceCollection services)
         {            
 
             // Add framework services.
@@ -87,7 +89,11 @@ namespace eShopOnContainers.Identity
                 .AddInMemoryIdentityResources(Config.GetResources())
                 .AddInMemoryClients(Config.GetClients(clientUrls))
                 .AddAspNetIdentity<ApplicationUser>()
-                .Services.AddTransient<IProfileService, ProfileService>(); 
+                .Services.AddTransient<IProfileService, ProfileService>();
+
+            var container = new ContainerBuilder();
+            container.Populate(services);
+            return new AutofacServiceProvider(container.Build());
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

src/Services/Ordering/Ordering.API/Application/IntegrationEvents/OrderingIntegrationEventService.cs

@@ -7,6 +7,7 @@ using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Utilities
 using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
 using System;
 using System.Data.Common;
+using System.Diagnostics;
 using System.Threading.Tasks;
 
 namespace Ordering.API.Application.IntegrationEvents

src/Services/Ordering/Ordering.API/Startup.cs

@@ -129,7 +129,7 @@
             services.AddSingleton<IEventBus, EventBusRabbitMQ>();
 
             services.AddTransient<UserCheckoutAcceptedIntegrationEventHandler>();
-            services.AddTransient<IIntegrationEventHandler<ConfirmGracePeriodCommandMsg>, OrderProcessSaga>();
+            services.AddTransient<OrderProcessSaga>();
             services.AddTransient<OrderStockConfirmedIntegrationEventHandler>();
             services.AddTransient<OrderStockNotConfirmedIntegrationEventHandler>();
             services.AddOptions();
@@ -156,14 +156,13 @@
             app.UseFailingMiddleware();
 
             ConfigureAuth(app);
-            ConfigureEventBus(app);
-
             app.UseMvcWithDefaultRoute();
 
             app.UseSwagger()
                 .UseSwaggerUi();
 
             OrderingContextSeed.SeedAsync(app).Wait();
+            ConfigureEventBus(app);
 
             var integrationEventLogContext = new IntegrationEventLogContext(
                 new DbContextOptionsBuilder<IntegrationEventLogContext>()
@@ -176,18 +175,11 @@
         private void ConfigureEventBus(IApplicationBuilder app)
         {
             var eventBus = app.ApplicationServices.GetRequiredService<IEventBus>();
-            eventBus.SubscribeDynamic(
-                "UserCheckoutAccepted",
-                () => app.ApplicationServices.GetRequiredService<UserCheckoutAcceptedIntegrationEventHandler>());
-
-            eventBus.Subscribe<ConfirmGracePeriodCommandMsg, IIntegrationEventHandler<ConfirmGracePeriodCommandMsg>>
-                (() => app.ApplicationServices.GetRequiredService<IIntegrationEventHandler<ConfirmGracePeriodCommandMsg>>());
-
-            eventBus.Subscribe<OrderStockConfirmedIntegrationEvent, OrderStockConfirmedIntegrationEventHandler>
-                (() => app.ApplicationServices.GetRequiredService<OrderStockConfirmedIntegrationEventHandler>());
+            eventBus.SubscribeDynamic<UserCheckoutAcceptedIntegrationEventHandler>("UserCheckoutAccepted");
 
-            eventBus.Subscribe<OrderStockNotConfirmedIntegrationEvent, OrderStockNotConfirmedIntegrationEventHandler>
-                (() => app.ApplicationServices.GetRequiredService<OrderStockNotConfirmedIntegrationEventHandler>());
+            eventBus.Subscribe<ConfirmGracePeriodCommandMsg, OrderProcessSaga>();
+            eventBus.Subscribe<OrderStockConfirmedIntegrationEvent, OrderStockConfirmedIntegrationEventHandler>();
+            eventBus.Subscribe<OrderStockNotConfirmedIntegrationEvent, OrderStockNotConfirmedIntegrationEventHandler>();
         }
 
         protected virtual void ConfigureAuth(IApplicationBuilder app)

src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs

@@ -38,7 +38,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.O
 
         private int? _paymentMethodId;
 
-        protected Order() { }
+        protected Order() { _orderItems = new List<OrderItem>(); }
 
         public Order(Address address, int cardTypeId, string cardNumber, string cardSecurityNumber,
                 string cardHolderName, DateTime cardExpiration, int? buyerId = null, int? paymentMethodId = null)

src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs

@@ -36,6 +36,9 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Infrastructure
         public OrderingContext(DbContextOptions options, IMediator mediator) : base(options)
         {
             _mediator = mediator ?? throw new ArgumentNullException(nameof(mediator));
+
+
+            System.Diagnostics.Debug.WriteLine("OrderingContext::ctor ->" + this.GetHashCode());
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)

src/Services/Payment/Payment.API/Payment.API.csproj

@@ -10,6 +10,7 @@
     <Folder Include="wwwroot\" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.0.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />

src/Services/Payment/Payment.API/Startup.cs

@@ -1,8 +1,11 @@
-using Microsoft.AspNetCore.Builder;
+using Autofac;
+using Autofac.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using System;
 
 namespace Payment.API
 {
@@ -21,7 +24,7 @@ namespace Payment.API
         public IConfigurationRoot Configuration { get; }
 
         // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
+        public IServiceProvider ConfigureServices(IServiceCollection services)
         {
             // Add framework services.
             services.AddMvc();
@@ -38,6 +41,10 @@ namespace Payment.API
                     TermsOfService = "Terms Of Service"
                 });
             });
+
+            var container = new ContainerBuilder();
+            container.Populate(services);
+            return new AutofacServiceProvider(container.Build());
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

src/Services/SagaManager/SagaManager/Program.cs

@@ -16,7 +16,8 @@ namespace SagaManager
     using Microsoft.Extensions.Options;
     using RabbitMQ.Client;
     using Services;
- 
+    using Autofac.Extensions.DependencyInjection;
+    using Autofac;
 
     public class Program
     {
@@ -76,6 +77,10 @@ namespace SagaManager
 
                 RegisterServiceBus(services);
 
+            var container = new ContainerBuilder();
+            container.Populate(services);
+            return new AutofacServiceProvider(container.Build());
+
             return services.BuildServiceProvider();
         }
 

src/Services/SagaManager/SagaManager/SagaManager.csproj

@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.0.0" />
     <PackageReference Include="Dapper" Version="1.50.2" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />