target fiddly bits

build/pgo/Terminal.PGO.props

@@ -36,6 +36,6 @@
     <PGOUseDefaultPGDFileInfo>true</PGOUseDefaultPGDFileInfo>
   </PropertyGroup>
 
-    <!-- Import PGO-Helpers -->
+  <!-- Import PGO-Helpers -->
   <Import Project="$(PkgMicrosoft_PGO_Helpers_Cpp)\build\Microsoft.PGO-Helpers.Cpp.props" />
 </Project>

src/cascadia/WindowsTerminal_UIATests/WindowsTerminal.UIA.Tests.csproj

@@ -117,6 +117,8 @@
       </ItemGroup>
     </When>
   </Choose>
+  <!-- Install an empty one for projects that don't PGO. -->
+  <Target Name="MergePGOCounts" />
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj

@@ -29,6 +29,9 @@
     </PackageReference>
   </ItemGroup>
 
+  <!-- Install an empty one for CSPROJ projects as they don't PGO. -->
+  <Target Name="MergePGOCounts" />
+
   <Target Name="CollectNativePackContents">
     <ItemGroup>
       <None Include="$(RepoBinPath)\Win32\$(Configuration)\PublicTerminalCore.dll">

src/common.build.pre.props

@@ -174,6 +174,9 @@
     </Link>
   </ItemDefinitionGroup>
 
+  <!-- Install an empty one for projects that won't have one.
+       The following import will override it when it needs to happen. -->
+  <Target Name="MergePGOCounts" />
   <Import Condition="'$(PgoTarget)' == 'true'" Project="$(SolutionDir)\build\PGO\Terminal.PGO.props" />
 
   <!-- For Win32 (x86) ONLY ... we use all defaults for AMD64. No def for those. -->

src/host/ft_uia/Host.Tests.UIA.csproj

@@ -140,6 +140,8 @@
       </ItemGroup>
     </When>
   </Choose>
+  <!-- Install an empty one for CSPROJ projects as they don't PGO. -->
+  <Target Name="MergePGOCounts" />
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj

@@ -45,6 +45,8 @@
       <Platform>AnyCPU</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <!-- Install an empty one for projects that don't PGO. -->
+  <Target Name="MergePGOCounts" />
   <PropertyGroup>
     <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
   </PropertyGroup>

src/tools/vtapp/VTApp.csproj

@@ -56,6 +56,8 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- Install an empty one for CSPROJ projects as they don't PGO. -->
+  <Target Name="MergePGOCounts" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

src/wap-common.build.pre.props

@@ -51,6 +51,9 @@
     <ProjectCapability Include="AssemblyReferences" />
   </ItemGroup>
 
+  <!-- Install an empty one for WAP projects as they don't PGO. -->
+  <Target Name="MergePGOCounts" />
+
   <PropertyGroup>
     <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
     <!-- Turn off the 6+MB Windows.winmd that's emitted into our package