Abort pending tasks with ObjectDisposedException

.github/actions/test/action.yaml

@@ -7,5 +7,13 @@ runs:
     run: cargo test --manifest-path tools/slicec-cs/Cargo.toml
     shell: bash
   - name: 🧪 Test
-    run: dotnet test --no-build --verbosity normal --blame-hang-timeout 8m
+    # See https://github.com/microsoft/vstest/issues/2080#issuecomment-539879345
+    run: dotnet test --no-build --verbosity normal --blame-hang-timeout 10s --logger:"console;noprogress=true"
     shell: bash
+  - name: Upload hang dumps
+    uses: actions/upload-artifact@v4
+    with:
+      name: hang-dumps
+      path: ${{ github.workspace }}/**/*.dmp
+      if-no-files-found: ignore
+    if: failure()

.github/workflows/ci.yml

@@ -6,10 +6,19 @@ on:
   pull_request:
     branches: ["main"]
 
+# See https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   build_and_test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 20
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -24,6 +33,7 @@ jobs:
         shell: bash
       - name: Test Templates
         uses: ./.github/actions/test-templates
+        if: runner.os != 'Windows'
       - name: Build Examples
         uses: ./.github/actions/build-examples
       - name: Build DocFX Examples

src/IceRpc.Transports.Coloc/Internal/ColocListener.cs

@@ -1,5 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO.Pipelines;
 using System.Net;
@@ -56,7 +57,9 @@ internal class ColocListener : IListener<IDuplexConnection>
         catch (OperationCanceledException)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            throw new IceRpcException(IceRpcError.OperationAborted);
+            // The accept operation was canceled because the listener was disposed.
+            Debug.Assert(_disposeCts.IsCancellationRequested);
+            throw new ObjectDisposedException($"{typeof(ColocListener)}");
         }
     }
 

src/IceRpc/Server.cs

@@ -647,9 +647,7 @@ await Task.WhenAll(
 
     /// <summary>Returns true if the <see cref="IConnectorListener.AcceptAsync" /> failure can be retried.</summary>
     private static bool IsRetryableAcceptException(Exception exception) =>
-        // The AcceptAsync call can fail with OperationAborted during shutdown if it is accepting a connection while the
-        // listener is disposed.
-        (exception is IceRpcException rpcException && rpcException.IceRpcError != IceRpcError.OperationAborted) ||
+        (exception is IceRpcException rpcException) ||
         // Transports such as Quic do the SSL handshake when the connection is accepted, this can throw
         // AuthenticationException if it fails.
         exception is AuthenticationException;
@@ -674,12 +672,6 @@ private class LogConnectorListenerDecorator : IConnectorListener
                     new LogConnectorDecorator(connector, ServerAddress, remoteNetworkAddress, _logger),
                     remoteNetworkAddress);
             }
-            catch (IceRpcException exception) when (exception.IceRpcError == IceRpcError.OperationAborted)
-            {
-                // Do not log this exception. The AcceptAsync call can fail with OperationAborted during shutdown if it
-                // is accepting a connection while the listener is disposed.
-                throw;
-            }
             catch (OperationCanceledException exception) when (exception.CancellationToken == cancellationToken)
             {
                 // Do not log this exception. The AcceptAsync call can fail with OperationCanceledException during
@@ -689,7 +681,8 @@ private class LogConnectorListenerDecorator : IConnectorListener
             catch (ObjectDisposedException)
             {
                 // Do not log this exception. The AcceptAsync call can fail with ObjectDisposedException during
-                // shutdown once the listener is disposed.
+                // shutdown once the listener is disposed or if it is accepting a connection while the listener is
+                // disposed.
                 throw;
             }
             catch (Exception exception) when (IsRetryableAcceptException(exception))

src/IceRpc/Transports/Slic/Internal/SlicConnection.cs

@@ -111,8 +111,8 @@ public async ValueTask<IMultiplexedStream> AcceptStreamAsync(CancellationToken c
         }
         catch (ChannelClosedException exception)
         {
+            ObjectDisposedException.ThrowIf(_disposeTask is not null, this);
             Debug.Assert(exception.InnerException is not null);
-
             // The exception given to ChannelWriter.Complete(Exception? exception) is the InnerException.
             throw ExceptionUtil.Throw(exception.InnerException);
         }
@@ -439,7 +439,7 @@ public async ValueTask<IMultiplexedStream> CreateStreamAsync(
         catch (OperationCanceledException)
         {
             cancellationToken.ThrowIfCancellationRequested();
-
+            ObjectDisposedException.ThrowIf(_disposeTask is not null, this);
             Debug.Assert(_isClosed);
             throw new IceRpcException(_peerCloseError ?? IceRpcError.OperationAborted, _closedMessage);
         }
@@ -458,8 +458,6 @@ public async ValueTask<IMultiplexedStream> CreateStreamAsync(
 
     public ValueTask DisposeAsync()
     {
-        TryClose(new IceRpcException(IceRpcError.OperationAborted), "The connection was disposed.");
-
         lock (_mutex)
         {
             _disposeTask ??= PerformDisposeAsync();
@@ -470,6 +468,7 @@ async Task PerformDisposeAsync()
         {
             // Make sure we execute the code below without holding the mutex lock.
             await Task.Yield();
+            TryClose(new IceRpcException(IceRpcError.OperationAborted), "The connection was disposed.");
 
             _disposedCts.Cancel();
 

src/IceRpc/Transports/Tcp/Internal/TcpListener.cs

@@ -17,6 +17,9 @@ internal sealed class TcpListener : IListener<IDuplexConnection>
     private readonly MemoryPool<byte> _pool;
     private readonly Socket _socket;
 
+    // Set to 1 when the listener is disposed.
+    private volatile int _disposed;
+
     public async Task<(IDuplexConnection, EndPoint)> AcceptAsync(CancellationToken cancellationToken)
     {
         try
@@ -32,13 +35,20 @@ internal sealed class TcpListener : IListener<IDuplexConnection>
         }
         catch (SocketException exception)
         {
+            if (exception.SocketErrorCode == SocketError.OperationAborted)
+            {
+                ObjectDisposedException.ThrowIf(_disposed == 1, this);
+            }
             throw exception.ToIceRpcException();
         }
     }
 
     public ValueTask DisposeAsync()
     {
-        _socket.Dispose();
+        if (Interlocked.Exchange(ref _disposed, 1) == 0)
+        {
+            _socket.Dispose();
+        }
         return default;
     }
 

tests/IceRpc.Conformance.Tests/IceRpc.Conformance.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <!-- Missing XML comment for publicly visible type or member. -->
     <NoWarn>CS1591</NoWarn>
@@ -27,6 +27,10 @@
     <ProjectReference Include="../IceRpc.Tests.Common/IceRpc.Tests.Common.csproj" ExactVersion="true" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
+  </ItemGroup>
+
   <!-- NuGet package contents-->
   <ItemGroup>
     <Content Include="../../LICENSE" Pack="true" PackagePath="/" />

tests/IceRpc.Conformance.Tests/Transports/DuplexListenerConformanceTests.cs

@@ -80,7 +80,7 @@ public async Task Call_accept_on_a_listener_and_then_cancel_the_cancellation_sou
     }
 
     [Test]
-    public async Task Call_accept_on_a_listener_and_then_dispose_it_fails_with_operation_aborted_error()
+    public async Task Call_accept_on_a_listener_and_then_dispose_it_fails_with_object_disposed_exception()
     {
         // Arrange
         await using ServiceProvider provider = CreateServiceCollection().BuildServiceProvider(validateScopes: true);
@@ -92,11 +92,7 @@ public async Task Call_accept_on_a_listener_and_then_dispose_it_fails_with_opera
         await listener.DisposeAsync();
 
         // Assert
-        IceRpcException? exception = Assert.ThrowsAsync<IceRpcException>(async () => await acceptTask);
-        Assert.That(
-            exception!.IceRpcError,
-            Is.EqualTo(IceRpcError.OperationAborted),
-            $"The test failed with an unexpected IceRpcError {exception}");
+        Assert.That(async () => await acceptTask, Throws.TypeOf<ObjectDisposedException>());
     }
 
     [Test]

tests/IceRpc.Conformance.Tests/Transports/DuplexTransportSslAuthenticationConformanceTests.cs

@@ -21,7 +21,10 @@ public async Task Ssl_client_connection_connect_fails_when_server_provides_untru
             .AddSingleton(
                 new SslServerAuthenticationOptions
                 {
-                    ServerCertificate = new X509Certificate2("server-untrusted.p12"),
+                    ServerCertificate = X509CertificateLoader.LoadPkcs12FromFile(
+                        "server-untrusted.p12",
+                        password: null,
+                        keyStorageFlags: X509KeyStorageFlags.Exportable),
                 })
             .AddSingleton(
                 new SslClientAuthenticationOptions
@@ -65,15 +68,21 @@ public async Task Ssl_server_connection_connect_fails_when_client_provides_untru
                 {
                     ClientCertificateRequired = true,
                     RemoteCertificateValidationCallback = (sender, certificate, chain, errors) => false,
-                    ServerCertificate = new X509Certificate2("server.p12"),
+                    ServerCertificate = X509CertificateLoader.LoadPkcs12FromFile(
+                        "server.p12",
+                        password: null,
+                        keyStorageFlags: X509KeyStorageFlags.Exportable),
                 })
             .AddSingleton(
                 new SslClientAuthenticationOptions
                 {
-                    ClientCertificates = new X509CertificateCollection()
-                    {
-                        new X509Certificate2("client-untrusted.p12")
-                    },
+                    ClientCertificates =
+                    [
+                        X509CertificateLoader.LoadPkcs12FromFile(
+                            "client-untrusted.p12",
+                            password: null,
+                            keyStorageFlags: X509KeyStorageFlags.Exportable)
+                    ],
 #pragma warning disable CA5359 // Do Not Disable Certificate Validation, certificate validation is not required for these tests.
                     RemoteCertificateValidationCallback = (sender, certificate, chain, errors) => true
 #pragma warning restore CA5359 // Do Not Disable Certificate Validation

tests/IceRpc.Conformance.Tests/Transports/MultiplexedConnectionConformanceTests.cs

@@ -426,9 +426,11 @@ public async Task Connection_operations_fail_with_connection_aborted_error_after
             $"The test failed with an unexpected IceRpcError {exception}");
     }
 
+#if NET9_0_OR_GREATER
+    // The QuicConnection behavior changed in .NET 9
+    // see: https://github.com/dotnet/runtime/pull/92215
     [Test]
-    [Ignore("TODO: Fix https://github.com/icerpc/icerpc-csharp/issues/3990")]
-    public async Task Connection_dispose_aborts_pending_operations_with_operation_aborted_error()
+    public async Task Connection_dispose_aborts_pending_operations_with_object_disposed_exception()
     {
         // Arrange
         IServiceCollection serviceCollection = CreateServiceCollection();
@@ -448,24 +450,16 @@ public async Task Connection_dispose_aborts_pending_operations_with_operation_ab
 
         // Assert
 
-        IceRpcException? exception = Assert.ThrowsAsync<IceRpcException>(async () => await acceptStreamTask);
-        Assert.That(
-            exception?.IceRpcError,
-            Is.EqualTo(IceRpcError.OperationAborted),
-            $"The test failed with an unexpected IceRpcError {exception}");
-
-        exception = Assert.ThrowsAsync<IceRpcException>(async () => await createStreamTask);
-        Assert.That(
-            exception?.IceRpcError,
-            Is.EqualTo(IceRpcError.OperationAborted),
-            $"The test failed with an unexpected IceRpcError {exception}");
+        Assert.That(async () => await acceptStreamTask, Throws.TypeOf<ObjectDisposedException>());
+        Assert.That(async () => await createStreamTask, Throws.TypeOf<ObjectDisposedException>());
 
-        exception = Assert.ThrowsAsync<IceRpcException>(async () => await readTask);
+        var exception = Assert.ThrowsAsync<IceRpcException>(async () => await readTask);
         Assert.That(
             exception?.IceRpcError,
             Is.EqualTo(IceRpcError.OperationAborted),
             $"The test failed with an unexpected IceRpcError {exception}");
     }
+#endif
 
     [Test]
     public async Task Disposing_the_client_connection_aborts_the_server_connection()

tests/IceRpc.Conformance.Tests/Transports/MultiplexedListenerConformanceTests.cs

@@ -111,9 +111,11 @@ public async Task Call_accept_on_a_listener_and_then_cancel_the_cancellation_sou
         Assert.That(async () => await acceptTask, Throws.TypeOf<OperationCanceledException>());
     }
 
+#if NET9_0_OR_GREATER
+    // The QuicListener behavior changed in .NET 9
+    // see: https://github.com/dotnet/runtime/pull/92215
     [Test]
-    [Ignore("TODO: Fix https://github.com/icerpc/icerpc-csharp/issues/3990")]
-    public async Task Call_accept_on_a_listener_and_then_dispose_it_fails_with_operation_aborted_error()
+    public async Task Call_accept_on_a_listener_and_then_dispose_it_fails_with_object_disposed_exception()
     {
         // Arrange
         await using ServiceProvider provider = CreateServiceCollection().BuildServiceProvider(validateScopes: true);
@@ -125,12 +127,9 @@ public async Task Call_accept_on_a_listener_and_then_dispose_it_fails_with_opera
         await listener.DisposeAsync();
 
         // Assert
-        IceRpcException? exception = Assert.ThrowsAsync<IceRpcException>(async () => await acceptTask);
-        Assert.That(
-            exception!.IceRpcError,
-            Is.EqualTo(IceRpcError.OperationAborted),
-            $"The test failed with an unexpected IceRpcError {exception}");
+        Assert.That(async () => await acceptTask, Throws.TypeOf<ObjectDisposedException>());
     }
+#endif
 
     [Test]
     public async Task Call_accept_on_a_listener_with_a_canceled_cancellation_token_fails_with_operation_canceled_exception()

tests/IceRpc.Tests/IceRpc.Tests.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Missing XML comment for publicly visible type or member. -->
     <NoWarn>CS1591</NoWarn>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,6 +24,9 @@
     <ProjectReference Include="../IceRpc.Conformance.Tests/IceRpc.Conformance.Tests.csproj" />
     <ProjectReference Include="../IceRpc.Tests.Common/IceRpc.Tests.Common.csproj" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="../../certs/*.p12">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

tests/IceRpc.Tests/ServerTests.cs

@@ -21,7 +21,7 @@ public class ServerTests
 
     public static IEnumerable<Exception> AcceptFatalException { get; } = new Exception[]
     {
-        new IceRpcException(IceRpcError.OperationAborted),
+        new ObjectDisposedException(nameof(ServerTests)),
         new Exception(),
     };
 

tests/IceRpc.Tests/Transports/Slic/SlicTransportSslAuthenticationTests.cs

@@ -23,7 +23,10 @@ public async Task Slic_over_ssl_client_connection_connect_fails_when_server_prov
             .AddSingleton(
                 new SslServerAuthenticationOptions
                 {
-                    ServerCertificate = new X509Certificate2("server-untrusted.p12"),
+                    ServerCertificate = X509CertificateLoader.LoadPkcs12FromFile(
+                        "server-untrusted.p12",
+                        password: null,
+                        keyStorageFlags: X509KeyStorageFlags.Exportable),
                 })
             .AddSingleton(
                 new SslClientAuthenticationOptions
@@ -71,15 +74,21 @@ public async Task Slic_over_ssl_server_connection_connect_fails_when_client_prov
                 {
                     ClientCertificateRequired = true,
                     RemoteCertificateValidationCallback = (sender, certificate, chain, errors) => false,
-                    ServerCertificate = new X509Certificate2("server.p12"),
+                    ServerCertificate = X509CertificateLoader.LoadPkcs12FromFile(
+                        "server.p12",
+                        password: null,
+                        keyStorageFlags: X509KeyStorageFlags.Exportable),
                 })
             .AddSingleton(
                 new SslClientAuthenticationOptions
                 {
-                    ClientCertificates = new X509CertificateCollection()
-                    {
-                        new X509Certificate2("client-untrusted.p12")
-                    },
+                    ClientCertificates =
+                    [
+                        X509CertificateLoader.LoadPkcs12FromFile(
+                            "client-untrusted.p12",
+                            password: null,
+                            keyStorageFlags: X509KeyStorageFlags.Exportable)
+                    ],
                     RemoteCertificateValidationCallback = (sender, certificate, chain, errors) => true
                 })
             .BuildServiceProvider(validateScopes: true);

tests/IceRpc.Tests/Transports/Tcp/SslTransportServiceCollectionExtensions.cs

@@ -22,6 +22,9 @@ internal static IServiceCollection AddSslTest(this IServiceCollection services,
             })
         .AddSingleton(provider => new SslServerAuthenticationOptions
         {
-            ServerCertificate = new X509Certificate2("server.p12")
+            ServerCertificate = X509CertificateLoader.LoadPkcs12FromFile(
+                "server.p12",
+                password: null,
+                keyStorageFlags: X509KeyStorageFlags.Exportable)
         });
 }