Skip to content

Commit 7031e9f

Browse files
bgraingerbgrainger
committed
Add netstandard2.1 build.
1 parent 9bc492c commit 7031e9f

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using MySqlConnector.Protocol.Serialization;
88
using MySqlConnector.Utilities;
99

10-
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1 || NETCOREAPP3_0
10+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP2_1 || NETCOREAPP3_0
1111
namespace System.Data.Common
1212
{
1313
public abstract class DbBatch : IDisposable

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Data.Common;
33
using MySqlConnector.Core;
44

5-
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1 || NETCOREAPP3_0
5+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP2_1 || NETCOREAPP3_0
66
namespace System.Data.Common
77
{
88
public abstract class DbBatchCommand

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Data.Common;
44
using MySqlConnector.Core;
55

6-
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETCOREAPP2_1 || NETCOREAPP3_0
6+
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP2_1 || NETCOREAPP3_0
77
namespace System.Data.Common
88
{
99
public abstract class DbBatchCommandCollection : Collection<DbBatchCommand>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public override void Prepare()
9696
DoPrepareAsync(IOBehavior.Synchronous, default).GetAwaiter().GetResult();
9797
}
9898

99-
#if !NETCOREAPP3_0
99+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
100100
public Task PrepareAsync(CancellationToken cancellationToken = default) => PrepareAsync(AsyncIOBehavior, cancellationToken);
101101
#else
102102
public override Task PrepareAsync(CancellationToken cancellationToken = default) => PrepareAsync(AsyncIOBehavior, cancellationToken);
@@ -347,7 +347,7 @@ protected override void Dispose(bool disposing)
347347
m_isDisposed = true;
348348
}
349349

350-
#if !NETCOREAPP3_0
350+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
351351
public Task DisposeAsync()
352352
#else
353353
public override ValueTask DisposeAsync()

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public MySqlConnection(string connectionString)
3131
public new MySqlTransaction BeginTransaction(IsolationLevel isolationLevel) => (MySqlTransaction) base.BeginTransaction(isolationLevel);
3232
protected override DbTransaction BeginDbTransaction(IsolationLevel isolationLevel) => BeginDbTransactionAsync(isolationLevel, IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
3333

34-
#if !NETCOREAPP3_0
34+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
3535
public ValueTask<MySqlTransaction> BeginTransactionAsync(CancellationToken cancellationToken = default) => BeginDbTransactionAsync(IsolationLevel.Unspecified, AsyncIOBehavior, cancellationToken);
3636
public ValueTask<MySqlTransaction> BeginTransactionAsync(IsolationLevel isolationLevel, CancellationToken cancellationToken = default) => BeginDbTransactionAsync(isolationLevel, AsyncIOBehavior, cancellationToken);
3737
#else
@@ -235,15 +235,15 @@ private void TakeSessionFrom(MySqlConnection other)
235235
#endif
236236

237237
public override void Close() => CloseAsync(changeState: true, IOBehavior.Synchronous).GetAwaiter().GetResult();
238-
#if !NETCOREAPP3_0
238+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
239239
public Task CloseAsync() => CloseAsync(changeState: true, SimpleAsyncIOBehavior);
240240
#else
241241
public override Task CloseAsync() => CloseAsync(changeState: true, SimpleAsyncIOBehavior);
242242
#endif
243243
internal Task CloseAsync(IOBehavior ioBehavior) => CloseAsync(changeState: true, ioBehavior);
244244

245245
public override void ChangeDatabase(string databaseName) => ChangeDatabaseAsync(IOBehavior.Synchronous, databaseName, CancellationToken.None).GetAwaiter().GetResult();
246-
#if !NETCOREAPP3_0
246+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
247247
public Task ChangeDatabaseAsync(string databaseName, CancellationToken cancellationToken = default) => ChangeDatabaseAsync(AsyncIOBehavior, databaseName, cancellationToken);
248248
#else
249249
public override Task ChangeDatabaseAsync(string databaseName, CancellationToken cancellationToken = default) => ChangeDatabaseAsync(AsyncIOBehavior, databaseName, cancellationToken);
@@ -435,7 +435,7 @@ protected override void Dispose(bool disposing)
435435
}
436436
}
437437

438-
#if !NETCOREAPP3_0
438+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
439439
public async Task DisposeAsync()
440440
#else
441441
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
@@ -312,7 +312,7 @@ protected override void Dispose(bool disposing)
312312
}
313313
}
314314

315-
#if !NETCOREAPP3_0
315+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
316316
public Task DisposeAsync() => DisposeAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, CancellationToken.None);
317317
#else
318318
public override ValueTask DisposeAsync() => DisposeAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, CancellationToken.None);
@@ -454,7 +454,7 @@ private MySqlDataReader(CommandListPosition commandListPosition, ICommandPayload
454454
m_resultSet = new ResultSet(this);
455455
}
456456

457-
#if !NETCOREAPP3_0
457+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
458458
internal async Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
459459
#else
460460
internal async ValueTask DisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)

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

Lines changed: 5 additions & 5 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 !NETCOREAPP3_0
14+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
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);
@@ -41,7 +41,7 @@ private async Task CommitAsync(IOBehavior ioBehavior, CancellationToken cancella
4141
}
4242

4343
public override void Rollback() => RollbackAsync(IOBehavior.Synchronous, default).GetAwaiter().GetResult();
44-
#if !NETCOREAPP3_0
44+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
4545
public Task RollbackAsync(CancellationToken cancellationToken = default) => RollbackAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, cancellationToken);
4646
#else
4747
public override Task RollbackAsync(CancellationToken cancellationToken = default) => RollbackAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, cancellationToken);
@@ -87,13 +87,13 @@ protected override void Dispose(bool disposing)
8787
}
8888
}
8989

90-
#if !NETCOREAPP3_0
90+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
9191
public Task DisposeAsync() => DisposeAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, CancellationToken.None);
9292
#else
9393
public override ValueTask DisposeAsync() => DisposeAsync(Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous, CancellationToken.None);
9494
#endif
9595

96-
#if !NETCOREAPP3_0
96+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
9797
internal Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
9898
#else
9999
internal ValueTask DisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
@@ -106,7 +106,7 @@ internal ValueTask DisposeAsync(IOBehavior ioBehavior, CancellationToken cancell
106106
return Utility.CompletedValueTask;
107107
}
108108

109-
#if !NETCOREAPP3_0
109+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
110110
private async Task DoDisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
111111
#else
112112
private async ValueTask DoDisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)

‎src/MySqlConnector/MySqlConnector.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks Condition=" '$(NETCoreSdkVersion)' != '3.0.100-preview7-012821' ">net45;net461;net471;netstandard1.3;netstandard2.0;netcoreapp2.1</TargetFrameworks>
5-
<TargetFrameworks Condition=" '$(NETCoreSdkVersion)' == '3.0.100-preview7-012821' ">net45;net461;net471;netstandard1.3;netstandard2.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks Condition=" '$(NETCoreSdkVersion)' == '3.0.100-preview7-012821' ">net45;net461;net471;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
66
<Title>Async MySQL ADO.NET Connector</Title>
77
<Description>A truly async MySQL ADO.NET provider, supporting MySQL Server, MariaDB, Percona Server, Amazon Aurora, Azure Database for MySQL and more.</Description>
88
<Copyright>Copyright 2016–2019 Bradley Grainger</Copyright>

‎src/MySqlConnector/Utilities/Utility.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ public static Task<T> TaskFromException<T>(Exception exception)
351351
public static Task<T> TaskFromException<T>(Exception exception) => Task.FromException<T>(exception);
352352
#endif
353353

354-
#if !NETCOREAPP3_0
354+
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
355355
public static Task CompletedValueTask => CompletedTask;
356356
#else
357357
public static ValueTask CompletedValueTask => default;

0 commit comments

Comments
 (0)