diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs index fe13dab8c8..42dbc1cc5a 100644 --- a/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs +++ b/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs @@ -74,7 +74,7 @@ namespace Microsoft.AspNet.Builder return context => { - var serviceProvider = context.RequestServices ?? context.ApplicationServices ?? applicationServices; + var serviceProvider = context.RequestServices ?? applicationServices; if (serviceProvider == null) { throw new InvalidOperationException(Resources.FormatException_UseMiddlewareIServiceProviderNotAvailable(nameof(IServiceProvider))); diff --git a/src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs b/src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs index 162f3c582d..f639a4dd9d 100644 --- a/src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs +++ b/src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs @@ -55,11 +55,6 @@ namespace Microsoft.AspNet.Http /// public abstract IDictionary Items { get; set; } - /// - /// Gets or sets the that provides access to the application's service container. - /// - public abstract IServiceProvider ApplicationServices { get; set; } - /// /// Gets or sets the that provides access to the request's service container. /// diff --git a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs index 0c95f04dc4..f4c60fb951 100644 --- a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs +++ b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs @@ -176,12 +176,6 @@ namespace Microsoft.AspNet.Http.Internal set { ItemsFeature.Items = value; } } - public override IServiceProvider ApplicationServices - { - get { return ServiceProvidersFeature.ApplicationServices; } - set { ServiceProvidersFeature.ApplicationServices = value; } - } - public override IServiceProvider RequestServices { get { return ServiceProvidersFeature.RequestServices; } diff --git a/src/Microsoft.AspNet.Http/Features/IServiceProvidersFeature.cs b/src/Microsoft.AspNet.Http/Features/IServiceProvidersFeature.cs index b5d192c503..30b9b63b96 100644 --- a/src/Microsoft.AspNet.Http/Features/IServiceProvidersFeature.cs +++ b/src/Microsoft.AspNet.Http/Features/IServiceProvidersFeature.cs @@ -7,7 +7,6 @@ namespace Microsoft.AspNet.Http.Features.Internal { public interface IServiceProvidersFeature { - IServiceProvider ApplicationServices { get; set; } IServiceProvider RequestServices { get; set; } } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Http/Features/ServiceProvidersFeature.cs b/src/Microsoft.AspNet.Http/Features/ServiceProvidersFeature.cs index d9082df7a2..194c3b3f36 100644 --- a/src/Microsoft.AspNet.Http/Features/ServiceProvidersFeature.cs +++ b/src/Microsoft.AspNet.Http/Features/ServiceProvidersFeature.cs @@ -7,7 +7,6 @@ namespace Microsoft.AspNet.Http.Features.Internal { public class ServiceProvidersFeature : IServiceProvidersFeature { - public IServiceProvider ApplicationServices { get; set; } public IServiceProvider RequestServices { get; set; } } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Owin/OwinExtensions.cs b/src/Microsoft.AspNet.Owin/OwinExtensions.cs index 3f6882653f..5ae81a6260 100644 --- a/src/Microsoft.AspNet.Owin/OwinExtensions.cs +++ b/src/Microsoft.AspNet.Owin/OwinExtensions.cs @@ -86,7 +86,7 @@ namespace Microsoft.AspNet.Builder return builder; } - private static CreateMiddleware CreateMiddlewareFactory(Func middleware, IServiceProvider applicationServices) + private static CreateMiddleware CreateMiddlewareFactory(Func middleware, IServiceProvider services) { return next => { @@ -110,7 +110,7 @@ namespace Microsoft.AspNet.Builder context = new DefaultHttpContext( new FeatureCollection( new OwinFeatureCollection(env))); - context.ApplicationServices = applicationServices; + context.RequestServices = services; } return app.Invoke(context); diff --git a/test/Microsoft.AspNet.Owin.Tests/OwinExtensionTests.cs b/test/Microsoft.AspNet.Owin.Tests/OwinExtensionTests.cs index d7d0a398d1..8d719f66c0 100644 --- a/test/Microsoft.AspNet.Owin.Tests/OwinExtensionTests.cs +++ b/test/Microsoft.AspNet.Owin.Tests/OwinExtensionTests.cs @@ -38,7 +38,7 @@ namespace Microsoft.AspNet.Owin serviceProvider = applicationBuilder.ApplicationServices; applicationBuilder.Run(async context => { - fakeService = context.ApplicationServices.GetService(); + fakeService = context.RequestServices.GetService(); }); }, new ServiceCollection().AddSingleton(new FakeService()).BuildServiceProvider()); @@ -66,7 +66,7 @@ namespace Microsoft.AspNet.Owin applicationBuilder.Run(async context => { applicationExecuted = true; - fakeService = context.ApplicationServices.GetService(); + fakeService = context.RequestServices.GetService(); }); });