Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support labels for runtime packs #11824

Merged
merged 7 commits into from
Jun 20, 2020
Merged

Support labels for runtime packs #11824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1850018
Add strings for runtime pack resolution failures
dsplaisted May 30, 2020
262fa48
Add support for matching runtime packs based on labels
dsplaisted May 30, 2020
c7d69c0
Handle matching runtime packs to multiple possible framework references
dsplaisted Jun 9, 2020
2f15741
Fix handling runtime packs when there isn't one
dsplaisted Jun 9, 2020
66bdd23
Simplify BuildCommand creation
dsplaisted Jun 17, 2020
96b6408
Simplify RestoreCommand creation
dsplaisted Jun 18, 2020
eec03a6
Add tests for runtime packs with labels
dsplaisted Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Tasks/Common/MetadataKeys.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ internal static class MetadataKeys
public const string PackageConflictPreferredPackages = "PackageConflictPreferredPackages";

// Runtime packs
public const string DropFromSingleFile = "DropFromSingleFile";
public const string DropFromSingleFile = "DropFromSingleFile";
public const string RuntimePackLabels = "RuntimePackLabels";
public const string AdditionalFrameworkReferences = "AdditionalFrameworkReferences";

// Content files
public const string PPOutputPath = "PPOutputPath";
Expand Down
9 changes: 9 additions & 0 deletions src/Tasks/Common/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,4 +628,13 @@ The following are names of parameters or literal values and should not be transl
<value>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</value>
<comment>{StrBegin="NETSDK1131: "}</comment>
</data>
<data name="NoRuntimePackInformation" xml:space="preserve">
<value>NETSDK1132: No runtime pack information was available for {0}.</value>
<comment>{StrBegin="NETSDK1132: "}</comment>
</data>
<data name="ConflictingRuntimePackInformation" xml:space="preserve">
<value>NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</value>
<comment>{StrBegin="NETSDK1133: "}</comment>
</data>
</root>
12 changes: 12 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,13 @@
<note>{StrBegin="NETSDK1090: "}
{0} - The path to the invalid assembly.</note>
</trans-unit>
<trans-unit id="ConflictingRuntimePackInformation">
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</source>
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</target>
<note>{StrBegin="NETSDK1133: "}</note>
</trans-unit>
<trans-unit id="ContentItemDoesNotProvideOutputPath">
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
<target state="translated">NETSDK1014: Položka obsahu pro {0} nastaví {1}, ale neposkytuje {2} ani {3}.</target>
Expand Down Expand Up @@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1082: Pro zadaný identifikátor RuntimeIdentifier {1} nebyl k dispozici žádný balíček modulu runtime {0}.</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackInformation">
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
<note>{StrBegin="NETSDK1132: "}</note>
</trans-unit>
<trans-unit id="NoSupportComSelfContained">
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>
Expand Down
12 changes: 12 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,13 @@
<note>{StrBegin="NETSDK1090: "}
{0} - The path to the invalid assembly.</note>
</trans-unit>
<trans-unit id="ConflictingRuntimePackInformation">
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</source>
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</target>
<note>{StrBegin="NETSDK1133: "}</note>
</trans-unit>
<trans-unit id="ContentItemDoesNotProvideOutputPath">
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
<target state="translated">NETSDK1014: Das Inhaltselement für "{0}" legt "{1}" fest, gibt aber "{2}" oder "{3}" nicht an.</target>
Expand Down Expand Up @@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1082: Für "{0}" stand für den angegebenen RuntimeIdentifier "{1}" kein Runtimepaket zur Verfügung.</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackInformation">
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
<note>{StrBegin="NETSDK1132: "}</note>
</trans-unit>
<trans-unit id="NoSupportComSelfContained">
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>
Expand Down
12 changes: 12 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,13 @@
<note>{StrBegin="NETSDK1090: "}
{0} - The path to the invalid assembly.</note>
</trans-unit>
<trans-unit id="ConflictingRuntimePackInformation">
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</source>
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</target>
<note>{StrBegin="NETSDK1133: "}</note>
</trans-unit>
<trans-unit id="ContentItemDoesNotProvideOutputPath">
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
<target state="translated">NETSDK1014: El elemento de contenido de "{0}" establece "{1}", pero no proporciona "{2}" ni "{3}".</target>
Expand Down Expand Up @@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1082: No había ningún paquete de tiempo de ejecución para {0} disponible para el valor de RuntimeIdentifier especificado "{1}".</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackInformation">
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
<note>{StrBegin="NETSDK1132: "}</note>
</trans-unit>
<trans-unit id="NoSupportComSelfContained">
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>
Expand Down
12 changes: 12 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,13 @@
<note>{StrBegin="NETSDK1090: "}
{0} - The path to the invalid assembly.</note>
</trans-unit>
<trans-unit id="ConflictingRuntimePackInformation">
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</source>
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</target>
<note>{StrBegin="NETSDK1133: "}</note>
</trans-unit>
<trans-unit id="ContentItemDoesNotProvideOutputPath">
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
<target state="translated">NETSDK1014: L'élément de contenu pour '{0}' définit '{1}', mais ne fournit ni '{2}' ni '{3}'.</target>
Expand Down Expand Up @@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1082: aucun pack d'exécution lié à {0} n'est disponible pour le RuntimeIdentifier spécifié '{1}'.</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackInformation">
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
<note>{StrBegin="NETSDK1132: "}</note>
</trans-unit>
<trans-unit id="NoSupportComSelfContained">
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>
Expand Down
12 changes: 12 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,13 @@
<note>{StrBegin="NETSDK1090: "}
{0} - The path to the invalid assembly.</note>
</trans-unit>
<trans-unit id="ConflictingRuntimePackInformation">
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</source>
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</target>
<note>{StrBegin="NETSDK1133: "}</note>
</trans-unit>
<trans-unit id="ContentItemDoesNotProvideOutputPath">
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
<target state="translated">NETSDK1014: l'elemento di contenuto per '{0}' imposta '{1}', ma non fornisce '{2}' o '{3}'.</target>
Expand Down Expand Up @@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1082: non è disponibile alcun pacchetto di runtime per {0} per l'elemento RuntimeIdentifier specificato '{1}'.</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackInformation">
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
<note>{StrBegin="NETSDK1132: "}</note>
</trans-unit>
<trans-unit id="NoSupportComSelfContained">
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>
Expand Down
12 changes: 12 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,13 @@
<note>{StrBegin="NETSDK1090: "}
{0} - The path to the invalid assembly.</note>
</trans-unit>
<trans-unit id="ConflictingRuntimePackInformation">
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</source>
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</target>
<note>{StrBegin="NETSDK1133: "}</note>
</trans-unit>
<trans-unit id="ContentItemDoesNotProvideOutputPath">
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
<target state="translated">NETSDK1014: '{0}' のコンテンツ項目で '{1}' が設定されていますが、'{2}' または '{3}' は指定されていません。</target>
Expand Down Expand Up @@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1082: 指定された RuntimeIdentifier '{1}' で利用できる {0} のランタイム パックがありませんでした。</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackInformation">
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
<note>{StrBegin="NETSDK1132: "}</note>
</trans-unit>
<trans-unit id="NoSupportComSelfContained">
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>
Expand Down
12 changes: 12 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,13 @@
<note>{StrBegin="NETSDK1090: "}
{0} - The path to the invalid assembly.</note>
</trans-unit>
<trans-unit id="ConflictingRuntimePackInformation">
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</source>
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</target>
<note>{StrBegin="NETSDK1133: "}</note>
</trans-unit>
<trans-unit id="ContentItemDoesNotProvideOutputPath">
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
<target state="translated">NETSDK1014: '{0}'의 콘텐츠 항목이 '{1}'을(를) 설정하지만, '{2}' 또는 '{3}'을(를) 제공하지 않습니다.</target>
Expand Down Expand Up @@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1082: 지정된 RuntimeIdentifier '{1}'에 사용할 수 있는 {0}용 런타임 팩이 없습니다.</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackInformation">
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
<note>{StrBegin="NETSDK1132: "}</note>
</trans-unit>
<trans-unit id="NoSupportComSelfContained">
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>
Expand Down
12 changes: 12 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,13 @@
<note>{StrBegin="NETSDK1090: "}
{0} - The path to the invalid assembly.</note>
</trans-unit>
<trans-unit id="ConflictingRuntimePackInformation">
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</source>
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</target>
<note>{StrBegin="NETSDK1133: "}</note>
</trans-unit>
<trans-unit id="ContentItemDoesNotProvideOutputPath">
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
<target state="translated">NETSDK1014: Element zawartości dla elementu „{0}” ustawia wartość „{1}”, ale nie zapewnia wartości „{2}” ani „{3}”.</target>
Expand Down Expand Up @@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1082: Brak dostępnego pakietu środowiska uruchomieniowego {0} dla określonego elementu RuntimeIdentifier „{1}”.</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackInformation">
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
<note>{StrBegin="NETSDK1132: "}</note>
</trans-unit>
<trans-unit id="NoSupportComSelfContained">
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>
Expand Down
12 changes: 12 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,13 @@
<note>{StrBegin="NETSDK1090: "}
{0} - The path to the invalid assembly.</note>
</trans-unit>
<trans-unit id="ConflictingRuntimePackInformation">
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</source>
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</target>
<note>{StrBegin="NETSDK1133: "}</note>
</trans-unit>
<trans-unit id="ContentItemDoesNotProvideOutputPath">
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
<target state="translated">NETSDK1014: O item de conteúdo para '{0}' define '{1}', mas não fornece '{2}' ou '{3}'.</target>
Expand Down Expand Up @@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1082: não havia nenhum pacote de tempo de execução de {0} disponível para o RuntimeIdentifier especificado '{1}'.</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackInformation">
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
<note>{StrBegin="NETSDK1132: "}</note>
</trans-unit>
<trans-unit id="NoSupportComSelfContained">
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>
Expand Down
12 changes: 12 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,13 @@
<note>{StrBegin="NETSDK1090: "}
{0} - The path to the invalid assembly.</note>
</trans-unit>
<trans-unit id="ConflictingRuntimePackInformation">
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</source>
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</target>
<note>{StrBegin="NETSDK1133: "}</note>
</trans-unit>
<trans-unit id="ContentItemDoesNotProvideOutputPath">
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
<target state="translated">NETSDK1014: элемент содержимого для "{0}" задает "{1}", но не предоставляет "{2}" или "{3}".</target>
Expand Down Expand Up @@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1082: не было доступного пакета среды выполнения для {0} для указанного RuntimeIdentifier "{1}".</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackInformation">
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
<note>{StrBegin="NETSDK1132: "}</note>
</trans-unit>
<trans-unit id="NoSupportComSelfContained">
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>
Expand Down
12 changes: 12 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,13 @@
<note>{StrBegin="NETSDK1090: "}
{0} - The path to the invalid assembly.</note>
</trans-unit>
<trans-unit id="ConflictingRuntimePackInformation">
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</source>
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
{1}</target>
<note>{StrBegin="NETSDK1133: "}</note>
</trans-unit>
<trans-unit id="ContentItemDoesNotProvideOutputPath">
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
<target state="translated">NETSDK1014: '{0}' için içerik öğesi, '{1}' değerini ayarlıyor ancak '{2}' veya '{3}' sağlamıyor.</target>
Expand Down Expand Up @@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1082: {0} için, belirtilen RuntimeIdentifier '{1}' için kullanılabilecek bir çalışma zamanı paketi yoktu.</target>
<note>{StrBegin="NETSDK1082: "}</note>
</trans-unit>
<trans-unit id="NoRuntimePackInformation">
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
<note>{StrBegin="NETSDK1132: "}</note>
</trans-unit>
<trans-unit id="NoSupportComSelfContained">
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>
Expand Down
Loading