Skip to content

Commit b648857

Browse files
authored
Update CLI options and help text (#335)
* Add target argument * Add TARGET argument * Add not for list by now * Update LocalizableStrings * Update --all description * Remove target from options (?) * Restore xlf translation * Show bundle types in <TARGET> argument * Update help link format * Restore CommandLine Arguments * Add --arm64 option * Fix archSelection.HasFlag
1 parent 9823503 commit b648857

17 files changed

+219
-59
lines changed

src/dotnet-core-uninstall/LocalizableStrings.Designer.cs

Lines changed: 20 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/dotnet-core-uninstall/LocalizableStrings.resx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,10 +353,10 @@ This tool cannot uninstall versions of the runtime or SDK that are installed usi
353353
</value>
354354
</data>
355355
<data name="HelpExplanationParagraphMac" xml:space="preserve">
356-
<value>(*) By default, SDKs and Runtimes that have a high probability of being used by Visual Studio for Mac or SDKs are not removed. To remove these, specify them individually or use --force. If removing SDKs or Runtimes causes issues with your installation of Visual Studio for Mac, run “Repair”. SDKs and Runtimes are available for download at aka.ms/dotnet-core-download.</value>
356+
<value>(*) By default, SDKs and Runtimes that have a high probability of being used by Visual Studio for Mac or SDKs are not removed. To remove these, specify them individually or use --force. If removing SDKs or Runtimes causes issues with your installation of Visual Studio for Mac, run “Repair”. SDKs and Runtimes are available for download at https://aka.ms/dotnet-core-download.</value>
357357
</data>
358358
<data name="HelpExplanationParagraphWindows" xml:space="preserve">
359-
<value>(*) By default, SDKs and Runtimes that have a high probability of being used by Visual Studio are not removed. To remove these, specify them individually or use --force. If removing SDKs or Runtimes causes issues with your installation of Visual Studio, run “Repair”. SDKs and Runtimes are available for download at aka.ms/dotnet-core-download.</value>
359+
<value>(*) By default, SDKs and Runtimes that have a high probability of being used by Visual Studio are not removed. To remove these, specify them individually or use --force. If removing SDKs or Runtimes causes issues with your installation of Visual Studio, run “Repair”. SDKs and Runtimes are available for download at https://aka.ms/dotnet-core-download.</value>
360360
</data>
361361
<data name="MacConfirmationPromptOutputFormat" xml:space="preserve">
362362
<value>The following items will be removed:
@@ -390,4 +390,10 @@ Warning: {0}: {1}
390390
Uninstalling this item will cause Visual Studio for to break.
391391
</value>
392392
</data>
393+
<data name="ListArm64OptionDescription" xml:space="preserve">
394+
<value>List arm64 .NET Core SDKs or Runtimes.</value>
395+
</data>
396+
<data name="UninstallArm64OptionDescription" xml:space="preserve">
397+
<value>Can be used with --sdk, --runtime and --aspnet-runtime to remove arm64.</value>
398+
</data>
393399
</root>

src/dotnet-core-uninstall/Shared/BundleInfo/BundleArch.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ internal enum BundleArch
1010
{
1111
X86 = 0x1,
1212
X64 = 0x2,
13-
Arm64 = 0x3
13+
Arm64 = 0x4
1414
}
1515
}

src/dotnet-core-uninstall/Shared/Configs/CommandLineConfigs.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ internal static class CommandLineConfigs
122122
$"--{X86OptionName}",
123123
LocalizableStrings.ListX86OptionDescription);
124124

125+
public static readonly Option ListArm64Option = new Option(
126+
$"--{Arm64OptionName}",
127+
LocalizableStrings.ListArm64OptionDescription);
128+
125129
public static readonly Command VersionSubcommand = new Command("--version")
126130
{
127131
IsHidden = true
@@ -167,7 +171,8 @@ internal static class CommandLineConfigs
167171
public static readonly Option[] ArchUninstallOptions = new Option[]
168172
{
169173
new Option($"--{X64OptionName}", LocalizableStrings.UninstallX64OptionDescription),
170-
new Option($"--{X86OptionName}", LocalizableStrings.UninstallX86OptionDescription)
174+
new Option($"--{X86OptionName}", LocalizableStrings.UninstallX86OptionDescription),
175+
new Option($"--{Arm64OptionName}", LocalizableStrings.UninstallArm64OptionDescription)
171176
};
172177

173178
public static readonly Option[] AdditionalUninstallOptions = new Option[]
@@ -244,7 +249,8 @@ static CommandLineConfigs()
244249
{
245250
ListAuxOptions = ListAuxOptions
246251
.Append(ListX64Option)
247-
.Append(ListX86Option);
252+
.Append(ListX86Option)
253+
.Append(ListArm64Option);
248254
}
249255
AssignOptionsToCommand(ListCommand, ListAuxOptions);
250256

src/dotnet-core-uninstall/xlf/LocalizableStrings.cs.xlf

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/dotnet-core-uninstall/xlf/LocalizableStrings.de.xlf

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)