From 5b7d6319ec8ff44c7eda6f8358e29cfdd53d81b5 Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Wed, 20 May 2020 17:52:07 -0700
Subject: [PATCH] Fix signing due to subset projects rename (#36791)

---
 eng/SubsetValidation.targets                   | 2 +-
 src/installer/signing/SignBinaries.proj        | 2 +-
 src/installer/signing/SignBurnBundleFiles.proj | 2 +-
 src/installer/signing/SignBurnEngineFiles.proj | 2 +-
 src/installer/signing/SignMsiFiles.proj        | 2 +-
 src/installer/signing/SignR2RBinaries.proj     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/SubsetValidation.targets b/eng/SubsetValidation.targets
index 53ea39c..3b0acd5 100644
--- a/eng/SubsetValidation.targets
+++ b/eng/SubsetValidation.targets
@@ -6,7 +6,7 @@
     on a whole subset, and the dependency on the subset is disregarded automatically when Subset
     doesn't contain it.
 
-    %(InstallerProject.SignPhase): Indicates this project must be built before a certain signing
+    %(ProjectToBuild.SignPhase): Indicates this project must be built before a certain signing
       phase. Projects can depend on 'signing/stages/Sign<stage>.proj' to wait until all projects
       that are part of a stage are complete. This allows the build to perform complex container
       signing that isn't (can't be?) supported by Arcade's single pass, such as MSIs and bundles:
diff --git a/src/installer/signing/SignBinaries.proj b/src/installer/signing/SignBinaries.proj
index d1f8fb5..8b1f681 100644
--- a/src/installer/signing/SignBinaries.proj
+++ b/src/installer/signing/SignBinaries.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <StageProject Include="@(InstallerProject -> WithMetadataValue('SignPhase', 'Binaries'))" />
+    <StageProject Include="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'Binaries'))" />
   </ItemGroup>
 
 </Project>
diff --git a/src/installer/signing/SignBurnBundleFiles.proj b/src/installer/signing/SignBurnBundleFiles.proj
index 52cac28..55c7a8c 100644
--- a/src/installer/signing/SignBurnBundleFiles.proj
+++ b/src/installer/signing/SignBurnBundleFiles.proj
@@ -4,7 +4,7 @@
   <Target Name="ReattachAllEnginesToBundles"
           BeforeTargets="RunArcadeSigning">
     <MSBuild
-      Projects="@(InstallerProject -> WithMetadataValue('SignPhase', 'BundleInstallerFiles'))"
+      Projects="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'BundleInstallerFiles'))"
       Targets="ReattachEngineToBundle" />
   </Target>
 
diff --git a/src/installer/signing/SignBurnEngineFiles.proj b/src/installer/signing/SignBurnEngineFiles.proj
index dc610b6..382eb20 100644
--- a/src/installer/signing/SignBurnEngineFiles.proj
+++ b/src/installer/signing/SignBurnEngineFiles.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <StageProject Include="@(InstallerProject -> WithMetadataValue('SignPhase', 'BundleInstallerFiles'))" />
+    <StageProject Include="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'BundleInstallerFiles'))" />
   </ItemGroup>
 
   <!-- To sign the burn engines, they need to be extracted from the bundles using WiX tools. -->
diff --git a/src/installer/signing/SignMsiFiles.proj b/src/installer/signing/SignMsiFiles.proj
index 55804e6..55dd18d 100644
--- a/src/installer/signing/SignMsiFiles.proj
+++ b/src/installer/signing/SignMsiFiles.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <StageProject Include="@(InstallerProject -> WithMetadataValue('SignPhase', 'MsiFiles'))" />
+    <StageProject Include="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'MsiFiles'))" />
   </ItemGroup>
 
   <!--
diff --git a/src/installer/signing/SignR2RBinaries.proj b/src/installer/signing/SignR2RBinaries.proj
index 4d6f62f..f2f60ef 100644
--- a/src/installer/signing/SignR2RBinaries.proj
+++ b/src/installer/signing/SignR2RBinaries.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <StageProject Include="@(InstallerProject -> WithMetadataValue('SignPhase', 'R2RBinaries'))" />
+    <StageProject Include="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'R2RBinaries'))" />
   </ItemGroup>
 
 </Project>
-- 
2.7.4