diff options
| author | Ahson Khan <ahkha@microsoft.com> | 2018-03-31 00:30:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-31 00:30:48 +0300 |
| commit | f592e887e2349ed52af6a83070c42adb9d26408c (patch) | |
| tree | 9d54fc60a316198f6a28409556c707af3eb46412 /src/System.IO | |
| parent | 366496832fbf9c893a33ebed176d6e053c721ca1 (diff) | |
Split OwnedMemory into MemoryManager and IMemoryOwner (#28640)
* Update IRetainable, OwnedMemory, and MemoryHandle APIs
* Split OwnedMemory into MemoryManager and IMemoryOwner
* Update ReadOnlySequence, ArrayMemoryPool, and BufferSegment
* Update System.Memory and System.IO.Pipeline tests
* Temporarily skipping the failing Pipelines tests until impl is corrected.
* Update the reference assembly to match implementation and cleanup
* Update API compat baseline for UAPAOT and add GenFacadesIgnoreMissingTypes
* Fix the System.Runtime ref
* Add back the Pin methods to the uapaot api compat baseline
* Clone the API compat baseline from uapaot and add it for uap as well.
* Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview3-02630-01, preview3-26330-08, preview3-26330-06, preview3-26330-04, beta-26330-00, beta-26330-00, respectively
* Fix pipelines tests and update the api compat baseline shim for uapaot
* Add empty Unpin override to pipe pool test.
* Fix the System.Net.Http Functional tests
Diffstat (limited to 'src/System.IO')
| -rw-r--r-- | src/System.IO/tests/Stream/Stream.ReadWriteSpan.netcoreapp.cs | 4 | ||||
| -rw-r--r-- | src/System.IO/tests/System.IO.Tests.csproj | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/System.IO/tests/Stream/Stream.ReadWriteSpan.netcoreapp.cs b/src/System.IO/tests/Stream/Stream.ReadWriteSpan.netcoreapp.cs index 6bdea544b0..c25418c06f 100644 --- a/src/System.IO/tests/Stream/Stream.ReadWriteSpan.netcoreapp.cs +++ b/src/System.IO/tests/Stream/Stream.ReadWriteSpan.netcoreapp.cs @@ -115,7 +115,7 @@ namespace System.IO.Tests return Task.FromResult(10); }); - using (var totalNativeMemory = new NativeOwnedMemory(30)) + using (var totalNativeMemory = new NativeMemoryManager(30)) { Memory<byte> totalMemory = totalNativeMemory.Memory; Memory<byte> targetMemory = totalMemory.Slice(5, 20); @@ -174,7 +174,7 @@ namespace System.IO.Tests return Task.CompletedTask; }); - using (var nativeMemory = new NativeOwnedMemory(10)) + using (var nativeMemory = new NativeMemoryManager(10)) { Memory<byte> memory = nativeMemory.Memory; memory.Span[2] = 0; diff --git a/src/System.IO/tests/System.IO.Tests.csproj b/src/System.IO/tests/System.IO.Tests.csproj index 52cf08256d..a1a7f7cc49 100644 --- a/src/System.IO/tests/System.IO.Tests.csproj +++ b/src/System.IO/tests/System.IO.Tests.csproj @@ -57,8 +57,8 @@ <Compile Include="StringReader\StringReader.CtorTests.cs" /> <Compile Include="StringWriter\StringWriterTests.netcoreapp.cs" Condition="'$(TargetGroup)' == 'netcoreapp'" /> <Compile Include="StringWriter\StringWriterTests.cs" /> - <Compile Include="$(CommonTestPath)\System\Buffers\NativeOwnedMemory.cs" Condition="'$(TargetGroup)' == 'netcoreapp'"> - <Link>Common\System\Buffers\NativeOwnedMemory.cs</Link> + <Compile Include="$(CommonTestPath)\System\Buffers\NativeMemoryManager.cs" Condition="'$(TargetGroup)' == 'netcoreapp'"> + <Link>Common\System\Buffers\NativeMemoryManager.cs</Link> </Compile> <Compile Include="$(CommonTestPath)\System\IO\CallTrackingStream.cs"> <Link>Common\System\IO\CallTrackingStream.cs</Link> |