From 8cedb4eff306db88c2ae2ae7d9aa736c318e1682 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 4 Jan 2018 10:01:16 -0800 Subject: [PATCH] React to pipeline changes (#503) --- build/dependencies.props | 16 ++++++++-------- .../Server/IISHttpContext.cs | 8 ++++---- .../Server/OutputProducer.cs | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 7cc25af0cd..c3b2506600 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -28,18 +28,18 @@ 1.1.0 2.1.0-preview1-27965 2.0.0 - 2.1.0-preview1-26016-05 + 2.1.0-preview1-26102-01 2.1.0-preview1-27965 15.3.0 7.0.0 - 4.5.0-preview1-26016-05 - 0.1.0-e171215-1 + 4.5.0-preview1-26102-01 + 0.1.0-e180104-2 6.1.7601.17515 - 4.5.0-preview1-26016-05 - 4.5.0-preview1-26016-05 - 4.5.0-preview1-26016-05 - 4.5.0-preview1-26016-05 - 0.1.0-e171215-1 + 4.5.0-preview1-26102-01 + 4.5.0-preview1-26102-01 + 4.5.0-preview1-26102-01 + 4.5.0-preview1-26102-01 + 0.1.0-e180104-2 2.3.1 2.3.1 diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs index 5f1c6ac894..5536833474 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs @@ -141,8 +141,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration RequestBody = new IISHttpRequestBody(this); ResponseBody = new IISHttpResponseBody(this); - Input = new Pipe(new PipeOptions(_memoryPool, readerScheduler: TaskRunScheduler.Default)); - var pipe = new Pipe(new PipeOptions(_memoryPool, readerScheduler: TaskRunScheduler.Default)); + Input = new Pipe(new PipeOptions(_memoryPool, readerScheduler: Scheduler.TaskRun)); + var pipe = new Pipe(new PipeOptions(_memoryPool, readerScheduler: Scheduler.TaskRun)); Output = new OutputProducer(pipe); } @@ -162,7 +162,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration public string RequestConnectionId { get; set; } public string TraceIdentifier { get; set; } public ClaimsPrincipal User { get; set; } - internal WindowsPrincipal WindowsUser { get; set; } + internal WindowsPrincipal WindowsUser { get; set; } public Stream RequestBody { get; set; } public Stream ResponseBody { get; set; } public IPipe Input { get; set; } @@ -561,7 +561,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration Output.Reader.Complete(); } - private unsafe IISAwaitable WriteAsync(ReadableBuffer buffer) + private unsafe IISAwaitable WriteAsync(ReadOnlyBuffer buffer) { var fCompletionExpected = false; var hr = 0; diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/OutputProducer.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/OutputProducer.cs index d469dd4d88..91c664c5b3 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/OutputProducer.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/OutputProducer.cs @@ -110,7 +110,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration return FlushAsyncAwaited(awaitable, cancellationToken); } - private async Task FlushAsyncAwaited(WritableBufferAwaitable awaitable, CancellationToken cancellationToken) + private async Task FlushAsyncAwaited(ValueAwaiter awaitable, CancellationToken cancellationToken) { // https://github.com/dotnet/corefxlab/issues/1334 // Since the flush awaitable doesn't currently support multiple awaiters