diff options
| -rw-r--r-- | src/wix/WixToolset.Sdk/tools/WixToolset.Signing.props | 12 | ||||
| -rw-r--r-- | src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets | 19 |
2 files changed, 2 insertions, 29 deletions
diff --git a/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.props b/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.props index 0b2522c8..563bba38 100644 --- a/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.props +++ b/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.props | |||
| @@ -54,18 +54,6 @@ | |||
| 54 | 54 | ||
| 55 | <!-- | 55 | <!-- |
| 56 | ================================================================================================== | 56 | ================================================================================================== |
| 57 | SignContainers | ||
| 58 | |||
| 59 | Redefine this target in your project in order to sign your bundle's detached containers. | ||
| 60 | |||
| 61 | [IN] | ||
| 62 | @(SignContainers) - detached container files to sign. | ||
| 63 | ================================================================================================== | ||
| 64 | --> | ||
| 65 | <Target Name="SignContainers" /> | ||
| 66 | |||
| 67 | <!-- | ||
| 68 | ================================================================================================== | ||
| 69 | SignBundleEngine | 57 | SignBundleEngine |
| 70 | 58 | ||
| 71 | Redefine this target in your project in order to sign your bundle, after it has been inscribed | 59 | Redefine this target in your project in order to sign your bundle, after it has been inscribed |
diff --git a/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets b/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets index 0fc05851..f976afd0 100644 --- a/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets +++ b/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets | |||
| @@ -62,8 +62,6 @@ | |||
| 62 | InternalSignMsi; | 62 | InternalSignMsi; |
| 63 | </_InternalSignDependsOn> | 63 | </_InternalSignDependsOn> |
| 64 | <_InternalSignDependsOn Condition=" '$(OutputType)' == 'Bundle' "> | 64 | <_InternalSignDependsOn Condition=" '$(OutputType)' == 'Bundle' "> |
| 65 | GetContainersToSign; | ||
| 66 | InternalSignContainers; | ||
| 67 | InscribeBundleEngine; | 65 | InscribeBundleEngine; |
| 68 | InternalSignBundleEngine; | 66 | InternalSignBundleEngine; |
| 69 | InscribeBundle; | 67 | InscribeBundle; |
| @@ -96,7 +94,7 @@ | |||
| 96 | 94 | ||
| 97 | <WriteLinesToFile | 95 | <WriteLinesToFile |
| 98 | File="$(SignedFilePath)" | 96 | File="$(SignedFilePath)" |
| 99 | Lines="^$(MSBuildProjectFullPath);@(SignMsm);@(SignCabs);@(SignMsi);@(SignContainers);@(SignBundleEngine);@(SignBundle)" | 97 | Lines="^$(MSBuildProjectFullPath);@(SignMsm);@(SignCabs);@(SignMsi);@(SignBundleEngine);@(SignBundle)" |
| 100 | Overwrite="true" /> | 98 | Overwrite="true" /> |
| 101 | </Target> | 99 | </Target> |
| 102 | 100 | ||
| @@ -157,18 +155,6 @@ | |||
| 157 | Condition=" '@(SignMsi)' != '' " /> | 155 | Condition=" '@(SignMsi)' != '' " /> |
| 158 | 156 | ||
| 159 | <Target | 157 | <Target |
| 160 | Name="GetContainersToSign" | ||
| 161 | Inputs="@(SignTargetPath)" | ||
| 162 | Outputs="$(SignedFilePath)"> | ||
| 163 | <!-- TODO: implement signing detached containers --> | ||
| 164 | </Target> | ||
| 165 | |||
| 166 | <Target | ||
| 167 | Name="InternalSignContainers" | ||
| 168 | DependsOnTargets="SignContainers" | ||
| 169 | Condition=" '@(SignContainers)' != '' " /> | ||
| 170 | |||
| 171 | <Target | ||
| 172 | Name="InternalSignBundleEngine" | 158 | Name="InternalSignBundleEngine" |
| 173 | DependsOnTargets="SignBundleEngine" | 159 | DependsOnTargets="SignBundleEngine" |
| 174 | Condition=" '@(SignBundleEngine)' != '' " /> | 160 | Condition=" '@(SignBundleEngine)' != '' " /> |
| @@ -224,8 +210,7 @@ | |||
| 224 | ================================================================================================ | 210 | ================================================================================================ |
| 225 | InscribeBundleEngine | 211 | InscribeBundleEngine |
| 226 | 212 | ||
| 227 | To be called after signing a bundle's detached containers. Also removes attached container | 213 | Removes attached container so engine can be signed without attached container. |
| 228 | so engine can be signed without attached container. | ||
| 229 | 214 | ||
| 230 | [IN] | 215 | [IN] |
| 231 | @(SignTargetPath) - The bundle to inscribe. | 216 | @(SignTargetPath) - The bundle to inscribe. |