From 9e8ae377ad8ee2e5d00cce6e337a2dbb3ad99736 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 10 Jan 2022 14:23:04 -0800
Subject: Re-enable signing targets

---
 src/wix/WixToolset.Sdk/tools/wix.signing.targets | 6 +++++-
 src/wix/WixToolset.Sdk/tools/wix.targets         | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/wix/WixToolset.Sdk/tools/wix.signing.targets b/src/wix/WixToolset.Sdk/tools/wix.signing.targets
index cdaee4a2..abf25177 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.signing.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.signing.targets
@@ -7,7 +7,6 @@
     <SignedFilePath>$(IntermediateOutputPath)$(SignedFileName)</SignedFilePath>
   </PropertyGroup>
 
-  <UsingTask TaskName="Insignia" AssemblyFile="$(WixTasksPath)" />
   <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
   <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
   <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
@@ -75,6 +74,11 @@
       $(_InternalSignDependsOn);
       AfterSigning
     </SigningDependsOn>
+
+    <CompileDependsOn>
+      $(CompileDependsOn);
+      Signing
+    </CompileDependsOn>
   </PropertyGroup>
   <Target
       Name="Signing"
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 0029e217..5487c07f 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -961,7 +961,7 @@
   </Target>
 
   <Import Project="$(WixHarvestTargetsPath)" Condition=" '$(WixHarvestTargetsPath)' != '' and Exists('$(WixHarvestTargetsPath)')" />
-  <Import Project="$(WixSigningTargetsPath)" Condition=" '$(WixSigningTargetsPath)' != '' and Exists('$(WixSigningTargetsPath)')" />
+  <Import Project="$(WixSigningTargetsPath)"  />
 
   <!-- Extension point: Define CustomAfterWixTargets to a .targets file that you want to include after this file. -->
   <Import Project="$(CustomAfterWixTargets)" Condition=" '$(CustomAfterWixTargets)' != '' and Exists('$(CustomAfterWixTargets)')" />
-- 
cgit v1.2.3-55-g6feb