Skip to content

Commit 4112eb3

Browse files
author
William Li
authored
Merge pull request #11824 from dsplaisted/runtime-pack-types
Support labels for runtime packs
2 parents 961162f + eec03a6 commit 4112eb3

File tree

127 files changed

+934
-470
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+934
-470
lines changed

‎src/Tasks/Common/MetadataKeys.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ internal static class MetadataKeys
8282
public const string PackageConflictPreferredPackages = "PackageConflictPreferredPackages";
8383

8484
// Runtime packs
85-
public const string DropFromSingleFile = "DropFromSingleFile";
85+
public const string DropFromSingleFile = "DropFromSingleFile";
86+
public const string RuntimePackLabels = "RuntimePackLabels";
87+
public const string AdditionalFrameworkReferences = "AdditionalFrameworkReferences";
8688

8789
// Content files
8890
public const string PPOutputPath = "PPOutputPath";

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,4 +628,13 @@ The following are names of parameters or literal values and should not be transl
628628
<value>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</value>
629629
<comment>{StrBegin="NETSDK1131: "}</comment>
630630
</data>
631+
<data name="NoRuntimePackInformation" xml:space="preserve">
632+
<value>NETSDK1132: No runtime pack information was available for {0}.</value>
633+
<comment>{StrBegin="NETSDK1132: "}</comment>
634+
</data>
635+
<data name="ConflictingRuntimePackInformation" xml:space="preserve">
636+
<value>NETSDK1133: There was conflicting information about runtime packs available for {0}:
637+
{1}</value>
638+
<comment>{StrBegin="NETSDK1133: "}</comment>
639+
</data>
631640
</root>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@
192192
<note>{StrBegin="NETSDK1090: "}
193193
{0} - The path to the invalid assembly.</note>
194194
</trans-unit>
195+
<trans-unit id="ConflictingRuntimePackInformation">
196+
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
197+
{1}</source>
198+
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
199+
{1}</target>
200+
<note>{StrBegin="NETSDK1133: "}</note>
201+
</trans-unit>
195202
<trans-unit id="ContentItemDoesNotProvideOutputPath">
196203
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
197204
<target state="translated">NETSDK1014: Položka obsahu pro {0} nastaví {1}, ale neposkytuje {2} ani {3}.</target>
@@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
426433
<target state="translated">NETSDK1082: Pro zadaný identifikátor RuntimeIdentifier {1} nebyl k dispozici žádný balíček modulu runtime {0}.</target>
427434
<note>{StrBegin="NETSDK1082: "}</note>
428435
</trans-unit>
436+
<trans-unit id="NoRuntimePackInformation">
437+
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
438+
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
439+
<note>{StrBegin="NETSDK1132: "}</note>
440+
</trans-unit>
429441
<trans-unit id="NoSupportComSelfContained">
430442
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
431443
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@
192192
<note>{StrBegin="NETSDK1090: "}
193193
{0} - The path to the invalid assembly.</note>
194194
</trans-unit>
195+
<trans-unit id="ConflictingRuntimePackInformation">
196+
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
197+
{1}</source>
198+
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
199+
{1}</target>
200+
<note>{StrBegin="NETSDK1133: "}</note>
201+
</trans-unit>
195202
<trans-unit id="ContentItemDoesNotProvideOutputPath">
196203
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
197204
<target state="translated">NETSDK1014: Das Inhaltselement für "{0}" legt "{1}" fest, gibt aber "{2}" oder "{3}" nicht an.</target>
@@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
426433
<target state="translated">NETSDK1082: Für "{0}" stand für den angegebenen RuntimeIdentifier "{1}" kein Runtimepaket zur Verfügung.</target>
427434
<note>{StrBegin="NETSDK1082: "}</note>
428435
</trans-unit>
436+
<trans-unit id="NoRuntimePackInformation">
437+
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
438+
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
439+
<note>{StrBegin="NETSDK1132: "}</note>
440+
</trans-unit>
429441
<trans-unit id="NoSupportComSelfContained">
430442
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
431443
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@
192192
<note>{StrBegin="NETSDK1090: "}
193193
{0} - The path to the invalid assembly.</note>
194194
</trans-unit>
195+
<trans-unit id="ConflictingRuntimePackInformation">
196+
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
197+
{1}</source>
198+
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
199+
{1}</target>
200+
<note>{StrBegin="NETSDK1133: "}</note>
201+
</trans-unit>
195202
<trans-unit id="ContentItemDoesNotProvideOutputPath">
196203
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
197204
<target state="translated">NETSDK1014: El elemento de contenido de "{0}" establece "{1}", pero no proporciona "{2}" ni "{3}".</target>
@@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
426433
<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>
427434
<note>{StrBegin="NETSDK1082: "}</note>
428435
</trans-unit>
436+
<trans-unit id="NoRuntimePackInformation">
437+
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
438+
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
439+
<note>{StrBegin="NETSDK1132: "}</note>
440+
</trans-unit>
429441
<trans-unit id="NoSupportComSelfContained">
430442
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
431443
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@
192192
<note>{StrBegin="NETSDK1090: "}
193193
{0} - The path to the invalid assembly.</note>
194194
</trans-unit>
195+
<trans-unit id="ConflictingRuntimePackInformation">
196+
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
197+
{1}</source>
198+
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
199+
{1}</target>
200+
<note>{StrBegin="NETSDK1133: "}</note>
201+
</trans-unit>
195202
<trans-unit id="ContentItemDoesNotProvideOutputPath">
196203
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
197204
<target state="translated">NETSDK1014: L'élément de contenu pour '{0}' définit '{1}', mais ne fournit ni '{2}' ni '{3}'.</target>
@@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
426433
<target state="translated">NETSDK1082: aucun pack d'exécution lié à {0} n'est disponible pour le RuntimeIdentifier spécifié '{1}'.</target>
427434
<note>{StrBegin="NETSDK1082: "}</note>
428435
</trans-unit>
436+
<trans-unit id="NoRuntimePackInformation">
437+
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
438+
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
439+
<note>{StrBegin="NETSDK1132: "}</note>
440+
</trans-unit>
429441
<trans-unit id="NoSupportComSelfContained">
430442
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
431443
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@
192192
<note>{StrBegin="NETSDK1090: "}
193193
{0} - The path to the invalid assembly.</note>
194194
</trans-unit>
195+
<trans-unit id="ConflictingRuntimePackInformation">
196+
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
197+
{1}</source>
198+
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
199+
{1}</target>
200+
<note>{StrBegin="NETSDK1133: "}</note>
201+
</trans-unit>
195202
<trans-unit id="ContentItemDoesNotProvideOutputPath">
196203
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
197204
<target state="translated">NETSDK1014: l'elemento di contenuto per '{0}' imposta '{1}', ma non fornisce '{2}' o '{3}'.</target>
@@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
426433
<target state="translated">NETSDK1082: non è disponibile alcun pacchetto di runtime per {0} per l'elemento RuntimeIdentifier specificato '{1}'.</target>
427434
<note>{StrBegin="NETSDK1082: "}</note>
428435
</trans-unit>
436+
<trans-unit id="NoRuntimePackInformation">
437+
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
438+
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
439+
<note>{StrBegin="NETSDK1132: "}</note>
440+
</trans-unit>
429441
<trans-unit id="NoSupportComSelfContained">
430442
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
431443
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@
192192
<note>{StrBegin="NETSDK1090: "}
193193
{0} - The path to the invalid assembly.</note>
194194
</trans-unit>
195+
<trans-unit id="ConflictingRuntimePackInformation">
196+
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
197+
{1}</source>
198+
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
199+
{1}</target>
200+
<note>{StrBegin="NETSDK1133: "}</note>
201+
</trans-unit>
195202
<trans-unit id="ContentItemDoesNotProvideOutputPath">
196203
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
197204
<target state="translated">NETSDK1014: '{0}' のコンテンツ項目で '{1}' が設定されていますが、'{2}' または '{3}' は指定されていません。</target>
@@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
426433
<target state="translated">NETSDK1082: 指定された RuntimeIdentifier '{1}' で利用できる {0} のランタイム パックがありませんでした。</target>
427434
<note>{StrBegin="NETSDK1082: "}</note>
428435
</trans-unit>
436+
<trans-unit id="NoRuntimePackInformation">
437+
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
438+
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
439+
<note>{StrBegin="NETSDK1132: "}</note>
440+
</trans-unit>
429441
<trans-unit id="NoSupportComSelfContained">
430442
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
431443
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@
192192
<note>{StrBegin="NETSDK1090: "}
193193
{0} - The path to the invalid assembly.</note>
194194
</trans-unit>
195+
<trans-unit id="ConflictingRuntimePackInformation">
196+
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
197+
{1}</source>
198+
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
199+
{1}</target>
200+
<note>{StrBegin="NETSDK1133: "}</note>
201+
</trans-unit>
195202
<trans-unit id="ContentItemDoesNotProvideOutputPath">
196203
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
197204
<target state="translated">NETSDK1014: '{0}'의 콘텐츠 항목이 '{1}'을(를) 설정하지만, '{2}' 또는 '{3}'을(를) 제공하지 않습니다.</target>
@@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
426433
<target state="translated">NETSDK1082: 지정된 RuntimeIdentifier '{1}'에 사용할 수 있는 {0}용 런타임 팩이 없습니다.</target>
427434
<note>{StrBegin="NETSDK1082: "}</note>
428435
</trans-unit>
436+
<trans-unit id="NoRuntimePackInformation">
437+
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
438+
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
439+
<note>{StrBegin="NETSDK1132: "}</note>
440+
</trans-unit>
429441
<trans-unit id="NoSupportComSelfContained">
430442
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
431443
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@
192192
<note>{StrBegin="NETSDK1090: "}
193193
{0} - The path to the invalid assembly.</note>
194194
</trans-unit>
195+
<trans-unit id="ConflictingRuntimePackInformation">
196+
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
197+
{1}</source>
198+
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
199+
{1}</target>
200+
<note>{StrBegin="NETSDK1133: "}</note>
201+
</trans-unit>
195202
<trans-unit id="ContentItemDoesNotProvideOutputPath">
196203
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
197204
<target state="translated">NETSDK1014: Element zawartości dla elementu „{0}” ustawia wartość „{1}”, ale nie zapewnia wartości „{2}” ani „{3}”.</target>
@@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
426433
<target state="translated">NETSDK1082: Brak dostępnego pakietu środowiska uruchomieniowego {0} dla określonego elementu RuntimeIdentifier „{1}”.</target>
427434
<note>{StrBegin="NETSDK1082: "}</note>
428435
</trans-unit>
436+
<trans-unit id="NoRuntimePackInformation">
437+
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
438+
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
439+
<note>{StrBegin="NETSDK1132: "}</note>
440+
</trans-unit>
429441
<trans-unit id="NoSupportComSelfContained">
430442
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
431443
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>

‎src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@
192192
<note>{StrBegin="NETSDK1090: "}
193193
{0} - The path to the invalid assembly.</note>
194194
</trans-unit>
195+
<trans-unit id="ConflictingRuntimePackInformation">
196+
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
197+
{1}</source>
198+
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
199+
{1}</target>
200+
<note>{StrBegin="NETSDK1133: "}</note>
201+
</trans-unit>
195202
<trans-unit id="ContentItemDoesNotProvideOutputPath">
196203
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
197204
<target state="translated">NETSDK1014: O item de conteúdo para '{0}' define '{1}', mas não fornece '{2}' ou '{3}'.</target>
@@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
426433
<target state="translated">NETSDK1082: não havia nenhum pacote de tempo de execução de {0} disponível para o RuntimeIdentifier especificado '{1}'.</target>
427434
<note>{StrBegin="NETSDK1082: "}</note>
428435
</trans-unit>
436+
<trans-unit id="NoRuntimePackInformation">
437+
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
438+
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
439+
<note>{StrBegin="NETSDK1132: "}</note>
440+
</trans-unit>
429441
<trans-unit id="NoSupportComSelfContained">
430442
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
431443
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@
192192
<note>{StrBegin="NETSDK1090: "}
193193
{0} - The path to the invalid assembly.</note>
194194
</trans-unit>
195+
<trans-unit id="ConflictingRuntimePackInformation">
196+
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
197+
{1}</source>
198+
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
199+
{1}</target>
200+
<note>{StrBegin="NETSDK1133: "}</note>
201+
</trans-unit>
195202
<trans-unit id="ContentItemDoesNotProvideOutputPath">
196203
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
197204
<target state="translated">NETSDK1014: элемент содержимого для "{0}" задает "{1}", но не предоставляет "{2}" или "{3}".</target>
@@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
426433
<target state="translated">NETSDK1082: не было доступного пакета среды выполнения для {0} для указанного RuntimeIdentifier "{1}".</target>
427434
<note>{StrBegin="NETSDK1082: "}</note>
428435
</trans-unit>
436+
<trans-unit id="NoRuntimePackInformation">
437+
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
438+
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
439+
<note>{StrBegin="NETSDK1132: "}</note>
440+
</trans-unit>
429441
<trans-unit id="NoSupportComSelfContained">
430442
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
431443
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@
192192
<note>{StrBegin="NETSDK1090: "}
193193
{0} - The path to the invalid assembly.</note>
194194
</trans-unit>
195+
<trans-unit id="ConflictingRuntimePackInformation">
196+
<source>NETSDK1133: There was conflicting information about runtime packs available for {0}:
197+
{1}</source>
198+
<target state="new">NETSDK1133: There was conflicting information about runtime packs available for {0}:
199+
{1}</target>
200+
<note>{StrBegin="NETSDK1133: "}</note>
201+
</trans-unit>
195202
<trans-unit id="ContentItemDoesNotProvideOutputPath">
196203
<source>NETSDK1014: Content item for '{0}' sets '{1}', but does not provide '{2}' or '{3}'.</source>
197204
<target state="translated">NETSDK1014: '{0}' için içerik öğesi, '{1}' değerini ayarlıyor ancak '{2}' veya '{3}' sağlamıyor.</target>
@@ -426,6 +433,11 @@ The following are names of parameters or literal values and should not be transl
426433
<target state="translated">NETSDK1082: {0} için, belirtilen RuntimeIdentifier '{1}' için kullanılabilecek bir çalışma zamanı paketi yoktu.</target>
427434
<note>{StrBegin="NETSDK1082: "}</note>
428435
</trans-unit>
436+
<trans-unit id="NoRuntimePackInformation">
437+
<source>NETSDK1132: No runtime pack information was available for {0}.</source>
438+
<target state="new">NETSDK1132: No runtime pack information was available for {0}.</target>
439+
<note>{StrBegin="NETSDK1132: "}</note>
440+
</trans-unit>
429441
<trans-unit id="NoSupportComSelfContained">
430442
<source>NETSDK1128: COM hosting does not support self-contained deployments.</source>
431443
<target state="new">NETSDK1128: COM hosting does not support self-contained deployments.</target>

0 commit comments

Comments
 (0)