From ffae512310456d66f542a67f3ec7e794e16aaeb0 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Thu, 8 Mar 2018 09:05:33 -0800
Subject: [PATCH] Update versions

---
 build/dependencies.props                           | 14 +++++++-------
 .../MemoryPoolBlock.cs                             |  2 +-
 .../SlabMemoryPool.cs                              |  2 +-
 .../PipeWriterTests.cs                             |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index a2a7ecf751b..48922453dc4 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -7,16 +7,16 @@
     <FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
     <InternalAspNetCoreSdkPackageVersion>2.1.0-preview2-15721</InternalAspNetCoreSdkPackageVersion>
     <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
-    <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview2-26305-07</MicrosoftNETCoreApp21PackageVersion>
+    <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview2-26308-01</MicrosoftNETCoreApp21PackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.6.0</MicrosoftNETTestSdkPackageVersion>
     <MoqPackageVersion>4.7.49</MoqPackageVersion>
     <NewtonsoftJsonPackageVersion>10.0.1</NewtonsoftJsonPackageVersion>
-    <SystemIOPipelinesPackageVersion>4.5.0-preview2-26305-02</SystemIOPipelinesPackageVersion>
-    <SystemMemoryPackageVersion>4.5.0-preview2-26305-02</SystemMemoryPackageVersion>
-    <SystemReflectionMetadataPackageVersion>1.6.0-preview2-26305-02</SystemReflectionMetadataPackageVersion>
-    <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-preview2-26305-02</SystemRuntimeCompilerServicesUnsafePackageVersion>
-    <SystemSecurityCryptographyCngPackageVersion>4.5.0-preview2-26305-02</SystemSecurityCryptographyCngPackageVersion>
-    <SystemThreadingTasksExtensionsPackageVersion>4.5.0-preview2-26305-02</SystemThreadingTasksExtensionsPackageVersion>
+    <SystemIOPipelinesPackageVersion>4.5.0-preview2-26308-02</SystemIOPipelinesPackageVersion>
+    <SystemMemoryPackageVersion>4.5.0-preview2-26308-02</SystemMemoryPackageVersion>
+    <SystemReflectionMetadataPackageVersion>1.6.0-preview2-26308-02</SystemReflectionMetadataPackageVersion>
+    <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-preview2-26308-02</SystemRuntimeCompilerServicesUnsafePackageVersion>
+    <SystemSecurityCryptographyCngPackageVersion>4.5.0-preview2-26308-02</SystemSecurityCryptographyCngPackageVersion>
+    <SystemThreadingTasksExtensionsPackageVersion>4.5.0-preview2-26308-02</SystemThreadingTasksExtensionsPackageVersion>
     <XunitAnalyzersPackageVersion>0.8.0</XunitAnalyzersPackageVersion>
     <XunitPackageVersion>2.3.1</XunitPackageVersion>
     <XunitRunnerVisualstudioPackageVersion>2.4.0-beta.1.build3945</XunitRunnerVisualstudioPackageVersion>
diff --git a/shared/Microsoft.Extensions.Buffers.Sources/MemoryPoolBlock.cs b/shared/Microsoft.Extensions.Buffers.Sources/MemoryPoolBlock.cs
index e1510aefade..9326c0ac34b 100644
--- a/shared/Microsoft.Extensions.Buffers.Sources/MemoryPoolBlock.cs
+++ b/shared/Microsoft.Extensions.Buffers.Sources/MemoryPoolBlock.cs
@@ -121,7 +121,7 @@ public override bool Release()
                 if (Interlocked.CompareExchange(ref _referenceCount, currentCount - 1, currentCount) == currentCount)
                 {
                     // TODO: this needs to be changed to 1 when get Pipelines with pool fix.
-                    if (currentCount == 2)
+                    if (currentCount == 1)
                     {
                         OnZeroReferences();
                         return false;
diff --git a/shared/Microsoft.Extensions.Buffers.Sources/SlabMemoryPool.cs b/shared/Microsoft.Extensions.Buffers.Sources/SlabMemoryPool.cs
index 4412387124d..2ce2f23cb5b 100644
--- a/shared/Microsoft.Extensions.Buffers.Sources/SlabMemoryPool.cs
+++ b/shared/Microsoft.Extensions.Buffers.Sources/SlabMemoryPool.cs
@@ -170,7 +170,7 @@ protected override void Dispose(bool disposing)
             if (!_disposedValue)
             {
                 _disposedValue = true;
-#if DEBUG
+#if DEBUG && !INNER_LOOP
                 GC.Collect();
                 GC.WaitForPendingFinalizers();
                 GC.Collect();
diff --git a/test/Microsoft.Extensions.Internal.Test/PipeWriterTests.cs b/test/Microsoft.Extensions.Internal.Test/PipeWriterTests.cs
index 11ef5f619da..d8a0a0907f6 100644
--- a/test/Microsoft.Extensions.Internal.Test/PipeWriterTests.cs
+++ b/test/Microsoft.Extensions.Internal.Test/PipeWriterTests.cs
@@ -9,12 +9,12 @@
 
 namespace System.IO.Pipelines.Tests
 {
-    public class BufferWriterTes: IDisposable
+    public class BufferWriterTes : IDisposable
     {
         protected Pipe Pipe;
         public BufferWriterTes()
         {
-            Pipe = new Pipe();
+            Pipe = new Pipe(new PipeOptions(useSynchronizationContext: false));
         }
 
         public void Dispose()