Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit a32de71

Browse files
authored
Fix System.IO.Pipelines reference assembly (#27644)
* Fix pipelines referency assembly * Only include System.Threading.Tasks when needed (on netstandard11). * Revert changes to ref csproj
1 parent f971d9b commit a32de71

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/System.IO.Pipelines/ref/System.IO.Pipelines.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ protected PipeWriter() { }
8080
public abstract void CancelPendingFlush();
8181
public abstract void Complete(System.Exception exception = null);
8282
public abstract System.IO.Pipelines.PipeAwaiter<System.IO.Pipelines.FlushResult> FlushAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
83-
public abstract System.Memory<byte> GetMemory(int minimumLength = 0);
84-
public abstract System.Span<byte> GetSpan(int minimumLength = 0);
83+
public abstract System.Memory<byte> GetMemory(int sizeHint = 0);
84+
public abstract System.Span<byte> GetSpan(int sizeHint = 0);
8585
public abstract void OnReaderCompleted(System.Action<System.Exception, object> callback, object state);
8686
public virtual System.IO.Pipelines.PipeAwaiter<System.IO.Pipelines.FlushResult> WriteAsync(System.ReadOnlyMemory<byte> source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
8787
}

src/System.IO.Pipelines/ref/System.IO.Pipelines.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<Reference Include="System.Threading.Tasks" />
1717
</ItemGroup>
1818
<ItemGroup>
19-
<ProjectReference Include="..\..\System.Memory\ref\System.Memory.csproj" />
2019
<ProjectReference Include="..\..\System.Buffers\ref\System.Buffers.csproj" />
20+
<ProjectReference Include="..\..\System.Memory\ref\System.Memory.csproj" />
2121
</ItemGroup>
2222
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
2323
</Project>

src/System.IO.Pipelines/src/System.IO.Pipelines.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<Reference Include="System.Runtime" />
5454
<Reference Include="System.Runtime.Extensions" />
5555
<Reference Include="System.Threading" />
56-
<Reference Include="System.Threading.Tasks" />
56+
<Reference Include="System.Threading.Tasks" Condition="'$(TargetGroup)' == 'netstandard1.1'" />
5757
<Reference Include="System.Threading.ThreadPool" Condition="'$(TargetGroup)' != 'netstandard1.1'" />
5858
</ItemGroup>
5959
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

0 commit comments

Comments
 (0)