Removing duplicate dlls from publish output

sfoslund · sfoslund · commit aa5129fdff3d · 2020-10-07T14:00:34.000-07:00
diff --git a/src/Tasks/Common/Resources/Strings.resx b/src/Tasks/Common/Resources/Strings.resx
@@ -686,4 +686,8 @@ The following are names of parameters or literal values and should not be transl
     <value>NETSDK1145: The {0} pack is not installed and NuGet package restore is not supported. Upgrade Visual Studio, remove global.json if it specifies a certain SDK version, and uninstall the newer SDK. For more options visit   https://aka.ms/targeting-apphost-pack-missing  Pack Type:{0}, Pack directory: {1}, targetframework: {2}, Pack PackageId: {3}, Pack Package Version: {4}</value>
     <comment>{StrBegin="NETSDK1145: "}</comment>
   </data>
+    <data name="DuplicatePublishOutputFiles" xml:space="preserve">
+    <value>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</value>
+    <comment>{StrBegin="NETSDK1146: "}</comment>
+  </data>
 </root>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf
@@ -284,6 +284,11 @@
         <target state="translated">NETSDK1015: Token preprocesoru {0} získal více než jednu hodnotu. Volí se hodnota {1}.</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicatePublishOutputFiles">
+        <source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
+        <target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
+        <note>{StrBegin="NETSDK1146: "}</note>
+      </trans-unit>
       <trans-unit id="DuplicateRuntimePackAsset">
         <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.</source>
         <target state="needs-review-translation">NETSDK1110: Více než jeden prostředek v balíčku modulu runtime má stejnou cílovou dílčí cestu {0}. Tady můžete tuto chybu nahlásit týmu .NET Core: https://aka.ms/dotnet-sdk-issue.</target>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf
@@ -284,6 +284,11 @@
         <target state="translated">NETSDK1015: Das Präprozessortoken "{0}" wurde mit mehreren Werten versehen. "{1}" wird als Wert ausgewählt.</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicatePublishOutputFiles">
+        <source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
+        <target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
+        <note>{StrBegin="NETSDK1146: "}</note>
+      </trans-unit>
       <trans-unit id="DuplicateRuntimePackAsset">
         <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.</source>
         <target state="needs-review-translation">NETSDK1110: Mehr als eine Ressource im Runtimepaket weist den gleichen Zielunterpfad "{0}" auf. Melden Sie diesen Fehler hier dem .NET Core-Team: https://aka.ms/dotnet-sdk-issue.</target>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf
@@ -284,6 +284,11 @@
         <target state="translated">NETSDK1015: Se han dado varios valores para el token de preprocesador "{0}". Se va a elegir "{1}" como valor.</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicatePublishOutputFiles">
+        <source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
+        <target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
+        <note>{StrBegin="NETSDK1146: "}</note>
+      </trans-unit>
       <trans-unit id="DuplicateRuntimePackAsset">
         <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.</source>
         <target state="needs-review-translation">NETSDK1110: Más de un recurso en el paquete del entorno de ejecución tiene la misma subruta de acceso de destino de "{0}". Notifique este error al equipo de .NET Core aquí: https://aka.ms/dotnet-sdk-issue.</target>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf
@@ -284,6 +284,11 @@
         <target state="translated">NETSDK1015: Le jeton de préprocesseur '{0}' a reçu plusieurs valeurs. La valeur choisie est '{1}'.</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicatePublishOutputFiles">
+        <source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
+        <target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
+        <note>{StrBegin="NETSDK1146: "}</note>
+      </trans-unit>
       <trans-unit id="DuplicateRuntimePackAsset">
         <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.</source>
         <target state="needs-review-translation">NETSDK1110: plusieurs composants du pack de runtime ont le même sous-chemin de destination que '{0}'. Signalez cette erreur à l'équipe .NET Core à l'adresse suivante : https://aka.ms/dotnet-sdk-issue.</target>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf
@@ -284,6 +284,11 @@
         <target state="translated">NETSDK1015: al token di preprocessore '{0}' è stato assegnato più di un valore. Come valore verrà scelto '{1}'.</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicatePublishOutputFiles">
+        <source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
+        <target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
+        <note>{StrBegin="NETSDK1146: "}</note>
+      </trans-unit>
       <trans-unit id="DuplicateRuntimePackAsset">
         <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.</source>
         <target state="needs-review-translation">NETSDK1110: più di un asset nel pacchetto di runtime ha lo stesso percorso secondario di destinazione di '{0}'. Segnalare questo errore al team di .NET Core all'indirizzo: https://aka.ms/dotnet-sdk-issue.</target>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf
@@ -284,6 +284,11 @@
         <target state="translated">NETSDK1015: プリプロセッサ トークン '{0}' に複数の値が指定されています。値として '{1}' を選択します。</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicatePublishOutputFiles">
+        <source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
+        <target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
+        <note>{StrBegin="NETSDK1146: "}</note>
+      </trans-unit>
       <trans-unit id="DuplicateRuntimePackAsset">
         <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.</source>
         <target state="needs-review-translation">NETSDK1110: ランタイム パック内の複数のアセットに同じターゲット サブパス '{0}' が指定されています。https://aka.ms/dotnet-sdk-issue で、このエラーを .NET Core チームに報告してください。</target>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf
@@ -284,6 +284,11 @@
         <target state="translated">NETSDK1015: 전처리기 토큰 '{0}'의 값이 두 개 이상 지정되었습니다. '{1}'을(를) 값으로 선택합니다.</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicatePublishOutputFiles">
+        <source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
+        <target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
+        <note>{StrBegin="NETSDK1146: "}</note>
+      </trans-unit>
       <trans-unit id="DuplicateRuntimePackAsset">
         <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.</source>
         <target state="needs-review-translation">NETSDK1110: 런타임 팩에 있는 두 개 이상 자산에 동일한 대상 하위 경로인 '{0}'이(가) 있습니다. https://aka.ms/dotnet-sdk-issue에서 .NET Core 팀에 이 오류를 보고하세요.</target>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf
@@ -284,6 +284,11 @@
         <target state="translated">NETSDK1015: Dla tokenu preprocesora „{0}” podano więcej niż jedną wartość. Wybieranie elementu „{1}” jako wartości.</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicatePublishOutputFiles">
+        <source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
+        <target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
+        <note>{StrBegin="NETSDK1146: "}</note>
+      </trans-unit>
       <trans-unit id="DuplicateRuntimePackAsset">
         <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.</source>
         <target state="needs-review-translation">NETSDK1110: Więcej niż jeden zasób w pakiecie środowiska uruchomieniowego ma taką samą docelową ścieżkę podrzędną („{0}”). Zgłoś ten błąd zespołowi platformy .NET Core tutaj: https://aka.ms/dotnet-sdk-issue.</target>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
@@ -284,6 +284,11 @@
         <target state="translated">NETSDK1015: O token de pré-processador '{0}' recebeu mais de um valor. Escolhendo '{1}' como o valor.</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicatePublishOutputFiles">
+        <source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
+        <target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
+        <note>{StrBegin="NETSDK1146: "}</note>
+      </trans-unit>
       <trans-unit id="DuplicateRuntimePackAsset">
         <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.</source>
         <target state="needs-review-translation">NETSDK1110: Mais de um ativo no pacote de runtime tem o mesmo subcaminho de destino de '{0}'. Relate esse erro à equipe do .NET Core: https://aka.ms/dotnet-sdk-issue.</target>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf
@@ -284,6 +284,11 @@
         <target state="translated">NETSDK1015: для маркера препроцессора "{0}" указано множество значений. В качестве значения будет использовано "{1}".</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicatePublishOutputFiles">
+        <source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
+        <target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
+        <note>{StrBegin="NETSDK1146: "}</note>
+      </trans-unit>
       <trans-unit id="DuplicateRuntimePackAsset">
         <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.</source>
         <target state="needs-review-translation">NETSDK1110: сразу несколько ресурсов в пакете среды выполнения имеют один и тот же конечный вложенный путь "{0}". Сообщите об этой ошибке группе разработчиков .NET Core по следующему адресу: https://aka.ms/dotnet-sdk-issue.</target>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf
@@ -284,6 +284,11 @@
         <target state="translated">NETSDK1015: '{0}' ön işlemci belirtecine birden fazla değer verildi. Değer olarak '{1}' seçiliyor.</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicatePublishOutputFiles">
+        <source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
+        <target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
+        <note>{StrBegin="NETSDK1146: "}</note>
+      </trans-unit>
       <trans-unit id="DuplicateRuntimePackAsset">
         <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.</source>
         <target state="needs-review-translation">NETSDK1110: Çalışma zamanı paketindeki birden fazla varlık, aynı '{0}' hedef alt yoluna sahip. Bu hatayı https://aka.ms/dotnet-sdk-issue adresinden .NET Core ekibine bildirin.</target>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
@@ -284,6 +284,11 @@
         <target state="translated">NETSDK1015: 已向预处理器标记“{0}”提供多个值。选择“{1}”作为值。</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicatePublishOutputFiles">
+        <source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
+        <target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
+        <note>{StrBegin="NETSDK1146: "}</note>
+      </trans-unit>
       <trans-unit id="DuplicateRuntimePackAsset">
         <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.</source>
         <target state="needs-review-translation">NETSDK1110: 运行时包中的多个资源具有 "{0}" 的相同目标子路径。请访问以下网站将此问题报告给 .NET Core 团队https://aka.ms/dotnet-sdk-issue。</target>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
@@ -284,6 +284,11 @@
         <target state="translated">NETSDK1015: 已為前置處理器語彙基元 '{0}' 指定多個值。正在選擇 '{1}' 作為值。</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicatePublishOutputFiles">
+        <source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
+        <target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
+        <note>{StrBegin="NETSDK1146: "}</note>
+      </trans-unit>
       <trans-unit id="DuplicateRuntimePackAsset">
         <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.</source>
         <target state="needs-review-translation">NETSDK1110: 執行階段套件中有多個資產具有相同的目的地子路徑 '{0}'。請於此處將錯誤回報給 .NET Core 小組: https://aka.ms/dotnet-sdk-issue。</target>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/CheckForDuplicateItemMetadata.cs b/src/Tasks/Microsoft.NET.Build.Tasks/CheckForDuplicateItemMetadata.cs
@@ -0,0 +1,37 @@
+﻿using Microsoft.Build.Framework;
+using System.Linq;
+
+namespace Microsoft.NET.Build.Tasks
+{
+    public class CheckForDuplicateItemMetadata : TaskBase
+    {
+        [Required]
+        public ITaskItem[] Items { get; set; }
+
+        [Required]
+        public string MetadataName { get; set; }
+
+        [Output]
+        public ITaskItem[] DuplicateItems { get; set; }
+
+        [Output]
+        public string[] DuplicatedMetadata { get; set; }
+
+        [Output]
+        public bool DuplicatesExist { get; set; }
+
+        protected override void ExecuteCore()
+        {
+            var groupings = Items.GroupBy(item => item.GetMetadata(MetadataName))
+                .Where(g => g.Count() > 1)
+                .ToList();
+            DuplicatesExist = groupings.Any();
+            DuplicatedMetadata = groupings
+                .Select(g=> g.Key)
+                .ToArray();
+            DuplicateItems = groupings
+                .SelectMany(g => g)
+                .ToArray();
+        }
+    }
+}
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ConflictResolution.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ConflictResolution.targets
@@ -15,6 +15,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Import Project="Microsoft.NET.DefaultPackageConflictOverrides.targets" />
 
   <UsingTask TaskName="ResolvePackageFileConflicts" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
+  <UsingTask TaskName="CheckForDuplicateItemMetadata" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
 
   <!--
     _HandlePackageFileConflicts
@@ -89,4 +90,50 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </Target>
 
+  <!--
+    _FilterDuplicateCopyLocalPublishAssets
+    Remove CopyLocalPublishAssets items that could overwrite resolved files to publish.
+    -->
+  <Target Name="_FilterDuplicateCopyLocalPublishAssets">
+    <ItemGroup>
+      <_ResolvedCopyLocalPublishAssetsWithMetadata Include="@(_ResolvedCopyLocalPublishAssets)">
+        <RelativePath>%(_ResolvedCopyLocalPublishAssets.DestinationSubDirectory)%(Filename)%(Extension)</RelativePath>
+      </_ResolvedCopyLocalPublishAssetsWithMetadata>
+    </ItemGroup>
+    
+    <CheckForDuplicateItemMetadata
+      Items="@(_ResolvedCopyLocalPublishAssetsWithMetadata);@(ResolvedFileToPublish)"
+      MetadataName="RelativePath" >
+      <Output TaskParameter="DuplicateItems" ItemName="_DuplicateResolvedCopyLocalPublishAssets" />
+    </CheckForDuplicateItemMetadata>
+
+    <ItemGroup>
+      <_ResolvedCopyLocalPublishAssets Remove="@(_ResolvedCopyLocalPublishAssets)"/>
+      <_ResolvedCopyLocalPublishAssets Include="@(_ResolvedCopyLocalPublishAssetsWithMetadata)" Exclude="@(_DuplicateResolvedCopyLocalPublishAssets)"/>
+    </ItemGroup>
+
+  </Target>
+
+  <!--
+  _HandleFileConflictsForPublish
+  Ensures there are no duplicate files being written to the publish output.
+  -->
+  <Target Name="_HandleFileConflictsForPublish"
+          AfterTargets="ComputeFilesToPublish"
+          BeforeTargets="CopyFilesToPublishDirectory;_ComputeFilesToBundle"
+          Condition="'$(ErrorOnDuplicatePublishOutputFiles)' != 'false'">
+
+    <CheckForDuplicateItemMetadata
+      Items="@(ResolvedFileToPublish)"
+      MetadataName="RelativePath">
+      <Output TaskParameter="DuplicatesExist" PropertyName="_ResolvedFileToPublishContainsDuplicates" />
+      <Output TaskParameter="DuplicateItems" ItemName="_ResolvedFileToPublishDuplicatedItems" />
+    </CheckForDuplicateItemMetadata>
+
+    <NETSdkError Condition="'$(_ResolvedFileToPublishContainsDuplicates)' == 'true'"
+                 ResourceName="DuplicatePublishOutputFiles"
+                 FormatArguments="@(_ResolvedFileToPublishDuplicatedItems, ', ')" />
+
+  </Target>
+
 </Project>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishWithoutConflicts.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishWithoutConflicts.cs
