@@ -504,7 +504,7 @@ internal async Task Open(NpgsqlTimeout timeout, bool async, CancellationToken ca
             SerializerOptions = DataSource.SerializerOptions;
             DatabaseInfo = DataSource.DatabaseInfo;
 
-            if (Settings.Pooling && !Settings.Multiplexing && !Settings.NoResetOnClose && DatabaseInfo.SupportsDiscard)
+            if (Settings.Pooling && Settings is { Multiplexing: false, NoResetOnClose: false } && DatabaseInfo.SupportsDiscard)
             {
                 _sendResetOnClose = true;
                 GenerateResetMessage();
@@ -1145,7 +1145,7 @@ void SetSocketOptions(Socket socket)
 
         if (Settings.TcpKeepAlive)
             socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true);
-        if (Settings.TcpKeepAliveInterval > 0 && Settings.TcpKeepAliveTime == 0)
+        if (Settings is { TcpKeepAliveInterval: > 0, TcpKeepAliveTime: 0 })
             throw new ArgumentException("If TcpKeepAliveInterval is defined, TcpKeepAliveTime must be defined as well");
         if (Settings.TcpKeepAliveTime > 0)
         {
@@ -2001,7 +2001,7 @@ internal async Task CloseOngoingOperations(bool async)
             // therefore vulnerable to the race condition in #615.
             if (copyOperation is NpgsqlBinaryImporter ||
                 copyOperation is NpgsqlCopyTextWriter ||
-                copyOperation is NpgsqlRawCopyStream rawCopyStream && rawCopyStream.CanWrite)
+                copyOperation is NpgsqlRawCopyStream { CanWrite: true })
             {
                 try
                 {
@@ -2676,7 +2676,7 @@ internal async Task<bool> Wait(bool async, int timeout, CancellationToken cancel
                 {
                     msg = await ReadMessageWithNotifications(async).ConfigureAwait(false);
                 }
-                catch (Exception e) when (e is OperationCanceledException || e is NpgsqlException npgEx && npgEx.InnerException is TimeoutException)
+                catch (Exception e) when (e is OperationCanceledException || e is NpgsqlException { InnerException: TimeoutException })
                 {
                     // We're somewhere in the middle of a reading keepalive messages
                     // Breaking the connection, as we've lost protocol sync
 
@@ -223,8 +223,7 @@ async ValueTask<int> ReadWithTimeoutAsync(Memory<byte> buffer, CancellationToken
                     // If we should attempt PostgreSQL cancellation, do it the first time we get a timeout.
                     // TODO: As an optimization, we can still attempt to send a cancellation request, but after
                     // that immediately break the connection
-                    if (connector.AttemptPostgresCancellation &&
-                        !connector.PostgresCancellationPerformed &&
+                    if (connector is { AttemptPostgresCancellation: true, PostgresCancellationPerformed: false } &&
                         connector.PerformPostgresCancellation())
                     {
                         // Note that if the cancellation timeout is negative, we flow down and break the
@@ -350,8 +349,7 @@ static async ValueTask EnsureLong(
                         // If we should attempt PostgreSQL cancellation, do it the first time we get a timeout.
                         // TODO: As an optimization, we can still attempt to send a cancellation request, but after
                         // that immediately break the connection
-                        if (connector.AttemptPostgresCancellation &&
-                            !connector.PostgresCancellationPerformed &&
+                        if (connector is { AttemptPostgresCancellation: true, PostgresCancellationPerformed: false } &&
                             connector.PerformPostgresCancellation())
                         {
                             // Note that if the cancellation timeout is negative, we flow down and break the
 
@@ -183,7 +183,7 @@ internal RowDescriptionMessage? Description
     /// </summary>
     internal PreparedStatement? PreparedStatement
     {
-        get => _preparedStatement != null && _preparedStatement.State == PreparedState.Unprepared
+        get => _preparedStatement is { State: PreparedState.Unprepared }
             ? _preparedStatement = null
             : _preparedStatement;
         set => _preparedStatement = value;
 
@@ -1031,7 +1031,7 @@ internal void ProcessRawQuery(SqlQueryParser? parser, bool standardConformingStr
 
         static void ValidateParameterCount(NpgsqlBatchCommand batchCommand)
         {
-            if (batchCommand.HasParameters && batchCommand.PositionalParameters.Count > ushort.MaxValue)
+            if (batchCommand is { HasParameters: true, PositionalParameters.Count: > ushort.MaxValue })
                 ThrowHelper.ThrowNpgsqlException("A statement cannot have more than 65535 parameters");
         }
     }
 
@@ -383,7 +383,7 @@ async ValueTask DisposeAsync(bool disposing, bool async)
                         }
                         _connector.SkipUntil(BackendMessageCode.ReadyForQuery);
                     }
-                    catch (OperationCanceledException e) when (e.InnerException is PostgresException pg && pg.SqlState == PostgresErrorCodes.QueryCanceled)
+                    catch (OperationCanceledException e) when (e.InnerException is PostgresException { SqlState: PostgresErrorCodes.QueryCanceled })
                     {
                         LogMessages.CopyOperationCancelled(_copyLogger, _connector.Id);
                     }
 
@@ -189,7 +189,7 @@ public static NpgsqlTsVector Parse(string value)
             if (value[pos] >= 'B' && value[pos] <= 'D' || value[pos] >= 'b' && value[pos] <= 'd')
             {
                 var weight = value[pos];
-                if (weight >= 'b' && weight <= 'd')
+                if (weight is >= 'b' and <= 'd')
                     weight = (char)(weight - ('b' - 'B'));
                 wordEntryPositions.Add(new Lexeme.WordEntryPos(wordPos, Lexeme.Weight.D + ('D' - weight)));
                 pos++;
 
@@ -243,7 +243,7 @@ public async Task Timeout_from_connection_string()
     public async Task Timeout_switch_connection()
     {
         var csb = new NpgsqlConnectionStringBuilder(ConnectionString);
-        if (csb.CommandTimeout >= 100 && csb.CommandTimeout < 105)
+        if (csb.CommandTimeout is >= 100 and < 105)
             IgnoreExceptOnBuildServer("Bad default command timeout");
 
         await using var dataSource1 = CreateDataSource(ConnectionString + ";CommandTimeout=100");
 
@@ -32,12 +32,10 @@ public async Task Basic_lifecycle()
 
         conn.StateChange += (s, e) =>
         {
-            if (e.OriginalState == ConnectionState.Closed &&
-                e.CurrentState == ConnectionState.Open)
+            if (e is { OriginalState: ConnectionState.Closed, CurrentState: ConnectionState.Open })
                 eventOpen = true;
 
-            if (e.OriginalState == ConnectionState.Open &&
-                e.CurrentState == ConnectionState.Closed)
+            if (e is { OriginalState: ConnectionState.Open, CurrentState: ConnectionState.Closed })
                 eventClosed = true;
         };
 
@@ -83,12 +81,10 @@ public async Task Broken_lifecycle([Values] bool openFromClose)
 
         conn.StateChange += (s, e) =>
         {
-            if (e.OriginalState == ConnectionState.Closed &&
-                e.CurrentState == ConnectionState.Open)
+            if (e is { OriginalState: ConnectionState.Closed, CurrentState: ConnectionState.Open })
                 eventOpen = true;
 
-            if (e.OriginalState == ConnectionState.Open &&
-                e.CurrentState == ConnectionState.Closed)
+            if (e is { OriginalState: ConnectionState.Open, CurrentState: ConnectionState.Closed })
                 eventClosed = true;
         };
Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ internal async Task Open(NpgsqlTimeout timeout, bool async, CancellationToken ca`
`504`	`504`	`SerializerOptions = DataSource.SerializerOptions;`
`505`	`505`	`DatabaseInfo = DataSource.DatabaseInfo;`
`506`	`506`
`507`		`- if (Settings.Pooling && !Settings.Multiplexing && !Settings.NoResetOnClose && DatabaseInfo.SupportsDiscard)`
	`507`	`+ if (Settings.Pooling && Settings is { Multiplexing: false, NoResetOnClose: false } && DatabaseInfo.SupportsDiscard)`
`508`	`508`	`{`
`509`	`509`	`_sendResetOnClose = true;`
`510`	`510`	`GenerateResetMessage();`
`@@ -1145,7 +1145,7 @@ void SetSocketOptions(Socket socket)`
`1145`	`1145`
`1146`	`1146`	`if (Settings.TcpKeepAlive)`
`1147`	`1147`	`socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true);`
`1148`		`- if (Settings.TcpKeepAliveInterval > 0 && Settings.TcpKeepAliveTime == 0)`
	`1148`	`+ if (Settings is { TcpKeepAliveInterval: > 0, TcpKeepAliveTime: 0 })`
`1149`	`1149`	`throw new ArgumentException("If TcpKeepAliveInterval is defined, TcpKeepAliveTime must be defined as well");`
`1150`	`1150`	`if (Settings.TcpKeepAliveTime > 0)`
`1151`	`1151`	`{`
`@@ -2001,7 +2001,7 @@ internal async Task CloseOngoingOperations(bool async)`
`2001`	`2001`	`// therefore vulnerable to the race condition in #615.`
`2002`	`2002`	`if (copyOperation is NpgsqlBinaryImporter \|\|`
`2003`	`2003`	`copyOperation is NpgsqlCopyTextWriter \|\|`
`2004`		`- copyOperation is NpgsqlRawCopyStream rawCopyStream && rawCopyStream.CanWrite)`
	`2004`	`+ copyOperation is NpgsqlRawCopyStream { CanWrite: true })`
`2005`	`2005`	`{`
`2006`	`2006`	`try`
`2007`	`2007`	`{`
`@@ -2676,7 +2676,7 @@ internal async Task<bool> Wait(bool async, int timeout, CancellationToken cancel`
`2676`	`2676`	`{`
`2677`	`2677`	`msg = await ReadMessageWithNotifications(async).ConfigureAwait(false);`
`2678`	`2678`	`}`
`2679`		`- catch (Exception e) when (e is OperationCanceledException \|\| e is NpgsqlException npgEx && npgEx.InnerException is TimeoutException)`
	`2679`	`+ catch (Exception e) when (e is OperationCanceledException \|\| e is NpgsqlException { InnerException: TimeoutException })`
`2680`	`2680`	`{`
`2681`	`2681`	`// We're somewhere in the middle of a reading keepalive messages`
`2682`	`2682`	`// Breaking the connection, as we've lost protocol sync`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ internal RowDescriptionMessage? Description`
`183`	`183`	`/// </summary>`
`184`	`184`	`internal PreparedStatement? PreparedStatement`
`185`	`185`	`{`
`186`		`- get => _preparedStatement != null && _preparedStatement.State == PreparedState.Unprepared`
	`186`	`+ get => _preparedStatement is { State: PreparedState.Unprepared }`
`187`	`187`	`? _preparedStatement = null`
`188`	`188`	`: _preparedStatement;`
`189`	`189`	`set => _preparedStatement = value;`
Original file line number	Diff line number	Diff line change
`@@ -1031,7 +1031,7 @@ internal void ProcessRawQuery(SqlQueryParser? parser, bool standardConformingStr`
`1031`	`1031`
`1032`	`1032`	`static void ValidateParameterCount(NpgsqlBatchCommand batchCommand)`
`1033`	`1033`	`{`
`1034`		`- if (batchCommand.HasParameters && batchCommand.PositionalParameters.Count > ushort.MaxValue)`
	`1034`	`+ if (batchCommand is { HasParameters: true, PositionalParameters.Count: > ushort.MaxValue })`
`1035`	`1035`	`ThrowHelper.ThrowNpgsqlException("A statement cannot have more than 65535 parameters");`
`1036`	`1036`	`}`
`1037`	`1037`	`}`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ async ValueTask DisposeAsync(bool disposing, bool async)`
`383`	`383`	`}`
`384`	`384`	`_connector.SkipUntil(BackendMessageCode.ReadyForQuery);`
`385`	`385`	`}`
`386`		`- catch (OperationCanceledException e) when (e.InnerException is PostgresException pg && pg.SqlState == PostgresErrorCodes.QueryCanceled)`
	`386`	`+ catch (OperationCanceledException e) when (e.InnerException is PostgresException { SqlState: PostgresErrorCodes.QueryCanceled })`
`387`	`387`	`{`
`388`	`388`	`LogMessages.CopyOperationCancelled(_copyLogger, _connector.Id);`
`389`	`389`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public static NpgsqlTsVector Parse(string value)`
`189`	`189`	`if (value[pos] >= 'B' && value[pos] <= 'D' \|\| value[pos] >= 'b' && value[pos] <= 'd')`
`190`	`190`	`{`
`191`	`191`	`var weight = value[pos];`
`192`		`- if (weight >= 'b' && weight <= 'd')`
	`192`	`+ if (weight is >= 'b' and <= 'd')`
`193`	`193`	`weight = (char)(weight - ('b' - 'B'));`
`194`	`194`	`wordEntryPositions.Add(new Lexeme.WordEntryPos(wordPos, Lexeme.Weight.D + ('D' - weight)));`
`195`	`195`	`pos++;`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ public async Task Timeout_from_connection_string()`
`243`	`243`	`public async Task Timeout_switch_connection()`
`244`	`244`	`{`
`245`	`245`	`var csb = new NpgsqlConnectionStringBuilder(ConnectionString);`
`246`		`- if (csb.CommandTimeout >= 100 && csb.CommandTimeout < 105)`
	`246`	`+ if (csb.CommandTimeout is >= 100 and < 105)`
`247`	`247`	`IgnoreExceptOnBuildServer("Bad default command timeout");`
`248`	`248`
`249`	`249`	`await using var dataSource1 = CreateDataSource(ConnectionString + ";CommandTimeout=100");`