Skip to content

Clean up the dotnet --info workloads messaging to be more consistent and localizable #50068

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions src/Cli/dotnet/Commands/CliCommandStrings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1852,7 +1852,7 @@ Your project targets multiple frameworks. Specify which framework to run using '
<comment>{Locked="--sdk-version"}</comment>
</data>
<data name="ShouldInstallAWorkloadSet" xml:space="preserve">
<value>Workloads are configured to install and update using workload versions, but none were found. Run "dotnet workload restore" to install a workload version.</value>
<value>No workload sets are installed. Run "dotnet workload restore" to install a workload set.</value>
<comment>{Locked="dotnet workload restore"}</comment>
</data>
<data name="ShutDownFailed" xml:space="preserve">
Expand Down Expand Up @@ -2468,8 +2468,12 @@ To display a value, specify the corresponding command-line option without provid
<data name="WorkloadManifestIdColumn" xml:space="preserve">
<value>Workload manifest ID</value>
</data>
<data name="WorkloadManifestInstallationConfiguration" xml:space="preserve">
<value>Configured to use {0} when installing new manifests.</value>
<data name="WorkloadManifestInstallationConfigurationWorkloadSets" xml:space="preserve">
<value>Configured to use workload sets when installing new manifests.</value>
<comment>{Locked="workload sets"}</comment>
</data>
<data name="WorkloadManifestInstallationConfigurationLooseManifests" xml:space="preserve">
<value>Configured to use loose manifests when installing new manifests.</value>
</data>
<data name="WorkloadManifestPathColumn" xml:space="preserve">
<value>Manifest Path</value>
Expand Down
6 changes: 4 additions & 2 deletions src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,10 @@ internal static void ShowWorkloadsInfo(ParseResult parseResult = null, WorkloadI
void WriteUpdateModeAndAnyError(string indent = "")
{
var useWorkloadSets = InstallStateContents.FromPath(Path.Combine(WorkloadInstallType.GetInstallStateFolder(workloadInfoHelper._currentSdkFeatureBand, workloadInfoHelper.UserLocalPath), "default.json")).ShouldUseWorkloadSets();
var workloadSetsString = useWorkloadSets ? "workload sets" : "loose manifests";
reporter.WriteLine(indent + string.Format(CliCommandStrings.WorkloadManifestInstallationConfiguration, workloadSetsString));
var configurationMessage = useWorkloadSets
? CliCommandStrings.WorkloadManifestInstallationConfigurationWorkloadSets
: CliCommandStrings.WorkloadManifestInstallationConfigurationLooseManifests;
reporter.WriteLine(indent + configurationMessage);

if (!versionInfo.IsInstalled)
{
Expand Down
15 changes: 10 additions & 5 deletions src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading