Re-enable signing targets
Rob Mensching committed
Jan 10, 2022 at 14:23 UTC
9e8ae377ad8ee2e5d00cce6e337a2dbb3ad99736
2 files changed
+6
-2
src/wix/WixToolset.Sdk/tools/wix.signing.targets
+5
-1
@@ -7,7 +7,6 @@
7
<SignedFilePath>$(IntermediateOutputPath)$(SignedFileName)</SignedFilePath>
8
</PropertyGroup>
9
10
- <UsingTask TaskName="Insignia" AssemblyFile="$(WixTasksPath)" />
10
<UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
11
<UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
12
<UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
@@ -75,6 +74,11 @@
74
$(_InternalSignDependsOn);
75
AfterSigning
76
</SigningDependsOn>
77
+
78
+ <CompileDependsOn>
79
+ $(CompileDependsOn);
80
+ Signing
81
+ </CompileDependsOn>
82
</PropertyGroup>
83
<Target
84
Name="Signing"
src/wix/WixToolset.Sdk/tools/wix.targets
+1
-1
@@ -961,7 +961,7 @@
961
</Target>
962
963
<Import Project="$(WixHarvestTargetsPath)" Condition=" '$(WixHarvestTargetsPath)' != '' and Exists('$(WixHarvestTargetsPath)')" />
964
- <Import Project="$(WixSigningTargetsPath)" Condition=" '$(WixSigningTargetsPath)' != '' and Exists('$(WixSigningTargetsPath)')" />
964
+ <Import Project="$(WixSigningTargetsPath)" />
965
966
<!-- Extension point: Define CustomAfterWixTargets to a .targets file that you want to include after this file. -->
967
<Import Project="$(CustomAfterWixTargets)" Condition=" '$(CustomAfterWixTargets)' != '' and Exists('$(CustomAfterWixTargets)')" />