Remove Task Utility methods.

bgrainger · bgrainger · commit 9edab000659e · 2022-08-18T22:37:05.000-07:00
These were only necessary for .NET 4.5 compatibility.

Signed-off-by: Bradley Grainger &lt;bgrainger@gmail.com&gt;
diff --git a/src/MySqlConnector/Core/SchemaProvider.g.cs b/src/MySqlConnector/Core/SchemaProvider.g.cs
@@ -119,7 +119,7 @@ private Task FillMetaDataCollectionsAsync(IOBehavior ioBehavior, DataTable dataT
 		dataTable.Rows.Add("UserPrivileges", 0, 0);
 		dataTable.Rows.Add("Views", 0, 3);
 
-		return Utility.CompletedTask;
+		return Task.CompletedTask;
 	}
 
 	private async Task FillCharacterSetsAsync(IOBehavior ioBehavior, DataTable dataTable, string?[]? restrictionValues, CancellationToken cancellationToken)
@@ -261,7 +261,7 @@ private Task FillDataSourceInformationAsync(IOBehavior ioBehavior, DataTable dat
 
 		DoFillDataSourceInformation(dataTable);
 
-		return Utility.CompletedTask;
+		return Task.CompletedTask;
 	}
 
 	private Task FillDataTypesAsync(IOBehavior ioBehavior, DataTable dataTable, string?[]? restrictionValues, CancellationToken cancellationToken)
@@ -298,7 +298,7 @@ private Task FillDataTypesAsync(IOBehavior ioBehavior, DataTable dataTable, stri
 
 		DoFillDataTypes(dataTable);
 
-		return Utility.CompletedTask;
+		return Task.CompletedTask;
 	}
 
 	private async Task FillEnginesAsync(IOBehavior ioBehavior, DataTable dataTable, string?[]? restrictionValues, CancellationToken cancellationToken)
@@ -562,7 +562,7 @@ private Task FillReservedWordsAsync(IOBehavior ioBehavior, DataTable dataTable,
 
 		DoFillReservedWords(dataTable);
 
-		return Utility.CompletedTask;
+		return Task.CompletedTask;
 	}
 
 	private async Task FillResourceGroupsAsync(IOBehavior ioBehavior, DataTable dataTable, string?[]? restrictionValues, CancellationToken cancellationToken)
@@ -604,7 +604,7 @@ private Task FillRestrictionsAsync(IOBehavior ioBehavior, DataTable dataTable, s
 		dataTable.Rows.Add("Tables", "Table", "TABLE_NAME", 3);
 		dataTable.Rows.Add("Tables", "TableType", "TABLE_TYPE", 4);
 
-		return Utility.CompletedTask;
+		return Task.CompletedTask;
 	}
 
 	private async Task FillSchemaPrivilegesAsync(IOBehavior ioBehavior, DataTable dataTable, string?[]? restrictionValues, CancellationToken cancellationToken)
diff --git a/src/MySqlConnector/MySqlBatch.cs b/src/MySqlConnector/MySqlBatch.cs
@@ -151,7 +151,7 @@ private async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavi
 	private Task<MySqlDataReader> ExecuteReaderAsync(CommandBehavior behavior, IOBehavior ioBehavior, CancellationToken cancellationToken)
 	{
 		if (!IsValid(out var exception))
-		 	return Utility.TaskFromException<MySqlDataReader>(exception);
+		 	return Task.FromException<MySqlDataReader>(exception);
 
 		CurrentCommandBehavior = behavior;
 		foreach (MySqlBatchCommand batchCommand in BatchCommands)
@@ -366,7 +366,7 @@ private bool NeedsPrepare(out Exception? exception)
 	private Task PrepareAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
 	{
 		if (!NeedsPrepare(out var exception))
-			return exception is null ? Utility.CompletedTask : Utility.TaskFromException(exception);
+			return exception is null ? Task.CompletedTask : Task.FromException(exception);
 
 		return DoPrepareAsync(ioBehavior, cancellationToken);
 	}
diff --git a/src/MySqlConnector/MySqlCommand.cs b/src/MySqlConnector/MySqlCommand.cs
@@ -160,7 +160,7 @@ public override void Prepare()
 	private Task PrepareAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
 	{
 		if (!NeedsPrepare(out var exception))
-			return exception is null ? Utility.CompletedTask : Utility.TaskFromException(exception);
+			return exception is null ? Task.CompletedTask : Task.FromException(exception);
 
 		return Connection!.Session.PrepareAsync(this, ioBehavior, cancellationToken);
 	}
@@ -347,7 +347,7 @@ internal async Task<MySqlDataReader> ExecuteReaderAsync(CommandBehavior behavior
 	internal Task<MySqlDataReader> ExecuteReaderNoResetTimeoutAsync(CommandBehavior behavior, IOBehavior ioBehavior, CancellationToken cancellationToken)
 	{
 		if (!IsValid(out var exception))
-			return Utility.TaskFromException<MySqlDataReader>(exception);
+			return Task.FromException<MySqlDataReader>(exception);
 
 		var activity = NoActivity ? null : Connection!.Session.StartActivity(ActivitySourceHelper.ExecuteActivityName,
 			ActivitySourceHelper.DatabaseStatementTagName, CommandText);
@@ -375,7 +375,7 @@ public Task DisposeAsync()
 #if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 		return default;
 #else
-		return Utility.CompletedTask;
+		return Task.CompletedTask;
 #endif
 	}
 
diff --git a/src/MySqlConnector/MySqlTransaction.cs b/src/MySqlConnector/MySqlTransaction.cs
@@ -217,7 +217,7 @@ internal Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancellation
 #if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 		return default;
 #else
-		return Utility.CompletedTask;
+		return Task.CompletedTask;
 #endif
 	}
 
diff --git a/src/MySqlConnector/Utilities/Utility.cs b/src/MySqlConnector/Utilities/Utility.cs
@@ -473,9 +473,6 @@ public static TimeSpan ParseTimeSpan(ReadOnlySpan<byte> value)
 		throw new FormatException("Couldn't interpret '{0}' as a valid TimeSpan".FormatInvariant(Encoding.UTF8.GetString(originalValue)));
 	}
 
-	public static Task CompletedTask => Task.CompletedTask;
-	public static Task TaskFromException(Exception exception) => Task.FromException(exception);
-	public static Task<T> TaskFromException<T>(Exception exception) => Task.FromException<T>(exception);
 	public static byte[] EmptyByteArray { get; } = Array.Empty<byte>();
 
 #if !NETCOREAPP2_1_OR_GREATER && !NETSTANDARD2_1_OR_GREATER
diff --git a/src/MySqlConnector/Utilities/ValueTaskExtensions.cs b/src/MySqlConnector/Utilities/ValueTaskExtensions.cs
@@ -4,5 +4,5 @@ internal static class ValueTaskExtensions
 {
 	public static async ValueTask<TResult> ContinueWith<T, TResult>(this ValueTask<T> valueTask, Func<T, ValueTask<TResult>> continuation) => await continuation(await valueTask.ConfigureAwait(false)).ConfigureAwait(false);
 
-	public static ValueTask<T> FromException<T>(Exception exception) => new ValueTask<T>(Utility.TaskFromException<T>(exception));
+	public static ValueTask<T> FromException<T>(Exception exception) => new ValueTask<T>(Task.FromException<T>(exception));
 }
diff --git a/tests/SideBySide/SslTests.cs b/tests/SideBySide/SslTests.cs
@@ -66,7 +66,7 @@ public async Task ConnectSslClientCertificateCallback(string certificateFile, st
 		connection.ProvideClientCertificatesCallback = x =>
 		{
 			x.Add(new X509Certificate2(certificateFilePath, certificateFilePassword));
-			return MySqlConnector.Utilities.Utility.CompletedTask;
+			return Task.CompletedTask;
 		};
 #else
 		connection.ProvideClientCertificatesCallback = async x =>
diff --git a/tools/SchemaCollectionGenerator/SchemaCollectionGenerator.cs b/tools/SchemaCollectionGenerator/SchemaCollectionGenerator.cs
@@ -131,7 +131,7 @@ public async ValueTask<DataTable> GetSchemaAsync(IOBehavior ioBehavior, string c
 	if (!isAsync)
 	{
 		codeWriter.Write(@"
-		return Utility.CompletedTask;");
+		return Task.CompletedTask;");
 	}
 
 	codeWriter.Write(@"

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ private Task FillMetaDataCollectionsAsync(IOBehavior ioBehavior, DataTable dataT`
`119`	`119`	`dataTable.Rows.Add("UserPrivileges", 0, 0);`
`120`	`120`	`dataTable.Rows.Add("Views", 0, 3);`
`121`	`121`
`122`		`- return Utility.CompletedTask;`
	`122`	`+ return Task.CompletedTask;`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`private async Task FillCharacterSetsAsync(IOBehavior ioBehavior, DataTable dataTable, string?[]? restrictionValues, CancellationToken cancellationToken)`
`@@ -261,7 +261,7 @@ private Task FillDataSourceInformationAsync(IOBehavior ioBehavior, DataTable dat`
`261`	`261`
`262`	`262`	`DoFillDataSourceInformation(dataTable);`
`263`	`263`
`264`		`- return Utility.CompletedTask;`
	`264`	`+ return Task.CompletedTask;`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`private Task FillDataTypesAsync(IOBehavior ioBehavior, DataTable dataTable, string?[]? restrictionValues, CancellationToken cancellationToken)`
`@@ -298,7 +298,7 @@ private Task FillDataTypesAsync(IOBehavior ioBehavior, DataTable dataTable, stri`
`298`	`298`
`299`	`299`	`DoFillDataTypes(dataTable);`
`300`	`300`
`301`		`- return Utility.CompletedTask;`
	`301`	`+ return Task.CompletedTask;`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`private async Task FillEnginesAsync(IOBehavior ioBehavior, DataTable dataTable, string?[]? restrictionValues, CancellationToken cancellationToken)`
`@@ -562,7 +562,7 @@ private Task FillReservedWordsAsync(IOBehavior ioBehavior, DataTable dataTable,`
`562`	`562`
`563`	`563`	`DoFillReservedWords(dataTable);`
`564`	`564`
`565`		`- return Utility.CompletedTask;`
	`565`	`+ return Task.CompletedTask;`
`566`	`566`	`}`
`567`	`567`
`568`	`568`	`private async Task FillResourceGroupsAsync(IOBehavior ioBehavior, DataTable dataTable, string?[]? restrictionValues, CancellationToken cancellationToken)`
`@@ -604,7 +604,7 @@ private Task FillRestrictionsAsync(IOBehavior ioBehavior, DataTable dataTable, s`
`604`	`604`	`dataTable.Rows.Add("Tables", "Table", "TABLE_NAME", 3);`
`605`	`605`	`dataTable.Rows.Add("Tables", "TableType", "TABLE_TYPE", 4);`
`606`	`606`
`607`		`- return Utility.CompletedTask;`
	`607`	`+ return Task.CompletedTask;`
`608`	`608`	`}`
`609`	`609`
`610`	`610`	`private async Task FillSchemaPrivilegesAsync(IOBehavior ioBehavior, DataTable dataTable, string?[]? restrictionValues, CancellationToken cancellationToken)`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ private async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavi`
`151`	`151`	`private Task<MySqlDataReader> ExecuteReaderAsync(CommandBehavior behavior, IOBehavior ioBehavior, CancellationToken cancellationToken)`
`152`	`152`	`{`
`153`	`153`	`if (!IsValid(out var exception))`
`154`		`- return Utility.TaskFromException<MySqlDataReader>(exception);`
	`154`	`+ return Task.FromException<MySqlDataReader>(exception);`
`155`	`155`
`156`	`156`	`CurrentCommandBehavior = behavior;`
`157`	`157`	`foreach (MySqlBatchCommand batchCommand in BatchCommands)`
`@@ -366,7 +366,7 @@ private bool NeedsPrepare(out Exception? exception)`
`366`	`366`	`private Task PrepareAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)`
`367`	`367`	`{`
`368`	`368`	`if (!NeedsPrepare(out var exception))`
`369`		`- return exception is null ? Utility.CompletedTask : Utility.TaskFromException(exception);`
	`369`	`+ return exception is null ? Task.CompletedTask : Task.FromException(exception);`
`370`	`370`
`371`	`371`	`return DoPrepareAsync(ioBehavior, cancellationToken);`
`372`	`372`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public override void Prepare()`
`160`	`160`	`private Task PrepareAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)`
`161`	`161`	`{`
`162`	`162`	`if (!NeedsPrepare(out var exception))`
`163`		`- return exception is null ? Utility.CompletedTask : Utility.TaskFromException(exception);`
	`163`	`+ return exception is null ? Task.CompletedTask : Task.FromException(exception);`
`164`	`164`
`165`	`165`	`return Connection!.Session.PrepareAsync(this, ioBehavior, cancellationToken);`
`166`	`166`	`}`
`@@ -347,7 +347,7 @@ internal async Task<MySqlDataReader> ExecuteReaderAsync(CommandBehavior behavior`
`347`	`347`	`internal Task<MySqlDataReader> ExecuteReaderNoResetTimeoutAsync(CommandBehavior behavior, IOBehavior ioBehavior, CancellationToken cancellationToken)`
`348`	`348`	`{`
`349`	`349`	`if (!IsValid(out var exception))`
`350`		`- return Utility.TaskFromException<MySqlDataReader>(exception);`
	`350`	`+ return Task.FromException<MySqlDataReader>(exception);`
`351`	`351`
`352`	`352`	`var activity = NoActivity ? null : Connection!.Session.StartActivity(ActivitySourceHelper.ExecuteActivityName,`
`353`	`353`	`ActivitySourceHelper.DatabaseStatementTagName, CommandText);`
`@@ -375,7 +375,7 @@ public Task DisposeAsync()`
`375`	`375`	`#if NETCOREAPP3_0_OR_GREATER \|\| NETSTANDARD2_1_OR_GREATER`
`376`	`376`	`return default;`
`377`	`377`	`#else`
`378`		`- return Utility.CompletedTask;`
	`378`	`+ return Task.CompletedTask;`
`379`	`379`	`#endif`
`380`	`380`	`}`
`381`	`381`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ internal Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancellation`
`217`	`217`	`#if NETCOREAPP3_0_OR_GREATER \|\| NETSTANDARD2_1_OR_GREATER`
`218`	`218`	`return default;`
`219`	`219`	`#else`
`220`		`- return Utility.CompletedTask;`
	`220`	`+ return Task.CompletedTask;`
`221`	`221`	`#endif`
`222`	`222`	`}`
`223`	`223`
Original file line number	Diff line number	Diff line change
`@@ -473,9 +473,6 @@ public static TimeSpan ParseTimeSpan(ReadOnlySpan<byte> value)`
`473`	`473`	`throw new FormatException("Couldn't interpret '{0}' as a valid TimeSpan".FormatInvariant(Encoding.UTF8.GetString(originalValue)));`
`474`	`474`	`}`
`475`	`475`
`476`		`- public static Task CompletedTask => Task.CompletedTask;`
`477`		`- public static Task TaskFromException(Exception exception) => Task.FromException(exception);`
`478`		`- public static Task<T> TaskFromException<T>(Exception exception) => Task.FromException<T>(exception);`
`479`	`476`	`public static byte[] EmptyByteArray { get; } = Array.Empty<byte>();`
`480`	`477`
`481`	`478`	`#if !NETCOREAPP2_1_OR_GREATER && !NETSTANDARD2_1_OR_GREATER`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ internal static class ValueTaskExtensions`
`4`	`4`	`{`
`5`	`5`	`public static async ValueTask<TResult> ContinueWith<T, TResult>(this ValueTask<T> valueTask, Func<T, ValueTask<TResult>> continuation) => await continuation(await valueTask.ConfigureAwait(false)).ConfigureAwait(false);`
`6`	`6`
`7`		`- public static ValueTask<T> FromException<T>(Exception exception) => new ValueTask<T>(Utility.TaskFromException<T>(exception));`
	`7`	`+ public static ValueTask<T> FromException<T>(Exception exception) => new ValueTask<T>(Task.FromException<T>(exception));`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public async Task ConnectSslClientCertificateCallback(string certificateFile, st`
`66`	`66`	`connection.ProvideClientCertificatesCallback = x =>`
`67`	`67`	`{`
`68`	`68`	`x.Add(new X509Certificate2(certificateFilePath, certificateFilePassword));`
`69`		`- return MySqlConnector.Utilities.Utility.CompletedTask;`
	`69`	`+ return Task.CompletedTask;`
`70`	`70`	`};`
`71`	`71`	`#else`
`72`	`72`	`connection.ProvideClientCertificatesCallback = async x =>`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public async ValueTask<DataTable> GetSchemaAsync(IOBehavior ioBehavior, string c`
`131`	`131`	`if (!isAsync)`
`132`	`132`	`{`
`133`	`133`	`codeWriter.Write(@"`
`134`		`- return Utility.CompletedTask;");`
	`134`	`+ return Task.CompletedTask;");`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`codeWriter.Write(@"`