Add synchronous methods to the Setup class

Author: cedx

src/Cmdlets/Install-Release.cs

@@ -30,7 +30,7 @@ public class InstallReleaseCommand: PSCmdlet {
 	/// </summary>
 	protected override void ProcessRecord() {
 		var release = ParameterSetName == nameof(InputObject) ? InputObject : Release.Find(Constraint);
-		if (release?.Exists ?? false) WriteObject(new Setup(release).Install(OptionalTasks).GetAwaiter().GetResult());
+		if (release?.Exists ?? false) WriteObject(new Setup(release).Install(OptionalTasks));
 		else {
 			var exception = new InvalidOperationException("No release matches the specified version constraint.");
 			WriteError(new ErrorRecord(exception, "ReleaseNotFound", ErrorCategory.ObjectNotFound, null));

src/Setup.cs

@@ -15,14 +15,21 @@ public class Setup(Release release) {
 	/// The release to download and install.
 	/// </summary>
 	public Release Release => release;
+	
+	/// <summary>
+	/// Downloads and extracts the ZIP archive of Apache Ant.
+	/// </summary>
+	/// <param name="optionalTasks">Value indicating whether to fetch the Ant optional tasks.</param>
+	/// <returns>The path to the extracted directory.</returns>
+	public string Download(bool optionalTasks = false) => DownloadAsync(optionalTasks, CancellationToken.None).GetAwaiter().GetResult();
 
 	/// <summary>
 	/// Downloads and extracts the ZIP archive of Apache Ant.
 	/// </summary>
 	/// <param name="optionalTasks">Value indicating whether to fetch the Ant optional tasks.</param>
 	/// <param name="cancellationToken">The token to cancel the operation.</param>
 	/// <returns>The path to the extracted directory.</returns>
-	public async Task<string> Download(bool optionalTasks = false, CancellationToken cancellationToken = default) {
+	public async Task<string> DownloadAsync(bool optionalTasks = false, CancellationToken cancellationToken = default) {
 		using var httpClient = new HttpClient();
 		var version = GetType().Assembly.GetName().Version!;
 		httpClient.DefaultRequestHeaders.Add("User-Agent", $".NET/{Environment.Version.ToString(3)} | SetupAnt/{version.ToString(3)}");
@@ -39,15 +46,22 @@ public async Task<string> Download(bool optionalTasks = false, CancellationToken
 		if (optionalTasks) await FetchOptionalTasks(antHome);
 		return antHome;
 	}
+	
+	/// <summary>
+	/// Installs Apache Ant, after downloading it.
+	/// </summary>
+	/// <param name="optionalTasks">Value indicating whether to fetch the Ant optional tasks.</param>
+	/// <returns>The path to the installation directory.</returns>
+	public string Install(bool optionalTasks = false) => InstallAsync(optionalTasks, CancellationToken.None).GetAwaiter().GetResult();
 
 	/// <summary>
 	/// Installs Apache Ant, after downloading it.
 	/// </summary>
 	/// <param name="optionalTasks">Value indicating whether to fetch the Ant optional tasks.</param>
 	/// <param name="cancellationToken">The token to cancel the operation.</param>
 	/// <returns>The path to the installation directory.</returns>
-	public async Task<string> Install(bool optionalTasks = false, CancellationToken cancellationToken = default) {
-		var antHome = await Download(optionalTasks, cancellationToken);
+	public async Task<string> InstallAsync(bool optionalTasks = false, CancellationToken cancellationToken = default) {
+		var antHome = await DownloadAsync(optionalTasks, cancellationToken);
 
 		var binFolder = Path.Join(antHome, "bin");
 		Environment.SetEnvironmentVariable("PATH", $"{Environment.GetEnvironmentVariable("PATH")}{Path.PathSeparator}{binFolder}");

test/Setup.Tests.cs

@@ -16,7 +16,7 @@ public static void ClassInitialize(TestContext testContext) {
 
 	[TestMethod]
 	public async Task Download() {
-		var path = await new Setup(Release.Latest).Download(optionalTasks: true, testContext.CancellationToken);
+		var path = await new Setup(Release.Latest).DownloadAsync(optionalTasks: true, testContext.CancellationToken);
 		IsTrue(File.Exists(Path.Join(path, "bin", OperatingSystem.IsWindows() ? "ant.cmd" : "ant")));
 
 		var jars = Directory.EnumerateFiles(Path.Join(path, "lib"), "*.jar");
@@ -25,7 +25,7 @@ public async Task Download() {
 
 	[TestMethod]
 	public async Task Install() {
-		var path = await new Setup(Release.Latest).Install(optionalTasks: false, testContext.CancellationToken);
+		var path = await new Setup(Release.Latest).InstallAsync(optionalTasks: false, testContext.CancellationToken);
 		AreEqual(path, Environment.GetEnvironmentVariable("ANT_HOME"));
 		Contains(path, Environment.GetEnvironmentVariable("PATH")!);
 	}