Split up configuration for Web and Bl in separate extension methods

rurku · Dec 28, 2015 · e152f97 · e152f97
1 parent 2142cdb
commit e152f97
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 5 deletions.
diff --git a/src/Example.Web/Startup.cs b/src/Example.Web/Startup.cs
@@ -13,6 +13,7 @@
 using Microsoft.Framework.Configuration;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Extensions;
+using WaCore.Bl;
 using WaCore.Contracts.Data.Repositories;
 using WaCore.Contracts.Data.Repositories.Base;
 using WaCore.Data;
@@ -57,7 +58,8 @@ public void ConfigureServices(IServiceCollection services)
                 .AddDbContext<ExampleDbContext>(options =>
                     options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"]));
 
-            services.ConfigureWaCore(Configuration);
+            services.ConfigureWaCoreWeb(Configuration);
+            services.ConfigureWaCoreBl(Configuration);
 
             services.AddIdentity<User, Role>()
                 .AddEntityFrameworkStores<ExampleDbContext, Guid>()

diff --git a/src/WaCore.Bl/ConfigurationExtensions.cs b/src/WaCore.Bl/ConfigurationExtensions.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Framework.Configuration;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.DependencyInjection.Extensions;
+using WaCore.Bl.Services.Account;
+using WaCore.Contracts.Bl.Services.Account;
+
+namespace WaCore.Bl
+{
+    public static class ConfigurationExtensions
+    {
+        public static IServiceCollection ConfigureWaCoreBl(this IServiceCollection services,
+            IConfigurationRoot configuration)
+        {
+
+            services.TryAddTransient<IAccountService, AccountService>();
+
+            return services;
+        }
+    }
+}
diff --git a/src/WaCore.Bl/project.json b/src/WaCore.Bl/project.json
@@ -26,6 +26,7 @@
     "Microsoft.AspNet.Cryptography.KeyDerivation": "1.0.0-beta8",
     "Microsoft.AspNet.Identity": "3.0.0-beta8",
     "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta8",
+    "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-beta8",
     "WaCore.Contracts": "1.0.0-*",
     "WaCore.Entities": "1.0.0-*"
   }

diff --git a/src/WaCore.Bl/project.lock.json b/src/WaCore.Bl/project.lock.json
@@ -10445,6 +10445,7 @@
       "Microsoft.AspNet.Cryptography.KeyDerivation >= 1.0.0-beta8",
       "Microsoft.AspNet.Identity >= 3.0.0-beta8",
       "Microsoft.AspNet.Identity.EntityFramework >= 3.0.0-beta8",
+      "Microsoft.Framework.DependencyInjection.Abstractions >= 1.0.0-beta8",
       "WaCore.Contracts >= 1.0.0-*",
       "WaCore.Entities >= 1.0.0-*"
     ],

diff --git a/src/WaCore.UnitTests/project.lock.json b/src/WaCore.UnitTests/project.lock.json
@@ -1518,6 +1518,7 @@
           "Microsoft.AspNet.Cryptography.KeyDerivation": "1.0.0-beta8",
           "Microsoft.AspNet.Identity": "3.0.0-beta8",
           "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta8",
+          "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-beta8",
           "RazorEngine": "3.7.5",
           "WaCore.Contracts": "1.0.0",
           "WaCore.Entities": "1.0.0"
@@ -3189,6 +3190,7 @@
           "Microsoft.AspNet.Cryptography.KeyDerivation": "1.0.0-beta8",
           "Microsoft.AspNet.Identity": "3.0.0-beta8",
           "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta8",
+          "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-beta8",
           "RazorEngine": "3.7.5",
           "WaCore.Contracts": "1.0.0",
           "WaCore.Entities": "1.0.0"
@@ -4860,6 +4862,7 @@
           "Microsoft.AspNet.Cryptography.KeyDerivation": "1.0.0-beta8",
           "Microsoft.AspNet.Identity": "3.0.0-beta8",
           "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta8",
+          "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-beta8",
           "RazorEngine": "3.7.5",
           "WaCore.Contracts": "1.0.0",
           "WaCore.Entities": "1.0.0"

diff --git a/src/WaCore.Web/ConfigurationExtensions.cs b/src/WaCore.Web/ConfigurationExtensions.cs
@@ -8,15 +8,14 @@
 using Microsoft.Framework.DependencyInjection;
 using WaCore.Web.Infrastructure;
 using Microsoft.Framework.DependencyInjection.Extensions;
-using WaCore.Bl.Services.Account;
 using WaCore.Contracts.Bl.Services.Account;
 using WaCore.Web.Controllers;
 
 namespace WaCore.Web
 {
     public static class ConfigurationExtensions
     {
-        public static IServiceCollection ConfigureWaCore(this IServiceCollection services,
+        public static IServiceCollection ConfigureWaCoreWeb(this IServiceCollection services,
             IConfigurationRoot configuration)
         {
             services.TryAddSingleton<IRazorViewEngine, WaCoreRazorViewEngine>();
@@ -29,8 +28,6 @@ public static IServiceCollection ConfigureWaCore(this IServiceCollection service
             // so you may need to compare your custom views to the originals again after upgrades
 
 
-            services.TryAddTransient<IAccountService, AccountService>();
-
             services.AddMvc();
             return services;
         }

diff --git a/src/WaCore.Web/project.lock.json b/src/WaCore.Web/project.lock.json
@@ -1471,6 +1471,7 @@
           "Microsoft.AspNet.Cryptography.KeyDerivation": "1.0.0-beta8",
           "Microsoft.AspNet.Identity": "3.0.0-beta8",
           "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta8",
+          "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-beta8",
           "RazorEngine": "3.7.5",
           "WaCore.Contracts": "1.0.0",
           "WaCore.Entities": "1.0.0"
@@ -3566,6 +3567,7 @@
           "Microsoft.AspNet.Identity": "3.0.0-beta8",
           "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta8",
           "Microsoft.CSharp": "4.0.1-beta-23409",
+          "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-beta8",
           "System.Collections": "4.0.11-beta-23409",
           "System.Linq": "4.0.1-beta-23409",
           "System.Runtime": "4.0.21-beta-23409",
@@ -5069,6 +5071,7 @@
           "Microsoft.AspNet.Cryptography.KeyDerivation": "1.0.0-beta8",
           "Microsoft.AspNet.Identity": "3.0.0-beta8",
           "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta8",
+          "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-beta8",
           "RazorEngine": "3.7.5",
           "WaCore.Contracts": "1.0.0",
           "WaCore.Entities": "1.0.0"
@@ -6556,6 +6559,7 @@
           "Microsoft.AspNet.Cryptography.KeyDerivation": "1.0.0-beta8",
           "Microsoft.AspNet.Identity": "3.0.0-beta8",
           "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta8",
+          "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-beta8",
           "RazorEngine": "3.7.5",
           "WaCore.Contracts": "1.0.0",
           "WaCore.Entities": "1.0.0"
@@ -9065,6 +9069,7 @@
           "Microsoft.AspNet.Identity": "3.0.0-beta8",
           "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta8",
           "Microsoft.CSharp": "4.0.1-beta-23409",
+          "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-beta8",
           "System.Collections": "4.0.11-beta-23409",
           "System.Linq": "4.0.1-beta-23409",
           "System.Runtime": "4.0.21-beta-23409",
@@ -11590,6 +11595,7 @@
           "Microsoft.AspNet.Identity": "3.0.0-beta8",
           "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta8",
           "Microsoft.CSharp": "4.0.1-beta-23409",
+          "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-beta8",
           "System.Collections": "4.0.11-beta-23409",
           "System.Linq": "4.0.1-beta-23409",
           "System.Runtime": "4.0.21-beta-23409",