Skip to content

Commit 7082ca7

Browse files
committed
Add net5.0 target.
1 parent 7472189 commit 7082ca7

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/MySqlConnector/Core/ServerSession.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ private async Task<bool> OpenNamedPipeAsync(ConnectionSettings cs, int startTick
10231023
#else
10241024
if (Log.IsInfoEnabled())
10251025
Log.Info("Session{0} connecting to NamedPipe '{1}' on Server '{2}'", m_logArguments[0], cs.PipeName, cs.HostNames![0]);
1026-
var namedPipeStream = new NamedPipeClientStream(cs.HostNames![0], cs.PipeName, PipeDirection.InOut, PipeOptions.Asynchronous);
1026+
var namedPipeStream = new NamedPipeClientStream(cs.HostNames![0], cs.PipeName!, PipeDirection.InOut, PipeOptions.Asynchronous);
10271027
var timeout = Math.Max(1, cs.ConnectionTimeoutMilliseconds - unchecked(Environment.TickCount - startTickCount));
10281028
try
10291029
{
@@ -1274,14 +1274,14 @@ private async Task InitSslAsync(ProtocolCapabilities serverCapabilities, Connect
12741274
}
12751275
}
12761276

1277-
X509Certificate ValidateLocalCertificate(object lcbSender, string lcbTargetHost, X509CertificateCollection lcbLocalCertificates, X509Certificate lcbRemoteCertificate, string[] lcbAcceptableIssuers) => lcbLocalCertificates[0];
1277+
X509Certificate ValidateLocalCertificate(object lcbSender, string lcbTargetHost, X509CertificateCollection lcbLocalCertificates, X509Certificate? lcbRemoteCertificate, string[] lcbAcceptableIssuers) => lcbLocalCertificates[0];
12781278

1279-
bool ValidateRemoteCertificate(object rcbSender, X509Certificate rcbCertificate, X509Chain rcbChain, SslPolicyErrors rcbPolicyErrors)
1279+
bool ValidateRemoteCertificate(object rcbSender, X509Certificate? rcbCertificate, X509Chain? rcbChain, SslPolicyErrors rcbPolicyErrors)
12801280
{
12811281
if (cs.SslMode == MySqlSslMode.Preferred || cs.SslMode == MySqlSslMode.Required)
12821282
return true;
12831283

1284-
if ((rcbPolicyErrors & SslPolicyErrors.RemoteCertificateChainErrors) != 0 && caCertificateChain is not null)
1284+
if ((rcbPolicyErrors & SslPolicyErrors.RemoteCertificateChainErrors) != 0 && caCertificateChain is not null && rcbCertificate is not null)
12851285
{
12861286
if (caCertificateChain.Build((X509Certificate2) rcbCertificate) && caCertificateChain.ChainStatus.Length > 0)
12871287
{
@@ -1297,8 +1297,8 @@ bool ValidateRemoteCertificate(object rcbSender, X509Certificate rcbCertificate,
12971297
return rcbPolicyErrors == SslPolicyErrors.None;
12981298
}
12991299

1300-
var sslStream = clientCertificates is null ? new SslStream(m_stream, false, ValidateRemoteCertificate) :
1301-
new SslStream(m_stream, false, ValidateRemoteCertificate, ValidateLocalCertificate);
1300+
var sslStream = clientCertificates is null ? new SslStream(m_stream!, false, ValidateRemoteCertificate) :
1301+
new SslStream(m_stream!, false, ValidateRemoteCertificate, ValidateLocalCertificate);
13021302

13031303
var checkCertificateRevocation = cs.SslMode == MySqlSslMode.VerifyFull;
13041304

src/MySqlConnector/MySqlConnector.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net45;net461;net471;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>net45;net461;net471;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp2.1;netcoreapp3.0;net5.0</TargetFrameworks>
55
<Title>Async MySQL ADO.NET Connector</Title>
66
<Description>A truly async MySQL ADO.NET provider, supporting MySQL Server, MariaDB, Percona Server, Amazon Aurora, Azure Database for MySQL and more.</Description>
77
<Copyright>Copyright 2016–2020 Bradley Grainger</Copyright>

src/MySqlConnector/Protocol/Serialization/CompressedPayloadHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ private ValueTask<int> CompressAndWrite(ArraySegment<byte> remainingUncompressed
193193
compressedStream.WriteByte(0xDA);
194194

195195
using (var deflateStream = new DeflateStream(compressedStream, CompressionLevel.Optimal, leaveOpen: true))
196-
deflateStream.Write(remainingUncompressedData.Array, remainingUncompressedData.Offset, remainingUncompressedBytes);
196+
deflateStream.Write(remainingUncompressedData.Array!, remainingUncompressedData.Offset, remainingUncompressedBytes);
197197

198198
// write Adler-32 checksum to stream
199199
var checksum = ComputeAdler32Checksum(remainingUncompressedData.Array!, remainingUncompressedData.Offset, remainingUncompressedBytes);

0 commit comments

Comments
 (0)