Skip to content

Commit

Permalink
Remove dotnet workload update --mode <mode>
Browse files Browse the repository at this point in the history
The replacement is `dotnet workload config --update-mode <true|false>`.
  • Loading branch information
dsplaisted committed Mar 27, 2024
1 parent 6bbd2b7 commit d884497
Show file tree
Hide file tree
Showing 31 changed files with 1 addition and 163 deletions.
6 changes: 0 additions & 6 deletions src/Cli/dotnet/commands/InstallingWorkloadCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,6 @@ protected IEnumerable<WorkloadId> GetInstalledWorkloads(bool fromPreviousSdk)

internal static class InstallingWorkloadCommandParser
{
public static readonly CliOption<string> WorkloadSetMode = new("--mode")
{
Description = Strings.WorkloadSetMode,
Hidden = true
};

public static readonly CliOption<string> WorkloadSetVersionOption = new("--version")
{
Description = Strings.WorkloadSetVersionOptionDescription
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,6 @@
<data name="PrintDownloadLinkOnlyDescription" xml:space="preserve">
<value>Only print the list of links to download without downloading.</value>
</data>
<data name="WorkloadSetMode" xml:space="preserve">
<value>Control whether future workload operations should use workload sets or loose manifests.</value>
</data>
<data name="DownloadToCacheOptionDescription" xml:space="preserve">
<value>Download packages needed to install a workload to a folder that can be used for offline installation.</value>
</data>
Expand Down

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

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

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

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

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

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

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

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

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

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

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

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

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

Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,6 @@
<data name="WorkloadUpdateFailed" xml:space="preserve">
<value>Workload update failed: {0}</value>
</data>
<data name="WorkloadSetModeTakesWorkloadSetLooseManifestOrAuto" xml:space="preserve">
<value>Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto".</value>
</data>
<data name="FromPreviousSdkOptionDescription" xml:space="preserve">
<value>Include workloads installed with earlier SDK versions in update.</value>
</data>
Expand All @@ -159,4 +156,4 @@
<data name="UpdateFromRollbackSwitchesModeToLooseManifests" xml:space="preserve">
<value>Updating to a rollback file is not compatible with workload sets. Install and Update will now use loose manifests. To update to a specific workload version, use --version.</value>
</data>
</root>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ internal class WorkloadUpdateCommand : InstallingWorkloadCommand
private readonly bool _adManifestOnlyOption;
private readonly bool _printRollbackDefinitionOnly;
private readonly bool _fromPreviousSdk;
private readonly string _workloadSetMode;

public WorkloadUpdateCommand(
ParseResult parseResult,
IReporter reporter = null,
Expand All @@ -41,7 +39,6 @@ public WorkloadUpdateCommand(
_fromPreviousSdk = parseResult.GetValue(WorkloadUpdateCommandParser.FromPreviousSdkOption);
_adManifestOnlyOption = parseResult.GetValue(WorkloadUpdateCommandParser.AdManifestOnlyOption);
_printRollbackDefinitionOnly = parseResult.GetValue(WorkloadUpdateCommandParser.PrintRollbackOption);
_workloadSetMode = parseResult.GetValue(InstallingWorkloadCommandParser.WorkloadSetMode);

_workloadInstaller = _workloadInstallerFromConstructor ?? WorkloadInstallerFactory.GetWorkloadInstaller(Reporter,
_sdkFeatureBand, _workloadResolver, Verbosity, _userProfileDir, VerifySignatures, PackageDownloader,
Expand Down Expand Up @@ -92,22 +89,6 @@ public override int Execute()
Reporter.WriteLine(workloadSet.ToJson());
Reporter.WriteLine("==workloadRollbackDefinitionJsonOutputEnd==");
}
else if (!string.IsNullOrWhiteSpace(_workloadSetMode))
{
if (_workloadSetMode.Equals("workloadset", StringComparison.OrdinalIgnoreCase))
{
_workloadInstaller.UpdateInstallMode(_sdkFeatureBand, true);
}
else if (_workloadSetMode.Equals("loosemanifest", StringComparison.OrdinalIgnoreCase) ||
_workloadSetMode.Equals("auto", StringComparison.OrdinalIgnoreCase))
{
_workloadInstaller.UpdateInstallMode(_sdkFeatureBand, false);
}
else
{
throw new GracefulException(string.Format(LocalizableStrings.WorkloadSetModeTakesWorkloadSetLooseManifestOrAuto, _workloadSetMode), isUserError: true);
}
}
else
{
try
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ private static CliCommand ConstructCommand()
command.Options.Add(CommonOptions.VerbosityOption);
command.Options.Add(PrintRollbackOption);
command.Options.Add(WorkloadInstallCommandParser.SkipSignCheckOption);
command.Options.Add(InstallingWorkloadCommandParser.WorkloadSetMode);

command.SetAction((parseResult) => new WorkloadUpdateCommand(parseResult).Execute());

Expand Down

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

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

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

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

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

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

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

Loading

0 comments on commit d884497

Please sign in to comment.