From 5038c369db16a23312612073ce7b36ab4b1931aa Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 12 Feb 2015 14:44:38 -0800
Subject: [PATCH] Using IServiceManifest from
 Microsoft.Framework.Runtime.Interfaces

---
 .../IApplicationLifetime.cs                      |  2 --
 .../IConfigureHostingEnvironment.cs              |  1 -
 .../IHostingEnvironment.cs                       |  2 --
 .../IServerFactory.cs                            |  2 --
 .../project.json                                 |  1 -
 src/Microsoft.AspNet.Hosting/IServiceManifest.cs | 16 ----------------
 src/Microsoft.AspNet.Hosting/project.json        |  1 +
 7 files changed, 1 insertion(+), 24 deletions(-)
 rename src/{Microsoft.AspNet.Hosting => Microsoft.AspNet.Hosting.Interfaces}/IConfigureHostingEnvironment.cs (94%)
 delete mode 100644 src/Microsoft.AspNet.Hosting/IServiceManifest.cs

diff --git a/src/Microsoft.AspNet.Hosting.Interfaces/IApplicationLifetime.cs b/src/Microsoft.AspNet.Hosting.Interfaces/IApplicationLifetime.cs
index df20556da1..755a415103 100644
--- a/src/Microsoft.AspNet.Hosting.Interfaces/IApplicationLifetime.cs
+++ b/src/Microsoft.AspNet.Hosting.Interfaces/IApplicationLifetime.cs
@@ -2,14 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading;
-using Microsoft.Framework.Runtime;
 
 namespace Microsoft.AspNet.Hosting
 {
     /// <summary>
     /// Allows consumers to perform cleanup during a graceful shutdown.
     /// </summary>
-    [AssemblyNeutral]
     public interface IApplicationLifetime
     {
         /// <summary>
diff --git a/src/Microsoft.AspNet.Hosting/IConfigureHostingEnvironment.cs b/src/Microsoft.AspNet.Hosting.Interfaces/IConfigureHostingEnvironment.cs
similarity index 94%
rename from src/Microsoft.AspNet.Hosting/IConfigureHostingEnvironment.cs
rename to src/Microsoft.AspNet.Hosting.Interfaces/IConfigureHostingEnvironment.cs
index 715d55b687..6ea92fde03 100644
--- a/src/Microsoft.AspNet.Hosting/IConfigureHostingEnvironment.cs
+++ b/src/Microsoft.AspNet.Hosting.Interfaces/IConfigureHostingEnvironment.cs
@@ -5,7 +5,6 @@ using Microsoft.Framework.Runtime;
 
 namespace Microsoft.AspNet.Hosting
 {
-    [AssemblyNeutral]
     public interface IConfigureHostingEnvironment
     {
         void Configure(IHostingEnvironment hostingEnv);
diff --git a/src/Microsoft.AspNet.Hosting.Interfaces/IHostingEnvironment.cs b/src/Microsoft.AspNet.Hosting.Interfaces/IHostingEnvironment.cs
index 8f5966e332..c946e5d3ff 100644
--- a/src/Microsoft.AspNet.Hosting.Interfaces/IHostingEnvironment.cs
+++ b/src/Microsoft.AspNet.Hosting.Interfaces/IHostingEnvironment.cs
@@ -2,11 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.FileProviders;
-using Microsoft.Framework.Runtime;
 
 namespace Microsoft.AspNet.Hosting
 {
-    [AssemblyNeutral]
     public interface IHostingEnvironment
     {
         string EnvironmentName { get; set; }
diff --git a/src/Microsoft.AspNet.Hosting.Interfaces/IServerFactory.cs b/src/Microsoft.AspNet.Hosting.Interfaces/IServerFactory.cs
index 94cb26ece7..979730e5de 100644
--- a/src/Microsoft.AspNet.Hosting.Interfaces/IServerFactory.cs
+++ b/src/Microsoft.AspNet.Hosting.Interfaces/IServerFactory.cs
@@ -5,11 +5,9 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.Framework.ConfigurationModel;
-using Microsoft.Framework.Runtime;
 
 namespace Microsoft.AspNet.Hosting.Server
 {
-    [AssemblyNeutral]
     public interface IServerFactory
     {
         IServerInformation Initialize(IConfiguration configuration);
diff --git a/src/Microsoft.AspNet.Hosting.Interfaces/project.json b/src/Microsoft.AspNet.Hosting.Interfaces/project.json
index 21b82874ae..9e5b132ac8 100644
--- a/src/Microsoft.AspNet.Hosting.Interfaces/project.json
+++ b/src/Microsoft.AspNet.Hosting.Interfaces/project.json
@@ -3,7 +3,6 @@
     "dependencies": {
         "Microsoft.AspNet.Http": "1.0.0-*",
         "Microsoft.AspNet.FileProviders.Interfaces": "1.0.0-*",
-        "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
         "Microsoft.Framework.ConfigurationModel": "1.0.0-*"
     },
 
diff --git a/src/Microsoft.AspNet.Hosting/IServiceManifest.cs b/src/Microsoft.AspNet.Hosting/IServiceManifest.cs
deleted file mode 100644
index 3810fdc06c..0000000000
--- a/src/Microsoft.AspNet.Hosting/IServiceManifest.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
-{
-#if ASPNET50 || ASPNETCORE50
-    [Microsoft.Framework.Runtime.AssemblyNeutral]
-#endif
-    public interface IServiceManifest
-    {
-        IEnumerable<Type> Services { get; }
-    }
-}
diff --git a/src/Microsoft.AspNet.Hosting/project.json b/src/Microsoft.AspNet.Hosting/project.json
index 2696a48923..f4deb14aca 100644
--- a/src/Microsoft.AspNet.Hosting/project.json
+++ b/src/Microsoft.AspNet.Hosting/project.json
@@ -3,6 +3,7 @@
     "description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications.",
     "dependencies": {
         "Microsoft.AspNet.Hosting.Interfaces": "1.0.0-*",
+        "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
         "Microsoft.AspNet.FileProviders": "1.0.0-*",
         "Microsoft.AspNet.Http.Core": "1.0.0-*",
         "Microsoft.Framework.Logging": "1.0.0-*",