Merge in 'release/5.0' changes

dotnet · Jan 7, 2022 · d5b56c6 · d5b56c6
2 parents 85e316c + 6d975f9
commit d5b56c6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/src/libraries/System.IO.Pipelines/Directory.Build.props b/src/libraries/System.IO.Pipelines/Directory.Build.props
@@ -2,7 +2,7 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <StrongNameKeyId>Open</StrongNameKeyId>
-    <ServicingVersion>1</ServicingVersion>
+    <ServicingVersion>2</ServicingVersion>
     <!-- This should be pinned to 5.0.0.1 for non-netfx assets as it is part of aspnetcore ref pack.-->
     <AssemblyVersion>5.0.0.1</AssemblyVersion>
   </PropertyGroup>

diff --git a/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/Pipe.cs b/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/Pipe.cs
@@ -1011,7 +1011,7 @@ private void WriteMultiSegment(ReadOnlySpan<byte> source)
                 }
 
                 // We filled the segment
-                _writingHead.End += writable;
+                _writingHead.End += _writingHeadBytesBuffered;
                 _writingHeadBytesBuffered = 0;
 
                 // This is optimized to use pooled memory. That's why we pass 0 instead of

diff --git a/src/libraries/System.IO.Pipelines/tests/PipeLengthTests.cs b/src/libraries/System.IO.Pipelines/tests/PipeLengthTests.cs
@@ -277,5 +277,19 @@ public async Task NullExaminedAndConsumedNoops()
             ReadResult result = await _pipe.Reader.ReadAsync();
             _pipe.Reader.AdvanceTo(default, default);
         }
+
+        [Fact]
+        public async Task AdvanceFollowedByWriteAsyncTest()
+        {
+            Memory<byte> buffer = new byte[26];
+            Pipe pipe = new(new PipeOptions(minimumSegmentSize: 1));
+
+            var mem = pipe.Writer.GetMemory(14)[..14];
+            buffer[..14].CopyTo(mem);
+            pipe.Writer.Advance(14);
+            await pipe.Writer.WriteAsync(buffer[14..]);
+            ReadResult res = await pipe.Reader.ReadAsync();
+            Assert.Equal(res.Buffer.Length, buffer.Length);
+        }
     }
 }
diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj
@@ -18,6 +18,7 @@
     <ProjectReference Include="$(PkgDir)*\*.proj" Exclude="$(PkgDir)test\*" Condition="'$(BuildAllOOBPackages)' == 'true'" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\**\*.pkgproj" Condition="('$(BuildAllConfigurations)' == 'true' or '$(DotNetBuildFromSource)' == 'true') And '$(BuildAllOOBPackages)' == 'true'" />
     <!-- If setting BuildAllOOBPackages to false, add bellow the individual OOB packages you want to continue to build -->
+    <ProjectReference Include="$(MSBuildThisFileDirectory)System.IO.Pipelines\pkg\System.IO.Pipelines.pkgproj" Condition="('$(BuildAllConfigurations)' == 'true' or '$(DotNetBuildFromSource)' == 'true') And '$(BuildAllOOBPackages)' == 'true'" />
     <!-- This is merge marker 1 to help automerge -->
     <!-- This is merge marker 2 to help automerge --> 
     <!-- This is merge marker 3 to help automerge -->