From da7fe362c9ff259239118b34bff72b0a7e63c928 Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 19 Nov 2015 15:03:57 -0800 Subject: [PATCH] Reacting to ApplicationServices removal from HttpContext --- samples/DatabaseErrorPageSample/Startup.cs | 2 +- .../Views/BaseView.cs | 6 +++--- .../DatabaseErrorPageMiddlewareTest.cs | 18 +++++++++--------- .../ElmMiddlewareTest.cs | 2 +- .../RuntimeInfoMiddlewareTest.cs | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/samples/DatabaseErrorPageSample/Startup.cs b/samples/DatabaseErrorPageSample/Startup.cs index cc59dfbcea..d6ee399eea 100644 --- a/samples/DatabaseErrorPageSample/Startup.cs +++ b/samples/DatabaseErrorPageSample/Startup.cs @@ -22,7 +22,7 @@ namespace DatabaseErrorPageSample app.UseDatabaseErrorPage(); app.Run(context => { - context.ApplicationServices.GetService().Blog.FirstOrDefault(); + context.RequestServices.GetService().Blog.FirstOrDefault(); return Task.FromResult(0); }); } diff --git a/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs b/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs index 7ee4ed6448..7b37ec718d 100644 --- a/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs +++ b/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs @@ -66,9 +66,9 @@ namespace Microsoft.AspNet.Diagnostics.Views Request = Context.Request; Response = Context.Response; Output = new StreamWriter(Response.Body, Encoding.UTF8, 4096, leaveOpen: true); - HtmlEncoder = context.ApplicationServices.GetHtmlEncoder(); - UrlEncoder = context.ApplicationServices.GetUrlEncoder(); - JavaScriptEncoder = context.ApplicationServices.GetJavaScriptEncoder(); + HtmlEncoder = context.RequestServices.GetHtmlEncoder(); + UrlEncoder = context.RequestServices.GetUrlEncoder(); + JavaScriptEncoder = context.RequestServices.GetJavaScriptEncoder(); await ExecuteAsync(); Output.Dispose(); } diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs index 43b32a76b6..e979e54fc7 100644 --- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs +++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs @@ -92,7 +92,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests public virtual Task Invoke(HttpContext context) { - var db = context.ApplicationServices.GetService(); + var db = context.RequestServices.GetService(); db.Database.EnsureCreated(); db.Database.ExecuteSqlCommand("ALTER TABLE dbo.Blog DROP COLUMN Name"); @@ -123,7 +123,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests public virtual Task Invoke(HttpContext context) { - var db = context.ApplicationServices.GetService(); + var db = context.RequestServices.GetService(); db.Blogs.Add(new Blog()); db.SaveChanges(); throw new Exception("SaveChanges should have thrown"); @@ -155,7 +155,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests public virtual Task Invoke(HttpContext context) { - var db = context.ApplicationServices.GetService(); + var db = context.RequestServices.GetService(); db.Blogs.Add(new Blog()); db.SaveChanges(); throw new Exception("SaveChanges should have thrown"); @@ -184,7 +184,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests public virtual Task Invoke(HttpContext context) { - var db = context.ApplicationServices.GetService(); + var db = context.RequestServices.GetService(); db.Database.Migrate(); db.Blogs.Add(new Blog()); @@ -237,7 +237,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests public virtual async Task Invoke(HttpContext context) { - var db = context.ApplicationServices.GetService(); + var db = context.RequestServices.GetService(); db.Blogs.Add(new Blog()); db.SaveChanges(); await context.Response.WriteAsync("Saved a Blog"); @@ -325,8 +325,8 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests public virtual Task Invoke(HttpContext context) { - var options = context.ApplicationServices.GetService(); - var db = new BloggingContext(context.ApplicationServices, options); + var options = context.RequestServices.GetService(); + var db = new BloggingContext(context.RequestServices, options); db.Blogs.Add(new Blog()); db.SaveChanges(); throw new Exception("SaveChanges should have thrown"); @@ -358,7 +358,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests public virtual Task Invoke(HttpContext context) { - var db = context.ApplicationServices.GetService(); + var db = context.RequestServices.GetService(); db.Blogs.Add(new Blog()); db.SaveChanges(); throw new Exception("SaveChanges should have thrown"); @@ -385,7 +385,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests public virtual Task Invoke(HttpContext context) { - var db = context.ApplicationServices.GetService(); + var db = context.RequestServices.GetService(); db.Blogs.Add(new Blog()); try { diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs index c2d4059545..e16c100397 100644 --- a/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs +++ b/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs @@ -106,7 +106,7 @@ namespace Microsoft.AspNet.Diagnostics.Tests .SetupGet(c => c.Response.Body) .Returns(responseStream); contextMock - .SetupGet(c => c.ApplicationServices) + .SetupGet(c => c.RequestServices) .Returns(() => null); // Act diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs index 44574b3e39..c7a2e3f78a 100644 --- a/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs +++ b/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs @@ -144,7 +144,7 @@ namespace Microsoft.AspNet.Diagnostics.Tests .SetupGet(c => c.Response.Body) .Returns(responseStream); contextMock - .SetupGet(c => c.ApplicationServices) + .SetupGet(c => c.RequestServices) .Returns(() => null); // Act @@ -203,7 +203,7 @@ namespace Microsoft.AspNet.Diagnostics.Tests .SetupGet(c => c.Response.Body) .Returns(responseStream); contextMock - .SetupGet(c => c.ApplicationServices) + .SetupGet(c => c.RequestServices) .Returns(new ServiceCollection() .AddSingleton(new HtmlTestEncoder()) .BuildServiceProvider());