Skip to content

Commit 7472189

Browse files
bgraingerbgrainger
committed
Make #if blocks more future-proof.
New frameworks (e.g., net5.0) should automatically fall into the '#else' block.
1 parent 831985a commit 7472189

File tree

10 files changed

+43
-41
lines changed

10 files changed

+43
-41
lines changed

‎src/MySqlConnector/Core/ServerSession.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,7 @@ private async Task<bool> OpenUnixSocketAsync(ConnectionSettings cs, IOBehavior i
10141014
#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
10151015
#endif
10161016
private async Task<bool> OpenNamedPipeAsync(ConnectionSettings cs, int startTickCount, IOBehavior ioBehavior, CancellationToken cancellationToken)
1017-
#if NET45 || NETSTANDARD1_3Co
1017+
#if NET45 || NETSTANDARD1_3
10181018
#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
10191019
#endif
10201020
{

‎src/MySqlConnector/MySql.Data.MySqlClient/MySqlBulkCopy.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void WriteToServer(DataTable dataTable)
6868
WriteToServerAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
6969
}
7070

71-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
71+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
7272
public async Task WriteToServerAsync(DataTable dataTable, CancellationToken cancellationToken = default)
7373
{
7474
m_valuesEnumerator = DataRowsValuesEnumerator.Create(dataTable ?? throw new ArgumentNullException(nameof(dataTable)));
@@ -87,7 +87,7 @@ public void WriteToServer(IEnumerable<DataRow> dataRows, int columnCount)
8787
m_valuesEnumerator = new DataRowsValuesEnumerator(dataRows ?? throw new ArgumentNullException(nameof(dataRows)), columnCount);
8888
WriteToServerAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
8989
}
90-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
90+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
9191
public async Task WriteToServerAsync(IEnumerable<DataRow> dataRows, int columnCount, CancellationToken cancellationToken = default)
9292
{
9393
m_valuesEnumerator = new DataRowsValuesEnumerator(dataRows ?? throw new ArgumentNullException(nameof(dataRows)), columnCount);
@@ -107,7 +107,7 @@ public void WriteToServer(IDataReader dataReader)
107107
m_valuesEnumerator = DataReaderValuesEnumerator.Create(dataReader ?? throw new ArgumentNullException(nameof(dataReader)));
108108
WriteToServerAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
109109
}
110-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
110+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
111111
public async Task WriteToServerAsync(IDataReader dataReader, CancellationToken cancellationToken = default)
112112
{
113113
m_valuesEnumerator = DataReaderValuesEnumerator.Create(dataReader ?? throw new ArgumentNullException(nameof(dataReader)));
@@ -121,7 +121,7 @@ public async ValueTask WriteToServerAsync(IDataReader dataReader, CancellationTo
121121
}
122122
#endif
123123

124-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
124+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
125125
private async ValueTask<int> WriteToServerAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
126126
#else
127127
private async ValueTask WriteToServerAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
@@ -229,7 +229,7 @@ private async ValueTask WriteToServerAsync(IOBehavior ioBehavior, CancellationTo
229229
throw new MySqlException(MySqlErrorCode.BulkCopyFailed, "{0} rows were copied to {1} but only {2} were inserted.".FormatInvariant(RowsCopied, tableName, rowsInserted));
230230
}
231231

232-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
232+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
233233
return default;
234234
#endif
235235

‎src/MySqlConnector/MySql.Data.MySqlClient/MySqlCommand.cs

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

88-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
88+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
8989
public Task PrepareAsync(CancellationToken cancellationToken = default) => PrepareAsync(AsyncIOBehavior, cancellationToken);
9090
#else
9191
public override Task PrepareAsync(CancellationToken cancellationToken = default) => PrepareAsync(AsyncIOBehavior, cancellationToken);
@@ -283,14 +283,18 @@ protected override void Dispose(bool disposing)
283283
base.Dispose(disposing);
284284
}
285285

286-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
286+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
287287
public Task DisposeAsync()
288288
#else
289289
public override ValueTask DisposeAsync()
290290
#endif
291291
{
292292
Dispose();
293-
return Utility.CompletedValueTask;
293+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
294+
return Utility.CompletedTask;
295+
#else
296+
return default;
297+
#endif
294298
}
295299

296300
/// <summary>

‎src/MySqlConnector/MySql.Data.MySqlClient/MySqlConnection.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public MySqlConnection(string? connectionString)
5757

5858
protected override DbTransaction BeginDbTransaction(IsolationLevel isolationLevel) => BeginTransactionAsync(isolationLevel, default, IOBehavior.Synchronous, default).GetAwaiter().GetResult();
5959

60-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
60+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
6161
/// <summary>
6262
/// Begins a database transaction asynchronously.
6363
/// </summary>
@@ -309,15 +309,15 @@ private void TakeSessionFrom(MySqlConnection other)
309309
#endif
310310

311311
public override void Close() => CloseAsync(changeState: true, IOBehavior.Synchronous).GetAwaiter().GetResult();
312-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
312+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
313313
public Task CloseAsync() => CloseAsync(changeState: true, SimpleAsyncIOBehavior);
314314
#else
315315
public override Task CloseAsync() => CloseAsync(changeState: true, SimpleAsyncIOBehavior);
316316
#endif
317317
internal Task CloseAsync(IOBehavior ioBehavior) => CloseAsync(changeState: true, ioBehavior);
318318

319319
public override void ChangeDatabase(string databaseName) => ChangeDatabaseAsync(IOBehavior.Synchronous, databaseName, CancellationToken.None).GetAwaiter().GetResult();
320-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
320+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
321321
public Task ChangeDatabaseAsync(string databaseName, CancellationToken cancellationToken = default) => ChangeDatabaseAsync(AsyncIOBehavior, databaseName, cancellationToken);
322322
#else
323323
public override Task ChangeDatabaseAsync(string databaseName, CancellationToken cancellationToken = default) => ChangeDatabaseAsync(AsyncIOBehavior, databaseName, cancellationToken);
@@ -515,7 +515,7 @@ protected override void Dispose(bool disposing)
515515
}
516516
}
517517

518-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
518+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
519519
public async Task DisposeAsync()
520520
#else
521521
public override async ValueTask DisposeAsync()

‎src/MySqlConnector/MySql.Data.MySqlClient/MySqlDataReader.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ protected override void Dispose(bool disposing)
369369
}
370370
}
371371

372-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
372+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
373373
public Task DisposeAsync() => DisposeAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, CancellationToken.None);
374374
#else
375375
public override ValueTask DisposeAsync() => DisposeAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, CancellationToken.None);
@@ -511,7 +511,7 @@ private MySqlDataReader(CommandListPosition commandListPosition, ICommandPayload
511511
m_resultSet = new ResultSet(this);
512512
}
513513

514-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
514+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
515515
internal async Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
516516
#else
517517
internal async ValueTask DisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)

‎src/MySqlConnector/MySql.Data.MySqlClient/MySqlTransaction.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace MySql.Data.MySqlClient
1111
public sealed class MySqlTransaction : DbTransaction
1212
{
1313
public override void Commit() => CommitAsync(IOBehavior.Synchronous, default).GetAwaiter().GetResult();
14-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
14+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
1515
public Task CommitAsync(CancellationToken cancellationToken = default) => CommitAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, cancellationToken);
1616
#else
1717
public override Task CommitAsync(CancellationToken cancellationToken = default) => CommitAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, cancellationToken);
@@ -28,7 +28,7 @@ private async Task CommitAsync(IOBehavior ioBehavior, CancellationToken cancella
2828
}
2929

3030
public override void Rollback() => RollbackAsync(IOBehavior.Synchronous, default).GetAwaiter().GetResult();
31-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
31+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
3232
public Task RollbackAsync(CancellationToken cancellationToken = default) => RollbackAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, cancellationToken);
3333
#else
3434
public override Task RollbackAsync(CancellationToken cancellationToken = default) => RollbackAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, cancellationToken);
@@ -83,13 +83,13 @@ protected override void Dispose(bool disposing)
8383
}
8484
}
8585

86-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
86+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
8787
public Task DisposeAsync() => DisposeAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, CancellationToken.None);
8888
#else
8989
public override ValueTask DisposeAsync() => DisposeAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, CancellationToken.None);
9090
#endif
9191

92-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
92+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
9393
internal Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
9494
#else
9595
internal ValueTask DisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
@@ -99,10 +99,14 @@ internal ValueTask DisposeAsync(IOBehavior ioBehavior, CancellationToken cancell
9999
if (Connection?.CurrentTransaction == this)
100100
return DoDisposeAsync(ioBehavior, cancellationToken);
101101
Connection = null;
102-
return Utility.CompletedValueTask;
102+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
103+
return Utility.CompletedTask;
104+
#else
105+
return default;
106+
#endif
103107
}
104108

105-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
109+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1
106110
private async Task DoDisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
107111
#else
108112
private async ValueTask DoDisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)

‎src/MySqlConnector/Protocol/Serialization/SocketByteHandler.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ internal sealed class SocketByteHandler : IByteHandler
1212
public SocketByteHandler(Socket socket)
1313
{
1414
m_socket = socket;
15-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
15+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
1616
m_socketAwaitable = new SocketAwaitable(new SocketAsyncEventArgs());
1717
#endif
1818
m_closeSocket = socket.Dispose;
1919
RemainingTimeout = Constants.InfiniteTimeout;
2020
}
2121

22-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
22+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
2323
public void Dispose() => m_socketAwaitable.EventArgs.Dispose();
2424
#else
2525
public void Dispose() { }
@@ -32,14 +32,14 @@ public ValueTask<int> ReadBytesAsync(Memory<byte> buffer, IOBehavior ioBehavior)
3232

3333
private ValueTask<int> DoReadBytesSync(Memory<byte> buffer)
3434
{
35-
#if !NETSTANDARD2_1 && !NETCOREAPP2_1 && !NETCOREAPP3_0
35+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
3636
MemoryMarshal.TryGetArray<byte>(buffer, out var arraySegment);
3737
#endif
3838

3939
try
4040
{
4141
if (RemainingTimeout == Constants.InfiniteTimeout)
42-
#if !NETSTANDARD2_1 && !NETCOREAPP2_1 && !NETCOREAPP3_0
42+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
4343
return new ValueTask<int>(m_socket.Receive(arraySegment.Array, arraySegment.Offset, arraySegment.Count, SocketFlags.None));
4444
#else
4545
return new ValueTask<int>(m_socket.Receive(buffer.Span, SocketFlags.None));
@@ -50,7 +50,7 @@ private ValueTask<int> DoReadBytesSync(Memory<byte> buffer)
5050
var startTime = Environment.TickCount;
5151
if (m_socket.Poll(Math.Min(int.MaxValue / 1000, RemainingTimeout) * 1000, SelectMode.SelectRead))
5252
{
53-
#if !NETSTANDARD2_1 && !NETCOREAPP2_1 && !NETCOREAPP3_0
53+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
5454
var bytesRead = m_socket.Receive(arraySegment.Array, arraySegment.Offset, arraySegment.Count, SocketFlags.None);
5555
#else
5656
var bytesRead = m_socket.Receive(buffer.Span, SocketFlags.None);
@@ -74,13 +74,13 @@ private async ValueTask<int> DoReadBytesAsync(Memory<byte> buffer)
7474
var timerId = RemainingTimeout == Constants.InfiniteTimeout ? 0 :
7575
RemainingTimeout <= 0 ? throw MySqlException.CreateForTimeout() :
7676
TimerQueue.Instance.Add(RemainingTimeout, m_closeSocket);
77-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
77+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
7878
m_socketAwaitable.EventArgs.SetBuffer(buffer);
7979
#endif
8080
int bytesRead;
8181
try
8282
{
83-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
83+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
8484
await m_socket.ReceiveAsync(m_socketAwaitable);
8585
bytesRead = m_socketAwaitable.EventArgs.BytesTransferred;
8686
#else
@@ -124,7 +124,7 @@ public ValueTask<int> WriteBytesAsync(ReadOnlyMemory<byte> data, IOBehavior ioBe
124124

125125
private async ValueTask<int> DoWriteBytesAsync(ReadOnlyMemory<byte> data)
126126
{
127-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
127+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
128128
m_socketAwaitable.EventArgs.SetBuffer(MemoryMarshal.AsMemory(data));
129129
await m_socket.SendAsync(m_socketAwaitable);
130130
#else
@@ -134,7 +134,7 @@ private async ValueTask<int> DoWriteBytesAsync(ReadOnlyMemory<byte> data)
134134
}
135135

136136
readonly Socket m_socket;
137-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
137+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
138138
readonly SocketAwaitable m_socketAwaitable;
139139
#endif
140140
readonly Action m_closeSocket;

‎src/MySqlConnector/Utilities/SocketAwaitable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
1+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
22
using System;
33
using System.Net.Sockets;
44
using System.Runtime.CompilerServices;

‎src/MySqlConnector/Utilities/SocketExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace MySqlConnector.Utilities
66
{
77
internal static class SocketExtensions
88
{
9-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
9+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
1010
public static SocketAwaitable ReceiveAsync(this Socket socket, SocketAwaitable awaitable)
1111
{
1212
awaitable.Reset();
@@ -24,7 +24,7 @@ public static SocketAwaitable SendAsync(this Socket socket, SocketAwaitable awai
2424
}
2525
#endif
2626

27-
#if !NETSTANDARD2_1 && !NETCOREAPP2_1 && !NETCOREAPP3_0
27+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
2828
public static void SetBuffer(this SocketAsyncEventArgs args, Memory<byte> buffer)
2929
{
3030
MemoryMarshal.TryGetArray<byte>(buffer, out var arraySegment);
@@ -48,7 +48,7 @@ public static void SetKeepAlive(this Socket socket, uint keepAliveTimeSeconds)
4848
return;
4949

5050
// If keepAliveTimeSeconds > 0, override keepalive options on the socket
51-
#if !NETCOREAPP3_0
51+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP2_1
5252
if (Utility.IsWindows())
5353
{
5454
// http://stackoverflow.com/a/11834055/1419658

‎src/MySqlConnector/Utilities/Utility.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -378,12 +378,6 @@ public static bool TryComputeHash(this HashAlgorithm hashAlgorithm, ReadOnlySpan
378378
}
379379
#endif
380380

381-
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
382-
public static Task CompletedValueTask => CompletedTask;
383-
#else
384-
public static ValueTask CompletedValueTask => default;
385-
#endif
386-
387381
public static byte[] TrimZeroByte(byte[] value)
388382
{
389383
if (value[value.Length - 1] == 0)
@@ -411,7 +405,7 @@ public static bool TryGetBuffer(this MemoryStream memoryStream, out ArraySegment
411405
}
412406
#endif
413407

414-
#if !NETSTANDARD2_1 && !NETCOREAPP2_1 && !NETCOREAPP3_0
408+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
415409
public static int Read(this Stream stream, Memory<byte> buffer)
416410
{
417411
MemoryMarshal.TryGetArray<byte>(buffer, out var arraySegment);

0 commit comments

Comments
 (0)