Skip to content

Commit f1a9918

Browse files
committed
Remove netstandard1.3. Fixes #1031
1 parent 8970071 commit f1a9918

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+39
-269
lines changed

.ci/test.ps1

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ dotnet test -c Release -f net461
3636
if ($LASTEXITCODE -ne 0){
3737
exit $LASTEXITCODE;
3838
}
39-
dotnet test -c Release -f netcoreapp1.1.2
40-
if ($LASTEXITCODE -ne 0){
41-
exit $LASTEXITCODE;
42-
}
4339

4440
echo "Executing tests with Compression, No SSL"
4541
Copy-Item -Force ..\..\.ci\config\config.compression.json config.json

docs/content/api/MySqlConnector/MySqlBulkCopy/WriteToServer.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ Copies all rows in the supplied DataTable to the destination table specified by
1010
public void WriteToServer(DataTable dataTable)
1111
```
1212

13-
## Remarks
14-
15-
This method is not available on `netstandard1.3`.
16-
1713
## See Also
1814

1915
* class [MySqlBulkCopy](../../MySqlBulkCopyType/)
@@ -55,10 +51,6 @@ public void WriteToServer(IEnumerable<DataRow> dataRows, int columnCount)
5551
| dataRows | The collection of DataRow objects. |
5652
| columnCount | The number of columns to copy (in each row). |
5753

58-
## Remarks
59-
60-
This method is not available on `netstandard1.3`.
61-
6254
## See Also
6355

6456
* class [MySqlBulkCopy](../../MySqlBulkCopyType/)

docs/content/api/MySqlConnector/MySqlBulkCopy/WriteToServerAsync.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ public ValueTask WriteToServerAsync(DataTable dataTable,
1111
CancellationToken cancellationToken = default(CancellationToken))
1212
```
1313

14-
## Remarks
15-
16-
This method is not available on `netstandard1.3`.
17-
1814
## See Also
1915

2016
* class [MySqlBulkCopy](../../MySqlBulkCopyType/)
@@ -60,10 +56,6 @@ public ValueTask WriteToServerAsync(IEnumerable<DataRow> dataRows, int columnCou
6056
| columnCount | The number of columns to copy (in each row). |
6157
| cancellationToken | A token to cancel the asynchronous operation. |
6258

63-
## Remarks
64-
65-
This method is not available on `netstandard1.3`.
66-
6759
## See Also
6860

6961
* class [MySqlBulkCopy](../../MySqlBulkCopyType/)

docs/content/connection-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ These are the options that need to be used in order to configure a connection to
111111
<tr id="SslCert">
112112
<td>SslCert, Ssl-Cert</td>
113113
<td></td>
114-
<td>Specifies the path to the client’s SSL certificate file in PEM format. <code>SslKey</code> must also be specified, and <code>CertificateFile</code> should not be. This option is not supported on the <code>netstandard1.3</code> or <code>netstandard2.0</code> platforms.</td>
114+
<td>Specifies the path to the client’s SSL certificate file in PEM format. <code>SslKey</code> must also be specified, and <code>CertificateFile</code> should not be. This option is not supported on <code>netstandard2.0</code>.</td>
115115
</tr>
116116
<tr id="SslKey">
117117
<td>SslKey, Ssl-Key</td>

src/MySqlConnector.Authentication.Ed25519/MySqlConnector.Authentication.Ed25519.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
55
<Title>MySqlConnector Ed25519 Authentication Plugin</Title>
66
<Description>Implements the client_ed25519 authentication plugin for MariaDB.</Description>
77
<Copyright>Copyright 2019 Bradley Grainger</Copyright>

src/MySqlConnector.Logging.NLog/MySqlConnector.Logging.NLog.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
55
<Title>MySqlConnector Logging Adapter for NLog</Title>
66
<Description>Writes lightly-structured MySqlConnector logging output to NLog.</Description>
77
<Copyright>Copyright 2018–2021 Bradley Grainger</Copyright>

src/MySqlConnector.Logging.Serilog/MySqlConnector.Logging.Serilog.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
55
<Title>MySqlConnector Logging Adapter for Serilog</Title>
66
<Description>Writes lightly-structured MySqlConnector logging output to Serilog.</Description>
77
<Copyright>Copyright 2017–2021 Bradley Grainger</Copyright>

src/MySqlConnector.Logging.log4net/MySqlConnector.Logging.log4net.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
55
<Title>MySqlConnector Logging Adapter for log4net</Title>
66
<Description>Writes MySqlConnector logging output to log4net with one line of code.</Description>
77
<Copyright>Copyright 2017–2021 Bradley Grainger</Copyright>

src/MySqlConnector/Core/ConnectionPool.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,6 @@ public ConnectionStringPool(string connectionString, ConnectionPool? pool)
596596
public ConnectionPool? Pool { get; }
597597
}
598598

599-
#if !NETSTANDARD1_3
600599
static ConnectionPool()
601600
{
602601
AppDomain.CurrentDomain.DomainUnload += OnAppDomainShutDown;
@@ -607,7 +606,6 @@ static void OnAppDomainShutDown(object? sender, EventArgs e)
607606
{
608607
ClearPoolsAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
609608
}
610-
#endif
611609

612610
static readonly IMySqlConnectorLogger Log = MySqlConnectorLogManager.CreateLogger(nameof(ConnectionPool));
613611
static readonly ConcurrentDictionary<string, ConnectionPool?> s_pools = new();

src/MySqlConnector/Core/EnlistedTransactionBase.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if !NETSTANDARD1_3
21
using System;
32
using System.Transactions;
43

@@ -54,4 +53,3 @@ protected EnlistedTransactionBase(Transaction transaction, MySqlConnection conne
5453
protected abstract void OnRollback(Enlistment enlistment);
5554
}
5655
}
57-
#endif

0 commit comments

Comments
 (0)