From b2033b2db9e8b10118beaa2dab8eebdb50544960 Mon Sep 17 00:00:00 2001
From: Luiz Henrique Cassettari <ricaun@gmail.com>
Date: Fri, 6 Dec 2024 22:02:28 -0300
Subject: [PATCH] Force to Download Package

---
 Build/IAzureSignTool.cs                 |  3 ++
 ricaun.Nuke/Tools/AzureSignToolUtils.cs | 57 +++++--------------------
 ricaun.Nuke/ricaun.Nuke.csproj          |  2 +-
 3 files changed, 15 insertions(+), 47 deletions(-)

diff --git a/Build/IAzureSignTool.cs b/Build/IAzureSignTool.cs
index 4f07aea..e4d92e2 100644
--- a/Build/IAzureSignTool.cs
+++ b/Build/IAzureSignTool.cs
@@ -9,8 +9,11 @@ public interface IAzureSignTool : IClean, ICompile
         .Executes(() =>
         {
             ricaun.Nuke.Tools.AzureSignToolUtils.DownloadAzureSignTool();
+            Serilog.Log.Information("DownloadAzureSignTool");
             ricaun.Nuke.Tools.AzureSignToolUtils.DownloadNuGetKeyVaultSignTool();
+            Serilog.Log.Information("DownloadNuGetKeyVaultSignTool");
 
             ricaun.Nuke.Tools.AzureSignToolUtils.EnsureAzureToolIsInstalled();
+            Serilog.Log.Information("EnsureAzureToolIsInstalled");
         });
 }
diff --git a/ricaun.Nuke/Tools/AzureSignToolUtils.cs b/ricaun.Nuke/Tools/AzureSignToolUtils.cs
index 984c15f..8704bcc 100644
--- a/ricaun.Nuke/Tools/AzureSignToolUtils.cs
+++ b/ricaun.Nuke/Tools/AzureSignToolUtils.cs
@@ -8,6 +8,7 @@
 using System.IO;
 using Nuke.Common.Tools.DotNet;
 using Nuke.Common.IO;
+using Nuke.Common.Tooling;
 
 namespace ricaun.Nuke.Tools
 {
@@ -78,16 +79,13 @@ private static string PackageDownload(string packageId)
         /// </summary>
         public static void DownloadAzureSignTool()
         {
-            try
-            {
-                _ = AzureSignToolTasks.AzureSignToolPath;
-            }
-            catch (Exception)
+            var packageId = AzureSignToolTasks.AzureSignToolPackageId;
+            var packageIdExe = packageId.ToUpper() + "_EXE";
+
+            if (ToolPathResolver.TryGetEnvironmentExecutable(packageIdExe) is null)
             {
-                var packageId = AzureSignToolTasks.AzureSignToolPackageId;
                 var packageToolExe = PackageDownload(packageId);
-
-                Environment.SetEnvironmentVariable(packageId.ToUpper() + "_EXE", packageToolExe);
+                Environment.SetEnvironmentVariable(packageIdExe, packageToolExe);
             }
 
             _ = AzureSignToolTasks.AzureSignToolPath;
@@ -98,51 +96,18 @@ public static void DownloadAzureSignTool()
         /// </summary>
         public static void DownloadNuGetKeyVaultSignTool()
         {
-            try
-            {
-                _ = NuGetKeyVaultSignToolTasks.NuGetKeyVaultSignToolPath;
-            }
-            catch (Exception)
+            var packageId = NuGetKeyVaultSignToolTasks.NuGetKeyVaultSignToolPackageId;
+            var packageIdExe = packageId.ToUpper() + "_EXE";
+
+            if (ToolPathResolver.TryGetEnvironmentExecutable(packageIdExe) is null)
             {
-                var packageId = NuGetKeyVaultSignToolTasks.NuGetKeyVaultSignToolPackageId;
                 var packageToolExe = PackageDownload(packageId);
-
-                Environment.SetEnvironmentVariable(packageId.ToUpper() + "_EXE", packageToolExe);
+                Environment.SetEnvironmentVariable(packageIdExe, packageToolExe);
             }
 
             _ = NuGetKeyVaultSignToolTasks.NuGetKeyVaultSignToolPath;
         }
 
-private static void DownloadNuGetKeyVaultSignTool_()
-{
-    try
-    {
-        _ = NuGetKeyVaultSignToolTasks.NuGetKeyVaultSignToolPath;
-    }
-    catch (Exception)
-    {
-        var toolFolder = GetToolInstallationPath();
-        var packageId = NuGetKeyVaultSignToolTasks.NuGetKeyVaultSignToolPackageId;
-
-        if (Globbing.GlobFiles(toolFolder, $"{packageId}.exe").FirstOrDefault() is AbsolutePath packageToolPathExists)
-        {
-            Environment.SetEnvironmentVariable(packageId.ToUpper() + "_EXE", packageToolPathExists);
-        }
-
-        DotNetTasks.DotNetToolInstall(x => x
-            .SetPackageName(packageId)
-            .SetToolInstallationPath(toolFolder)
-        );
-
-        if (Globbing.GlobFiles(toolFolder, $"{packageId}.exe").FirstOrDefault() is AbsolutePath packageToolPath)
-        {
-            Environment.SetEnvironmentVariable(packageId.ToUpper() + "_EXE", packageToolPath);
-        }
-    }
-
-    _ = NuGetKeyVaultSignToolTasks.NuGetKeyVaultSignToolPath;
-}
-
         /// <summary>
         /// Signs the specified file using Azure Sign Tool or NuGet Key Vault Sign Tool.
         /// </summary>
diff --git a/ricaun.Nuke/ricaun.Nuke.csproj b/ricaun.Nuke/ricaun.Nuke.csproj
index 153519c..23bfd82 100644
--- a/ricaun.Nuke/ricaun.Nuke.csproj
+++ b/ricaun.Nuke/ricaun.Nuke.csproj
@@ -8,7 +8,7 @@
 
   <PropertyGroup>
     <PackageId>ricaun.Nuke</PackageId>
-    <Version>1.9.0-alpha.4</Version>
+    <Version>1.9.0-alpha.5</Version>
   </PropertyGroup>
 
   <PropertyGroup>