Merge pull request #1 from aspnet/dev

Update with recent changes from aspnet/Hosting
dotnet · Feb 13, 2015 · b94634b · b94634b
2 parents e95472e + 66b98e2
commit b94634b
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 28 deletions.
diff --git 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/...t.Hosting/IConfigureHostingEnvironment.cs → ...nterfaces/IConfigureHostingEnvironment.cs b/...t.Hosting/IConfigureHostingEnvironment.cs → ...nterfaces/IConfigureHostingEnvironment.cs
@@ -5,7 +5,6 @@
 
 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
@@ -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
@@ -5,11 +5,9 @@
 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
@@ -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/HostingServices.cs b/src/Microsoft.AspNet.Hosting/HostingServices.cs
@@ -6,8 +6,8 @@
 using System.Linq;
 using Microsoft.Framework.ConfigurationModel;
 using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.DependencyInjection.ServiceLookup;
 using Microsoft.Framework.Logging;
+using Microsoft.Framework.Runtime;
 using Microsoft.Framework.Runtime.Infrastructure;
 
 namespace Microsoft.AspNet.Hosting

diff --git a/src/Microsoft.AspNet.Hosting/IServiceManifest.cs b/src/Microsoft.AspNet.Hosting/IServiceManifest.cs
diff --git 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-*",

diff --git a/test/Microsoft.AspNet.Hosting.Tests/HostingServicesFacts.cs b/test/Microsoft.AspNet.Hosting.Tests/HostingServicesFacts.cs
@@ -6,7 +6,7 @@
 using Microsoft.AspNet.Hosting.Fakes;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Fallback;
-using Microsoft.Framework.DependencyInjection.ServiceLookup;
+using Microsoft.Framework.Runtime;
 using Xunit;
 
 namespace Microsoft.AspNet.Hosting.Tests
@@ -84,11 +84,12 @@ public void CreateThrowsWithNoManifest()
             fallbackServices.AddTransient<IFakeService, FakeService>();
 
             // Act
-            var exp = Assert.Throws<InvalidOperationException>(() => HostingServices.Create(fallbackServices.BuildServiceProvider()));
+            var exception = Assert.Throws<InvalidOperationException>(() => HostingServices.Create(fallbackServices.BuildServiceProvider()));
 
 
             // Assert
-            Assert.True(exp.Message.Contains("No service for type 'Microsoft.Framework.DependencyInjection.ServiceLookup.IServiceManifest'"));
+            Assert.Equal($"No service for type '{typeof(IServiceManifest).FullName}' has been registered.",
+                         exception.Message);
         }
 
         private class ServiceManifest : IServiceManifest