Skip to content

Commit

Permalink
Remove bundle container signing support.
Browse files Browse the repository at this point in the history
It was never implemented and ass-u-mes containers are cabs,
which hopefully won't be the case forever.

Fixes wixtoolset/issues#7490.
  • Loading branch information
barnson committed Dec 31, 2023
1 parent d56481c commit 32e3cc2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 29 deletions.
12 changes: 0 additions & 12 deletions src/wix/WixToolset.Sdk/tools/WixToolset.Signing.props
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,6 @@
-->
<Target Name="SignMsi" />

<!--
==================================================================================================
SignContainers
Redefine this target in your project in order to sign your bundle's detached containers.
[IN]
@(SignContainers) - detached container files to sign.
==================================================================================================
-->
<Target Name="SignContainers" />

<!--
==================================================================================================
SignBundleEngine
Expand Down
19 changes: 2 additions & 17 deletions src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@
InternalSignMsi;
</_InternalSignDependsOn>
<_InternalSignDependsOn Condition=" '$(OutputType)' == 'Bundle' ">
GetContainersToSign;
InternalSignContainers;
InscribeBundleEngine;
InternalSignBundleEngine;
InscribeBundle;
Expand Down Expand Up @@ -96,7 +94,7 @@

<WriteLinesToFile
File="$(SignedFilePath)"
Lines="^$(MSBuildProjectFullPath);@(SignMsm);@(SignCabs);@(SignMsi);@(SignContainers);@(SignBundleEngine);@(SignBundle)"
Lines="^$(MSBuildProjectFullPath);@(SignMsm);@(SignCabs);@(SignMsi);@(SignBundleEngine);@(SignBundle)"
Overwrite="true" />
</Target>

Expand Down Expand Up @@ -156,18 +154,6 @@
Outputs="$(SignedFilePath)"
Condition=" '@(SignMsi)' != '' " />

<Target
Name="GetContainersToSign"
Inputs="@(SignTargetPath)"
Outputs="$(SignedFilePath)">
<!-- TODO: implement signing detached containers -->
</Target>

<Target
Name="InternalSignContainers"
DependsOnTargets="SignContainers"
Condition=" '@(SignContainers)' != '' " />

<Target
Name="InternalSignBundleEngine"
DependsOnTargets="SignBundleEngine"
Expand Down Expand Up @@ -224,8 +210,7 @@
================================================================================================
InscribeBundleEngine
To be called after signing a bundle's detached containers. Also removes attached container
so engine can be signed without attached container.
Removes attached container so engine can be signed without attached container.
[IN]
@(SignTargetPath) - The bundle to inscribe.
Expand Down

0 comments on commit 32e3cc2

Please sign in to comment.