From 6ed066072db5bf15453da1f8da28f727ba46fc5b Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 20 Nov 2022 11:12:45 -0800
Subject: Allow signing targets to be overridden in simple Sdk-style .wixproj

Moved the overridable signing targets (like SignMsi) to a new
WixToolset.Signing.props that is included "at the very top of" a
.wixproj using Sdk-style project. That way these signing targets can be
overridden in the .wixproj. When the overridable signing targets were
defined in WixToolset.Signing.targets, then it was necessary to use the
more complex Sdk-style Import syntax to place the signing targets low
enough in the .wixproj.

Closes 7038
---
 .../WixprojPackageVcxprojWindowsApp.wixproj                       | 5 +++++
 src/test/wix/WixE2E/WixE2EFixture.cs                              | 8 ++++++++
 2 files changed, 13 insertions(+)

(limited to 'src/test')

diff --git a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj
index 63caf5c0..27affb11 100644
--- a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj
+++ b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj
@@ -3,6 +3,7 @@
 <Project Sdk='WixToolset.Sdk'> 
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <SignOutput>true</SignOutput>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,4 +13,8 @@
 
     <PackageReference Include="Wixtoolset.UI.wixext" />
   </ItemGroup>
+
+  <Target Name="SignMsi">
+    <Warning Text="SignMsi = @(SignMsi)" />
+  </Target>
 </Project>
diff --git a/src/test/wix/WixE2E/WixE2EFixture.cs b/src/test/wix/WixE2E/WixE2EFixture.cs
index f9094fb2..4a0b78d8 100644
--- a/src/test/wix/WixE2E/WixE2EFixture.cs
+++ b/src/test/wix/WixE2E/WixE2EFixture.cs
@@ -55,6 +55,14 @@ namespace WixE2E
 
             var result = RestoreAndBuild(projectPath);
             result.AssertSuccess();
+
+            var signingStatement = result.Output.Where(s => s.Contains("warning :"))
+                                                .Select(s => s.Replace(Path.GetDirectoryName(projectPath), "<projectFolder>").Replace(@"\Debug\", @"\<configuration>\").Replace(@"\Release\", @"\<configuration>\"))
+                                                .ToArray();
+            WixAssert.CompareLineByLine(new[]
+            {
+                @"<projectFolder>\WixprojPackageVcxprojWindowsApp.wixproj(18,5): warning : SignMsi = obj\<configuration>\en-US\WixprojPackageVcxprojWindowsApp.msi;obj\<configuration>\ja-JP\WixprojPackageVcxprojWindowsApp.msi"
+            }, signingStatement);
         }
 
         [Fact]
-- 
cgit v1.2.3-55-g6feb