Removing ApplicationServices from HttpContext #466

Author: JunTaoLuo

Diff for: src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs

@@ -74,7 +74,7 @@ public static IApplicationBuilder UseMiddleware(this IApplicationBuilder app, Ty
 
                 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 for: src/Microsoft.AspNet.Http.Abstractions/HttpContext.cs

@@ -55,11 +55,6 @@ public abstract class HttpContext
         /// </summary>
         public abstract IDictionary<object, object> Items { get; set; }
 
-        /// <summary>
-        /// Gets or sets the <see cref="IServiceProvider"/> that provides access to the application's service container.
-        /// </summary>
-        public abstract IServiceProvider ApplicationServices { get; set; }
-
         /// <summary>
         /// Gets or sets the <see cref="IServiceProvider"/> that provides access to the request's service container.
         /// </summary>

Diff for: src/Microsoft.AspNet.Http/DefaultHttpContext.cs

@@ -176,12 +176,6 @@ public override IDictionary<object, object> Items
             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 for: 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; }
     }
 }

Diff for: 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; }
     }
 }

Diff for: src/Microsoft.AspNet.Owin/OwinExtensions.cs

@@ -86,7 +86,7 @@ public static IApplicationBuilder UseBuilder(this AddMiddleware app, IServicePro
             return builder;
         }
 
-        private static CreateMiddleware CreateMiddlewareFactory(Func<RequestDelegate, RequestDelegate> middleware, IServiceProvider applicationServices)
+        private static CreateMiddleware CreateMiddlewareFactory(Func<RequestDelegate, RequestDelegate> middleware, IServiceProvider services)
         {
             return next =>
             {
@@ -110,7 +110,7 @@ private static CreateMiddleware CreateMiddlewareFactory(Func<RequestDelegate, Re
                         context = new DefaultHttpContext(
                                     new FeatureCollection(
                                         new OwinFeatureCollection(env)));
-                        context.ApplicationServices = applicationServices;
+                        context.RequestServices = services;
                     }
 
                     return app.Invoke(context);

Diff for: test/Microsoft.AspNet.Owin.Tests/OwinExtensionTests.cs

@@ -38,7 +38,7 @@ public void OwinConfigureServiceProviderAddsServices()
                 serviceProvider = applicationBuilder.ApplicationServices;
                 applicationBuilder.Run(async context =>
                 {
-                    fakeService = context.ApplicationServices.GetService<FakeService>();
+                    fakeService = context.RequestServices.GetService<FakeService>();
                 });
             }, new ServiceCollection().AddSingleton(new FakeService()).BuildServiceProvider());
 
@@ -66,7 +66,7 @@ public void OwinDefaultNoServices()
                 applicationBuilder.Run(async context =>
                 {
                     applicationExecuted = true;
-                    fakeService = context.ApplicationServices.GetService<FakeService>();
+                    fakeService = context.RequestServices.GetService<FakeService>();
                 });
             });