Adding filtering for duplicate content files for referencing projects

dotnet · Nov 15, 2019 · a6a6c85 · a6a6c85
1 parent 2f706bc
commit a6a6c85
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/Tasks/Microsoft.Common.CurrentVersion.targets b/src/Tasks/Microsoft.Common.CurrentVersion.targets
@@ -4449,6 +4449,20 @@ Copyright (C) Microsoft Corporation. All rights reserved.
       <Output TaskParameter="TargetOutputs" ItemName="_AllChildProjectItemsWithTargetPath"/>
 
     </MSBuild>
+
+    <!-- Filter out dependency items that could overwrite referencer content -->
+    <CreateItem Include="@(_AllChildProjectItemsWithTargetPath)"  AdditionalMetadata="ParentContent=%(ContentWithTargetPath.Identity)">
+        <Output TaskParameter="Include" ItemName="_FilteredChildProjectItemsWithTargetPath"/>
+    </CreateItem>
+    <ItemGroup>
+      <ParentChildContentDuplicates Include="@(_FilteredChildProjectItemsWithTargetPath)" Condition="'%(_FilteredChildProjectItemsWithTargetPath.TargetPath)'=='%(ParentContent)'" />
+      <_FilteredChildProjectItemsWithTargetPath Remove="@(ParentChildContentDuplicates)" />
+      <_FilteredChildProjectItemsWithTargetPath>
+        <ParentContent></ParentContent> <!-- Remove unnecessary metadata -->
+      </_FilteredChildProjectItemsWithTargetPath>
+      <_AllChildProjectItemsWithTargetPath Remove="@(_AllChildProjectItemsWithTargetPath)" />
+      <_AllChildProjectItemsWithTargetPath Include="@(_FilteredChildProjectItemsWithTargetPath->Distinct())" />
+    </ItemGroup>
 
     <!-- Target outputs must be full paths because they will be consumed by a different project. -->
     <ItemGroup>
@@ -4459,6 +4473,8 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     <!-- Remove items which we will never again use - they just sit around taking up memory otherwise -->
     <ItemGroup>
       <_AllChildProjectItemsWithTargetPath Remove="@(_AllChildProjectItemsWithTargetPath)"/>
+      <_FilteredChildProjectItemsWithTargetPath Remove="@(_FilteredChildProjectItemsWithTargetPath)"/>
+      <ParentChildContentDuplicates Remove="@(ParentChildContentDuplicates)"/>
     </ItemGroup>
 
     <!-- Get items from this project last so that they will be copied last. -->