Commit a9e3c6a

committed

Fix some errors

1 parent f2b8c67 commit a9e3c6aCopy full SHA for a9e3c6a

File tree

2 files changed

-8

lines changed

src/Servers/IIS/IIS/test/testassets/InProcessWebSite
- Startup.WebSockets.cs
- Startup.cs

2 files changed

-8

lines changed

`‎src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private void WebSocketEcho(IApplicationBuilder app)`
`62`	`62`	`{`
`63`	`63`	`var ws = await Upgrade(context);`
`64`	`64`	`#if FORWARDCOMPAT`
`65`		`- var appLifetime = app.ApplicationServices.GetRequiredService<Microsoft.AspNetCore.Hosting.IApplicationLifetime>();`
	`65`	`+ var appLifetime = app.ApplicationServices.GetRequiredService<IHostApplicationLifetime>();`
`66`	`66`	`#else`
`67`	`67`	`var appLifetime = app.ApplicationServices.GetRequiredService<IHostApplicationLifetime>();`
`68`	`68`	`#endif`

`‎src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs‎`

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,9 @@ public void ConfigureServices(IServiceCollection serviceCollection)`
`55`	`55`	`serviceCollection.AddHttpContextAccessor();`
`56`	`56`	`}`
`57`	`57`	`#if FORWARDCOMPAT`
`58`		`- private async Task ContentRootPath(HttpContext ctx) => await ctx.Response.WriteAsync(ctx.RequestServices.GetService<Microsoft.AspNetCore.Hosting.IHostingEnvironment>().ContentRootPath);`
	`58`	`+ private async Task ContentRootPath(HttpContext ctx) => await ctx.Response.WriteAsync(ctx.RequestServices.GetService<IWebHostEnvironment>().ContentRootPath);`
`59`	`59`
`60`		`- private async Task WebRootPath(HttpContext ctx) => await ctx.Response.WriteAsync(ctx.RequestServices.GetService<Microsoft.AspNetCore.Hosting.IHostingEnvironment>().WebRootPath);`
	`60`	`+ private async Task WebRootPath(HttpContext ctx) => await ctx.Response.WriteAsync(ctx.RequestServices.GetService<IWebHostEnvironment>().WebRootPath);`
`61`	`61`	`#else`
`62`	`62`	`private async Task ContentRootPath(HttpContext ctx) => await ctx.Response.WriteAsync(ctx.RequestServices.GetService<IWebHostEnvironment>().ContentRootPath);`
`63`	`63`
`@@ -175,7 +175,7 @@ public async Task WaitingRequestCount(HttpContext context)`
`175`	`175`	`public Task CreateFile(HttpContext context)`
`176`	`176`	`{`
`177`	`177`	`#if FORWARDCOMPAT`
`178`		`- var hostingEnv = context.RequestServices.GetService<Microsoft.AspNetCore.Hosting.IHostingEnvironment>();`
	`178`	`+ var hostingEnv = context.RequestServices.GetService<IWebHostEnvironment>();`
`179`	`179`	`#else`
`180`	`180`	`var hostingEnv = context.RequestServices.GetService<IWebHostEnvironment>();`
`181`	`181`	`#endif`
`@@ -597,7 +597,7 @@ private async Task WaitForAppToStartShuttingDown(HttpContext ctx)`
`597`	`597`	`{`
`598`	`598`	`await ctx.Response.WriteAsync("test1");`
`599`	`599`	`#if FORWARDCOMPAT`
`600`		`- var lifetime = ctx.RequestServices.GetService<Microsoft.AspNetCore.Hosting.IApplicationLifetime>();`
	`600`	`+ var lifetime = ctx.RequestServices.GetService<IHostApplicationLifetime>();`
`601`	`601`	`#else`
`602`	`602`	`var lifetime = ctx.RequestServices.GetService<IHostApplicationLifetime>();`
`603`	`603`	`#endif`
`@@ -680,8 +680,9 @@ private async Task ReadAndWriteEchoLines(HttpContext ctx)`
`680`	`680`	`private async Task ReadAndWriteEchoLinesNoBuffering(HttpContext ctx)`
`681`	`681`	`{`
`682`	`682`	`#if FORWARDCOMPAT`
`683`		`- var feature = ctx.Features.Get<IHttpBufferingFeature>();`
`684`		`- feature.DisableResponseBuffering();`
	`683`	`+ var feature = ctx.Features.Get<IHttpResponseBodyFeature>();`
	`684`	`+ feature.DisableBuffering();`
	`685`	`+ Assert.True(ctx.Request.CanHaveBody());`
`685`	`686`	`#else`
`686`	`687`	`var feature = ctx.Features.Get<IHttpResponseBodyFeature>();`
`687`	`688`	`feature.DisableBuffering();`
`@@ -993,7 +994,7 @@ private async Task Shutdown(HttpContext ctx)`
`993`	`994`	`{`
`994`	`995`	`await ctx.Response.WriteAsync("Shutting down");`
`995`	`996`	`#if FORWARDCOMPAT`
`996`		`- ctx.RequestServices.GetService<Microsoft.AspNetCore.Hosting.IApplicationLifetime>().StopApplication();`
	`997`	`+ ctx.RequestServices.GetService<IHostApplicationLifetime>().StopApplication();`
`997`	`998`	`#else`
`998`	`999`	`ctx.RequestServices.GetService<IHostApplicationLifetime>().StopApplication();`
`999`	`1000`	`#endif`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a9e3c6a

File tree

2 files changed

2 files changed

`‎src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs‎`

`‎src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs‎`

0 commit comments