diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-12-12 11:51:44 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-12-13 15:29:03 -0800 |
| commit | 931e5d027892a5c251d32276c4ce61f5ce135f88 (patch) | |
| tree | 0269377a4d37b733a66b7f604c922179936a9f0a | |
| parent | bd0f3491f36f4e24dd899e0c3479beed6e3c00f9 (diff) | |
| download | wix-931e5d027892a5c251d32276c4ce61f5ce135f88.tar.gz wix-931e5d027892a5c251d32276c4ce61f5ce135f88.tar.bz2 wix-931e5d027892a5c251d32276c4ce61f5ce135f88.zip | |
Sign WixAdditionalTools bundle
Fixes 7083
| -rw-r--r-- | src/Directory.Build.targets | 14 | ||||
| -rw-r--r-- | src/setup/WixAdditionalTools/WixAdditionalTools.wixproj | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 58c18b26..0dd56353 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets | |||
| @@ -143,6 +143,20 @@ | |||
| 143 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | 143 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> |
| 144 | </Target> | 144 | </Target> |
| 145 | 145 | ||
| 146 | <Target Name="SignBundleEngine" DependsOnTargets="_GetSignClient" Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' "> | ||
| 147 | <Message Importance="high" Text="Signing bundle engine: @(SignBundleEngine->'%(Identity)') using configuration from: $(SigningConfiguration)" /> | ||
| 148 | |||
| 149 | <Exec Command='"$(SigningToolExe)" sign -i "@(SignBundleEngine->'%(Identity)')" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' | ||
| 150 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | ||
| 151 | </Target> | ||
| 152 | |||
| 153 | <Target Name="SignBundle" DependsOnTargets="_GetSignClient" Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' "> | ||
| 154 | <Message Importance="high" Text="Signing bundle: @(SignBundle->'%(Identity)') using configuration from: $(SigningConfiguration)" /> | ||
| 155 | |||
| 156 | <Exec Command='"$(SigningToolExe)" sign -i "@(SignBundle->'%(Identity)')" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' | ||
| 157 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | ||
| 158 | </Target> | ||
| 159 | |||
| 146 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | 160 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> |
| 147 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | 161 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> |
| 148 | </Project> | 162 | </Project> |
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj b/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj index b7f2b1a9..847e144a 100644 --- a/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj +++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <OutputType>Bundle</OutputType> | 4 | <OutputType>Bundle</OutputType> |
| 5 | <OutputPath>$(PackageOutputPath)</OutputPath> | 5 | <OutputPath>$(PackageOutputPath)</OutputPath> |
| 6 | <SignOutput>true</SignOutput> | ||
| 6 | </PropertyGroup> | 7 | </PropertyGroup> |
| 7 | 8 | ||
| 8 | <ItemGroup> | 9 | <ItemGroup> |