diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wix/WixToolset.Sdk/tools/wix.signing.targets | 6 | ||||
| -rw-r--r-- | 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 @@ | |||
| 7 | <SignedFilePath>$(IntermediateOutputPath)$(SignedFileName)</SignedFilePath> | 7 | <SignedFilePath>$(IntermediateOutputPath)$(SignedFileName)</SignedFilePath> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
| 10 | <UsingTask TaskName="Insignia" AssemblyFile="$(WixTasksPath)" /> | ||
| 11 | <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" /> | 10 | <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" /> |
| 12 | <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" /> | 11 | <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" /> |
| 13 | <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" /> | 12 | <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" /> |
| @@ -75,6 +74,11 @@ | |||
| 75 | $(_InternalSignDependsOn); | 74 | $(_InternalSignDependsOn); |
| 76 | AfterSigning | 75 | AfterSigning |
| 77 | </SigningDependsOn> | 76 | </SigningDependsOn> |
| 77 | |||
| 78 | <CompileDependsOn> | ||
| 79 | $(CompileDependsOn); | ||
| 80 | Signing | ||
| 81 | </CompileDependsOn> | ||
| 78 | </PropertyGroup> | 82 | </PropertyGroup> |
| 79 | <Target | 83 | <Target |
| 80 | Name="Signing" | 84 | 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 @@ | |||
| 961 | </Target> | 961 | </Target> |
| 962 | 962 | ||
| 963 | <Import Project="$(WixHarvestTargetsPath)" Condition=" '$(WixHarvestTargetsPath)' != '' and Exists('$(WixHarvestTargetsPath)')" /> | 963 | <Import Project="$(WixHarvestTargetsPath)" Condition=" '$(WixHarvestTargetsPath)' != '' and Exists('$(WixHarvestTargetsPath)')" /> |
| 964 | <Import Project="$(WixSigningTargetsPath)" Condition=" '$(WixSigningTargetsPath)' != '' and Exists('$(WixSigningTargetsPath)')" /> | 964 | <Import Project="$(WixSigningTargetsPath)" /> |
| 965 | 965 | ||
| 966 | <!-- Extension point: Define CustomAfterWixTargets to a .targets file that you want to include after this file. --> | 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)')" /> | 967 | <Import Project="$(CustomAfterWixTargets)" Condition=" '$(CustomAfterWixTargets)' != '' and Exists('$(CustomAfterWixTargets)')" /> |
