Enable recommended .NET analysers.

bgrainger · bgrainger · commit 5a833319030c · 2022-02-10T00:10:12.000-08:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -14,10 +14,11 @@
     <RepositoryUrl>https://github.com/mysql-net/MySqlConnector.git</RepositoryUrl>
     <DebugType>embedded</DebugType>
     <LangVersion>preview</LangVersion>
+    <AnalysisLevel>latest-recommended</AnalysisLevel>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>$(NoWarn);1591;NU5105</NoWarn>
+    <NoWarn>$(NoWarn);1591;CA1708;CA1835;CA2215;CA5397;NU5105</NoWarn>
     <MinVerDefaultPreReleasePhase>beta</MinVerDefaultPreReleasePhase>
   </PropertyGroup>
 
diff --git a/src/MySqlConnector/Core/DbTypeMapping.cs b/src/MySqlConnector/Core/DbTypeMapping.cs
@@ -1,3 +1,5 @@
+using System.Globalization;
+
 namespace MySqlConnector.Core;
 
 internal sealed class DbTypeMapping
@@ -16,7 +18,7 @@ public object DoConversion(object obj)
 	{
 		if (obj.GetType() == ClrType)
 			return obj;
-		return m_convert is null ? Convert.ChangeType(obj, ClrType)! : m_convert(obj);
+		return m_convert is null ? Convert.ChangeType(obj, ClrType, CultureInfo.InvariantCulture)! : m_convert(obj);
 	}
 
 	readonly Func<object, object>? m_convert;
diff --git a/src/MySqlConnector/Core/ResultSet.cs b/src/MySqlConnector/Core/ResultSet.cs
@@ -85,7 +85,7 @@ public async Task ReadResultSetHeaderAsync(IOBehavior ioBehavior)
 							try
 							{
 								int byteCount;
-								while ((byteCount = await stream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false)) > 0)
+								while ((byteCount = await stream.ReadAsync(buffer, 0, buffer.Length, CancellationToken.None).ConfigureAwait(false)) > 0)
 								{
 									payload = new(new ArraySegment<byte>(buffer, 0, byteCount));
 									await Session.SendReplyAsync(payload, ioBehavior, CancellationToken.None).ConfigureAwait(false);
@@ -286,6 +286,8 @@ public async Task<bool> ReadAsync(IOBehavior ioBehavior, CancellationToken cance
 	public int Depth => 0;
 #pragma warning restore CA1822 // Mark members as static
 
+#pragma warning disable CA2201 // Do not raise reserved exception types (IndexOutOfRangeException)
+
 	public string GetName(int ordinal)
 	{
 		if (ColumnDefinitions is null)
diff --git a/src/MySqlConnector/Core/ServerSession.cs b/src/MySqlConnector/Core/ServerSession.cs
@@ -20,6 +20,8 @@
 
 namespace MySqlConnector.Core;
 
+#pragma warning disable CA1001 // Types that own disposable fields should be disposable
+
 internal sealed class ServerSession
 {
 	public ServerSession()
@@ -1029,7 +1031,11 @@ private async Task<bool> OpenTcpSocketAsync(ConnectionSettings cs, ILoadBalancer
 			try
 			{
 				ipAddresses = ioBehavior == IOBehavior.Asynchronous
+#if NET6_0_OR_GREATER
+					? await Dns.GetHostAddressesAsync(hostName, cancellationToken).ConfigureAwait(false)
+#else
 					? await Dns.GetHostAddressesAsync(hostName).ConfigureAwait(false)
+#endif
 					: Dns.GetHostAddresses(hostName);
 			}
 			catch (SocketException)
diff --git a/src/MySqlConnector/Core/TypeMapper.cs b/src/MySqlConnector/Core/TypeMapper.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using System.Text;
 using MySqlConnector.Protocol;
 using MySqlConnector.Protocol.Payloads;
@@ -19,18 +20,18 @@ private TypeMapper()
 		m_mySqlDbTypeToColumnTypeMetadata = new();
 
 		// boolean
-		var typeBoolean = AddDbTypeMapping(new(typeof(bool), new[] { DbType.Boolean }, convert: static o => Convert.ToBoolean(o)));
+		var typeBoolean = AddDbTypeMapping(new(typeof(bool), new[] { DbType.Boolean }, convert: static o => Convert.ToBoolean(o, CultureInfo.InvariantCulture)));
 		AddColumnTypeMetadata(new("TINYINT", typeBoolean, MySqlDbType.Bool, isUnsigned: false, length: 1, columnSize: 1, simpleDataTypeName: "BOOL", createFormat: "BOOL"));
 
 		// integers
-		var typeSbyte = AddDbTypeMapping(new(typeof(sbyte), new[] { DbType.SByte }, convert: static o => Convert.ToSByte(o)));
-		var typeByte = AddDbTypeMapping(new(typeof(byte), new[] { DbType.Byte }, convert: static o => Convert.ToByte(o)));
-		var typeShort = AddDbTypeMapping(new(typeof(short), new[] { DbType.Int16 }, convert: static o => Convert.ToInt16(o)));
-		var typeUshort = AddDbTypeMapping(new(typeof(ushort), new[] { DbType.UInt16 }, convert: static o => Convert.ToUInt16(o)));
-		var typeInt = AddDbTypeMapping(new(typeof(int), new[] { DbType.Int32 }, convert: static o => Convert.ToInt32(o)));
-		var typeUint = AddDbTypeMapping(new(typeof(uint), new[] { DbType.UInt32 }, convert: static o => Convert.ToUInt32(o)));
-		var typeLong = AddDbTypeMapping(new(typeof(long), new[] { DbType.Int64 }, convert: static o => Convert.ToInt64(o)));
-		var typeUlong = AddDbTypeMapping(new(typeof(ulong), new[] { DbType.UInt64 }, convert: static o => Convert.ToUInt64(o)));
+		var typeSbyte = AddDbTypeMapping(new(typeof(sbyte), new[] { DbType.SByte }, convert: static o => Convert.ToSByte(o, CultureInfo.InvariantCulture)));
+		var typeByte = AddDbTypeMapping(new(typeof(byte), new[] { DbType.Byte }, convert: static o => Convert.ToByte(o, CultureInfo.InvariantCulture)));
+		var typeShort = AddDbTypeMapping(new(typeof(short), new[] { DbType.Int16 }, convert: static o => Convert.ToInt16(o, CultureInfo.InvariantCulture)));
+		var typeUshort = AddDbTypeMapping(new(typeof(ushort), new[] { DbType.UInt16 }, convert: static o => Convert.ToUInt16(o, CultureInfo.InvariantCulture)));
+		var typeInt = AddDbTypeMapping(new(typeof(int), new[] { DbType.Int32 }, convert: static o => Convert.ToInt32(o, CultureInfo.InvariantCulture)));
+		var typeUint = AddDbTypeMapping(new(typeof(uint), new[] { DbType.UInt32 }, convert: static o => Convert.ToUInt32(o, CultureInfo.InvariantCulture)));
+		var typeLong = AddDbTypeMapping(new(typeof(long), new[] { DbType.Int64 }, convert: static o => Convert.ToInt64(o, CultureInfo.InvariantCulture)));
+		var typeUlong = AddDbTypeMapping(new(typeof(ulong), new[] { DbType.UInt64 }, convert: static o => Convert.ToUInt64(o, CultureInfo.InvariantCulture)));
 		AddColumnTypeMetadata(new("TINYINT", typeSbyte, MySqlDbType.Byte, isUnsigned: false));
 		AddColumnTypeMetadata(new("TINYINT", typeByte, MySqlDbType.UByte, isUnsigned: true, length: 1));
 		AddColumnTypeMetadata(new("TINYINT", typeByte, MySqlDbType.UByte, isUnsigned: true));
@@ -45,9 +46,9 @@ private TypeMapper()
 		AddColumnTypeMetadata(new("BIT", typeUlong, MySqlDbType.Bit));
 
 		// decimals
-		var typeDecimal = AddDbTypeMapping(new(typeof(decimal), new[] { DbType.Decimal, DbType.Currency, DbType.VarNumeric }, convert: static o => Convert.ToDecimal(o)));
-		var typeDouble = AddDbTypeMapping(new(typeof(double), new[] { DbType.Double }, convert: static o => Convert.ToDouble(o)));
-		var typeFloat = AddDbTypeMapping(new(typeof(float), new[] { DbType.Single }, convert: static o => Convert.ToSingle(o)));
+		var typeDecimal = AddDbTypeMapping(new(typeof(decimal), new[] { DbType.Decimal, DbType.Currency, DbType.VarNumeric }, convert: static o => Convert.ToDecimal(o, CultureInfo.InvariantCulture)));
+		var typeDouble = AddDbTypeMapping(new(typeof(double), new[] { DbType.Double }, convert: static o => Convert.ToDouble(o, CultureInfo.InvariantCulture)));
+		var typeFloat = AddDbTypeMapping(new(typeof(float), new[] { DbType.Single }, convert: static o => Convert.ToSingle(o, CultureInfo.InvariantCulture)));
 		AddColumnTypeMetadata(new("DECIMAL", typeDecimal, MySqlDbType.NewDecimal, createFormat: "DECIMAL({0},{1});precision,scale"));
 		AddColumnTypeMetadata(new("DECIMAL", typeDecimal, MySqlDbType.Decimal));
 		AddColumnTypeMetadata(new("DOUBLE", typeDouble, MySqlDbType.Double));
@@ -97,7 +98,7 @@ private TypeMapper()
 #if NET6_0_OR_GREATER
 		AddDbTypeMapping(new(typeof(TimeOnly), new[] { DbType.Time }));
 #endif
-		var typeTime = AddDbTypeMapping(new(typeof(TimeSpan), new[] { DbType.Time }, convert: static o => o is string s ? Utility.ParseTimeSpan(Encoding.UTF8.GetBytes(s)) : Convert.ChangeType(o, typeof(TimeSpan))));
+		var typeTime = AddDbTypeMapping(new(typeof(TimeSpan), new[] { DbType.Time }, convert: static o => o is string s ? Utility.ParseTimeSpan(Encoding.UTF8.GetBytes(s)) : Convert.ChangeType(o, typeof(TimeSpan), CultureInfo.InvariantCulture)));
 		AddColumnTypeMetadata(new("DATETIME", typeDateTime, MySqlDbType.DateTime));
 		AddColumnTypeMetadata(new("DATE", typeDate, MySqlDbType.Date));
 		AddColumnTypeMetadata(new("DATE", typeDate, MySqlDbType.Newdate));
@@ -106,7 +107,7 @@ private TypeMapper()
 		AddColumnTypeMetadata(new("YEAR", typeInt, MySqlDbType.Year));
 
 		// guid
-		var typeGuid = AddDbTypeMapping(new(typeof(Guid), new[] { DbType.Guid }, convert: static o => Guid.Parse(Convert.ToString(o)!)));
+		var typeGuid = AddDbTypeMapping(new(typeof(Guid), new[] { DbType.Guid }, convert: static o => Guid.Parse(Convert.ToString(o, CultureInfo.InvariantCulture)!)));
 		AddColumnTypeMetadata(new("CHAR", typeGuid, MySqlDbType.Guid, length: 36, simpleDataTypeName: "CHAR(36)", createFormat: "CHAR(36)"));
 
 		// null
diff --git a/src/MySqlConnector/MySqlAttribute.cs b/src/MySqlConnector/MySqlAttribute.cs
@@ -4,7 +4,9 @@ namespace MySqlConnector
 	/// <see cref="MySqlAttribute"/> represents an attribute that can be sent with a MySQL query.
 	/// </summary>
 	/// <remarks>See <a href="https://dev.mysql.com/doc/refman/8.0/en/query-attributes.html">Query Attributes</a> for information on using query attributes.</remarks>
+#pragma warning disable CA1711 // Identifiers should not have incorrect suffix
 	public sealed class MySqlAttribute
+#pragma warning restore CA1711 // Identifiers should not have incorrect suffix
 	{
 		/// <summary>
 		/// Initializes a new <see cref="MySqlAttribute"/>.
diff --git a/src/MySqlConnector/MySqlBatch.cs b/src/MySqlConnector/MySqlBatch.cs
@@ -235,6 +235,9 @@ public void Dispose()
 #endif
 	{
 		m_isDisposed = true;
+#if NET6_0_OR_GREATER
+		base.Dispose();
+#endif
 	}
 
 	internal CommandBehavior CurrentCommandBehavior { get; set; }
diff --git a/src/MySqlConnector/MySqlBatchCommand.cs b/src/MySqlConnector/MySqlBatchCommand.cs
@@ -2,6 +2,10 @@
 
 namespace MySqlConnector;
 
+#if !NET6_0_OR_GREATER
+#pragma warning disable CA1822 // Mark members as static
+#endif
+
 public sealed class MySqlBatchCommand :
 #if NET6_0_OR_GREATER
 	DbBatchCommand,
diff --git a/src/MySqlConnector/MySqlBulkLoader.cs b/src/MySqlConnector/MySqlBulkLoader.cs
@@ -273,7 +273,7 @@ private string CreateSql()
 			sb.AppendFormat(CultureInfo.InvariantCulture, "({0}) ", string.Join(",", Columns));
 
 		if (Expressions.Count > 0)
-			sb.AppendFormat("SET {0}", string.Join(",", Expressions));
+			sb.AppendFormat(CultureInfo.InvariantCulture, "SET {0}", string.Join(",", Expressions));
 
 		sb.Append(';');
 
diff --git a/src/MySqlConnector/MySqlConnection.cs b/src/MySqlConnector/MySqlConnection.cs
@@ -13,6 +13,10 @@
 
 namespace MySqlConnector;
 
+#if !NET6_0_OR_GREATER
+#pragma warning disable CA1822 // Mark members as static
+#endif
+
 /// <summary>
 /// <see cref="MySqlConnection"/> represents a connection to a MySQL database.
 /// </summary>
diff --git a/src/MySqlConnector/MySqlConnectionStringBuilder.cs b/src/MySqlConnector/MySqlConnectionStringBuilder.cs
@@ -7,6 +7,8 @@
 
 namespace MySqlConnector;
 
+#pragma warning disable CA1010 // Generic interface should also be implemented
+
 /// <summary>
 /// <see cref="MySqlConnectionStringBuilder"/> allows you to construct a MySQL connection string by setting properties on the builder then reading the <see cref="DbConnectionStringBuilder.ConnectionString"/> property.
 /// </summary>
diff --git a/src/MySqlConnector/MySqlDataAdapter.cs b/src/MySqlConnector/MySqlDataAdapter.cs
@@ -216,15 +216,23 @@ protected override void OnNamedParameter(int index, int length)
 			ParameterIndexes.Add(parameterIndex);
 
 			// overwrite the parameter name with spaces
+#if NETCOREAPP3_0_OR_GREATER
+			CommandText = string.Concat(CommandText.AsSpan(0, index), new string(' ', length), CommandText.AsSpan(index + length));
+#else
 			CommandText = CommandText.Substring(0, index) + new string(' ', length) + CommandText.Substring(index + length);
+#endif
 		}
 
 		protected override void OnPositionalParameter(int index)
 		{
 			ParameterIndexes.Add(ParameterIndexes.Count);
 
 			// overwrite the parameter placeholder with a space
+#if NETCOREAPP3_0_OR_GREATER
+			CommandText = string.Concat(CommandText.AsSpan(0, index), " ", CommandText.AsSpan(index + 1));
+#else
 			CommandText = CommandText.Substring(0, index) + " " + CommandText.Substring(index + 1);
+#endif
 		}
 
 		readonly MySqlParameterCollection? m_parameters;
@@ -233,9 +241,11 @@ protected override void OnPositionalParameter(int index)
 	MySqlBatch? m_batch;
 }
 
+#pragma warning disable CA1711 // Identifiers should not have incorrect suffix
 public delegate void MySqlRowUpdatingEventHandler(object sender, MySqlRowUpdatingEventArgs e);
 
 public delegate void MySqlRowUpdatedEventHandler(object sender, MySqlRowUpdatedEventArgs e);
+#pragma warning restore CA1711 // Identifiers should not have incorrect suffix
 
 public sealed class MySqlRowUpdatingEventArgs : RowUpdatingEventArgs
 {
diff --git a/src/MySqlConnector/MySqlDataReader.cs b/src/MySqlConnector/MySqlDataReader.cs
@@ -8,6 +8,8 @@
 
 namespace MySqlConnector;
 
+#pragma warning disable CA1010 // Generic interface should also be implemented
+
 #if NET45 || NET461
 public sealed class MySqlDataReader : DbDataReader
 #else
diff --git a/src/MySqlConnector/MySqlDateTime.cs b/src/MySqlConnector/MySqlDateTime.cs
@@ -112,7 +112,9 @@ public readonly DateTime GetDateTime() =>
 	/// <summary>
 	/// Converts this object to a <see cref="string"/>.
 	/// </summary>
+#pragma warning disable CA1305 // Specify IFormatProvider
 	public readonly override string ToString() => IsValidDateTime ? GetDateTime().ToString() : "0000-00-00";
+#pragma warning restore CA1305 // Specify IFormatProvider
 
 	/// <summary>
 	/// Converts this object to a <see cref="DateTime"/>.
diff --git a/src/MySqlConnector/MySqlDbColumn.cs b/src/MySqlConnector/MySqlDbColumn.cs
@@ -5,6 +5,7 @@
 using MySqlConnector.Protocol.Serialization;
 
 #if NET45 || NET461
+#pragma warning disable CA1716 // Don't use reserved language keywords
 #pragma warning disable SA1402 // File may only contain a single type
 #pragma warning disable SA1403 // File may only contain a single namespace
 #pragma warning disable SA1649 // File name should match first type name
diff --git a/src/MySqlConnector/MySqlDbType.cs b/src/MySqlConnector/MySqlDbType.cs
@@ -1,5 +1,7 @@
 namespace MySqlConnector;
 
+#pragma warning disable CA1720 // Identifier contains type name
+
 public enum MySqlDbType
 {
 	Bool = -1,
diff --git a/src/MySqlConnector/MySqlInfoMessageEventArgs.cs b/src/MySqlConnector/MySqlInfoMessageEventArgs.cs
@@ -18,4 +18,6 @@ public sealed class MySqlInfoMessageEventArgs : EventArgs
 /// </summary>
 /// <param name="sender">The sender. This is the associated <see cref="MySqlConnection"/>.</param>
 /// <param name="args">The <see cref="MySqlInfoMessageEventArgs"/> containing the errors.</param>
+#pragma warning disable CA1711 // Identifiers should not have incorrect suffix
 public delegate void MySqlInfoMessageEventHandler(object sender, MySqlInfoMessageEventArgs args);
+#pragma warning restore CA1711 // Identifiers should not have incorrect suffix
diff --git a/src/MySqlConnector/MySqlParameter.cs b/src/MySqlConnector/MySqlParameter.cs
@@ -744,7 +744,7 @@ internal void AppendBinary(ByteBufferWriter writer, StatementPreparerOptions opt
 		}
 		else if (Value is Enum)
 		{
-			writer.Write(Convert.ToInt32(Value));
+			writer.Write(Convert.ToInt32(Value, CultureInfo.InvariantCulture));
 		}
 		else
 		{
diff --git a/src/MySqlConnector/MySqlParameterCollection.cs b/src/MySqlConnector/MySqlParameterCollection.cs
@@ -3,6 +3,8 @@
 
 namespace MySqlConnector;
 
+#pragma warning disable CA1010 // Generic interface should also be implemented
+
 public sealed class MySqlParameterCollection : DbParameterCollection, IEnumerable<MySqlParameter>
 {
 	internal MySqlParameterCollection()
diff --git a/src/MySqlConnector/MySqlRowsCopiedEventArgs.cs b/src/MySqlConnector/MySqlRowsCopiedEventArgs.cs
@@ -20,4 +20,6 @@ internal MySqlRowsCopiedEventArgs()
 /// <summary>
 /// Represents the method that handles the <see cref="MySqlBulkCopy.MySqlRowsCopied"/> event of a <see cref="MySqlBulkCopy"/>.
 /// </summary>
+#pragma warning disable CA1711 // Identifiers should not have incorrect suffix
 public delegate void MySqlRowsCopiedEventHandler(object sender, MySqlRowsCopiedEventArgs e);
+#pragma warning restore CA1711 // Identifiers should not have incorrect suffix
diff --git a/src/MySqlConnector/Protocol/Serialization/AuthGSSAPI.cs b/src/MySqlConnector/Protocol/Serialization/AuthGSSAPI.cs
@@ -20,6 +20,8 @@ internal static class NegotiateStreamConstants
 	public const ushort MaxPayloadLength = ushort.MaxValue;
 }
 
+#pragma warning disable CA1844 // Provide memory-based overrides of async methods when subclassing 'Stream'
+
 /// <summary>
 /// Helper class to translate NegotiateStream framing for SPNEGO token
 /// into MySQL protocol packets.
@@ -80,7 +82,7 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
 			var payloadMemory = payload.Memory;
 
 			if (payloadMemory.Length > NegotiateStreamConstants.MaxPayloadLength)
-				throw new InvalidDataException(string.Format("Payload too big for NegotiateStream - {0} bytes", payloadMemory.Length));
+				throw new InvalidDataException("Payload too big for NegotiateStream - {0} bytes".FormatInvariant(payloadMemory.Length));
 
 			// Check the first byte of the incoming packet.
 			// It can be an OK packet indicating end of server processing,
@@ -133,16 +135,15 @@ public override async Task WriteAsync(byte[] buffer, int offset, int count, Canc
 				minorProtocolVersion != NegotiateStreamConstants.MinorVersion)
 			{
 				throw new FormatException(
-					string.Format("Unknown version of NegotiateStream protocol {0}.{1}, expected {2}.{3}",
+					"Unknown version of NegotiateStream protocol {0}.{1}, expected {2}.{3}".FormatInvariant(
 					majorProtocolVersion, minorProtocolVersion,
 					NegotiateStreamConstants.MajorVersion, NegotiateStreamConstants.MinorVersion));
 			}
 			if (messageId != NegotiateStreamConstants.HandshakeDone &&
 				messageId != NegotiateStreamConstants.HandshakeError &&
 				messageId != NegotiateStreamConstants.HandshakeInProgress)
 			{
-				throw new FormatException(
-					string.Format("Invalid NegotiateStream MessageId 0x{0:X2}", messageId));
+				throw new FormatException("Invalid NegotiateStream MessageId 0x{0:X2}".FormatInvariant(messageId));
 			}
 
 			m_writePayloadLength = (int) payloadSizeLow + ((int) payloadSizeHigh << 8);
@@ -225,9 +226,7 @@ public static async Task<PayloadData> AuthenticateAsync(ConnectionSettings cs, b
 		if (cs.ServerSPN.Length != 0 && !negotiateStream.IsMutuallyAuthenticated)
 		{
 			// Negotiate used NTLM fallback, server name cannot be verified.
-			throw new AuthenticationException(string.Format(
-				"GSSAPI : Unable to verify server principal name using authentication type {0}",
-				negotiateStream.RemoteIdentity?.AuthenticationType));
+			throw new AuthenticationException("GSSAPI : Unable to verify server principal name using authentication type {0}".FormatInvariant(negotiateStream.RemoteIdentity?.AuthenticationType));
 		}
 		if (innerStream.MySQLProtocolPayload is PayloadData payload)
 			// return already pre-read OK packet.
diff --git a/src/MySqlConnector/Protocol/Serialization/AuthenticationUtility.cs b/src/MySqlConnector/Protocol/Serialization/AuthenticationUtility.cs
@@ -5,6 +5,8 @@
 
 namespace MySqlConnector.Protocol.Serialization;
 
+#pragma warning disable CA5350 // Do Not Use Weak Cryptographic Algorithms
+
 internal static class AuthenticationUtility
 {
 	public static byte[] CreateAuthenticationResponse(ReadOnlySpan<byte> challenge, string password) =>
diff --git a/src/MySqlConnector/Utilities/Utility.cs b/src/MySqlConnector/Utilities/Utility.cs
@@ -118,13 +118,21 @@ public static RSAParameters GetRsaParameters(string key)
 		}
 		else
 		{
+#if NETCOREAPP3_0_OR_GREATER
+			throw new FormatException(string.Concat("Unrecognized PEM header: ", key.AsSpan(0, Math.Min(key.Length, 80))));
+#else
 			throw new FormatException("Unrecognized PEM header: " + key.Substring(0, Math.Min(key.Length, 80)));
+#endif
 		}
 
 		var keyEndIndex = key.IndexOf(pemFooter, keyStartIndex, StringComparison.Ordinal);
 
 		if (keyEndIndex <= -1)
+#if NETCOREAPP3_0_OR_GREATER
+			throw new FormatException(string.Concat("Missing expected '", pemFooter, "' PEM footer: ", key.AsSpan(Math.Max(key.Length - 80, 0))));
+#else
 			throw new FormatException($"Missing expected '{pemFooter}' PEM footer: " + key.Substring(Math.Max(key.Length - 80, 0)));
+#endif
 
 #if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 		var keyChars = key.AsSpan().Slice(keyStartIndex, keyEndIndex - keyStartIndex);
@@ -286,12 +294,12 @@ public static ArraySegment<T> Slice<T>(this ArraySegment<T> arraySegment, int in
 		new ArraySegment<T>(arraySegment.Array!, arraySegment.Offset + index, length);
 
 	/// <summary>
-	/// Returns a new <see cref="T:byte[]"/> that is a slice of <paramref name="input"/> starting at <paramref name="offset"/>.
+	/// Returns a new <see cref="byte"/> array that is a slice of <paramref name="input"/> starting at <paramref name="offset"/>.
 	/// </summary>
 	/// <param name="input">The array to slice.</param>
 	/// <param name="offset">The offset at which to slice.</param>
 	/// <param name="length">The length of the slice.</param>
-	/// <returns>A new <see cref="T:byte[]"/> that is a slice of <paramref name="input"/> from <paramref name="offset"/> to the end.</returns>
+	/// <returns>A new <see cref="byte"/> array that is a slice of <paramref name="input"/> from <paramref name="offset"/> to the end.</returns>
 	public static byte[] ArraySlice(byte[] input, int offset, int length)
 	{
 		if (offset == 0 && length == input.Length)
@@ -384,7 +392,11 @@ public static bool TryParseRedirectionHeader(string header, out string host, out
 		if (userIndex == -1)
 			return false;
 
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
+		if (!int.TryParse(header.AsSpan(portIndex, userIndex - portIndex), out port) || port <= 0)
+#else
 		if (!int.TryParse(header.Substring(portIndex, userIndex - portIndex), out port) || port <= 0)
+#endif
 			return false;
 
 		userIndex += isCommunityFormat ? 7 : 6;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+using System.Globalization;`
	`2`	`+`
`1`	`3`	`namespace MySqlConnector.Core;`
`2`	`4`
`3`	`5`	`internal sealed class DbTypeMapping`
`@@ -16,7 +18,7 @@ public object DoConversion(object obj)`
`16`	`18`	`{`
`17`	`19`	`if (obj.GetType() == ClrType)`
`18`	`20`	`return obj;`
`19`		`- return m_convert is null ? Convert.ChangeType(obj, ClrType)! : m_convert(obj);`
	`21`	`+ return m_convert is null ? Convert.ChangeType(obj, ClrType, CultureInfo.InvariantCulture)! : m_convert(obj);`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`readonly Func<object, object>? m_convert;`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public async Task ReadResultSetHeaderAsync(IOBehavior ioBehavior)`
`85`	`85`	`try`
`86`	`86`	`{`
`87`	`87`	`int byteCount;`
`88`		`- while ((byteCount = await stream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false)) > 0)`
	`88`	`+ while ((byteCount = await stream.ReadAsync(buffer, 0, buffer.Length, CancellationToken.None).ConfigureAwait(false)) > 0)`
`89`	`89`	`{`
`90`	`90`	`payload = new(new ArraySegment<byte>(buffer, 0, byteCount));`
`91`	`91`	`await Session.SendReplyAsync(payload, ioBehavior, CancellationToken.None).ConfigureAwait(false);`
`@@ -286,6 +286,8 @@ public async Task<bool> ReadAsync(IOBehavior ioBehavior, CancellationToken cance`
`286`	`286`	`public int Depth => 0;`
`287`	`287`	`#pragma warning restore CA1822 // Mark members as static`
`288`	`288`
	`289`	`+#pragma warning disable CA2201 // Do not raise reserved exception types (IndexOutOfRangeException)`
	`290`	`+`
`289`	`291`	`public string GetName(int ordinal)`
`290`	`292`	`{`
`291`	`293`	`if (ColumnDefinitions is null)`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`
`21`	`21`	`namespace MySqlConnector.Core;`
`22`	`22`
	`23`	`+#pragma warning disable CA1001 // Types that own disposable fields should be disposable`
	`24`	`+`
`23`	`25`	`internal sealed class ServerSession`
`24`	`26`	`{`
`25`	`27`	`public ServerSession()`
`@@ -1029,7 +1031,11 @@ private async Task<bool> OpenTcpSocketAsync(ConnectionSettings cs, ILoadBalancer`
`1029`	`1031`	`try`
`1030`	`1032`	`{`
`1031`	`1033`	`ipAddresses = ioBehavior == IOBehavior.Asynchronous`
	`1034`	`+#if NET6_0_OR_GREATER`
	`1035`	`+ ? await Dns.GetHostAddressesAsync(hostName, cancellationToken).ConfigureAwait(false)`
	`1036`	`+#else`
`1032`	`1037`	`? await Dns.GetHostAddressesAsync(hostName).ConfigureAwait(false)`
	`1038`	`+#endif`
`1033`	`1039`	`: Dns.GetHostAddresses(hostName);`
`1034`	`1040`	`}`
`1035`	`1041`	`catch (SocketException)`
Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,9 @@ public void Dispose()`
`235`	`235`	`#endif`
`236`	`236`	`{`
`237`	`237`	`m_isDisposed = true;`
	`238`	`+#if NET6_0_OR_GREATER`
	`239`	`+ base.Dispose();`
	`240`	`+#endif`
`238`	`241`	`}`
`239`	`242`
`240`	`243`	`internal CommandBehavior CurrentCommandBehavior { get; set; }`