Fix installer signing after restore changes (#34707)

diff --git a/Directory.Build.props b/Directory.Build.props
index 06cb0f4..3dc091c 100644 (file)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -31,7 +31,7 @@
   <Import Project="$(RepositoryEngineeringDir)Configurations.props" />
 
   <!--
-    Get ProjectToBuild and '<subset>ProjectToBuild' items. Using the items lets projects handle
+    Get '<subset>Project' items. Using the items lets projects handle
     $(Subset) automatically when creating project-to-project dependencies.
   -->
   <Import Project="$(RepositoryEngineeringDir)Subsets.props" />

diff --git a/eng/SubsetValidation.targets b/eng/SubsetValidation.targets
index 293cbfd..53ea39c 100644 (file)
--- a/eng/SubsetValidation.targets
+++ b/eng/SubsetValidation.targets
@@ -2,11 +2,11 @@
   <!--
     The imported file supports the '/p:Subset=<desired subset string>' dev build argument.
 
-    Each subset has its own '<subset>ProjectToBuild' items so that a project in the build can depend
+    Each subset has its own '<subset>Project' items so that a project in the build can depend
     on a whole subset, and the dependency on the subset is disregarded automatically when Subset
     doesn't contain it.
 
-    %(ProjectToBuild.SignPhase): Indicates this project must be built before a certain signing
+    %(InstallerProject.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 8b1f681..d1f8fb5 100644 (file)
--- a/src/installer/signing/SignBinaries.proj
+++ b/src/installer/signing/SignBinaries.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <StageProject Include="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'Binaries'))" />
+    <StageProject Include="@(InstallerProject -> WithMetadataValue('SignPhase', 'Binaries'))" />
   </ItemGroup>
 
 </Project>

diff --git a/src/installer/signing/SignBurnBundleFiles.proj b/src/installer/signing/SignBurnBundleFiles.proj
index 55c7a8c..52cac28 100644 (file)
--- a/src/installer/signing/SignBurnBundleFiles.proj
+++ b/src/installer/signing/SignBurnBundleFiles.proj
@@ -4,7 +4,7 @@
   <Target Name="ReattachAllEnginesToBundles"
           BeforeTargets="RunArcadeSigning">
     <MSBuild
-      Projects="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'BundleInstallerFiles'))"
+      Projects="@(InstallerProject -> WithMetadataValue('SignPhase', 'BundleInstallerFiles'))"
       Targets="ReattachEngineToBundle" />
   </Target>
 

diff --git a/src/installer/signing/SignBurnEngineFiles.proj b/src/installer/signing/SignBurnEngineFiles.proj
index 382eb20..dc610b6 100644 (file)
--- a/src/installer/signing/SignBurnEngineFiles.proj
+++ b/src/installer/signing/SignBurnEngineFiles.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <StageProject Include="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'BundleInstallerFiles'))" />
+    <StageProject Include="@(InstallerProject -> 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 55dd18d..55804e6 100644 (file)
--- a/src/installer/signing/SignMsiFiles.proj
+++ b/src/installer/signing/SignMsiFiles.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <StageProject Include="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'MsiFiles'))" />
+    <StageProject Include="@(InstallerProject -> WithMetadataValue('SignPhase', 'MsiFiles'))" />
   </ItemGroup>
 
   <!--

diff --git a/src/installer/signing/SignR2RBinaries.proj b/src/installer/signing/SignR2RBinaries.proj
index f2f60ef..4d6f62f 100644 (file)
--- a/src/installer/signing/SignR2RBinaries.proj
+++ b/src/installer/signing/SignR2RBinaries.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <StageProject Include="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'R2RBinaries'))" />
+    <StageProject Include="@(InstallerProject -> WithMetadataValue('SignPhase', 'R2RBinaries'))" />
   </ItemGroup>
 
 </Project>