Added support for "Microsoft BuildTools" Nuget Package (nuke-build#1186)

gustavocalheiros · Apr 5, 2024 · e9401fb · e9401fb
1 parent 1279c3c
commit e9401fb
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/source/Nuke.Common/Tools/SignTool/SignToolSettings.cs b/source/Nuke.Common/Tools/SignTool/SignToolSettings.cs
@@ -4,6 +4,7 @@
 
 using System.Linq;
 using JetBrains.Annotations;
+using NuGet.Configuration;
 using Nuke.Common.IO;
 
 namespace Nuke.Common.Tools.SignTool;
@@ -20,11 +21,25 @@ private static string GetToolPath()
 
         var platformIdentifier = EnvironmentInfo.Is64Bit ? "x64" : "x86";
         const string windowsKitLastVersion = "10";
+        const string windowsKitVersionWildcard = windowsKitLastVersion + ".*";
+        const string signtoolExe = "signtool.exe";
+        const string microsoftBuildToolsNugetPackage = "microsoft.windows.sdk.buildtools";
 
         var windowsKitsRootDirectory = programDirectory / "Windows Kits" / windowsKitLastVersion;
 
-        var signToolPath = windowsKitsRootDirectory.GlobFiles($"bin/{windowsKitLastVersion}.*/{platformIdentifier}/signtool.exe").LastOrDefault();
+        var signToolPath = windowsKitsRootDirectory.GlobFiles($"bin/{windowsKitVersionWildcard}/{platformIdentifier}/{signtoolExe}").LastOrDefault();
 
-        return signToolPath ?? windowsKitsRootDirectory.GlobFiles("App Certification Kit/signtool.exe").SingleOrDefault();
+        if(signToolPath == null)
+        {
+            var nugetPath = SettingsUtility.GetGlobalPackagesFolder(Settings.LoadDefaultSettings(null));
+
+            signToolPath = AbsolutePath.Create(nugetPath)
+                .GlobFiles($"{microsoftBuildToolsNugetPackage}/{windowsKitVersionWildcard}/bin/{windowsKitVersionWildcard}/{platformIdentifier}/{signtoolExe}")
+                .LastOrDefault();
+
+            signToolPath ??= windowsKitsRootDirectory.GlobFiles($"App Certification Kit/{signtoolExe}").SingleOrDefault();
+        }
+
+        return signToolPath;
     }
 }