From 19825b16522d2761d8e40a511d03a0e237eef0b5 Mon Sep 17 00:00:00 2001
From: Morten Nielsen <mn@iter.dk>
Date: Thu, 23 Dec 2021 13:38:52 -0800
Subject: [PATCH] Improve path for signtool

---
 .github/workflows/publish_nuget.yml |  2 +-
 src/NmeaParser/NmeaParser.csproj    | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish_nuget.yml b/.github/workflows/publish_nuget.yml
index dfe4df9..89c6bec 100644
--- a/.github/workflows/publish_nuget.yml
+++ b/.github/workflows/publish_nuget.yml
@@ -13,7 +13,7 @@ jobs:
       uses: actions/checkout@v1
     
     - name: Setup Visual Studio Command Prompt
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v1.1
   
     - name: Get certificate
       id: cert_file
diff --git a/src/NmeaParser/NmeaParser.csproj b/src/NmeaParser/NmeaParser.csproj
index 3bc2340..9eb4d4a 100644
--- a/src/NmeaParser/NmeaParser.csproj
+++ b/src/NmeaParser/NmeaParser.csproj
@@ -88,17 +88,22 @@ All messages now have a unique timestamp useful to expire older messages.</Packa
   </ItemGroup>
 
   <Target Name="SignAssemblies" Condition="Exists($(CertificatePath)) AND '$(CertificatePassword)'!=''" BeforeTargets="CopyFilesToOutputDirectory" DependsOnTargets="ComputeIntermediateSatelliteAssemblies"> 
+    <PropertyGroup>
+      <SignToolPath>$(ProgramFiles)\Windows Kits\10\bin\x64\signtool.exe</SignToolPath>
+      <SignToolPath Condition="!Exists($(SignToolPath))">$(ProgramFiles)\Windows Kits\10\bin\x86\signtool.exe</SignToolPath>
+      <SignToolPath Condition="!Exists($(SignToolPath))">$(ProgramFiles)\Windows Kits\10\bin\10.0.18362.0\x64\signtool.exe</SignToolPath>    
+      <SignToolPath Condition="!Exists($(SignToolPath))">$(WindowsSDK80Path)bin\x64\signtool.exe</SignToolPath>
+      <SignToolPath Condition="!Exists($(SignToolPath))">signtool.exe</SignToolPath> <!-- fallback to use PATH environment -->  
+    </PropertyGroup>
     <ItemGroup>
       <FilesToSign Include="@(IntermediateAssembly)" />
       <FilesToSign Include="@(IntermediateRefAssembly)" />
       <FilesToSign Include="@(IntermediateSatelliteAssembliesWithTargetPath)" />
-    </ItemGroup>
-    <ItemGroup>
       <FilesToSignFiltered Include="@(FilesToSign)" Condition="Exists(%(FilesToSign.Identity))" />
     </ItemGroup>
-    <Exec Condition="'@(FilesToSignFiltered->Count())' > 0" Command="signtool sign /v /fd SHA1 /f &quot;$(CertificatePath)&quot; /p &quot;$(CertificatePassword)&quot; /tr http://timestamp.digicert.com /td SHA1 &quot;%(FilesToSignFiltered.Identity)&quot;"
+    <Exec Condition="'@(FilesToSignFiltered->Count())' > 0" Command="&quot;$(SignToolPath)&quot; sign /v /fd SHA1 /f &quot;$(CertificatePath)&quot; /p &quot;$(CertificatePassword)&quot; /tr http://timestamp.digicert.com /td SHA1 &quot;%(FilesToSignFiltered.Identity)&quot;"
           WorkingDirectory="$(ProjectDir)" EchoOff="true" />
-    <Exec Condition="'@(FilesToSignFiltered->Count())' > 0" Command="signtool sign /v /as /d &quot;Authorization Summary&quot; /fd SHA256 /f &quot;$(CertificatePath)&quot; /p &quot;$(CertificatePassword)&quot; /tr http://timestamp.digicert.com /td SHA256 &quot;%(FilesToSignFiltered.Identity)&quot;"
+    <Exec Condition="'@(FilesToSignFiltered->Count())' > 0" Command="&quot;$(SignToolPath)&quot; sign /v /as /d &quot;Authorization Summary&quot; /fd SHA256 /f &quot;$(CertificatePath)&quot; /p &quot;$(CertificatePassword)&quot; /tr http://timestamp.digicert.com /td SHA256 &quot;%(FilesToSignFiltered.Identity)&quot;"
           WorkingDirectory="$(ProjectDir)" EchoOff="true" />
   </Target>