Ensure engine inscribe path is different from the original engine path
Fixes 7085
Rob Mensching committed
Dec 13, 2022 at 14:31 UTC
f41e1ec53f706551e6f747e42b2e926ee8624791
2 files changed
+6
-6
src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets
+4
-4
@@ -246,7 +246,7 @@
246
247
<DetachBundleEngineForSigning
248
BundleFile="@(SignTargetPath)"
249
- OutputFile="$(IntermediateOutputPath)%(SignTargetPath.Filename)%(SignTargetPath.Extension)"
249
+ OutputFile="$(IntermediateOutputPath)%(SignTargetPath.Filename)-engine%(SignTargetPath.Extension)"
250
IntermediateDirectory="%(SignTargetPath.RootDir)%(SignTargetPath.Directory)"
251
252
NoLogo="$(InscribeNoLogo)"
@@ -264,7 +264,7 @@
264
265
<!-- Explicitly add output to FileWrites to ensure it is included even when the target is up to date. -->
266
<ItemGroup>
267
- <FileWrites Include="$(IntermediateOutputPath)%(SignTargetPath.Filename)%(SignTargetPath.Extension)" />
267
+ <FileWrites Include="$(IntermediateOutputPath)%(SignTargetPath.Filename)-engine%(SignTargetPath.Extension)" />
268
</ItemGroup>
269
</Target>
270
@@ -275,7 +275,7 @@
275
To be called after signing the bundle engine to reattach the attached container.
276
277
[IN]
278
- @(Inscribe) - The bundle to inscribe.
278
+ @(SignBundleEngine) - The bundle to inscribe.
279
280
[OUT]
281
@(SignBundle) - The bundle engine file to be signed.
@@ -288,7 +288,7 @@
288
<Target
289
Name="InscribeBundle"
290
DependsOnTargets="$(InscribeBundleDependsOn)"
291
- Inputs="@(SignTargetPath)"
291
+ Inputs="@(SignTargetPath);@(SignBundleEngine)"
292
Outputs="$(SignedFilePath)">
293
294
<ReattachSignedBundleEngine
src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+2
-2
@@ -41,7 +41,7 @@ namespace WixToolsetTest.Sdk
41
var testMessages = result.Output.Where(line => line.Contains("TEST:")).Select(line => line.Trim()).ToArray();
42
WixAssert.CompareLineByLine(new[]
43
{
44
- @"TEST: SignBundleEngine: obj\x86\Release\SimpleBundle.exe",
44
+ @"TEST: SignBundleEngine: obj\x86\Release\SimpleBundle-engine.exe",
45
@"TEST: SignBundle: obj\x86\Release\SimpleBundle.exe",
46
}, testMessages);
47
@@ -84,7 +84,7 @@ namespace WixToolsetTest.Sdk
84
var testMessages = result.Output.Where(line => line.Contains("TEST:")).Select(line => line.Trim()).ToArray();
85
WixAssert.CompareLineByLine(new[]
86
{
87
- @"TEST: SignBundleEngine: obj\x86\Release\UncompressedBundle.exe",
87
+ @"TEST: SignBundleEngine: obj\x86\Release\UncompressedBundle-engine.exe",
88
}, testMessages);
89
90
var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)