Skip to content

Commit 8cedb4e

Browse files
authored
React to pipeline changes (#503)
1 parent 575c006 commit 8cedb4e

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

build/dependencies.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@
2828
<MicrosoftExtensionsPlatformAbstractionsPackageVersion>1.1.0</MicrosoftExtensionsPlatformAbstractionsPackageVersion>
2929
<MicrosoftExtensionsSecurityHelperSourcesPackageVersion>2.1.0-preview1-27965</MicrosoftExtensionsSecurityHelperSourcesPackageVersion>
3030
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
31-
<MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26016-05</MicrosoftNETCoreApp21PackageVersion>
31+
<MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26102-01</MicrosoftNETCoreApp21PackageVersion>
3232
<MicrosoftNetHttpHeadersPackageVersion>2.1.0-preview1-27965</MicrosoftNetHttpHeadersPackageVersion>
3333
<MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
3434
<MicrosoftWebAdministrationPackageVersion>7.0.0</MicrosoftWebAdministrationPackageVersion>
35-
<SystemBuffersPackageVersion>4.5.0-preview1-26016-05</SystemBuffersPackageVersion>
36-
<SystemIOPipelinesPackageVersion>0.1.0-e171215-1</SystemIOPipelinesPackageVersion>
35+
<SystemBuffersPackageVersion>4.5.0-preview1-26102-01</SystemBuffersPackageVersion>
36+
<SystemIOPipelinesPackageVersion>0.1.0-e180104-2</SystemIOPipelinesPackageVersion>
3737
<SystemManagementAutomationPackageVersion>6.1.7601.17515</SystemManagementAutomationPackageVersion>
38-
<SystemMemoryPackageVersion>4.5.0-preview1-26016-05</SystemMemoryPackageVersion>
39-
<SystemNumericsVectorsPackageVersion>4.5.0-preview1-26016-05</SystemNumericsVectorsPackageVersion>
40-
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-preview1-26016-05</SystemRuntimeCompilerServicesUnsafePackageVersion>
41-
<SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview1-26016-05</SystemSecurityPrincipalWindowsPackageVersion>
42-
<SystemTextEncodingsWebUtf8PackageVersion>0.1.0-e171215-1</SystemTextEncodingsWebUtf8PackageVersion>
38+
<SystemMemoryPackageVersion>4.5.0-preview1-26102-01</SystemMemoryPackageVersion>
39+
<SystemNumericsVectorsPackageVersion>4.5.0-preview1-26102-01</SystemNumericsVectorsPackageVersion>
40+
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-preview1-26102-01</SystemRuntimeCompilerServicesUnsafePackageVersion>
41+
<SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview1-26102-01</SystemSecurityPrincipalWindowsPackageVersion>
42+
<SystemTextEncodingsWebUtf8PackageVersion>0.1.0-e180104-2</SystemTextEncodingsWebUtf8PackageVersion>
4343
<XunitPackageVersion>2.3.1</XunitPackageVersion>
4444
<XunitRunnerVisualStudioPackageVersion>2.3.1</XunitRunnerVisualStudioPackageVersion>
4545
</PropertyGroup>

src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ internal unsafe IISHttpContext(MemoryPool memoryPool, IntPtr pInProcessHandler,
141141
RequestBody = new IISHttpRequestBody(this);
142142
ResponseBody = new IISHttpResponseBody(this);
143143

144-
Input = new Pipe(new PipeOptions(_memoryPool, readerScheduler: TaskRunScheduler.Default));
145-
var pipe = new Pipe(new PipeOptions(_memoryPool, readerScheduler: TaskRunScheduler.Default));
144+
Input = new Pipe(new PipeOptions(_memoryPool, readerScheduler: Scheduler.TaskRun));
145+
var pipe = new Pipe(new PipeOptions(_memoryPool, readerScheduler: Scheduler.TaskRun));
146146
Output = new OutputProducer(pipe);
147147
}
148148

@@ -162,7 +162,7 @@ internal unsafe IISHttpContext(MemoryPool memoryPool, IntPtr pInProcessHandler,
162162
public string RequestConnectionId { get; set; }
163163
public string TraceIdentifier { get; set; }
164164
public ClaimsPrincipal User { get; set; }
165-
internal WindowsPrincipal WindowsUser { get; set; }
165+
internal WindowsPrincipal WindowsUser { get; set; }
166166
public Stream RequestBody { get; set; }
167167
public Stream ResponseBody { get; set; }
168168
public IPipe Input { get; set; }
@@ -561,7 +561,7 @@ private async Task ProcessResponseBody()
561561
Output.Reader.Complete();
562562
}
563563

564-
private unsafe IISAwaitable WriteAsync(ReadableBuffer buffer)
564+
private unsafe IISAwaitable WriteAsync(ReadOnlyBuffer buffer)
565565
{
566566
var fCompletionExpected = false;
567567
var hr = 0;

src/Microsoft.AspNetCore.Server.IISIntegration/Server/OutputProducer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private Task FlushAsync(WritableBuffer writableBuffer,
110110
return FlushAsyncAwaited(awaitable, cancellationToken);
111111
}
112112

113-
private async Task FlushAsyncAwaited(WritableBufferAwaitable awaitable, CancellationToken cancellationToken)
113+
private async Task FlushAsyncAwaited(ValueAwaiter<FlushResult> awaitable, CancellationToken cancellationToken)
114114
{
115115
// https://github.com/dotnet/corefxlab/issues/1334
116116
// Since the flush awaitable doesn't currently support multiple awaiters

0 commit comments

Comments
 (0)