From 28a080d24bcd9564fcb1f5b44923f49f0ff18648 Mon Sep 17 00:00:00 2001
From: Oscar Virot <virot@virot.com>
Date: Thu, 2 Jan 2025 23:46:34 +0100
Subject: [PATCH] Use Windows Kit mc.exe instead of from user nuget cache..

---
 .../Support.GenerateETWManifest.csproj                   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Support.GenerateETWManifest/Support.GenerateETWManifest.csproj b/Support.GenerateETWManifest/Support.GenerateETWManifest.csproj
index 4f8efe2..d85feb8 100644
--- a/Support.GenerateETWManifest/Support.GenerateETWManifest.csproj
+++ b/Support.GenerateETWManifest/Support.GenerateETWManifest.csproj
@@ -15,16 +15,21 @@
     <ProjectReference Include="..\TameMyCerts\TameMyCerts.csproj" />
   </ItemGroup>
 
+  <PropertyGroup>
+    <buildtools>C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64</buildtools>
+  </PropertyGroup>
+
   <Target Name="GenerateManifest" AfterTargets="Build">
     <Exec Command="$(TargetDir)\$(TargetName).exe  --outfile &quot;$(TargetDir)TameMyCerts.Events.man&quot;" WorkingDirectory="$(TargetDir)" />
   </Target>
 
+  <!-- There must not be quotes around $(TargetDir), as it adds a tempfile after and it breaks horribly if it has quotes-->
   <Target Name="MessageCompiler" AfterTargets="Build" DependsOnTargets="GenerateManifest">
-    <Exec Command="&quot;$(NuGetPackageRoot)microsoft.windows.sdk.buildtools\10.0.26100.1742\bin\10.0.26100.0\x64\mc.exe&quot; &quot;$(TargetDir)TameMyCerts.Events.man&quot; -r $(TargetDir)" WorkingDirectory="$(TargetDir)" />
+    <Exec Command="&quot;$(buildtools)\mc.exe&quot; &quot;$(TargetDir)TameMyCerts.Events.man&quot; -r $(TargetDir)" WorkingDirectory="$(TargetDir)" />
   </Target>
   
   <Target Name="ResourceCompiler" AfterTargets="Build" DependsOnTargets="MessageCompiler">
-    <Exec Command="&quot;$(NuGetPackageRoot)microsoft.windows.sdk.buildtools\10.0.26100.1742\bin\10.0.26100.0\x64\rc.exe&quot; &quot;$(TargetDir)TameMyCerts.Events.rc&quot;" WorkingDirectory="$(TargetDir)" />
+    <Exec Command="&quot;$(buildtools)\rc.exe&quot; &quot;$(TargetDir)TameMyCerts.Events.rc&quot;" WorkingDirectory="$(TargetDir)" />
   </Target>
 
   <Target Name="BuildDll" AfterTargets="Build" DependsOnTargets="MessageCompiler">