From 018e803dc13508c2b0a23aed3474be41d1a2e053 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 4 Aug 2015 15:50:10 -0700 Subject: [PATCH] Removing Autofac dependency \ tests from ControllersFromServicesWebSite --- .../ControllersFromServicesWebSite/Startup.cs | 20 +------------------ .../project.json | 8 ++------ 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/test/WebSites/ControllersFromServicesWebSite/Startup.cs b/test/WebSites/ControllersFromServicesWebSite/Startup.cs index 1f3fa50b33..a5af9a3f00 100644 --- a/test/WebSites/ControllersFromServicesWebSite/Startup.cs +++ b/test/WebSites/ControllersFromServicesWebSite/Startup.cs @@ -3,14 +3,9 @@ using System; using System.Reflection; +using ControllersFromServicesClassLibrary; using Microsoft.AspNet.Builder; using Microsoft.Framework.DependencyInjection; -using ControllersFromServicesClassLibrary; - -#if DNX451 -using Autofac; -using Microsoft.Framework.DependencyInjection.Autofac; -#endif namespace ControllersFromServicesWebSite { @@ -28,20 +23,7 @@ namespace ControllersFromServicesWebSite services.AddTransient(); -#if DNX451 - // Create the autofac container - var builder = new ContainerBuilder(); - - // Create the container and use the default application services as a fallback - AutofacRegistration.Populate( - builder, - services); - - return builder.Build() - .Resolve(); -#else return services.BuildServiceProvider(); -#endif } public void Configure(IApplicationBuilder app) diff --git a/test/WebSites/ControllersFromServicesWebSite/project.json b/test/WebSites/ControllersFromServicesWebSite/project.json index 41d416d6e6..03e07adddc 100644 --- a/test/WebSites/ControllersFromServicesWebSite/project.json +++ b/test/WebSites/ControllersFromServicesWebSite/project.json @@ -4,7 +4,7 @@ "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" }, "dependencies": { - "ControllersFromServicesClassLibrary": "1.0.0", + "ControllersFromServicesClassLibrary": "1.0.0", "Kestrel": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0", @@ -13,11 +13,7 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "dnx451": { - "dependencies": { - "Microsoft.Framework.DependencyInjection.Autofac": "1.0.0-*" - } - }, + "dnx451": {}, "dnxcore50": { } }, "webroot": "wwwroot"