Remove ForceAsync from CryptoStream (#45150)

dotnet · Nov 25, 2020 · 93cbc09 · 93cbc09
1 parent 3e65d68
commit 93cbc09
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 55 deletions.
diff --git a/src/libraries/Common/src/System/Threading/Tasks/ForceAsyncAwaiter.cs b/src/libraries/Common/src/System/Threading/Tasks/ForceAsyncAwaiter.cs
diff --git a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
@@ -167,8 +167,6 @@
              Link="Common\Interop\Unix\Interop.GetEUid.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SetEUid.cs"
              Link="Common\Interop\Unix\Interop.SetEUid.cs" />
-    <Compile Include="$(CommonPath)System\Threading\Tasks\ForceAsyncAwaiter.cs"
-             Link="Common\System\Threading\Tasks\ForceAsyncAwaiter.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Collections" />

diff --git a/...ystem.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj b/...ystem.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj
@@ -25,8 +25,6 @@
     <Compile Include="System\Security\Cryptography\SymmetricAlgorithm.cs" />
     <Compile Include="$(CommonPath)System\Obsoletions.cs"
              Link="Common\System\Obsoletions.cs" />
-    <Compile Include="$(CommonPath)System\Threading\Tasks\ForceAsyncAwaiter.cs"
-             Link="Common\System\Threading\Tasks\ForceAsyncAwaiter.cs" />
     <Compile Include="$(CommonPath)Internal\Cryptography\Helpers.cs"
              Link="Internal\Cryptography\Helpers.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\CryptoPool.cs"

diff --git a/.../System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptoStream.cs b/.../System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptoStream.cs
@@ -3,6 +3,7 @@
 
 using System.Buffers;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -218,15 +219,14 @@ private async Task<int> ReadAsyncInternal(byte[] buffer, int offset, int count,
             // async requests outstanding, we will block the application's main
             // thread if it does a second IO request until the first one completes.
 
-            SemaphoreSlim semaphore = AsyncActiveSemaphore;
-            await semaphore.WaitAsync(cancellationToken).ForceAsync();
+            await AsyncActiveSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
             try
             {
                 return await ReadAsyncCore(buffer, offset, count, cancellationToken, useAsync: true).ConfigureAwait(false);
             }
             finally
             {
-                semaphore.Release();
+                _lazyAsyncActiveSemaphore.Release();
             }
         }
 
@@ -495,15 +495,14 @@ private async Task WriteAsyncInternal(byte[] buffer, int offset, int count, Canc
             // async requests outstanding, we will block the application's main
             // thread if it does a second IO request until the first one completes.
 
-            SemaphoreSlim semaphore = AsyncActiveSemaphore;
-            await semaphore.WaitAsync(cancellationToken).ForceAsync();
+            await AsyncActiveSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
             try
             {
                 await WriteAsyncCore(buffer, offset, count, cancellationToken, useAsync: true).ConfigureAwait(false);
             }
             finally
             {
-                semaphore.Release();
+                _lazyAsyncActiveSemaphore.Release();
             }
         }
 
@@ -748,6 +747,7 @@ private void InitializeBuffer()
             }
         }
 
+        [MemberNotNull(nameof(_lazyAsyncActiveSemaphore))]
         private SemaphoreSlim AsyncActiveSemaphore
         {
             get