Skip to content

Commit a11655a

Browse files
dsplaisteddsplaisted
authored
Merge pull request #13672 from dsplaisted/TargetPlatformAttributes
Fix target platform attribute generation
2 parents 5c208e1 + 92b9068 commit a11655a

21 files changed

+287
-114
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,8 +641,8 @@ The following are names of parameters or literal values and should not be transl
641641
<value>NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</value>
642642
<comment>{StrBegin="NETSDK1134: "}</comment>
643643
</data>
644-
<data name="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion" xml:space="preserve">
645-
<value>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</value>
644+
<data name="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion" xml:space="preserve">
645+
<value>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</value>
646646
<comment>{StrBegin="NETSDK1135: "}</comment>
647647
</data>
648648
<data name="WindowsDesktopTargetPlatformMustBeWindows" xml:space="preserve">

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@
107107
<target state="translated">NETSDK1007: Nelze najít informace o projektu pro {0}. Může to znamenat chybějící odkaz na projekt.</target>
108108
<note>{StrBegin="NETSDK1007: "}</note>
109109
</trans-unit>
110-
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
111-
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
112-
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
113-
<note>{StrBegin="NETSDK1135: "}</note>
114-
</trans-unit>
115110
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
116111
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
117112
<target state="translated">NETSDK1032: Platforma RuntimeIdentifier {0} a PlatformTarget {1} musí být kompatibilní.</target>
@@ -142,6 +137,11 @@
142137
<target state="new">NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</target>
143138
<note>{StrBegin="NETSDK1134: "}</note>
144139
</trans-unit>
140+
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
141+
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
142+
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
143+
<note>{StrBegin="NETSDK1135: "}</note>
144+
</trans-unit>
145145
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
146146
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
147147
<target state="new">NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</target>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@
107107
<target state="translated">NETSDK1007: Die Projektinformationen für "{0}" wurden nicht gefunden. Dies ist möglicherweise auf einen fehlenden Projektverweis zurückzuführen.</target>
108108
<note>{StrBegin="NETSDK1007: "}</note>
109109
</trans-unit>
110-
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
111-
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
112-
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
113-
<note>{StrBegin="NETSDK1135: "}</note>
114-
</trans-unit>
115110
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
116111
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
117112
<target state="translated">NETSDK1032: Die RuntimeIdentifier-Plattform "{0}" und das PlatformTarget "{1}" müssen kompatibel sein.</target>
@@ -142,6 +137,11 @@
142137
<target state="new">NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</target>
143138
<note>{StrBegin="NETSDK1134: "}</note>
144139
</trans-unit>
140+
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
141+
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
142+
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
143+
<note>{StrBegin="NETSDK1135: "}</note>
144+
</trans-unit>
145145
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
146146
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
147147
<target state="new">NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</target>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@
107107
<target state="translated">NETSDK1007: No se encuentra la información de proyecto de "{0}". Esto puede indicar que falta una referencia de proyecto.</target>
108108
<note>{StrBegin="NETSDK1007: "}</note>
109109
</trans-unit>
110-
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
111-
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
112-
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
113-
<note>{StrBegin="NETSDK1135: "}</note>
114-
</trans-unit>
115110
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
116111
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
117112
<target state="translated">NETSDK1032: Las plataformas RuntimeIdentifier "{0}" y PlatformTarget "{1}" deben ser compatibles.</target>
@@ -142,6 +137,11 @@
142137
<target state="new">NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</target>
143138
<note>{StrBegin="NETSDK1134: "}</note>
144139
</trans-unit>
140+
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
141+
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
142+
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
143+
<note>{StrBegin="NETSDK1135: "}</note>
144+
</trans-unit>
145145
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
146146
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
147147
<target state="new">NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</target>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@
107107
<target state="translated">NETSDK1007: Les informations relatives au projet sont introuvables pour '{0}'. Cela peut indiquer une référence de projet manquante.</target>
108108
<note>{StrBegin="NETSDK1007: "}</note>
109109
</trans-unit>
110-
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
111-
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
112-
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
113-
<note>{StrBegin="NETSDK1135: "}</note>
114-
</trans-unit>
115110
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
116111
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
117112
<target state="translated">NETSDK1032: La plateforme de RuntimeIdentifier '{0}' et le PlatformTarget '{1}' doivent être compatibles.</target>
@@ -142,6 +137,11 @@
142137
<target state="new">NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</target>
143138
<note>{StrBegin="NETSDK1134: "}</note>
144139
</trans-unit>
140+
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
141+
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
142+
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
143+
<note>{StrBegin="NETSDK1135: "}</note>
144+
</trans-unit>
145145
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
146146
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
147147
<target state="new">NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</target>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@
107107
<target state="translated">NETSDK1007: le informazioni del progetto per '{0}' non sono state trovate. Questo errore può indicare la mancanza di un riferimento al progetto.</target>
108108
<note>{StrBegin="NETSDK1007: "}</note>
109109
</trans-unit>
110-
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
111-
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
112-
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
113-
<note>{StrBegin="NETSDK1135: "}</note>
114-
</trans-unit>
115110
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
116111
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
117112
<target state="translated">NETSDK1032: la piattaforma '{0}' di RuntimeIdentifier e quella '{1}' di PlatformTarget devono essere compatibili.</target>
@@ -142,6 +137,11 @@
142137
<target state="new">NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</target>
143138
<note>{StrBegin="NETSDK1134: "}</note>
144139
</trans-unit>
140+
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
141+
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
142+
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
143+
<note>{StrBegin="NETSDK1135: "}</note>
144+
</trans-unit>
145145
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
146146
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
147147
<target state="new">NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</target>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@
107107
<target state="translated">NETSDK1007: '{0}' のプロジェクト情報が見つかりません。これは、プロジェクト参照がないことを示している可能性があります。</target>
108108
<note>{StrBegin="NETSDK1007: "}</note>
109109
</trans-unit>
110-
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
111-
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
112-
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
113-
<note>{StrBegin="NETSDK1135: "}</note>
114-
</trans-unit>
115110
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
116111
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
117112
<target state="translated">NETSDK1032: RuntimeIdentifier プラットフォーム '{0}' と PlatformTarget '{1}' には互換性が必要です。</target>
@@ -142,6 +137,11 @@
142137
<target state="new">NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</target>
143138
<note>{StrBegin="NETSDK1134: "}</note>
144139
</trans-unit>
140+
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
141+
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
142+
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
143+
<note>{StrBegin="NETSDK1135: "}</note>
144+
</trans-unit>
145145
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
146146
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
147147
<target state="new">NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</target>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@
107107
<target state="translated">NETSDK1007: '{0}'에 대한 프로젝트 정보를 찾을 수 없습니다. 프로젝트 참조가 없음을 나타낼 수 있습니다.</target>
108108
<note>{StrBegin="NETSDK1007: "}</note>
109109
</trans-unit>
110-
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
111-
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
112-
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
113-
<note>{StrBegin="NETSDK1135: "}</note>
114-
</trans-unit>
115110
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
116111
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
117112
<target state="translated">NETSDK1032: RuntimeIdentifier 플랫폼 '{0}'과(와) PlatformTarget '{1}'은(는) 호환되어야 합니다.</target>
@@ -142,6 +137,11 @@
142137
<target state="new">NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</target>
143138
<note>{StrBegin="NETSDK1134: "}</note>
144139
</trans-unit>
140+
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
141+
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
142+
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
143+
<note>{StrBegin="NETSDK1135: "}</note>
144+
</trans-unit>
145145
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
146146
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
147147
<target state="new">NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</target>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@
107107
<target state="translated">NETSDK1007: Nie odnaleziono informacji o projekcie dla elementu „{0}”. Może to wskazywać na brakujące odwołanie do projektu.</target>
108108
<note>{StrBegin="NETSDK1007: "}</note>
109109
</trans-unit>
110-
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
111-
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
112-
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
113-
<note>{StrBegin="NETSDK1135: "}</note>
114-
</trans-unit>
115110
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
116111
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
117112
<target state="translated">NETSDK1032: Platforma elementu RuntimeIdentifier „{0}” i element PlatformTarget „{1}” muszą być zgodne.</target>
@@ -142,6 +137,11 @@
142137
<target state="new">NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</target>
143138
<note>{StrBegin="NETSDK1134: "}</note>
144139
</trans-unit>
140+
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
141+
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
142+
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
143+
<note>{StrBegin="NETSDK1135: "}</note>
144+
</trans-unit>
145145
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
146146
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
147147
<target state="new">NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</target>

0 commit comments

Comments
 (0)