From 445cd7833a858deec291d3682763ccbfa3856337 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 10 Jan 2022 16:32:31 -0800
Subject: Rename wix.signing.targets to WixToolset.Signing.targets

---
 src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj       |   2 +-
 .../tools/WixToolset.Signing.targets               | 408 +++++++++++++++++++++
 src/wix/WixToolset.Sdk/tools/wix.signing.targets   | 408 ---------------------
 src/wix/WixToolset.Sdk/tools/wix.targets           |   2 +-
 4 files changed, 410 insertions(+), 410 deletions(-)
 create mode 100644 src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets
 delete mode 100644 src/wix/WixToolset.Sdk/tools/wix.signing.targets

diff --git a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
index 33fdc7b2..a20a3aa9 100644
--- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
+++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
@@ -16,7 +16,7 @@
     <Content Include="build\$(MSBuildThisFileName).targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="tools\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="tools\wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="tools\wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="tools\WixToolset.Signing.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="tools\wix.props" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="tools\wix.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="Sdk\Sdk.props" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets b/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets
new file mode 100644
index 00000000..abf25177
--- /dev/null
+++ b/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SignedFileName Condition=" '$(SignedFileName)' == '' ">$(MSBuildProjectFile).Signed.txt</SignedFileName>
+    <SignedFilePath>$(IntermediateOutputPath)$(SignedFileName)</SignedFilePath>
+  </PropertyGroup>
+
+  <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
+  <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
+  <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
+
+  <UsingTask TaskName="GetLooseFileList" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
+  <UsingTask TaskName="GetLooseFileList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
+  <UsingTask TaskName="GetLooseFileList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
+
+  <UsingTask TaskName="InscribeMsiWithCabinetSignatures" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
+  <UsingTask TaskName="InscribeMsiWithCabinetSignatures" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
+  <UsingTask TaskName="InscribeMsiWithCabinetSignatures" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
+
+  <UsingTask TaskName="DetachBundleEngineForSigning" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
+  <UsingTask TaskName="DetachBundleEngineForSigning" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
+  <UsingTask TaskName="DetachBundleEngineForSigning" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
+
+  <UsingTask TaskName="ReattachSignedBundleEngine" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
+  <UsingTask TaskName="ReattachSignedBundleEngine" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
+  <UsingTask TaskName="ReattachSignedBundleEngine" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
+
+  <!-- Default Inscribe properties. -->
+  <PropertyGroup>
+    <InscribeNoLogo Condition=" '$(InscribeNoLogo)' == '' ">$(NoLogo)</InscribeNoLogo>
+    <InscribeSuppressAllWarnings Condition=" '$(InscribeSuppressAllWarnings)' == '' ">$(SuppressAllWarnings)</InscribeSuppressAllWarnings>
+    <InscribeSuppressSpecificWarnings Condition=" '$(InscribeSuppressSpecificWarnings)' == '' ">$(SuppressSpecificWarnings)</InscribeSuppressSpecificWarnings>
+    <InscribeTreatWarningsAsErrors Condition=" '$(InscribeTreatWarningsAsErrors)' == '' ">$(TreatWarningsAsErrors)</InscribeTreatWarningsAsErrors>
+    <InscribeTreatSpecificWarningsAsErrors Condition=" '$(InscribeTreatSpecificWarningsAsErrors)' == '' ">$(TreatSpecificWarningsAsErrors)</InscribeTreatSpecificWarningsAsErrors>
+    <InscribeVerboseOutput Condition=" '$(InscribeVerboseOutput)' == '' ">$(VerboseOutput)</InscribeVerboseOutput>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SignOutputCabs Condition=" '$(SignOutputCabs)'=='' ">$(SignOutput)</SignOutputCabs>
+  </PropertyGroup>
+
+  <!--
+  ==================================================================================================
+  Signing
+  ==================================================================================================
+  -->
+  <PropertyGroup>
+    <_InternalSignDependsOn Condition=" '$(OutputType)' == 'Module' ">
+      GetMsmsToSign;
+      InternalSignMsm;
+    </_InternalSignDependsOn>
+    <_InternalSignDependsOn Condition=" '$(OutputType)' == 'Package' ">
+      GetCabsToSign;
+      GetMsiToSign;
+      InternalSignCabs;
+      InscribeMsi;
+      InternalSignMsi;
+    </_InternalSignDependsOn>
+    <_InternalSignDependsOn Condition=" '$(OutputType)' == 'Bundle' ">
+      GetContainersToSign;
+      InternalSignContainers;
+      InscribeBundleEngine;
+      InternalSignBundleEngine;
+      InscribeBundle;
+      InternalSignBundle;
+    </_InternalSignDependsOn>
+
+    <SigningDependsOn>
+      CoreCompile;
+      CalculateSignTargetFiles;
+      BeforeSigning;
+      $(_InternalSignDependsOn);
+      AfterSigning
+    </SigningDependsOn>
+
+    <CompileDependsOn>
+      $(CompileDependsOn);
+      Signing
+    </CompileDependsOn>
+  </PropertyGroup>
+  <Target
+      Name="Signing"
+      DependsOnTargets="$(SigningDependsOn)"
+      Inputs="@(_WixBuildOutputFile)"
+      Outputs="$(SignedFilePath)"
+      Condition=" '$(SignOutput)' == 'true' ">
+
+    <ItemGroup>
+      <FileWrites Include="$(SignedFilePath)" />
+    </ItemGroup>
+
+    <WriteLinesToFile
+      File="$(SignedFilePath)"
+      Lines="^$(MSBuildProjectFullPath);@(SignMsm);@(SignCabs);@(SignMsi);@(SignContainers);@(SignBundleEngine);@(SignBundle)"
+      Overwrite="true" />
+  </Target>
+
+  <!-- Internal targets so correct signing targets are called. -->
+  <Target
+      Name="CalculateSignTargetFiles">
+    <ItemGroup>
+      <SignTargetPath Include="@(_WixBuildOutputFile)" />
+    </ItemGroup>
+  </Target>
+
+  <Target
+      Name="GetMsmsToSign"
+      Inputs="@(SignTargetPath)"
+      Outputs="$(SignedFilePath)">
+
+    <ItemGroup>
+      <SignMsm Include="@(SignTargetPath)" />
+    </ItemGroup>
+  </Target>
+
+  <Target
+      Name="InternalSignMsm"
+      DependsOnTargets="SignMsm"
+      Condition=" '@(SignMsm)' != '' " />
+
+  <Target
+      Name="GetCabsToSign"
+      Inputs="@(SignTargetPath)"
+      Outputs="$(SignedFilePath)"
+      Condition=" '$(SignOutputCabs)' == 'true' ">
+    <GetCabList Database="%(SignTargetPath.FullPath)">
+      <Output TaskParameter="CabList" ItemName="SignCabs" />
+      <Output TaskParameter="CabList" ItemName="FileWrites" />
+    </GetCabList>
+  </Target>
+
+  <Target
+      Name="InternalSignCabs"
+      DependsOnTargets="SignCabs"
+      Condition=" '@(SignCabs)' != '' " />
+
+  <Target
+      Name="GetMsiToSign"
+      Inputs="@(SignTargetPath)"
+      Outputs="$(SignedFilePath)">
+    <CreateItemAvoidingInference InputProperties="@(SignTargetPath)">
+      <Output TaskParameter="OuputItems" ItemName="SignMsi" />
+      <Output TaskParameter="OuputItems" ItemName="FileWrites" />
+    </CreateItemAvoidingInference>
+  </Target>
+
+  <Target
+      Name="InternalSignMsi"
+      DependsOnTargets="SignMsi"
+      Inputs="@(SignTargetPath)"
+      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"
+      Condition=" '@(SignBundleEngine)' != '' " />
+
+  <Target
+      Name="InternalSignBundle"
+      DependsOnTargets="SignBundle"
+      Condition=" '@(SignBundle)' != '' " />
+
+  <!--
+  ================================================================================================
+  InscribeMsi
+
+    To be called after signing an MSI's cabs - inscribes an MSI with the digital signature of its
+      external cabs.
+
+    [IN/OUT]
+    @(SignTargetPath) - The database file to inscribe - database file will be modified in-place.
+
+    [OUT]
+    @(SignMsi) - The database file to sign.
+  ================================================================================================
+  -->
+  <PropertyGroup>
+    <InscribeMsiDependsOn>
+    </InscribeMsiDependsOn>
+  </PropertyGroup>
+  <Target
+      Name="InscribeMsi"
+      DependsOnTargets="$(InscribeMsiDependsOn)"
+      Inputs="@(SignTargetPath)"
+      Outputs="$(SignedFilePath)"
+      Condition=" '@(SignCabs)' != '' ">
+
+    <InscribeMsiWithCabinetSignatures
+        DatabaseFile="%(SignTargetPath.FullPath)"
+        OutputFile="%(SignTargetPath.FullPath)"
+        IntermediateDirectory="%(SignTargetPath.RootDir)%(SignTargetPath.Directory)"
+
+        NoLogo="$(InscribeNoLogo)"
+        SuppressAllWarnings="$(InscribeSuppressAllWarnings)"
+        SuppressSpecificWarnings="$(InscribeSuppressSpecificWarnings)"
+        TreatWarningsAsErrors="$(InscribeTreatWarningsAsErrors)"
+        TreatSpecificWarningsAsErrors="$(InscribeTreatSpecificWarningsAsErrors)"
+        VerboseOutput="$(InscribeVerboseOutput)"
+        AdditionalOptions="$(InscribeAdditionalOptions)"
+
+        RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
+        ToolExe="$(WixToolExe)"
+        ToolPath="$(WixToolDir)" />
+  </Target>
+
+  <!--
+  ================================================================================================
+  InscribeBundleEngine
+
+    To be called after signing a bundle's detached containers. Also removes attached container
+    so engine can be signed without attached container.
+
+    [IN]
+    @(SignTargetPath) - The bundle to inscribe.
+
+    [OUT]
+    @(SignBundleEngine) - The bundle engine file to be signed.
+  ================================================================================================
+  -->
+  <PropertyGroup>
+    <InscribeBundleEngineDependsOn>
+    </InscribeBundleEngineDependsOn>
+  </PropertyGroup>
+  <Target
+      Name="InscribeBundleEngine"
+      DependsOnTargets="$(InscribeBundleEngineDependsOn)"
+      Inputs="@(SignTargetPath)"
+      Outputs="$(SignedFilePath)">
+
+    <DetachBundleEngineForSigning
+        BundleFile="@(SignTargetPath)"
+        OutputFile="$(IntermediateOutputPath)%(SignTargetPath.Filename)%(SignTargetPath.Extension)"
+        IntermediateDirectory="%(SignTargetPath.RootDir)%(SignTargetPath.Directory)"
+
+        NoLogo="$(InscribeNoLogo)"
+        SuppressAllWarnings="$(InscribeSuppressAllWarnings)"
+        SuppressSpecificWarnings="$(InscribeSuppressSpecificWarnings)"
+        TreatWarningsAsErrors="$(InscribeTreatWarningsAsErrors)"
+        TreatSpecificWarningsAsErrors="$(InscribeTreatSpecificWarningsAsErrors)"
+        VerboseOutput="$(InscribeVerboseOutput)"
+        AdditionalOptions="$(InscribeAdditionalOptions)"
+
+        RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
+        ToolExe="$(WixToolExe)"
+        ToolPath="$(WixToolDir)">
+      <Output TaskParameter="Output" ItemName="SignBundleEngine" />
+    </DetachBundleEngineForSigning>
+
+    <!-- Explicitly add output to FileWrites to ensure it is included even when the target is up to date. -->
+    <ItemGroup>
+      <FileWrites Include="$(IntermediateOutputPath)%(SignTargetPath.Filename)%(SignTargetPath.Extension)" />
+    </ItemGroup>
+  </Target>
+
+  <!--
+  ================================================================================================
+  InscribeBundle
+
+    To be called after signing the bundle engine to reattach the attached container.
+
+    [IN]
+    @(Inscribe) - The bundle to inscribe.
+
+    [OUT]
+    @(SignBundle) - The bundle engine file to be signed.
+  ================================================================================================
+  -->
+  <PropertyGroup>
+    <InscribeBundleDependsOn>
+    </InscribeBundleDependsOn>
+  </PropertyGroup>
+  <Target
+      Name="InscribeBundle"
+      DependsOnTargets="$(InscribeBundleDependsOn)"
+      Inputs="@(SignTargetPath)"
+      Outputs="$(SignedFilePath)">
+
+    <ReattachSignedBundleEngine
+        BundleFile="@(SignTargetPath)"
+        BundleEngineFile="@(SignBundleEngine)"
+        OutputFile="@(SignTargetPath)"
+        IntermediateDirectory="%(SignTargetPath.RootDir)%(SignTargetPath.Directory)"
+
+        NoLogo="$(InscribeNoLogo)"
+        SuppressAllWarnings="$(InscribeSuppressAllWarnings)"
+        SuppressSpecificWarnings="$(InscribeSuppressSpecificWarnings)"
+        TreatWarningsAsErrors="$(InscribeTreatWarningsAsErrors)"
+        TreatSpecificWarningsAsErrors="$(InscribeTreatSpecificWarningsAsErrors)"
+        VerboseOutput="$(InscribeVerboseOutput)"
+        AdditionalOptions="$(InscribeAdditionalOptions)"
+
+        RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
+        ToolExe="$(WixToolExe)"
+        ToolPath="$(WixToolDir)">
+      <Output TaskParameter="Output" ItemName="SignBundle" />
+      <Output TaskParameter="Output" ItemName="FileWrites" />
+    </ReattachSignedBundleEngine>
+  </Target>
+
+  <!--
+  ==================================================================================================
+  BeforeSigning
+
+    Redefine this target in your project in order to run tasks just before all signing tasks.
+  ==================================================================================================
+  -->
+  <Target Name="BeforeSigning" />
+
+  <!--
+  ==================================================================================================
+  SignMsm
+
+    Redefine this target in your project in order to sign merge modules.
+
+    [IN]
+    @(SignMsm) - merge module files to sign.
+  ==================================================================================================
+  -->
+  <Target Name="SignMsm" />
+
+  <!--
+  ==================================================================================================
+  SignCabs
+
+    Redefine this target in your project in order to sign the cabs of your database.
+
+    [IN]
+    @(SignCabs) - cabinet files to sign.
+  ==================================================================================================
+  -->
+  <Target Name="SignCabs" />
+
+  <!--
+  ==================================================================================================
+  SignMsi
+
+    Redefine this target in your project in order to sign your database, after it has been inscribed
+    with the signatures of your signed cabs.
+
+    [IN]
+    @(SignMsi) - database files to sign.
+  ==================================================================================================
+  -->
+  <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
+
+    Redefine this target in your project in order to sign your bundle, after it has been inscribed
+    with the signatures of your signed containers.
+
+    [IN]
+    @(SignBundleEngine) - bundle engine file to sign.
+  ==================================================================================================
+  -->
+  <Target Name="SignBundleEngine" />
+
+  <!--
+  ==================================================================================================
+  SignBundle
+
+    Redefine this target in your project in order to sign your bundle, after the attached container
+    is reattached.
+
+    [IN]
+    @(SignBundle) - bundle file to sign.
+  ==================================================================================================
+  -->
+  <Target Name="SignBundle" />
+
+  <!--
+  ==================================================================================================
+  AfterSigning
+
+    Redefine this target in your project in order to run tasks just after all signing tasks.
+  ==================================================================================================
+  -->
+  <Target Name="AfterSigning" />
+
+</Project>
diff --git a/src/wix/WixToolset.Sdk/tools/wix.signing.targets b/src/wix/WixToolset.Sdk/tools/wix.signing.targets
deleted file mode 100644
index abf25177..00000000
--- a/src/wix/WixToolset.Sdk/tools/wix.signing.targets
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <SignedFileName Condition=" '$(SignedFileName)' == '' ">$(MSBuildProjectFile).Signed.txt</SignedFileName>
-    <SignedFilePath>$(IntermediateOutputPath)$(SignedFileName)</SignedFilePath>
-  </PropertyGroup>
-
-  <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
-  <UsingTask TaskName="GetCabList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
-
-  <UsingTask TaskName="GetLooseFileList" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="GetLooseFileList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
-  <UsingTask TaskName="GetLooseFileList" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
-
-  <UsingTask TaskName="InscribeMsiWithCabinetSignatures" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="InscribeMsiWithCabinetSignatures" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
-  <UsingTask TaskName="InscribeMsiWithCabinetSignatures" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
-
-  <UsingTask TaskName="DetachBundleEngineForSigning" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="DetachBundleEngineForSigning" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
-  <UsingTask TaskName="DetachBundleEngineForSigning" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
-
-  <UsingTask TaskName="ReattachSignedBundleEngine" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="ReattachSignedBundleEngine" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
-  <UsingTask TaskName="ReattachSignedBundleEngine" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
-
-  <!-- Default Inscribe properties. -->
-  <PropertyGroup>
-    <InscribeNoLogo Condition=" '$(InscribeNoLogo)' == '' ">$(NoLogo)</InscribeNoLogo>
-    <InscribeSuppressAllWarnings Condition=" '$(InscribeSuppressAllWarnings)' == '' ">$(SuppressAllWarnings)</InscribeSuppressAllWarnings>
-    <InscribeSuppressSpecificWarnings Condition=" '$(InscribeSuppressSpecificWarnings)' == '' ">$(SuppressSpecificWarnings)</InscribeSuppressSpecificWarnings>
-    <InscribeTreatWarningsAsErrors Condition=" '$(InscribeTreatWarningsAsErrors)' == '' ">$(TreatWarningsAsErrors)</InscribeTreatWarningsAsErrors>
-    <InscribeTreatSpecificWarningsAsErrors Condition=" '$(InscribeTreatSpecificWarningsAsErrors)' == '' ">$(TreatSpecificWarningsAsErrors)</InscribeTreatSpecificWarningsAsErrors>
-    <InscribeVerboseOutput Condition=" '$(InscribeVerboseOutput)' == '' ">$(VerboseOutput)</InscribeVerboseOutput>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SignOutputCabs Condition=" '$(SignOutputCabs)'=='' ">$(SignOutput)</SignOutputCabs>
-  </PropertyGroup>
-
-  <!--
-  ==================================================================================================
-  Signing
-  ==================================================================================================
-  -->
-  <PropertyGroup>
-    <_InternalSignDependsOn Condition=" '$(OutputType)' == 'Module' ">
-      GetMsmsToSign;
-      InternalSignMsm;
-    </_InternalSignDependsOn>
-    <_InternalSignDependsOn Condition=" '$(OutputType)' == 'Package' ">
-      GetCabsToSign;
-      GetMsiToSign;
-      InternalSignCabs;
-      InscribeMsi;
-      InternalSignMsi;
-    </_InternalSignDependsOn>
-    <_InternalSignDependsOn Condition=" '$(OutputType)' == 'Bundle' ">
-      GetContainersToSign;
-      InternalSignContainers;
-      InscribeBundleEngine;
-      InternalSignBundleEngine;
-      InscribeBundle;
-      InternalSignBundle;
-    </_InternalSignDependsOn>
-
-    <SigningDependsOn>
-      CoreCompile;
-      CalculateSignTargetFiles;
-      BeforeSigning;
-      $(_InternalSignDependsOn);
-      AfterSigning
-    </SigningDependsOn>
-
-    <CompileDependsOn>
-      $(CompileDependsOn);
-      Signing
-    </CompileDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="Signing"
-      DependsOnTargets="$(SigningDependsOn)"
-      Inputs="@(_WixBuildOutputFile)"
-      Outputs="$(SignedFilePath)"
-      Condition=" '$(SignOutput)' == 'true' ">
-
-    <ItemGroup>
-      <FileWrites Include="$(SignedFilePath)" />
-    </ItemGroup>
-
-    <WriteLinesToFile
-      File="$(SignedFilePath)"
-      Lines="^$(MSBuildProjectFullPath);@(SignMsm);@(SignCabs);@(SignMsi);@(SignContainers);@(SignBundleEngine);@(SignBundle)"
-      Overwrite="true" />
-  </Target>
-
-  <!-- Internal targets so correct signing targets are called. -->
-  <Target
-      Name="CalculateSignTargetFiles">
-    <ItemGroup>
-      <SignTargetPath Include="@(_WixBuildOutputFile)" />
-    </ItemGroup>
-  </Target>
-
-  <Target
-      Name="GetMsmsToSign"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(SignedFilePath)">
-
-    <ItemGroup>
-      <SignMsm Include="@(SignTargetPath)" />
-    </ItemGroup>
-  </Target>
-
-  <Target
-      Name="InternalSignMsm"
-      DependsOnTargets="SignMsm"
-      Condition=" '@(SignMsm)' != '' " />
-
-  <Target
-      Name="GetCabsToSign"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(SignedFilePath)"
-      Condition=" '$(SignOutputCabs)' == 'true' ">
-    <GetCabList Database="%(SignTargetPath.FullPath)">
-      <Output TaskParameter="CabList" ItemName="SignCabs" />
-      <Output TaskParameter="CabList" ItemName="FileWrites" />
-    </GetCabList>
-  </Target>
-
-  <Target
-      Name="InternalSignCabs"
-      DependsOnTargets="SignCabs"
-      Condition=" '@(SignCabs)' != '' " />
-
-  <Target
-      Name="GetMsiToSign"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(SignedFilePath)">
-    <CreateItemAvoidingInference InputProperties="@(SignTargetPath)">
-      <Output TaskParameter="OuputItems" ItemName="SignMsi" />
-      <Output TaskParameter="OuputItems" ItemName="FileWrites" />
-    </CreateItemAvoidingInference>
-  </Target>
-
-  <Target
-      Name="InternalSignMsi"
-      DependsOnTargets="SignMsi"
-      Inputs="@(SignTargetPath)"
-      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"
-      Condition=" '@(SignBundleEngine)' != '' " />
-
-  <Target
-      Name="InternalSignBundle"
-      DependsOnTargets="SignBundle"
-      Condition=" '@(SignBundle)' != '' " />
-
-  <!--
-  ================================================================================================
-  InscribeMsi
-
-    To be called after signing an MSI's cabs - inscribes an MSI with the digital signature of its
-      external cabs.
-
-    [IN/OUT]
-    @(SignTargetPath) - The database file to inscribe - database file will be modified in-place.
-
-    [OUT]
-    @(SignMsi) - The database file to sign.
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <InscribeMsiDependsOn>
-    </InscribeMsiDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="InscribeMsi"
-      DependsOnTargets="$(InscribeMsiDependsOn)"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(SignedFilePath)"
-      Condition=" '@(SignCabs)' != '' ">
-
-    <InscribeMsiWithCabinetSignatures
-        DatabaseFile="%(SignTargetPath.FullPath)"
-        OutputFile="%(SignTargetPath.FullPath)"
-        IntermediateDirectory="%(SignTargetPath.RootDir)%(SignTargetPath.Directory)"
-
-        NoLogo="$(InscribeNoLogo)"
-        SuppressAllWarnings="$(InscribeSuppressAllWarnings)"
-        SuppressSpecificWarnings="$(InscribeSuppressSpecificWarnings)"
-        TreatWarningsAsErrors="$(InscribeTreatWarningsAsErrors)"
-        TreatSpecificWarningsAsErrors="$(InscribeTreatSpecificWarningsAsErrors)"
-        VerboseOutput="$(InscribeVerboseOutput)"
-        AdditionalOptions="$(InscribeAdditionalOptions)"
-
-        RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-        ToolExe="$(WixToolExe)"
-        ToolPath="$(WixToolDir)" />
-  </Target>
-
-  <!--
-  ================================================================================================
-  InscribeBundleEngine
-
-    To be called after signing a bundle's detached containers. Also removes attached container
-    so engine can be signed without attached container.
-
-    [IN]
-    @(SignTargetPath) - The bundle to inscribe.
-
-    [OUT]
-    @(SignBundleEngine) - The bundle engine file to be signed.
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <InscribeBundleEngineDependsOn>
-    </InscribeBundleEngineDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="InscribeBundleEngine"
-      DependsOnTargets="$(InscribeBundleEngineDependsOn)"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(SignedFilePath)">
-
-    <DetachBundleEngineForSigning
-        BundleFile="@(SignTargetPath)"
-        OutputFile="$(IntermediateOutputPath)%(SignTargetPath.Filename)%(SignTargetPath.Extension)"
-        IntermediateDirectory="%(SignTargetPath.RootDir)%(SignTargetPath.Directory)"
-
-        NoLogo="$(InscribeNoLogo)"
-        SuppressAllWarnings="$(InscribeSuppressAllWarnings)"
-        SuppressSpecificWarnings="$(InscribeSuppressSpecificWarnings)"
-        TreatWarningsAsErrors="$(InscribeTreatWarningsAsErrors)"
-        TreatSpecificWarningsAsErrors="$(InscribeTreatSpecificWarningsAsErrors)"
-        VerboseOutput="$(InscribeVerboseOutput)"
-        AdditionalOptions="$(InscribeAdditionalOptions)"
-
-        RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-        ToolExe="$(WixToolExe)"
-        ToolPath="$(WixToolDir)">
-      <Output TaskParameter="Output" ItemName="SignBundleEngine" />
-    </DetachBundleEngineForSigning>
-
-    <!-- Explicitly add output to FileWrites to ensure it is included even when the target is up to date. -->
-    <ItemGroup>
-      <FileWrites Include="$(IntermediateOutputPath)%(SignTargetPath.Filename)%(SignTargetPath.Extension)" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-  ================================================================================================
-  InscribeBundle
-
-    To be called after signing the bundle engine to reattach the attached container.
-
-    [IN]
-    @(Inscribe) - The bundle to inscribe.
-
-    [OUT]
-    @(SignBundle) - The bundle engine file to be signed.
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <InscribeBundleDependsOn>
-    </InscribeBundleDependsOn>
-  </PropertyGroup>
-  <Target
-      Name="InscribeBundle"
-      DependsOnTargets="$(InscribeBundleDependsOn)"
-      Inputs="@(SignTargetPath)"
-      Outputs="$(SignedFilePath)">
-
-    <ReattachSignedBundleEngine
-        BundleFile="@(SignTargetPath)"
-        BundleEngineFile="@(SignBundleEngine)"
-        OutputFile="@(SignTargetPath)"
-        IntermediateDirectory="%(SignTargetPath.RootDir)%(SignTargetPath.Directory)"
-
-        NoLogo="$(InscribeNoLogo)"
-        SuppressAllWarnings="$(InscribeSuppressAllWarnings)"
-        SuppressSpecificWarnings="$(InscribeSuppressSpecificWarnings)"
-        TreatWarningsAsErrors="$(InscribeTreatWarningsAsErrors)"
-        TreatSpecificWarningsAsErrors="$(InscribeTreatSpecificWarningsAsErrors)"
-        VerboseOutput="$(InscribeVerboseOutput)"
-        AdditionalOptions="$(InscribeAdditionalOptions)"
-
-        RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
-        ToolExe="$(WixToolExe)"
-        ToolPath="$(WixToolDir)">
-      <Output TaskParameter="Output" ItemName="SignBundle" />
-      <Output TaskParameter="Output" ItemName="FileWrites" />
-    </ReattachSignedBundleEngine>
-  </Target>
-
-  <!--
-  ==================================================================================================
-  BeforeSigning
-
-    Redefine this target in your project in order to run tasks just before all signing tasks.
-  ==================================================================================================
-  -->
-  <Target Name="BeforeSigning" />
-
-  <!--
-  ==================================================================================================
-  SignMsm
-
-    Redefine this target in your project in order to sign merge modules.
-
-    [IN]
-    @(SignMsm) - merge module files to sign.
-  ==================================================================================================
-  -->
-  <Target Name="SignMsm" />
-
-  <!--
-  ==================================================================================================
-  SignCabs
-
-    Redefine this target in your project in order to sign the cabs of your database.
-
-    [IN]
-    @(SignCabs) - cabinet files to sign.
-  ==================================================================================================
-  -->
-  <Target Name="SignCabs" />
-
-  <!--
-  ==================================================================================================
-  SignMsi
-
-    Redefine this target in your project in order to sign your database, after it has been inscribed
-    with the signatures of your signed cabs.
-
-    [IN]
-    @(SignMsi) - database files to sign.
-  ==================================================================================================
-  -->
-  <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
-
-    Redefine this target in your project in order to sign your bundle, after it has been inscribed
-    with the signatures of your signed containers.
-
-    [IN]
-    @(SignBundleEngine) - bundle engine file to sign.
-  ==================================================================================================
-  -->
-  <Target Name="SignBundleEngine" />
-
-  <!--
-  ==================================================================================================
-  SignBundle
-
-    Redefine this target in your project in order to sign your bundle, after the attached container
-    is reattached.
-
-    [IN]
-    @(SignBundle) - bundle file to sign.
-  ==================================================================================================
-  -->
-  <Target Name="SignBundle" />
-
-  <!--
-  ==================================================================================================
-  AfterSigning
-
-    Redefine this target in your project in order to run tasks just after all signing tasks.
-  ==================================================================================================
-  -->
-  <Target Name="AfterSigning" />
-
-</Project>
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 54115619..bd27d1a5 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -30,7 +30,7 @@
 
   <PropertyGroup>
     <WixHarvestTargetsPath Condition=" '$(WixHarvestTargetsPath)' == '' ">$(MSBuildThisFileDirectory)wix.harvest.targets</WixHarvestTargetsPath>
-    <WixSigningTargetsPath Condition=" '$(WixSigningTargetsPath)' == '' ">$(MSBuildThisFileDirectory)wix.signing.targets</WixSigningTargetsPath>
+    <WixSigningTargetsPath Condition=" '$(WixSigningTargetsPath)' == '' ">$(MSBuildThisFileDirectory)WixToolset.Signing.targets</WixSigningTargetsPath>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(EnableDefaultItems)' == 'true' ">
-- 
cgit v1.2.3-55-g6feb