Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to prerelease-02312-02, preview1-26013-03, preview1-26013-06, preview1-26012-06, beta-26013-00, beta-26013-00, respectively (master)

BuildToolsVersion.txt

@@ -1 +1 @@
-2.1.0-prerelease-02304-01
+2.1.0-prerelease-02312-02

dependencies.props

@@ -9,15 +9,15 @@
        These ref versions are pulled from https://github.com/dotnet/versions.
   -->
   <PropertyGroup>
-    <CoreFxCurrentRef>ba779d501d3d8c70deb52b7e1074b897b6b9b357</CoreFxCurrentRef>
-    <CoreClrCurrentRef>ba779d501d3d8c70deb52b7e1074b897b6b9b357</CoreClrCurrentRef>
-    <CoreSetupCurrentRef>92e0b8eb154b97421de10a605fcda7993f99466c</CoreSetupCurrentRef>
+    <CoreFxCurrentRef>fb15a62b48c5f6cc1cd3d658c7b74ddc3a5e1a78</CoreFxCurrentRef>
+    <CoreClrCurrentRef>fb15a62b48c5f6cc1cd3d658c7b74ddc3a5e1a78</CoreClrCurrentRef>
+    <CoreSetupCurrentRef>fb15a62b48c5f6cc1cd3d658c7b74ddc3a5e1a78</CoreSetupCurrentRef>
     <ExternalCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ExternalCurrentRef>
-    <ProjectNTfsCurrentRef>92e0b8eb154b97421de10a605fcda7993f99466c</ProjectNTfsCurrentRef>
-    <ProjectNTfsTestILCCurrentRef>92e0b8eb154b97421de10a605fcda7993f99466c</ProjectNTfsTestILCCurrentRef>
+    <ProjectNTfsCurrentRef>fb15a62b48c5f6cc1cd3d658c7b74ddc3a5e1a78</ProjectNTfsCurrentRef>
+    <ProjectNTfsTestILCCurrentRef>fb15a62b48c5f6cc1cd3d658c7b74ddc3a5e1a78</ProjectNTfsTestILCCurrentRef>
     <SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
     <StandardCurrentRef>6298244e25cf84d91e3cda9627315f2425274624</StandardCurrentRef>
-    <BuildToolsCurrentRef>ee6b82e62028a90468bb3827a660ee946d990409</BuildToolsCurrentRef>
+    <BuildToolsCurrentRef>fb15a62b48c5f6cc1cd3d658c7b74ddc3a5e1a78</BuildToolsCurrentRef>
   </PropertyGroup>
 
   <!-- Product dependency versions. -->
@@ -31,30 +31,30 @@
 
   <!-- Tests/infrastructure dependency versions. -->
   <PropertyGroup>
-    <CoreFxExpectedPrerelease>preview1-26007-02</CoreFxExpectedPrerelease>
-    <MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview1-26007-02</MicrosoftNETCorePlatformsPackageVersion>
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-preview1-26007-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
-    <ProjectNTfsExpectedPrerelease>beta-26007-00</ProjectNTfsExpectedPrerelease>
-    <ProjectNTfsTestILCExpectedPrerelease>beta-26007-00</ProjectNTfsTestILCExpectedPrerelease>
-    <ProjectNTfsTestILCPackageVersion>1.0.0-beta-26007-00</ProjectNTfsTestILCPackageVersion>
+    <CoreFxExpectedPrerelease>preview1-26013-06</CoreFxExpectedPrerelease>
+    <MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview1-26013-06</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-preview1-26013-03</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+    <ProjectNTfsExpectedPrerelease>beta-26013-00</ProjectNTfsExpectedPrerelease>
+    <ProjectNTfsTestILCExpectedPrerelease>beta-26013-00</ProjectNTfsTestILCExpectedPrerelease>
+    <ProjectNTfsTestILCPackageVersion>1.0.0-beta-26013-00</ProjectNTfsTestILCPackageVersion>
     <MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview1-25929-07</MicrosoftNETCoreDotNetHostPackageVersion>
     <MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview1-25929-07</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
-    <MicrosoftNETCoreAppPackageVersion>2.1.0-preview1-26007-02</MicrosoftNETCoreAppPackageVersion>
-    <MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview1-26007-02</MicrosoftDotNetPlatformAbstractionsPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>2.1.0-preview1-26012-06</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview1-26012-06</MicrosoftDotNetPlatformAbstractionsPackageVersion>
 
     <!-- CoreFX-built SNI identity package -->
     <RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
 
     <AppXRunnerVersion>1.0.3-prerelease-00921-01</AppXRunnerVersion>
     <XunitPerfAnalysisPackageVersion>1.0.0-beta-build0007</XunitPerfAnalysisPackageVersion>
     <TraceEventPackageVersion>1.0.3-alpha-experimental</TraceEventPackageVersion>
-    <XunitNetcoreExtensionsVersion>2.1.0-prerelease-02304-01</XunitNetcoreExtensionsVersion>
+    <XunitNetcoreExtensionsVersion>2.1.0-prerelease-02312-02</XunitNetcoreExtensionsVersion>
   </PropertyGroup>
 
   <!-- Package versions used as toolsets -->
   <PropertyGroup>
     <FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
-    <FeedTasksPackageVersion>2.1.0-prerelease-02304-01</FeedTasksPackageVersion>
+    <FeedTasksPackageVersion>2.1.0-prerelease-02312-02</FeedTasksPackageVersion>
   </PropertyGroup>
 
   <!-- Package dependency verification/auto-upgrade configuration. -->

external/test-runtime/optional.json

@@ -3,9 +3,9 @@
     "net45": {
       "dependencies": {
         "Microsoft.DotNet.IBCMerge": "4.6.0-alpha-00001",
-        "TestILC.amd64ret": "1.0.0-beta-26007-00",
-        "TestILC.armret": "1.0.0-beta-26007-00",
-        "TestILC.x86ret": "1.0.0-beta-26007-00"
+        "TestILC.amd64ret": "1.0.0-beta-26013-00",
+        "TestILC.armret": "1.0.0-beta-26013-00",
+        "TestILC.x86ret": "1.0.0-beta-26013-00"
       }
     }
   }

src/Common/tests/System/Buffers/NativeOwnedMemory.cs

@@ -53,7 +53,12 @@ protected override bool IsRetained
 
         public override unsafe Span<byte> Span => new Span<byte>((void*)_ptr, _length);
 
-        public override unsafe MemoryHandle Pin() => new MemoryHandle(this, (void*)_ptr);
+        public override unsafe MemoryHandle Pin(int offset = 0)
+        {
+            if (offset < 0 || offset >= _length) throw new ArgumentOutOfRangeException(nameof(offset));
+            void* pointer = (void*)((byte*)_ptr + offset);
+            return new MemoryHandle(this, pointer);
+        }
 
         public override bool Release()
         {

src/System.Memory/ref/System.Memory.cs

@@ -228,7 +228,7 @@ public abstract class OwnedMemory<T> : IDisposable, IRetainable
         public abstract Span<T> Span { get; }
         public void Dispose() { throw null; }
         protected abstract void Dispose(bool disposing);
-        public abstract MemoryHandle Pin();
+        public abstract MemoryHandle Pin(int offset = 0);
         public abstract bool Release();
         public abstract void Retain();
         protected internal abstract bool TryGetArray(out ArraySegment<T> arraySegment);

src/System.Memory/src/System/Buffers/MemoryHandle.cs

@@ -41,24 +41,6 @@ public unsafe struct MemoryHandle : IDisposable
         /// </summary>
         public bool HasPointer => _pointer != null;
 
-        /// <summary>
-        /// Adds an offset to the pinned pointer.
-        /// </summary>
-        /// <exception cref="System.ArgumentNullException">
-        /// Throw when pinned pointer is null.
-        /// </exception>
-        internal void AddOffset(int offset)
-        {
-            if (_pointer == null)
-            {
-                ThrowHelper.ThrowArgumentNullException(ExceptionArgument.pointer);
-            }
-            else
-            {
-                _pointer = (void*)((byte*)_pointer + offset);
-            }
-        }
-
         /// <summary>
         /// Frees the pinned handle and releases IRetainable.
         /// </summary>

src/System.Memory/src/System/Buffers/OwnedMemory.cs

@@ -45,7 +45,7 @@ public Memory<T> Memory
         /// <summary>
         /// Returns a handle for the array that has been pinned and hence its address can be taken
         /// </summary>
-        public abstract MemoryHandle Pin();
+        public abstract MemoryHandle Pin(int offset = 0);
 
         /// <summary>
         /// Returns an array segment.

src/System.Memory/src/System/Memory.cs

@@ -235,8 +235,7 @@ public unsafe MemoryHandle Retain(bool pin = false)
             {
                 if (_index < 0)
                 {
-                    memoryHandle = ((OwnedMemory<T>)_object).Pin();
-                    memoryHandle.AddOffset((_index & RemoveOwnedFlagBitMask) * Unsafe.SizeOf<T>());
+                    memoryHandle = ((OwnedMemory<T>)_object).Pin((_index & RemoveOwnedFlagBitMask) * Unsafe.SizeOf<T>());
                 }
                 else if (typeof(T) == typeof(char) && _object is string s)
                 {

src/System.Memory/src/System/ReadOnlyMemory.cs

@@ -209,8 +209,7 @@ public unsafe MemoryHandle Retain(bool pin = false)
             {
                 if (_index < 0)
                 {
-                    memoryHandle = ((OwnedMemory<T>)_object).Pin();
-                    memoryHandle.AddOffset((_index & RemoveOwnedFlagBitMask) * Unsafe.SizeOf<T>());
+                    memoryHandle = ((OwnedMemory<T>)_object).Pin((_index & RemoveOwnedFlagBitMask) * Unsafe.SizeOf<T>());
                 }
                 else if (typeof(T) == typeof(char) && _object is string s)
                 {

src/System.Memory/tests/Memory/CustomMemoryForTest.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Buffers;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Threading;
 
@@ -38,13 +39,14 @@ public override Span<T> Span
             }
         }
 
-        public override MemoryHandle Pin()
+        public override MemoryHandle Pin(int offset = 0)
         {
             unsafe
             {
                 Retain();
+                if (offset < 0 || offset >= _array.Length) throw new ArgumentOutOfRangeException(nameof(offset));
                 var handle = GCHandle.Alloc(_array, GCHandleType.Pinned);
-                return new MemoryHandle(this, (void*)handle.AddrOfPinnedObject(), handle);
+                return new MemoryHandle(this, Unsafe.Add<byte>((void*)handle.AddrOfPinnedObject(), offset), handle);
             }
         }
 

src/System.Runtime/ref/System.Runtime.cs

@@ -3889,7 +3889,7 @@ public abstract class OwnedMemory<T> : IDisposable, IRetainable
         public abstract Span<T> Span { get; }
         public void Dispose() { throw null; }
         protected abstract void Dispose(bool disposing);
-        public abstract MemoryHandle Pin();
+        public abstract MemoryHandle Pin(int offset = 0);
         public abstract bool Release();
         public abstract void Retain();
         protected internal abstract bool TryGetArray(out ArraySegment<T> arraySegment);

tools-local/ILAsmVersion.txt

@@ -1 +1 @@
-2.1.0-preview1-26007-01
+2.1.0-preview1-26013-03