Skip to content

Commit dcc8bfe

Browse files
bgraingerbgrainger
committed
Use 'OR_GREATER' preprocessor tests.
1 parent c64f6b0 commit dcc8bfe

15 files changed

+49
-49
lines changed

‎src/MySqlConnector/Core/ConnectionPool.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private int GetSessionHealth(ServerSession session)
158158
return 0;
159159
}
160160

161-
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
161+
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
162162
public async ValueTask ReturnAsync(IOBehavior ioBehavior, ServerSession session)
163163
#else
164164
public async ValueTask<int> ReturnAsync(IOBehavior ioBehavior, ServerSession session)
@@ -193,7 +193,7 @@ public async ValueTask<int> ReturnAsync(IOBehavior ioBehavior, ServerSession ses
193193
m_sessionSemaphore.Release();
194194
}
195195

196-
#if !NETCOREAPP2_1_OR_GREATER && !NETSTANDARD2_1
196+
#if !NETCOREAPP2_1_OR_GREATER && !NETSTANDARD2_1_OR_GREATER
197197
return default;
198198
#endif
199199
}

‎src/MySqlConnector/Core/Row.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ protected Row(ResultSet resultSet)
465465
protected unsafe static Guid CreateGuidFromBytes(MySqlGuidFormat guidFormat, ReadOnlySpan<byte> bytes) =>
466466
guidFormat switch
467467
{
468-
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
468+
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
469469
MySqlGuidFormat.Binary16 => new Guid(stackalloc byte[16] { bytes[3], bytes[2], bytes[1], bytes[0], bytes[5], bytes[4], bytes[7], bytes[6], bytes[8], bytes[9], bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15] }),
470470
MySqlGuidFormat.TimeSwapBinary16 => new Guid(stackalloc byte[16] { bytes[7], bytes[6], bytes[5], bytes[4], bytes[3], bytes[2], bytes[1], bytes[0], bytes[8], bytes[9], bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15] }),
471471
_ => new Guid(bytes),

‎src/MySqlConnector/Core/ServerSession.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public ServerSession(ConnectionPool? pool, int poolGeneration, int id)
6868
public bool SupportsSessionTrack => m_supportsSessionTrack;
6969
public bool ProcAccessDenied { get; set; }
7070

71-
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
71+
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
7272
public ValueTask ReturnToPoolAsync(IOBehavior ioBehavior, MySqlConnection? owningConnection)
7373
#else
7474
public ValueTask<int> ReturnToPoolAsync(IOBehavior ioBehavior, MySqlConnection? owningConnection)
@@ -165,7 +165,7 @@ public async Task PrepareAsync(IMySqlCommand command, IOBehavior ioBehavior, Can
165165
}
166166

167167
var parameterCount = cachedProcedure.Parameters.Count;
168-
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
168+
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
169169
commandToPrepare = string.Create(commandText.Length + 7 + parameterCount * 2 + (parameterCount == 0 ? 1 : 0), (commandText, parameterCount), static (buffer, state) =>
170170
{
171171
buffer[0] = 'C';
@@ -1337,7 +1337,7 @@ caCertificateChain is not null &&
13371337
{
13381338
if (ioBehavior == IOBehavior.Asynchronous)
13391339
{
1340-
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
1340+
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
13411341
await sslStream.AuthenticateAsClientAsync(clientAuthenticationOptions, cancellationToken).ConfigureAwait(false);
13421342
#else
13431343
await sslStream.AuthenticateAsClientAsync(clientAuthenticationOptions.TargetHost,
@@ -1350,7 +1350,7 @@ await sslStream.AuthenticateAsClientAsync(clientAuthenticationOptions.TargetHost
13501350
{
13511351
#if NET5_0_OR_GREATER
13521352
sslStream.AuthenticateAsClient(clientAuthenticationOptions);
1353-
#elif NET45_OR_GREATER || NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_0 || NETSTANDARD2_1
1353+
#elif NET45_OR_GREATER || NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_0_OR_GREATER
13541354
sslStream.AuthenticateAsClient(clientAuthenticationOptions.TargetHost,
13551355
clientAuthenticationOptions.ClientCertificates,
13561356
clientAuthenticationOptions.EnabledSslProtocols,
@@ -1478,7 +1478,7 @@ X509CertificateCollection LoadCertificate(string sslKeyFile, string sslCertifica
14781478
}
14791479
}
14801480

1481-
#if !NETCOREAPP2_1_OR_GREATER && !NETSTANDARD2_1
1481+
#if !NETCOREAPP2_1_OR_GREATER && !NETSTANDARD2_1_OR_GREATER
14821482
// a stripped-down version of this POCO options class for TFMs that don't have it built in
14831483
internal sealed class SslClientAuthenticationOptions
14841484
{

‎src/MySqlConnector/MySqlBulkCopy.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void WriteToServer(DataTable dataTable)
107107
#pragma warning restore CA2012
108108
}
109109

110-
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
110+
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
111111
/// <summary>
112112
/// Asynchronously copies all rows in the supplied <see cref="DataTable"/> to the destination table specified by the
113113
/// <see cref="DestinationTableName"/> property of the <see cref="MySqlBulkCopy"/> object.
@@ -147,7 +147,7 @@ public void WriteToServer(IEnumerable<DataRow> dataRows, int columnCount)
147147
#pragma warning restore CA2012
148148
}
149149

150-
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
150+
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
151151
/// <summary>
152152
/// Asynchronously copies all rows in the supplied sequence of <see cref="DataRow"/> objects to the destination table specified by the
153153
/// <see cref="DestinationTableName"/> property of the <see cref="MySqlBulkCopy"/> object. The number of columns
@@ -193,7 +193,7 @@ public void WriteToServer(IDataReader dataReader)
193193
#pragma warning restore CA2012
194194
}
195195

196-
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
196+
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
197197
/// <summary>
198198
/// Asynchronously copies all rows in the supplied <see cref="IDataReader"/> to the destination table specified by the
199199
/// <see cref="DestinationTableName"/> property of the <see cref="MySqlBulkCopy"/> object.
@@ -219,7 +219,7 @@ public async Task WriteToServerAsync(IDataReader dataReader, CancellationToken c
219219
}
220220
#endif
221221

222-
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
222+
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
223223
private async ValueTask WriteToServerAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
224224
#else
225225
private async ValueTask<int> WriteToServerAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
@@ -327,7 +327,7 @@ private async ValueTask<int> WriteToServerAsync(IOBehavior ioBehavior, Cancellat
327327
throw new MySqlException(MySqlErrorCode.BulkCopyFailed, "{0} rows were copied to {1} but only {2} were inserted.".FormatInvariant(RowsCopied, tableName, rowsInserted));
328328
}
329329

330-
#if !NETCOREAPP2_1_OR_GREATER && !NETSTANDARD2_1
330+
#if !NETCOREAPP2_1_OR_GREATER && !NETSTANDARD2_1_OR_GREATER
331331
return default;
332332
#endif
333333

‎src/MySqlConnector/MySqlCommand.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public override void Prepare()
120120
Connection!.Session.PrepareAsync(this, IOBehavior.Synchronous, default).GetAwaiter().GetResult();
121121
}
122122

123-
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1
123+
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
124124
public override Task PrepareAsync(CancellationToken cancellationToken = default) => PrepareAsync(AsyncIOBehavior, cancellationToken);
125125
#else
126126
public Task PrepareAsync(CancellationToken cancellationToken = default) => PrepareAsync(AsyncIOBehavior, cancellationToken);
@@ -335,14 +335,14 @@ protected override void Dispose(bool disposing)
335335
base.Dispose(disposing);
336336
}
337337

338-
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1
338+
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
339339
public override ValueTask DisposeAsync()
340340
#else
341341
public Task DisposeAsync()
342342
#endif
343343
{
344344
Dispose();
345-
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1
345+
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
346346
return default;
347347
#else
348348
return Utility.CompletedTask;

‎src/MySqlConnector/MySqlConnection.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public MySqlConnection(string? connectionString)
6767
protected override DbTransaction BeginDbTransaction(IsolationLevel isolationLevel) => BeginTransactionAsync(isolationLevel, default, IOBehavior.Synchronous, default).GetAwaiter().GetResult();
6868
#pragma warning restore CA2012
6969

70-
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1
70+
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
7171
/// <summary>
7272
/// Begins a database transaction asynchronously.
7373
/// </summary>
@@ -325,15 +325,15 @@ private void TakeSessionFrom(MySqlConnection other)
325325
#endif
326326

327327
public override void Close() => CloseAsync(changeState: true, IOBehavior.Synchronous).GetAwaiter().GetResult();
328-
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1
328+
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
329329
public override Task CloseAsync() => CloseAsync(changeState: true, SimpleAsyncIOBehavior);
330330
#else
331331
public Task CloseAsync() => CloseAsync(changeState: true, SimpleAsyncIOBehavior);
332332
#endif
333333
internal Task CloseAsync(IOBehavior ioBehavior) => CloseAsync(changeState: true, ioBehavior);
334334

335335
public override void ChangeDatabase(string databaseName) => ChangeDatabaseAsync(IOBehavior.Synchronous, databaseName, CancellationToken.None).GetAwaiter().GetResult();
336-
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1
336+
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
337337
public override Task ChangeDatabaseAsync(string databaseName, CancellationToken cancellationToken = default) => ChangeDatabaseAsync(AsyncIOBehavior, databaseName, cancellationToken);
338338
#else
339339
public Task ChangeDatabaseAsync(string databaseName, CancellationToken cancellationToken = default) => ChangeDatabaseAsync(AsyncIOBehavior, databaseName, cancellationToken);
@@ -442,7 +442,7 @@ internal async Task OpenAsync(IOBehavior? ioBehavior, CancellationToken cancella
442442
/// <remarks>This is an optional feature of the MySQL protocol and may not be supported by all servers.
443443
/// It's known to be supported by MySQL Server 5.7.3 (and later) and MariaDB 10.2.4 (and later).
444444
/// Other MySQL-compatible servers or proxies may not support this command.</remarks>
445-
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
445+
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
446446
public async ValueTask ResetConnectionAsync(CancellationToken cancellationToken = default)
447447
#else
448448
public async Task ResetConnectionAsync(CancellationToken cancellationToken = default)
@@ -640,7 +640,7 @@ protected override void Dispose(bool disposing)
640640
}
641641
}
642642

643-
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1
643+
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
644644
public override async ValueTask DisposeAsync()
645645
#else
646646
public async Task DisposeAsync()
@@ -1025,7 +1025,7 @@ private async Task DoCloseAsync(bool changeState, IOBehavior ioBehavior)
10251025
}
10261026
}
10271027

1028-
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
1028+
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
10291029
private async ValueTask CloseDatabaseAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
10301030
#else
10311031
private async Task CloseDatabaseAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)

‎src/MySqlConnector/MySqlConnectionStringBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ private T ChangeType(object objectValue)
820820
{
821821
try
822822
{
823-
#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1
823+
#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
824824
return Enum.Parse<T>(enumString, ignoreCase: true);
825825
#else
826826
return (T) Enum.Parse(typeof(T), enumString, ignoreCase: true);

‎src/MySqlConnector/MySqlConnectorFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public sealed class MySqlConnectorFactory : DbProviderFactory
5050
/// <remarks><see cref="DbDataSourceEnumerator"/> is not supported by MySqlConnector.</remarks>
5151
public override bool CanCreateDataSourceEnumerator => false;
5252

53-
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1
53+
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
5454
/// <summary>
5555
/// Returns <c>true</c>.
5656
/// </summary>

‎src/MySqlConnector/MySqlDataReader.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ protected override void Dispose(bool disposing)
423423
}
424424
}
425425

426-
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1
426+
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
427427
public override ValueTask DisposeAsync() => DisposeAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, CancellationToken.None);
428428
#else
429429
public Task DisposeAsync() => DisposeAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, CancellationToken.None);
@@ -565,7 +565,7 @@ private MySqlDataReader(CommandListPosition commandListPosition, ICommandPayload
565565
m_resultSet = new(this);
566566
}
567567

568-
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1
568+
#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
569569
internal async ValueTask DisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
570570
#else
571571
internal async Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)

‎src/MySqlConnector/MySqlDateTime.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public override bool Equals(object? obj) =>
134134
/// Returns a hash code for this instance.
135135
/// </summary>
136136
public override int GetHashCode() =>
137-
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
137+
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
138138
HashCode.Combine(Year, Month, Day, Hour, Minute, Second, Microsecond);
139139
#else
140140
(((((Year * 33 ^ Month) * 33 ^ Day) * 33 ^ Hour) * 33 ^ Minute) * 33 ^ Second) * 33 ^ Microsecond;

0 commit comments

Comments
 (0)