[XBuild] Add support for copying/cleaning portable .pdb files generated by Roslyn compiler

5 files changed, 70 insertions, 0 deletions

diff --git a/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets
index d6f012b3b9f..518676de5e2 100644
--- a/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets
@@ -221,6 +221,7 @@
 		<AllowedReferenceRelatedFileExtensions Condition=" '$(AllowedReferenceRelatedFileExtensions)' == '' ">
 			.exe.mdb;
 			.dll.mdb;
+			.pdb;
 			.xml
 		</AllowedReferenceRelatedFileExtensions>
 
@@ -625,6 +626,14 @@
 			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
 		</Copy>
 
+		<Copy
+			SourceFiles="$(IntermediateOutputPath)$(AssemblyName).pdb"
+			Condition="'$(OutDir)' != '' and Exists('$(IntermediateOutputPath)$(AssemblyName).pdb')"
+			DestinationFolder="$(OutDir)"
+			SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" >
+			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+		</Copy>
+
 		<Copy SourceFiles="@(IntermediateAssembly)" Condition="'$(OutDir)' != '' and Exists ('@(IntermediateAssembly)')" DestinationFolder="$(OutDir)" SkipUnchangedFiles="$(SkipCopyUnchangedFiles)">
 			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
 		</Copy>
@@ -861,6 +870,11 @@
 			Condition="Exists('$(IntermediateOutputPath)$(AssemblyName)$(TargetExt).mdb')">
 			<Output TaskParameter="Include" ItemName="FileWrites"/>
 		</CreateItem>
+
+		<CreateItem Include="$(IntermediateOutputPath)$(AssemblyName).pdb"
+			Condition="Exists('$(IntermediateOutputPath)$(AssemblyName).pdb')">
+			<Output TaskParameter="Include" ItemName="FileWrites"/>
+		</CreateItem>
 	</Target>
 
 	<!-- Get the list of files written, for clean -->
diff --git a/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets
index 5e90fd09ce0..81650fa20c5 100644
--- a/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets
@@ -206,6 +206,7 @@
 		<AllowedReferenceRelatedFileExtensions Condition=" '$(AllowedReferenceRelatedFileExtensions)' == '' ">
 			.exe.mdb;
 			.dll.mdb;
+			.pdb;
 			.xml
 		</AllowedReferenceRelatedFileExtensions>
 
@@ -611,6 +612,14 @@
 			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
 		</Copy>
 
+		<Copy
+			SourceFiles="$(IntermediateOutputPath)$(AssemblyName).pdb"
+			Condition="'$(OutDir)' != '' and Exists('$(IntermediateOutputPath)$(AssemblyName).pdb')"
+			DestinationFolder="$(OutDir)"
+			SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" >
+			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+		</Copy>
+
 		<Copy SourceFiles="@(IntermediateAssembly)" Condition="'$(OutDir)' != '' and Exists ('@(IntermediateAssembly)')" DestinationFolder="$(OutDir)" SkipUnchangedFiles="$(SkipCopyUnchangedFiles)">
 			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
 		</Copy>
@@ -847,6 +856,11 @@
 			Condition="Exists('$(IntermediateOutputPath)$(AssemblyName)$(TargetExt).mdb')">
 			<Output TaskParameter="Include" ItemName="FileWrites"/>
 		</CreateItem>
+
+		<CreateItem Include="$(IntermediateOutputPath)$(AssemblyName).pdb"
+			Condition="Exists('$(IntermediateOutputPath)$(AssemblyName).pdb')">
+			<Output TaskParameter="Include" ItemName="FileWrites"/>
+		</CreateItem>
 	</Target>
 
 	<!-- Get the list of files written, for clean -->
diff --git a/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets
index 74c1a9d6d70..1298d3e42d4 100644
--- a/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets
@@ -131,6 +131,7 @@
 		<AllowedReferenceRelatedFileExtensions Condition=" '$(AllowedReferenceRelatedFileExtensions)' == '' ">
 			.exe.mdb;
 			.dll.mdb;
+			.pdb;
 			.xml
 		</AllowedReferenceRelatedFileExtensions>
 
@@ -490,6 +491,14 @@
 			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
 		</Copy>
 
+		<Copy
+			SourceFiles="$(IntermediateOutputPath)$(AssemblyName).pdb"
+			Condition="'$(OutDir)' != '' and Exists('$(IntermediateOutputPath)$(AssemblyName).pdb')"
+			DestinationFolder="$(OutDir)"
+			SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" >
+			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+		</Copy>
+
 		<Copy SourceFiles="@(IntermediateAssembly)" Condition="'$(OutDir)' != '' and Exists ('@(IntermediateAssembly)')" DestinationFolder="$(OutDir)" SkipUnchangedFiles="$(SkipCopyUnchangedFiles)">
 			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
 		</Copy>
@@ -726,6 +735,11 @@
 			Condition="Exists('$(IntermediateOutputPath)$(AssemblyName)$(TargetExt).mdb')">
 			<Output TaskParameter="Include" ItemName="FileWrites"/>
 		</CreateItem>
+
+		<CreateItem Include="$(IntermediateOutputPath)$(AssemblyName).pdb"
+			Condition="Exists('$(IntermediateOutputPath)$(AssemblyName).pdb')">
+			<Output TaskParameter="Include" ItemName="FileWrites"/>
+		</CreateItem>
 	</Target>
 
 	<!-- Get the list of files written, for clean -->
diff --git a/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets b/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets
index 9ffa41d9233..db0acba830c 100644
--- a/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets
@@ -159,6 +159,7 @@
 		<AllowedReferenceRelatedFileExtensions Condition=" '$(AllowedReferenceRelatedFileExtensions)' == '' ">
 			.exe.mdb;
 			.dll.mdb;
+			.pdb;
 			.xml
 		</AllowedReferenceRelatedFileExtensions>
 
@@ -518,6 +519,14 @@
 			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
 		</Copy>
 
+		<Copy
+			SourceFiles="$(IntermediateOutputPath)$(AssemblyName).pdb"
+			Condition="'$(OutDir)' != '' and Exists('$(IntermediateOutputPath)$(AssemblyName).pdb')"
+			DestinationFolder="$(OutDir)"
+			SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" >
+			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+		</Copy>
+
 		<Copy SourceFiles="@(IntermediateAssembly)" Condition="'$(OutDir)' != '' and Exists ('@(IntermediateAssembly)')" DestinationFolder="$(OutDir)" SkipUnchangedFiles="$(SkipCopyUnchangedFiles)">
 			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
 		</Copy>
@@ -754,6 +763,11 @@
 			Condition="Exists('$(IntermediateOutputPath)$(AssemblyName)$(TargetExt).mdb')">
 			<Output TaskParameter="Include" ItemName="FileWrites"/>
 		</CreateItem>
+
+		<CreateItem Include="$(IntermediateOutputPath)$(AssemblyName).pdb"
+			Condition="Exists('$(IntermediateOutputPath)$(AssemblyName).pdb')">
+			<Output TaskParameter="Include" ItemName="FileWrites"/>
+		</CreateItem>
 	</Target>
 
 	<!-- Get the list of files written, for clean -->
diff --git a/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets
index 39bc73e41d0..133ff49a041 100644
--- a/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets
@@ -221,6 +221,7 @@
 		<AllowedReferenceRelatedFileExtensions Condition=" '$(AllowedReferenceRelatedFileExtensions)' == '' ">
 			.exe.mdb;
 			.dll.mdb;
+			.pdb;
 			.xml
 		</AllowedReferenceRelatedFileExtensions>
 
@@ -625,6 +626,14 @@
 			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
 		</Copy>
 
+		<Copy
+			SourceFiles="$(IntermediateOutputPath)$(AssemblyName).pdb"
+			Condition="'$(OutDir)' != '' and Exists('$(IntermediateOutputPath)$(AssemblyName).pdb')"
+			DestinationFolder="$(OutDir)"
+			SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" >
+			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+		</Copy>
+
 		<Copy SourceFiles="@(IntermediateAssembly)" Condition="'$(OutDir)' != '' and Exists ('@(IntermediateAssembly)')" DestinationFolder="$(OutDir)" SkipUnchangedFiles="$(SkipCopyUnchangedFiles)">
 			<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
 		</Copy>
@@ -861,6 +870,11 @@
 			Condition="Exists('$(IntermediateOutputPath)$(AssemblyName)$(TargetExt).mdb')">
 			<Output TaskParameter="Include" ItemName="FileWrites"/>
 		</CreateItem>
+
+		<CreateItem Include="$(IntermediateOutputPath)$(AssemblyName).pdb"
+			Condition="Exists('$(IntermediateOutputPath)$(AssemblyName).pdb')">
+			<Output TaskParameter="Include" ItemName="FileWrites"/>
+		</CreateItem>
 	</Target>
 
 	<!-- Get the list of files written, for clean -->