From b066907dfcf2409d5b422eea9d11ab533549540c Mon Sep 17 00:00:00 2001
From: Elinor Fung <elfung@microsoft.com>
Date: Mon, 29 Jun 2020 16:31:38 -0700
Subject: [PATCH] Fix packaging of PDBs for host binaries

---
 src/installer/pkg/projects/Directory.Build.targets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets
index c34fe883201d5c..88d46c810ffeb4 100644
--- a/src/installer/pkg/projects/Directory.Build.targets
+++ b/src/installer/pkg/projects/Directory.Build.targets
@@ -158,6 +158,15 @@
       <File Include="@(SiblingSymbolFile)" />
     </ItemGroup>
 
+    <!-- On Windows, native symbols are installed to a PDB subdirectory -->
+    <ItemGroup>
+      <WindowsSymbolFileInSubdirectory Include="@(WindowsSymbolFile -> '%(RootDir)%(Directory)PDB\%(Filename)%(Extension)')" />
+      <ExistingWindowsSymbolFileInSubdirectory Include="@(WindowsSymbolFileInSubdirectory)" Condition="Exists('%(Identity)')" />
+      <File Include="@(ExistingWindowsSymbolFileInSubdirectory)">
+        <IsSymbolFile>true</IsSymbolFile>
+      </File>
+    </ItemGroup>
+
     <PropertyGroup>
       <NeedsPlaceholderPdb Condition="'@(ExistingNonWindowsSymbolFile)' != '' and '@(ExistingWindowsSymbolFile)' == ''">true</NeedsPlaceholderPdb>
     </PropertyGroup>