Skip to content

Commit 10ecfba

Browse files
sfoslundsfoslund
committed
Removing conflicting publish output dlls
1 parent d9e515f commit 10ecfba

19 files changed

+304
-4
lines changed

‎src/Tasks/Common/ConflictResolution/ResolvePublishOutputConflicts.cs‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// Copyright (c) .NET Foundation and contributors. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using Microsoft.Build.Framework;
5+
using System.Collections.Generic;
6+
using System.Linq;
7+
8+
namespace Microsoft.NET.Build.Tasks.ConflictResolution
9+
{
10+
public class ResolveOverlappingItemGroupConflicts : TaskBase
11+
{
12+
[Required]
13+
public ITaskItem[] ItemGroup1 { get; set; }
14+
15+
[Required]
16+
public ITaskItem[] ItemGroup2 { get; set; }
17+
18+
public string[] PreferredPackages { get; set; }
19+
20+
public ITaskItem[] PackageOverrides { get; set; }
21+
22+
[Output]
23+
public ITaskItem[] RemovedItemGroup1 { get; set; }
24+
25+
[Output]
26+
public ITaskItem[] RemovedItemGroup2 { get; set; }
27+
28+
protected override void ExecuteCore()
29+
{
30+
var packageRanks = new PackageRank(PreferredPackages);
31+
var packageOverrides = new PackageOverrideResolver<ConflictItem>(PackageOverrides);
32+
var conflicts = new HashSet<ConflictItem>();
33+
34+
var conflictItemGroup1 = GetConflictTaskItems(ItemGroup1, ConflictItemType.CopyLocal);
35+
var conflictItemGroup2 = GetConflictTaskItems(ItemGroup2, ConflictItemType.CopyLocal);
36+
37+
using (var conflictResolver = new ConflictResolver<ConflictItem>(packageRanks, packageOverrides, Log))
38+
{
39+
var allConflicts = conflictItemGroup1.Concat(conflictItemGroup2);
40+
conflictResolver.ResolveConflicts(allConflicts,
41+
ci => ItemUtilities.GetReferenceTargetPath(ci.OriginalItem),
42+
(ConflictItem winner, ConflictItem loser) => { conflicts.Add(loser); });
43+
44+
var conflictItems = conflicts.Select(i => i.OriginalItem);
45+
RemovedItemGroup1 = ItemGroup1.Intersect(conflictItems).ToArray();
46+
RemovedItemGroup2 = ItemGroup2.Intersect(conflictItems).ToArray();
47+
}
48+
}
49+
50+
private IEnumerable<ConflictItem> GetConflictTaskItems(ITaskItem[] items, ConflictItemType itemType)
51+
{
52+
return (items != null) ? items.Select(i => new ConflictItem(i, itemType)) : Enumerable.Empty<ConflictItem>();
53+
}
54+
}
55+
}

‎src/Tasks/Common/Resources/Strings.resx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,4 +686,8 @@ The following are names of parameters or literal values and should not be transl
686686
<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>
687687
<comment>{StrBegin="NETSDK1145: "}</comment>
688688
</data>
689+
<data name="DuplicatePublishOutputFiles" xml:space="preserve">
690+
<value>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</value>
691+
<comment>{StrBegin="NETSDK1146: "}</comment>
692+
</data>
689693
</root>

‎src/Tasks/Common/Resources/xlf/Strings.cs.xlf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,11 @@
284284
<target state="translated">NETSDK1015: Token preprocesoru {0} získal více než jednu hodnotu. Volí se hodnota {1}.</target>
285285
<note>{StrBegin="NETSDK1015: "}</note>
286286
</trans-unit>
287+
<trans-unit id="DuplicatePublishOutputFiles">
288+
<source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
289+
<target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
290+
<note>{StrBegin="NETSDK1146: "}</note>
291+
</trans-unit>
287292
<trans-unit id="DuplicateRuntimePackAsset">
288293
<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>
289294
<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>

‎src/Tasks/Common/Resources/xlf/Strings.de.xlf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,11 @@
284284
<target state="translated">NETSDK1015: Das Präprozessortoken "{0}" wurde mit mehreren Werten versehen. "{1}" wird als Wert ausgewählt.</target>
285285
<note>{StrBegin="NETSDK1015: "}</note>
286286
</trans-unit>
287+
<trans-unit id="DuplicatePublishOutputFiles">
288+
<source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
289+
<target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
290+
<note>{StrBegin="NETSDK1146: "}</note>
291+
</trans-unit>
287292
<trans-unit id="DuplicateRuntimePackAsset">
288293
<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>
289294
<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>

‎src/Tasks/Common/Resources/xlf/Strings.es.xlf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,11 @@
284284
<target state="translated">NETSDK1015: Se han dado varios valores para el token de preprocesador "{0}". Se va a elegir "{1}" como valor.</target>
285285
<note>{StrBegin="NETSDK1015: "}</note>
286286
</trans-unit>
287+
<trans-unit id="DuplicatePublishOutputFiles">
288+
<source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
289+
<target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
290+
<note>{StrBegin="NETSDK1146: "}</note>
291+
</trans-unit>
287292
<trans-unit id="DuplicateRuntimePackAsset">
288293
<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>
289294
<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>

‎src/Tasks/Common/Resources/xlf/Strings.fr.xlf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,11 @@
284284
<target state="translated">NETSDK1015: Le jeton de préprocesseur '{0}' a reçu plusieurs valeurs. La valeur choisie est '{1}'.</target>
285285
<note>{StrBegin="NETSDK1015: "}</note>
286286
</trans-unit>
287+
<trans-unit id="DuplicatePublishOutputFiles">
288+
<source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
289+
<target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
290+
<note>{StrBegin="NETSDK1146: "}</note>
291+
</trans-unit>
287292
<trans-unit id="DuplicateRuntimePackAsset">
288293
<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>
289294
<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>

‎src/Tasks/Common/Resources/xlf/Strings.it.xlf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,11 @@
284284
<target state="translated">NETSDK1015: al token di preprocessore '{0}' è stato assegnato più di un valore. Come valore verrà scelto '{1}'.</target>
285285
<note>{StrBegin="NETSDK1015: "}</note>
286286
</trans-unit>
287+
<trans-unit id="DuplicatePublishOutputFiles">
288+
<source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
289+
<target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
290+
<note>{StrBegin="NETSDK1146: "}</note>
291+
</trans-unit>
287292
<trans-unit id="DuplicateRuntimePackAsset">
288293
<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>
289294
<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>

‎src/Tasks/Common/Resources/xlf/Strings.ja.xlf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,11 @@
284284
<target state="translated">NETSDK1015: プリプロセッサ トークン '{0}' に複数の値が指定されています。値として '{1}' を選択します。</target>
285285
<note>{StrBegin="NETSDK1015: "}</note>
286286
</trans-unit>
287+
<trans-unit id="DuplicatePublishOutputFiles">
288+
<source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
289+
<target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
290+
<note>{StrBegin="NETSDK1146: "}</note>
291+
</trans-unit>
287292
<trans-unit id="DuplicateRuntimePackAsset">
288293
<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>
289294
<target state="needs-review-translation">NETSDK1110: ランタイム パック内の複数のアセットに同じターゲット サブパス '{0}' が指定されています。https://aka.ms/dotnet-sdk-issue で、このエラーを .NET Core チームに報告してください。</target>

‎src/Tasks/Common/Resources/xlf/Strings.ko.xlf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,11 @@
284284
<target state="translated">NETSDK1015: 전처리기 토큰 '{0}'의 값이 두 개 이상 지정되었습니다. '{1}'을(를) 값으로 선택합니다.</target>
285285
<note>{StrBegin="NETSDK1015: "}</note>
286286
</trans-unit>
287+
<trans-unit id="DuplicatePublishOutputFiles">
288+
<source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
289+
<target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
290+
<note>{StrBegin="NETSDK1146: "}</note>
291+
</trans-unit>
287292
<trans-unit id="DuplicateRuntimePackAsset">
288293
<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>
289294
<target state="needs-review-translation">NETSDK1110: 런타임 팩에 있는 두 개 이상 자산에 동일한 대상 하위 경로인 '{0}'이(가) 있습니다. https://aka.ms/dotnet-sdk-issue에서 .NET Core 팀에 이 오류를 보고하세요.</target>

‎src/Tasks/Common/Resources/xlf/Strings.pl.xlf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,11 @@
284284
<target state="translated">NETSDK1015: Dla tokenu preprocesora „{0}” podano więcej niż jedną wartość. Wybieranie elementu „{1}” jako wartości.</target>
285285
<note>{StrBegin="NETSDK1015: "}</note>
286286
</trans-unit>
287+
<trans-unit id="DuplicatePublishOutputFiles">
288+
<source>NETSDK1146: Found multiple publish output files with the same relative path: {0}.</source>
289+
<target state="new">NETSDK1146: Found multiple publish output files with the same relative path: {0}.</target>
290+
<note>{StrBegin="NETSDK1146: "}</note>
291+
</trans-unit>
287292
<trans-unit id="DuplicateRuntimePackAsset">
288293
<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>
289294
<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>

0 commit comments

Comments
 (0)