@joebigelow / wix-1 / commits / 32e3cc2e

Remove bundle container signing support.

It was never implemented and ass-u-mes containers are cabs, which hopefully won't be the case forever. Fixes https://github.com/wixtoolset/issues/issues/7490.

Bob Arnson committed Dec 31, 2023 at 17:12 UTC 32e3cc2e0b9a343e4f2fa94a02be8ab8d834edc8
2 files changed +2 -29
src/wix/WixToolset.Sdk/tools/WixToolset.Signing.props
-12
@@ -52,18 +52,6 @@
52 -->
53 <Target Name="SignMsi" />
54
55 - <!--
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 -
55 <!--
56 ==================================================================================================
57 SignBundleEngine
src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets
+2 -17
@@ -62,8 +62,6 @@
62 InternalSignMsi;
63 </_InternalSignDependsOn>
64 <_InternalSignDependsOn Condition=" '$(OutputType)' == 'Bundle' ">
65 - GetContainersToSign;
66 - InternalSignContainers;
65 InscribeBundleEngine;
66 InternalSignBundleEngine;
67 InscribeBundle;
@@ -96,7 +94,7 @@
94
95 <WriteLinesToFile
96 File="$(SignedFilePath)"
99 - Lines="^$(MSBuildProjectFullPath);@(SignMsm);@(SignCabs);@(SignMsi);@(SignContainers);@(SignBundleEngine);@(SignBundle)"
97 + Lines="^$(MSBuildProjectFullPath);@(SignMsm);@(SignCabs);@(SignMsi);@(SignBundleEngine);@(SignBundle)"
98 Overwrite="true" />
99 </Target>
100
@@ -156,18 +154,6 @@
154 Outputs="$(SignedFilePath)"
155 Condition=" '@(SignMsi)' != '' " />
156
159 - <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 -
157 <Target
158 Name="InternalSignBundleEngine"
159 DependsOnTargets="SignBundleEngine"
@@ -224,8 +210,7 @@
210 ================================================================================================
211 InscribeBundleEngine
212
227 - To be called after signing a bundle's detached containers. Also removes attached container
228 - so engine can be signed without attached container.
213 + Removes attached container so engine can be signed without attached container.
214
215 [IN]
216 @(SignTargetPath) - The bundle to inscribe.