Skip to content
Merged
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
22 changes: 20 additions & 2 deletions src/dotnet-core-uninstall/LocalizableStrings.Designer.cs

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

10 changes: 8 additions & 2 deletions src/dotnet-core-uninstall/LocalizableStrings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,10 @@ This tool cannot uninstall versions of the runtime or SDK that are installed usi
</value>
</data>
<data name="HelpExplanationParagraphMac" xml:space="preserve">
<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>
<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>
</data>
<data name="HelpExplanationParagraphWindows" xml:space="preserve">
<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>
<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>
</data>
<data name="MacConfirmationPromptOutputFormat" xml:space="preserve">
<value>The following items will be removed:
Expand Down Expand Up @@ -390,4 +390,10 @@ Warning: {0}: {1}
Uninstalling this item will cause Visual Studio for to break.
</value>
</data>
<data name="ListArm64OptionDescription" xml:space="preserve">
<value>List arm64 .NET Core SDKs or Runtimes.</value>
</data>
<data name="UninstallArm64OptionDescription" xml:space="preserve">
<value>Can be used with --sdk, --runtime and --aspnet-runtime to remove arm64.</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/dotnet-core-uninstall/Shared/BundleInfo/BundleArch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ internal enum BundleArch
{
X86 = 0x1,
X64 = 0x2,
Arm64 = 0x3
Arm64 = 0x4
}
}
10 changes: 8 additions & 2 deletions src/dotnet-core-uninstall/Shared/Configs/CommandLineConfigs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ internal static class CommandLineConfigs
$"--{X86OptionName}",
LocalizableStrings.ListX86OptionDescription);

public static readonly Option ListArm64Option = new Option(
$"--{Arm64OptionName}",
LocalizableStrings.ListArm64OptionDescription);

public static readonly Command VersionSubcommand = new Command("--version")
{
IsHidden = true
Expand Down Expand Up @@ -167,7 +171,8 @@ internal static class CommandLineConfigs
public static readonly Option[] ArchUninstallOptions = new Option[]
{
new Option($"--{X64OptionName}", LocalizableStrings.UninstallX64OptionDescription),
new Option($"--{X86OptionName}", LocalizableStrings.UninstallX86OptionDescription)
new Option($"--{X86OptionName}", LocalizableStrings.UninstallX86OptionDescription),
new Option($"--{Arm64OptionName}", LocalizableStrings.UninstallArm64OptionDescription)
};

public static readonly Option[] AdditionalUninstallOptions = new Option[]
Expand Down Expand Up @@ -244,7 +249,8 @@ static CommandLineConfigs()
{
ListAuxOptions = ListAuxOptions
.Append(ListX64Option)
.Append(ListX86Option);
.Append(ListX86Option)
.Append(ListArm64Option);
}
AssignOptionsToCommand(ListCommand, ListAuxOptions);

Expand Down
18 changes: 14 additions & 4 deletions src/dotnet-core-uninstall/xlf/LocalizableStrings.cs.xlf

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

18 changes: 14 additions & 4 deletions src/dotnet-core-uninstall/xlf/LocalizableStrings.de.xlf

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

Loading