From f41e1ec53f706551e6f747e42b2e926ee8624791 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 13 Dec 2022 14:31:15 -0800
Subject: Ensure engine inscribe path is different from the original engine
 path

Fixes 7085
---
 src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets | 8 ++++----
 src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets b/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets
index c414bcf1..0fc05851 100644
--- a/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets
+++ b/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets
@@ -246,7 +246,7 @@
 
     <DetachBundleEngineForSigning
         BundleFile="@(SignTargetPath)"
-        OutputFile="$(IntermediateOutputPath)%(SignTargetPath.Filename)%(SignTargetPath.Extension)"
+        OutputFile="$(IntermediateOutputPath)%(SignTargetPath.Filename)-engine%(SignTargetPath.Extension)"
         IntermediateDirectory="%(SignTargetPath.RootDir)%(SignTargetPath.Directory)"
 
         NoLogo="$(InscribeNoLogo)"
@@ -264,7 +264,7 @@
 
     <!-- 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)" />
+      <FileWrites Include="$(IntermediateOutputPath)%(SignTargetPath.Filename)-engine%(SignTargetPath.Extension)" />
     </ItemGroup>
   </Target>
 
@@ -275,7 +275,7 @@
     To be called after signing the bundle engine to reattach the attached container.
 
     [IN]
-    @(Inscribe) - The bundle to inscribe.
+    @(SignBundleEngine) - The bundle to inscribe.
 
     [OUT]
     @(SignBundle) - The bundle engine file to be signed.
@@ -288,7 +288,7 @@
   <Target
       Name="InscribeBundle"
       DependsOnTargets="$(InscribeBundleDependsOn)"
-      Inputs="@(SignTargetPath)"
+      Inputs="@(SignTargetPath);@(SignBundleEngine)"
       Outputs="$(SignedFilePath)">
 
     <ReattachSignedBundleEngine
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index a259298c..2c106015 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -41,7 +41,7 @@ namespace WixToolsetTest.Sdk
                 var testMessages = result.Output.Where(line => line.Contains("TEST:")).Select(line => line.Trim()).ToArray();
                 WixAssert.CompareLineByLine(new[]
                 {
-                    @"TEST: SignBundleEngine: obj\x86\Release\SimpleBundle.exe",
+                    @"TEST: SignBundleEngine: obj\x86\Release\SimpleBundle-engine.exe",
                     @"TEST: SignBundle: obj\x86\Release\SimpleBundle.exe",
                 }, testMessages);
 
@@ -84,7 +84,7 @@ namespace WixToolsetTest.Sdk
                 var testMessages = result.Output.Where(line => line.Contains("TEST:")).Select(line => line.Trim()).ToArray();
                 WixAssert.CompareLineByLine(new[]
                 {
-                    @"TEST: SignBundleEngine: obj\x86\Release\UncompressedBundle.exe",
+                    @"TEST: SignBundleEngine: obj\x86\Release\UncompressedBundle-engine.exe",
                 }, testMessages);
 
                 var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
-- 
cgit v1.2.3-55-g6feb