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

Use 'artifacts' instead of .artifacts for default artifacts path #31955

Merged
merged 2 commits into from
Apr 25, 2023
Merged

Use 'artifacts' instead of .artifacts for default artifacts path #31955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bfbe46
Drop dot from default artifacts path
dsplaisted Apr 21, 2023
d9a005b
Add error if Directory.Build.props file isn't found when setting arti…
dsplaisted Apr 25, 2023
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
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 @@ -896,4 +896,13 @@ You may need to build the project on another operating system or architecture, o
<value>NETSDK1198: A publish profile with the name '{0}' was not found in the project. Set the PublishProfile property to a valid file name.</value>
<comment>{StrBegin="NETSDK1198: "}</comment>
</data>
<data name="ArtifactsPathCannotBeSetInProject" xml:space="preserve">
<value>NETSDK1199: The ArtifactsPath and UseArtifactsOutput properties cannot be set in a project file, due to MSBuild ordering constraints. They must be set in a Directory.Build.props file or from the command line. See https://aka.ms/netsdk1199 for more information.</value>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to manually lock the ArtifactsPath and UseArtifactsOutput strings inside a <note /> section for the translators so they cannot translate the property names by accident?

Copy link
Member Author

@dsplaisted dsplaisted Apr 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be a good idea, can you point me to an example of what that looks like?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can add something like:
<note>{Locked="dotnet workload search"}</note>
if dotnet workload search is what you want to lock.

This PR has a lot of examples: https://github.com/dotnet/sdk/pull/28553/files

Copy link
Member

@joeloff joeloff Apr 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the ENU resx file you should be able to add something like

<comment>{Locked="ArtifactsPath"} {Locked="UseArtifactsOutput"}</comment>

The comments will automatically be added in the XLF as notes for the translators IIRC. I can't remember if you need a single comment or multiple comments with separate locks. I think it's the former

<comment>{StrBegin="NETSDK1199: "}</comment>
</data>
<data name="UseArtifactsOutputRequiresDirectoryBuildProps" xml:space="preserve">
<value>NETSDK1200: If UseArtifactsPath is set to true and ArtifactsPath is not set, there must be a Directory.Build.props file in order to determine where the artifacts folder should be located.</value>
<comment>{StrBegin="NETSDK1200: "}</comment>
</data>

</root>
10 changes: 10 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 @@ -52,6 +52,11 @@
<target state="translated">NETSDK1177: Nepovedlo se podepsat hostitele aplikace s kódem chyby {1}: {0}.</target>
<note>{StrBegin="NETSDK1177: "}</note>
</trans-unit>
<trans-unit id="ArtifactsPathCannotBeSetInProject">
<source>NETSDK1199: The ArtifactsPath and UseArtifactsOutput properties cannot be set in a project file, due to MSBuild ordering constraints. They must be set in a Directory.Build.props file or from the command line. See https://aka.ms/netsdk1199 for more information.</source>
<target state="new">NETSDK1199: The ArtifactsPath and UseArtifactsOutput properties cannot be set in a project file, due to MSBuild ordering constraints. They must be set in a Directory.Build.props file or from the command line. See https://aka.ms/netsdk1199 for more information.</target>
<note>{StrBegin="NETSDK1199: "}</note>
</trans-unit>
<trans-unit id="AspNetCoreAllNotSupported">
<source>NETSDK1079: The Microsoft.AspNetCore.All package is not supported when targeting .NET Core 3.0 or higher. A FrameworkReference to Microsoft.AspNetCore.App should be used instead, and will be implicitly included by Microsoft.NET.Sdk.Web.</source>
<target state="translated">NETSDK1079: Když se cílí na .NET Core 3.0 nebo vyšší, balíček Microsoft.AspNetCore.All se nepodporuje. Místo něj by se měl použít odkaz FrameworkReference na Microsoft.AspNetCore.App, který se implicitně zahrne pomocí Microsoft.NET.Sdk.Web.</target>
Expand Down Expand Up @@ -932,6 +937,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1139: Identifikátor cílové platformy {0} se nerozpoznal.</target>
<note>{StrBegin="NETSDK1139: "}</note>
</trans-unit>
<trans-unit id="UseArtifactsOutputRequiresDirectoryBuildProps">
<source>NETSDK1200: If UseArtifactsPath is set to true and ArtifactsPath is not set, there must be a Directory.Build.props file in order to determine where the artifacts folder should be located.</source>
<target state="new">NETSDK1200: If UseArtifactsPath is set to true and ArtifactsPath is not set, there must be a Directory.Build.props file in order to determine where the artifacts folder should be located.</target>
<note>{StrBegin="NETSDK1200: "}</note>
</trans-unit>
<trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
<source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>
<target state="translated">NETSDK1107: K sestavování desktopových aplikací pro Windows se vyžaduje Microsoft.NET.Sdk.WindowsDesktop. Aktuální verze sady SDK nepodporuje hodnoty UseWpf a UseWindowsForms.</target>
Expand Down
10 changes: 10 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 @@ -52,6 +52,11 @@
<target state="translated">NETSDK1177: Fehler beim Signieren von apphost mit Fehlercode {1}: {0}</target>
<note>{StrBegin="NETSDK1177: "}</note>
</trans-unit>
<trans-unit id="ArtifactsPathCannotBeSetInProject">
<source>NETSDK1199: The ArtifactsPath and UseArtifactsOutput properties cannot be set in a project file, due to MSBuild ordering constraints. They must be set in a Directory.Build.props file or from the command line. See https://aka.ms/netsdk1199 for more information.</source>
<target state="new">NETSDK1199: The ArtifactsPath and UseArtifactsOutput properties cannot be set in a project file, due to MSBuild ordering constraints. They must be set in a Directory.Build.props file or from the command line. See https://aka.ms/netsdk1199 for more information.</target>
<note>{StrBegin="NETSDK1199: "}</note>
</trans-unit>
<trans-unit id="AspNetCoreAllNotSupported">
<source>NETSDK1079: The Microsoft.AspNetCore.All package is not supported when targeting .NET Core 3.0 or higher. A FrameworkReference to Microsoft.AspNetCore.App should be used instead, and will be implicitly included by Microsoft.NET.Sdk.Web.</source>
<target state="translated">NETSDK1079: Das Paket "Microsoft.AspNetCore.All" wird für .NET Core 3.0 oder höher nicht unterstützt. Verwenden Sie stattdessen eine FrameworkReference auf Microsoft.AspNetCore.App, die daraufhin implizit von Microsoft.NET.Sdk.Web eingeschlossen wird.</target>
Expand Down Expand Up @@ -932,6 +937,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1139: Der Zielplattformbezeichner "{0}" wurde nicht erkannt.</target>
<note>{StrBegin="NETSDK1139: "}</note>
</trans-unit>
<trans-unit id="UseArtifactsOutputRequiresDirectoryBuildProps">
<source>NETSDK1200: If UseArtifactsPath is set to true and ArtifactsPath is not set, there must be a Directory.Build.props file in order to determine where the artifacts folder should be located.</source>
<target state="new">NETSDK1200: If UseArtifactsPath is set to true and ArtifactsPath is not set, there must be a Directory.Build.props file in order to determine where the artifacts folder should be located.</target>
<note>{StrBegin="NETSDK1200: "}</note>
</trans-unit>
<trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
<source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>
<target state="translated">NETSDK1107: Für das Erstellen von Windows-Desktopanwendungen ist Microsoft.NET.Sdk.WindowsDesktop erforderlich. "UseWpf" und "UseWindowsForms" werden vom aktuellen SDK nicht unterstützt.</target>
Expand Down
10 changes: 10 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 @@ -52,6 +52,11 @@
<target state="translated">NETSDK1177: No se pudo firmar apphost con el código de error {1}: {0}</target>
<note>{StrBegin="NETSDK1177: "}</note>
</trans-unit>
<trans-unit id="ArtifactsPathCannotBeSetInProject">
<source>NETSDK1199: The ArtifactsPath and UseArtifactsOutput properties cannot be set in a project file, due to MSBuild ordering constraints. They must be set in a Directory.Build.props file or from the command line. See https://aka.ms/netsdk1199 for more information.</source>
<target state="new">NETSDK1199: The ArtifactsPath and UseArtifactsOutput properties cannot be set in a project file, due to MSBuild ordering constraints. They must be set in a Directory.Build.props file or from the command line. See https://aka.ms/netsdk1199 for more information.</target>
<note>{StrBegin="NETSDK1199: "}</note>
</trans-unit>
<trans-unit id="AspNetCoreAllNotSupported">
<source>NETSDK1079: The Microsoft.AspNetCore.All package is not supported when targeting .NET Core 3.0 or higher. A FrameworkReference to Microsoft.AspNetCore.App should be used instead, and will be implicitly included by Microsoft.NET.Sdk.Web.</source>
<target state="translated">NETSDK1079: El paquete Microsoft.AspNetCore.All no se admite cuando el destino es .NET Core 3.0 o posterior. En su lugar, se debe usar un valor de FrameworkReference para Microsoft.AspNetCore.App, y se incluirá implícitamente en Microsoft.NET.Sdk.Web.</target>
Expand Down Expand Up @@ -932,6 +937,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1139: No se reconoció el identificador de la plataforma de destino {0}.</target>
<note>{StrBegin="NETSDK1139: "}</note>
</trans-unit>
<trans-unit id="UseArtifactsOutputRequiresDirectoryBuildProps">
<source>NETSDK1200: If UseArtifactsPath is set to true and ArtifactsPath is not set, there must be a Directory.Build.props file in order to determine where the artifacts folder should be located.</source>
<target state="new">NETSDK1200: If UseArtifactsPath is set to true and ArtifactsPath is not set, there must be a Directory.Build.props file in order to determine where the artifacts folder should be located.</target>
<note>{StrBegin="NETSDK1200: "}</note>
</trans-unit>
<trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
<source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>
<target state="translated">NETSDK1107: Se requiere Microsoft.NET.Sdk.WindowsDesktop para compilar las aplicaciones de escritorio de Windows. El SDK actual no admite "UseWpf" ni "UseWindowsForms".</target>
Expand Down
10 changes: 10 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 @@ -52,6 +52,11 @@
<target state="translated">NETSDK1177: échec de la signature de apphost avec le code d’erreur {1}: {0}</target>
<note>{StrBegin="NETSDK1177: "}</note>
</trans-unit>
<trans-unit id="ArtifactsPathCannotBeSetInProject">
<source>NETSDK1199: The ArtifactsPath and UseArtifactsOutput properties cannot be set in a project file, due to MSBuild ordering constraints. They must be set in a Directory.Build.props file or from the command line. See https://aka.ms/netsdk1199 for more information.</source>
<target state="new">NETSDK1199: The ArtifactsPath and UseArtifactsOutput properties cannot be set in a project file, due to MSBuild ordering constraints. They must be set in a Directory.Build.props file or from the command line. See https://aka.ms/netsdk1199 for more information.</target>
<note>{StrBegin="NETSDK1199: "}</note>
</trans-unit>
<trans-unit id="AspNetCoreAllNotSupported">
<source>NETSDK1079: The Microsoft.AspNetCore.All package is not supported when targeting .NET Core 3.0 or higher. A FrameworkReference to Microsoft.AspNetCore.App should be used instead, and will be implicitly included by Microsoft.NET.Sdk.Web.</source>
<target state="translated">NETSDK1079: le package Microsoft.AspNetCore.All n'est pas pris en charge pour le ciblage de .NET Core 3.0 ou une version ultérieure. Vous devez utiliser à la place un FrameworkReference pour Microsoft.AspNetCore.App. Il est inclus implicitement par Microsoft.NET.Sdk.Web.</target>
Expand Down Expand Up @@ -932,6 +937,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1139: L'identificateur de la plateforme cible {0} n'a pas été reconnu.</target>
<note>{StrBegin="NETSDK1139: "}</note>
</trans-unit>
<trans-unit id="UseArtifactsOutputRequiresDirectoryBuildProps">
<source>NETSDK1200: If UseArtifactsPath is set to true and ArtifactsPath is not set, there must be a Directory.Build.props file in order to determine where the artifacts folder should be located.</source>
<target state="new">NETSDK1200: If UseArtifactsPath is set to true and ArtifactsPath is not set, there must be a Directory.Build.props file in order to determine where the artifacts folder should be located.</target>
<note>{StrBegin="NETSDK1200: "}</note>
</trans-unit>
<trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
<source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>
<target state="translated">NETSDK1107: vous devez disposer de Microsoft.NET.Sdk.WindowsDesktop pour générer des applications de bureau Windows. 'UseWpf' et 'UseWindowsForms' ne sont pas pris en charge par le kit SDK actuel.</target>
Expand Down
10 changes: 10 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 @@ -52,6 +52,11 @@
<target state="translated">NETSDK1177: impossibile firmare apphost con codice di errore {1}: {0}</target>
<note>{StrBegin="NETSDK1177: "}</note>
</trans-unit>
<trans-unit id="ArtifactsPathCannotBeSetInProject">
<source>NETSDK1199: The ArtifactsPath and UseArtifactsOutput properties cannot be set in a project file, due to MSBuild ordering constraints. They must be set in a Directory.Build.props file or from the command line. See https://aka.ms/netsdk1199 for more information.</source>
<target state="new">NETSDK1199: The ArtifactsPath and UseArtifactsOutput properties cannot be set in a project file, due to MSBuild ordering constraints. They must be set in a Directory.Build.props file or from the command line. See https://aka.ms/netsdk1199 for more information.</target>
<note>{StrBegin="NETSDK1199: "}</note>
</trans-unit>
<trans-unit id="AspNetCoreAllNotSupported">
<source>NETSDK1079: The Microsoft.AspNetCore.All package is not supported when targeting .NET Core 3.0 or higher. A FrameworkReference to Microsoft.AspNetCore.App should be used instead, and will be implicitly included by Microsoft.NET.Sdk.Web.</source>
<target state="translated">NETSDK1079: il pacchetto Microsoft.AspNetCore.All non è supportato quando la destinazione è .NET Core 3.0 o versione successiva. È necessario un elemento FrameworkReference per Microsoft.AspNetCore.App, che verrà incluso in modo implicito da Microsoft.NET.Sdk.Web.</target>
Expand Down Expand Up @@ -932,6 +937,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1139: l'identificatore di piattaforma di destinazione {0} non è stato riconosciuto.</target>
<note>{StrBegin="NETSDK1139: "}</note>
</trans-unit>
<trans-unit id="UseArtifactsOutputRequiresDirectoryBuildProps">
<source>NETSDK1200: If UseArtifactsPath is set to true and ArtifactsPath is not set, there must be a Directory.Build.props file in order to determine where the artifacts folder should be located.</source>
<target state="new">NETSDK1200: If UseArtifactsPath is set to true and ArtifactsPath is not set, there must be a Directory.Build.props file in order to determine where the artifacts folder should be located.</target>
<note>{StrBegin="NETSDK1200: "}</note>
</trans-unit>
<trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
<source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>
<target state="translated">NETSDK1107: per compilare applicazioni desktop di Windows, è necessario Microsoft.NET.Sdk.WindowsDesktop. 'UseWpf' e 'UseWindowsForms' non sono supportati dall'SDK corrente.</target>
Expand Down
10 changes: 10 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 @@ -52,6 +52,11 @@
<target state="translated">NETSDK1177: エラー コード {1} が発生して AppHost に署名できませんでした: {0}</target>
<note>{StrBegin="NETSDK1177: "}</note>
</trans-unit>
<trans-unit id="ArtifactsPathCannotBeSetInProject">
<source>NETSDK1199: The ArtifactsPath and UseArtifactsOutput properties cannot be set in a project file, due to MSBuild ordering constraints. They must be set in a Directory.Build.props file or from the command line. See https://aka.ms/netsdk1199 for more information.</source>
<target state="new">NETSDK1199: The ArtifactsPath and UseArtifactsOutput properties cannot be set in a project file, due to MSBuild ordering constraints. They must be set in a Directory.Build.props file or from the command line. See https://aka.ms/netsdk1199 for more information.</target>
<note>{StrBegin="NETSDK1199: "}</note>
</trans-unit>
<trans-unit id="AspNetCoreAllNotSupported">
<source>NETSDK1079: The Microsoft.AspNetCore.All package is not supported when targeting .NET Core 3.0 or higher. A FrameworkReference to Microsoft.AspNetCore.App should be used instead, and will be implicitly included by Microsoft.NET.Sdk.Web.</source>
<target state="translated">NETSDK1079: .NET Core 3.0 以上がターゲットの場合、Microsoft.AspNetCore.All パッケージはサポートされていません。代わりに Microsoft.AspNetCore.App への FrameworkReference を使用する必要があり、これは Microsoft.NET.Sdk.Web によって暗黙的に含まれます。</target>
Expand Down Expand Up @@ -932,6 +937,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1139: ターゲット プラットフォーム識別子 {0} は認識されませんでした。</target>
<note>{StrBegin="NETSDK1139: "}</note>
</trans-unit>
<trans-unit id="UseArtifactsOutputRequiresDirectoryBuildProps">
<source>NETSDK1200: If UseArtifactsPath is set to true and ArtifactsPath is not set, there must be a Directory.Build.props file in order to determine where the artifacts folder should be located.</source>
<target state="new">NETSDK1200: If UseArtifactsPath is set to true and ArtifactsPath is not set, there must be a Directory.Build.props file in order to determine where the artifacts folder should be located.</target>
<note>{StrBegin="NETSDK1200: "}</note>
</trans-unit>
<trans-unit id="UseWpfOrUseWindowsFormsRequiresWindowsDesktopFramework">
<source>NETSDK1107: Microsoft.NET.Sdk.WindowsDesktop is required to build Windows desktop applications. 'UseWpf' and 'UseWindowsForms' are not supported by the current SDK.</source>
<target state="translated">NETSDK1107: Windows デスクトップ アプリケーションを作成するには、Microsoft.NET.Sdk.WindowsDesktop が必要です。現在の SDK では、'UseWpf' と 'UseWindowsForms' はサポートされていません。</target>
Expand Down
Loading