Merge remote-tracking branch 'upstream/release/2.1' into 2.1-merge

2 files changed, 6 insertions, 6 deletions

diff --git a/src/System.IO.FileSystem/tests/FileStream/ReadWriteSpan.netcoreapp.cs b/src/System.IO.FileSystem/tests/FileStream/ReadWriteSpan.netcoreapp.cs
index 0b1898d1f5..187c7788be 100644
--- a/src/System.IO.FileSystem/tests/FileStream/ReadWriteSpan.netcoreapp.cs
+++ b/src/System.IO.FileSystem/tests/FileStream/ReadWriteSpan.netcoreapp.cs
@@ -189,13 +189,13 @@ namespace System.IO.Tests
         }
 
         [Fact]
-        public async Task NonEmptyFile_CustomOwnedMemory_ReadAsync_GetsExpectedData()
+        public async Task NonEmptyFile_CustomMemoryManager_ReadAsync_GetsExpectedData()
         {
             string fileName = GetTestFilePath();
             File.WriteAllBytes(fileName, TestBuffer);
 
             using (var fs = CreateFileStream(fileName, FileMode.Open))
-            using (var buffer = new NativeOwnedMemory(TestBuffer.Length))
+            using (var buffer = new NativeMemoryManager(TestBuffer.Length))
             {
                 Assert.Equal(TestBuffer.Length, await fs.ReadAsync(buffer.Memory));
                 Assert.Equal<byte>(TestBuffer, buffer.Memory.ToArray());
@@ -255,9 +255,9 @@ namespace System.IO.Tests
         }
 
         [Fact]
-        public async Task NonEmptyWriteAsync_CustomOwnedMemory_WritesExpectedData()
+        public async Task NonEmptyWriteAsync_CustomMemoryManager_WritesExpectedData()
         {
-            using (var mem = new NativeOwnedMemory(TestBuffer.Length))
+            using (var mem = new NativeMemoryManager(TestBuffer.Length))
             using (var fs = CreateFileStream(GetTestFilePath(), FileMode.Create))
             {
                 new Memory<byte>(TestBuffer).CopyTo(mem.Memory);
diff --git a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
index 7597996101..3a25873cb3 100644
--- a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
+++ b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
@@ -177,8 +177,8 @@
     <Compile Include="FileInfo\AppendText.cs" />
     <Compile Include="FileInfo\CopyTo.cs" />
     <!-- Helpers -->
-    <Compile Include="$(CommonTestPath)\System\Buffers\NativeOwnedMemory.cs">
-      <Link>Common\System\Buffers\NativeOwnedMemory.cs</Link>
+    <Compile Include="$(CommonTestPath)\System\Buffers\NativeMemoryManager.cs">
+      <Link>Common\System\Buffers\NativeMemoryManager.cs</Link>
     </Compile>
     <Compile Include="$(CommonTestPath)\System\IO\TempFile.cs">
       <Link>Common\System\IO\TempFile.cs</Link>