Skip to content

Fix target platform attribute generation #13672

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

Merged
merged 8 commits into from
Sep 18, 2020
Merged

Fix target platform attribute generation #13672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e741bfa
Update error text for SupportedOSPlatformVersion
dsplaisted Sep 16, 2020
91be61f
Generate target platform attributes
dsplaisted Sep 17, 2020
f57d089
Update tests to cover TargetPlatformAttribute
dsplaisted Sep 17, 2020
df6b087
Add tests for TargetPlatformMinVersion property
dsplaisted Sep 17, 2020
a47d789
Reduce duplication in setting version-related properties
dsplaisted Sep 17, 2020
37d5ade
Rename SdkSupportedTargetPlatform to SdkSupportedTargetPlatformVersion
dsplaisted Sep 17, 2020
a41778a
Fix non .NET 5 projects with TargetPlatformMinVersion set
dsplaisted Sep 17, 2020
92b9068
Switch tests to Windows only
dsplaisted Sep 17, 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: 2 additions & 2 deletions src/Tasks/Common/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,8 +641,8 @@ The following are names of parameters or literal values and should not be transl
<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>
<comment>{StrBegin="NETSDK1134: "}</comment>
</data>
<data name="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion" xml:space="preserve">
<value>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</value>
<data name="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion" xml:space="preserve">
<value>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</value>
<comment>{StrBegin="NETSDK1135: "}</comment>
</data>
<data name="WindowsDesktopTargetPlatformMustBeWindows" xml:space="preserve">
Expand Down
10 changes: 5 additions & 5 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 @@ -107,11 +107,6 @@
<target state="translated">NETSDK1007: Nelze najít informace o projektu pro {0}. Může to znamenat chybějící odkaz na projekt.</target>
<note>{StrBegin="NETSDK1007: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="translated">NETSDK1032: Platforma RuntimeIdentifier {0} a PlatformTarget {1} musí být kompatibilní.</target>
Expand Down Expand Up @@ -142,6 +137,11 @@
<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>
<note>{StrBegin="NETSDK1134: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
<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>
Expand Down
10 changes: 5 additions & 5 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 @@ -107,11 +107,6 @@
<target state="translated">NETSDK1007: Die Projektinformationen für "{0}" wurden nicht gefunden. Dies ist möglicherweise auf einen fehlenden Projektverweis zurückzuführen.</target>
<note>{StrBegin="NETSDK1007: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="translated">NETSDK1032: Die RuntimeIdentifier-Plattform "{0}" und das PlatformTarget "{1}" müssen kompatibel sein.</target>
Expand Down Expand Up @@ -142,6 +137,11 @@
<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>
<note>{StrBegin="NETSDK1134: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
<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>
Expand Down
10 changes: 5 additions & 5 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 @@ -107,11 +107,6 @@
<target state="translated">NETSDK1007: No se encuentra la información de proyecto de "{0}". Esto puede indicar que falta una referencia de proyecto.</target>
<note>{StrBegin="NETSDK1007: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="translated">NETSDK1032: Las plataformas RuntimeIdentifier "{0}" y PlatformTarget "{1}" deben ser compatibles.</target>
Expand Down Expand Up @@ -142,6 +137,11 @@
<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>
<note>{StrBegin="NETSDK1134: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
<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>
Expand Down
10 changes: 5 additions & 5 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 @@ -107,11 +107,6 @@
<target state="translated">NETSDK1007: Les informations relatives au projet sont introuvables pour '{0}'. Cela peut indiquer une référence de projet manquante.</target>
<note>{StrBegin="NETSDK1007: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="translated">NETSDK1032: La plateforme de RuntimeIdentifier '{0}' et le PlatformTarget '{1}' doivent être compatibles.</target>
Expand Down Expand Up @@ -142,6 +137,11 @@
<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>
<note>{StrBegin="NETSDK1134: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
<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>
Expand Down
10 changes: 5 additions & 5 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 @@ -107,11 +107,6 @@
<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>
<note>{StrBegin="NETSDK1007: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="translated">NETSDK1032: la piattaforma '{0}' di RuntimeIdentifier e quella '{1}' di PlatformTarget devono essere compatibili.</target>
Expand Down Expand Up @@ -142,6 +137,11 @@
<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>
<note>{StrBegin="NETSDK1134: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
<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>
Expand Down
10 changes: 5 additions & 5 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 @@ -107,11 +107,6 @@
<target state="translated">NETSDK1007: '{0}' のプロジェクト情報が見つかりません。これは、プロジェクト参照がないことを示している可能性があります。</target>
<note>{StrBegin="NETSDK1007: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="translated">NETSDK1032: RuntimeIdentifier プラットフォーム '{0}' と PlatformTarget '{1}' には互換性が必要です。</target>
Expand Down Expand Up @@ -142,6 +137,11 @@
<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>
<note>{StrBegin="NETSDK1134: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
<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>
Expand Down
10 changes: 5 additions & 5 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 @@ -107,11 +107,6 @@
<target state="translated">NETSDK1007: '{0}'에 대한 프로젝트 정보를 찾을 수 없습니다. 프로젝트 참조가 없음을 나타낼 수 있습니다.</target>
<note>{StrBegin="NETSDK1007: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="translated">NETSDK1032: RuntimeIdentifier 플랫폼 '{0}'과(와) PlatformTarget '{1}'은(는) 호환되어야 합니다.</target>
Expand Down Expand Up @@ -142,6 +137,11 @@
<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>
<note>{StrBegin="NETSDK1134: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
<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>
Expand Down
10 changes: 5 additions & 5 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 @@ -107,11 +107,6 @@
<target state="translated">NETSDK1007: Nie odnaleziono informacji o projekcie dla elementu „{0}”. Może to wskazywać na brakujące odwołanie do projektu.</target>
<note>{StrBegin="NETSDK1007: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatform {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget">
<source>NETSDK1032: The RuntimeIdentifier platform '{0}' and the PlatformTarget '{1}' must be compatible.</source>
<target state="translated">NETSDK1032: Platforma elementu RuntimeIdentifier „{0}” i element PlatformTarget „{1}” muszą być zgodne.</target>
Expand Down Expand Up @@ -142,6 +137,11 @@
<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>
<note>{StrBegin="NETSDK1134: "}</note>
</trans-unit>
<trans-unit id="CannotHaveSupportedOSPlatformVersionHigherThanTargetPlatformVersion">
<source>NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</source>
<target state="new">NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}.</target>
<note>{StrBegin="NETSDK1135: "}</note>
</trans-unit>
<trans-unit id="CannotIncludeAllContentButNotNativeLibrariesInSingleFile">
<source>NETSDK1143: Including all content in a single file bundle also includes native libraries. If IncludeAllContentForSelfExtract is true, IncludeNativeLibrariesForSelfExtract must not be false.</source>
<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>
Expand Down
Loading