From fe6d6fa95ef84411cbc245fa92e1e219a8565778 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 19 Mar 2018 12:31:16 -0700 Subject: [PATCH 01/14] Generate Microsoft.NETCoreSdk.BundledCliTools.props --- build/BundledDotnetTools.props | 6 ++-- build/MSBuildExtensions.targets | 50 ++++++++++++++++++++++++++++----- 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/build/BundledDotnetTools.props b/build/BundledDotnetTools.props index e64552ab0..29c483c57 100644 --- a/build/BundledDotnetTools.props +++ b/build/BundledDotnetTools.props @@ -1,8 +1,8 @@ - - - + + + diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index c6ce9ae6b..09324294e 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -1,9 +1,11 @@ + + + DependsOnTargets="GenerateBundledVersionsProps;GenerateBundledCliToolsProps;RestoreMSBuildExtensionsPackages"> - + @@ -11,19 +13,19 @@ from that package under the net461, net462, etc folders. That is because they come from the NETStandard.Library.NETFramework package, and we want to insert them directly into the CLI from CoreFx instead of having to do a two-hop insertion (CoreFX -> SDK -> CLI) if we need to update them. - + https://github.com/dotnet/sdk/issues/1324 has been filed to exclude these from the Microsoft.NET.Build.Extensions package when we generate it. --> - + - + @@ -68,7 +70,7 @@ - + CLIBuildDll=$(CLIBuildDll); @@ -91,7 +93,7 @@ Microsoft.NETCoreSdk.BundledVersions.props - + + +@(BundledDotnetTools->HasMetadata('ObsoletesCliTool')->' %3CBundledDotNetCliToolReference Include="%(ObsoletesCliTool)" /%3E','%0A') + + +]]> + + + + + + From ba8e18dac7dd9af87666ff3af878e083070ee11b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 8 Mar 2018 15:50:33 -0800 Subject: [PATCH 02/14] Fix #4139 - escape quoted strings for process start --- .../ArgumentEscaper.cs | 6 ----- .../WindowsExePreferredCommandSpecFactory.cs | 3 ++- .../ArgumentEscaperTests.cs | 25 +++++++++++++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 test/Microsoft.DotNet.Cli.Utils.Tests/ArgumentEscaperTests.cs diff --git a/src/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs b/src/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs index 79ab2aa1c..afaa58d48 100644 --- a/src/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs +++ b/src/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs @@ -185,12 +185,6 @@ namespace Microsoft.DotNet.Cli.Utils internal static bool ShouldSurroundWithQuotes(string argument) { - // Don't quote already quoted strings - if (IsSurroundedWithQuotes(argument)) - { - return false; - } - // Only quote if whitespace exists in the string return ArgumentContainsWhitespace(argument); } diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/WindowsExePreferredCommandSpecFactory.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/WindowsExePreferredCommandSpecFactory.cs index 7815c77f0..4c5940c7a 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/WindowsExePreferredCommandSpecFactory.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/WindowsExePreferredCommandSpecFactory.cs @@ -63,7 +63,8 @@ namespace Microsoft.DotNet.Cli.Utils var cmdEscapedArgs = ArgumentEscaper.EscapeAndConcatenateArgArrayForCmdProcessStart(args); - if (ArgumentEscaper.ShouldSurroundWithQuotes(command)) + if (!ArgumentEscaper.IsSurroundedWithQuotes(command) // Don't quote already quoted strings + && ArgumentEscaper.ShouldSurroundWithQuotes(command)) { command = $"\"{command}\""; } diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/ArgumentEscaperTests.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/ArgumentEscaperTests.cs new file mode 100644 index 000000000..92ae9df36 --- /dev/null +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/ArgumentEscaperTests.cs @@ -0,0 +1,25 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using Xunit; + +namespace Microsoft.DotNet.Cli.Utils.Tests +{ + public class ArgumentEscaperTests + { + [Theory] + [InlineData(new[] { "one", "two", "three" }, "one two three")] + [InlineData(new[] { "line1\nline2", "word1\tword2" }, "\"line1\nline2\" \"word1\tword2\"")] + [InlineData(new[] { "with spaces" }, "\"with spaces\"")] + [InlineData(new[] { @"with\backslash" }, @"with\backslash")] + [InlineData(new[] { @"""quotedwith\backslash""" }, @"\""quotedwith\backslash\""")] + [InlineData(new[] { @"C:\Users\" }, @"C:\Users\")] + [InlineData(new[] { @"C:\Program Files\dotnet\" }, @"""C:\Program Files\dotnet\\""")] + [InlineData(new[] { @"backslash\""preceedingquote" }, @"backslash\\\""preceedingquote")] + [InlineData(new[] { @""" hello """ }, @"""\"" hello \""""")] + public void EscapesArgumentsForProcessStart(string[] args, string expected) + { + Assert.Equal(expected, ArgumentEscaper.EscapeAndConcatenateArgArrayForProcessStart(args)); + } + } +} From 3ce2d4da0feed50080c480e070d564fd3158d285 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Thu, 15 Mar 2018 14:40:10 -0700 Subject: [PATCH 03/14] Fix list tool command tests to be localizable. Currently the list tool command tests, while localizing the column headers, didn't properly take into account the fact that localized builds might produce strings longer than the English versions of the column header strings. This results in a mismatch of the actual from the expected due to additional column padding. The fix is to stop using a static expected table and do a simple calculation of the expected table based on the length of the localized strings. Fixes issue related to PR #8799. --- src/dotnet/PrintableTable.cs | 2 +- .../dotnet-list-tool/ListToolCommand.cs | 8 +- .../CommandTests/ListToolCommandTests.cs | 116 ++++++++++-------- 3 files changed, 70 insertions(+), 56 deletions(-) diff --git a/src/dotnet/PrintableTable.cs b/src/dotnet/PrintableTable.cs index ce31e13cc..f5a0afd58 100644 --- a/src/dotnet/PrintableTable.cs +++ b/src/dotnet/PrintableTable.cs @@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Cli // Represents a table (with rows of type T) that can be printed to a terminal. internal class PrintableTable { - private const string ColumnDelimiter = " "; + public const string ColumnDelimiter = " "; private List _columns = new List(); private class Column diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs b/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs index b567ac74d..2c3608d3c 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs @@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Tools.List.Tool { internal class ListToolCommand : CommandBase { - private const string CommandDelimiter = ", "; + public const string CommandDelimiter = ", "; private readonly AppliedOption _options; private readonly IToolPackageStore _toolPackageStore; private readonly IReporter _reporter; @@ -66,20 +66,20 @@ namespace Microsoft.DotNet.Tools.List.Tool .ToArray(); } - private bool PackageHasCommands(IToolPackage p) + private bool PackageHasCommands(IToolPackage package) { try { // Attempt to read the commands collection // If it fails, print a warning and treat as no commands - return p.Commands.Count >= 0; + return package.Commands.Count >= 0; } catch (Exception ex) when (ex is ToolConfigurationException) { _errorReporter.WriteLine( string.Format( LocalizableStrings.InvalidPackageWarning, - p.Id, + package.Id, ex.Message).Yellow()); return false; } diff --git a/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs b/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs index 3b764abb4..c378e0803 100644 --- a/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs @@ -62,14 +62,7 @@ namespace Microsoft.DotNet.Tests.Commands command.Execute().Should().Be(0); - _reporter.Lines.Should().Equal( - string.Format( - "{0} {1} {2}", - LocalizableStrings.PackageIdColumn, - LocalizableStrings.VersionColumn, - LocalizableStrings.CommandsColumn - ), - "-------------------------------------"); + _reporter.Lines.Should().Equal(EnumerateExpectedTableLines(store.Object)); } [Fact] @@ -92,15 +85,7 @@ namespace Microsoft.DotNet.Tests.Commands command.Execute().Should().Be(0); - _reporter.Lines.Should().Equal( - string.Format( - "{0} {1} {2}", - LocalizableStrings.PackageIdColumn, - LocalizableStrings.VersionColumn, - LocalizableStrings.CommandsColumn - ), - "-------------------------------------------", - "test.tool 1.3.5-preview foo "); + _reporter.Lines.Should().Equal(EnumerateExpectedTableLines(store.Object)); } [Fact] @@ -137,17 +122,7 @@ namespace Microsoft.DotNet.Tests.Commands command.Execute().Should().Be(0); - _reporter.Lines.Should().Equal( - string.Format( - "{0} {1} {2} ", - LocalizableStrings.PackageIdColumn, - LocalizableStrings.VersionColumn, - LocalizableStrings.CommandsColumn - ), - "----------------------------------------------", - "another.tool 2.7.3 bar ", - "some.tool 1.0.0 fancy-foo", - "test.tool 1.3.5-preview foo "); + _reporter.Lines.Should().Equal(EnumerateExpectedTableLines(store.Object)); } [Fact] @@ -172,15 +147,7 @@ namespace Microsoft.DotNet.Tests.Commands command.Execute().Should().Be(0); - _reporter.Lines.Should().Equal( - string.Format( - "{0} {1} {2} ", - LocalizableStrings.PackageIdColumn, - LocalizableStrings.VersionColumn, - LocalizableStrings.CommandsColumn - ), - "------------------------------------------------", - "test.tool 1.3.5-preview foo, bar, baz"); + _reporter.Lines.Should().Equal(EnumerateExpectedTableLines(store.Object)); } [Fact] @@ -212,20 +179,11 @@ namespace Microsoft.DotNet.Tests.Commands command.Execute().Should().Be(0); _reporter.Lines.Should().Equal( - string.Format( - LocalizableStrings.InvalidPackageWarning, - "another.tool", - "broken" - ).Yellow(), - string.Format( - "{0} {1} {2} ", - LocalizableStrings.PackageIdColumn, - LocalizableStrings.VersionColumn, - LocalizableStrings.CommandsColumn - ), - "--------------------------------------------", - "some.tool 1.0.0 fancy-foo", - "test.tool 1.3.5-preview foo "); + EnumerateExpectedTableLines(store.Object).Prepend( + string.Format( + LocalizableStrings.InvalidPackageWarning, + "another.tool", + "broken").Yellow())); } private IToolPackage CreateMockToolPackage(string id, string version, IReadOnlyList commands) @@ -257,5 +215,61 @@ namespace Microsoft.DotNet.Tests.Commands store, _reporter); } + + private IEnumerable EnumerateExpectedTableLines(IToolPackageStore store) + { + string GetCommandsString(IToolPackage package) + { + return string.Join(ListToolCommand.CommandDelimiter, package.Commands.Select(c => c.Name)); + } + + var packages = store.EnumeratePackages().Where(PackageHasCommands).OrderBy(package => package.Id); + var columnDelimiter = PrintableTable.ColumnDelimiter; + + int packageIdColumnWidth = LocalizableStrings.PackageIdColumn.Length; + int versionColumnWidth = LocalizableStrings.VersionColumn.Length; + int commandsColumnWidth = LocalizableStrings.CommandsColumn.Length; + foreach (var package in packages) + { + packageIdColumnWidth = Math.Max(packageIdColumnWidth, package.Id.ToString().Length); + versionColumnWidth = Math.Max(versionColumnWidth, package.Version.ToNormalizedString().Length); + commandsColumnWidth = Math.Max(commandsColumnWidth, GetCommandsString(package).Length); + } + + yield return string.Format( + "{0}{1}{2}{3}{4}", + LocalizableStrings.PackageIdColumn.PadRight(packageIdColumnWidth), + columnDelimiter, + LocalizableStrings.VersionColumn.PadRight(versionColumnWidth), + columnDelimiter, + LocalizableStrings.CommandsColumn.PadRight(commandsColumnWidth)); + + yield return new string( + '-', + packageIdColumnWidth + versionColumnWidth + commandsColumnWidth + (columnDelimiter.Length * 2)); + + foreach (var package in packages) + { + yield return string.Format( + "{0}{1}{2}{3}{4}", + package.Id.ToString().PadRight(packageIdColumnWidth), + columnDelimiter, + package.Version.ToNormalizedString().PadRight(versionColumnWidth), + columnDelimiter, + GetCommandsString(package).PadRight(commandsColumnWidth)); + } + } + + private static bool PackageHasCommands(IToolPackage package) + { + try + { + return package.Commands.Count >= 0; + } + catch (Exception ex) when (ex is ToolConfigurationException) + { + return false; + } + } } } From cee0a3baa7fe1610370e184dc8e21f91db13e2a9 Mon Sep 17 00:00:00 2001 From: William Lee Date: Fri, 16 Mar 2018 17:00:14 -0700 Subject: [PATCH 04/14] Better using facing string (#8809) Fix #8728 Fix #8369 --- src/dotnet/CommonLocalizableStrings.resx | 2 +- .../dotnet-install-tool/LocalizableStrings.resx | 8 ++++---- .../xlf/LocalizableStrings.cs.xlf | 14 +++++++------- .../xlf/LocalizableStrings.de.xlf | 14 +++++++------- .../xlf/LocalizableStrings.es.xlf | 14 +++++++------- .../xlf/LocalizableStrings.fr.xlf | 14 +++++++------- .../xlf/LocalizableStrings.it.xlf | 14 +++++++------- .../xlf/LocalizableStrings.ja.xlf | 14 +++++++------- .../xlf/LocalizableStrings.ko.xlf | 14 +++++++------- .../xlf/LocalizableStrings.pl.xlf | 14 +++++++------- .../xlf/LocalizableStrings.pt-BR.xlf | 14 +++++++------- .../xlf/LocalizableStrings.ru.xlf | 14 +++++++------- .../xlf/LocalizableStrings.tr.xlf | 14 +++++++------- .../xlf/LocalizableStrings.zh-Hans.xlf | 14 +++++++------- .../xlf/LocalizableStrings.zh-Hant.xlf | 14 +++++++------- .../dotnet-uninstall/tool/LocalizableStrings.resx | 8 ++++---- .../tool/xlf/LocalizableStrings.cs.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.de.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.es.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.fr.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.it.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.ja.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.ko.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.pl.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.pt-BR.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.ru.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.tr.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.zh-Hans.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.zh-Hant.xlf | 12 ++++++------ src/dotnet/xlf/CommonLocalizableStrings.cs.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.de.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.es.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.fr.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.it.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.ja.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.ko.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.pl.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.ru.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.tr.xlf | 4 ++-- .../xlf/CommonLocalizableStrings.zh-Hans.xlf | 4 ++-- .../xlf/CommonLocalizableStrings.zh-Hant.xlf | 4 ++-- 42 files changed, 204 insertions(+), 204 deletions(-) diff --git a/src/dotnet/CommonLocalizableStrings.resx b/src/dotnet/CommonLocalizableStrings.resx index ad40ada4d..4215d718e 100644 --- a/src/dotnet/CommonLocalizableStrings.resx +++ b/src/dotnet/CommonLocalizableStrings.resx @@ -626,6 +626,6 @@ setx PATH "%PATH%;{0}" Column maximum width must be greater than zero. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/LocalizableStrings.resx b/src/dotnet/commands/dotnet-install/dotnet-install-tool/LocalizableStrings.resx index d74dda56e..c970ea1cf 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/LocalizableStrings.resx @@ -148,7 +148,7 @@ NuGet configuration file '{0}' does not exist. - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. @@ -179,12 +179,12 @@ Tool '{1}' (version '{2}') was successfully installed. Specified version '{0}' is not a valid NuGet version range. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf index 035aa553e..134946337 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf @@ -3,7 +3,7 @@ - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. Instalace byla úspěšná. Pokud nejsou další pokyny, můžete přímo do jádra napsat následující příkaz k vyvolání: {0} @@ -95,18 +95,18 @@ Instalace byla úspěšná. Pokud nejsou další pokyny, můžete přímo do já - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool - Location of shim to access tool + Location where the tool will be installed. + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf index 5830c4aa3..d6f547d27 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf @@ -3,7 +3,7 @@ - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. Die Installation war erfolgreich. Sofern keine weiteren Anweisungen vorliegen, können Sie für den Aufruf den folgenden Befehl direkt in der Shell eingeben: {0} @@ -95,18 +95,18 @@ Die Installation war erfolgreich. Sofern keine weiteren Anweisungen vorliegen, k - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool - Location of shim to access tool + Location where the tool will be installed. + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf index d4c2b4d8a..e612badc9 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf @@ -3,7 +3,7 @@ - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. La instalación se completó correctamente. Si no hay más instrucciones, puede escribir el comando siguiente en el shell directamente para invocar: {0} @@ -95,18 +95,18 @@ La instalación se completó correctamente. Si no hay más instrucciones, puede - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool - Location of shim to access tool + Location where the tool will be installed. + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf index 067258b75..608b781d5 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf @@ -3,7 +3,7 @@ - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. L'installation a réussi. En l'absence d'instructions supplémentaires, vous pouvez taper directement la commande suivante dans l'interpréteur de commandes pour appeler : {0} @@ -95,18 +95,18 @@ L'installation a réussi. En l'absence d'instructions supplémentaires, vous pou - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool - Location of shim to access tool + Location where the tool will be installed. + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf index 70816d492..c9dee5ae6 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf @@ -3,7 +3,7 @@ - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. L'installazione è riuscita. Se non ci sono altre istruzioni, è possibile digitare direttamente nella shell il comando seguente da richiamare: {0} @@ -95,18 +95,18 @@ L'installazione è riuscita. Se non ci sono altre istruzioni, è possibile digit - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool - Location of shim to access tool + Location where the tool will be installed. + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf index 8aec5915e..3c98e1cda 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf @@ -3,7 +3,7 @@ - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. インストールは成功しました。追加の指示がなければ、シェルに次のコマンドを直接入力して呼び出すことができます: {0} @@ -95,18 +95,18 @@ Tool '{1}' (version '{2}') was successfully installed. - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool - Location of shim to access tool + Location where the tool will be installed. + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf index 18a1f09a8..0dad643ad 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf @@ -3,7 +3,7 @@ - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. 설치했습니다. 추가 지침이 없는 경우 셸에 다음 명령을 직접 입력하여 {0}을(를) 호출할 수 있습니다. @@ -95,18 +95,18 @@ Tool '{1}' (version '{2}') was successfully installed. - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool - Location of shim to access tool + Location where the tool will be installed. + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf index d8dcac491..e0d1029b7 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf @@ -3,7 +3,7 @@ - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. Instalacja powiodła się. Jeśli nie ma dodatkowych instrukcji, możesz wpisać następujące polecenie bezpośrednio w powłoce, aby wywołać: {0} @@ -95,18 +95,18 @@ Instalacja powiodła się. Jeśli nie ma dodatkowych instrukcji, możesz wpisać - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool - Location of shim to access tool + Location where the tool will be installed. + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf index def0a0021..13c433f6d 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf @@ -3,7 +3,7 @@ - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. A instalação foi bem-sucedida. Se não houver outras instruções, digite o seguinte comando no shell diretamente para invocar: {0} @@ -95,18 +95,18 @@ A instalação foi bem-sucedida. Se não houver outras instruções, digite o se - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool - Location of shim to access tool + Location where the tool will be installed. + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf index 2365e75c2..b3834143d 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf @@ -3,7 +3,7 @@ - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. Установка завершена. Если других действий не требуется, вы можете непосредственно в оболочке ввести для вызова следующую команду: {0}. @@ -95,18 +95,18 @@ Tool '{1}' (version '{2}') was successfully installed. - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool - Location of shim to access tool + Location where the tool will be installed. + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf index 481e356cf..c8f12507e 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf @@ -3,7 +3,7 @@ - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. Yükleme başarılı oldu. Daha fazla yönerge yoksa, çağırmak için şu komutu doğrudan kabuğa yazabilirsiniz: {0} @@ -95,18 +95,18 @@ Yükleme başarılı oldu. Daha fazla yönerge yoksa, çağırmak için şu komu - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool - Location of shim to access tool + Location where the tool will be installed. + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf index b522b0202..8c62d691b 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf @@ -3,7 +3,7 @@ - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. 安装成功。如果没有进一步的说明，则可直接在 shell 中键入以下命令进行调用: {0} @@ -95,18 +95,18 @@ Tool '{1}' (version '{2}') was successfully installed. - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool - Location of shim to access tool + Location where the tool will be installed. + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf index 299606dff..5c539520d 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf @@ -3,7 +3,7 @@ - If there were no additional instructions, you can type the following command to invoke the tool: {0} + You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. 安裝已成功。如果沒有進一步指示，您可以直接在命令介面中鍵入下列命令，以叫用: {0} @@ -95,18 +95,18 @@ Tool '{1}' (version '{2}') was successfully installed. - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Cannot have global and tool-path as opinion at the same time. - Cannot have global and tool-path as opinion at the same time. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - Location of shim to access tool - Location of shim to access tool + Location where the tool will be installed. + Location where the tool will be installed. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/LocalizableStrings.resx b/src/dotnet/commands/dotnet-uninstall/tool/LocalizableStrings.resx index 83309121e..a077fd0f8 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-uninstall/tool/LocalizableStrings.resx @@ -145,12 +145,12 @@ Failed to uninstall tool '{0}': {1} - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - \ No newline at end of file + diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf index c45412a8e..aa0dbd5c0 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool - Location of shim to access tool + Location where the tool was previously installed. + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf index b7d0fef06..ce478ca79 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool - Location of shim to access tool + Location where the tool was previously installed. + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf index 0f0884a52..a7985e0ef 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool - Location of shim to access tool + Location where the tool was previously installed. + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf index bbc1608da..a8dbbe714 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool - Location of shim to access tool + Location where the tool was previously installed. + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf index 28354ec20..8cbd2a85a 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool - Location of shim to access tool + Location where the tool was previously installed. + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf index cf28053cb..aa3bcf05f 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool - Location of shim to access tool + Location where the tool was previously installed. + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf index b2cc666d5..9e4a118c3 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool - Location of shim to access tool + Location where the tool was previously installed. + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf index 552aaeda3..d0a2b491e 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool - Location of shim to access tool + Location where the tool was previously installed. + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf index d7093abd1..d95633b58 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool - Location of shim to access tool + Location where the tool was previously installed. + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf index 7215ef17a..cb08d5d10 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool - Location of shim to access tool + Location where the tool was previously installed. + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf index 56e68b543..03e2c1067 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool - Location of shim to access tool + Location where the tool was previously installed. + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf index 04cae1765..41dbe4f97 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool - Location of shim to access tool + Location where the tool was previously installed. + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf index c59aef876..ae1d252ff 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Need either global or tool-path provided. + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). - Location of shim to access tool - Location of shim to access tool + Location where the tool was previously installed. + Location where the tool was previously installed. - Cannot have global and tool-path as opinion at the same time." - Cannot have global and tool-path as opinion at the same time." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf index f464118ce..69fc6689f 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). + The command name '{0}' cannot begin with a leading dot (.). diff --git a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf index cae4ffe72..e9c8b2940 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). + The command name '{0}' cannot begin with a leading dot (.). diff --git a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf index 55e770628..943149e15 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). + The command name '{0}' cannot begin with a leading dot (.). diff --git a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf index 5d7e2755f..2baa03033 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). + The command name '{0}' cannot begin with a leading dot (.). diff --git a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf index 28d31da38..2a4ac595d 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). + The command name '{0}' cannot begin with a leading dot (.). diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf index 46d5302b0..0f6e00cc5 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). + The command name '{0}' cannot begin with a leading dot (.). diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf index 470eb0bc5..4567204f2 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). + The command name '{0}' cannot begin with a leading dot (.). diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf index 889ec7173..51754421e 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). + The command name '{0}' cannot begin with a leading dot (.). diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf index 7d9b411ff..c9fbe6480 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). + The command name '{0}' cannot begin with a leading dot (.). diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf index 7ecf75ccc..f66a3168f 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). + The command name '{0}' cannot begin with a leading dot (.). diff --git a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf index b633fd9cd..daaf80c22 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). + The command name '{0}' cannot begin with a leading dot (.). diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf index 11fef08ba..f7a36eb48 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). + The command name '{0}' cannot begin with a leading dot (.). diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf index 413d99070..544d6aa66 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Command '{0}' has a leading dot. + The command name '{0}' cannot begin with a leading dot (.). + The command name '{0}' cannot begin with a leading dot (.). From 4f8ac7dce5536698b2435e01b31270ca6bfdb4b4 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Fri, 16 Mar 2018 19:47:34 -0700 Subject: [PATCH 05/14] Ensure tool package store root is a full path. This commit fixes the tool package store such that it stores a full path instead of, potentially, a relative path. This prevents a relative path from inadvertently being passed to NuGet during the restore and causing it to restore relative to the temp project directory. Fixes #8829. --- src/dotnet/ToolPackage/ToolPackageStore.cs | 2 +- .../ToolPackageInstallerTests.cs | 4 +++- .../ToolPackageStoreMock.cs | 2 +- test/dotnet.Tests/CommandTests/UninstallToolCommandTests.cs | 6 ++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/dotnet/ToolPackage/ToolPackageStore.cs b/src/dotnet/ToolPackage/ToolPackageStore.cs index f424b6062..24ec84289 100644 --- a/src/dotnet/ToolPackage/ToolPackageStore.cs +++ b/src/dotnet/ToolPackage/ToolPackageStore.cs @@ -14,7 +14,7 @@ namespace Microsoft.DotNet.ToolPackage public ToolPackageStore(DirectoryPath root) { - Root = root; + Root = new DirectoryPath(Path.GetFullPath(root.Value)); } public DirectoryPath Root { get; private set; } diff --git a/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs b/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs index b8def9296..848849ba4 100644 --- a/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs +++ b/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs @@ -685,7 +685,7 @@ namespace Microsoft.DotNet.ToolPackage.Tests FilePath? tempProject = null, DirectoryPath? offlineFeed = null) { - var root = new DirectoryPath(Path.Combine(Path.GetFullPath(TempRoot.Root), Path.GetRandomFileName())); + var root = new DirectoryPath(Path.Combine(TempRoot.Root, Path.GetRandomFileName())); var reporter = new BufferedReporter(); IFileSystem fileSystem; @@ -714,6 +714,8 @@ namespace Microsoft.DotNet.ToolPackage.Tests offlineFeed: offlineFeed ?? new DirectoryPath("does not exist")); } + store.Root.Value.Should().Be(Path.GetFullPath(root.Value)); + return (store, installer, reporter, fileSystem); } diff --git a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageStoreMock.cs b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageStoreMock.cs index e8219560c..43203a635 100644 --- a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageStoreMock.cs +++ b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageStoreMock.cs @@ -22,7 +22,7 @@ namespace Microsoft.DotNet.Tools.Tests.ComponentMocks IFileSystem fileSystem, Action uninstallCallback = null) { - Root = root; + Root = new DirectoryPath(Path.GetFullPath(root.Value)); _fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem)); _uninstallCallback = uninstallCallback; } diff --git a/test/dotnet.Tests/CommandTests/UninstallToolCommandTests.cs b/test/dotnet.Tests/CommandTests/UninstallToolCommandTests.cs index 813a70ec4..4707f8e1c 100644 --- a/test/dotnet.Tests/CommandTests/UninstallToolCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/UninstallToolCommandTests.cs @@ -73,7 +73,8 @@ namespace Microsoft.DotNet.Tests.Commands PackageId, PackageVersion)); - var packageDirectory = new DirectoryPath(ToolsDirectory).WithSubDirectories(PackageId, PackageVersion); + var packageDirectory = new DirectoryPath(Path.GetFullPath(ToolsDirectory)) + .WithSubDirectories(PackageId, PackageVersion); var shimPath = Path.Combine( ShimsDirectory, ProjectRestorerMock.FakeCommandName + @@ -114,7 +115,8 @@ namespace Microsoft.DotNet.Tests.Commands PackageId, PackageVersion)); - var packageDirectory = new DirectoryPath(ToolsDirectory).WithSubDirectories(PackageId, PackageVersion); + var packageDirectory = new DirectoryPath(Path.GetFullPath(ToolsDirectory)) + .WithSubDirectories(PackageId, PackageVersion); var shimPath = Path.Combine( ShimsDirectory, ProjectRestorerMock.FakeCommandName + From 60d71618becd1b1aa4638e436739e833108a537a Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Fri, 16 Mar 2018 14:56:24 -0700 Subject: [PATCH 06/14] Implement the --tool-path option for the list tool command. This commit implements the missing `--tool-path` option for the list tool command. This enables the command to list locally installed tools. Fixes #8803. --- .../dotnet-list-tool/ListToolCommand.cs | 33 ++++++++---- .../dotnet-list-tool/ListToolCommandParser.cs | 4 ++ .../dotnet-list-tool/LocalizableStrings.resx | 10 +++- .../xlf/LocalizableStrings.cs.xlf | 20 +++++-- .../xlf/LocalizableStrings.de.xlf | 20 +++++-- .../xlf/LocalizableStrings.es.xlf | 20 +++++-- .../xlf/LocalizableStrings.fr.xlf | 20 +++++-- .../xlf/LocalizableStrings.it.xlf | 20 +++++-- .../xlf/LocalizableStrings.ja.xlf | 20 +++++-- .../xlf/LocalizableStrings.ko.xlf | 20 +++++-- .../xlf/LocalizableStrings.pl.xlf | 20 +++++-- .../xlf/LocalizableStrings.pt-BR.xlf | 20 +++++-- .../xlf/LocalizableStrings.ru.xlf | 20 +++++-- .../xlf/LocalizableStrings.tr.xlf | 20 +++++-- .../xlf/LocalizableStrings.zh-Hans.xlf | 20 +++++-- .../xlf/LocalizableStrings.zh-Hant.xlf | 20 +++++-- .../tool/UninstallToolCommand.cs | 8 +-- .../CommandTests/ListToolCommandTests.cs | 54 +++++++++++++++++-- .../ParserTests/InstallToolParserTests.cs | 4 +- .../ParserTests/ListToolParserTests.cs | 42 +++++++++++++++ ...erTests.cs => UninstallToolParserTests.cs} | 10 ++-- 21 files changed, 334 insertions(+), 91 deletions(-) create mode 100644 test/dotnet.Tests/ParserTests/ListToolParserTests.cs rename test/dotnet.Tests/ParserTests/{UninstallInstallToolParserTests.cs => UninstallToolParserTests.cs} (84%) diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs b/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs index 2c3608d3c..9d00b45eb 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs @@ -13,33 +13,48 @@ using Microsoft.Extensions.EnvironmentAbstractions; namespace Microsoft.DotNet.Tools.List.Tool { + internal delegate IToolPackageStore CreateToolPackageStore(DirectoryPath? nonGlobalLocation = null); + internal class ListToolCommand : CommandBase { public const string CommandDelimiter = ", "; private readonly AppliedOption _options; - private readonly IToolPackageStore _toolPackageStore; private readonly IReporter _reporter; private readonly IReporter _errorReporter; + private CreateToolPackageStore _createToolPackageStore; public ListToolCommand( AppliedOption options, ParseResult result, - IToolPackageStore toolPackageStore = null, + CreateToolPackageStore createToolPackageStore = null, IReporter reporter = null) : base(result) { _options = options ?? throw new ArgumentNullException(nameof(options)); - _toolPackageStore = toolPackageStore ?? new ToolPackageStore( - new DirectoryPath(new CliFolderPathCalculator().ToolsPackagePath)); _reporter = reporter ?? Reporter.Output; _errorReporter = reporter ?? Reporter.Error; + _createToolPackageStore = createToolPackageStore ?? ToolPackageFactory.CreateToolPackageStore; } public override int Execute() { - if (!_options.ValueOrDefault("global")) + var global = _options.ValueOrDefault("global"); + var toolPathOption = _options.ValueOrDefault("tool-path"); + + DirectoryPath? toolPath = null; + if (!string.IsNullOrWhiteSpace(toolPathOption)) { - throw new GracefulException(LocalizableStrings.ListToolCommandOnlySupportsGlobal); + toolPath = new DirectoryPath(toolPathOption); + } + + if (toolPath == null && !global) + { + throw new GracefulException(LocalizableStrings.NeedGlobalOrToolPath); + } + + if (toolPath != null && global) + { + throw new GracefulException(LocalizableStrings.GlobalAndToolPathConflict); } var table = new PrintableTable(); @@ -54,13 +69,13 @@ namespace Microsoft.DotNet.Tools.List.Tool LocalizableStrings.CommandsColumn, p => string.Join(CommandDelimiter, p.Commands.Select(c => c.Name))); - table.PrintRows(GetPackages(), l => _reporter.WriteLine(l)); + table.PrintRows(GetPackages(toolPath), l => _reporter.WriteLine(l)); return 0; } - private IEnumerable GetPackages() + private IEnumerable GetPackages(DirectoryPath? toolPath) { - return _toolPackageStore.EnumeratePackages() + return _createToolPackageStore(toolPath).EnumeratePackages() .Where(PackageHasCommands) .OrderBy(p => p.Id) .ToArray(); diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommandParser.cs b/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommandParser.cs index c75e2e1ac..b8a5084aa 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommandParser.cs +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommandParser.cs @@ -17,6 +17,10 @@ namespace Microsoft.DotNet.Cli "-g|--global", LocalizableStrings.GlobalOptionDescription, Accept.NoArguments()), + Create.Option( + "--tool-path", + LocalizableStrings.ToolPathDescription, + Accept.ExactlyOneArgument()), CommonOptions.HelpOption()); } } diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/LocalizableStrings.resx b/src/dotnet/commands/dotnet-list/dotnet-list-tool/LocalizableStrings.resx index b4d21c122..852ca839b 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/LocalizableStrings.resx @@ -123,8 +123,14 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. + + Location where the tools are installed. + + + Please specify either the global option (--global) or the tool path option (--tool-path). + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. Warning: tool package '{0}' is invalid: {1} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf index 649e0ecf4..947520d2c 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf @@ -12,11 +12,6 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. - The --global switch (-g) is currently required because only user wide tools are supported. - - Version Version @@ -37,6 +32,21 @@ Warning: tool package '{0}' is invalid: {1} + + Location where the tools are installed. + Location where the tools are installed. + + + + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). + + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf index ea32b1a2c..3ebb7fd97 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf @@ -12,11 +12,6 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. - The --global switch (-g) is currently required because only user wide tools are supported. - - Version Version @@ -37,6 +32,21 @@ Warning: tool package '{0}' is invalid: {1} + + Location where the tools are installed. + Location where the tools are installed. + + + + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). + + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf index 65116604b..debaab941 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf @@ -12,11 +12,6 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. - The --global switch (-g) is currently required because only user wide tools are supported. - - Version Version @@ -37,6 +32,21 @@ Warning: tool package '{0}' is invalid: {1} + + Location where the tools are installed. + Location where the tools are installed. + + + + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). + + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf index 0f383597d..ad6de0b05 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf @@ -12,11 +12,6 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. - The --global switch (-g) is currently required because only user wide tools are supported. - - Version Version @@ -37,6 +32,21 @@ Warning: tool package '{0}' is invalid: {1} + + Location where the tools are installed. + Location where the tools are installed. + + + + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). + + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf index 33a6f2083..4859f9ab7 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf @@ -12,11 +12,6 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. - The --global switch (-g) is currently required because only user wide tools are supported. - - Version Version @@ -37,6 +32,21 @@ Warning: tool package '{0}' is invalid: {1} + + Location where the tools are installed. + Location where the tools are installed. + + + + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). + + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf index c9e468b1a..4e9d50460 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf @@ -12,11 +12,6 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. - The --global switch (-g) is currently required because only user wide tools are supported. - - Version Version @@ -37,6 +32,21 @@ Warning: tool package '{0}' is invalid: {1} + + Location where the tools are installed. + Location where the tools are installed. + + + + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). + + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf index 7d5475c1f..75aa8d88d 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf @@ -12,11 +12,6 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. - The --global switch (-g) is currently required because only user wide tools are supported. - - Version Version @@ -37,6 +32,21 @@ Warning: tool package '{0}' is invalid: {1} + + Location where the tools are installed. + Location where the tools are installed. + + + + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). + + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf index 5c81b12ec..76006b1b9 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf @@ -12,11 +12,6 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. - The --global switch (-g) is currently required because only user wide tools are supported. - - Version Version @@ -37,6 +32,21 @@ Warning: tool package '{0}' is invalid: {1} + + Location where the tools are installed. + Location where the tools are installed. + + + + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). + + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf index 146703c1a..57dd7c6fe 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf @@ -12,11 +12,6 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. - The --global switch (-g) is currently required because only user wide tools are supported. - - Version Version @@ -37,6 +32,21 @@ Warning: tool package '{0}' is invalid: {1} + + Location where the tools are installed. + Location where the tools are installed. + + + + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). + + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf index dfda07a01..8e3b3f7b2 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf @@ -12,11 +12,6 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. - The --global switch (-g) is currently required because only user wide tools are supported. - - Version Version @@ -37,6 +32,21 @@ Warning: tool package '{0}' is invalid: {1} + + Location where the tools are installed. + Location where the tools are installed. + + + + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). + + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf index f51db1c10..f15578b16 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf @@ -12,11 +12,6 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. - The --global switch (-g) is currently required because only user wide tools are supported. - - Version Version @@ -37,6 +32,21 @@ Warning: tool package '{0}' is invalid: {1} + + Location where the tools are installed. + Location where the tools are installed. + + + + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). + + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf index 0473cd7d7..2a824d319 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf @@ -12,11 +12,6 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. - The --global switch (-g) is currently required because only user wide tools are supported. - - Version Version @@ -37,6 +32,21 @@ Warning: tool package '{0}' is invalid: {1} + + Location where the tools are installed. + Location where the tools are installed. + + + + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). + + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf index 34eadedae..f54b5933d 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf @@ -12,11 +12,6 @@ List user wide tools. - - The --global switch (-g) is currently required because only user wide tools are supported. - The --global switch (-g) is currently required because only user wide tools are supported. - - Version Version @@ -37,6 +32,21 @@ Warning: tool package '{0}' is invalid: {1} + + Location where the tools are installed. + Location where the tools are installed. + + + + Please specify either the global option (--global) or the tool path option (--tool-path). + Please specify either the global option (--global) or the tool path option (--tool-path). + + + + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommand.cs b/src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommand.cs index 11cd9dd98..87661cced 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommand.cs +++ b/src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommand.cs @@ -24,12 +24,12 @@ namespace Microsoft.DotNet.Tools.Uninstall.Tool private readonly IReporter _reporter; private readonly IReporter _errorReporter; private CreateShellShimRepository _createShellShimRepository; - private CreateToolPackageStore _createToolPackageStoreAndInstaller; + private CreateToolPackageStore _createToolPackageStore; public UninstallToolCommand( AppliedOption options, ParseResult result, - CreateToolPackageStore createToolPackageStoreAndInstaller = null, + CreateToolPackageStore createToolPackageStore = null, CreateShellShimRepository createShellShimRepository = null, IReporter reporter = null) : base(result) @@ -41,7 +41,7 @@ namespace Microsoft.DotNet.Tools.Uninstall.Tool _errorReporter = reporter ?? Reporter.Error; _createShellShimRepository = createShellShimRepository ?? ShellShimRepositoryFactory.CreateShellShimRepository; - _createToolPackageStoreAndInstaller = createToolPackageStoreAndInstaller ?? ToolPackageFactory.CreateToolPackageStore; + _createToolPackageStore = createToolPackageStore ?? ToolPackageFactory.CreateToolPackageStore; } public override int Execute() @@ -65,7 +65,7 @@ namespace Microsoft.DotNet.Tools.Uninstall.Tool toolDirectoryPath = new DirectoryPath(toolPath); } - IToolPackageStore toolPackageStore = _createToolPackageStoreAndInstaller(toolDirectoryPath); + IToolPackageStore toolPackageStore = _createToolPackageStore(toolDirectoryPath); IShellShimRepository shellShimRepository = _createShellShimRepository(toolDirectoryPath); var packageId = new PackageId(_options.Arguments.Single()); diff --git a/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs b/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs index c378e0803..879f37870 100644 --- a/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs @@ -33,7 +33,7 @@ namespace Microsoft.DotNet.Tests.Commands } [Fact] - public void GivenAMissingGlobalOptionItErrors() + public void GivenAMissingGlobalOrToolPathOptionItErrors() { var store = new Mock(MockBehavior.Strict); @@ -47,7 +47,25 @@ namespace Microsoft.DotNet.Tests.Commands .And .Message .Should() - .Be(LocalizableStrings.ListToolCommandOnlySupportsGlobal); + .Be(LocalizableStrings.NeedGlobalOrToolPath); + } + + [Fact] + public void GivenBothGlobalAndToolPathOptionsItErrors() + { + var store = new Mock(MockBehavior.Strict); + + var command = CreateCommand(store.Object, "-g --tool-path /tools", "/tools"); + + Action a = () => { + command.Execute(); + }; + + a.ShouldThrow() + .And + .Message + .Should() + .Be(LocalizableStrings.GlobalAndToolPathConflict); } [Fact] @@ -65,6 +83,21 @@ namespace Microsoft.DotNet.Tests.Commands _reporter.Lines.Should().Equal(EnumerateExpectedTableLines(store.Object)); } + [Fact] + public void GivenAToolPathItPassesToolPathToStoreFactory() + { + var store = new Mock(MockBehavior.Strict); + store + .Setup(s => s.EnumeratePackages()) + .Returns(new IToolPackage[0]); + + var command = CreateCommand(store.Object, "--tool-path /tools", "/tools"); + + command.Execute().Should().Be(0); + + _reporter.Lines.Should().Equal(EnumerateExpectedTableLines(store.Object)); + } + [Fact] public void GivenASingleInstalledPackageItPrintsThePackage() { @@ -206,16 +239,29 @@ namespace Microsoft.DotNet.Tests.Commands return package.Object; } - private ListToolCommand CreateCommand(IToolPackageStore store, string options = "") + private ListToolCommand CreateCommand(IToolPackageStore store, string options = "", string expectedToolPath = null) { ParseResult result = Parser.Instance.Parse("dotnet list tool " + options); return new ListToolCommand( result["dotnet"]["list"]["tool"], result, - store, + toolPath => { AssertExpectedToolPath(toolPath, expectedToolPath); return store; }, _reporter); } + private void AssertExpectedToolPath(DirectoryPath? toolPath, string expectedToolPath) + { + if (expectedToolPath != null) + { + toolPath.Should().NotBeNull(); + toolPath.Value.Value.Should().Be(expectedToolPath); + } + else + { + toolPath.Should().BeNull(); + } + } + private IEnumerable EnumerateExpectedTableLines(IToolPackageStore store) { string GetCommandsString(IToolPackage package) diff --git a/test/dotnet.Tests/ParserTests/InstallToolParserTests.cs b/test/dotnet.Tests/ParserTests/InstallToolParserTests.cs index 305400ef7..7750d380b 100644 --- a/test/dotnet.Tests/ParserTests/InstallToolParserTests.cs +++ b/test/dotnet.Tests/ParserTests/InstallToolParserTests.cs @@ -103,10 +103,10 @@ namespace Microsoft.DotNet.Tests.ParserTests public void InstallToolParserCanParseToolPathOption() { var result = - Parser.Instance.Parse(@"dotnet install tool --tool-path C:\TestAssetLocalNugetFeed console.test.app"); + Parser.Instance.Parse(@"dotnet install tool --tool-path C:\Tools console.test.app"); var appliedOptions = result["dotnet"]["install"]["tool"]; - appliedOptions.SingleArgumentOrDefault("tool-path").Should().Be(@"C:\TestAssetLocalNugetFeed"); + appliedOptions.SingleArgumentOrDefault("tool-path").Should().Be(@"C:\Tools"); } } } diff --git a/test/dotnet.Tests/ParserTests/ListToolParserTests.cs b/test/dotnet.Tests/ParserTests/ListToolParserTests.cs new file mode 100644 index 000000000..b538f8eab --- /dev/null +++ b/test/dotnet.Tests/ParserTests/ListToolParserTests.cs @@ -0,0 +1,42 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Linq; +using FluentAssertions; +using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.CommandLine; +using Xunit; +using Xunit.Abstractions; +using Parser = Microsoft.DotNet.Cli.Parser; + +namespace Microsoft.DotNet.Tests.ParserTests +{ + public class ListToolParserTests + { + private readonly ITestOutputHelper output; + + public ListToolParserTests(ITestOutputHelper output) + { + this.output = output; + } + + [Fact] + public void ListToolParserCanGetGlobalOption() + { + var result = Parser.Instance.Parse("dotnet list tool -g"); + + var appliedOptions = result["dotnet"]["list"]["tool"]; + appliedOptions.ValueOrDefault("global").Should().Be(true); + } + + [Fact] + public void ListToolParserCanParseToolPathOption() + { + var result = + Parser.Instance.Parse(@"dotnet list tool --tool-path C:\Tools "); + + var appliedOptions = result["dotnet"]["list"]["tool"]; + appliedOptions.SingleArgumentOrDefault("tool-path").Should().Be(@"C:\Tools"); + } + } +} diff --git a/test/dotnet.Tests/ParserTests/UninstallInstallToolParserTests.cs b/test/dotnet.Tests/ParserTests/UninstallToolParserTests.cs similarity index 84% rename from test/dotnet.Tests/ParserTests/UninstallInstallToolParserTests.cs rename to test/dotnet.Tests/ParserTests/UninstallToolParserTests.cs index ab1581f5d..ace3874d4 100644 --- a/test/dotnet.Tests/ParserTests/UninstallInstallToolParserTests.cs +++ b/test/dotnet.Tests/ParserTests/UninstallToolParserTests.cs @@ -11,17 +11,17 @@ using Parser = Microsoft.DotNet.Cli.Parser; namespace Microsoft.DotNet.Tests.ParserTests { - public class UninstallInstallToolParserTests + public class UninstallToolParserTests { private readonly ITestOutputHelper output; - public UninstallInstallToolParserTests(ITestOutputHelper output) + public UninstallToolParserTests(ITestOutputHelper output) { this.output = output; } [Fact] - public void UninstallGlobaltoolParserCanGetPackageId() + public void UninstallToolParserCanGetPackageId() { var command = Parser.Instance; var result = command.Parse("dotnet uninstall tool -g console.test.app"); @@ -46,10 +46,10 @@ namespace Microsoft.DotNet.Tests.ParserTests public void UninstallToolParserCanParseToolPathOption() { var result = - Parser.Instance.Parse(@"dotnet uninstall tool --tool-path C:\TestAssetLocalNugetFeed console.test.app"); + Parser.Instance.Parse(@"dotnet uninstall tool --tool-path C:\Tools console.test.app"); var appliedOptions = result["dotnet"]["uninstall"]["tool"]; - appliedOptions.SingleArgumentOrDefault("tool-path").Should().Be(@"C:\TestAssetLocalNugetFeed"); + appliedOptions.SingleArgumentOrDefault("tool-path").Should().Be(@"C:\Tools"); } } } From e4e665d98abf02a790f6b904c0e7ea6f6d466c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbyn=C4=9Bk=20Sailer?= Date: Thu, 15 Mar 2018 15:00:28 +0100 Subject: [PATCH 07/14] LOC CHECKIN | cli master | 20180315 --- .../xlf/LocalizableStrings.cs.xlf | 4 +- .../xlf/LocalizableStrings.de.xlf | 4 +- .../xlf/LocalizableStrings.es.xlf | 4 +- .../xlf/LocalizableStrings.fr.xlf | 4 +- .../xlf/LocalizableStrings.it.xlf | 4 +- .../xlf/LocalizableStrings.ja.xlf | 4 +- .../xlf/LocalizableStrings.ko.xlf | 4 +- .../xlf/LocalizableStrings.pl.xlf | 4 +- .../xlf/LocalizableStrings.pt-BR.xlf | 4 +- .../xlf/LocalizableStrings.ru.xlf | 4 +- .../xlf/LocalizableStrings.tr.xlf | 4 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 4 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 4 +- .../dotnet-help/xlf/LocalizableStrings.cs.xlf | 4 +- .../dotnet-help/xlf/LocalizableStrings.de.xlf | 4 +- .../dotnet-help/xlf/LocalizableStrings.es.xlf | 4 +- .../dotnet-help/xlf/LocalizableStrings.fr.xlf | 4 +- .../dotnet-help/xlf/LocalizableStrings.it.xlf | 4 +- .../dotnet-help/xlf/LocalizableStrings.ja.xlf | 4 +- .../dotnet-help/xlf/LocalizableStrings.ko.xlf | 4 +- .../dotnet-help/xlf/LocalizableStrings.pl.xlf | 4 +- .../xlf/LocalizableStrings.pt-BR.xlf | 4 +- .../dotnet-help/xlf/LocalizableStrings.ru.xlf | 4 +- .../dotnet-help/xlf/LocalizableStrings.tr.xlf | 4 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 4 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 4 +- .../xlf/LocalizableStrings.cs.xlf | 24 ++++----- .../xlf/LocalizableStrings.de.xlf | 24 ++++----- .../xlf/LocalizableStrings.es.xlf | 24 ++++----- .../xlf/LocalizableStrings.fr.xlf | 24 ++++----- .../xlf/LocalizableStrings.it.xlf | 24 ++++----- .../xlf/LocalizableStrings.ja.xlf | 24 ++++----- .../xlf/LocalizableStrings.ko.xlf | 24 ++++----- .../xlf/LocalizableStrings.pl.xlf | 24 ++++----- .../xlf/LocalizableStrings.pt-BR.xlf | 24 ++++----- .../xlf/LocalizableStrings.ru.xlf | 24 ++++----- .../xlf/LocalizableStrings.tr.xlf | 24 ++++----- .../xlf/LocalizableStrings.zh-Hans.xlf | 24 ++++----- .../xlf/LocalizableStrings.zh-Hant.xlf | 24 ++++----- .../xlf/LocalizableStrings.cs.xlf | 17 +++--- .../xlf/LocalizableStrings.de.xlf | 17 +++--- .../xlf/LocalizableStrings.es.xlf | 17 +++--- .../xlf/LocalizableStrings.fr.xlf | 17 +++--- .../xlf/LocalizableStrings.it.xlf | 17 +++--- .../xlf/LocalizableStrings.ja.xlf | 17 +++--- .../xlf/LocalizableStrings.ko.xlf | 17 +++--- .../xlf/LocalizableStrings.pl.xlf | 17 +++--- .../xlf/LocalizableStrings.pt-BR.xlf | 17 +++--- .../xlf/LocalizableStrings.ru.xlf | 17 +++--- .../xlf/LocalizableStrings.tr.xlf | 17 +++--- .../xlf/LocalizableStrings.zh-Hans.xlf | 17 +++--- .../xlf/LocalizableStrings.zh-Hant.xlf | 17 +++--- .../tool/xlf/LocalizableStrings.cs.xlf | 30 +++++------ .../tool/xlf/LocalizableStrings.de.xlf | 30 +++++------ .../tool/xlf/LocalizableStrings.es.xlf | 30 +++++------ .../tool/xlf/LocalizableStrings.fr.xlf | 30 +++++------ .../tool/xlf/LocalizableStrings.it.xlf | 30 +++++------ .../tool/xlf/LocalizableStrings.ja.xlf | 30 +++++------ .../tool/xlf/LocalizableStrings.ko.xlf | 30 +++++------ .../tool/xlf/LocalizableStrings.pl.xlf | 30 +++++------ .../tool/xlf/LocalizableStrings.pt-BR.xlf | 30 +++++------ .../tool/xlf/LocalizableStrings.ru.xlf | 30 +++++------ .../tool/xlf/LocalizableStrings.tr.xlf | 30 +++++------ .../tool/xlf/LocalizableStrings.zh-Hans.xlf | 30 +++++------ .../tool/xlf/LocalizableStrings.zh-Hant.xlf | 30 +++++------ .../xlf/LocalizableStrings.cs.xlf | 6 +-- .../xlf/LocalizableStrings.de.xlf | 6 +-- .../xlf/LocalizableStrings.es.xlf | 6 +-- .../xlf/LocalizableStrings.fr.xlf | 6 +-- .../xlf/LocalizableStrings.it.xlf | 6 +-- .../xlf/LocalizableStrings.ja.xlf | 6 +-- .../xlf/LocalizableStrings.ko.xlf | 6 +-- .../xlf/LocalizableStrings.pl.xlf | 6 +-- .../xlf/LocalizableStrings.pt-BR.xlf | 6 +-- .../xlf/LocalizableStrings.ru.xlf | 6 +-- .../xlf/LocalizableStrings.tr.xlf | 6 +-- .../xlf/LocalizableStrings.zh-Hans.xlf | 6 +-- .../xlf/LocalizableStrings.zh-Hant.xlf | 6 +-- .../xlf/CommonLocalizableStrings.cs.xlf | 52 +++++++++---------- .../xlf/CommonLocalizableStrings.de.xlf | 50 +++++++++--------- .../xlf/CommonLocalizableStrings.es.xlf | 48 ++++++++--------- .../xlf/CommonLocalizableStrings.fr.xlf | 48 ++++++++--------- .../xlf/CommonLocalizableStrings.it.xlf | 48 ++++++++--------- .../xlf/CommonLocalizableStrings.ja.xlf | 48 ++++++++--------- .../xlf/CommonLocalizableStrings.ko.xlf | 48 ++++++++--------- .../xlf/CommonLocalizableStrings.pl.xlf | 48 ++++++++--------- .../xlf/CommonLocalizableStrings.pt-BR.xlf | 48 ++++++++--------- .../xlf/CommonLocalizableStrings.ru.xlf | 48 ++++++++--------- .../xlf/CommonLocalizableStrings.tr.xlf | 52 +++++++++---------- .../xlf/CommonLocalizableStrings.zh-Hans.xlf | 48 ++++++++--------- .../xlf/CommonLocalizableStrings.zh-Hant.xlf | 48 ++++++++--------- 91 files changed, 902 insertions(+), 837 deletions(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf index d97ad03f5..449c774d4 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf @@ -236,12 +236,12 @@ .NET Core SDK (reflecting any global.json): - .NET Core SDK (reflecting any global.json): + Sada .NET Core SDK (vyjadřující jakýkoli global.json): Runtime Environment: - Runtime Environment: + Běhové prostředí: diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf index 2d1b8c640..17866d663 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf @@ -236,12 +236,12 @@ .NET Core SDK (reflecting any global.json): - .NET Core SDK (reflecting any global.json): + .NET Core SDK (gemäß "global.json"): Runtime Environment: - Runtime Environment: + Laufzeitumgebung: diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf index f123e30d9..b3ee8513f 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf @@ -236,12 +236,12 @@ .NET Core SDK (reflecting any global.json): - .NET Core SDK (reflecting any global.json): + SDK de .NET Core (reflejando cualquier global.json): Runtime Environment: - Runtime Environment: + Entorno de tiempo de ejecución: diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf index 1120da01a..184e19566 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf @@ -236,12 +236,12 @@ .NET Core SDK (reflecting any global.json): - .NET Core SDK (reflecting any global.json): + SDK .NET Core (reflétant tous les global.json) : Runtime Environment: - Runtime Environment: + Environnement d'exécution : diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf index 9cd9eb799..15ece9a24 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf @@ -236,12 +236,12 @@ .NET Core SDK (reflecting any global.json): - .NET Core SDK (reflecting any global.json): + .NET Core SDK (che rispecchia un qualsiasi file global.json): Runtime Environment: - Runtime Environment: + Ambiente di runtime: diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf index 781282b5b..7b9a7a89c 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf @@ -236,12 +236,12 @@ .NET Core SDK (reflecting any global.json): - .NET Core SDK (reflecting any global.json): + .NET Core SDK (global.json を反映): Runtime Environment: - Runtime Environment: + ランタイム環境: diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf index 750cf37b3..d6e82782e 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf @@ -236,12 +236,12 @@ .NET Core SDK (reflecting any global.json): - .NET Core SDK (reflecting any global.json): + .NET Core SDK(global.json 반영): Runtime Environment: - Runtime Environment: + 런타임 환경: diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf index 8e614f3e7..25e6b67e0 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf @@ -236,12 +236,12 @@ .NET Core SDK (reflecting any global.json): - .NET Core SDK (reflecting any global.json): + Zestaw .NET Core SDK (odzwierciedlenie dowolnego pliku global.json): Runtime Environment: - Runtime Environment: + Środowisko uruchomieniowe: diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf index 9c273516d..2b4d00938 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf @@ -236,12 +236,12 @@ .NET Core SDK (reflecting any global.json): - .NET Core SDK (reflecting any global.json): + SDK do .NET Core (refletindo qualquer global.json): Runtime Environment: - Runtime Environment: + Ambiente de tempo de execução: diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf index 4e3e0e41c..844433601 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf @@ -236,12 +236,12 @@ .NET Core SDK (reflecting any global.json): - .NET Core SDK (reflecting any global.json): + Пакет SDK для .NET Core (отражающий любой global.json): Runtime Environment: - Runtime Environment: + Среда выполнения: diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf index 5bb319c46..56d05c817 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf @@ -236,12 +236,12 @@ .NET Core SDK (reflecting any global.json): - .NET Core SDK (reflecting any global.json): + .NET Core SDK (varsa global.json’u yansıtır): Runtime Environment: - Runtime Environment: + Çalışma Zamanı Ortamı: diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf index ba1d877e6..da9efabae 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf @@ -236,12 +236,12 @@ .NET Core SDK (reflecting any global.json): - .NET Core SDK (reflecting any global.json): + .NET Core SDK（反映任何 global.json）: Runtime Environment: - Runtime Environment: + 运行时环境: diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf index edae196da..7fa3da3f4 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf @@ -236,12 +236,12 @@ .NET Core SDK (reflecting any global.json): - .NET Core SDK (reflecting any global.json): + .NET Core SDK (反映任何 global.json): Runtime Environment: - Runtime Environment: + 執行階段環境: diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf index c2cd7df30..186d1b446 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf @@ -154,7 +154,7 @@ List project references or installed tools. - Vypíše odkaz v projektu. + Zobrazí seznam odkazů projektu nebo nainstalovaných nástrojů. @@ -259,7 +259,7 @@ Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Odinstaluje položku z vývojového prostředí. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf index 3e7614d85..018663ad6 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf @@ -154,7 +154,7 @@ List project references or installed tools. - Verweis im Projekt auflisten. + Hiermit werden Projektverweise oder installierte Tools aufgelistet. @@ -259,7 +259,7 @@ Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Deinstalliert ein Element aus der Entwicklungsumgebung. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf index 45dcc6151..bcd3332f3 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf @@ -154,7 +154,7 @@ List project references or installed tools. - Muestra referencias en el proyecto. + Enumere las referencias de proyecto o las herramientas instaladas. @@ -259,7 +259,7 @@ Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Desinstala un elemento en el entorno de desarrollo. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf index 08376a558..4dfdfe158 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf @@ -154,7 +154,7 @@ List project references or installed tools. - Listez une référence dans le projet. + Répertoriez des références de projet ou des outils installés. @@ -259,7 +259,7 @@ Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Désinstalle un élément dans l'environnement de développement. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf index 32bc0fdbd..a0fed482d 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf @@ -154,7 +154,7 @@ List project references or installed tools. - Elenca il riferimento nel progetto. + Elenca i riferimenti al progetto o gli strumenti installati. @@ -259,7 +259,7 @@ Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Disinstalla un elemento dall'ambiente di sviluppo. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf index d63dc94c9..d6d7ba00b 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf @@ -154,7 +154,7 @@ List project references or installed tools. - プロジェクト内の参照を一覧表示します。 + プロジェクトの参照またはインストール済みツールを一覧表示します。 @@ -259,7 +259,7 @@ Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + 項目を開発環境からアンインストールします。 diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf index 8d5af754a..110c9a46f 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf @@ -154,7 +154,7 @@ List project references or installed tools. - 프로젝트의 참조를 나열합니다. + 프로젝트 참조 또는 설치된 도구를 나열합니다. @@ -259,7 +259,7 @@ Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + 개발 환경에서 항목을 제거합니다. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf index fa12272e7..7983dd5f1 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf @@ -154,7 +154,7 @@ List project references or installed tools. - Wyświetl odwołanie w projekcie. + Wyświetl listę odwołań projektu lub zainstalowanych narzędzi. @@ -259,7 +259,7 @@ Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Odinstalowuje element ze środowiska deweloperskiego. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf index 2da572e4d..d6285b7ff 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf @@ -154,7 +154,7 @@ List project references or installed tools. - Listar referência no projeto. + Listar referências de projeto ou ferramentas instaladas. @@ -259,7 +259,7 @@ Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Desinstala um item do ambiente de desenvolvimento. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf index d2c19e629..ac73dc520 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf @@ -154,7 +154,7 @@ List project references or installed tools. - Список ссылок в проекте. + Перечисление ссылок на проекты или установленных инструментов. @@ -259,7 +259,7 @@ Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Удаляет элемент из среды разработки. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf index 3feabf584..edb9777af 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf @@ -154,7 +154,7 @@ List project references or installed tools. - Projede başvuruyu listeleyin. + Proje başvurularını veya yüklü araçları listeleyin. @@ -259,7 +259,7 @@ Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Bir öğeyi geliştirme ortamından kaldırır. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf index cef10bb34..93b544f6c 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf @@ -154,7 +154,7 @@ List project references or installed tools. - 列出项目中的引用。 + 列出项目参考或安装的工具。 @@ -259,7 +259,7 @@ Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + 从开发环境中卸载项目。 diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf index 18172bbf3..e43b10609 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf @@ -154,7 +154,7 @@ List project references or installed tools. - 列出專案中的參考。 + 列出專案參考或安裝的工具。 @@ -259,7 +259,7 @@ Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + 將開發環境的項目解除安裝。 diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf index 134946337..a714175e0 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf @@ -5,8 +5,8 @@ You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. - -Instalace byla úspěšná. Pokud nejsou další pokyny, můžete přímo do jádra napsat následující příkaz k vyvolání: {0} + Pokud nebyly dostupné žádné další pokyny, můžete zadáním následujícího příkazu nástroj vyvolat: {0} +Nástroj {1} (verze {2}) byl úspěšně nainstalován. @@ -71,17 +71,17 @@ Instalace byla úspěšná. Pokud nejsou další pokyny, můžete přímo do já Tool '{0}' is already installed. - Tool '{0}' is already installed. + Nástroj {0} je už nainstalovaný. Failed to create shell shim for tool '{0}': {1} - Failed to create shell shim for tool '{0}': {1} + Pro nástroj {0} se nepodařilo vytvořit překrytí prostředí: {1}. NuGet configuration file '{0}' does not exist. - NuGet configuration file '{0}' does not exist. + Konfigurační soubor NuGet {0} neexistuje. @@ -91,22 +91,22 @@ Instalace byla úspěšná. Pokud nejsou další pokyny, můžete přímo do já Specified version '{0}' is not a valid NuGet version range. - Specified version '{0}' is not a valid NuGet version range. + Zadaná verze {0} není platným rozsahem verzí NuGet. - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Je potřeba zadat buď globální cestu, nebo cestu k nástroji. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time. + Globální cesta a cesta k nástroji nemůžou být zadané současně. - Location where the tool will be installed. - Location where the tool will be installed. + Location of shim to access tool + Umístění překrytí pro přístup k nástroji diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf index d6f547d27..85edca6df 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf @@ -5,8 +5,8 @@ You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. - -Die Installation war erfolgreich. Sofern keine weiteren Anweisungen vorliegen, können Sie für den Aufruf den folgenden Befehl direkt in der Shell eingeben: {0} + Wenn keine zusätzlichen Anweisungen vorliegen, können Sie den folgenden Befehl zum Aufruf des Tools eingeben: {0} +Das Tool "{1}" (Version "{2}") wurde erfolgreich installiert. @@ -71,17 +71,17 @@ Die Installation war erfolgreich. Sofern keine weiteren Anweisungen vorliegen, k Tool '{0}' is already installed. - Tool '{0}' is already installed. + Das Tool "{0}" ist bereits installiert. Failed to create shell shim for tool '{0}': {1} - Failed to create shell shim for tool '{0}': {1} + Fehler beim Erstellen des Shell-Shims für das Tool "{0}": {1} NuGet configuration file '{0}' does not exist. - NuGet configuration file '{0}' does not exist. + Die NuGet-Konfigurationsdatei "{0}" ist nicht vorhanden. @@ -91,22 +91,22 @@ Die Installation war erfolgreich. Sofern keine weiteren Anweisungen vorliegen, k Specified version '{0}' is not a valid NuGet version range. - Specified version '{0}' is not a valid NuGet version range. + Die angegebene Version "{0}" ist kein gültiger NuGet-Versionsbereich. - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Es muss entweder "global" oder "tool-path" angegeben werden. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time. + Die gleichzeitige Angabe von "global" und "tool-path" ist nicht möglich. - Location where the tool will be installed. - Location where the tool will be installed. + Location of shim to access tool + Shim-Speicherort für Toolzugriff diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf index e612badc9..45624220c 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf @@ -5,8 +5,8 @@ You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. - -La instalación se completó correctamente. Si no hay más instrucciones, puede escribir el comando siguiente en el shell directamente para invocar: {0} + Si no había instrucciones adicionales, puede escribir el comando siguiente para invocar la herramienta: {0} +La herramienta "{1}" (versión "{2}") se instaló correctamente. @@ -71,17 +71,17 @@ La instalación se completó correctamente. Si no hay más instrucciones, puede Tool '{0}' is already installed. - Tool '{0}' is already installed. + La herramienta “{0}” ya está instalada. Failed to create shell shim for tool '{0}': {1} - Failed to create shell shim for tool '{0}': {1} + No se pudieron crear correcciones de compatibilidad (shim) de shell para la herramienta "{0}": {1} NuGet configuration file '{0}' does not exist. - NuGet configuration file '{0}' does not exist. + El archivo de configuración de NuGet "{0}" no existe. @@ -91,22 +91,22 @@ La instalación se completó correctamente. Si no hay más instrucciones, puede Specified version '{0}' is not a valid NuGet version range. - Specified version '{0}' is not a valid NuGet version range. + La versión especificada "{0}" no es una gama de versiones de NuGet válida. - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Se necesita una ruta global o de herramienta. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time. + No puede tener una ruta global y de herramienta como opinión al mismo tiempo. - Location where the tool will be installed. - Location where the tool will be installed. + Location of shim to access tool + Ubicación de las correcciones de compatibilidad (shim) para acceder a la herramienta diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf index 608b781d5..8e2caf8c8 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf @@ -5,8 +5,8 @@ You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. - -L'installation a réussi. En l'absence d'instructions supplémentaires, vous pouvez taper directement la commande suivante dans l'interpréteur de commandes pour appeler : {0} + En l'absence d'instructions supplémentaires, vous pouvez taper la commande suivante pour appeler l'outil : {0} +L'outil '{1}' (version '{2}') a été installé. @@ -71,17 +71,17 @@ L'installation a réussi. En l'absence d'instructions supplémentaires, vous pou Tool '{0}' is already installed. - Tool '{0}' is already installed. + L'outil '{0}' est déjà installé. Failed to create shell shim for tool '{0}': {1} - Failed to create shell shim for tool '{0}': {1} + Échec de création d'un shim d'environnement pour l'outil '{0}' : {1} NuGet configuration file '{0}' does not exist. - NuGet configuration file '{0}' does not exist. + Le fichier config NuGet '{0}' n'existe pas. @@ -91,22 +91,22 @@ L'installation a réussi. En l'absence d'instructions supplémentaires, vous pou Specified version '{0}' is not a valid NuGet version range. - Specified version '{0}' is not a valid NuGet version range. + La version spécifiée '{0}' n'est pas une plage de versions NuGet valide. - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Un paramètre global ou tool-path doit être fourni. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time. + Impossible d'avoir une propriété opinion avec les paramètres global et tool-path en même temps. - Location where the tool will be installed. - Location where the tool will be installed. + Location of shim to access tool + Emplacement de shim pour accéder à l'outil diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf index c9dee5ae6..af5f315a9 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf @@ -5,8 +5,8 @@ You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. - -L'installazione è riuscita. Se non ci sono altre istruzioni, è possibile digitare direttamente nella shell il comando seguente da richiamare: {0} + Se non sono presenti istruzioni aggiuntive, è possibile digitare il comando seguente per richiamare lo strumento: {0} +Lo strumento '{1}' (versione '{2}') è stato installato. @@ -71,17 +71,17 @@ L'installazione è riuscita. Se non ci sono altre istruzioni, è possibile digit Tool '{0}' is already installed. - Tool '{0}' is already installed. + Lo strumento '{0}' è già installato. Failed to create shell shim for tool '{0}': {1} - Failed to create shell shim for tool '{0}': {1} + Non è stato possibile creare lo shim della shell per lo strumento '{0}': {1} NuGet configuration file '{0}' does not exist. - NuGet configuration file '{0}' does not exist. + Il file di configurazione NuGet '{0}' non esiste. @@ -91,22 +91,22 @@ L'installazione è riuscita. Se non ci sono altre istruzioni, è possibile digit Specified version '{0}' is not a valid NuGet version range. - Specified version '{0}' is not a valid NuGet version range. + La versione specificata '{0}' non è un intervallo di versioni NuGet valido. - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + È necessario specificare global o tool-path. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time. + Non è possibile specificare contemporaneamente global e tool-path come opzione. - Location where the tool will be installed. - Location where the tool will be installed. + Location of shim to access tool + Percorso dello shim per accedere allo strumento diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf index 3c98e1cda..40d285ec4 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf @@ -5,8 +5,8 @@ You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. - -インストールは成功しました。追加の指示がなければ、シェルに次のコマンドを直接入力して呼び出すことができます: {0} + 追加の指示がない場合、次のコマンドを入力してツールを呼び出すことができます: {0} +ツール '{1}' (バージョン '{2}') は正常にインストールされました。 @@ -71,17 +71,17 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' is already installed. - Tool '{0}' is already installed. + ツール '{0}' は既にインストールされています。 Failed to create shell shim for tool '{0}': {1} - Failed to create shell shim for tool '{0}': {1} + ツール '{0}' でシェル shim を作成できませんでした: {1} NuGet configuration file '{0}' does not exist. - NuGet configuration file '{0}' does not exist. + NuGet 構成ファイル '{0}' は存在しません。 @@ -91,22 +91,22 @@ Tool '{1}' (version '{2}') was successfully installed. Specified version '{0}' is not a valid NuGet version range. - Specified version '{0}' is not a valid NuGet version range. + 指定されたバージョン '{0}' は、有効な NuGet バージョン範囲ではありません。 - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + global か tool-path を指定する必要があります。 - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time. + global と tool-path を意見として同時に指定することはできません。 - Location where the tool will be installed. - Location where the tool will be installed. + Location of shim to access tool + ツールにアクセスする shim の場所 diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf index 0dad643ad..3a5f414ef 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf @@ -5,8 +5,8 @@ You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. - -설치했습니다. 추가 지침이 없는 경우 셸에 다음 명령을 직접 입력하여 {0}을(를) 호출할 수 있습니다. + 추가 지침이 없는 경우 다음 명령을 입력하여 도구를 호출할 수 있습니다. {0} +도구 '{1}'(버전 '{2}')이(가) 설치되었습니다. @@ -71,17 +71,17 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' is already installed. - Tool '{0}' is already installed. + '{0}' 도구가 이미 설치되어 있습니다. Failed to create shell shim for tool '{0}': {1} - Failed to create shell shim for tool '{0}': {1} + '{0}' 도구에 대해 셸 shim을 만들지 못했습니다. {1} NuGet configuration file '{0}' does not exist. - NuGet configuration file '{0}' does not exist. + NuGet 구성 파일 '{0}'이(가) 없습니다. @@ -91,22 +91,22 @@ Tool '{1}' (version '{2}') was successfully installed. Specified version '{0}' is not a valid NuGet version range. - Specified version '{0}' is not a valid NuGet version range. + 지정된 버전 '{0}'이(가) 유효한 NuGet 버전 범위가 아닙니다. - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + 전역 또는 도구 경로를 제공해야 합니다. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time. + 전역 및 도구 경로를 의견으로 동시에 사용할 수 없습니다. - Location where the tool will be installed. - Location where the tool will be installed. + Location of shim to access tool + 도구에 액세스하는 shim 위치 diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf index e0d1029b7..e25835213 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf @@ -5,8 +5,8 @@ You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. - -Instalacja powiodła się. Jeśli nie ma dodatkowych instrukcji, możesz wpisać następujące polecenie bezpośrednio w powłoce, aby wywołać: {0} + Jeśli nie było dodatkowych instrukcji, możesz wpisać następujące polecenie, aby wywołać narzędzie: {0} +Pomyślnie zainstalowano narzędzie „{1}” (wersja: „{2}”). @@ -71,17 +71,17 @@ Instalacja powiodła się. Jeśli nie ma dodatkowych instrukcji, możesz wpisać Tool '{0}' is already installed. - Tool '{0}' is already installed. + Narzędzie „{0}” jest już zainstalowane. Failed to create shell shim for tool '{0}': {1} - Failed to create shell shim for tool '{0}': {1} + Nie można utworzyć podkładki powłoki dla narzędzia „{0}”: {1} NuGet configuration file '{0}' does not exist. - NuGet configuration file '{0}' does not exist. + Plik konfiguracji pakietu NuGet „{0}” nie istnieje. @@ -91,22 +91,22 @@ Instalacja powiodła się. Jeśli nie ma dodatkowych instrukcji, możesz wpisać Specified version '{0}' is not a valid NuGet version range. - Specified version '{0}' is not a valid NuGet version range. + Określona wersja „{0}” nie należy do prawidłowego zakresu wersji pakietu NuGet. - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Należy podać ścieżkę globalną lub ścieżkę narzędzia. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time. + Nie można jednocześnie używać ścieżki globalnej i ścieżki narzędzia jako opinii. - Location where the tool will be installed. - Location where the tool will be installed. + Location of shim to access tool + Lokalizacja podkładki na potrzeby dostępu do narzędzia diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf index 13c433f6d..5b5cc5ad9 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf @@ -5,8 +5,8 @@ You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. - -A instalação foi bem-sucedida. Se não houver outras instruções, digite o seguinte comando no shell diretamente para invocar: {0} + Se não houver nenhuma instrução adicional, você poderá digitar o seguinte comando para invocar a ferramenta: {0} +A ferramenta '{1}' (versão '{2}') foi instalada com êxito. @@ -71,17 +71,17 @@ A instalação foi bem-sucedida. Se não houver outras instruções, digite o se Tool '{0}' is already installed. - Tool '{0}' is already installed. + A ferramenta '{0}' já está instalada. Failed to create shell shim for tool '{0}': {1} - Failed to create shell shim for tool '{0}': {1} + Falha ao criar o shim do shell para a ferramenta '{0}': {1} NuGet configuration file '{0}' does not exist. - NuGet configuration file '{0}' does not exist. + O arquivo de configuração '{0}' do NuGet não existe. @@ -91,22 +91,22 @@ A instalação foi bem-sucedida. Se não houver outras instruções, digite o se Specified version '{0}' is not a valid NuGet version range. - Specified version '{0}' is not a valid NuGet version range. + A versão '{0}' especificada não é um intervalo de versão do NuGet válido. - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + É necessário o caminho de ferramenta ou global fornecido. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time. + Não é possível ter o caminho de ferramenta e o global como opinião ao mesmo tempo. - Location where the tool will be installed. - Location where the tool will be installed. + Location of shim to access tool + Local do shim para acessar a ferramenta diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf index b3834143d..4d8da0383 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf @@ -5,8 +5,8 @@ You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. - -Установка завершена. Если других действий не требуется, вы можете непосредственно в оболочке ввести для вызова следующую команду: {0}. + Если не было других указаний, вы можете ввести для вызова инструмента следующую команду: {0} +Инструмент "{1}" (версия "{2}") установлен. @@ -71,17 +71,17 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' is already installed. - Tool '{0}' is already installed. + Инструмент "{0}" уже установлен. Failed to create shell shim for tool '{0}': {1} - Failed to create shell shim for tool '{0}': {1} + Не удалось создать оболочку совместимости для инструмента "{0}": {1} NuGet configuration file '{0}' does not exist. - NuGet configuration file '{0}' does not exist. + Файл конфигурации NuGet "{0}" не существует. @@ -91,22 +91,22 @@ Tool '{1}' (version '{2}') was successfully installed. Specified version '{0}' is not a valid NuGet version range. - Specified version '{0}' is not a valid NuGet version range. + Указанная версия "{0}" не входит в допустимый диапазон версий NuGet. - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Требуется указать глобальный параметр или параметр tool-path. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time. + Невозможно указать глобальный параметр и параметр tool-path в качестве оценки одновременно. - Location where the tool will be installed. - Location where the tool will be installed. + Location of shim to access tool + Расположение оболочки совместимости для доступа к инструменту diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf index c8f12507e..1882ee034 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf @@ -5,8 +5,8 @@ You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. - -Yükleme başarılı oldu. Daha fazla yönerge yoksa, çağırmak için şu komutu doğrudan kabuğa yazabilirsiniz: {0} + Başka bir yönerge sağlanmadıysa şu komutu yazarak aracı çağırabilirsiniz: {0} +'{1}' aracı (sürüm '{2}') başarıyla yüklendi. @@ -71,17 +71,17 @@ Yükleme başarılı oldu. Daha fazla yönerge yoksa, çağırmak için şu komu Tool '{0}' is already installed. - Tool '{0}' is already installed. + '{0}' aracı zaten yüklü. Failed to create shell shim for tool '{0}': {1} - Failed to create shell shim for tool '{0}': {1} + '{0}' aracı için kabuk dolgusu oluşturulamadı: {1} NuGet configuration file '{0}' does not exist. - NuGet configuration file '{0}' does not exist. + NuGet yapılandırma dosyası '{0}' yok. @@ -91,22 +91,22 @@ Yükleme başarılı oldu. Daha fazla yönerge yoksa, çağırmak için şu komu Specified version '{0}' is not a valid NuGet version range. - Specified version '{0}' is not a valid NuGet version range. + Belirtilen '{0}' sürümü geçerli bir NuGet sürüm aralığı değil. - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Genel yolun veya araç yolunun sağlanması gerekir. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time. + Fikir olarak aynı anda hem genel yol hem de araç yolu kullanılamaz. - Location where the tool will be installed. - Location where the tool will be installed. + Location of shim to access tool + Araca erişmek için dolgu konumu diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf index 8c62d691b..ef0f12b43 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf @@ -5,8 +5,8 @@ You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. - -安装成功。如果没有进一步的说明，则可直接在 shell 中键入以下命令进行调用: {0} + 如果没有其他说明，可键入以下命令来调用该工具: {0} +已成功安装工具“{1}”（版本“{2}”）。 @@ -71,17 +71,17 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' is already installed. - Tool '{0}' is already installed. + 已安装工具“{0}”。 Failed to create shell shim for tool '{0}': {1} - Failed to create shell shim for tool '{0}': {1} + 无法为工具“{0}”创建 shell 填充程序: {1} NuGet configuration file '{0}' does not exist. - NuGet configuration file '{0}' does not exist. + NuGet 配置文件“{0}”不存在。 @@ -91,22 +91,22 @@ Tool '{1}' (version '{2}') was successfully installed. Specified version '{0}' is not a valid NuGet version range. - Specified version '{0}' is not a valid NuGet version range. + 指定的版本“{0}”是无效的 NuGet 版本范围。 - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + 需要提供全局或工具路径。 - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time. + 无法同时主张全局和工具路径。 - Location where the tool will be installed. - Location where the tool will be installed. + Location of shim to access tool + 填充程序访问工具的位置 diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf index 5c539520d..8f73fc4f3 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf @@ -5,8 +5,8 @@ You can invoke the tool using the following command: {0} Tool '{1}' (version '{2}') was successfully installed. - -安裝已成功。如果沒有進一步指示，您可以直接在命令介面中鍵入下列命令，以叫用: {0} + 若無任何其他指示，您可以鍵入下列命令來叫用工具: {0} +已成功安裝工具 '{1}' ('{2}' 版)。 @@ -71,17 +71,17 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' is already installed. - Tool '{0}' is already installed. + 工具 '{0}' 已安裝。 Failed to create shell shim for tool '{0}': {1} - Failed to create shell shim for tool '{0}': {1} + 無法為工具 '{0}' 建立殼層填充碼: {1} NuGet configuration file '{0}' does not exist. - NuGet configuration file '{0}' does not exist. + NuGet 組態檔 '{0}' 不存在。 @@ -91,22 +91,22 @@ Tool '{1}' (version '{2}') was successfully installed. Specified version '{0}' is not a valid NuGet version range. - Specified version '{0}' is not a valid NuGet version range. + 指定的版本 '{0}' 不是有效的 NuGet 版本範圍。 - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + 必須提供全域或工具路徑。 - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time. + 無法同時將全域與工具路徑作為選項。 - Location where the tool will be installed. - Location where the tool will be installed. + Location of shim to access tool + 存取工具的填充碼位置 diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf index 947520d2c..cfb6cd7dd 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf @@ -4,32 +4,37 @@ Lists installed tools in the current development environment. - Lists installed tools in the current development environment. + Vypíše nástroje nainstalované v aktuálním vývojovém prostředí. List user wide tools. - List user wide tools. + Vypsat nástroje všech uživatelů + + + + The --global switch (-g) is currently required because only user wide tools are supported. + Přepínač --global (-g) se aktuálně vyžaduje, protože se podporují jenom nástroje pro všechny uživatele. Version - Version + Verze Commands - Commands + Příkazy Package Id - Package Id + ID balíčku Warning: tool package '{0}' is invalid: {1} - Warning: tool package '{0}' is invalid: {1} + Upozornění: Balíček nástroje {0} je neplatný: {1}. diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf index 3ebb7fd97..3d396b4ef 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf @@ -4,32 +4,37 @@ Lists installed tools in the current development environment. - Lists installed tools in the current development environment. + Hiermit werden die in der aktuellen Entwicklungsumgebung installierten Tools aufgelistet. List user wide tools. - List user wide tools. + Hiermit werden benutzerweite Tools aufgelistet. + + + + The --global switch (-g) is currently required because only user wide tools are supported. + Die Option --global (-g) ist aktuell erforderlich, weil nur benutzerweite Tools unterstützt werden. Version - Version + Version Commands - Commands + Befehle Package Id - Package Id + Paket-ID Warning: tool package '{0}' is invalid: {1} - Warning: tool package '{0}' is invalid: {1} + Warnung: Das Toolpaket "{0}" ist ungültig: {1} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf index debaab941..d68c19863 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf @@ -4,32 +4,37 @@ Lists installed tools in the current development environment. - Lists installed tools in the current development environment. + Enumera las herramientas instaladas en el entorno de desarrollo actual. List user wide tools. - List user wide tools. + Enumera las herramientas para todos los usuarios. + + + + The --global switch (-g) is currently required because only user wide tools are supported. + El conmutador --global (g) se requiere actualmente porque solo se admiten herramientas para todos los usuarios. Version - Version + Versión Commands - Commands + Comandos Package Id - Package Id + Id. de paquete Warning: tool package '{0}' is invalid: {1} - Warning: tool package '{0}' is invalid: {1} + Advertencia: El paquete de herramientas "{0}" no es válido: {1} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf index ad6de0b05..160010326 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf @@ -4,32 +4,37 @@ Lists installed tools in the current development environment. - Lists installed tools in the current development environment. + Liste les outils installés dans l'environnement de développement actuel. List user wide tools. - List user wide tools. + Listez les outils pour tous les utilisateurs. + + + + The --global switch (-g) is currently required because only user wide tools are supported. + Le commutateur --global (-g) est obligatoire, car seuls les outils à l'échelle des utilisateurs sont pris en charge. Version - Version + Version Commands - Commands + Commandes Package Id - Package Id + ID de package Warning: tool package '{0}' is invalid: {1} - Warning: tool package '{0}' is invalid: {1} + Avertissement : Le package d'outils '{0}' n'est pas valide : {1} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf index 4859f9ab7..d942322f6 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf @@ -4,32 +4,37 @@ Lists installed tools in the current development environment. - Lists installed tools in the current development environment. + Elenca gli strumenti installati nell'ambiente di sviluppo corrente. List user wide tools. - List user wide tools. + Elenca gli strumenti a livello di utente. + + + + The --global switch (-g) is currently required because only user wide tools are supported. + L'opzione --global (-g) è attualmente obbligatoria perché sono supportati solo gli strumenti a livello di utente. Version - Version + Versione Commands - Commands + Comandi Package Id - Package Id + ID pacchetto Warning: tool package '{0}' is invalid: {1} - Warning: tool package '{0}' is invalid: {1} + Avviso: il pacchetto '{0}' dello strumento non è valido: {1} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf index 4e9d50460..02a2bf4bc 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf @@ -4,32 +4,37 @@ Lists installed tools in the current development environment. - Lists installed tools in the current development environment. + 現在の開発環境にインストールされているツールを一覧表示します。 List user wide tools. - List user wide tools. + ユーザー全体のツールを一覧表示します。 + + + + The --global switch (-g) is currently required because only user wide tools are supported. + サポートされているのはユーザー全体のツールだけなので、現在 --global スイッチ (-g) が必要です。 Version - Version + バージョン Commands - Commands + コマンド Package Id - Package Id + パッケージ ID Warning: tool package '{0}' is invalid: {1} - Warning: tool package '{0}' is invalid: {1} + 警告: ツール パッケージ '{0}' が無効です: {1} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf index 75aa8d88d..49a7ed8c5 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf @@ -4,32 +4,37 @@ Lists installed tools in the current development environment. - Lists installed tools in the current development environment. + 현재 개발 환경에 설치된 도구를 나열합니다. List user wide tools. - List user wide tools. + 사용자 전체 도구를 나열합니다. + + + + The --global switch (-g) is currently required because only user wide tools are supported. + 사용자 전체 도구만 지원되므로 -global 스위치(-g)가 필요합니다. Version - Version + 버전 Commands - Commands + 명령 Package Id - Package Id + 패키지 ID Warning: tool package '{0}' is invalid: {1} - Warning: tool package '{0}' is invalid: {1} + 경고: 도구 패키지 '{0}'이(가) 잘못되었습니다. {1} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf index 76006b1b9..1cca46ada 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf @@ -4,32 +4,37 @@ Lists installed tools in the current development environment. - Lists installed tools in the current development environment. + Wyświetla listę narzędzi zainstalowanych w bieżącym środowisku deweloperskim. List user wide tools. - List user wide tools. + Wyświetl listę narzędzi użytkownika. + + + + The --global switch (-g) is currently required because only user wide tools are supported. + Obecnie jest wymagany przełącznik --global (-g), ponieważ obsługiwane są tylko narzędzia użytkownika. Version - Version + Wersja Commands - Commands + Polecenia Package Id - Package Id + Identyfikator pakietu Warning: tool package '{0}' is invalid: {1} - Warning: tool package '{0}' is invalid: {1} + Ostrzeżenie: pakiet narzędzia „{0}” jest nieprawidłowy: {1} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf index 57dd7c6fe..c516fe0ed 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf @@ -4,32 +4,37 @@ Lists installed tools in the current development environment. - Lists installed tools in the current development environment. + Lista as ferramentas instaladas no ambiente de desenvolvimento atual. List user wide tools. - List user wide tools. + Listar as ferramentas para todo o usuário. + + + + The --global switch (-g) is currently required because only user wide tools are supported. + A opção --global (-g) é obrigatória, pois somente ferramentas para todo o usuário são compatíveis. Version - Version + Versão Commands - Commands + Comandos Package Id - Package Id + ID do Pacote Warning: tool package '{0}' is invalid: {1} - Warning: tool package '{0}' is invalid: {1} + Aviso: o pacote de ferramentas '{0}' é inválido: {1} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf index 8e3b3f7b2..8b9559832 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf @@ -4,32 +4,37 @@ Lists installed tools in the current development environment. - Lists installed tools in the current development environment. + Перечисляет установленные инструменты в текущей среде разработки. List user wide tools. - List user wide tools. + Перечисление пользовательских инструментов. + + + + The --global switch (-g) is currently required because only user wide tools are supported. + Параметр "--global switch (-g)" сейчас обязателен, так как поддерживаются только инструменты уровня пользователя. Version - Version + Версия Commands - Commands + Команды Package Id - Package Id + Идентификатор пакета Warning: tool package '{0}' is invalid: {1} - Warning: tool package '{0}' is invalid: {1} + Предупреждение. Пакет инструментов "{0}" недопустим: {1} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf index f15578b16..b281dcf54 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf @@ -4,32 +4,37 @@ Lists installed tools in the current development environment. - Lists installed tools in the current development environment. + Geçerli geliştirme ortamında yüklü araçları listeler. List user wide tools. - List user wide tools. + Kullanıcıya yönelik araçları listeleyin. + + + + The --global switch (-g) is currently required because only user wide tools are supported. + Yalnızca kullanıcı için araçlar desteklendiğinden --global anahtarı (-g) şu anda gereklidir. Version - Version + Sürüm Commands - Commands + Komutlar Package Id - Package Id + Paket Kimliği Warning: tool package '{0}' is invalid: {1} - Warning: tool package '{0}' is invalid: {1} + Uyarı: '{0}' araç paketi geçersiz: {1} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf index 2a824d319..350b5eafc 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf @@ -4,32 +4,37 @@ Lists installed tools in the current development environment. - Lists installed tools in the current development environment. + 列出当前开发环境中的已安装工具。 List user wide tools. - List user wide tools. + 列出用户范围工具。 + + + + The --global switch (-g) is currently required because only user wide tools are supported. + 目前需要 --global 开关 (-g)，因为仅支持用户范围工具。 Version - Version + 版本 Commands - Commands + 命令 Package Id - Package Id + 包 ID Warning: tool package '{0}' is invalid: {1} - Warning: tool package '{0}' is invalid: {1} + 警告: 工具包“{0}”无效: {1} diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf index f54b5933d..5e8595d39 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf @@ -4,32 +4,37 @@ Lists installed tools in the current development environment. - Lists installed tools in the current development environment. + 列出目前開發環境中安裝的工具。 List user wide tools. - List user wide tools. + 列出全體使用者工具。 + + + + The --global switch (-g) is currently required because only user wide tools are supported. + 因為只支援適用於全體使用者的工具，所以目前必須有 --global 參數 (-g)。 Version - Version + 版本 Commands - Commands + 命令 Package Id - Package Id + 套件識別碼 Warning: tool package '{0}' is invalid: {1} - Warning: tool package '{0}' is invalid: {1} + 警告: 工具套件 '{0}' 無效: {1} diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf index aa0dbd5c0..7d882fa9b 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf @@ -4,62 +4,62 @@ NuGet Package Id of the tool to uninstall. - NuGet Package Id of the tool to uninstall. + ID balíčku NuGet nástroje, který se má odinstalovat Uninstalls a tool. - Uninstalls a tool. + Odinstaluje nástroj. PACKAGE_ID - PACKAGE_ID + PACKAGE_ID Please specify one tool Package Id to uninstall. - Please specify one tool Package Id to uninstall. + Zadejte prosím jedno ID balíčku nástroje, který se má odinstalovat. Uninstall user wide. - Uninstall user wide. + Odinstalovat pro všechny uživatele Tool '{0}' (version '{1}') was successfully uninstalled. - Tool '{0}' (version '{1}') was successfully uninstalled. + Nástroj {0} (verze {1}) byl úspěšně odinstalován. Tool '{0}' is not currently installed. - Tool '{0}' is not currently installed. + Nástroj {0} není momentálně nainstalovaný. Tool '{0}' has multiple versions installed and cannot be uninstalled. - Tool '{0}' has multiple versions installed and cannot be uninstalled. + Nástroj {0} má několik nainstalovaných verzí a nelze ho odinstalovat. Failed to uninstall tool '{0}': {1} - Failed to uninstall tool '{0}': {1} + Nepodařilo se odinstalovat nástroj {0}: {1}. - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Je potřeba zadat buď globální cestu, nebo cestu k nástroji. - Location where the tool was previously installed. - Location where the tool was previously installed. + Location of shim to access tool + Umístění překrytí pro přístup k nástroji - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time." + Globální cesta a cesta k nástroji nemůžou být zadané současně. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf index ce478ca79..035b5e799 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf @@ -4,62 +4,62 @@ NuGet Package Id of the tool to uninstall. - NuGet Package Id of the tool to uninstall. + NuGet-Paket-ID des Tools, das deinstalliert werden soll. Uninstalls a tool. - Uninstalls a tool. + Hiermit wird ein Tool deinstalliert. PACKAGE_ID - PACKAGE_ID + PACKAGE_ID Please specify one tool Package Id to uninstall. - Please specify one tool Package Id to uninstall. + Geben Sie eine Toolpaket-ID für die Deinstallation an. Uninstall user wide. - Uninstall user wide. + Benutzerweite Deinstallation. Tool '{0}' (version '{1}') was successfully uninstalled. - Tool '{0}' (version '{1}') was successfully uninstalled. + Das Tool "{0}" (Version "{1}") wurde erfolgreich deinstalliert. Tool '{0}' is not currently installed. - Tool '{0}' is not currently installed. + Das Tool "{0}" ist aktuell nicht installiert. Tool '{0}' has multiple versions installed and cannot be uninstalled. - Tool '{0}' has multiple versions installed and cannot be uninstalled. + Es sind mehrere Versionen von Tool "{0}" installiert, eine Deinstallation ist nicht möglich. Failed to uninstall tool '{0}': {1} - Failed to uninstall tool '{0}': {1} + Fehler beim Deinstallieren des Tools "{0}": {1} - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Es muss entweder "global" oder "tool-path" angegeben werden. - Location where the tool was previously installed. - Location where the tool was previously installed. + Location of shim to access tool + Shim-Speicherort für Toolzugriff - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time." + Die gleichzeitige Angabe von "global" und "tool-path" ist nicht möglich. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf index a7985e0ef..0dbf24486 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf @@ -4,62 +4,62 @@ NuGet Package Id of the tool to uninstall. - NuGet Package Id of the tool to uninstall. + Id. del paquete de NuGet de la herramienta que se desinstalará. Uninstalls a tool. - Uninstalls a tool. + Desinstala una herramienta. PACKAGE_ID - PACKAGE_ID + PACKAGE_ID Please specify one tool Package Id to uninstall. - Please specify one tool Package Id to uninstall. + Especifique un id. de paquete de herramienta para desinstalar. Uninstall user wide. - Uninstall user wide. + Desinstale para todos los usuarios. Tool '{0}' (version '{1}') was successfully uninstalled. - Tool '{0}' (version '{1}') was successfully uninstalled. + La herramienta "{0}" (versión "{1}") se desinstaló correctamente. Tool '{0}' is not currently installed. - Tool '{0}' is not currently installed. + La herramienta "{0}" no está instalada actualmente. Tool '{0}' has multiple versions installed and cannot be uninstalled. - Tool '{0}' has multiple versions installed and cannot be uninstalled. + La herramienta "{0}" tiene varias versiones instaladas y no se puede desinstalar. Failed to uninstall tool '{0}': {1} - Failed to uninstall tool '{0}': {1} + No se pudo desinstalar la herramienta "{0}": {1} - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Se necesita una ruta global o de herramienta. - Location where the tool was previously installed. - Location where the tool was previously installed. + Location of shim to access tool + Ubicación de las correcciones de compatibilidad (shim) para acceder a la herramienta - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time." + No puede tener una ruta global y de herramienta como opinión al mismo tiempo." diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf index a8dbbe714..c712beb35 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf @@ -4,62 +4,62 @@ NuGet Package Id of the tool to uninstall. - NuGet Package Id of the tool to uninstall. + ID de package NuGet de l'outil à désinstaller. Uninstalls a tool. - Uninstalls a tool. + Désinstalle un outil. PACKAGE_ID - PACKAGE_ID + PACKAGE_ID Please specify one tool Package Id to uninstall. - Please specify one tool Package Id to uninstall. + Spécifiez un ID de package d'outils à désinstaller. Uninstall user wide. - Uninstall user wide. + Effectuez la désinstallation pour tous les utilisateurs. Tool '{0}' (version '{1}') was successfully uninstalled. - Tool '{0}' (version '{1}') was successfully uninstalled. + L'outil '{0}' (version '{1}') a été désinstallé. Tool '{0}' is not currently installed. - Tool '{0}' is not currently installed. + L'outil '{0}' n'est pas installé actuellement. Tool '{0}' has multiple versions installed and cannot be uninstalled. - Tool '{0}' has multiple versions installed and cannot be uninstalled. + L'outil '{0}' a plusieurs versions installées et ne peut pas être désinstallé. Failed to uninstall tool '{0}': {1} - Failed to uninstall tool '{0}': {1} + Échec de désinstallation de l'outil '{0}' : {1} - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Un paramètre global ou tool-path doit être fourni. - Location where the tool was previously installed. - Location where the tool was previously installed. + Location of shim to access tool + Emplacement de shim pour accéder à l'outil - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time." + Impossible d'avoir une propriété opinion avec les paramètres global et tool-path en même temps." diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf index 8cbd2a85a..cb816a3b1 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf @@ -4,62 +4,62 @@ NuGet Package Id of the tool to uninstall. - NuGet Package Id of the tool to uninstall. + ID pacchetto NuGet dello strumento da disinstallare. Uninstalls a tool. - Uninstalls a tool. + Disinstalla uno strumento. PACKAGE_ID - PACKAGE_ID + PACKAGE_ID Please specify one tool Package Id to uninstall. - Please specify one tool Package Id to uninstall. + Specificare un ID pacchetto dello strumento da disinstallare. Uninstall user wide. - Uninstall user wide. + Esegue la disinstallazione a livello di utente. Tool '{0}' (version '{1}') was successfully uninstalled. - Tool '{0}' (version '{1}') was successfully uninstalled. + Lo strumento '{0}' (versione '{1}') è stato disinstallato. Tool '{0}' is not currently installed. - Tool '{0}' is not currently installed. + Lo strumento '{0}' non è attualmente installato. Tool '{0}' has multiple versions installed and cannot be uninstalled. - Tool '{0}' has multiple versions installed and cannot be uninstalled. + Lo strumento '{0}' non può essere disinstallato perché ne sono installate più versioni. Failed to uninstall tool '{0}': {1} - Failed to uninstall tool '{0}': {1} + Non è stato possibile disinstallare lo strumento '{0}': {1} - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + È necessario specificare global o tool-path. - Location where the tool was previously installed. - Location where the tool was previously installed. + Location of shim to access tool + Percorso dello shim per accedere allo strumento - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time." + Non è possibile specificare contemporaneamente global e tool-path come opzione." diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf index aa3bcf05f..ce397e65b 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf @@ -4,62 +4,62 @@ NuGet Package Id of the tool to uninstall. - NuGet Package Id of the tool to uninstall. + アンインストールするツールの NuGet パッケージ ID。 Uninstalls a tool. - Uninstalls a tool. + ツールをアンインストールします。 PACKAGE_ID - PACKAGE_ID + PACKAGE_ID Please specify one tool Package Id to uninstall. - Please specify one tool Package Id to uninstall. + アンインストールするツール パッケージの ID を 1 つ指定してください。 Uninstall user wide. - Uninstall user wide. + ユーザー全体でアンインストールします。 Tool '{0}' (version '{1}') was successfully uninstalled. - Tool '{0}' (version '{1}') was successfully uninstalled. + ツール '{0}' (バージョン '{1}') は正常にアンインストールされました。 Tool '{0}' is not currently installed. - Tool '{0}' is not currently installed. + ツール '{0}' は現在、インストールされていません。 Tool '{0}' has multiple versions installed and cannot be uninstalled. - Tool '{0}' has multiple versions installed and cannot be uninstalled. + ツール '{0}' の複数のバージョンがインストールされており、アンインストールできません。 Failed to uninstall tool '{0}': {1} - Failed to uninstall tool '{0}': {1} + ツール '{0}' をアンインストールできませんでした: {1} - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + global か tool-path を指定する必要があります。 - Location where the tool was previously installed. - Location where the tool was previously installed. + Location of shim to access tool + ツールにアクセスする shim の場所 - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time." + global と tool-path を意見として同時に指定することはできません。" diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf index 9e4a118c3..8bae59fc3 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf @@ -4,62 +4,62 @@ NuGet Package Id of the tool to uninstall. - NuGet Package Id of the tool to uninstall. + 제거할 도구의 NuGet 패키지 ID입니다. Uninstalls a tool. - Uninstalls a tool. + 도구를 제거합니다. PACKAGE_ID - PACKAGE_ID + PACKAGE_ID Please specify one tool Package Id to uninstall. - Please specify one tool Package Id to uninstall. + 제거할 도구 패키지 ID를 하나 지정하세요. Uninstall user wide. - Uninstall user wide. + 사용자 전체 도구를 제거합니다. Tool '{0}' (version '{1}') was successfully uninstalled. - Tool '{0}' (version '{1}') was successfully uninstalled. + 도구 '{0}'(버전 '{1}')을(를) 제거했습니다. Tool '{0}' is not currently installed. - Tool '{0}' is not currently installed. + 도구 '{0}'이(가) 현재 설치되어 있지 않습니다. Tool '{0}' has multiple versions installed and cannot be uninstalled. - Tool '{0}' has multiple versions installed and cannot be uninstalled. + 도구 '{0}'의 여러 버전이 설치되어 있으며 제거할 수 없습니다. Failed to uninstall tool '{0}': {1} - Failed to uninstall tool '{0}': {1} + 도구 '{0}'을(를) 제거하지 못했습니다. {1} - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + 전역 또는 도구 경로를 제공해야 합니다. - Location where the tool was previously installed. - Location where the tool was previously installed. + Location of shim to access tool + 도구에 액세스하는 shim 위치 - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time." + 전역 및 도구 경로를 의견으로 동시에 사용할 수 없습니다." diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf index d0a2b491e..d740e76f3 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf @@ -4,62 +4,62 @@ NuGet Package Id of the tool to uninstall. - NuGet Package Id of the tool to uninstall. + Identyfikator pakietu NuGet narzędzia do odinstalowania. Uninstalls a tool. - Uninstalls a tool. + Odinstalowuje narzędzie. PACKAGE_ID - PACKAGE_ID + PACKAGE_ID Please specify one tool Package Id to uninstall. - Please specify one tool Package Id to uninstall. + Określ jeden identyfikator pakietu narzędzia do odinstalowania. Uninstall user wide. - Uninstall user wide. + Odinstaluj dla użytkownika. Tool '{0}' (version '{1}') was successfully uninstalled. - Tool '{0}' (version '{1}') was successfully uninstalled. + Pomyślnie odinstalowano narzędzie „{0}” (wersja: „{1}”). Tool '{0}' is not currently installed. - Tool '{0}' is not currently installed. + Narzędzie „{0}” nie jest obecnie zainstalowane. Tool '{0}' has multiple versions installed and cannot be uninstalled. - Tool '{0}' has multiple versions installed and cannot be uninstalled. + Jest zainstalowanych wiele wersji narzędzia „{0}” i nie można go odinstalować. Failed to uninstall tool '{0}': {1} - Failed to uninstall tool '{0}': {1} + Nie można odinstalować narzędzia „{0}”: {1} - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Należy podać ścieżkę globalną lub ścieżkę narzędzia. - Location where the tool was previously installed. - Location where the tool was previously installed. + Location of shim to access tool + Lokalizacja podkładki na potrzeby dostępu do narzędzia - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time." + Nie można jednocześnie używać ścieżki globalnej i ścieżki narzędzia jako opinii. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf index d95633b58..0f7b58a01 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf @@ -4,62 +4,62 @@ NuGet Package Id of the tool to uninstall. - NuGet Package Id of the tool to uninstall. + A ID do pacote NuGet da ferramenta a ser desinstalada. Uninstalls a tool. - Uninstalls a tool. + Desinstala uma ferramenta. PACKAGE_ID - PACKAGE_ID + PACKAGE_ID Please specify one tool Package Id to uninstall. - Please specify one tool Package Id to uninstall. + Especifique uma ID de Pacote da ferramenta a ser desinstalada. Uninstall user wide. - Uninstall user wide. + Desinstale para todo o usuário. Tool '{0}' (version '{1}') was successfully uninstalled. - Tool '{0}' (version '{1}') was successfully uninstalled. + A ferramenta '{0}' (versão '{1}') foi desinstalada com êxito. Tool '{0}' is not currently installed. - Tool '{0}' is not currently installed. + A ferramenta '{0}' não está instalada no momento. Tool '{0}' has multiple versions installed and cannot be uninstalled. - Tool '{0}' has multiple versions installed and cannot be uninstalled. + A ferramenta '{0}' tem várias versões instaladas e não pode ser desinstalada. Failed to uninstall tool '{0}': {1} - Failed to uninstall tool '{0}': {1} + Falha ao desinstalar a ferramenta '{0}': {1} - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + É necessário o caminho de ferramenta ou global fornecido. - Location where the tool was previously installed. - Location where the tool was previously installed. + Location of shim to access tool + Local do shim para acessar a ferramenta - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time." + Não é possível ter o caminho de ferramenta e o global como opinião ao mesmo tempo." diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf index cb08d5d10..dca9f0751 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf @@ -4,62 +4,62 @@ NuGet Package Id of the tool to uninstall. - NuGet Package Id of the tool to uninstall. + Идентификатор пакета NuGet удаляемого инструмента. Uninstalls a tool. - Uninstalls a tool. + Удаляет инструмент. PACKAGE_ID - PACKAGE_ID + PACKAGE_ID Please specify one tool Package Id to uninstall. - Please specify one tool Package Id to uninstall. + Укажите один идентификатор пакета удаляемого инструмента. Uninstall user wide. - Uninstall user wide. + Удаление на уровне пользователя. Tool '{0}' (version '{1}') was successfully uninstalled. - Tool '{0}' (version '{1}') was successfully uninstalled. + Инструмент "{0}" (версия "{1}") удален. Tool '{0}' is not currently installed. - Tool '{0}' is not currently installed. + Инструмент "{0}" сейчас не установлен. Tool '{0}' has multiple versions installed and cannot be uninstalled. - Tool '{0}' has multiple versions installed and cannot be uninstalled. + Установлено несколько версий инструмента "{0}", и удалить его невозможно. Failed to uninstall tool '{0}': {1} - Failed to uninstall tool '{0}': {1} + Не удалось удалить инструмент "{0}": {1} - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Требуется указать глобальный параметр или параметр tool-path. - Location where the tool was previously installed. - Location where the tool was previously installed. + Location of shim to access tool + Расположение оболочки совместимости для доступа к инструменту - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time." + Невозможно указать глобальный параметр и параметр tool-path в качестве оценки одновременно. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf index 03e2c1067..99d02a31d 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf @@ -4,62 +4,62 @@ NuGet Package Id of the tool to uninstall. - NuGet Package Id of the tool to uninstall. + Kaldırılacak aracın NuGet Paket Kimliği. Uninstalls a tool. - Uninstalls a tool. + Bir aracı kaldırır. PACKAGE_ID - PACKAGE_ID + PACKAGE_ID Please specify one tool Package Id to uninstall. - Please specify one tool Package Id to uninstall. + Lütfen kaldırılacak aracın Paket Kimliğini belirtin. Uninstall user wide. - Uninstall user wide. + Kullanıcı için kaldırın. Tool '{0}' (version '{1}') was successfully uninstalled. - Tool '{0}' (version '{1}') was successfully uninstalled. + '{0}' aracı (sürüm '{1}') başarıyla kaldırıldı. Tool '{0}' is not currently installed. - Tool '{0}' is not currently installed. + '{0}' aracı şu anda yüklü değil. Tool '{0}' has multiple versions installed and cannot be uninstalled. - Tool '{0}' has multiple versions installed and cannot be uninstalled. + '{0}' aracının birden fazla sürümü yüklü ve kaldırılamıyor. Failed to uninstall tool '{0}': {1} - Failed to uninstall tool '{0}': {1} + '{0}' aracı kaldırılamadı: {1} - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + Genel yolun veya araç yolunun sağlanması gerekir. - Location where the tool was previously installed. - Location where the tool was previously installed. + Location of shim to access tool + Araca erişmek için dolgu konumu - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time." + Fikir olarak aynı anda hem genel yol hem de araç yolu kullanılamaz.” diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf index 41dbe4f97..a92746560 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf @@ -4,62 +4,62 @@ NuGet Package Id of the tool to uninstall. - NuGet Package Id of the tool to uninstall. + 要卸载的工具的 NuGet 包 ID。 Uninstalls a tool. - Uninstalls a tool. + 卸载工具。 PACKAGE_ID - PACKAGE_ID + PACKAGE_ID Please specify one tool Package Id to uninstall. - Please specify one tool Package Id to uninstall. + 请指定一个要卸载的工具包 ID。 Uninstall user wide. - Uninstall user wide. + 卸载用户范围。 Tool '{0}' (version '{1}') was successfully uninstalled. - Tool '{0}' (version '{1}') was successfully uninstalled. + 已成功卸载工具“{0}”（版本“{1}”）。 Tool '{0}' is not currently installed. - Tool '{0}' is not currently installed. + 工具“{0}”目前尚未安装。 Tool '{0}' has multiple versions installed and cannot be uninstalled. - Tool '{0}' has multiple versions installed and cannot be uninstalled. + 工具“{0}”已安装多个版本，无法卸载。 Failed to uninstall tool '{0}': {1} - Failed to uninstall tool '{0}': {1} + 无法卸载工具“{0}”: {1} - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + 需要提供全局或工具路径。 - Location where the tool was previously installed. - Location where the tool was previously installed. + Location of shim to access tool + 填充程序访问工具的位置 - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time." + 无法同时主张全局和工具路径。” diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf index ae1d252ff..277884b8a 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf @@ -4,62 +4,62 @@ NuGet Package Id of the tool to uninstall. - NuGet Package Id of the tool to uninstall. + 要解除安裝之工具的 NuGet 套件識別碼。 Uninstalls a tool. - Uninstalls a tool. + 將工具解除安裝。 PACKAGE_ID - PACKAGE_ID + PACKAGE_ID Please specify one tool Package Id to uninstall. - Please specify one tool Package Id to uninstall. + 請指定一個要解除安裝的工具套件識別碼。 Uninstall user wide. - Uninstall user wide. + 為全部使用者解除安裝。 Tool '{0}' (version '{1}') was successfully uninstalled. - Tool '{0}' (version '{1}') was successfully uninstalled. + 已成功解除安裝工具 '{0}' ('{1}' 版)。 Tool '{0}' is not currently installed. - Tool '{0}' is not currently installed. + 目前未安裝工具 '{0}'。 Tool '{0}' has multiple versions installed and cannot be uninstalled. - Tool '{0}' has multiple versions installed and cannot be uninstalled. + 工具 '{0}' 有多個安裝的版本，且無法解除安裝。 Failed to uninstall tool '{0}': {1} - Failed to uninstall tool '{0}': {1} + 無法將工具 '{0}' 解除安裝: {1} - Please specify either the global option (--global) or the tool path option (--tool-path). - Please specify either the global option (--global) or the tool path option (--tool-path). + Need either global or tool-path provided. + 必須提供全域或工具路徑。 - Location where the tool was previously installed. - Location where the tool was previously installed. + Location of shim to access tool + 存取工具的填充碼位置 - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. - (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Cannot have global and tool-path as opinion at the same time." + 無法同時將全域與工具路徑作為選項。」 diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.cs.xlf index 2aa39fc98..2f716a2ac 100644 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.cs.xlf @@ -4,17 +4,17 @@ .NET Uninstall Command - .NET Uninstall Command + Příkaz k odinstalaci rozhraní .NET The NuGet package identifier of the tool to uninstall. - The NuGet package identifier of the tool to uninstall. + Identifikátor balíčku NuGet nástroje, který se má odinstalovat Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Odinstaluje položku z vývojového prostředí. diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.de.xlf index d73382dab..69e060e00 100644 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.de.xlf @@ -4,17 +4,17 @@ .NET Uninstall Command - .NET Uninstall Command + Befehl zur Deinstallation von .NET The NuGet package identifier of the tool to uninstall. - The NuGet package identifier of the tool to uninstall. + NuGet-Paketbezeichner des Tools, das deinstalliert werden soll. Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Deinstalliert ein Element aus der Entwicklungsumgebung. diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.es.xlf index ee061aa4a..c0a641af1 100644 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.es.xlf @@ -4,17 +4,17 @@ .NET Uninstall Command - .NET Uninstall Command + Comando para la desinstalación de .NET The NuGet package identifier of the tool to uninstall. - The NuGet package identifier of the tool to uninstall. + Identificador del paquete de NuGet de la herramienta que se desinstalará. Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Desinstala un elemento en el entorno de desarrollo. diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.fr.xlf index 0a37b8974..e2f7c1baa 100644 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.fr.xlf @@ -4,17 +4,17 @@ .NET Uninstall Command - .NET Uninstall Command + Commande de désinstallation .NET The NuGet package identifier of the tool to uninstall. - The NuGet package identifier of the tool to uninstall. + Identificateur de package NuGet de l'outil à désinstaller. Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Désinstalle un élément dans l'environnement de développement. diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.it.xlf index beb220cdf..279d42a9a 100644 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.it.xlf @@ -4,17 +4,17 @@ .NET Uninstall Command - .NET Uninstall Command + Comando di disinstallazione .NET The NuGet package identifier of the tool to uninstall. - The NuGet package identifier of the tool to uninstall. + Identificatore del pacchetto NuGet dello strumento da disinstallare. Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Disinstalla un elemento dall'ambiente di sviluppo. diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ja.xlf index 35fa420ff..faa091d5c 100644 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ja.xlf @@ -4,17 +4,17 @@ .NET Uninstall Command - .NET Uninstall Command + .NET アンインストール コマンド The NuGet package identifier of the tool to uninstall. - The NuGet package identifier of the tool to uninstall. + アンインストールするツールの NuGet パッケージ ID。 Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + 項目を開発環境からアンインストールします。 diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ko.xlf index f8fc7ef14..f85e4370c 100644 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ko.xlf @@ -4,17 +4,17 @@ .NET Uninstall Command - .NET Uninstall Command + .NET 제거 명령 The NuGet package identifier of the tool to uninstall. - The NuGet package identifier of the tool to uninstall. + 제거할 도구의 NuGet 패키지 식별자입니다. Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + 개발 환경에서 항목을 제거합니다. diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pl.xlf index d573f8f3f..a8bd1b431 100644 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pl.xlf @@ -4,17 +4,17 @@ .NET Uninstall Command - .NET Uninstall Command + Polecenie dezinstalacji platformy .NET The NuGet package identifier of the tool to uninstall. - The NuGet package identifier of the tool to uninstall. + Identyfikator pakietu NuGet narzędzia do odinstalowania. Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Odinstalowuje element ze środowiska deweloperskiego. diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pt-BR.xlf index ba5d9acb4..be9a2b6d3 100644 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pt-BR.xlf @@ -4,17 +4,17 @@ .NET Uninstall Command - .NET Uninstall Command + Comando de desinstalação do .NET The NuGet package identifier of the tool to uninstall. - The NuGet package identifier of the tool to uninstall. + O identificador do pacote do NuGet da ferramenta a ser desinstalada. Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Desinstala um item do ambiente de desenvolvimento. diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ru.xlf index cfd97f776..5fe055778 100644 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ru.xlf @@ -4,17 +4,17 @@ .NET Uninstall Command - .NET Uninstall Command + Команда удаления .NET The NuGet package identifier of the tool to uninstall. - The NuGet package identifier of the tool to uninstall. + Идентификатор пакета NuGet удаляемого инструмента. Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Удаляет элемент из среды разработки. diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.tr.xlf index 1d52db404..6c058a453 100644 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.tr.xlf @@ -4,17 +4,17 @@ .NET Uninstall Command - .NET Uninstall Command + .NET Kaldırma Komutu The NuGet package identifier of the tool to uninstall. - The NuGet package identifier of the tool to uninstall. + Kaldırılacak aracın NuGet paketi tanımlayıcısı. Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + Bir öğeyi geliştirme ortamından kaldırır. diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hans.xlf index 69296cfe6..283659d81 100644 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hans.xlf @@ -4,17 +4,17 @@ .NET Uninstall Command - .NET Uninstall Command + .NET 卸载命令 The NuGet package identifier of the tool to uninstall. - The NuGet package identifier of the tool to uninstall. + 要卸载的工具的 NuGet 包标识符。 Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + 从开发环境中卸载项目。 diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hant.xlf index 3e2ac319b..24e0532e4 100644 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hant.xlf @@ -4,17 +4,17 @@ .NET Uninstall Command - .NET Uninstall Command + .NET 解除安裝命令 The NuGet package identifier of the tool to uninstall. - The NuGet package identifier of the tool to uninstall. + 要解除安裝之工具的 NuGet 套件識別碼。 Uninstalls an item from the development environment. - Uninstalls an item from the development environment. + 將開發環境的項目解除安裝。 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf index 69fc6689f..c727e2635 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf @@ -721,27 +721,27 @@ Tool '{0}' (version '{1}') is already installed. - Nástroj {0} je už nainstalovaný. + Nástroj {0} (verze {1}) je už nainstalovaný. Command '{0}' conflicts with an existing command from another tool. - Command '{0}' conflicts with an existing command from another tool. + Příkaz {0} koliduje s existujícím příkazem jiného nástroje. Cannot create shell shim for an empty executable path. - Cannot create shell shim for an empty executable path. + Pro prázdnou cestu ke spustitelnému souboru nelze vytvořit překrytí prostředí. Cannot create shell shim for an empty command. - Cannot create shell shim for an empty command. + Pro prázdný příkaz nelze vytvořit překrytí prostředí. Failed to retrieve tool configuration: {0} - Failed to retrieve tool configuration: {0} + Nepodařilo se načíst konfiguraci nástroje: {0}. @@ -757,15 +757,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + Adresář nástrojů {0} není momentálně v proměnné prostředí PATH. +Pokud používáte bash, přidáte ho do svého profilu spuštěním následujícího příkazu: cat << \EOF >> ~/.bash_profile -# Add .NET Core SDK tools +# Přidání nástrojů sady .NET Core SDK export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Do aktuální relace ho přidáte spuštěním následujícího příkazu: export PATH="$PATH:{0}" @@ -784,15 +784,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + Adresář nástrojů {0} není momentálně v proměnné prostředí PATH. +Pokud používáte bash, přidáte ho do svého profilu spuštěním následujícího příkazu: cat << \EOF >> ~/.bash_profile -# Add .NET Core SDK tools +# Přidání nástrojů sady .NET Core SDK export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Do aktuální relace ho přidáte spuštěním následujícího příkazu: export PATH="$PATH:{0}" @@ -805,9 +805,9 @@ You can add the directory to the PATH by running the following command: setx PATH "%PATH%;{0}" - Tools directory '{0}' is not currently on the PATH environment variable. + Adresář nástrojů {0} není momentálně v proměnné prostředí PATH. -You can add the directory to the PATH by running the following command: +Tento adresář přidáte do proměnné PATH spuštěním následujícího příkazu: setx PATH "%PATH%;{0}" @@ -815,52 +815,52 @@ setx PATH "%PATH%;{0}" Failed to create tool shim for command '{0}': {1} - Failed to create tool shim for command '{0}': {1} + Pro příkaz {0} se nepodařilo vytvořit překrytí nástroje: {1}. Failed to remove tool shim for command '{0}': {1} - Failed to remove tool shim for command '{0}': {1} + Pro příkaz {0} se nepodařilo odebrat překrytí nástroje: {1}. Failed to set user executable permissions for shell shim: {0} - Failed to set user executable permissions for shell shim: {0} + Pro překrytí prostředí se nepodařilo nastavit oprávnění uživatele ke spouštění: {0}. Failed to install tool package '{0}': {1} - Failed to install tool package '{0}': {1} + Nepodařilo se nainstalovat balíček nástroje {0}: {1}. Failed to uninstall tool package '{0}': {1} - Failed to uninstall tool package '{0}': {1} + Nepodařilo se odinstalovat balíček nástroje {0}: {1}. Column maximum width must be greater than zero. - Column maximum width must be greater than zero. + Maximální šířka sloupce musí být větší než nula. Entry point file '{0}' for command '{1}' was not found in the package. - Entry point file '{0}' for command '{1}' was not found in the package. + Soubor vstupního bodu {0} pro příkaz {1} nebyl v balíčku nalezen. Settings file 'DotnetToolSettings.xml' was not found in the package. - Settings file 'DotnetToolSettings.xml' was not found in the package. + Soubor s nastavením DotnetToolSettings.xml nebyl v balíčku nalezen. Failed to find staged tool package '{0}'. - Failed to find staged tool package '{0}'. + Nepodařilo se najít připravený balíček nástroje {0}. - The command name '{0}' cannot begin with a leading dot (.). - The command name '{0}' cannot begin with a leading dot (.). + Command '{0}' has a leading dot. + Příkaz {0} obsahuje úvodní tečku. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf index e9c8b2940..73003f8e1 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf @@ -716,32 +716,32 @@ Command '{0}' uses unsupported runner '{1}'." - Der Befehl "{0}" verwendet die nicht unterstützte Ausführung"{1}". + Der Befehl "{0}" verwendet die nicht unterstützte Ausführung "{1}". Tool '{0}' (version '{1}') is already installed. - Das Tool "{0}" ist bereits installiert. + Das Tool "{0}" (Version "{1}") ist bereits installiert. Command '{0}' conflicts with an existing command from another tool. - Command '{0}' conflicts with an existing command from another tool. + Der Befehl "{0}" steht in Konflikt zu einem vorhandenen Befehl aus einem anderen Tool. Cannot create shell shim for an empty executable path. - Cannot create shell shim for an empty executable path. + Für einen leeren Pfad einer ausführbaren Datei kann kein Shell-Shim erstellt werden. Cannot create shell shim for an empty command. - Cannot create shell shim for an empty command. + Für einen leeren Befehl kann kein Shell-Shim erstellt werden. Failed to retrieve tool configuration: {0} - Failed to retrieve tool configuration: {0} + Fehler beim Abrufen der Toolkonfiguration: {0} @@ -757,15 +757,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + Das Toolverzeichnis "{0}" ist aktuell nicht in der PATH-Umgebungsvariable angegeben. +Bei Verwendung von Bash können Sie hierzu den folgenden Befehl ausführen: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Um das Verzeichnis der aktuellen Sitzung hinzuzufügen, können Sie den folgenden Befehl ausführen: export PATH="$PATH:{0}" @@ -784,15 +784,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + Das Toolverzeichnis "{0}" ist aktuell nicht in der PATH-Umgebungsvariable angegeben. +Bei Verwendung von Bash können Sie hierzu den folgenden Befehl ausführen: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Um das Verzeichnis der aktuellen Sitzung hinzuzufügen, können Sie den folgenden Befehl ausführen: export PATH="$PATH:{0}" @@ -805,9 +805,9 @@ You can add the directory to the PATH by running the following command: setx PATH "%PATH%;{0}" - Tools directory '{0}' is not currently on the PATH environment variable. + Das Toolverzeichnis "{0}" ist aktuell nicht in der PATH-Umgebungsvariable angegeben. -You can add the directory to the PATH by running the following command: +Um das Verzeichnis zu PATH hinzuzufügen, können Sie den folgenden Befehl ausführen: setx PATH "%PATH%;{0}" @@ -815,52 +815,52 @@ setx PATH "%PATH%;{0}" Failed to create tool shim for command '{0}': {1} - Failed to create tool shim for command '{0}': {1} + Fehler beim Erstellen des Tool-Shims für den Befehl "{0}": {1} Failed to remove tool shim for command '{0}': {1} - Failed to remove tool shim for command '{0}': {1} + Fehler beim Entfernen des Tool-Shims für den Befehl "{0}": {1} Failed to set user executable permissions for shell shim: {0} - Failed to set user executable permissions for shell shim: {0} + Fehler beim Festlegen der Benutzerberechtigungen der ausführbaren Datei für den Shell-Shim: {0} Failed to install tool package '{0}': {1} - Failed to install tool package '{0}': {1} + Fehler beim Installieren des Toolpakets "{0}": {1} Failed to uninstall tool package '{0}': {1} - Failed to uninstall tool package '{0}': {1} + Fehler beim Deinstallieren des Toolpakets "{0}": {1} Column maximum width must be greater than zero. - Column maximum width must be greater than zero. + Die maximale Spaltenbreite muss größer als 0 sein. Entry point file '{0}' for command '{1}' was not found in the package. - Entry point file '{0}' for command '{1}' was not found in the package. + Die Einstiegspunktdatei "{0}" für den Befehl "{1}" wurde nicht im Paket gefunden. Settings file 'DotnetToolSettings.xml' was not found in the package. - Settings file 'DotnetToolSettings.xml' was not found in the package. + Die Einstellungsdatei "DotnetToolSettings.xml" wurde nicht im Paket gefunden. Failed to find staged tool package '{0}'. - Failed to find staged tool package '{0}'. + Das bereitgestellte Toolpaket "{0}" wurde nicht gefunden. - The command name '{0}' cannot begin with a leading dot (.). - The command name '{0}' cannot begin with a leading dot (.). + Command '{0}' has a leading dot. + Der Befehl "{0}" weist einen vorangestellten Punkt auf. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf index 943149e15..60b7a4ea4 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf @@ -721,27 +721,27 @@ Tool '{0}' (version '{1}') is already installed. - La herramienta “{0}” ya está instalada. + La herramienta "{0}" (versión "{1}") ya está instalada. Command '{0}' conflicts with an existing command from another tool. - Command '{0}' conflicts with an existing command from another tool. + El comando "{0}" está en conflicto con un comando existente de otra herramienta. Cannot create shell shim for an empty executable path. - Cannot create shell shim for an empty executable path. + No se pueden crear las correcciones de compatibilidad (shim) de shell para una ruta ejecutable vacía. Cannot create shell shim for an empty command. - Cannot create shell shim for an empty command. + No se pueden crear las correcciones de compatibilidad (shim) de shell para un comando vacío. Failed to retrieve tool configuration: {0} - Failed to retrieve tool configuration: {0} + Error al recuperar la configuración de la herramienta: {0} @@ -757,15 +757,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + El directorio de herramientas "{0}" no está actualmente en la variable de entorno PATH. +Si usa bash, puede agregarlo a su perfil mediante la ejecución de comando siguiente: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Puede agregarlo a la sesión actual mediante la ejecución del comando siguiente: export PATH="$PATH:{0}" @@ -784,15 +784,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + El directorio de herramientas "{0}" no está actualmente en la variable de entorno PATH. +Si usa bash, puede agregarlo a su perfil mediante la ejecución de comando siguiente: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Puede agregarlo a la sesión actual mediante la ejecución del comando siguiente: export PATH="$PATH:{0}" @@ -805,9 +805,9 @@ You can add the directory to the PATH by running the following command: setx PATH "%PATH%;{0}" - Tools directory '{0}' is not currently on the PATH environment variable. + El directorio de herramientas "{0}" no está actualmente en la variable de entorno PATH. -You can add the directory to the PATH by running the following command: +Puede agregar el directorio a PATH mediante la ejecución del comando siguiente: setx PATH "%PATH%;{0}" @@ -815,52 +815,52 @@ setx PATH "%PATH%;{0}" Failed to create tool shim for command '{0}': {1} - Failed to create tool shim for command '{0}': {1} + No se pudieron crear correcciones de compatibilidad (shim) de herramientas para el comando "{0}": {1} Failed to remove tool shim for command '{0}': {1} - Failed to remove tool shim for command '{0}': {1} + No se pudieron quitar correcciones de compatibilidad (shim) de herramientas para el comando "{0}": {1} Failed to set user executable permissions for shell shim: {0} - Failed to set user executable permissions for shell shim: {0} + No se pudieron establecer los permisos ejecutables del usuario para las correcciones de compatibilidad (shim) de shell: {0} Failed to install tool package '{0}': {1} - Failed to install tool package '{0}': {1} + No se pudo instalar el paquete de herramientas "{0}": {1} Failed to uninstall tool package '{0}': {1} - Failed to uninstall tool package '{0}': {1} + No se pudo desinstalar el paquete de herramientas "{0}": {1} Column maximum width must be greater than zero. - Column maximum width must be greater than zero. + El ancho máximo de la columna debe ser superior a cero. Entry point file '{0}' for command '{1}' was not found in the package. - Entry point file '{0}' for command '{1}' was not found in the package. + El archivo de punto de entrada "{0}" para el comando "{1}" no se encontró en el paquete. Settings file 'DotnetToolSettings.xml' was not found in the package. - Settings file 'DotnetToolSettings.xml' was not found in the package. + El archivo de configuración "DotnetToolSettings.xml" no se encontró en el paquete. Failed to find staged tool package '{0}'. - Failed to find staged tool package '{0}'. + No se pudo encontrar el paquete de herramientas almacenado provisionalmente "{0}". - The command name '{0}' cannot begin with a leading dot (.). - The command name '{0}' cannot begin with a leading dot (.). + Command '{0}' has a leading dot. + El comando "{0}" tiene un punto al principio. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf index 2baa03033..9e67eb29a 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf @@ -721,27 +721,27 @@ Tool '{0}' (version '{1}') is already installed. - L'outil '{0}' est déjà installé. + L'outil '{0}' (version '{1}') est déjà installé. Command '{0}' conflicts with an existing command from another tool. - Command '{0}' conflicts with an existing command from another tool. + La commande '{0}' est en conflit avec une commande existante d'un autre outil. Cannot create shell shim for an empty executable path. - Cannot create shell shim for an empty executable path. + Impossible de créer un shim d'environnement pour un chemin d'exécutable vide. Cannot create shell shim for an empty command. - Cannot create shell shim for an empty command. + Impossible de créer un shim d'environnement pour une commande vide. Failed to retrieve tool configuration: {0} - Failed to retrieve tool configuration: {0} + Échec de récupération de la configuration de l'outil : {0} @@ -757,15 +757,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + Le répertoire d'outils '{0}' ne se trouve pas actuellement sur la variable d'environnement PATH. +Si vous utilisez Bash, vous pouvez l'ajouter à votre profil en exécutant la commande suivante : cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Vous pouvez l'ajouter à la session actuelle en exécutant la commande suivante : export PATH="$PATH:{0}" @@ -784,15 +784,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + Le répertoire d'outils '{0}' ne se trouve pas actuellement sur la variable d'environnement PATH. +Si vous utilisez Bash, vous pouvez l'ajouter à votre profil en exécutant la commande suivante : cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Vous pouvez l'ajouter à la session actuelle en exécutant la commande suivante : export PATH="$PATH:{0}" @@ -805,9 +805,9 @@ You can add the directory to the PATH by running the following command: setx PATH "%PATH%;{0}" - Tools directory '{0}' is not currently on the PATH environment variable. + Le répertoire d'outils '{0}' se ne trouve pas actuellement sur la variable d'environnement PATH. -You can add the directory to the PATH by running the following command: +Vous pouvez ajouter le répertoire à PATH en exécutant la commande suivante : setx PATH "%PATH%;{0}" @@ -815,52 +815,52 @@ setx PATH "%PATH%;{0}" Failed to create tool shim for command '{0}': {1} - Failed to create tool shim for command '{0}': {1} + Échec de création d'un shim d'outil pour la commande '{0}' : {1} Failed to remove tool shim for command '{0}': {1} - Failed to remove tool shim for command '{0}': {1} + Échec de suppression d'un shim d'outil pour la commande '{0}' : {1} Failed to set user executable permissions for shell shim: {0} - Failed to set user executable permissions for shell shim: {0} + Échec de définition des autorisations utilisateur d'exécutable pour le shim d'environnement : {0} Failed to install tool package '{0}': {1} - Failed to install tool package '{0}': {1} + Échec d'installation du package d'outils '{0}' : {1} Failed to uninstall tool package '{0}': {1} - Failed to uninstall tool package '{0}': {1} + Échec de désinstallation du package d'outils '{0}' : {1} Column maximum width must be greater than zero. - Column maximum width must be greater than zero. + La largeur maximale de colonne doit être supérieure à zéro. Entry point file '{0}' for command '{1}' was not found in the package. - Entry point file '{0}' for command '{1}' was not found in the package. + Le fichier de point d'entrée '{0}' pour la commande '{1}' est introuvable dans le package. Settings file 'DotnetToolSettings.xml' was not found in the package. - Settings file 'DotnetToolSettings.xml' was not found in the package. + Le fichier de paramètres 'DotnetToolSettings.xml' est introuvable dans le package. Failed to find staged tool package '{0}'. - Failed to find staged tool package '{0}'. + Package d'outils intermédiaire '{0}' introuvable. - The command name '{0}' cannot begin with a leading dot (.). - The command name '{0}' cannot begin with a leading dot (.). + Command '{0}' has a leading dot. + La commande '{0}' commence par un point. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf index 2a4ac595d..50d90e87b 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf @@ -721,27 +721,27 @@ Tool '{0}' (version '{1}') is already installed. - Lo strumento '{0}' è già installato. + Lo strumento '{0}' (versione '{1}') è già installato. Command '{0}' conflicts with an existing command from another tool. - Command '{0}' conflicts with an existing command from another tool. + Il comando '{0}' è in conflitto con un comando esistente di un altro strumento. Cannot create shell shim for an empty executable path. - Cannot create shell shim for an empty executable path. + Non è possibile creare lo shim della shell per un percorso di eseguibile vuoto. Cannot create shell shim for an empty command. - Cannot create shell shim for an empty command. + Non è possibile creare lo shim della shell per un comando vuoto. Failed to retrieve tool configuration: {0} - Failed to retrieve tool configuration: {0} + Non è stato possibile recuperare la configurazione dello strumento: {0} @@ -757,15 +757,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + La directory '{0}' degli strumenti non si trova attualmente nella variabile di ambiente PATH. +Se si usa using bash, è possibile aggiungerla al profilo eseguendo il comando seguente: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Per aggiungerla alla sessione corrente, eseguire il comando seguente: export PATH="$PATH:{0}" @@ -784,15 +784,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + La directory '{0}' degli strumenti non si trova attualmente nella variabile di ambiente PATH. +Se si usa using bash, è possibile aggiungerla al profilo eseguendo il comando seguente: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Per aggiungerla alla sessione corrente, eseguire il comando seguente: export PATH="$PATH:{0}" @@ -805,9 +805,9 @@ You can add the directory to the PATH by running the following command: setx PATH "%PATH%;{0}" - Tools directory '{0}' is not currently on the PATH environment variable. + La directory '{0}' degli strumenti non si trova attualmente nella variabile di ambiente PATH. -You can add the directory to the PATH by running the following command: +Per aggiungere la directory a PATH, eseguire il comando seguente: setx PATH "%PATH%;{0}" @@ -815,52 +815,52 @@ setx PATH "%PATH%;{0}" Failed to create tool shim for command '{0}': {1} - Failed to create tool shim for command '{0}': {1} + Non è stato possibile creare lo shim dello strumento per il comando '{0}': {1} Failed to remove tool shim for command '{0}': {1} - Failed to remove tool shim for command '{0}': {1} + Non è stato possibile rimuovere lo shim dello strumento per il comando '{0}': {1} Failed to set user executable permissions for shell shim: {0} - Failed to set user executable permissions for shell shim: {0} + Non è stato possibile impostare le autorizzazioni dell'eseguibile per lo shim della shell: {0} Failed to install tool package '{0}': {1} - Failed to install tool package '{0}': {1} + Non è stato possibile installare il pacchetto '{0}' dello strumento: {1} Failed to uninstall tool package '{0}': {1} - Failed to uninstall tool package '{0}': {1} + Non è stato possibile disinstallare il pacchetto '{0}' dello strumento: {1} Column maximum width must be greater than zero. - Column maximum width must be greater than zero. + La larghezza massima della colonna deve essere maggiore di zero. Entry point file '{0}' for command '{1}' was not found in the package. - Entry point file '{0}' for command '{1}' was not found in the package. + Il file '{0}' del punto di ingresso per il comando '{1}' non è stato trovato nel pacchetto. Settings file 'DotnetToolSettings.xml' was not found in the package. - Settings file 'DotnetToolSettings.xml' was not found in the package. + Il file di impostazioni 'DotnetToolSettings.xml' non è stato trovato nel pacchetto. Failed to find staged tool package '{0}'. - Failed to find staged tool package '{0}'. + Non è stato possibile trovare il pacchetto '{0}' dello strumento preparato per il commit. - The command name '{0}' cannot begin with a leading dot (.). - The command name '{0}' cannot begin with a leading dot (.). + Command '{0}' has a leading dot. + Il comando '{0}' presenta un punto iniziale. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf index 0f6e00cc5..aae349b91 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf @@ -721,27 +721,27 @@ Tool '{0}' (version '{1}') is already installed. - ツール '{0}' は既にインストールされています。 + ツール '{0}' (バージョン '{1}') は既にインストールされています。 Command '{0}' conflicts with an existing command from another tool. - Command '{0}' conflicts with an existing command from another tool. + コマンド '{0}' は、別のツールからの既存のコマンドと競合します。 Cannot create shell shim for an empty executable path. - Cannot create shell shim for an empty executable path. + 空の実行可能パスにシェル shim を作成できませんでした。 Cannot create shell shim for an empty command. - Cannot create shell shim for an empty command. + 空のコマンドにシェル shim を作成できませんでした。 Failed to retrieve tool configuration: {0} - Failed to retrieve tool configuration: {0} + ツールの構成を取得できませんでした: {0} @@ -757,15 +757,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + Tools ディレクトリ '{0}' は現在、PATH 環境変数に含まれていません。 +Bash を使用している場合、次のコマンドを実行して、このディレクトリをプロファイルに追加できます: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +次のコマンドを実行すると、このディレクトリを現在のセッションに追加できます: export PATH="$PATH:{0}" @@ -784,15 +784,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + Tools ディレクトリ '{0}' は現在、PATH 環境変数に含まれていません。 +Bash を使用している場合、次のコマンドを実行して、このディレクトリをプロファイルに追加できます: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +次のコマンドを実行すると、このディレクトリを現在のセッションに追加できます: export PATH="$PATH:{0}" @@ -805,9 +805,9 @@ You can add the directory to the PATH by running the following command: setx PATH "%PATH%;{0}" - Tools directory '{0}' is not currently on the PATH environment variable. + Tools ディレクトリ '{0}' は現在、PATH 環境変数に含まれていません。 -You can add the directory to the PATH by running the following command: +次のコマンドを実行して、PATH にディレクトリを追加できます: setx PATH "%PATH%;{0}" @@ -815,52 +815,52 @@ setx PATH "%PATH%;{0}" Failed to create tool shim for command '{0}': {1} - Failed to create tool shim for command '{0}': {1} + コマンド '{0}' でツール shim を作成できませんでした: {1} Failed to remove tool shim for command '{0}': {1} - Failed to remove tool shim for command '{0}': {1} + コマンド '{0}' でツール shim を削除できませんでした: {1} Failed to set user executable permissions for shell shim: {0} - Failed to set user executable permissions for shell shim: {0} + シェル shim で実行可能なユーザー アクセス許可を設定できませんでした: {0} Failed to install tool package '{0}': {1} - Failed to install tool package '{0}': {1} + ツール パッケージ '{0}' をインストールできませんでした: {1} Failed to uninstall tool package '{0}': {1} - Failed to uninstall tool package '{0}': {1} + ツール パッケージ '{0}' をアンインストールできませんでした: {1} Column maximum width must be greater than zero. - Column maximum width must be greater than zero. + 列の最大幅はゼロより大きくなければなりません。 Entry point file '{0}' for command '{1}' was not found in the package. - Entry point file '{0}' for command '{1}' was not found in the package. + コマンド '{1}' のエントリ ポイント ファイル '{0}' がパッケージで見つかりませんでした。 Settings file 'DotnetToolSettings.xml' was not found in the package. - Settings file 'DotnetToolSettings.xml' was not found in the package. + 設定ファイル 'DotnetToolSettings.xml' がパッケージで見つかりませんでした。 Failed to find staged tool package '{0}'. - Failed to find staged tool package '{0}'. + ステージング済みのツール パッケージ '{0}' が見つかりませんでした。 - The command name '{0}' cannot begin with a leading dot (.). - The command name '{0}' cannot begin with a leading dot (.). + Command '{0}' has a leading dot. + コマンド '{0}' の先頭にドットがあります。 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf index 4567204f2..d4cd4f62c 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf @@ -721,27 +721,27 @@ Tool '{0}' (version '{1}') is already installed. - '{0}' 도구가 이미 설치되어 있습니다. + '{0}' 도구(버전 '{1}')가 이미 설치되어 있습니다. Command '{0}' conflicts with an existing command from another tool. - Command '{0}' conflicts with an existing command from another tool. + '{0}' 명령이 다른 도구의 기존 명령과 충돌합니다. Cannot create shell shim for an empty executable path. - Cannot create shell shim for an empty executable path. + 빈 실행 파일 경로에 대해 셸 shim을 만들 수 없습니다. Cannot create shell shim for an empty command. - Cannot create shell shim for an empty command. + 빈 명령에 대해 셸 shim을 만들 수 없습니다. Failed to retrieve tool configuration: {0} - Failed to retrieve tool configuration: {0} + 도구 구성을 검색하지 못했습니다. {0} @@ -757,15 +757,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + 도구 디렉터리 '{0}'이(가) 현재 PATH 환경 변수에 있지 않습니다. +Bash를 사용하는 경우 다음 명령을 실행하여 프로필에 추가할 수 있습니다. cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +다음 명령을 실행하여 현재 세션에 추가할 수 있습니다. export PATH="$PATH:{0}" @@ -784,15 +784,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + 도구 디렉터리 '{0}'이(가) 현재 PATH 환경 변수에 있지 않습니다. +Bash를 사용하는 경우 다음 명령을 실행하여 프로필에 추가할 수 있습니다. cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +다음 명령을 실행하여 현재 세션에 추가할 수 있습니다. export PATH="$PATH:{0}" @@ -805,9 +805,9 @@ You can add the directory to the PATH by running the following command: setx PATH "%PATH%;{0}" - Tools directory '{0}' is not currently on the PATH environment variable. + 도구 디렉터리 '{0}'이(가) 현재 PATH 환경 변수에 없습니다. -You can add the directory to the PATH by running the following command: +다음 명령을 실행하여 디렉터리를 PATH에 추가할 수 있습니다. setx PATH "%PATH%;{0}" @@ -815,52 +815,52 @@ setx PATH "%PATH%;{0}" Failed to create tool shim for command '{0}': {1} - Failed to create tool shim for command '{0}': {1} + '{0}' 명령에 대해 도구 shim을 만들지 못했습니다. {1} Failed to remove tool shim for command '{0}': {1} - Failed to remove tool shim for command '{0}': {1} + '{0}' 명령에 대해 도구 shim을 제거하지 못했습니다. {1} Failed to set user executable permissions for shell shim: {0} - Failed to set user executable permissions for shell shim: {0} + 셸 shim에 대해 사용자 실행 파일 권한을 설정하지 못했습니다. {0} Failed to install tool package '{0}': {1} - Failed to install tool package '{0}': {1} + 도구 패키지 '{0}'을(를) 설치하지 못했습니다. {1} Failed to uninstall tool package '{0}': {1} - Failed to uninstall tool package '{0}': {1} + 도구 패키지 '{0}'을(를) 제거하지 못했습니다. {1} Column maximum width must be greater than zero. - Column maximum width must be greater than zero. + 열 최대 너비는 0보다 커야 합니다. Entry point file '{0}' for command '{1}' was not found in the package. - Entry point file '{0}' for command '{1}' was not found in the package. + 패키지에서 '{1}' 명령에 대한 진입점 파일 '{0}'을(를) 찾지 못했습니다. Settings file 'DotnetToolSettings.xml' was not found in the package. - Settings file 'DotnetToolSettings.xml' was not found in the package. + 패키지에서 설정 파일 'DotnetToolSettings.xml'을 찾지 못했습니다. Failed to find staged tool package '{0}'. - Failed to find staged tool package '{0}'. + 스테이징된 도구 패키지 '{0}'을(를) 찾지 못했습니다. - The command name '{0}' cannot begin with a leading dot (.). - The command name '{0}' cannot begin with a leading dot (.). + Command '{0}' has a leading dot. + 명령 '{0}' 앞에 점이 있습니다. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf index 51754421e..e4f75ce0f 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf @@ -721,27 +721,27 @@ Tool '{0}' (version '{1}') is already installed. - Narzędzie „{0}” jest już zainstalowane. + Narzędzie „{0}” (wersja: „{1}”) jest już zainstalowane. Command '{0}' conflicts with an existing command from another tool. - Command '{0}' conflicts with an existing command from another tool. + Wystąpił konflikt między poleceniem „{0}” i istniejącym poleceniem z innego narzędzia. Cannot create shell shim for an empty executable path. - Cannot create shell shim for an empty executable path. + Nie można utworzyć podkładki powłoki dla pustej ścieżki pliku wykonywalnego. Cannot create shell shim for an empty command. - Cannot create shell shim for an empty command. + Nie można utworzyć podkładki powłoki dla pustego polecenia. Failed to retrieve tool configuration: {0} - Failed to retrieve tool configuration: {0} + Nie można pobrać konfiguracji narzędzia: {0} @@ -757,15 +757,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + Katalogu narzędzi „{0}” nie ma obecnie w zmiennej środowiskowej PATH. +Jeśli używasz powłoki bash, możesz dodać go do profilu przez uruchomienie następującego polecenia: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Możesz dodać go do bieżącej sesji przez uruchomienie następującego polecenia: export PATH="$PATH:{0}" @@ -784,15 +784,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + Katalogu narzędzi „{0}” nie ma obecnie w zmiennej środowiskowej PATH. +Jeśli używasz powłoki bash, możesz dodać go do profilu przez uruchomienie następującego polecenia: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Możesz dodać go do bieżącej sesji przez uruchomienie następującego polecenia: export PATH="$PATH:{0}" @@ -805,9 +805,9 @@ You can add the directory to the PATH by running the following command: setx PATH "%PATH%;{0}" - Tools directory '{0}' is not currently on the PATH environment variable. + Katalogu narzędzi „{0}” nie ma obecnie w zmiennej środowiskowej PATH. -You can add the directory to the PATH by running the following command: +Możesz dodać katalog do zmiennej PATH przez uruchomienie następującego polecenia: setx PATH "%PATH%;{0}" @@ -815,52 +815,52 @@ setx PATH "%PATH%;{0}" Failed to create tool shim for command '{0}': {1} - Failed to create tool shim for command '{0}': {1} + Nie można utworzyć podkładki narzędzia dla polecenia „{0}”: {1} Failed to remove tool shim for command '{0}': {1} - Failed to remove tool shim for command '{0}': {1} + Nie można usunąć podkładki narzędzia dla polecenia „{0}”: {1} Failed to set user executable permissions for shell shim: {0} - Failed to set user executable permissions for shell shim: {0} + Nie można ustawić uprawnień pliku wykonywalnego użytkownika dla podkładki powłoki: {0} Failed to install tool package '{0}': {1} - Failed to install tool package '{0}': {1} + Nie można zainstalować pakietu narzędzia „{0}”: {1} Failed to uninstall tool package '{0}': {1} - Failed to uninstall tool package '{0}': {1} + Nie można odinstalować pakietu narzędzia „{0}”: {1} Column maximum width must be greater than zero. - Column maximum width must be greater than zero. + Maksymalna szerokość kolumny musi być większa niż zero. Entry point file '{0}' for command '{1}' was not found in the package. - Entry point file '{0}' for command '{1}' was not found in the package. + Nie znaleziono pliku punktu wejścia „{0}” polecenia „{1}” w pakiecie. Settings file 'DotnetToolSettings.xml' was not found in the package. - Settings file 'DotnetToolSettings.xml' was not found in the package. + Nie znaleziono pliku ustawień „DotnetToolSettings.xml” w pakiecie. Failed to find staged tool package '{0}'. - Failed to find staged tool package '{0}'. + Nie można odnaleźć etapowego pakietu narzędzia „{0}”. - The command name '{0}' cannot begin with a leading dot (.). - The command name '{0}' cannot begin with a leading dot (.). + Command '{0}' has a leading dot. + Polecenie „{0}” zawiera kropkę na początku. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf index c9fbe6480..c3000b9a2 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf @@ -721,27 +721,27 @@ Tool '{0}' (version '{1}') is already installed. - A ferramenta '{0}' já está instalada. + A ferramenta '{0}' (versão '{1}') já está instalada. Command '{0}' conflicts with an existing command from another tool. - Command '{0}' conflicts with an existing command from another tool. + O comando '{0}' conflita com um comando existente de outra ferramenta. Cannot create shell shim for an empty executable path. - Cannot create shell shim for an empty executable path. + Não é possível criar o shim do shell para um caminho executável vazio. Cannot create shell shim for an empty command. - Cannot create shell shim for an empty command. + Não é possível criar o shim do shell para um comando vazio. Failed to retrieve tool configuration: {0} - Failed to retrieve tool configuration: {0} + Falha ao recuperar a configuração da ferramenta: {0} @@ -757,15 +757,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + O diretório de ferramentas '{0}' não está na variável de ambiente PATH no momento. +Se você estiver usando o Bash, poderá adicioná-lo ao seu perfil executando o seguinte comando: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Você pode adicioná-lo à sessão atual executando o seguinte comando: export PATH="$PATH:{0}" @@ -784,15 +784,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + O diretório de ferramentas '{0}' não está na variável de ambiente PATH no momento. +Se você estiver usando o Bash, poderá adicioná-lo ao seu perfil executando o seguinte comando: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Você pode adicioná-lo à sessão atual executando o seguinte comando: export PATH="$PATH:{0}" @@ -805,9 +805,9 @@ You can add the directory to the PATH by running the following command: setx PATH "%PATH%;{0}" - Tools directory '{0}' is not currently on the PATH environment variable. + O diretório de ferramentas '{0}' não está na variável de ambiente PATH no momento. -You can add the directory to the PATH by running the following command: +Você pode adicionar o diretório à variável PATH executando o seguinte comando: setx PATH "%PATH%;{0}" @@ -815,52 +815,52 @@ setx PATH "%PATH%;{0}" Failed to create tool shim for command '{0}': {1} - Failed to create tool shim for command '{0}': {1} + Falha ao criar o shim da ferramenta para o comando '{0}': {1} Failed to remove tool shim for command '{0}': {1} - Failed to remove tool shim for command '{0}': {1} + Falha ao remover o shim da ferramenta para o comando '{0}': {1} Failed to set user executable permissions for shell shim: {0} - Failed to set user executable permissions for shell shim: {0} + Falha ao definir as permissões do executável do usuário para o shim do shell: {0} Failed to install tool package '{0}': {1} - Failed to install tool package '{0}': {1} + Falha ao instalar o pacote da ferramenta '{0}': {1} Failed to uninstall tool package '{0}': {1} - Failed to uninstall tool package '{0}': {1} + Falha ao desinstalar o pacote da ferramenta '{0}': {1} Column maximum width must be greater than zero. - Column maximum width must be greater than zero. + A largura máxima da coluna deve ser maior que zero. Entry point file '{0}' for command '{1}' was not found in the package. - Entry point file '{0}' for command '{1}' was not found in the package. + O arquivo de ponto de entrada '{0}' do comando '{1}' não foi encontrado no pacote. Settings file 'DotnetToolSettings.xml' was not found in the package. - Settings file 'DotnetToolSettings.xml' was not found in the package. + O arquivo de configurações 'DotnetToolSettings.xml' não foi encontrado no pacote. Failed to find staged tool package '{0}'. - Failed to find staged tool package '{0}'. + Falha ao encontrar o pacote de ferramentas preparado '{0}'. - The command name '{0}' cannot begin with a leading dot (.). - The command name '{0}' cannot begin with a leading dot (.). + Command '{0}' has a leading dot. + O comando '{0}' tem um ponto à esquerda. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf index f66a3168f..f80bf3e3c 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf @@ -721,27 +721,27 @@ Tool '{0}' (version '{1}') is already installed. - Инструмент "{0}" уже установлен. + Инструмент "{0}" (версия "{1}") уже установлен. Command '{0}' conflicts with an existing command from another tool. - Command '{0}' conflicts with an existing command from another tool. + Команда "{0}" конфликтует с существующей командой в другом инструменте. Cannot create shell shim for an empty executable path. - Cannot create shell shim for an empty executable path. + Невозможно создать оболочку совместимости для пустого пути к исполняемому файлу. Cannot create shell shim for an empty command. - Cannot create shell shim for an empty command. + Невозможно создать оболочку совместимости для пустой команды. Failed to retrieve tool configuration: {0} - Failed to retrieve tool configuration: {0} + Не удалось получить конфигурацию инструмента: {0} @@ -757,15 +757,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + Каталог инструментов "{0}" сейчас отсутствует в переменной среды PATH. +Если вы используете Bash, вы можете добавить его в профиль, выполнив следующую команду: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Вы можете добавить его в текущий сеанс, выполнив следующую команду: export PATH="$PATH:{0}" @@ -784,15 +784,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + Каталог инструментов "{0}" сейчас отсутствует в переменной среды PATH. +Если вы используете Bash, вы можете добавить его в профиль, выполнив следующую команду: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Вы можете добавить его в текущий сеанс, выполнив следующую команду: export PATH="$PATH:{0}" @@ -805,9 +805,9 @@ You can add the directory to the PATH by running the following command: setx PATH "%PATH%;{0}" - Tools directory '{0}' is not currently on the PATH environment variable. + Каталог инструментов "{0}" сейчас отсутствует в переменной среды PATH. -You can add the directory to the PATH by running the following command: +Вы можете добавить каталог в PATH, выполнив следующую команду: setx PATH "%PATH%;{0}" @@ -815,52 +815,52 @@ setx PATH "%PATH%;{0}" Failed to create tool shim for command '{0}': {1} - Failed to create tool shim for command '{0}': {1} + Не удалось создать оболочку совместимости инструмента для команды "{0}": {1} Failed to remove tool shim for command '{0}': {1} - Failed to remove tool shim for command '{0}': {1} + Не удалось удалить оболочку совместимости инструмента для команды "{0}": {1} Failed to set user executable permissions for shell shim: {0} - Failed to set user executable permissions for shell shim: {0} + Не удалось задать разрешения исполняемого файла пользователя для оболочки совместимости: {0} Failed to install tool package '{0}': {1} - Failed to install tool package '{0}': {1} + Не удалось установить пакет инструментов "{0}": {1} Failed to uninstall tool package '{0}': {1} - Failed to uninstall tool package '{0}': {1} + Не удалось удалить пакет инструментов "{0}": {1} Column maximum width must be greater than zero. - Column maximum width must be greater than zero. + Максимальная ширина столбца должна быть больше нуля. Entry point file '{0}' for command '{1}' was not found in the package. - Entry point file '{0}' for command '{1}' was not found in the package. + Файл точки входа "{0}" для команды "{1}" не найден в пакете. Settings file 'DotnetToolSettings.xml' was not found in the package. - Settings file 'DotnetToolSettings.xml' was not found in the package. + Файл параметров "DotnetToolSettings.xml" не найден в пакете. Failed to find staged tool package '{0}'. - Failed to find staged tool package '{0}'. + Не удалось найти промежуточный пакет инструментов "{0}". - The command name '{0}' cannot begin with a leading dot (.). - The command name '{0}' cannot begin with a leading dot (.). + Command '{0}' has a leading dot. + В начале команды "{0}" стоит точка. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf index daaf80c22..4cfc50678 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf @@ -721,27 +721,27 @@ Tool '{0}' (version '{1}') is already installed. - '{0}' aracı zaten yüklü. + '{0}' aracı (sürüm '{1}') zaten yüklü. Command '{0}' conflicts with an existing command from another tool. - Command '{0}' conflicts with an existing command from another tool. + '{0}' komutu, başka bir araçtaki mevcut bir komutla çakışıyor. Cannot create shell shim for an empty executable path. - Cannot create shell shim for an empty executable path. + Boş bir yürütülebilir yol için kabuk dolgusu oluşturulamaz. Cannot create shell shim for an empty command. - Cannot create shell shim for an empty command. + Boş bir komut için kabuk dolgusu oluşturulamaz. Failed to retrieve tool configuration: {0} - Failed to retrieve tool configuration: {0} + Araç yapılandırması alınamadı: {0} @@ -757,15 +757,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + '{0}' araç dizini şu anda PATH ortam değişkeni üzerinde değil. +Bash kullanıyorsanız aşağıdaki komutu çalıştırarak bunu profilinize ekleyebilirsiniz: cat << \EOF >> ~/.bash_profile -# Add .NET Core SDK tools +# .NET Core SDK araçlarını ekle export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Aşağıdaki komutu çalıştırarak geçerli oturuma ekleyebilirsiniz: export PATH="$PATH:{0}" @@ -784,15 +784,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + '{0}' araç dizini şu anda PATH ortam değişkeni üzerinde değil. +Bash kullanıyorsanız aşağıdaki komutu çalıştırarak bunu profilinize ekleyebilirsiniz: cat << \EOF >> ~/.bash_profile -# Add .NET Core SDK tools +# .NET Core SDK araçlarını ekle export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +Aşağıdaki komutu çalıştırarak geçerli oturuma ekleyebilirsiniz: export PATH="$PATH:{0}" @@ -805,9 +805,9 @@ You can add the directory to the PATH by running the following command: setx PATH "%PATH%;{0}" - Tools directory '{0}' is not currently on the PATH environment variable. + '{0}' araç dizini şu anda PATH ortam değişkeni üzerinde değil. -You can add the directory to the PATH by running the following command: +Aşağıdaki komutu çalıştırarak dizini PATH öğesine ekleyebilirsiniz: setx PATH "%PATH%;{0}" @@ -815,52 +815,52 @@ setx PATH "%PATH%;{0}" Failed to create tool shim for command '{0}': {1} - Failed to create tool shim for command '{0}': {1} + '{0}' komutu için araç dolgusu oluşturulamadı: {1} Failed to remove tool shim for command '{0}': {1} - Failed to remove tool shim for command '{0}': {1} + '{0}' komutu için araç dolgusu kaldırılamadı: {1} Failed to set user executable permissions for shell shim: {0} - Failed to set user executable permissions for shell shim: {0} + Kabuk dolgusu için kullanıcı yürütülebilir dosya izinleri ayarlanamadı: {0} Failed to install tool package '{0}': {1} - Failed to install tool package '{0}': {1} + '{0}' araç paketi başlatılamadı: {1} Failed to uninstall tool package '{0}': {1} - Failed to uninstall tool package '{0}': {1} + '{0}' araç paketi kaldırılamadı: {1} Column maximum width must be greater than zero. - Column maximum width must be greater than zero. + Maksimum sütun genişliği sıfırdan büyük olmalıdır. Entry point file '{0}' for command '{1}' was not found in the package. - Entry point file '{0}' for command '{1}' was not found in the package. + '{1}' komutu için '{0}' giriş noktası dosyası pakette bulunamadı. Settings file 'DotnetToolSettings.xml' was not found in the package. - Settings file 'DotnetToolSettings.xml' was not found in the package. + 'DotnetToolSettings.xml' ayar dosyası pakette bulunamadı. Failed to find staged tool package '{0}'. - Failed to find staged tool package '{0}'. + '{0}' adlı hazırlanmış araç paketi bulunamadı. - The command name '{0}' cannot begin with a leading dot (.). - The command name '{0}' cannot begin with a leading dot (.). + Command '{0}' has a leading dot. + '{0}' komutunun başında nokta var. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf index f7a36eb48..d8dd0cde3 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf @@ -721,27 +721,27 @@ Tool '{0}' (version '{1}') is already installed. - 已安装工具“{0}”。 + 已安装工具“{0}”（版本“{1}”）。 Command '{0}' conflicts with an existing command from another tool. - Command '{0}' conflicts with an existing command from another tool. + 命令“{0}”与另一个工具中的现有命令相冲突。 Cannot create shell shim for an empty executable path. - Cannot create shell shim for an empty executable path. + 无法为空的可执行文件路径创建 shell 填充程序。 Cannot create shell shim for an empty command. - Cannot create shell shim for an empty command. + 无法为空的命令创建 shell 填充程序。 Failed to retrieve tool configuration: {0} - Failed to retrieve tool configuration: {0} + 无法检索工具配置: {0} @@ -757,15 +757,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + 工具目录“{0}”目前不在 PATH 环境变量中。 +如果你使用的是 bash，可运行以下命令将其添加到配置文件中: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +可通过运行以下命令将其添加到当前会话中: export PATH="$PATH:{0}" @@ -784,15 +784,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + 工具目录“{0}”目前不在 PATH 环境变量中。 +如果你使用的是 bash，可运行以下命令将其添加到配置文件中: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +可通过运行以下命令将其添加到当前会话中: export PATH="$PATH:{0}" @@ -805,9 +805,9 @@ You can add the directory to the PATH by running the following command: setx PATH "%PATH%;{0}" - Tools directory '{0}' is not currently on the PATH environment variable. + 工具目录“{0}”目前不在 PATH 环境变量中。 -You can add the directory to the PATH by running the following command: +可运行以下命令将目录添加到 PATH: setx PATH "%PATH%;{0}" @@ -815,52 +815,52 @@ setx PATH "%PATH%;{0}" Failed to create tool shim for command '{0}': {1} - Failed to create tool shim for command '{0}': {1} + 未能为命令“{0}”创建工具填充程序: {1} Failed to remove tool shim for command '{0}': {1} - Failed to remove tool shim for command '{0}': {1} + 未能为命令“{0}”删除工具填充程序: {1} Failed to set user executable permissions for shell shim: {0} - Failed to set user executable permissions for shell shim: {0} + 未能为 shell 填充程序设置用户可执行文件权限: {0} Failed to install tool package '{0}': {1} - Failed to install tool package '{0}': {1} + 未能安装工具包“{0}”: {1} Failed to uninstall tool package '{0}': {1} - Failed to uninstall tool package '{0}': {1} + 未能卸载工具包“{0}”: {1} Column maximum width must be greater than zero. - Column maximum width must be greater than zero. + 列的最大宽度必须大于零。 Entry point file '{0}' for command '{1}' was not found in the package. - Entry point file '{0}' for command '{1}' was not found in the package. + 在包中找不到命令“{1}”的入口点文件“{0}”。 Settings file 'DotnetToolSettings.xml' was not found in the package. - Settings file 'DotnetToolSettings.xml' was not found in the package. + 在包中找不到设置文件 "DotnetToolSettings.xml"。 Failed to find staged tool package '{0}'. - Failed to find staged tool package '{0}'. + 无法找到暂存工具包“{0}”。 - The command name '{0}' cannot begin with a leading dot (.). - The command name '{0}' cannot begin with a leading dot (.). + Command '{0}' has a leading dot. + 命令“{0}”有一个前导点。 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf index 544d6aa66..12f763df8 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf @@ -721,27 +721,27 @@ Tool '{0}' (version '{1}') is already installed. - 工具 '{0}' 已安裝。 + 工具 '{0}' ('\{1\ 版}' 已經安裝。 Command '{0}' conflicts with an existing command from another tool. - Command '{0}' conflicts with an existing command from another tool. + 命令 '{0}' 與來自另一個工具的現有命令發生衝突。 Cannot create shell shim for an empty executable path. - Cannot create shell shim for an empty executable path. + 無法為空白的可執行檔路徑建立殼層填充碼。 Cannot create shell shim for an empty command. - Cannot create shell shim for an empty command. + 無法為空白的命令建立殼層填充碼。 Failed to retrieve tool configuration: {0} - Failed to retrieve tool configuration: {0} + 無法擷取工具組態: {0} @@ -757,15 +757,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + 工具目錄 '{0}' 目前不在 PATH 環境變數上。 +若您正在使用 Bash，您可執行下列命令將其新增至您的設定檔: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +您可執行下列命令將其新增至目前的工作階段: export PATH="$PATH:{0}" @@ -784,15 +784,15 @@ You can add it to the current session by running the following command: export PATH="$PATH:{0}" - Tools directory '{0}' is not currently on the PATH environment variable. -If you are using bash, you can add it to your profile by running the following command: + 工具目錄 '{0}' 目前不在 PATH 環境變數上。 +若您正在使用 Bash，您可執行下列命令將其新增至您的設定檔: cat << \EOF >> ~/.bash_profile # Add .NET Core SDK tools export PATH="$PATH:{0}" EOF -You can add it to the current session by running the following command: +您可執行下列命令將其新增至目前的工作階段: export PATH="$PATH:{0}" @@ -805,9 +805,9 @@ You can add the directory to the PATH by running the following command: setx PATH "%PATH%;{0}" - Tools directory '{0}' is not currently on the PATH environment variable. + 工具目錄 '{0}' 目前不在 PATH 環境變數上。 -You can add the directory to the PATH by running the following command: +您可執行下列命令將目錄新增至 PATH: setx PATH "%PATH%;{0}" @@ -815,52 +815,52 @@ setx PATH "%PATH%;{0}" Failed to create tool shim for command '{0}': {1} - Failed to create tool shim for command '{0}': {1} + 無法為命令 '{0}' 建立工具填充碼: {1} Failed to remove tool shim for command '{0}': {1} - Failed to remove tool shim for command '{0}': {1} + 無法為命令 '{0}' 移除工具填充碼: {1} Failed to set user executable permissions for shell shim: {0} - Failed to set user executable permissions for shell shim: {0} + 無法為殼層填充碼設定使用者可執行檔權限: {0} Failed to install tool package '{0}': {1} - Failed to install tool package '{0}': {1} + 無法安裝工具套件 '{0}': {1} Failed to uninstall tool package '{0}': {1} - Failed to uninstall tool package '{0}': {1} + 無法將工具套件 '{0}' 解除安裝: {1} Column maximum width must be greater than zero. - Column maximum width must be greater than zero. + 資料行寬度上限必須大於零。 Entry point file '{0}' for command '{1}' was not found in the package. - Entry point file '{0}' for command '{1}' was not found in the package. + 無法在套件中找到命令 '{1}' 的進入點檔案 '{0}'。 Settings file 'DotnetToolSettings.xml' was not found in the package. - Settings file 'DotnetToolSettings.xml' was not found in the package. + 無法在套件中找到設定檔 'DotnetToolSettings.xml'。 Failed to find staged tool package '{0}'. - Failed to find staged tool package '{0}'. + 無法找到分段工具套件 '{0}'。 - The command name '{0}' cannot begin with a leading dot (.). - The command name '{0}' cannot begin with a leading dot (.). + Command '{0}' has a leading dot. + 命令 '{0}' 的開頭有一個點 (.)。 From 8e8426848da3f7be302c40fc441bc7bdbb2bdc1d Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Mon, 19 Mar 2018 14:00:57 -0700 Subject: [PATCH 08/14] Update translations following merge with conflicts. Updating translation status for resource strings that changed upstream. --- .../xlf/LocalizableStrings.cs.xlf | 12 ++++++------ .../xlf/LocalizableStrings.de.xlf | 12 ++++++------ .../xlf/LocalizableStrings.es.xlf | 12 ++++++------ .../xlf/LocalizableStrings.fr.xlf | 12 ++++++------ .../xlf/LocalizableStrings.it.xlf | 12 ++++++------ .../xlf/LocalizableStrings.ja.xlf | 12 ++++++------ .../xlf/LocalizableStrings.ko.xlf | 12 ++++++------ .../xlf/LocalizableStrings.pl.xlf | 12 ++++++------ .../xlf/LocalizableStrings.pt-BR.xlf | 12 ++++++------ .../xlf/LocalizableStrings.ru.xlf | 12 ++++++------ .../xlf/LocalizableStrings.tr.xlf | 12 ++++++------ .../xlf/LocalizableStrings.zh-Hans.xlf | 12 ++++++------ .../xlf/LocalizableStrings.zh-Hant.xlf | 12 ++++++------ .../dotnet-list-tool/xlf/LocalizableStrings.cs.xlf | 5 ----- .../dotnet-list-tool/xlf/LocalizableStrings.de.xlf | 5 ----- .../dotnet-list-tool/xlf/LocalizableStrings.es.xlf | 5 ----- .../dotnet-list-tool/xlf/LocalizableStrings.fr.xlf | 5 ----- .../dotnet-list-tool/xlf/LocalizableStrings.it.xlf | 5 ----- .../dotnet-list-tool/xlf/LocalizableStrings.ja.xlf | 5 ----- .../dotnet-list-tool/xlf/LocalizableStrings.ko.xlf | 5 ----- .../dotnet-list-tool/xlf/LocalizableStrings.pl.xlf | 5 ----- .../xlf/LocalizableStrings.pt-BR.xlf | 5 ----- .../dotnet-list-tool/xlf/LocalizableStrings.ru.xlf | 5 ----- .../dotnet-list-tool/xlf/LocalizableStrings.tr.xlf | 5 ----- .../xlf/LocalizableStrings.zh-Hans.xlf | 5 ----- .../xlf/LocalizableStrings.zh-Hant.xlf | 5 ----- .../tool/xlf/LocalizableStrings.cs.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.de.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.es.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.fr.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.it.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.ja.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.ko.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.pl.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.pt-BR.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.ru.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.tr.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.zh-Hans.xlf | 12 ++++++------ .../tool/xlf/LocalizableStrings.zh-Hant.xlf | 12 ++++++------ src/dotnet/xlf/CommonLocalizableStrings.cs.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.de.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.es.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.fr.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.it.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.ja.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.ko.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.pl.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.ru.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.tr.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf | 4 ++-- src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf | 4 ++-- 52 files changed, 182 insertions(+), 247 deletions(-) diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf index a714175e0..019e0c5c4 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf @@ -95,18 +95,18 @@ Nástroj {1} (verze {2}) byl úspěšně nainstalován. - Need either global or tool-path provided. - Je potřeba zadat buď globální cestu, nebo cestu k nástroji. + Please specify either the global option (--global) or the tool path option (--tool-path). + Je potřeba zadat buď globální cestu, nebo cestu k nástroji. - Cannot have global and tool-path as opinion at the same time. - Globální cesta a cesta k nástroji nemůžou být zadané současně. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Globální cesta a cesta k nástroji nemůžou být zadané současně. - Location of shim to access tool - Umístění překrytí pro přístup k nástroji + Location where the tool will be installed. + Umístění překrytí pro přístup k nástroji diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf index 85edca6df..58227cfb8 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf @@ -95,18 +95,18 @@ Das Tool "{1}" (Version "{2}") wurde erfolgreich installiert. - Need either global or tool-path provided. - Es muss entweder "global" oder "tool-path" angegeben werden. + Please specify either the global option (--global) or the tool path option (--tool-path). + Es muss entweder "global" oder "tool-path" angegeben werden. - Cannot have global and tool-path as opinion at the same time. - Die gleichzeitige Angabe von "global" und "tool-path" ist nicht möglich. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Die gleichzeitige Angabe von "global" und "tool-path" ist nicht möglich. - Location of shim to access tool - Shim-Speicherort für Toolzugriff + Location where the tool will be installed. + Shim-Speicherort für Toolzugriff diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf index 45624220c..774e3968c 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf @@ -95,18 +95,18 @@ La herramienta "{1}" (versión "{2}") se instaló correctamente. - Need either global or tool-path provided. - Se necesita una ruta global o de herramienta. + Please specify either the global option (--global) or the tool path option (--tool-path). + Se necesita una ruta global o de herramienta. - Cannot have global and tool-path as opinion at the same time. - No puede tener una ruta global y de herramienta como opinión al mismo tiempo. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + No puede tener una ruta global y de herramienta como opinión al mismo tiempo. - Location of shim to access tool - Ubicación de las correcciones de compatibilidad (shim) para acceder a la herramienta + Location where the tool will be installed. + Ubicación de las correcciones de compatibilidad (shim) para acceder a la herramienta diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf index 8e2caf8c8..cdf3f021c 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf @@ -95,18 +95,18 @@ L'outil '{1}' (version '{2}') a été installé. - Need either global or tool-path provided. - Un paramètre global ou tool-path doit être fourni. + Please specify either the global option (--global) or the tool path option (--tool-path). + Un paramètre global ou tool-path doit être fourni. - Cannot have global and tool-path as opinion at the same time. - Impossible d'avoir une propriété opinion avec les paramètres global et tool-path en même temps. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Impossible d'avoir une propriété opinion avec les paramètres global et tool-path en même temps. - Location of shim to access tool - Emplacement de shim pour accéder à l'outil + Location where the tool will be installed. + Emplacement de shim pour accéder à l'outil diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf index af5f315a9..c42d1cc40 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf @@ -95,18 +95,18 @@ Lo strumento '{1}' (versione '{2}') è stato installato. - Need either global or tool-path provided. - È necessario specificare global o tool-path. + Please specify either the global option (--global) or the tool path option (--tool-path). + È necessario specificare global o tool-path. - Cannot have global and tool-path as opinion at the same time. - Non è possibile specificare contemporaneamente global e tool-path come opzione. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Non è possibile specificare contemporaneamente global e tool-path come opzione. - Location of shim to access tool - Percorso dello shim per accedere allo strumento + Location where the tool will be installed. + Percorso dello shim per accedere allo strumento diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf index 40d285ec4..9fa3c5928 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf @@ -95,18 +95,18 @@ Tool '{1}' (version '{2}') was successfully installed. - Need either global or tool-path provided. - global か tool-path を指定する必要があります。 + Please specify either the global option (--global) or the tool path option (--tool-path). + global か tool-path を指定する必要があります。 - Cannot have global and tool-path as opinion at the same time. - global と tool-path を意見として同時に指定することはできません。 + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + global と tool-path を意見として同時に指定することはできません。 - Location of shim to access tool - ツールにアクセスする shim の場所 + Location where the tool will be installed. + ツールにアクセスする shim の場所 diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf index 3a5f414ef..e7d4dbd9e 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf @@ -95,18 +95,18 @@ Tool '{1}' (version '{2}') was successfully installed. - Need either global or tool-path provided. - 전역 또는 도구 경로를 제공해야 합니다. + Please specify either the global option (--global) or the tool path option (--tool-path). + 전역 또는 도구 경로를 제공해야 합니다. - Cannot have global and tool-path as opinion at the same time. - 전역 및 도구 경로를 의견으로 동시에 사용할 수 없습니다. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + 전역 및 도구 경로를 의견으로 동시에 사용할 수 없습니다. - Location of shim to access tool - 도구에 액세스하는 shim 위치 + Location where the tool will be installed. + 도구에 액세스하는 shim 위치 diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf index e25835213..2d7d4f93f 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf @@ -95,18 +95,18 @@ Pomyślnie zainstalowano narzędzie „{1}” (wersja: „{2}”). - Need either global or tool-path provided. - Należy podać ścieżkę globalną lub ścieżkę narzędzia. + Please specify either the global option (--global) or the tool path option (--tool-path). + Należy podać ścieżkę globalną lub ścieżkę narzędzia. - Cannot have global and tool-path as opinion at the same time. - Nie można jednocześnie używać ścieżki globalnej i ścieżki narzędzia jako opinii. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Nie można jednocześnie używać ścieżki globalnej i ścieżki narzędzia jako opinii. - Location of shim to access tool - Lokalizacja podkładki na potrzeby dostępu do narzędzia + Location where the tool will be installed. + Lokalizacja podkładki na potrzeby dostępu do narzędzia diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf index 5b5cc5ad9..0dc50e9a1 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf @@ -95,18 +95,18 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito. - Need either global or tool-path provided. - É necessário o caminho de ferramenta ou global fornecido. + Please specify either the global option (--global) or the tool path option (--tool-path). + É necessário o caminho de ferramenta ou global fornecido. - Cannot have global and tool-path as opinion at the same time. - Não é possível ter o caminho de ferramenta e o global como opinião ao mesmo tempo. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Não é possível ter o caminho de ferramenta e o global como opinião ao mesmo tempo. - Location of shim to access tool - Local do shim para acessar a ferramenta + Location where the tool will be installed. + Local do shim para acessar a ferramenta diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf index 4d8da0383..42eb6fd3d 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf @@ -95,18 +95,18 @@ Tool '{1}' (version '{2}') was successfully installed. - Need either global or tool-path provided. - Требуется указать глобальный параметр или параметр tool-path. + Please specify either the global option (--global) or the tool path option (--tool-path). + Требуется указать глобальный параметр или параметр tool-path. - Cannot have global and tool-path as opinion at the same time. - Невозможно указать глобальный параметр и параметр tool-path в качестве оценки одновременно. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Невозможно указать глобальный параметр и параметр tool-path в качестве оценки одновременно. - Location of shim to access tool - Расположение оболочки совместимости для доступа к инструменту + Location where the tool will be installed. + Расположение оболочки совместимости для доступа к инструменту diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf index 1882ee034..2bd6bf5bb 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf @@ -95,18 +95,18 @@ Tool '{1}' (version '{2}') was successfully installed. - Need either global or tool-path provided. - Genel yolun veya araç yolunun sağlanması gerekir. + Please specify either the global option (--global) or the tool path option (--tool-path). + Genel yolun veya araç yolunun sağlanması gerekir. - Cannot have global and tool-path as opinion at the same time. - Fikir olarak aynı anda hem genel yol hem de araç yolu kullanılamaz. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Fikir olarak aynı anda hem genel yol hem de araç yolu kullanılamaz. - Location of shim to access tool - Araca erişmek için dolgu konumu + Location where the tool will be installed. + Araca erişmek için dolgu konumu diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf index ef0f12b43..63d1210de 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf @@ -95,18 +95,18 @@ Tool '{1}' (version '{2}') was successfully installed. - Need either global or tool-path provided. - 需要提供全局或工具路径。 + Please specify either the global option (--global) or the tool path option (--tool-path). + 需要提供全局或工具路径。 - Cannot have global and tool-path as opinion at the same time. - 无法同时主张全局和工具路径。 + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + 无法同时主张全局和工具路径。 - Location of shim to access tool - 填充程序访问工具的位置 + Location where the tool will be installed. + 填充程序访问工具的位置 diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf index 8f73fc4f3..48bd8e3e5 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf @@ -95,18 +95,18 @@ Tool '{1}' (version '{2}') was successfully installed. - Need either global or tool-path provided. - 必須提供全域或工具路徑。 + Please specify either the global option (--global) or the tool path option (--tool-path). + 必須提供全域或工具路徑。 - Cannot have global and tool-path as opinion at the same time. - 無法同時將全域與工具路徑作為選項。 + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + 無法同時將全域與工具路徑作為選項。 - Location of shim to access tool - 存取工具的填充碼位置 + Location where the tool will be installed. + 存取工具的填充碼位置 diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf index cfb6cd7dd..2885762cc 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf @@ -12,11 +12,6 @@ Vypsat nástroje všech uživatelů - - The --global switch (-g) is currently required because only user wide tools are supported. - Přepínač --global (-g) se aktuálně vyžaduje, protože se podporují jenom nástroje pro všechny uživatele. - - Version Verze diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf index 3d396b4ef..9eabad841 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf @@ -12,11 +12,6 @@ Hiermit werden benutzerweite Tools aufgelistet. - - The --global switch (-g) is currently required because only user wide tools are supported. - Die Option --global (-g) ist aktuell erforderlich, weil nur benutzerweite Tools unterstützt werden. - - Version Version diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf index d68c19863..2db3a8d08 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf @@ -12,11 +12,6 @@ Enumera las herramientas para todos los usuarios. - - The --global switch (-g) is currently required because only user wide tools are supported. - El conmutador --global (g) se requiere actualmente porque solo se admiten herramientas para todos los usuarios. - - Version Versión diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf index 160010326..c0beb0fef 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf @@ -12,11 +12,6 @@ Listez les outils pour tous les utilisateurs. - - The --global switch (-g) is currently required because only user wide tools are supported. - Le commutateur --global (-g) est obligatoire, car seuls les outils à l'échelle des utilisateurs sont pris en charge. - - Version Version diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf index d942322f6..28e1a3014 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf @@ -12,11 +12,6 @@ Elenca gli strumenti a livello di utente. - - The --global switch (-g) is currently required because only user wide tools are supported. - L'opzione --global (-g) è attualmente obbligatoria perché sono supportati solo gli strumenti a livello di utente. - - Version Versione diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf index 02a2bf4bc..b0e1114dc 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf @@ -12,11 +12,6 @@ ユーザー全体のツールを一覧表示します。 - - The --global switch (-g) is currently required because only user wide tools are supported. - サポートされているのはユーザー全体のツールだけなので、現在 --global スイッチ (-g) が必要です。 - - Version バージョン diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf index 49a7ed8c5..5829435dc 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf @@ -12,11 +12,6 @@ 사용자 전체 도구를 나열합니다. - - The --global switch (-g) is currently required because only user wide tools are supported. - 사용자 전체 도구만 지원되므로 -global 스위치(-g)가 필요합니다. - - Version 버전 diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf index 1cca46ada..c6a02e125 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf @@ -12,11 +12,6 @@ Wyświetl listę narzędzi użytkownika. - - The --global switch (-g) is currently required because only user wide tools are supported. - Obecnie jest wymagany przełącznik --global (-g), ponieważ obsługiwane są tylko narzędzia użytkownika. - - Version Wersja diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf index c516fe0ed..e26992927 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf @@ -12,11 +12,6 @@ Listar as ferramentas para todo o usuário. - - The --global switch (-g) is currently required because only user wide tools are supported. - A opção --global (-g) é obrigatória, pois somente ferramentas para todo o usuário são compatíveis. - - Version Versão diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf index 8b9559832..d8b7343e4 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf @@ -12,11 +12,6 @@ Перечисление пользовательских инструментов. - - The --global switch (-g) is currently required because only user wide tools are supported. - Параметр "--global switch (-g)" сейчас обязателен, так как поддерживаются только инструменты уровня пользователя. - - Version Версия diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf index b281dcf54..0eca3acac 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf @@ -12,11 +12,6 @@ Kullanıcıya yönelik araçları listeleyin. - - The --global switch (-g) is currently required because only user wide tools are supported. - Yalnızca kullanıcı için araçlar desteklendiğinden --global anahtarı (-g) şu anda gereklidir. - - Version Sürüm diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf index 350b5eafc..34e56573d 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf @@ -12,11 +12,6 @@ 列出用户范围工具。 - - The --global switch (-g) is currently required because only user wide tools are supported. - 目前需要 --global 开关 (-g)，因为仅支持用户范围工具。 - - Version 版本 diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf index 5e8595d39..395b10be6 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf @@ -12,11 +12,6 @@ 列出全體使用者工具。 - - The --global switch (-g) is currently required because only user wide tools are supported. - 因為只支援適用於全體使用者的工具，所以目前必須有 --global 參數 (-g)。 - - Version 版本 diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf index 7d882fa9b..a43c7063a 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Je potřeba zadat buď globální cestu, nebo cestu k nástroji. + Please specify either the global option (--global) or the tool path option (--tool-path). + Je potřeba zadat buď globální cestu, nebo cestu k nástroji. - Location of shim to access tool - Umístění překrytí pro přístup k nástroji + Location where the tool was previously installed. + Umístění překrytí pro přístup k nástroji - Cannot have global and tool-path as opinion at the same time." - Globální cesta a cesta k nástroji nemůžou být zadané současně. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Globální cesta a cesta k nástroji nemůžou být zadané současně. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf index 035b5e799..f1b63122f 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Es muss entweder "global" oder "tool-path" angegeben werden. + Please specify either the global option (--global) or the tool path option (--tool-path). + Es muss entweder "global" oder "tool-path" angegeben werden. - Location of shim to access tool - Shim-Speicherort für Toolzugriff + Location where the tool was previously installed. + Shim-Speicherort für Toolzugriff - Cannot have global and tool-path as opinion at the same time." - Die gleichzeitige Angabe von "global" und "tool-path" ist nicht möglich. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Die gleichzeitige Angabe von "global" und "tool-path" ist nicht möglich. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf index 0dbf24486..0f64e95e5 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Se necesita una ruta global o de herramienta. + Please specify either the global option (--global) or the tool path option (--tool-path). + Se necesita una ruta global o de herramienta. - Location of shim to access tool - Ubicación de las correcciones de compatibilidad (shim) para acceder a la herramienta + Location where the tool was previously installed. + Ubicación de las correcciones de compatibilidad (shim) para acceder a la herramienta - Cannot have global and tool-path as opinion at the same time." - No puede tener una ruta global y de herramienta como opinión al mismo tiempo." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + No puede tener una ruta global y de herramienta como opinión al mismo tiempo." diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf index c712beb35..4cd67ae0a 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Un paramètre global ou tool-path doit être fourni. + Please specify either the global option (--global) or the tool path option (--tool-path). + Un paramètre global ou tool-path doit être fourni. - Location of shim to access tool - Emplacement de shim pour accéder à l'outil + Location where the tool was previously installed. + Emplacement de shim pour accéder à l'outil - Cannot have global and tool-path as opinion at the same time." - Impossible d'avoir une propriété opinion avec les paramètres global et tool-path en même temps." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Impossible d'avoir une propriété opinion avec les paramètres global et tool-path en même temps." diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf index cb816a3b1..20cc84342 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - È necessario specificare global o tool-path. + Please specify either the global option (--global) or the tool path option (--tool-path). + È necessario specificare global o tool-path. - Location of shim to access tool - Percorso dello shim per accedere allo strumento + Location where the tool was previously installed. + Percorso dello shim per accedere allo strumento - Cannot have global and tool-path as opinion at the same time." - Non è possibile specificare contemporaneamente global e tool-path come opzione." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Non è possibile specificare contemporaneamente global e tool-path come opzione." diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf index ce397e65b..1ed94e4dd 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - global か tool-path を指定する必要があります。 + Please specify either the global option (--global) or the tool path option (--tool-path). + global か tool-path を指定する必要があります。 - Location of shim to access tool - ツールにアクセスする shim の場所 + Location where the tool was previously installed. + ツールにアクセスする shim の場所 - Cannot have global and tool-path as opinion at the same time." - global と tool-path を意見として同時に指定することはできません。" + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + global と tool-path を意見として同時に指定することはできません。" diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf index 8bae59fc3..5384141e0 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - 전역 또는 도구 경로를 제공해야 합니다. + Please specify either the global option (--global) or the tool path option (--tool-path). + 전역 또는 도구 경로를 제공해야 합니다. - Location of shim to access tool - 도구에 액세스하는 shim 위치 + Location where the tool was previously installed. + 도구에 액세스하는 shim 위치 - Cannot have global and tool-path as opinion at the same time." - 전역 및 도구 경로를 의견으로 동시에 사용할 수 없습니다." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + 전역 및 도구 경로를 의견으로 동시에 사용할 수 없습니다." diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf index d740e76f3..d06a3abe9 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Należy podać ścieżkę globalną lub ścieżkę narzędzia. + Please specify either the global option (--global) or the tool path option (--tool-path). + Należy podać ścieżkę globalną lub ścieżkę narzędzia. - Location of shim to access tool - Lokalizacja podkładki na potrzeby dostępu do narzędzia + Location where the tool was previously installed. + Lokalizacja podkładki na potrzeby dostępu do narzędzia - Cannot have global and tool-path as opinion at the same time." - Nie można jednocześnie używać ścieżki globalnej i ścieżki narzędzia jako opinii. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Nie można jednocześnie używać ścieżki globalnej i ścieżki narzędzia jako opinii. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf index 0f7b58a01..82a487078 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - É necessário o caminho de ferramenta ou global fornecido. + Please specify either the global option (--global) or the tool path option (--tool-path). + É necessário o caminho de ferramenta ou global fornecido. - Location of shim to access tool - Local do shim para acessar a ferramenta + Location where the tool was previously installed. + Local do shim para acessar a ferramenta - Cannot have global and tool-path as opinion at the same time." - Não é possível ter o caminho de ferramenta e o global como opinião ao mesmo tempo." + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Não é possível ter o caminho de ferramenta e o global como opinião ao mesmo tempo." diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf index dca9f0751..0e1bfe321 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Требуется указать глобальный параметр или параметр tool-path. + Please specify either the global option (--global) or the tool path option (--tool-path). + Требуется указать глобальный параметр или параметр tool-path. - Location of shim to access tool - Расположение оболочки совместимости для доступа к инструменту + Location where the tool was previously installed. + Расположение оболочки совместимости для доступа к инструменту - Cannot have global and tool-path as opinion at the same time." - Невозможно указать глобальный параметр и параметр tool-path в качестве оценки одновременно. + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Невозможно указать глобальный параметр и параметр tool-path в качестве оценки одновременно. diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf index 99d02a31d..d57c84ab4 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - Genel yolun veya araç yolunun sağlanması gerekir. + Please specify either the global option (--global) or the tool path option (--tool-path). + Genel yolun veya araç yolunun sağlanması gerekir. - Location of shim to access tool - Araca erişmek için dolgu konumu + Location where the tool was previously installed. + Araca erişmek için dolgu konumu - Cannot have global and tool-path as opinion at the same time." - Fikir olarak aynı anda hem genel yol hem de araç yolu kullanılamaz.” + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + Fikir olarak aynı anda hem genel yol hem de araç yolu kullanılamaz.” diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf index a92746560..86f92fae5 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - 需要提供全局或工具路径。 + Please specify either the global option (--global) or the tool path option (--tool-path). + 需要提供全局或工具路径。 - Location of shim to access tool - 填充程序访问工具的位置 + Location where the tool was previously installed. + 填充程序访问工具的位置 - Cannot have global and tool-path as opinion at the same time." - 无法同时主张全局和工具路径。” + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + 无法同时主张全局和工具路径。” diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf index 277884b8a..a0d7000d7 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf @@ -48,18 +48,18 @@ - Need either global or tool-path provided. - 必須提供全域或工具路徑。 + Please specify either the global option (--global) or the tool path option (--tool-path). + 必須提供全域或工具路徑。 - Location of shim to access tool - 存取工具的填充碼位置 + Location where the tool was previously installed. + 存取工具的填充碼位置 - Cannot have global and tool-path as opinion at the same time." - 無法同時將全域與工具路徑作為選項。」 + (--global) conflicts with the tool path option (--tool-path). Please specify only one of the options. + 無法同時將全域與工具路徑作為選項。」 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf index c727e2635..168e4b3ae 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Příkaz {0} obsahuje úvodní tečku. + The command name '{0}' cannot begin with a leading dot (.). + Příkaz {0} obsahuje úvodní tečku. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf index 73003f8e1..36a6eab3a 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Der Befehl "{0}" weist einen vorangestellten Punkt auf. + The command name '{0}' cannot begin with a leading dot (.). + Der Befehl "{0}" weist einen vorangestellten Punkt auf. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf index 60b7a4ea4..239e43859 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - El comando "{0}" tiene un punto al principio. + The command name '{0}' cannot begin with a leading dot (.). + El comando "{0}" tiene un punto al principio. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf index 9e67eb29a..4fe6a8abd 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - La commande '{0}' commence par un point. + The command name '{0}' cannot begin with a leading dot (.). + La commande '{0}' commence par un point. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf index 50d90e87b..b70573748 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Il comando '{0}' presenta un punto iniziale. + The command name '{0}' cannot begin with a leading dot (.). + Il comando '{0}' presenta un punto iniziale. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf index aae349b91..9f4029221 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - コマンド '{0}' の先頭にドットがあります。 + The command name '{0}' cannot begin with a leading dot (.). + コマンド '{0}' の先頭にドットがあります。 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf index d4cd4f62c..9291769c0 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - 명령 '{0}' 앞에 점이 있습니다. + The command name '{0}' cannot begin with a leading dot (.). + 명령 '{0}' 앞에 점이 있습니다. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf index e4f75ce0f..a9ee05177 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - Polecenie „{0}” zawiera kropkę na początku. + The command name '{0}' cannot begin with a leading dot (.). + Polecenie „{0}” zawiera kropkę na początku. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf index c3000b9a2..74e740d5c 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - O comando '{0}' tem um ponto à esquerda. + The command name '{0}' cannot begin with a leading dot (.). + O comando '{0}' tem um ponto à esquerda. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf index f80bf3e3c..1ba1fd0c8 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - В начале команды "{0}" стоит точка. + The command name '{0}' cannot begin with a leading dot (.). + В начале команды "{0}" стоит точка. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf index 4cfc50678..5e5c301e1 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - '{0}' komutunun başında nokta var. + The command name '{0}' cannot begin with a leading dot (.). + '{0}' komutunun başında nokta var. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf index d8dd0cde3..91ade3fab 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - 命令“{0}”有一个前导点。 + The command name '{0}' cannot begin with a leading dot (.). + 命令“{0}”有一个前导点。 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf index 12f763df8..8f43162dd 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf @@ -859,8 +859,8 @@ setx PATH "%PATH%;{0}" - Command '{0}' has a leading dot. - 命令 '{0}' 的開頭有一個點 (.)。 + The command name '{0}' cannot begin with a leading dot (.). + 命令 '{0}' 的開頭有一個點 (.)。 From 149bdfd0faa813b767953888ae4f91eb1cfdfa77 Mon Sep 17 00:00:00 2001 From: William Lee Date: Wed, 21 Mar 2018 19:12:32 -0700 Subject: [PATCH 09/14] Change command order for tools (#8862) dotnet install tool -> dotnet tool install dotnet uninstall tool -> dotnet tool uninstall dotnet list tool -> dotnet tool list dotnet update tool -> dotnet tool update --- scripts/cli-test-env.bat | 8 +- .../LocalizableStrings.resx | 2 +- .../xlf/LocalizableStrings.cs.xlf | 4 +- .../xlf/LocalizableStrings.de.xlf | 4 +- .../xlf/LocalizableStrings.es.xlf | 4 +- .../xlf/LocalizableStrings.fr.xlf | 4 +- .../xlf/LocalizableStrings.it.xlf | 4 +- .../xlf/LocalizableStrings.ja.xlf | 4 +- .../xlf/LocalizableStrings.ko.xlf | 4 +- .../xlf/LocalizableStrings.pl.xlf | 4 +- .../xlf/LocalizableStrings.pt-BR.xlf | 4 +- .../xlf/LocalizableStrings.ru.xlf | 4 +- .../xlf/LocalizableStrings.tr.xlf | 4 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 4 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 4 +- src/dotnet/BuiltInCommandsCatalog.cs | 16 +-- src/dotnet/Parser.cs | 4 +- src/dotnet/ToolPackage/ToolPackageFactory.cs | 2 +- .../commands/dotnet-help/HelpUsageText.cs | 4 +- .../dotnet-help/LocalizableStrings.resx | 12 +- .../dotnet-help/xlf/LocalizableStrings.cs.xlf | 16 +-- .../dotnet-help/xlf/LocalizableStrings.de.xlf | 16 +-- .../dotnet-help/xlf/LocalizableStrings.es.xlf | 16 +-- .../dotnet-help/xlf/LocalizableStrings.fr.xlf | 16 +-- .../dotnet-help/xlf/LocalizableStrings.it.xlf | 16 +-- .../dotnet-help/xlf/LocalizableStrings.ja.xlf | 16 +-- .../dotnet-help/xlf/LocalizableStrings.ko.xlf | 16 +-- .../dotnet-help/xlf/LocalizableStrings.pl.xlf | 16 +-- .../xlf/LocalizableStrings.pt-BR.xlf | 16 +-- .../dotnet-help/xlf/LocalizableStrings.ru.xlf | 16 +-- .../dotnet-help/xlf/LocalizableStrings.tr.xlf | 16 +-- .../xlf/LocalizableStrings.zh-Hans.xlf | 16 +-- .../xlf/LocalizableStrings.zh-Hant.xlf | 16 +-- .../dotnet-install/InstallCommandParser.cs | 21 --- .../commands/dotnet-list/ListCommand.cs | 7 +- .../commands/dotnet-list/ListCommandParser.cs | 4 +- .../LocalizableStrings.resx | 4 +- .../ToolCommand.cs} | 31 +++-- .../ToolCommandParser.cs} | 13 +- .../install}/LocalizableStrings.resx | 0 .../install}/ProjectRestorer.cs | 2 +- .../install/ToolInstallCommand.cs} | 6 +- ...olInstallCommandLowLevelErrorConverter.cs} | 2 +- .../install/ToolInstallCommandParser.cs} | 8 +- .../install}/xlf/LocalizableStrings.cs.xlf | 0 .../install}/xlf/LocalizableStrings.de.xlf | 0 .../install}/xlf/LocalizableStrings.es.xlf | 0 .../install}/xlf/LocalizableStrings.fr.xlf | 0 .../install}/xlf/LocalizableStrings.it.xlf | 0 .../install}/xlf/LocalizableStrings.ja.xlf | 0 .../install}/xlf/LocalizableStrings.ko.xlf | 0 .../install}/xlf/LocalizableStrings.pl.xlf | 0 .../install}/xlf/LocalizableStrings.pt-BR.xlf | 0 .../install}/xlf/LocalizableStrings.ru.xlf | 0 .../install}/xlf/LocalizableStrings.tr.xlf | 0 .../xlf/LocalizableStrings.zh-Hans.xlf | 0 .../xlf/LocalizableStrings.zh-Hant.xlf | 0 .../list}/LocalizableStrings.resx | 0 .../list/ToolListCommand.cs} | 2 +- .../list/ToolListCommandParser.cs} | 8 +- .../list}/xlf/LocalizableStrings.cs.xlf | 0 .../list}/xlf/LocalizableStrings.de.xlf | 0 .../list}/xlf/LocalizableStrings.es.xlf | 0 .../list}/xlf/LocalizableStrings.fr.xlf | 0 .../list}/xlf/LocalizableStrings.it.xlf | 0 .../list}/xlf/LocalizableStrings.ja.xlf | 0 .../list}/xlf/LocalizableStrings.ko.xlf | 0 .../list}/xlf/LocalizableStrings.pl.xlf | 0 .../list}/xlf/LocalizableStrings.pt-BR.xlf | 0 .../list}/xlf/LocalizableStrings.ru.xlf | 0 .../list}/xlf/LocalizableStrings.tr.xlf | 0 .../list}/xlf/LocalizableStrings.zh-Hans.xlf | 0 .../list}/xlf/LocalizableStrings.zh-Hant.xlf | 0 .../uninstall}/LocalizableStrings.resx | 0 .../uninstall/ToolUninstallCommand.cs} | 10 +- ...UninstallCommandLowLevelErrorConverter.cs} | 6 +- .../uninstall/ToolUninstallCommandParser.cs} | 8 +- .../uninstall}/xlf/LocalizableStrings.cs.xlf | 0 .../uninstall}/xlf/LocalizableStrings.de.xlf | 0 .../uninstall}/xlf/LocalizableStrings.es.xlf | 0 .../uninstall}/xlf/LocalizableStrings.fr.xlf | 0 .../uninstall}/xlf/LocalizableStrings.it.xlf | 0 .../uninstall}/xlf/LocalizableStrings.ja.xlf | 0 .../uninstall}/xlf/LocalizableStrings.ko.xlf | 0 .../uninstall}/xlf/LocalizableStrings.pl.xlf | 0 .../xlf/LocalizableStrings.pt-BR.xlf | 0 .../uninstall}/xlf/LocalizableStrings.ru.xlf | 0 .../uninstall}/xlf/LocalizableStrings.tr.xlf | 0 .../xlf/LocalizableStrings.zh-Hans.xlf | 0 .../xlf/LocalizableStrings.zh-Hant.xlf | 0 .../update}/LocalizableStrings.resx | 0 .../update/ToolUpdateCommand.cs} | 14 +- .../update/ToolUpdateCommandParser.cs} | 8 +- .../update}/xlf/LocalizableStrings.cs.xlf | 0 .../update}/xlf/LocalizableStrings.de.xlf | 0 .../update}/xlf/LocalizableStrings.es.xlf | 0 .../update}/xlf/LocalizableStrings.fr.xlf | 0 .../update}/xlf/LocalizableStrings.it.xlf | 0 .../update}/xlf/LocalizableStrings.ja.xlf | 0 .../update}/xlf/LocalizableStrings.ko.xlf | 0 .../update}/xlf/LocalizableStrings.pl.xlf | 0 .../update}/xlf/LocalizableStrings.pt-BR.xlf | 0 .../update}/xlf/LocalizableStrings.ru.xlf | 0 .../update}/xlf/LocalizableStrings.tr.xlf | 0 .../xlf/LocalizableStrings.zh-Hans.xlf | 0 .../xlf/LocalizableStrings.zh-Hant.xlf | 0 .../xlf/LocalizableStrings.cs.xlf | 6 +- .../xlf/LocalizableStrings.de.xlf | 6 +- .../xlf/LocalizableStrings.es.xlf | 6 +- .../xlf/LocalizableStrings.fr.xlf | 6 +- .../xlf/LocalizableStrings.it.xlf | 6 +- .../xlf/LocalizableStrings.ja.xlf | 6 +- .../xlf/LocalizableStrings.ko.xlf | 6 +- .../xlf/LocalizableStrings.pl.xlf | 6 +- .../xlf/LocalizableStrings.pt-BR.xlf | 6 +- .../xlf/LocalizableStrings.ru.xlf | 6 +- .../xlf/LocalizableStrings.tr.xlf | 6 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 6 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 6 +- .../dotnet-uninstall/LocalizableStrings.resx | 129 ------------------ .../dotnet-uninstall/UninstallCommand.cs | 31 ----- .../xlf/LocalizableStrings.cs.xlf | 22 --- .../xlf/LocalizableStrings.de.xlf | 22 --- .../xlf/LocalizableStrings.es.xlf | 22 --- .../xlf/LocalizableStrings.fr.xlf | 22 --- .../xlf/LocalizableStrings.it.xlf | 22 --- .../xlf/LocalizableStrings.ja.xlf | 22 --- .../xlf/LocalizableStrings.ko.xlf | 22 --- .../xlf/LocalizableStrings.pl.xlf | 22 --- .../xlf/LocalizableStrings.pt-BR.xlf | 22 --- .../xlf/LocalizableStrings.ru.xlf | 22 --- .../xlf/LocalizableStrings.tr.xlf | 22 --- .../xlf/LocalizableStrings.zh-Hans.xlf | 22 --- .../xlf/LocalizableStrings.zh-Hant.xlf | 22 --- .../dotnet-update/LocalizableStrings.resx | 129 ------------------ .../commands/dotnet-update/UpdateCommand.cs | 30 ---- .../dotnet-update/UpdateCommandParser.cs | 20 --- .../xlf/LocalizableStrings.cs.xlf | 22 --- .../xlf/LocalizableStrings.de.xlf | 22 --- .../xlf/LocalizableStrings.es.xlf | 22 --- .../xlf/LocalizableStrings.fr.xlf | 22 --- .../xlf/LocalizableStrings.it.xlf | 22 --- .../xlf/LocalizableStrings.ja.xlf | 22 --- .../xlf/LocalizableStrings.ko.xlf | 22 --- .../xlf/LocalizableStrings.pl.xlf | 22 --- .../xlf/LocalizableStrings.pt-BR.xlf | 22 --- .../xlf/LocalizableStrings.ru.xlf | 22 --- .../xlf/LocalizableStrings.tr.xlf | 22 --- .../xlf/LocalizableStrings.zh-Hans.xlf | 22 --- .../xlf/LocalizableStrings.zh-Hant.xlf | 22 --- src/dotnet/dotnet.csproj | 18 ++- .../ToolPackageInstallerTests.cs | 2 +- .../ProjectRestorerMock.cs | 2 +- .../{InstallCommand.cs => ToolCommand.cs} | 6 +- ...ivenThatIWantToShowHelpForDotnetCommand.cs | 4 +- .../GivenDotnetInstallTool.cs | 8 +- .../GivenDotnetListReference.cs | 1 - ...andTests.cs => ToolInstallCommandTests.cs} | 116 ++++++++-------- ...ommandTests.cs => ToolListCommandTests.cs} | 12 +- ...dTests.cs => ToolUninstallCommandTests.cs} | 28 ++-- ...mandTests.cs => ToolUpdateCommandTests.cs} | 40 +++--- .../ParserTests/InstallToolParserTests.cs | 30 ++-- .../ParserTests/ListToolParserTests.cs | 8 +- .../ParserTests/UninstallToolParserTests.cs | 12 +- .../ParserTests/UpdateToolParserTests.cs | 28 ++-- 165 files changed, 345 insertions(+), 1421 deletions(-) delete mode 100644 src/dotnet/commands/dotnet-install/InstallCommandParser.cs rename src/dotnet/commands/{dotnet-install => dotnet-tool}/LocalizableStrings.resx (98%) rename src/dotnet/commands/{dotnet-install/InstallCommand.cs => dotnet-tool/ToolCommand.cs} (50%) rename src/dotnet/commands/{dotnet-uninstall/UninstallCommandParser.cs => dotnet-tool/ToolCommandParser.cs} (53%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/LocalizableStrings.resx (100%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/ProjectRestorer.cs (98%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool/InstallToolCommand.cs => dotnet-tool/install/ToolInstallCommand.cs} (98%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool/InstallToolCommandLowLevelErrorConverter.cs => dotnet-tool/install/ToolInstallCommandLowLevelErrorConverter.cs} (97%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool/InstallToolCommandParser.cs => dotnet-tool/install/ToolInstallCommandParser.cs} (90%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/xlf/LocalizableStrings.cs.xlf (100%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/xlf/LocalizableStrings.de.xlf (100%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/xlf/LocalizableStrings.es.xlf (100%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/xlf/LocalizableStrings.fr.xlf (100%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/xlf/LocalizableStrings.it.xlf (100%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/xlf/LocalizableStrings.ja.xlf (100%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/xlf/LocalizableStrings.ko.xlf (100%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/xlf/LocalizableStrings.pl.xlf (100%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/xlf/LocalizableStrings.pt-BR.xlf (100%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/xlf/LocalizableStrings.ru.xlf (100%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/xlf/LocalizableStrings.tr.xlf (100%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/xlf/LocalizableStrings.zh-Hans.xlf (100%) rename src/dotnet/commands/{dotnet-install/dotnet-install-tool => dotnet-tool/install}/xlf/LocalizableStrings.zh-Hant.xlf (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/LocalizableStrings.resx (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool/ListToolCommand.cs => dotnet-tool/list/ToolListCommand.cs} (98%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool/ListToolCommandParser.cs => dotnet-tool/list/ToolListCommandParser.cs} (81%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/xlf/LocalizableStrings.cs.xlf (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/xlf/LocalizableStrings.de.xlf (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/xlf/LocalizableStrings.es.xlf (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/xlf/LocalizableStrings.fr.xlf (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/xlf/LocalizableStrings.it.xlf (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/xlf/LocalizableStrings.ja.xlf (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/xlf/LocalizableStrings.ko.xlf (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/xlf/LocalizableStrings.pl.xlf (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/xlf/LocalizableStrings.pt-BR.xlf (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/xlf/LocalizableStrings.ru.xlf (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/xlf/LocalizableStrings.tr.xlf (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/xlf/LocalizableStrings.zh-Hans.xlf (100%) rename src/dotnet/commands/{dotnet-list/dotnet-list-tool => dotnet-tool/list}/xlf/LocalizableStrings.zh-Hant.xlf (100%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/LocalizableStrings.resx (100%) rename src/dotnet/commands/{dotnet-uninstall/tool/UninstallToolCommand.cs => dotnet-tool/uninstall/ToolUninstallCommand.cs} (94%) rename src/dotnet/commands/{dotnet-uninstall/tool/UninstallToolCommandLowLevelErrorConverter.cs => dotnet-tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs} (89%) rename src/dotnet/commands/{dotnet-uninstall/tool/UninstallToolCommandParser.cs => dotnet-tool/uninstall/ToolUninstallCommandParser.cs} (82%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/xlf/LocalizableStrings.cs.xlf (100%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/xlf/LocalizableStrings.de.xlf (100%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/xlf/LocalizableStrings.es.xlf (100%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/xlf/LocalizableStrings.fr.xlf (100%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/xlf/LocalizableStrings.it.xlf (100%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/xlf/LocalizableStrings.ja.xlf (100%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/xlf/LocalizableStrings.ko.xlf (100%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/xlf/LocalizableStrings.pl.xlf (100%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/xlf/LocalizableStrings.pt-BR.xlf (100%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/xlf/LocalizableStrings.ru.xlf (100%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/xlf/LocalizableStrings.tr.xlf (100%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/xlf/LocalizableStrings.zh-Hans.xlf (100%) rename src/dotnet/commands/{dotnet-uninstall/tool => dotnet-tool/uninstall}/xlf/LocalizableStrings.zh-Hant.xlf (100%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/LocalizableStrings.resx (100%) rename src/dotnet/commands/{dotnet-update/tool/UpdateToolCommand.cs => dotnet-tool/update/ToolUpdateCommand.cs} (95%) rename src/dotnet/commands/{dotnet-update/tool/UpdateToolCommandParser.cs => dotnet-tool/update/ToolUpdateCommandParser.cs} (89%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/xlf/LocalizableStrings.cs.xlf (100%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/xlf/LocalizableStrings.de.xlf (100%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/xlf/LocalizableStrings.es.xlf (100%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/xlf/LocalizableStrings.fr.xlf (100%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/xlf/LocalizableStrings.it.xlf (100%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/xlf/LocalizableStrings.ja.xlf (100%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/xlf/LocalizableStrings.ko.xlf (100%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/xlf/LocalizableStrings.pl.xlf (100%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/xlf/LocalizableStrings.pt-BR.xlf (100%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/xlf/LocalizableStrings.ru.xlf (100%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/xlf/LocalizableStrings.tr.xlf (100%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/xlf/LocalizableStrings.zh-Hans.xlf (100%) rename src/dotnet/commands/{dotnet-update/tool => dotnet-tool/update}/xlf/LocalizableStrings.zh-Hant.xlf (100%) rename src/dotnet/commands/{dotnet-install => dotnet-tool}/xlf/LocalizableStrings.cs.xlf (71%) rename src/dotnet/commands/{dotnet-install => dotnet-tool}/xlf/LocalizableStrings.de.xlf (71%) rename src/dotnet/commands/{dotnet-install => dotnet-tool}/xlf/LocalizableStrings.es.xlf (71%) rename src/dotnet/commands/{dotnet-install => dotnet-tool}/xlf/LocalizableStrings.fr.xlf (70%) rename src/dotnet/commands/{dotnet-install => dotnet-tool}/xlf/LocalizableStrings.it.xlf (71%) rename src/dotnet/commands/{dotnet-install => dotnet-tool}/xlf/LocalizableStrings.ja.xlf (70%) rename src/dotnet/commands/{dotnet-install => dotnet-tool}/xlf/LocalizableStrings.ko.xlf (73%) rename src/dotnet/commands/{dotnet-install => dotnet-tool}/xlf/LocalizableStrings.pl.xlf (72%) rename src/dotnet/commands/{dotnet-install => dotnet-tool}/xlf/LocalizableStrings.pt-BR.xlf (71%) rename src/dotnet/commands/{dotnet-install => dotnet-tool}/xlf/LocalizableStrings.ru.xlf (68%) rename src/dotnet/commands/{dotnet-install => dotnet-tool}/xlf/LocalizableStrings.tr.xlf (73%) rename src/dotnet/commands/{dotnet-install => dotnet-tool}/xlf/LocalizableStrings.zh-Hans.xlf (74%) rename src/dotnet/commands/{dotnet-install => dotnet-tool}/xlf/LocalizableStrings.zh-Hant.xlf (74%) delete mode 100644 src/dotnet/commands/dotnet-uninstall/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-uninstall/UninstallCommand.cs delete mode 100644 src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.cs.xlf delete mode 100644 src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.de.xlf delete mode 100644 src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.es.xlf delete mode 100644 src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.fr.xlf delete mode 100644 src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.it.xlf delete mode 100644 src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ja.xlf delete mode 100644 src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ko.xlf delete mode 100644 src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pl.xlf delete mode 100644 src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pt-BR.xlf delete mode 100644 src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ru.xlf delete mode 100644 src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.tr.xlf delete mode 100644 src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hans.xlf delete mode 100644 src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hant.xlf delete mode 100644 src/dotnet/commands/dotnet-update/LocalizableStrings.resx delete mode 100644 src/dotnet/commands/dotnet-update/UpdateCommand.cs delete mode 100644 src/dotnet/commands/dotnet-update/UpdateCommandParser.cs delete mode 100644 src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.cs.xlf delete mode 100644 src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.de.xlf delete mode 100644 src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.es.xlf delete mode 100644 src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.fr.xlf delete mode 100644 src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.it.xlf delete mode 100644 src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.ja.xlf delete mode 100644 src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.ko.xlf delete mode 100644 src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.pl.xlf delete mode 100644 src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.pt-BR.xlf delete mode 100644 src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.ru.xlf delete mode 100644 src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.tr.xlf delete mode 100644 src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.zh-Hans.xlf delete mode 100644 src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.zh-Hant.xlf rename test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/{InstallCommand.cs => ToolCommand.cs} (72%) rename test/dotnet.Tests/CommandTests/{InstallToolCommandTests.cs => ToolInstallCommandTests.cs} (79%) rename test/dotnet.Tests/CommandTests/{ListToolCommandTests.cs => ToolListCommandTests.cs} (97%) rename test/dotnet.Tests/CommandTests/{UninstallToolCommandTests.cs => ToolUninstallCommandTests.cs} (89%) rename test/dotnet.Tests/CommandTests/{UpdateToolCommandTests.cs => ToolUpdateCommandTests.cs} (87%) diff --git a/scripts/cli-test-env.bat b/scripts/cli-test-env.bat index 91a31c078..0fd84c053 100644 --- a/scripts/cli-test-env.bat +++ b/scripts/cli-test-env.bat @@ -10,11 +10,11 @@ for %%i in (%~dp0..\) DO ( title CLI Test (%CLI_REPO_ROOT%) REM Add Stage 2 CLI to path -set PATH=%CLI_REPO_ROOT%bin\2\win10-x64\dotnet;%PATH% +set PATH=%CLI_REPO_ROOT%bin\2\win-x64\dotnet;%PATH% set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 set DOTNET_MULTILEVEL_LOOKUP=0 set NUGET_PACKAGES=%CLI_REPO_ROOT%.nuget\packages -set TEST_PACKAGES=%CLI_REPO_ROOT%bin\2\win10-x64\test\packages -set TEST_ARTIFACTS=%CLI_REPO_ROOT%bin\2\win10-x64\test\artifacts -set PreviousStageProps=%CLI_REPO_ROOT%bin\2\win10-x64\PreviousStage.props +set TEST_PACKAGES=%CLI_REPO_ROOT%bin\2\win-x64\test\packages +set TEST_ARTIFACTS=%CLI_REPO_ROOT%bin\2\win-x64\test\artifacts +set PreviousStageProps=%CLI_REPO_ROOT%bin\2\win-x64\PreviousStage.props diff --git a/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx b/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx index 3b46d09d5..0f3baa4dd 100644 --- a/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx +++ b/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx @@ -151,7 +151,7 @@ Here are some options to fix this error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. \ No newline at end of file diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf index b98e0a4bb..6c8a84691 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf @@ -62,9 +62,9 @@ Tuto chybu můžete opravit pomocí některé z těchto možností: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Úspěšně se podařilo nainstalovat certifikát pro vývoj ASP.NET Core HTTPS Development Certificate. Pokud chcete certifikátu důvěřovat (platí jenom pro Windows a macOS), nainstalujte nejprve nástroj dev-certs. To uděláte tak, že spustíte dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final a potom dotnet-dev-certs https --trust. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf index c5b1970cc..ff35f87f0 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf @@ -62,9 +62,9 @@ Im Folgenden finden Sie einige Optionen, um diesen Fehler zu beheben: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Das ASP.NET Core-HTTPS-Entwicklungszertifikat wurde erfolgreich installiert. Um dem Zertifikat zu vertrauen (nur Windows und macOS), installieren Sie zuerst das Tool "dev-certs", indem Sie "dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final" und anschließend "dotnet-dev-certs https --trust" ausführen. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf index fa1e01cf1..44c0389eb 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf @@ -61,9 +61,9 @@ Estas son algunas opciones para corregir este error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ El certificado de desarrollo HTTPS de ASP.NET Core se ha instalado correctamente. Para confiar en el certificado (solo Windows y macOS), instale primero la herramienta dev-certs ejecutando "dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final" y, después, ejecute "dotnet-dev-certs https --trust". diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf index aaa8cfded..95953db3f 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf @@ -62,9 +62,9 @@ Voici quelques options pour corriger cette erreur : ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Le certificat de développement ASP.NET Core HTTPS a été installé. Pour approuver le certificat (Windows et macOS uniquement), installez d'abord l'outil dev-certs en exécutant 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final', puis exécutez 'dotnet-dev-certs https --trust'. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf index f0aa9cd81..b359ffe68 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf @@ -62,9 +62,9 @@ Ecco alcune opzioni per correggere questo errore: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Il certificato di sviluppo HTTPS di ASP.NET Core è stato installato. Per considerare attendibile il certificato (solo Windows e macOS), installare prima lo strumento dev-certs eseguendo 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' e quindi eseguire 'dotnet-dev-certs https --trust'. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf index 42c146c99..2632c0543 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf @@ -62,9 +62,9 @@ Here are some options to fix this error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ ASP.NET Core HTTPS 開発証明書が正常にインストールされました。 証明書を信頼する (Windows および macOS のみ) には、まず 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' を実行して dev-certs ツールをインストールし、次に 'dotnet-dev-certs https --trust' を実行します。 diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf index 4bd36c154..ab5a0750d 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf @@ -62,9 +62,9 @@ Here are some options to fix this error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ ASP.NET Core HTTPS 개발 인증서를 설치했습니다. 인증서를 신뢰하려면(Windows 및 macOS만 해당) 먼저 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final'을 실행하여 dev-certs 도구를 설치한 다음, 'dotnet-dev-certs https --trust'를 실행하세요. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf index f9c4c7e4f..96a9a22de 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf @@ -62,9 +62,9 @@ Oto kilka opcji naprawiania tego błędu: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Pomyślnie zainstalowano certyfikat deweloperski protokołu HTTPS programu ASP.NET Core. Aby ufać temu certyfikatowi (dotyczy tylko systemów Windows i macOS), najpierw zainstaluj narzędzie dev-certs, uruchamiając polecenie „dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final”, a następnie uruchom polecenie „dotnet-dev-certs https --trust”. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf index b0a55f54f..9a26ac428 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf @@ -62,9 +62,9 @@ Aqui estão algumas opções para corrigir este erro: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Certificado de Desenvolvimento HTTPS ASP.NET Core instalado com êxito. Para confiar no certificado (apenas Windows e macOS), primeiramente instale a ferramenta dev-certs executando ‘dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final’ e, em seguida, execute ‘dotnet-dev-certs https --trust’. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf index 53e8228c1..7d539fe75 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf @@ -62,9 +62,9 @@ Here are some options to fix this error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Сертификат разработки HTTPS для ASP.NET Core установлен. Чтобы сделать сертификат доверенным (только Windows и macOS), сначала установите инструмент dev-certs, выполнив команду "dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final", а затем выполните "dotnet-dev-certs https --trust". diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf index 7ce095994..10d1e33a4 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf @@ -62,9 +62,9 @@ Bu hatayı düzeltmek için bazı seçenekler: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ ASP.NET Core HTTPS Geliştirme Sertifikası başarıyla yüklendi. Sertifikaya güvenmek için (yalnızca Windows ve macOS) önce 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final', sonra 'dotnet-dev-certs https --trust' komutlarını çalıştırarak dev-certs aracını yükleyin. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf index 89d13dacf..43c95f582 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf @@ -62,9 +62,9 @@ Here are some options to fix this error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ 已成功安装 ASP.NET Core HTTPS 开发证书。 要信任证书(仅限 Windows 和 macOS)，请首先通过运行 "dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final" 安装 dev-certs 工具，然后运行 "dotnet-dev-certs https --trust"。 diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf index dac4c5015..6277f3a67 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf @@ -62,9 +62,9 @@ Here are some options to fix this error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. +To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ 已成功安裝 ASP.NET Core HTTPS 開發憑證。 若要信任此憑證 (僅限 Windows 與 macOS)，請先執行 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' 安裝 dev-certs 工具，然後再執行 'dotnet-dev-certs https --trust'。 diff --git a/src/dotnet/BuiltInCommandsCatalog.cs b/src/dotnet/BuiltInCommandsCatalog.cs index 75666ea65..3ec1db6ec 100644 --- a/src/dotnet/BuiltInCommandsCatalog.cs +++ b/src/dotnet/BuiltInCommandsCatalog.cs @@ -18,11 +18,9 @@ using Microsoft.DotNet.Tools.Run; using Microsoft.DotNet.Tools.Sln; using Microsoft.DotNet.Tools.Store; using Microsoft.DotNet.Tools.Test; -using Microsoft.DotNet.Tools.Uninstall; using Microsoft.DotNet.Tools.VSTest; using System.Collections.Generic; -using Microsoft.DotNet.Tools.Install; -using Microsoft.DotNet.Tools.Update; +using Microsoft.DotNet.Tools.Tool; namespace Microsoft.DotNet.Cli { @@ -147,17 +145,9 @@ namespace Microsoft.DotNet.Cli { Command = ParseCommand.Run }, - ["install"] = new BuiltInCommandMetadata + ["tool"] = new BuiltInCommandMetadata { - Command = InstallCommand.Run - }, - ["uninstall"] = new BuiltInCommandMetadata - { - Command = UninstallCommand.Run - }, - ["update"] = new BuiltInCommandMetadata - { - Command = UpdateCommand.Run + Command = ToolCommand.Run }, ["internal-reportinstallsuccess"] = new BuiltInCommandMetadata { diff --git a/src/dotnet/Parser.cs b/src/dotnet/Parser.cs index 29f39f9bc..59d356094 100644 --- a/src/dotnet/Parser.cs +++ b/src/dotnet/Parser.cs @@ -55,9 +55,7 @@ namespace Microsoft.DotNet.Cli Create.Command("vstest", ""), CompleteCommandParser.Complete(), InternalReportinstallsuccessCommandParser.InternalReportinstallsuccess(), - InstallCommandParser.Install(), - UninstallCommandParser.Uninstall(), - UpdateCommandParser.Update(), + ToolCommandParser.Tool(), CommonOptions.HelpOption(), Create.Option("--info", ""), Create.Option("-d", ""), diff --git a/src/dotnet/ToolPackage/ToolPackageFactory.cs b/src/dotnet/ToolPackage/ToolPackageFactory.cs index f3349db77..49be4af40 100644 --- a/src/dotnet/ToolPackage/ToolPackageFactory.cs +++ b/src/dotnet/ToolPackage/ToolPackageFactory.cs @@ -3,7 +3,7 @@ using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Configurer; -using Microsoft.DotNet.Tools.Install.Tool; +using Microsoft.DotNet.Tools.Tool.Install; using Microsoft.Extensions.EnvironmentAbstractions; namespace Microsoft.DotNet.ToolPackage diff --git a/src/dotnet/commands/dotnet-help/HelpUsageText.cs b/src/dotnet/commands/dotnet-help/HelpUsageText.cs index e8875c7f8..ae461c33a 100644 --- a/src/dotnet/commands/dotnet-help/HelpUsageText.cs +++ b/src/dotnet/commands/dotnet-help/HelpUsageText.cs @@ -28,9 +28,7 @@ path-to-application: msbuild {LocalizableStrings.MsBuildDefinition} vstest {LocalizableStrings.VsTestDefinition} store {LocalizableStrings.StoreDefinition} - install {LocalizableStrings.InstallDefinition} - uninstall {LocalizableStrings.UninstallDefinition} - update {LocalizableStrings.UpdateDefinition} + tool {LocalizableStrings.ToolDefinition} help {LocalizableStrings.HelpDefinition} {LocalizableStrings.CommonOptions}: diff --git a/src/dotnet/commands/dotnet-help/LocalizableStrings.resx b/src/dotnet/commands/dotnet-help/LocalizableStrings.resx index 1c3ad318d..e8aa3f752 100644 --- a/src/dotnet/commands/dotnet-help/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-help/LocalizableStrings.resx @@ -267,13 +267,7 @@ Path to additional deps.json file. - - Installs an item into the development environment. + + Modify tools. - - Uninstalls an item from the development environment. - - - Updates an item in the development environment. - - + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf index 186d1b446..c1f77737b 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf @@ -252,19 +252,9 @@ Ukládá zadaná nastavení do úložiště runtime. - - Installs an item into the development environment. - Nainstaluje položku do vývojového prostředí. - - - - Uninstalls an item from the development environment. - Odinstaluje položku z vývojového prostředí. - - - - Updates an item in the development environment. - Updates an item in the development environment. + + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf index 018663ad6..6ef28b768 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf @@ -252,19 +252,9 @@ Speichert die angegebenen Assemblys im Runtimespeicher. - - Installs an item into the development environment. - Installiert ein Element in der Entwicklungsumgebung. - - - - Uninstalls an item from the development environment. - Deinstalliert ein Element aus der Entwicklungsumgebung. - - - - Updates an item in the development environment. - Updates an item in the development environment. + + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf index bcd3332f3..c087f15e6 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf @@ -252,19 +252,9 @@ Almacena los ensamblados especificados en el almacén del tiempo de ejecución. - - Installs an item into the development environment. - Instala un elemento en el entorno de desarrollo. - - - - Uninstalls an item from the development environment. - Desinstala un elemento en el entorno de desarrollo. - - - - Updates an item in the development environment. - Updates an item in the development environment. + + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf index 4dfdfe158..7ed05b6d4 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf @@ -252,19 +252,9 @@ Stocke les assemblys spécifiés dans le magasin de runtimes. - - Installs an item into the development environment. - Installe un élément dans l'environnement de développement. - - - - Uninstalls an item from the development environment. - Désinstalle un élément dans l'environnement de développement. - - - - Updates an item in the development environment. - Updates an item in the development environment. + + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf index a0fed482d..ebf7f1a61 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf @@ -252,19 +252,9 @@ Memorizza gli assembly specificati nell'archivio di runtime. - - Installs an item into the development environment. - Installa un elemento nell'ambiente di sviluppo. - - - - Uninstalls an item from the development environment. - Disinstalla un elemento dall'ambiente di sviluppo. - - - - Updates an item in the development environment. - Updates an item in the development environment. + + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf index d6d7ba00b..c140004e9 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf @@ -252,19 +252,9 @@ 指定されたアセンブリを実行時ストアに格納します。 - - Installs an item into the development environment. - 項目を開発環境にインストールします。 - - - - Uninstalls an item from the development environment. - 項目を開発環境からアンインストールします。 - - - - Updates an item in the development environment. - Updates an item in the development environment. + + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf index 110c9a46f..8ae63114c 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf @@ -252,19 +252,9 @@ 지정된 어셈블리를 런타임 저장소에 저장합니다. - - Installs an item into the development environment. - 개발 환경에 항목을 설치합니다. - - - - Uninstalls an item from the development environment. - 개발 환경에서 항목을 제거합니다. - - - - Updates an item in the development environment. - Updates an item in the development environment. + + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf index 7983dd5f1..dd8049bf7 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf @@ -252,19 +252,9 @@ Przechowuje określone zestawy w magazynie środowiska uruchomieniowego. - - Installs an item into the development environment. - Instaluje element w środowisku deweloperskim. - - - - Uninstalls an item from the development environment. - Odinstalowuje element ze środowiska deweloperskiego. - - - - Updates an item in the development environment. - Updates an item in the development environment. + + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf index d6285b7ff..7d7dc099e 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf @@ -252,19 +252,9 @@ Armazena os assemblies especificados no repositório de tempo de execução. - - Installs an item into the development environment. - Instala um item no ambiente de desenvolvimento. - - - - Uninstalls an item from the development environment. - Desinstala um item do ambiente de desenvolvimento. - - - - Updates an item in the development environment. - Updates an item in the development environment. + + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf index ac73dc520..8fd85f944 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf @@ -252,19 +252,9 @@ Он сохраняет указанные сборки в хранилище среды выполнения. - - Installs an item into the development environment. - Устанавливает элемент в среде разработки. - - - - Uninstalls an item from the development environment. - Удаляет элемент из среды разработки. - - - - Updates an item in the development environment. - Updates an item in the development environment. + + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf index edb9777af..765a2ecfa 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf @@ -252,19 +252,9 @@ Belirtilen bütünleştirilmiş kodları çalışma zamanı deposunda depolar. - - Installs an item into the development environment. - Bir öğeyi geliştirme ortamına yükler. - - - - Uninstalls an item from the development environment. - Bir öğeyi geliştirme ortamından kaldırır. - - - - Updates an item in the development environment. - Updates an item in the development environment. + + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf index 93b544f6c..57b5a76d7 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf @@ -252,19 +252,9 @@ 在运行时存储中存储指定的程序集。 - - Installs an item into the development environment. - 将项目安装到开发环境中。 - - - - Uninstalls an item from the development environment. - 从开发环境中卸载项目。 - - - - Updates an item in the development environment. - Updates an item in the development environment. + + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf index e43b10609..204a0dcdb 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf @@ -252,19 +252,9 @@ 將指定組件儲存到執行階段存放區中。 - - Installs an item into the development environment. - 將項目安裝至部署環境。 - - - - Uninstalls an item from the development environment. - 將開發環境的項目解除安裝。 - - - - Updates an item in the development environment. - Updates an item in the development environment. + + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-install/InstallCommandParser.cs b/src/dotnet/commands/dotnet-install/InstallCommandParser.cs deleted file mode 100644 index 1d235f31d..000000000 --- a/src/dotnet/commands/dotnet-install/InstallCommandParser.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using Microsoft.DotNet.Cli.CommandLine; -using LocalizableStrings = Microsoft.DotNet.Tools.Install.LocalizableStrings; - -namespace Microsoft.DotNet.Cli -{ - internal static class InstallCommandParser - { - public static Command Install() - { - return Create.Command( - "install", - LocalizableStrings.CommandDescription, - Accept.NoArguments(), - CommonOptions.HelpOption(), - InstallToolCommandParser.InstallTool()); - } - } -} diff --git a/src/dotnet/commands/dotnet-list/ListCommand.cs b/src/dotnet/commands/dotnet-list/ListCommand.cs index 969a44179..cb0b67bc2 100644 --- a/src/dotnet/commands/dotnet-list/ListCommand.cs +++ b/src/dotnet/commands/dotnet-list/ListCommand.cs @@ -7,7 +7,6 @@ using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Tools.List.ProjectToProjectReferences; -using Microsoft.DotNet.Tools.List.Tool; namespace Microsoft.DotNet.Tools.List { @@ -24,10 +23,6 @@ namespace Microsoft.DotNet.Tools.List { "reference", o => new ListProjectToProjectReferencesCommand(o, ParseResult) - }, - { - "tool", - o => new ListToolCommand(o["tool"], ParseResult) } }; @@ -36,4 +31,4 @@ namespace Microsoft.DotNet.Tools.List return new ListCommand().RunCommand(args); } } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-list/ListCommandParser.cs b/src/dotnet/commands/dotnet-list/ListCommandParser.cs index 1f2bb48d8..5efba7e2c 100644 --- a/src/dotnet/commands/dotnet-list/ListCommandParser.cs +++ b/src/dotnet/commands/dotnet-list/ListCommandParser.cs @@ -4,7 +4,6 @@ using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Tools; using Microsoft.DotNet.Tools.List.ProjectToProjectReferences; -using Microsoft.DotNet.Tools.List.Tool; using LocalizableStrings = Microsoft.DotNet.Tools.List.LocalizableStrings; namespace Microsoft.DotNet.Cli @@ -20,7 +19,6 @@ namespace Microsoft.DotNet.Cli description: CommonLocalizableStrings.ArgumentsProjectDescription) .DefaultToCurrentDirectory(), CommonOptions.HelpOption(), - ListProjectToProjectReferencesCommandParser.ListProjectToProjectReferences(), - ListToolCommandParser.ListTool()); + ListProjectToProjectReferencesCommandParser.ListProjectToProjectReferences()); } } diff --git a/src/dotnet/commands/dotnet-install/LocalizableStrings.resx b/src/dotnet/commands/dotnet-tool/LocalizableStrings.resx similarity index 98% rename from src/dotnet/commands/dotnet-install/LocalizableStrings.resx rename to src/dotnet/commands/dotnet-tool/LocalizableStrings.resx index 75be146a8..13ec6c39b 100644 --- a/src/dotnet/commands/dotnet-install/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-tool/LocalizableStrings.resx @@ -121,6 +121,6 @@ .NET Install Command - Installs an item into the development environment. + Modify tools. - + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-install/InstallCommand.cs b/src/dotnet/commands/dotnet-tool/ToolCommand.cs similarity index 50% rename from src/dotnet/commands/dotnet-install/InstallCommand.cs rename to src/dotnet/commands/dotnet-tool/ToolCommand.cs index 11e823484..d6ab4ef38 100644 --- a/src/dotnet/commands/dotnet-install/InstallCommand.cs +++ b/src/dotnet/commands/dotnet-tool/ToolCommand.cs @@ -6,13 +6,16 @@ using System.Collections.Generic; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.Utils; -using Microsoft.DotNet.Tools.Install.Tool; +using Microsoft.DotNet.Tools.Tool.Install; +using Microsoft.DotNet.Tools.Tool.List; +using Microsoft.DotNet.Tools.Tool.Uninstall; +using Microsoft.DotNet.Tools.Tool.Update; -namespace Microsoft.DotNet.Tools.Install +namespace Microsoft.DotNet.Tools.Tool { - public class InstallCommand : DotNetTopLevelCommandBase + public class ToolCommand : DotNetTopLevelCommandBase { - protected override string CommandName => "install"; + protected override string CommandName => "tool"; protected override string FullCommandNameLocalized => LocalizableStrings.InstallFullCommandNameLocalized; protected override string ArgumentName => Constants.ProjectArgumentName; protected override string ArgumentDescriptionLocalized => CommonLocalizableStrings.ArgumentsProjectDescription; @@ -20,15 +23,27 @@ namespace Microsoft.DotNet.Tools.Install internal override Dictionary> SubCommands => new Dictionary> { - ["tool"] = - appliedOption => new InstallToolCommand( - appliedOption["tool"], + ["install"] = + appliedOption => new ToolInstallCommand( + appliedOption["install"], + ParseResult), + ["uninstall"] = + appliedOption => new ToolUninstallCommand( + appliedOption["uninstall"], + ParseResult), + ["update"] = + appliedOption => new ToolUpdateCommand( + appliedOption["update"], + ParseResult), + ["list"] = + appliedOption => new ListToolCommand( + appliedOption["list"], ParseResult) }; public static int Run(string[] args) { - var command = new InstallCommand(); + var command = new ToolCommand(); return command.RunCommand(args); } } diff --git a/src/dotnet/commands/dotnet-uninstall/UninstallCommandParser.cs b/src/dotnet/commands/dotnet-tool/ToolCommandParser.cs similarity index 53% rename from src/dotnet/commands/dotnet-uninstall/UninstallCommandParser.cs rename to src/dotnet/commands/dotnet-tool/ToolCommandParser.cs index ec6f4aa6a..e965964d3 100644 --- a/src/dotnet/commands/dotnet-uninstall/UninstallCommandParser.cs +++ b/src/dotnet/commands/dotnet-tool/ToolCommandParser.cs @@ -2,20 +2,23 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using Microsoft.DotNet.Cli.CommandLine; -using LocalizableStrings = Microsoft.DotNet.Tools.Uninstall.LocalizableStrings; +using LocalizableStrings = Microsoft.DotNet.Tools.Tool.LocalizableStrings; namespace Microsoft.DotNet.Cli { - internal static class UninstallCommandParser + internal static class ToolCommandParser { - public static Command Uninstall() + public static Command Tool() { return Create.Command( - "uninstall", + "tool", LocalizableStrings.CommandDescription, Accept.NoArguments(), CommonOptions.HelpOption(), - UninstallToolCommandParser.UninstallTool()); + ToolInstallCommandParser.ToolInstall(), + ToolUninstallCommandParser.ToolUninstall(), + ToolUpdateCommandParser.ToolUpdate(), + ToolListCommandParser.ToolList()); } } } diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/LocalizableStrings.resx b/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/LocalizableStrings.resx rename to src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/ProjectRestorer.cs b/src/dotnet/commands/dotnet-tool/install/ProjectRestorer.cs similarity index 98% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/ProjectRestorer.cs rename to src/dotnet/commands/dotnet-tool/install/ProjectRestorer.cs index 64a382d1e..dd05db478 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/ProjectRestorer.cs +++ b/src/dotnet/commands/dotnet-tool/install/ProjectRestorer.cs @@ -10,7 +10,7 @@ using Microsoft.DotNet.ToolPackage; using Microsoft.DotNet.PlatformAbstractions; using Microsoft.Extensions.EnvironmentAbstractions; -namespace Microsoft.DotNet.Tools.Install.Tool +namespace Microsoft.DotNet.Tools.Tool.Install { internal class ProjectRestorer : IProjectRestorer { diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommand.cs b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs similarity index 98% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommand.cs rename to src/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs index 36d1d1ab5..0977cd066 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommand.cs +++ b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs @@ -15,12 +15,12 @@ using Microsoft.DotNet.ToolPackage; using Microsoft.Extensions.EnvironmentAbstractions; using NuGet.Versioning; -namespace Microsoft.DotNet.Tools.Install.Tool +namespace Microsoft.DotNet.Tools.Tool.Install { internal delegate IShellShimRepository CreateShellShimRepository(DirectoryPath? nonGlobalLocation = null); internal delegate (IToolPackageStore, IToolPackageInstaller) CreateToolPackageStoreAndInstaller(DirectoryPath? nonGlobalLocation = null); - internal class InstallToolCommand : CommandBase + internal class ToolInstallCommand : CommandBase { private readonly IEnvironmentPathInstruction _environmentPathInstruction; private readonly IReporter _reporter; @@ -37,7 +37,7 @@ namespace Microsoft.DotNet.Tools.Install.Tool private readonly string _verbosity; private readonly string _toolPath; - public InstallToolCommand( + public ToolInstallCommand( AppliedOption appliedCommand, ParseResult parseResult, CreateToolPackageStoreAndInstaller createToolPackageStoreAndInstaller = null, diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommandLowLevelErrorConverter.cs b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandLowLevelErrorConverter.cs similarity index 97% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommandLowLevelErrorConverter.cs rename to src/dotnet/commands/dotnet-tool/install/ToolInstallCommandLowLevelErrorConverter.cs index ba3910003..e1596b0bb 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommandLowLevelErrorConverter.cs +++ b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandLowLevelErrorConverter.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using Microsoft.DotNet.ShellShim; using Microsoft.DotNet.ToolPackage; -namespace Microsoft.DotNet.Tools.Install.Tool +namespace Microsoft.DotNet.Tools.Tool.Install { internal static class InstallToolCommandLowLevelErrorConverter { diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommandParser.cs b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs similarity index 90% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommandParser.cs rename to src/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs index 6bb80d417..55a128724 100644 --- a/src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommandParser.cs +++ b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs @@ -2,15 +2,15 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using Microsoft.DotNet.Cli.CommandLine; -using LocalizableStrings = Microsoft.DotNet.Tools.Install.Tool.LocalizableStrings; +using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Install.LocalizableStrings; namespace Microsoft.DotNet.Cli { - internal static class InstallToolCommandParser + internal static class ToolInstallCommandParser { - public static Command InstallTool() + public static Command ToolInstall() { - return Create.Command("tool", + return Create.Command("install", LocalizableStrings.CommandDescription, Accept.ExactlyOneArgument(errorMessage: o => LocalizableStrings.SpecifyExactlyOnePackageId) .With(name: LocalizableStrings.PackageIdArgumentName, diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.cs.xlf rename to src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.de.xlf rename to src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.es.xlf rename to src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.fr.xlf rename to src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.it.xlf rename to src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ja.xlf rename to src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ko.xlf rename to src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pl.xlf rename to src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.pt-BR.xlf rename to src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.ru.xlf rename to src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.tr.xlf rename to src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hans.xlf rename to src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf diff --git a/src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf similarity index 100% rename from src/dotnet/commands/dotnet-install/dotnet-install-tool/xlf/LocalizableStrings.zh-Hant.xlf rename to src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/LocalizableStrings.resx b/src/dotnet/commands/dotnet-tool/list/LocalizableStrings.resx similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/LocalizableStrings.resx rename to src/dotnet/commands/dotnet-tool/list/LocalizableStrings.resx diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs b/src/dotnet/commands/dotnet-tool/list/ToolListCommand.cs similarity index 98% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs rename to src/dotnet/commands/dotnet-tool/list/ToolListCommand.cs index 9d00b45eb..df7616089 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs +++ b/src/dotnet/commands/dotnet-tool/list/ToolListCommand.cs @@ -11,7 +11,7 @@ using Microsoft.DotNet.Configurer; using Microsoft.DotNet.ToolPackage; using Microsoft.Extensions.EnvironmentAbstractions; -namespace Microsoft.DotNet.Tools.List.Tool +namespace Microsoft.DotNet.Tools.Tool.List { internal delegate IToolPackageStore CreateToolPackageStore(DirectoryPath? nonGlobalLocation = null); diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommandParser.cs b/src/dotnet/commands/dotnet-tool/list/ToolListCommandParser.cs similarity index 81% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommandParser.cs rename to src/dotnet/commands/dotnet-tool/list/ToolListCommandParser.cs index b8a5084aa..3144c85fe 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommandParser.cs +++ b/src/dotnet/commands/dotnet-tool/list/ToolListCommandParser.cs @@ -2,16 +2,16 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using Microsoft.DotNet.Cli.CommandLine; -using LocalizableStrings = Microsoft.DotNet.Tools.List.Tool.LocalizableStrings; +using LocalizableStrings = Microsoft.DotNet.Tools.Tool.List.LocalizableStrings; namespace Microsoft.DotNet.Cli { - internal static class ListToolCommandParser + internal static class ToolListCommandParser { - public static Command ListTool() + public static Command ToolList() { return Create.Command( - "tool", + "list", LocalizableStrings.CommandDescription, Create.Option( "-g|--global", diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.cs.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.cs.xlf rename to src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.cs.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.de.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.de.xlf rename to src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.de.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.es.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.es.xlf rename to src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.es.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.fr.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.fr.xlf rename to src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.fr.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.it.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.it.xlf rename to src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.it.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ja.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ja.xlf rename to src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ja.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ko.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ko.xlf rename to src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ko.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pl.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pl.xlf rename to src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pl.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pt-BR.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.pt-BR.xlf rename to src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pt-BR.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ru.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.ru.xlf rename to src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ru.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.tr.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.tr.xlf rename to src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.tr.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hans.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hans.xlf rename to src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hans.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hant.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-tool/xlf/LocalizableStrings.zh-Hant.xlf rename to src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hant.xlf diff --git a/src/dotnet/commands/dotnet-uninstall/tool/LocalizableStrings.resx b/src/dotnet/commands/dotnet-tool/uninstall/LocalizableStrings.resx similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/LocalizableStrings.resx rename to src/dotnet/commands/dotnet-tool/uninstall/LocalizableStrings.resx diff --git a/src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommand.cs b/src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommand.cs similarity index 94% rename from src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommand.cs rename to src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommand.cs index 87661cced..3347895e2 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommand.cs +++ b/src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommand.cs @@ -14,11 +14,11 @@ using Microsoft.DotNet.ShellShim; using Microsoft.DotNet.ToolPackage; using Microsoft.Extensions.EnvironmentAbstractions; -namespace Microsoft.DotNet.Tools.Uninstall.Tool +namespace Microsoft.DotNet.Tools.Tool.Uninstall { internal delegate IShellShimRepository CreateShellShimRepository(DirectoryPath? nonGlobalLocation = null); internal delegate IToolPackageStore CreateToolPackageStore(DirectoryPath? nonGlobalLocation = null); - internal class UninstallToolCommand : CommandBase + internal class ToolUninstallCommand : CommandBase { private readonly AppliedOption _options; private readonly IReporter _reporter; @@ -26,7 +26,7 @@ namespace Microsoft.DotNet.Tools.Uninstall.Tool private CreateShellShimRepository _createShellShimRepository; private CreateToolPackageStore _createToolPackageStore; - public UninstallToolCommand( + public ToolUninstallCommand( AppliedOption options, ParseResult result, CreateToolPackageStore createToolPackageStore = null, @@ -120,10 +120,10 @@ namespace Microsoft.DotNet.Tools.Uninstall.Tool package.Version.ToNormalizedString()).Green()); return 0; } - catch (Exception ex) when (UninstallToolCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex)) + catch (Exception ex) when (ToolUninstallCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex)) { throw new GracefulException( - messages: UninstallToolCommandLowLevelErrorConverter.GetUserFacingMessages(ex, packageId), + messages: ToolUninstallCommandLowLevelErrorConverter.GetUserFacingMessages(ex, packageId), verboseMessages: new[] {ex.ToString()}, isUserError: false); } diff --git a/src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommandLowLevelErrorConverter.cs b/src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs similarity index 89% rename from src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommandLowLevelErrorConverter.cs rename to src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs index 8169e5171..cf8d421ea 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommandLowLevelErrorConverter.cs +++ b/src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandLowLevelErrorConverter.cs @@ -6,9 +6,9 @@ using System.Collections.Generic; using Microsoft.DotNet.ShellShim; using Microsoft.DotNet.ToolPackage; -namespace Microsoft.DotNet.Tools.Uninstall.Tool +namespace Microsoft.DotNet.Tools.Tool.Uninstall { - internal static class UninstallToolCommandLowLevelErrorConverter + internal static class ToolUninstallCommandLowLevelErrorConverter { public static IEnumerable GetUserFacingMessages(Exception ex, PackageId packageId) { @@ -24,7 +24,7 @@ namespace Microsoft.DotNet.Tools.Uninstall.Tool { userFacingMessages = new[] { - String.Format( + string.Format( LocalizableStrings.FailedToUninstallTool, packageId, ex.Message) diff --git a/src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommandParser.cs b/src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandParser.cs similarity index 82% rename from src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommandParser.cs rename to src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandParser.cs index 028d44a0f..7d1efb54a 100644 --- a/src/dotnet/commands/dotnet-uninstall/tool/UninstallToolCommandParser.cs +++ b/src/dotnet/commands/dotnet-tool/uninstall/ToolUninstallCommandParser.cs @@ -2,15 +2,15 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using Microsoft.DotNet.Cli.CommandLine; -using LocalizableStrings = Microsoft.DotNet.Tools.Uninstall.Tool.LocalizableStrings; +using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Uninstall.LocalizableStrings; namespace Microsoft.DotNet.Cli { - internal static class UninstallToolCommandParser + internal static class ToolUninstallCommandParser { - public static Command UninstallTool() + public static Command ToolUninstall() { - return Create.Command("tool", + return Create.Command("uninstall", LocalizableStrings.CommandDescription, Accept.ExactlyOneArgument(errorMessage: o => LocalizableStrings.SpecifyExactlyOnePackageId) .With(name: LocalizableStrings.PackageIdArgumentName, diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.cs.xlf similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.cs.xlf rename to src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.cs.xlf diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.de.xlf similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.de.xlf rename to src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.de.xlf diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.es.xlf similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.es.xlf rename to src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.es.xlf diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.fr.xlf similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.fr.xlf rename to src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.fr.xlf diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.it.xlf similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.it.xlf rename to src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.it.xlf diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ja.xlf similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ja.xlf rename to src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ja.xlf diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ko.xlf similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ko.xlf rename to src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ko.xlf diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pl.xlf similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pl.xlf rename to src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pl.xlf diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pt-BR.xlf similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.pt-BR.xlf rename to src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pt-BR.xlf diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ru.xlf similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.ru.xlf rename to src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ru.xlf diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.tr.xlf similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.tr.xlf rename to src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.tr.xlf diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hans.xlf similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hans.xlf rename to src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hans.xlf diff --git a/src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hant.xlf similarity index 100% rename from src/dotnet/commands/dotnet-uninstall/tool/xlf/LocalizableStrings.zh-Hant.xlf rename to src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hant.xlf diff --git a/src/dotnet/commands/dotnet-update/tool/LocalizableStrings.resx b/src/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/LocalizableStrings.resx rename to src/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx diff --git a/src/dotnet/commands/dotnet-update/tool/UpdateToolCommand.cs b/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs similarity index 95% rename from src/dotnet/commands/dotnet-update/tool/UpdateToolCommand.cs rename to src/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs index 9bfe52902..62034e3ba 100644 --- a/src/dotnet/commands/dotnet-update/tool/UpdateToolCommand.cs +++ b/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs @@ -11,18 +11,18 @@ using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ShellShim; using Microsoft.DotNet.ToolPackage; -using Microsoft.DotNet.Tools.Install.Tool; -using Microsoft.DotNet.Tools.Uninstall.Tool; +using Microsoft.DotNet.Tools.Tool.Install; +using Microsoft.DotNet.Tools.Tool.Uninstall; using Microsoft.Extensions.EnvironmentAbstractions; -namespace Microsoft.DotNet.Tools.Update.Tool +namespace Microsoft.DotNet.Tools.Tool.Update { internal delegate IShellShimRepository CreateShellShimRepository(DirectoryPath? nonGlobalLocation = null); internal delegate (IToolPackageStore, IToolPackageInstaller) CreateToolPackageStoreAndInstaller( DirectoryPath? nonGlobalLocation = null); - internal class UpdateToolCommand : CommandBase + internal class ToolUpdateCommand : CommandBase { private readonly IReporter _reporter; private readonly IReporter _errorReporter; @@ -37,7 +37,7 @@ namespace Microsoft.DotNet.Tools.Update.Tool private readonly string _verbosity; private readonly string _toolPath; - public UpdateToolCommand(AppliedOption appliedCommand, + public ToolUpdateCommand(AppliedOption appliedCommand, ParseResult parseResult, CreateToolPackageStoreAndInstaller createToolPackageStoreAndInstaller = null, CreateShellShimRepository createShellShimRepository = null, @@ -207,14 +207,14 @@ namespace Microsoft.DotNet.Tools.Update.Tool uninstallAction(); } catch (Exception ex) - when (UninstallToolCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex)) + when (ToolUninstallCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex)) { var message = new List { string.Format(LocalizableStrings.UpdateToolFailed, _packageId) }; message.AddRange( - UninstallToolCommandLowLevelErrorConverter.GetUserFacingMessages(ex, _packageId)); + ToolUninstallCommandLowLevelErrorConverter.GetUserFacingMessages(ex, _packageId)); throw new GracefulException( messages: message, diff --git a/src/dotnet/commands/dotnet-update/tool/UpdateToolCommandParser.cs b/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs similarity index 89% rename from src/dotnet/commands/dotnet-update/tool/UpdateToolCommandParser.cs rename to src/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs index 00f21ceb1..637171188 100644 --- a/src/dotnet/commands/dotnet-update/tool/UpdateToolCommandParser.cs +++ b/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs @@ -2,15 +2,15 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using Microsoft.DotNet.Cli.CommandLine; -using LocalizableStrings = Microsoft.DotNet.Tools.Update.Tool.LocalizableStrings; +using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Update.LocalizableStrings; namespace Microsoft.DotNet.Cli { - internal static class UpdateToolCommandParser + internal static class ToolUpdateCommandParser { - public static Command Update() + public static Command ToolUpdate() { - return Create.Command("tool", + return Create.Command("update", LocalizableStrings.CommandDescription, Accept.ExactlyOneArgument(errorMessage: o => LocalizableStrings.SpecifyExactlyOnePackageId) .With(name: LocalizableStrings.PackageIdArgumentName, diff --git a/src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.cs.xlf rename to src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf diff --git a/src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.de.xlf rename to src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf diff --git a/src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.es.xlf rename to src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf diff --git a/src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.fr.xlf rename to src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf diff --git a/src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.it.xlf rename to src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf diff --git a/src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.ja.xlf rename to src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf diff --git a/src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.ko.xlf rename to src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf diff --git a/src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.pl.xlf rename to src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf diff --git a/src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.pt-BR.xlf rename to src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf diff --git a/src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.ru.xlf rename to src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf diff --git a/src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.tr.xlf rename to src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf diff --git a/src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.zh-Hans.xlf rename to src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf diff --git a/src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf similarity index 100% rename from src/dotnet/commands/dotnet-update/tool/xlf/LocalizableStrings.zh-Hant.xlf rename to src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf diff --git a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf similarity index 71% rename from src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.cs.xlf rename to src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf index 6ea7bd20c..43ca50f49 100644 --- a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf @@ -4,12 +4,12 @@ .NET Install Command - Příkaz Instalovat rozhraní .NET + .NET Install Command - Installs an item into the development environment. - Nainstaluje položku do vývojového prostředí. + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf similarity index 71% rename from src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.de.xlf rename to src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf index 7d871b47e..519c801a0 100644 --- a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf @@ -4,12 +4,12 @@ .NET Install Command - .NET-Installationsbefehl + .NET Install Command - Installs an item into the development environment. - Installiert ein Element in der Entwicklungsumgebung. + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf similarity index 71% rename from src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.es.xlf rename to src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf index 91724fd74..a1acafb62 100644 --- a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf @@ -4,12 +4,12 @@ .NET Install Command - Comando para la instalación de .NET + .NET Install Command - Installs an item into the development environment. - Instala un elemento en el entorno de desarrollo. + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf similarity index 70% rename from src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.fr.xlf rename to src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf index 54b608a2b..b7ee42611 100644 --- a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf @@ -4,12 +4,12 @@ .NET Install Command - Commande d'installation .NET + .NET Install Command - Installs an item into the development environment. - Installe un élément dans l'environnement de développement. + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf similarity index 71% rename from src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.it.xlf rename to src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf index 2b3e4b41a..f6d82cae4 100644 --- a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf @@ -4,12 +4,12 @@ .NET Install Command - Comando di installazione .NET + .NET Install Command - Installs an item into the development environment. - Installa un elemento nell'ambiente di sviluppo. + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf similarity index 70% rename from src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.ja.xlf rename to src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf index d02cab060..85af3a736 100644 --- a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf @@ -4,12 +4,12 @@ .NET Install Command - .NET インストール コマンド + .NET Install Command - Installs an item into the development environment. - 項目を開発環境にインストールします。 + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf similarity index 73% rename from src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.ko.xlf rename to src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf index d21a653d2..df410d0b9 100644 --- a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf @@ -4,12 +4,12 @@ .NET Install Command - .NET 설치 명령 + .NET Install Command - Installs an item into the development environment. - 개발 환경에 항목을 설치합니다. + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf similarity index 72% rename from src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.pl.xlf rename to src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf index e10cbde25..4d02180c8 100644 --- a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf @@ -4,12 +4,12 @@ .NET Install Command - Polecenie instalacji .NET + .NET Install Command - Installs an item into the development environment. - Instaluje element w środowisku deweloperskim. + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf similarity index 71% rename from src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.pt-BR.xlf rename to src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf index 6ff812be4..da48d30dd 100644 --- a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf @@ -4,12 +4,12 @@ .NET Install Command - Comando de instalação do .NET + .NET Install Command - Installs an item into the development environment. - Instala um item no ambiente de desenvolvimento. + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf similarity index 68% rename from src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.ru.xlf rename to src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf index 82fced65c..94e368063 100644 --- a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf @@ -4,12 +4,12 @@ .NET Install Command - Команда установки .NET + .NET Install Command - Installs an item into the development environment. - Устанавливает элемент в среде разработки. + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf similarity index 73% rename from src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.tr.xlf rename to src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf index 6ac5ab4a6..d0ae73c52 100644 --- a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf @@ -4,12 +4,12 @@ .NET Install Command - .NET Yükleme Komutu + .NET Install Command - Installs an item into the development environment. - Bir öğeyi geliştirme ortamına yükler. + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf similarity index 74% rename from src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.zh-Hans.xlf rename to src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf index b6cbdbe49..815fb5397 100644 --- a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf @@ -4,12 +4,12 @@ .NET Install Command - .NET 安装命令 + .NET Install Command - Installs an item into the development environment. - 将项目安装到开发环境中。 + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf similarity index 74% rename from src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.zh-Hant.xlf rename to src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf index 4addd8206..c55136c4e 100644 --- a/src/dotnet/commands/dotnet-install/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf @@ -4,12 +4,12 @@ .NET Install Command - .NET 安裝命令 + .NET Install Command - Installs an item into the development environment. - 將項目安裝至部署環境。 + Modify tools. + Modify tools. diff --git a/src/dotnet/commands/dotnet-uninstall/LocalizableStrings.resx b/src/dotnet/commands/dotnet-uninstall/LocalizableStrings.resx deleted file mode 100644 index 99440a870..000000000 --- a/src/dotnet/commands/dotnet-uninstall/LocalizableStrings.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - .NET Uninstall Command - - - Uninstalls an item from the development environment. - - - The NuGet package identifier of the tool to uninstall. - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/UninstallCommand.cs b/src/dotnet/commands/dotnet-uninstall/UninstallCommand.cs deleted file mode 100644 index 46f6231af..000000000 --- a/src/dotnet/commands/dotnet-uninstall/UninstallCommand.cs +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System; -using System.Collections.Generic; -using Microsoft.DotNet.Cli; -using Microsoft.DotNet.Cli.CommandLine; -using Microsoft.DotNet.Cli.Utils; -using Microsoft.DotNet.Tools.Uninstall.Tool; - -namespace Microsoft.DotNet.Tools.Uninstall -{ - public class UninstallCommand : DotNetTopLevelCommandBase - { - protected override string CommandName => "uninstall"; - protected override string FullCommandNameLocalized => LocalizableStrings.UninstallFullCommandName; - protected override string ArgumentName => Constants.ToolPackageArgumentName; - protected override string ArgumentDescriptionLocalized => LocalizableStrings.UninstallArgumentDescription; - - internal override Dictionary> SubCommands => - new Dictionary> - { - ["tool"] = options => new UninstallToolCommand(options["tool"], ParseResult) - }; - - public static int Run(string[] args) - { - return new UninstallCommand().RunCommand(args); - } - } -} diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.cs.xlf deleted file mode 100644 index 2f716a2ac..000000000 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.cs.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Uninstall Command - Příkaz k odinstalaci rozhraní .NET - - - - The NuGet package identifier of the tool to uninstall. - Identifikátor balíčku NuGet nástroje, který se má odinstalovat - - - - Uninstalls an item from the development environment. - Odinstaluje položku z vývojového prostředí. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.de.xlf deleted file mode 100644 index 69e060e00..000000000 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.de.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Uninstall Command - Befehl zur Deinstallation von .NET - - - - The NuGet package identifier of the tool to uninstall. - NuGet-Paketbezeichner des Tools, das deinstalliert werden soll. - - - - Uninstalls an item from the development environment. - Deinstalliert ein Element aus der Entwicklungsumgebung. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.es.xlf deleted file mode 100644 index c0a641af1..000000000 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.es.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Uninstall Command - Comando para la desinstalación de .NET - - - - The NuGet package identifier of the tool to uninstall. - Identificador del paquete de NuGet de la herramienta que se desinstalará. - - - - Uninstalls an item from the development environment. - Desinstala un elemento en el entorno de desarrollo. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.fr.xlf deleted file mode 100644 index e2f7c1baa..000000000 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.fr.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Uninstall Command - Commande de désinstallation .NET - - - - The NuGet package identifier of the tool to uninstall. - Identificateur de package NuGet de l'outil à désinstaller. - - - - Uninstalls an item from the development environment. - Désinstalle un élément dans l'environnement de développement. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.it.xlf deleted file mode 100644 index 279d42a9a..000000000 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.it.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Uninstall Command - Comando di disinstallazione .NET - - - - The NuGet package identifier of the tool to uninstall. - Identificatore del pacchetto NuGet dello strumento da disinstallare. - - - - Uninstalls an item from the development environment. - Disinstalla un elemento dall'ambiente di sviluppo. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ja.xlf deleted file mode 100644 index faa091d5c..000000000 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ja.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Uninstall Command - .NET アンインストール コマンド - - - - The NuGet package identifier of the tool to uninstall. - アンインストールするツールの NuGet パッケージ ID。 - - - - Uninstalls an item from the development environment. - 項目を開発環境からアンインストールします。 - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ko.xlf deleted file mode 100644 index f85e4370c..000000000 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ko.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Uninstall Command - .NET 제거 명령 - - - - The NuGet package identifier of the tool to uninstall. - 제거할 도구의 NuGet 패키지 식별자입니다. - - - - Uninstalls an item from the development environment. - 개발 환경에서 항목을 제거합니다. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pl.xlf deleted file mode 100644 index a8bd1b431..000000000 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pl.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Uninstall Command - Polecenie dezinstalacji platformy .NET - - - - The NuGet package identifier of the tool to uninstall. - Identyfikator pakietu NuGet narzędzia do odinstalowania. - - - - Uninstalls an item from the development environment. - Odinstalowuje element ze środowiska deweloperskiego. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pt-BR.xlf deleted file mode 100644 index be9a2b6d3..000000000 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.pt-BR.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Uninstall Command - Comando de desinstalação do .NET - - - - The NuGet package identifier of the tool to uninstall. - O identificador do pacote do NuGet da ferramenta a ser desinstalada. - - - - Uninstalls an item from the development environment. - Desinstala um item do ambiente de desenvolvimento. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ru.xlf deleted file mode 100644 index 5fe055778..000000000 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.ru.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Uninstall Command - Команда удаления .NET - - - - The NuGet package identifier of the tool to uninstall. - Идентификатор пакета NuGet удаляемого инструмента. - - - - Uninstalls an item from the development environment. - Удаляет элемент из среды разработки. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.tr.xlf deleted file mode 100644 index 6c058a453..000000000 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.tr.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Uninstall Command - .NET Kaldırma Komutu - - - - The NuGet package identifier of the tool to uninstall. - Kaldırılacak aracın NuGet paketi tanımlayıcısı. - - - - Uninstalls an item from the development environment. - Bir öğeyi geliştirme ortamından kaldırır. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hans.xlf deleted file mode 100644 index 283659d81..000000000 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hans.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Uninstall Command - .NET 卸载命令 - - - - The NuGet package identifier of the tool to uninstall. - 要卸载的工具的 NuGet 包标识符。 - - - - Uninstalls an item from the development environment. - 从开发环境中卸载项目。 - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hant.xlf deleted file mode 100644 index 24e0532e4..000000000 --- a/src/dotnet/commands/dotnet-uninstall/xlf/LocalizableStrings.zh-Hant.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Uninstall Command - .NET 解除安裝命令 - - - - The NuGet package identifier of the tool to uninstall. - 要解除安裝之工具的 NuGet 套件識別碼。 - - - - Uninstalls an item from the development environment. - 將開發環境的項目解除安裝。 - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-update/LocalizableStrings.resx b/src/dotnet/commands/dotnet-update/LocalizableStrings.resx deleted file mode 100644 index b2c5e6d30..000000000 --- a/src/dotnet/commands/dotnet-update/LocalizableStrings.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - .NET Update Command - - - Updates an item in the development environment. - - - The NuGet package identifier of the tool to update. - - diff --git a/src/dotnet/commands/dotnet-update/UpdateCommand.cs b/src/dotnet/commands/dotnet-update/UpdateCommand.cs deleted file mode 100644 index 2a37ffd1a..000000000 --- a/src/dotnet/commands/dotnet-update/UpdateCommand.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System; -using System.Collections.Generic; -using Microsoft.DotNet.Cli; -using Microsoft.DotNet.Cli.CommandLine; -using Microsoft.DotNet.Cli.Utils; - -namespace Microsoft.DotNet.Tools.Update -{ - public class UpdateCommand : DotNetTopLevelCommandBase - { - protected override string CommandName => "update"; - protected override string FullCommandNameLocalized => LocalizableStrings.UpdateFullCommandName; - protected override string ArgumentName => Constants.ToolPackageArgumentName; - protected override string ArgumentDescriptionLocalized => LocalizableStrings.UpdateArgumentDescription; - - internal override Dictionary> SubCommands => - new Dictionary> - { - ["tool"] = options => new Tool.UpdateToolCommand(options["tool"], ParseResult) - }; - - public static int Run(string[] args) - { - return new UpdateCommand().RunCommand(args); - } - } -} diff --git a/src/dotnet/commands/dotnet-update/UpdateCommandParser.cs b/src/dotnet/commands/dotnet-update/UpdateCommandParser.cs deleted file mode 100644 index 17c1adfe1..000000000 --- a/src/dotnet/commands/dotnet-update/UpdateCommandParser.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using Microsoft.DotNet.Cli.CommandLine; - -namespace Microsoft.DotNet.Cli -{ - internal static class UpdateCommandParser - { - public static Command Update() - { - return Create.Command( - "update", - Tools.Update.LocalizableStrings.CommandDescription, - Accept.NoArguments(), - CommonOptions.HelpOption(), - UpdateToolCommandParser.Update()); - } - } -} diff --git a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.cs.xlf deleted file mode 100644 index ece6d54c0..000000000 --- a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.cs.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Update Command - .NET Update Command - - - - Updates an item in the development environment. - Updates an item in the development environment. - - - - The NuGet package identifier of the tool to update. - The NuGet package identifier of the tool to update. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.de.xlf deleted file mode 100644 index 1d7936f5d..000000000 --- a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.de.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Update Command - .NET Update Command - - - - Updates an item in the development environment. - Updates an item in the development environment. - - - - The NuGet package identifier of the tool to update. - The NuGet package identifier of the tool to update. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.es.xlf deleted file mode 100644 index ead4dc655..000000000 --- a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.es.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Update Command - .NET Update Command - - - - Updates an item in the development environment. - Updates an item in the development environment. - - - - The NuGet package identifier of the tool to update. - The NuGet package identifier of the tool to update. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.fr.xlf deleted file mode 100644 index cef466edd..000000000 --- a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.fr.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Update Command - .NET Update Command - - - - Updates an item in the development environment. - Updates an item in the development environment. - - - - The NuGet package identifier of the tool to update. - The NuGet package identifier of the tool to update. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.it.xlf deleted file mode 100644 index 790f68c1d..000000000 --- a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.it.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Update Command - .NET Update Command - - - - Updates an item in the development environment. - Updates an item in the development environment. - - - - The NuGet package identifier of the tool to update. - The NuGet package identifier of the tool to update. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.ja.xlf deleted file mode 100644 index 1832a8731..000000000 --- a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.ja.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Update Command - .NET Update Command - - - - Updates an item in the development environment. - Updates an item in the development environment. - - - - The NuGet package identifier of the tool to update. - The NuGet package identifier of the tool to update. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.ko.xlf deleted file mode 100644 index aa24da83b..000000000 --- a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.ko.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Update Command - .NET Update Command - - - - Updates an item in the development environment. - Updates an item in the development environment. - - - - The NuGet package identifier of the tool to update. - The NuGet package identifier of the tool to update. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.pl.xlf deleted file mode 100644 index 9094f057e..000000000 --- a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.pl.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Update Command - .NET Update Command - - - - Updates an item in the development environment. - Updates an item in the development environment. - - - - The NuGet package identifier of the tool to update. - The NuGet package identifier of the tool to update. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.pt-BR.xlf deleted file mode 100644 index 1247ed8e7..000000000 --- a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.pt-BR.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Update Command - .NET Update Command - - - - Updates an item in the development environment. - Updates an item in the development environment. - - - - The NuGet package identifier of the tool to update. - The NuGet package identifier of the tool to update. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.ru.xlf deleted file mode 100644 index c0de3f963..000000000 --- a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.ru.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Update Command - .NET Update Command - - - - Updates an item in the development environment. - Updates an item in the development environment. - - - - The NuGet package identifier of the tool to update. - The NuGet package identifier of the tool to update. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.tr.xlf deleted file mode 100644 index 2053d884a..000000000 --- a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.tr.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Update Command - .NET Update Command - - - - Updates an item in the development environment. - Updates an item in the development environment. - - - - The NuGet package identifier of the tool to update. - The NuGet package identifier of the tool to update. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.zh-Hans.xlf deleted file mode 100644 index 650ec901e..000000000 --- a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.zh-Hans.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Update Command - .NET Update Command - - - - Updates an item in the development environment. - Updates an item in the development environment. - - - - The NuGet package identifier of the tool to update. - The NuGet package identifier of the tool to update. - - - - - \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.zh-Hant.xlf deleted file mode 100644 index f4067e882..000000000 --- a/src/dotnet/commands/dotnet-update/xlf/LocalizableStrings.zh-Hant.xlf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - .NET Update Command - .NET Update Command - - - - Updates an item in the development environment. - Updates an item in the development environment. - - - - The NuGet package identifier of the tool to update. - The NuGet package identifier of the tool to update. - - - - - \ No newline at end of file diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index af0e16264..9705c5802 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -16,33 +16,31 @@ - + - - - - + - + - - - - + + + + + diff --git a/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs b/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs index 848849ba4..3f939f1fe 100644 --- a/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs +++ b/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs @@ -12,7 +12,7 @@ using Microsoft.DotNet.Tools.Test.Utilities; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Tools; -using Microsoft.DotNet.Tools.Install.Tool; +using Microsoft.DotNet.Tools.Tool.Install; using Microsoft.DotNet.Tools.Tests.ComponentMocks; using Microsoft.Extensions.DependencyModel.Tests; using Microsoft.Extensions.EnvironmentAbstractions; diff --git a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ProjectRestorerMock.cs b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ProjectRestorerMock.cs index 3e491140f..7d7f34849 100644 --- a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ProjectRestorerMock.cs +++ b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ProjectRestorerMock.cs @@ -9,7 +9,7 @@ using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ToolPackage; using Microsoft.DotNet.Tools; -using Microsoft.DotNet.Tools.Install.Tool; +using Microsoft.DotNet.Tools.Tool.Install; using Microsoft.Extensions.EnvironmentAbstractions; using NuGet.Versioning; diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/InstallCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/ToolCommand.cs similarity index 72% rename from test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/InstallCommand.cs rename to test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/ToolCommand.cs index ee1daa874..3a3589f73 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/InstallCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/ToolCommand.cs @@ -5,16 +5,16 @@ using Microsoft.DotNet.Cli.Utils; namespace Microsoft.DotNet.Tools.Test.Utilities { - public sealed class InstallCommand : DotnetCommand + public sealed class ToolCommand : DotnetCommand { public override CommandResult Execute(string args = "") { - return base.Execute($"install {args}"); + return base.Execute($"tool {args}"); } public override CommandResult ExecuteWithCapturedOutput(string args = "") { - return base.ExecuteWithCapturedOutput($"install {args}"); + return base.ExecuteWithCapturedOutput($"tool {args}"); } } } diff --git a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs index 46d5303a0..7556b8583 100644 --- a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs +++ b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs @@ -39,9 +39,7 @@ SDK commands: msbuild Runs Microsoft Build Engine (MSBuild). vstest Runs Microsoft Test Execution Command Line Tool. store Stores the specified assemblies in the runtime store. - install Installs an item into the development environment. - uninstall Uninstalls an item from the development environment. - update Updates an item in the development environment. + tool Modify tools. help Show help. Common options: diff --git a/test/dotnet-install-tool.Tests/GivenDotnetInstallTool.cs b/test/dotnet-install-tool.Tests/GivenDotnetInstallTool.cs index 8fecb093d..c5c3988e5 100644 --- a/test/dotnet-install-tool.Tests/GivenDotnetInstallTool.cs +++ b/test/dotnet-install-tool.Tests/GivenDotnetInstallTool.cs @@ -13,8 +13,8 @@ namespace Microsoft.DotNet.Cli.Install.Tests [Fact] public void ItRunsWithQuietVerbosityByDefault() { - var result = new InstallCommand() - .ExecuteWithCapturedOutput("tool -g nonexistent_tool_package"); + var result = new ToolCommand() + .ExecuteWithCapturedOutput("install -g nonexistent_tool_package"); result .Should() @@ -26,8 +26,8 @@ namespace Microsoft.DotNet.Cli.Install.Tests [Fact] public void ItRunsWithTheSpecifiedVerbosity() { - var result = new InstallCommand() - .ExecuteWithCapturedOutput("tool -g -v:m nonexistent_tool_package"); + var result = new ToolCommand() + .ExecuteWithCapturedOutput("install -g -v:m nonexistent_tool_package"); result .Should() diff --git a/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs b/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs index 8cfbc7173..12766e983 100644 --- a/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs +++ b/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs @@ -33,7 +33,6 @@ Options: Commands: reference .NET Core Project-to-Project dependency viewer - tool Lists installed tools in the current development environment. "; const string FrameworkNet451Arg = "-f net451"; diff --git a/test/dotnet.Tests/CommandTests/InstallToolCommandTests.cs b/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs similarity index 79% rename from test/dotnet.Tests/CommandTests/InstallToolCommandTests.cs rename to test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs index 923b34fa7..89ea673d2 100644 --- a/test/dotnet.Tests/CommandTests/InstallToolCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs @@ -11,7 +11,7 @@ using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ToolPackage; using Microsoft.DotNet.Tools; -using Microsoft.DotNet.Tools.Install.Tool; +using Microsoft.DotNet.Tools.Tool.Install; using Microsoft.DotNet.Tools.Tests.ComponentMocks; using Microsoft.DotNet.Tools.Test.Utilities; using Microsoft.Extensions.DependencyModel.Tests; @@ -20,12 +20,12 @@ using Newtonsoft.Json; using Xunit; using Parser = Microsoft.DotNet.Cli.Parser; using System.Runtime.InteropServices; -using LocalizableStrings = Microsoft.DotNet.Tools.Install.Tool.LocalizableStrings; +using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Install.LocalizableStrings; using Microsoft.DotNet.ShellShim; namespace Microsoft.DotNet.Tests.Commands { - public class InstallToolCommandTests + public class ToolInstallCommandTests { private readonly IFileSystem _fileSystem; private readonly IToolPackageStore _toolPackageStore; @@ -40,7 +40,7 @@ namespace Microsoft.DotNet.Tests.Commands private const string PackageId = "global.tool.console.demo"; private const string PackageVersion = "1.0.4"; - public InstallToolCommandTests() + public ToolInstallCommandTests() { _reporter = new BufferedReporter(); _fileSystem = new FileSystemMockBuilder().Build(); @@ -51,16 +51,16 @@ namespace Microsoft.DotNet.Tests.Commands new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim); _createToolPackageStoreAndInstaller = (_) => (_toolPackageStore, CreateToolPackageInstaller()); - ParseResult result = Parser.Instance.Parse($"dotnet install tool -g {PackageId}"); - _appliedCommand = result["dotnet"]["install"]["tool"]; + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId}"); + _appliedCommand = result["dotnet"]["tool"]["install"]; var parser = Parser.Instance; - _parseResult = parser.ParseFrom("dotnet install", new[] {"tool", PackageId}); + _parseResult = parser.ParseFrom("dotnet tool", new[] {"install", "-g", PackageId}); } [Fact] public void WhenRunWithPackageIdItShouldCreateValidShim() { - var installToolCommand = new InstallToolCommand(_appliedCommand, + var installToolCommand = new ToolInstallCommand(_appliedCommand, _parseResult, _createToolPackageStoreAndInstaller, _createShellShimRepository, @@ -81,10 +81,10 @@ namespace Microsoft.DotNet.Tests.Commands public void WhenRunWithPackageIdWithSourceItShouldCreateValidShim() { const string sourcePath = "http://mysouce.com"; - ParseResult result = Parser.Instance.Parse($"dotnet install tool -g {PackageId} --source-feed {sourcePath}"); - AppliedOption appliedCommand = result["dotnet"]["install"]["tool"]; + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --source-feed {sourcePath}"); + AppliedOption appliedCommand = result["dotnet"]["tool"]["install"]; ParseResult parseResult = - Parser.Instance.ParseFrom("dotnet install", new[] { "tool", PackageId, "--source-feed", sourcePath }); + Parser.Instance.ParseFrom("dotnet tool", new[] { "install", "-g", PackageId, "--source-feed", sourcePath }); var toolToolPackageInstaller = CreateToolPackageInstaller( @@ -104,14 +104,14 @@ namespace Microsoft.DotNet.Tests.Commands } }); - var installToolCommand = new InstallToolCommand(appliedCommand, + var installCommand = new ToolInstallCommand(appliedCommand, parseResult, (_) => (_toolPackageStore, toolToolPackageInstaller), _createShellShimRepository, _environmentPathInstructionMock, _reporter); - installToolCommand.Execute().Should().Be(0); + installCommand.Execute().Should().Be(0); // It is hard to simulate shell behavior. Only Assert shim can point to executable dll _fileSystem.File.Exists(ExpectedCommandPath()) @@ -125,14 +125,14 @@ namespace Microsoft.DotNet.Tests.Commands [Fact] public void WhenRunWithPackageIdItShouldShowPathInstruction() { - var installToolCommand = new InstallToolCommand(_appliedCommand, + var installCommand = new ToolInstallCommand(_appliedCommand, _parseResult, _createToolPackageStoreAndInstaller, _createShellShimRepository, _environmentPathInstructionMock, _reporter); - installToolCommand.Execute().Should().Be(0); + installCommand.Execute().Should().Be(0); _reporter.Lines.First().Should().Be(EnvironmentPathInstructionMock.MockInstructionText); } @@ -144,7 +144,7 @@ namespace Microsoft.DotNet.Tests.Commands CreateToolPackageInstaller( installCallback: () => throw new ToolPackageException("Simulated error")); - var installToolCommand = new InstallToolCommand( + var installCommand = new ToolInstallCommand( _appliedCommand, _parseResult, (_) => (_toolPackageStore, toolPackageInstaller), @@ -152,7 +152,7 @@ namespace Microsoft.DotNet.Tests.Commands _environmentPathInstructionMock, _reporter); - Action a = () => installToolCommand.Execute(); + Action a = () => installCommand.Execute(); a.ShouldThrow().And.Message .Should().Contain( @@ -167,7 +167,7 @@ namespace Microsoft.DotNet.Tests.Commands { _fileSystem.File.CreateEmptyFile(ExpectedCommandPath()); // Create conflict shim - var installToolCommand = new InstallToolCommand( + var installCommand = new ToolInstallCommand( _appliedCommand, _parseResult, _createToolPackageStoreAndInstaller, @@ -175,7 +175,7 @@ namespace Microsoft.DotNet.Tests.Commands _environmentPathInstructionMock, _reporter); - Action a = () => installToolCommand.Execute(); + Action a = () => installCommand.Execute(); a.ShouldThrow().And.Message .Should().Contain(string.Format( @@ -192,7 +192,7 @@ namespace Microsoft.DotNet.Tests.Commands CreateToolPackageInstaller( installCallback: () => throw new ToolConfigurationException("Simulated error")); - var installToolCommand = new InstallToolCommand( + var installCommand = new ToolInstallCommand( _appliedCommand, _parseResult, (_) => (_toolPackageStore, toolPackageInstaller), @@ -200,7 +200,7 @@ namespace Microsoft.DotNet.Tests.Commands _environmentPathInstructionMock, _reporter); - Action a = () => installToolCommand.Execute(); + Action a = () => installCommand.Execute(); a.ShouldThrow().And.Message .Should().Contain( @@ -214,7 +214,7 @@ namespace Microsoft.DotNet.Tests.Commands [Fact] public void WhenRunWithPackageIdItShouldShowSuccessMessage() { - var installToolCommand = new InstallToolCommand( + var installCommand = new ToolInstallCommand( _appliedCommand, _parseResult, _createToolPackageStoreAndInstaller, @@ -222,7 +222,7 @@ namespace Microsoft.DotNet.Tests.Commands new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), _reporter); - installToolCommand.Execute().Should().Be(0); + installCommand.Execute().Should().Be(0); _reporter .Lines @@ -238,10 +238,10 @@ namespace Microsoft.DotNet.Tests.Commands public void WhenRunWithInvalidVersionItShouldThrow() { const string invalidVersion = "!NotValidVersion!"; - ParseResult result = Parser.Instance.Parse($"dotnet install tool -g {PackageId} --version {invalidVersion}"); - AppliedOption appliedCommand = result["dotnet"]["install"]["tool"]; + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {invalidVersion}"); + AppliedOption appliedCommand = result["dotnet"]["tool"]["install"]; - var installToolCommand = new InstallToolCommand( + var installCommand = new ToolInstallCommand( appliedCommand, result, _createToolPackageStoreAndInstaller, @@ -249,7 +249,7 @@ namespace Microsoft.DotNet.Tests.Commands new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), _reporter); - Action action = () => installToolCommand.Execute(); + Action action = () => installCommand.Execute(); action .ShouldThrow() @@ -261,10 +261,10 @@ namespace Microsoft.DotNet.Tests.Commands [Fact] public void WhenRunWithExactVersionItShouldSucceed() { - ParseResult result = Parser.Instance.Parse($"dotnet install tool -g {PackageId} --version {PackageVersion}"); - AppliedOption appliedCommand = result["dotnet"]["install"]["tool"]; + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {PackageVersion}"); + AppliedOption appliedCommand = result["dotnet"]["tool"]["install"]; - var installToolCommand = new InstallToolCommand( + var installCommand = new ToolInstallCommand( appliedCommand, result, _createToolPackageStoreAndInstaller, @@ -272,7 +272,7 @@ namespace Microsoft.DotNet.Tests.Commands new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), _reporter); - installToolCommand.Execute().Should().Be(0); + installCommand.Execute().Should().Be(0); _reporter .Lines @@ -287,10 +287,10 @@ namespace Microsoft.DotNet.Tests.Commands [Fact] public void WhenRunWithValidVersionRangeItShouldSucceed() { - ParseResult result = Parser.Instance.Parse($"dotnet install tool -g {PackageId} --version [1.0,2.0]"); - AppliedOption appliedCommand = result["dotnet"]["install"]["tool"]; + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version [1.0,2.0]"); + AppliedOption appliedCommand = result["dotnet"]["tool"]["install"]; - var installToolCommand = new InstallToolCommand( + var installCommand = new ToolInstallCommand( appliedCommand, result, _createToolPackageStoreAndInstaller, @@ -298,7 +298,7 @@ namespace Microsoft.DotNet.Tests.Commands new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), _reporter); - installToolCommand.Execute().Should().Be(0); + installCommand.Execute().Should().Be(0); _reporter .Lines @@ -313,10 +313,10 @@ namespace Microsoft.DotNet.Tests.Commands [Fact] public void WhenRunWithoutAMatchingRangeItShouldFail() { - ParseResult result = Parser.Instance.Parse($"dotnet install tool -g {PackageId} --version [5.0,10.0]"); - AppliedOption appliedCommand = result["dotnet"]["install"]["tool"]; + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version [5.0,10.0]"); + AppliedOption appliedCommand = result["dotnet"]["tool"]["install"]; - var installToolCommand = new InstallToolCommand( + var installCommand = new ToolInstallCommand( appliedCommand, result, _createToolPackageStoreAndInstaller, @@ -324,7 +324,7 @@ namespace Microsoft.DotNet.Tests.Commands new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), _reporter); - Action a = () => installToolCommand.Execute(); + Action a = () => installCommand.Execute(); a.ShouldThrow().And.Message .Should().Contain( @@ -337,10 +337,10 @@ namespace Microsoft.DotNet.Tests.Commands [Fact] public void WhenRunWithValidVersionWildcardItShouldSucceed() { - ParseResult result = Parser.Instance.Parse($"dotnet install tool -g {PackageId} --version 1.0.*"); - AppliedOption appliedCommand = result["dotnet"]["install"]["tool"]; + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version 1.0.*"); + AppliedOption appliedCommand = result["dotnet"]["tool"]["install"]; - var installToolCommand = new InstallToolCommand( + var installCommand = new ToolInstallCommand( appliedCommand, result, _createToolPackageStoreAndInstaller, @@ -348,7 +348,7 @@ namespace Microsoft.DotNet.Tests.Commands new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), _reporter); - installToolCommand.Execute().Should().Be(0); + installCommand.Execute().Should().Be(0); _reporter .Lines @@ -363,12 +363,12 @@ namespace Microsoft.DotNet.Tests.Commands [Fact] public void WhenRunWithBothGlobalAndToolPathShowErrorMessage() { - var result = Parser.Instance.Parse($"dotnet install tool -g --tool-path /tmp/folder {PackageId}"); - var appliedCommand = result["dotnet"]["install"]["tool"]; + var result = Parser.Instance.Parse($"dotnet tool install -g --tool-path /tmp/folder {PackageId}"); + var appliedCommand = result["dotnet"]["tool"]["install"]; var parser = Parser.Instance; - var parseResult = parser.ParseFrom("dotnet install", new[] {"tool", PackageId}); + var parseResult = parser.ParseFrom("dotnet tool", new[] {"install", "-g", PackageId}); - var installToolCommand = new InstallToolCommand( + var installCommand = new ToolInstallCommand( appliedCommand, parseResult, _createToolPackageStoreAndInstaller, @@ -376,7 +376,7 @@ namespace Microsoft.DotNet.Tests.Commands new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), _reporter); - Action a = () => installToolCommand.Execute(); + Action a = () => installCommand.Execute(); a.ShouldThrow().And.Message .Should().Contain(LocalizableStrings.InstallToolCommandInvalidGlobalAndToolPath); @@ -385,12 +385,12 @@ namespace Microsoft.DotNet.Tests.Commands [Fact] public void WhenRunWithNeitherOfGlobalNorToolPathShowErrorMessage() { - var result = Parser.Instance.Parse($"dotnet install tool {PackageId}"); - var appliedCommand = result["dotnet"]["install"]["tool"]; + var result = Parser.Instance.Parse($"dotnet tool install {PackageId}"); + var appliedCommand = result["dotnet"]["tool"]["install"]; var parser = Parser.Instance; - var parseResult = parser.ParseFrom("dotnet install", new[] { "tool", PackageId }); + var parseResult = parser.ParseFrom("dotnet tool", new[] { "install", "-g", PackageId }); - var installToolCommand = new InstallToolCommand( + var installCommand = new ToolInstallCommand( appliedCommand, parseResult, _createToolPackageStoreAndInstaller, @@ -398,7 +398,7 @@ namespace Microsoft.DotNet.Tests.Commands new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), _reporter); - Action a = () => installToolCommand.Execute(); + Action a = () => installCommand.Execute(); a.ShouldThrow().And.Message .Should().Contain(LocalizableStrings.InstallToolCommandNeedGlobalOrToolPath); @@ -407,19 +407,19 @@ namespace Microsoft.DotNet.Tests.Commands [Fact] public void WhenRunWithPackageIdAndBinPathItShouldNoteHaveEnvironmentPathInstruction() { - var result = Parser.Instance.Parse($"dotnet install tool --tool-path /tmp/folder {PackageId}"); - var appliedCommand = result["dotnet"]["install"]["tool"]; + var result = Parser.Instance.Parse($"dotnet tool install --tool-path /tmp/folder {PackageId}"); + var appliedCommand = result["dotnet"]["tool"]["install"]; var parser = Parser.Instance; - var parseResult = parser.ParseFrom("dotnet install", new[] {"tool", PackageId}); + var parseResult = parser.ParseFrom("dotnet tool", new[] {"install", "-g", PackageId}); - var installToolCommand = new InstallToolCommand(appliedCommand, + var installCommand = new ToolInstallCommand(appliedCommand, parseResult, _createToolPackageStoreAndInstaller, _createShellShimRepository, new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim), _reporter); - installToolCommand.Execute().Should().Be(0); + installCommand.Execute().Should().Be(0); _reporter.Lines.Should().NotContain(l => l.Contains(EnvironmentPathInstructionMock.MockInstructionText)); } diff --git a/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs b/test/dotnet.Tests/CommandTests/ToolListCommandTests.cs similarity index 97% rename from test/dotnet.Tests/CommandTests/ListToolCommandTests.cs rename to test/dotnet.Tests/CommandTests/ToolListCommandTests.cs index 879f37870..d7aca4c96 100644 --- a/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ToolListCommandTests.cs @@ -11,7 +11,7 @@ using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ToolPackage; using Microsoft.DotNet.Tools; -using Microsoft.DotNet.Tools.List.Tool; +using Microsoft.DotNet.Tools.Tool.List; using Microsoft.DotNet.Tools.Test.Utilities; using Microsoft.Extensions.DependencyModel.Tests; using Microsoft.Extensions.EnvironmentAbstractions; @@ -19,15 +19,15 @@ using Moq; using NuGet.Versioning; using Xunit; using Parser = Microsoft.DotNet.Cli.Parser; -using LocalizableStrings = Microsoft.DotNet.Tools.List.Tool.LocalizableStrings; +using LocalizableStrings = Microsoft.DotNet.Tools.Tool.List.LocalizableStrings; namespace Microsoft.DotNet.Tests.Commands { - public class ListToolCommandTests + public class ToolListCommandTests { private readonly BufferedReporter _reporter; - public ListToolCommandTests() + public ToolListCommandTests() { _reporter = new BufferedReporter(); } @@ -241,9 +241,9 @@ namespace Microsoft.DotNet.Tests.Commands private ListToolCommand CreateCommand(IToolPackageStore store, string options = "", string expectedToolPath = null) { - ParseResult result = Parser.Instance.Parse("dotnet list tool " + options); + ParseResult result = Parser.Instance.Parse("dotnet tool list " + options); return new ListToolCommand( - result["dotnet"]["list"]["tool"], + result["dotnet"]["tool"]["list"], result, toolPath => { AssertExpectedToolPath(toolPath, expectedToolPath); return store; }, _reporter); diff --git a/test/dotnet.Tests/CommandTests/UninstallToolCommandTests.cs b/test/dotnet.Tests/CommandTests/ToolUninstallCommandTests.cs similarity index 89% rename from test/dotnet.Tests/CommandTests/UninstallToolCommandTests.cs rename to test/dotnet.Tests/CommandTests/ToolUninstallCommandTests.cs index 4707f8e1c..a9440f0d8 100644 --- a/test/dotnet.Tests/CommandTests/UninstallToolCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ToolUninstallCommandTests.cs @@ -12,20 +12,20 @@ using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ToolPackage; using Microsoft.DotNet.Tools; -using Microsoft.DotNet.Tools.Install.Tool; -using Microsoft.DotNet.Tools.Uninstall.Tool; +using Microsoft.DotNet.Tools.Tool.Install; +using Microsoft.DotNet.Tools.Tool.Uninstall; using Microsoft.DotNet.Tools.Tests.ComponentMocks; using Microsoft.DotNet.Tools.Test.Utilities; using Microsoft.Extensions.DependencyModel.Tests; using Microsoft.Extensions.EnvironmentAbstractions; using Xunit; using Parser = Microsoft.DotNet.Cli.Parser; -using LocalizableStrings = Microsoft.DotNet.Tools.Uninstall.Tool.LocalizableStrings; -using InstallLocalizableStrings = Microsoft.DotNet.Tools.Install.Tool.LocalizableStrings; +using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Uninstall.LocalizableStrings; +using InstallLocalizableStrings = Microsoft.DotNet.Tools.Tool.Install.LocalizableStrings; namespace Microsoft.DotNet.Tests.Commands { - public class UninstallToolCommandTests + public class ToolUninstallCommandTests { private readonly BufferedReporter _reporter; private readonly IFileSystem _fileSystem; @@ -36,7 +36,7 @@ namespace Microsoft.DotNet.Tests.Commands private const string ShimsDirectory = "shims"; private const string ToolsDirectory = "tools"; - public UninstallToolCommandTests() + public ToolUninstallCommandTests() { _reporter = new BufferedReporter(); _fileSystem = new FileSystemMockBuilder().Build(); @@ -164,9 +164,9 @@ namespace Microsoft.DotNet.Tests.Commands .Should().Contain(LocalizableStrings.UninstallToolCommandNeedGlobalOrToolPath); } - private InstallToolCommand CreateInstallCommand(string options) + private ToolInstallCommand CreateInstallCommand(string options) { - ParseResult result = Parser.Instance.Parse("dotnet install tool " + options); + ParseResult result = Parser.Instance.Parse("dotnet tool install " + options); var store = new ToolPackageStoreMock(new DirectoryPath(ToolsDirectory), _fileSystem); var packageInstallerMock = new ToolPackageInstallerMock( @@ -176,8 +176,8 @@ namespace Microsoft.DotNet.Tests.Commands _fileSystem, _reporter)); - return new InstallToolCommand( - result["dotnet"]["install"]["tool"], + return new ToolInstallCommand( + result["dotnet"]["tool"]["install"], result, (_) => (store, packageInstallerMock), (_) => new ShellShimRepositoryMock(new DirectoryPath(ShimsDirectory), _fileSystem), @@ -185,12 +185,12 @@ namespace Microsoft.DotNet.Tests.Commands _reporter); } - private UninstallToolCommand CreateUninstallCommand(string options, Action uninstallCallback = null) + private ToolUninstallCommand CreateUninstallCommand(string options, Action uninstallCallback = null) { - ParseResult result = Parser.Instance.Parse("dotnet uninstall tool " + options); + ParseResult result = Parser.Instance.Parse("dotnet tool uninstall " + options); - return new UninstallToolCommand( - result["dotnet"]["uninstall"]["tool"], + return new ToolUninstallCommand( + result["dotnet"]["tool"]["uninstall"], result, (_) => new ToolPackageStoreMock( new DirectoryPath(ToolsDirectory), diff --git a/test/dotnet.Tests/CommandTests/UpdateToolCommandTests.cs b/test/dotnet.Tests/CommandTests/ToolUpdateCommandTests.cs similarity index 87% rename from test/dotnet.Tests/CommandTests/UpdateToolCommandTests.cs rename to test/dotnet.Tests/CommandTests/ToolUpdateCommandTests.cs index 9d2c6e59b..4be734335 100644 --- a/test/dotnet.Tests/CommandTests/UpdateToolCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ToolUpdateCommandTests.cs @@ -8,19 +8,19 @@ using FluentAssertions; using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ToolPackage; -using Microsoft.DotNet.Tools.Install.Tool; +using Microsoft.DotNet.Tools.Tool.Install; using Microsoft.DotNet.Tools.Tests.ComponentMocks; using Microsoft.DotNet.Tools.Test.Utilities; -using Microsoft.DotNet.Tools.Update.Tool; +using Microsoft.DotNet.Tools.Tool.Update; using Microsoft.Extensions.DependencyModel.Tests; using Microsoft.Extensions.EnvironmentAbstractions; using Xunit; using Parser = Microsoft.DotNet.Cli.Parser; -using LocalizableStrings = Microsoft.DotNet.Tools.Update.Tool.LocalizableStrings; +using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Update.LocalizableStrings; namespace Microsoft.DotNet.Tests.Commands { - public class UpdateToolCommandTests + public class ToolUpdateCommandTests { private readonly BufferedReporter _reporter; private readonly IFileSystem _fileSystem; @@ -33,7 +33,7 @@ namespace Microsoft.DotNet.Tests.Commands private const string ShimsDirectory = "shims"; private const string ToolsDirectory = "tools"; - public UpdateToolCommandTests() + public ToolUpdateCommandTests() { _reporter = new BufferedReporter(); _fileSystem = new FileSystemMockBuilder().Build(); @@ -125,9 +125,9 @@ namespace Microsoft.DotNet.Tests.Commands CreateInstallCommand($"-g {_packageId} --version {LowerPackageVersion}").Execute(); _reporter.Lines.Clear(); - ParseResult result = Parser.Instance.Parse("dotnet update tool " + $"-g {_packageId}"); - var command = new UpdateToolCommand( - result["dotnet"]["update"]["tool"], + ParseResult result = Parser.Instance.Parse("dotnet tool update " + $"-g {_packageId}"); + var command = new ToolUpdateCommand( + result["dotnet"]["tool"]["update"], result, _ => (_store, new ToolPackageInstallerMock( @@ -145,7 +145,7 @@ namespace Microsoft.DotNet.Tests.Commands Action a = () => command.Execute(); a.ShouldThrow().And.Message.Should().Contain( string.Format(LocalizableStrings.UpdateToolFailed, _packageId) + Environment.NewLine + - string.Format(Tools.Install.Tool.LocalizableStrings.InvalidToolConfiguration, "Simulated error")); + string.Format(Tools.Tool.Install.LocalizableStrings.InvalidToolConfiguration, "Simulated error")); } [Fact] @@ -154,9 +154,9 @@ namespace Microsoft.DotNet.Tests.Commands CreateInstallCommand($"-g {_packageId} --version {LowerPackageVersion}").Execute(); _reporter.Lines.Clear(); - ParseResult result = Parser.Instance.Parse("dotnet update tool " + $"-g {_packageId}"); - var command = new UpdateToolCommand( - result["dotnet"]["update"]["tool"], + ParseResult result = Parser.Instance.Parse("dotnet tool update " + $"-g {_packageId}"); + var command = new ToolUpdateCommand( + result["dotnet"]["tool"]["update"], result, _ => (_store, new ToolPackageInstallerMock( @@ -201,12 +201,12 @@ namespace Microsoft.DotNet.Tests.Commands LocalizableStrings.UpdateToolCommandNeedGlobalOrToolPath); } - private InstallToolCommand CreateInstallCommand(string options) + private ToolInstallCommand CreateInstallCommand(string options) { - ParseResult result = Parser.Instance.Parse("dotnet install tool " + options); + ParseResult result = Parser.Instance.Parse("dotnet tool install " + options); - return new InstallToolCommand( - result["dotnet"]["install"]["tool"], + return new ToolInstallCommand( + result["dotnet"]["tool"]["install"], result, (_) => (_store, new ToolPackageInstallerMock( _fileSystem, @@ -221,12 +221,12 @@ namespace Microsoft.DotNet.Tests.Commands _reporter); } - private UpdateToolCommand CreateUpdateCommand(string options) + private ToolUpdateCommand CreateUpdateCommand(string options) { - ParseResult result = Parser.Instance.Parse("dotnet update tool " + options); + ParseResult result = Parser.Instance.Parse("dotnet tool update " + options); - return new UpdateToolCommand( - result["dotnet"]["update"]["tool"], + return new ToolUpdateCommand( + result["dotnet"]["tool"]["update"], result, (_) => (_store, new ToolPackageInstallerMock( _fileSystem, diff --git a/test/dotnet.Tests/ParserTests/InstallToolParserTests.cs b/test/dotnet.Tests/ParserTests/InstallToolParserTests.cs index 7750d380b..61134ae03 100644 --- a/test/dotnet.Tests/ParserTests/InstallToolParserTests.cs +++ b/test/dotnet.Tests/ParserTests/InstallToolParserTests.cs @@ -24,9 +24,9 @@ namespace Microsoft.DotNet.Tests.ParserTests public void InstallGlobaltoolParserCanGetPackageIdAndPackageVersion() { var command = Parser.Instance; - var result = command.Parse("dotnet install tool -g console.test.app --version 1.0.1"); + var result = command.Parse("dotnet tool install -g console.test.app --version 1.0.1"); - var parseResult = result["dotnet"]["install"]["tool"]; + var parseResult = result["dotnet"]["tool"]["install"]; var packageId = parseResult.Arguments.Single(); var packageVersion = parseResult.ValueOrDefault("version"); @@ -41,9 +41,9 @@ namespace Microsoft.DotNet.Tests.ParserTests var command = Parser.Instance; var result = command.Parse( - @"dotnet install tool -g console.test.app --version 1.0.1 --framework netcoreapp2.0 --configfile C:\TestAssetLocalNugetFeed"); + @"dotnet tool install -g console.test.app --version 1.0.1 --framework netcoreapp2.0 --configfile C:\TestAssetLocalNugetFeed"); - var parseResult = result["dotnet"]["install"]["tool"]; + var parseResult = result["dotnet"]["tool"]["install"]; parseResult.ValueOrDefault("configfile").Should().Be(@"C:\TestAssetLocalNugetFeed"); parseResult.ValueOrDefault("framework").Should().Be("netcoreapp2.0"); @@ -55,9 +55,9 @@ namespace Microsoft.DotNet.Tests.ParserTests const string expectedSourceValue = "TestSourceValue"; var result = - Parser.Instance.Parse($"dotnet install tool -g --source-feed {expectedSourceValue} console.test.app"); + Parser.Instance.Parse($"dotnet tool install -g --source-feed {expectedSourceValue} console.test.app"); - var appliedOptions = result["dotnet"]["install"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["install"]; appliedOptions.ValueOrDefault("source-feed").First().Should().Be(expectedSourceValue); } @@ -69,11 +69,11 @@ namespace Microsoft.DotNet.Tests.ParserTests var result = Parser.Instance.Parse( - $"dotnet install tool -g " + + $"dotnet tool install -g " + $"--source-feed {expectedSourceValue1} " + $"--source-feed {expectedSourceValue2} console.test.app"); - var appliedOptions = result["dotnet"]["install"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["install"]; appliedOptions.ValueOrDefault("source-feed")[0].Should().Be(expectedSourceValue1); appliedOptions.ValueOrDefault("source-feed")[1].Should().Be(expectedSourceValue2); @@ -82,9 +82,9 @@ namespace Microsoft.DotNet.Tests.ParserTests [Fact] public void InstallToolParserCanGetGlobalOption() { - var result = Parser.Instance.Parse("dotnet install tool -g console.test.app"); + var result = Parser.Instance.Parse("dotnet tool install -g console.test.app"); - var appliedOptions = result["dotnet"]["install"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["install"]; appliedOptions.ValueOrDefault("global").Should().Be(true); } @@ -93,19 +93,19 @@ namespace Microsoft.DotNet.Tests.ParserTests { const string expectedVerbosityLevel = "diag"; - var result = Parser.Instance.Parse($"dotnet install tool -g --verbosity:{expectedVerbosityLevel} console.test.app"); + var result = Parser.Instance.Parse($"dotnet tool install -g --verbosity:{expectedVerbosityLevel} console.test.app"); - var appliedOptions = result["dotnet"]["install"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["install"]; appliedOptions.SingleArgumentOrDefault("verbosity").Should().Be(expectedVerbosityLevel); } - + [Fact] public void InstallToolParserCanParseToolPathOption() { var result = - Parser.Instance.Parse(@"dotnet install tool --tool-path C:\Tools console.test.app"); + Parser.Instance.Parse(@"dotnet tool install --tool-path C:\Tools console.test.app"); - var appliedOptions = result["dotnet"]["install"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["install"]; appliedOptions.SingleArgumentOrDefault("tool-path").Should().Be(@"C:\Tools"); } } diff --git a/test/dotnet.Tests/ParserTests/ListToolParserTests.cs b/test/dotnet.Tests/ParserTests/ListToolParserTests.cs index b538f8eab..d55b67e92 100644 --- a/test/dotnet.Tests/ParserTests/ListToolParserTests.cs +++ b/test/dotnet.Tests/ParserTests/ListToolParserTests.cs @@ -23,9 +23,9 @@ namespace Microsoft.DotNet.Tests.ParserTests [Fact] public void ListToolParserCanGetGlobalOption() { - var result = Parser.Instance.Parse("dotnet list tool -g"); + var result = Parser.Instance.Parse("dotnet tool list -g"); - var appliedOptions = result["dotnet"]["list"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["list"]; appliedOptions.ValueOrDefault("global").Should().Be(true); } @@ -33,9 +33,9 @@ namespace Microsoft.DotNet.Tests.ParserTests public void ListToolParserCanParseToolPathOption() { var result = - Parser.Instance.Parse(@"dotnet list tool --tool-path C:\Tools "); + Parser.Instance.Parse(@"dotnet tool list --tool-path C:\Tools "); - var appliedOptions = result["dotnet"]["list"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["list"]; appliedOptions.SingleArgumentOrDefault("tool-path").Should().Be(@"C:\Tools"); } } diff --git a/test/dotnet.Tests/ParserTests/UninstallToolParserTests.cs b/test/dotnet.Tests/ParserTests/UninstallToolParserTests.cs index ace3874d4..a61616f60 100644 --- a/test/dotnet.Tests/ParserTests/UninstallToolParserTests.cs +++ b/test/dotnet.Tests/ParserTests/UninstallToolParserTests.cs @@ -24,9 +24,9 @@ namespace Microsoft.DotNet.Tests.ParserTests public void UninstallToolParserCanGetPackageId() { var command = Parser.Instance; - var result = command.Parse("dotnet uninstall tool -g console.test.app"); + var result = command.Parse("dotnet tool uninstall -g console.test.app"); - var parseResult = result["dotnet"]["uninstall"]["tool"]; + var parseResult = result["dotnet"]["tool"]["uninstall"]; var packageId = parseResult.Arguments.Single(); @@ -36,9 +36,9 @@ namespace Microsoft.DotNet.Tests.ParserTests [Fact] public void UninstallToolParserCanGetGlobalOption() { - var result = Parser.Instance.Parse("dotnet uninstall tool -g console.test.app"); + var result = Parser.Instance.Parse("dotnet tool uninstall -g console.test.app"); - var appliedOptions = result["dotnet"]["uninstall"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["uninstall"]; appliedOptions.ValueOrDefault("global").Should().Be(true); } @@ -46,9 +46,9 @@ namespace Microsoft.DotNet.Tests.ParserTests public void UninstallToolParserCanParseToolPathOption() { var result = - Parser.Instance.Parse(@"dotnet uninstall tool --tool-path C:\Tools console.test.app"); + Parser.Instance.Parse(@"dotnet tool uninstall --tool-path C:\Tools console.test.app"); - var appliedOptions = result["dotnet"]["uninstall"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["uninstall"]; appliedOptions.SingleArgumentOrDefault("tool-path").Should().Be(@"C:\Tools"); } } diff --git a/test/dotnet.Tests/ParserTests/UpdateToolParserTests.cs b/test/dotnet.Tests/ParserTests/UpdateToolParserTests.cs index b0c7b529e..4f94dc86e 100644 --- a/test/dotnet.Tests/ParserTests/UpdateToolParserTests.cs +++ b/test/dotnet.Tests/ParserTests/UpdateToolParserTests.cs @@ -24,9 +24,9 @@ namespace Microsoft.DotNet.Tests.ParserTests public void UpdateGlobaltoolParserCanGetPackageId() { var command = Parser.Instance; - var result = command.Parse("dotnet update tool -g console.test.app"); + var result = command.Parse("dotnet tool update -g console.test.app"); - var parseResult = result["dotnet"]["update"]["tool"]; + var parseResult = result["dotnet"]["tool"]["update"]; var packageId = parseResult.Arguments.Single(); @@ -36,9 +36,9 @@ namespace Microsoft.DotNet.Tests.ParserTests [Fact] public void UpdateToolParserCanGetGlobalOption() { - var result = Parser.Instance.Parse("dotnet update tool -g console.test.app"); + var result = Parser.Instance.Parse("dotnet tool update -g console.test.app"); - var appliedOptions = result["dotnet"]["update"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["update"]; appliedOptions.ValueOrDefault("global").Should().Be(true); } @@ -48,9 +48,9 @@ namespace Microsoft.DotNet.Tests.ParserTests var command = Parser.Instance; var result = command.Parse( - @"dotnet update tool -g console.test.app --version 1.0.1 --framework netcoreapp2.0 --configfile C:\TestAssetLocalNugetFeed"); + @"dotnet tool update -g console.test.app --version 1.0.1 --framework netcoreapp2.0 --configfile C:\TestAssetLocalNugetFeed"); - var parseResult = result["dotnet"]["update"]["tool"]; + var parseResult = result["dotnet"]["tool"]["update"]; parseResult.ValueOrDefault("configfile").Should().Be(@"C:\TestAssetLocalNugetFeed"); parseResult.ValueOrDefault("framework").Should().Be("netcoreapp2.0"); @@ -62,9 +62,9 @@ namespace Microsoft.DotNet.Tests.ParserTests const string expectedSourceValue = "TestSourceValue"; var result = - Parser.Instance.Parse($"dotnet update tool -g --source-feed {expectedSourceValue} console.test.app"); + Parser.Instance.Parse($"dotnet tool update -g --source-feed {expectedSourceValue} console.test.app"); - var appliedOptions = result["dotnet"]["update"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["update"]; appliedOptions.ValueOrDefault("source-feed").First().Should().Be(expectedSourceValue); } @@ -76,11 +76,11 @@ namespace Microsoft.DotNet.Tests.ParserTests var result = Parser.Instance.Parse( - $"dotnet update tool -g " + + $"dotnet tool update -g " + $"--source-feed {expectedSourceValue1} " + $"--source-feed {expectedSourceValue2} console.test.app"); - var appliedOptions = result["dotnet"]["update"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["update"]; appliedOptions.ValueOrDefault("source-feed")[0].Should().Be(expectedSourceValue1); appliedOptions.ValueOrDefault("source-feed")[1].Should().Be(expectedSourceValue2); @@ -92,9 +92,9 @@ namespace Microsoft.DotNet.Tests.ParserTests const string expectedVerbosityLevel = "diag"; var result = - Parser.Instance.Parse($"dotnet update tool -g --verbosity:{expectedVerbosityLevel} console.test.app"); + Parser.Instance.Parse($"dotnet tool update -g --verbosity:{expectedVerbosityLevel} console.test.app"); - var appliedOptions = result["dotnet"]["update"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["update"]; appliedOptions.SingleArgumentOrDefault("verbosity").Should().Be(expectedVerbosityLevel); } @@ -102,9 +102,9 @@ namespace Microsoft.DotNet.Tests.ParserTests public void UpdateToolParserCanParseToolPathOption() { var result = - Parser.Instance.Parse(@"dotnet update tool --tool-path C:\TestAssetLocalNugetFeed console.test.app"); + Parser.Instance.Parse(@"dotnet tool update --tool-path C:\TestAssetLocalNugetFeed console.test.app"); - var appliedOptions = result["dotnet"]["update"]["tool"]; + var appliedOptions = result["dotnet"]["tool"]["update"]; appliedOptions.SingleArgumentOrDefault("tool-path").Should().Be(@"C:\TestAssetLocalNugetFeed"); } } From c1fff9649a090fe6bdab10c438b0a9d730aabef3 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Wed, 21 Mar 2018 21:19:24 -0700 Subject: [PATCH 10/14] Update launch settings for ApplicationUrl handling --- ...pWithApplicationUrlInLaunchSettings.csproj | 9 +++ .../Program.cs | 16 +++++ .../Properties/launchSettings.json | 27 +++++++++ .../ProjectLaunchSettingsProvider.cs | 10 ++-- .../GivenDotnetRunRunsCsProj.cs | 60 +++++++++++++++++++ 5 files changed, 117 insertions(+), 5 deletions(-) create mode 100644 TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj create mode 100644 TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/Program.cs create mode 100644 TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/Properties/launchSettings.json diff --git a/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj new file mode 100644 index 000000000..9434c36c9 --- /dev/null +++ b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj @@ -0,0 +1,9 @@ + + + + + Exe + netcoreapp2.1 + win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;alpine.3.6-x64 + + diff --git a/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/Program.cs b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/Program.cs new file mode 100644 index 000000000..33322e771 --- /dev/null +++ b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/Program.cs @@ -0,0 +1,16 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; + +namespace MSBuildTestApp +{ + public class Program + { + public static void Main(string[] args) + { + var message = Environment.GetEnvironmentVariable("ASPNETCORE_URLS"); + Console.WriteLine(message); + } + } +} diff --git a/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/Properties/launchSettings.json b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/Properties/launchSettings.json new file mode 100644 index 000000000..b61eabd57 --- /dev/null +++ b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:49850/", + "sslPort": 0 + } + }, + "profiles": { + "First": { + "commandName": "Project", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_URLS": "http://localhost:12345/" + }, + "applicationUrl": "http://localhost:67890/" + }, + "Second": { + "commandName": "Project", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:54321/" + } + } +} \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs b/src/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs index 780870494..5bb5ce85d 100644 --- a/src/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs +++ b/src/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs @@ -15,6 +15,11 @@ namespace Microsoft.DotNet.Tools.Run.LaunchSettings { var config = model.ToObject(); + if (!string.IsNullOrEmpty(config.ApplicationUrl)) + { + command.EnvironmentVariable("ASPNETCORE_URLS", config.ApplicationUrl); + } + //For now, ignore everything but the environment variables section foreach (var entry in config.EnvironmentVariables) @@ -24,11 +29,6 @@ namespace Microsoft.DotNet.Tools.Run.LaunchSettings command.EnvironmentVariable(entry.Key, value); } - if (!string.IsNullOrEmpty(config.ApplicationUrl)) - { - command.EnvironmentVariable("ASPNETCORE_URLS", config.ApplicationUrl); - } - return new LaunchSettingsApplyResult(true, null, config.LaunchUrl); } diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs index 35660db73..a30853340 100644 --- a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs +++ b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs @@ -364,6 +364,66 @@ namespace Microsoft.DotNet.Cli.Run.Tests cmd.StdErr.Should().BeEmpty(); } + [Fact] + public void ItPrefersTheValueOfApplicationUrlFromEnvironmentVariablesOverTheProperty() + { + var testAppName = "AppWithApplicationUrlInLaunchSettings"; + var testInstance = TestAssets.Get(testAppName) + .CreateInstance() + .WithSourceFiles(); + + var testProjectDirectory = testInstance.Root.FullName; + + new RestoreCommand() + .WithWorkingDirectory(testProjectDirectory) + .Execute("/p:SkipInvalidConfigurations=true") + .Should().Pass(); + + new BuildCommand() + .WithWorkingDirectory(testProjectDirectory) + .Execute() + .Should().Pass(); + + var cmd = new RunCommand() + .WithWorkingDirectory(testProjectDirectory) + .ExecuteWithCapturedOutput("--launch-profile First"); + + cmd.Should().Pass() + .And.HaveStdOutContaining("http://localhost:12345/"); + + cmd.StdErr.Should().BeEmpty(); + } + + [Fact] + public void ItUsesTheValueOfApplicationUrlIfTheEnvironmentVariableIsNotSet() + { + var testAppName = "AppWithApplicationUrlInLaunchSettings"; + var testInstance = TestAssets.Get(testAppName) + .CreateInstance() + .WithSourceFiles(); + + var testProjectDirectory = testInstance.Root.FullName; + + new RestoreCommand() + .WithWorkingDirectory(testProjectDirectory) + .Execute("/p:SkipInvalidConfigurations=true") + .Should().Pass(); + + new BuildCommand() + .WithWorkingDirectory(testProjectDirectory) + .Execute() + .Should().Pass(); + + var cmd = new RunCommand() + .WithWorkingDirectory(testProjectDirectory) + .ExecuteWithCapturedOutput("--launch-profile Second"); + + cmd.Should().Pass() + .And.HaveStdOutContaining("http://localhost:54321/"); + + cmd.StdErr.Should().BeEmpty(); + } + [Fact] public void ItGivesAnErrorWhenTheLaunchProfileNotFound() { From 9ea0c38f81cee0b88552300c1cfb62744cb27995 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Thu, 22 Mar 2018 14:37:05 -0700 Subject: [PATCH 11/14] Remove runtime identifiers from the test project --- .../AppWithApplicationUrlInLaunchSettings.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj index 9434c36c9..be02066ff 100644 --- a/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj +++ b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj @@ -4,6 +4,5 @@ Exe netcoreapp2.1 - win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;alpine.3.6-x64 From 52c73a1e262442fb85470d74dfb425ac4d895250 Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 22 Mar 2018 17:16:55 -0700 Subject: [PATCH 12/14] Updating the runtime to 2.1.0-preview2-26314-02 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f4fd69fc0..e112fbee6 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.1.0-preview2-30338 - 2.1.0-preview2-26313-01 + 2.1.0-preview2-26314-02 $(MicrosoftNETCoreAppPackageVersion) 15.7.0-preview-000066 $(MicrosoftBuildPackageVersion) @@ -28,8 +28,8 @@ $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) - 2.1.0-preview2-26313-01 - 2.1.0-preview2-26313-01 + 2.1.0-preview2-26314-02 + 2.1.0-preview2-26314-02 0.1.1-alpha-174 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) From e30fe29aab592530a1e9def9c7e47f8662944dc5 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Wed, 14 Mar 2018 18:21:50 -0700 Subject: [PATCH 13/14] Fix project type GUIDs when adding projects to solution files. This commit ensures the correct property (`ProjectTypeGuids`) is respected when adding a project to a solution file. Additionally, we now error if a project type GUID cannot be determined rather than incorrectly mapping to the C# project type. Enabled previously disabled tests that were waiting on upstream changes from MSBuild and F#. Fixes #5131. Fixes #7742. --- .../FSharpProject/App.config | 6 -- .../FSharpProject/AssemblyInfo.fs | 41 ---------- .../FSharpProject/FSharpProject.fsproj | 81 ++----------------- .../FSharpProject/packages.config | 4 - .../App.sln | 18 +++++ .../UnknownProject/UnknownProject.unknownproj | 3 + .../UnknownProject/UnknownProject.unknownproj | 2 +- .../UnknownProject/UnknownProject.unknownproj | 2 +- .../ProjectTypeGuids.cs | 2 + src/dotnet/CommonLocalizableStrings.resx | 2 +- src/dotnet/ProjectInstanceExtensions.cs | 26 +----- src/dotnet/ProjectRootElementExtensions.cs | 23 ++++++ src/dotnet/SlnFileExtensions.cs | 15 +++- .../xlf/CommonLocalizableStrings.cs.xlf | 4 +- .../xlf/CommonLocalizableStrings.de.xlf | 4 +- .../xlf/CommonLocalizableStrings.es.xlf | 4 +- .../xlf/CommonLocalizableStrings.fr.xlf | 4 +- .../xlf/CommonLocalizableStrings.it.xlf | 4 +- .../xlf/CommonLocalizableStrings.ja.xlf | 4 +- .../xlf/CommonLocalizableStrings.ko.xlf | 4 +- .../xlf/CommonLocalizableStrings.pl.xlf | 4 +- .../xlf/CommonLocalizableStrings.pt-BR.xlf | 4 +- .../xlf/CommonLocalizableStrings.ru.xlf | 4 +- .../xlf/CommonLocalizableStrings.tr.xlf | 4 +- .../xlf/CommonLocalizableStrings.zh-Hans.xlf | 4 +- .../xlf/CommonLocalizableStrings.zh-Hant.xlf | 4 +- .../GivenThatIWantToMigrateSolutions.cs | 4 +- .../dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs | 38 +++++++-- 28 files changed, 130 insertions(+), 189 deletions(-) delete mode 100644 TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/App.config delete mode 100644 TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/AssemblyInfo.fs delete mode 100644 TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/packages.config create mode 100644 TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectType/App.sln create mode 100644 TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectType/UnknownProject/UnknownProject.unknownproj create mode 100644 src/dotnet/ProjectRootElementExtensions.cs diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/App.config b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/App.config deleted file mode 100644 index 88fa4027b..000000000 --- a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/AssemblyInfo.fs b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/AssemblyInfo.fs deleted file mode 100644 index d8b2c37d6..000000000 --- a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/AssemblyInfo.fs +++ /dev/null @@ -1,41 +0,0 @@ -namespace FSharpProject.AssemblyInfo - -open System.Reflection -open System.Runtime.CompilerServices -open System.Runtime.InteropServices - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[] -[] -[] -[] -[] -[] -[] -[] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [] -[] -[] - -do - () \ No newline at end of file diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/FSharpProject.fsproj b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/FSharpProject.fsproj index cad8d59ce..43b200bd5 100644 --- a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/FSharpProject.fsproj +++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/FSharpProject.fsproj @@ -1,81 +1,12 @@ - - - + + - Debug - AnyCPU - 2.0 - 52161bb2-18bf-4304-87e7-8d7f0c98ccf3 Exe - FSharpProject - FSharpProject - v4.5.2 - true - 4.4.1.0 - FSharpProject + netcoreapp2.1 - - true - full - false - false - bin\$(Configuration)\ - DEBUG;TRACE - 3 - AnyCPU - bin\$(Configuration)\$(AssemblyName).XML - true - - - pdbonly - true - true - bin\$(Configuration)\ - TRACE - 3 - AnyCPU - bin\$(Configuration)\$(AssemblyName).XML - true - - - 11 - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - + - - - - - - - True - - - - - - ..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll - - - - + + \ No newline at end of file diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/packages.config b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/packages.config deleted file mode 100644 index 2688d2baf..000000000 --- a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndFSharpProject/FSharpProject/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectType/App.sln b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectType/App.sln new file mode 100644 index 000000000..5b61df887 --- /dev/null +++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectType/App.sln @@ -0,0 +1,18 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26006.2 +MinimumVisualStudioVersion = 10.0.40219.1 +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectType/UnknownProject/UnknownProject.unknownproj b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectType/UnknownProject/UnknownProject.unknownproj new file mode 100644 index 000000000..2ed799e9d --- /dev/null +++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectType/UnknownProject/UnknownProject.unknownproj @@ -0,0 +1,3 @@ + + + diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids/UnknownProject/UnknownProject.unknownproj b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids/UnknownProject/UnknownProject.unknownproj index c5e694360..e5a55313b 100644 --- a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids/UnknownProject/UnknownProject.unknownproj +++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids/UnknownProject/UnknownProject.unknownproj @@ -1,6 +1,6 @@  - {20E2F8CC-55AA-4705-B10F-7ABA6F107ECE};{130159A9-F047-44B3-88CF-0CF7F02ED50F} + {20E2F8CC-55AA-4705-B10F-7ABA6F107ECE};{130159A9-F047-44B3-88CF-0CF7F02ED50F} diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid/UnknownProject/UnknownProject.unknownproj b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid/UnknownProject/UnknownProject.unknownproj index 2615598f1..44f4622a0 100644 --- a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid/UnknownProject/UnknownProject.unknownproj +++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid/UnknownProject/UnknownProject.unknownproj @@ -1,6 +1,6 @@  - {130159A9-F047-44B3-88CF-0CF7F02ED50F} + {130159A9-F047-44B3-88CF-0CF7F02ED50F} diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/ProjectTypeGuids.cs b/src/Microsoft.DotNet.Cli.Sln.Internal/ProjectTypeGuids.cs index 547e93eef..63292ebf7 100644 --- a/src/Microsoft.DotNet.Cli.Sln.Internal/ProjectTypeGuids.cs +++ b/src/Microsoft.DotNet.Cli.Sln.Internal/ProjectTypeGuids.cs @@ -6,6 +6,8 @@ namespace Microsoft.DotNet.Cli.Sln.Internal public static class ProjectTypeGuids { public const string CSharpProjectTypeGuid = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"; + public const string FSharpProjectTypeGuid = "{F2A71F9B-5D33-465A-A702-920D77279786}"; + public const string VBProjectTypeGuid = "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}"; public const string SolutionFolderGuid = "{2150E333-8FDC-42A3-9474-1A3956D46DE8}"; } } diff --git a/src/dotnet/CommonLocalizableStrings.resx b/src/dotnet/CommonLocalizableStrings.resx index ad40ada4d..188643c16 100644 --- a/src/dotnet/CommonLocalizableStrings.resx +++ b/src/dotnet/CommonLocalizableStrings.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Unsupported project type. Please check with your sdk provider. + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. Project already has a reference to `{0}`. diff --git a/src/dotnet/ProjectInstanceExtensions.cs b/src/dotnet/ProjectInstanceExtensions.cs index fdfd41b38..457e83d82 100644 --- a/src/dotnet/ProjectInstanceExtensions.cs +++ b/src/dotnet/ProjectInstanceExtensions.cs @@ -20,31 +20,9 @@ namespace Microsoft.DotNet.Tools.Common return projectGuid.ToString("B").ToUpper(); } - public static string GetProjectTypeGuid(this ProjectInstance projectInstance) + public static string GetDefaultProjectTypeGuid(this ProjectInstance projectInstance) { - string projectTypeGuid = null; - - var projectTypeGuidProperty = projectInstance.GetPropertyValue("ProjectTypeGuid"); - if (!string.IsNullOrEmpty(projectTypeGuidProperty)) - { - projectTypeGuid = projectTypeGuidProperty.Split(';').Last(); - } - else - { - projectTypeGuid = projectInstance.GetPropertyValue("DefaultProjectTypeGuid"); - } - - if (string.IsNullOrEmpty(projectTypeGuid)) - { - //ISSUE: https://github.com/dotnet/sdk/issues/522 - //The real behavior we want (once DefaultProjectTypeGuid support is in) is to throw - //when we cannot find ProjectTypeGuid or DefaultProjectTypeGuid. But for now we - //need to default to the C# one. - //throw new GracefulException(CommonLocalizableStrings.UnsupportedProjectType); - projectTypeGuid = ProjectTypeGuids.CSharpProjectTypeGuid; - } - - return projectTypeGuid; + return projectInstance.GetPropertyValue("DefaultProjectTypeGuid"); } public static IEnumerable GetPlatforms(this ProjectInstance projectInstance) diff --git a/src/dotnet/ProjectRootElementExtensions.cs b/src/dotnet/ProjectRootElementExtensions.cs new file mode 100644 index 000000000..1d7ae3a53 --- /dev/null +++ b/src/dotnet/ProjectRootElementExtensions.cs @@ -0,0 +1,23 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; +using System.Collections.Generic; +using System.Linq; +using Microsoft.Build.Construction; + +namespace Microsoft.DotNet.Tools.Common +{ + public static class ProjectRootElementExtensions + { + public static string GetProjectTypeGuid(this ProjectRootElement rootElement) + { + return rootElement + .Properties + .FirstOrDefault(p => string.Equals(p.Name, "ProjectTypeGuids", StringComparison.OrdinalIgnoreCase)) + ?.Value + .Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries) + .LastOrDefault(g => !string.IsNullOrWhiteSpace(g)); + } + } +} diff --git a/src/dotnet/SlnFileExtensions.cs b/src/dotnet/SlnFileExtensions.cs index e1d91c224..292c697e4 100644 --- a/src/dotnet/SlnFileExtensions.cs +++ b/src/dotnet/SlnFileExtensions.cs @@ -37,10 +37,12 @@ namespace Microsoft.DotNet.Tools.Common } else { + ProjectRootElement rootElement = null; ProjectInstance projectInstance = null; try { - projectInstance = new ProjectInstance(fullProjectPath); + rootElement = ProjectRootElement.Open(fullProjectPath); + projectInstance = new ProjectInstance(rootElement); } catch (InvalidProjectFileException e) { @@ -54,11 +56,20 @@ namespace Microsoft.DotNet.Tools.Common var slnProject = new SlnProject { Id = projectInstance.GetProjectId(), - TypeGuid = projectInstance.GetProjectTypeGuid(), + TypeGuid = rootElement.GetProjectTypeGuid() ?? projectInstance.GetDefaultProjectTypeGuid(), Name = Path.GetFileNameWithoutExtension(relativeProjectPath), FilePath = relativeProjectPath }; + if (string.IsNullOrEmpty(slnProject.TypeGuid)) + { + Reporter.Error.WriteLine( + string.Format( + CommonLocalizableStrings.UnsupportedProjectType, + projectInstance.FullPath)); + return; + } + // NOTE: The order you create the sections determines the order they are written to the sln // file. In the case of an empty sln file, in order to make sure the solution configurations // section comes first we need to add it first. This doesn't affect correctness but does diff --git a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf index f464118ce..03639a1a6 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf @@ -600,8 +600,8 @@ - Unsupported project type. Please check with your sdk provider. - Nepodporovaný typ projektu. Ověřte to prosím u poskytovatele sady SDK. + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. + Nepodporovaný typ projektu. Ověřte to prosím u poskytovatele sady SDK. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf index cae4ffe72..528a1f198 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf @@ -600,8 +600,8 @@ - Unsupported project type. Please check with your sdk provider. - Nicht unterstützter Projekttyp. Wenden Sie sich an Ihren SDK-Anbieter. + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. + Nicht unterstützter Projekttyp. Wenden Sie sich an Ihren SDK-Anbieter. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf index 55e770628..9d8bbcb26 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf @@ -600,8 +600,8 @@ - Unsupported project type. Please check with your sdk provider. - Tipo de proyecto no admitido. Consulte a su proveedor de SDK. + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. + Tipo de proyecto no admitido. Consulte a su proveedor de SDK. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf index 5d7e2755f..ee89238f2 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf @@ -600,8 +600,8 @@ - Unsupported project type. Please check with your sdk provider. - Type de projet non pris en charge. Consultez le fournisseur de votre SDK. + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. + Type de projet non pris en charge. Consultez le fournisseur de votre SDK. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf index 28d31da38..274e11230 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf @@ -600,8 +600,8 @@ - Unsupported project type. Please check with your sdk provider. - Tipo di progetto non supportato. Verificare con il provider SDK. + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. + Tipo di progetto non supportato. Verificare con il provider SDK. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf index 46d5302b0..d0fefd2b5 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf @@ -600,8 +600,8 @@ - Unsupported project type. Please check with your sdk provider. - サポートされていないプロジェクトの種類です。SDK プロバイダーに確認してください。 + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. + サポートされていないプロジェクトの種類です。SDK プロバイダーに確認してください。 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf index 470eb0bc5..e5716a3a0 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf @@ -600,8 +600,8 @@ - Unsupported project type. Please check with your sdk provider. - 지원되지 않는 프로젝트 형식입니다. SDK 공급자를 확인하세요. + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. + 지원되지 않는 프로젝트 형식입니다. SDK 공급자를 확인하세요. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf index 889ec7173..d31152f29 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf @@ -600,8 +600,8 @@ - Unsupported project type. Please check with your sdk provider. - Nieobsługiwany typ projektu. Skontaktuj się z dostawcą zestawu SDK. + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. + Nieobsługiwany typ projektu. Skontaktuj się z dostawcą zestawu SDK. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf index 7d9b411ff..a4326cfcb 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf @@ -600,8 +600,8 @@ - Unsupported project type. Please check with your sdk provider. - Tipo de projeto sem suporte. Verifique com seu provedor de SDK. + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. + Tipo de projeto sem suporte. Verifique com seu provedor de SDK. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf index 7ecf75ccc..7318ecbde 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf @@ -600,8 +600,8 @@ - Unsupported project type. Please check with your sdk provider. - Тип проекта не поддерживается. Обратитесь к поставщику пакета SDK. + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. + Тип проекта не поддерживается. Обратитесь к поставщику пакета SDK. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf index b633fd9cd..b128725bd 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf @@ -600,8 +600,8 @@ - Unsupported project type. Please check with your sdk provider. - Proje türü desteklenmiyor. Lütfen SDK sağlayıcınıza başvurun. + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. + Proje türü desteklenmiyor. Lütfen SDK sağlayıcınıza başvurun. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf index 11fef08ba..f33533c58 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf @@ -600,8 +600,8 @@ - Unsupported project type. Please check with your sdk provider. - 不支持的项目类型。请联系 SDK 提供商。 + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. + 不支持的项目类型。请联系 SDK 提供商。 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf index 413d99070..416b821ff 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf @@ -600,8 +600,8 @@ - Unsupported project type. Please check with your sdk provider. - 不支援的專案類型。請與 SDK 提供者連絡。 + Project '{0}' has an unknown project type and cannot be added to the solution file. Please contact your SDK provider for support. + 不支援的專案類型。請與 SDK 提供者連絡。 diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs index af96bd2a2..585a3da02 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs @@ -64,9 +64,7 @@ namespace Microsoft.DotNet.Migration.Tests slnProject.FilePath.Should().Be(Path.Combine("..", "TestLibrary", "TestLibrary.csproj")); slnProject = nonSolutionFolderProjects.Where((p) => p.Name == "subdir").Single(); - //ISSUE: https://github.com/dotnet/sdk/issues/522 - //Once we have that change migrate will always burn in the C# guid - //slnProject.TypeGuid.Should().Be(ProjectTypeGuids.CSharpProjectTypeGuid); + slnProject.TypeGuid.Should().Be(ProjectTypeGuids.CSharpProjectTypeGuid); slnProject.FilePath.Should().Be(Path.Combine("src", "subdir", "subdir.csproj")); } } diff --git a/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs index bb50d5f5d..40f53d567 100644 --- a/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs +++ b/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs @@ -867,10 +867,9 @@ EndGlobal } [Theory] - //ISSUE: https://github.com/dotnet/sdk/issues/522 - //[InlineData("SlnFileWithNoProjectReferencesAndCSharpProject", "CSharpProject", "CSharpProject.csproj", ProjectTypeGuids.CSharpProjectTypeGuid)] - //[InlineData("SlnFileWithNoProjectReferencesAndFSharpProject", "FSharpProject", "FSharpProject.fsproj", "{F2A71F9B-5D33-465A-A702-920D77279786}")] - //[InlineData("SlnFileWithNoProjectReferencesAndVBProject", "VBProject", "VBProject.vbproj", "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}")] + [InlineData("SlnFileWithNoProjectReferencesAndCSharpProject", "CSharpProject", "CSharpProject.csproj", ProjectTypeGuids.CSharpProjectTypeGuid)] + [InlineData("SlnFileWithNoProjectReferencesAndFSharpProject", "FSharpProject", "FSharpProject.fsproj", ProjectTypeGuids.FSharpProjectTypeGuid)] + [InlineData("SlnFileWithNoProjectReferencesAndVBProject", "VBProject", "VBProject.vbproj", ProjectTypeGuids.VBProjectTypeGuid)] [InlineData("SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] [InlineData("SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")] public void WhenPassedAProjectItAddsCorrectProjectTypeGuid( @@ -891,8 +890,8 @@ EndGlobal .WithWorkingDirectory(projectDirectory) .ExecuteWithCapturedOutput($"sln App.sln add {projectToAdd}"); cmd.Should().Pass(); - cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectAddedToTheSolution, projectToAdd)); cmd.StdErr.Should().BeEmpty(); + cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectAddedToTheSolution, projectToAdd)); var slnFile = SlnFile.Read(Path.Combine(projectDirectory, "App.sln")); var nonSolutionFolderProjects = slnFile.Projects.Where( @@ -901,6 +900,35 @@ EndGlobal nonSolutionFolderProjects.Single().TypeGuid.Should().Be(expectedTypeGuid); } + [Fact] + public void WhenPassedAProjectWithoutATypeGuidItErrors() + { + var solutionDirectory = TestAssets + .Get("SlnFileWithNoProjectReferencesAndUnknownProjectType") + .CreateInstance() + .WithSourceFiles() + .Root + .FullName; + + var solutionPath = Path.Combine(solutionDirectory, "App.sln"); + var contentBefore = File.ReadAllText(solutionPath); + + var projectToAdd = Path.Combine("UnknownProject", "UnknownProject.unknownproj"); + var cmd = new DotnetCommand() + .WithWorkingDirectory(solutionDirectory) + .ExecuteWithCapturedOutput($"sln add {projectToAdd}"); + cmd.Should().Pass(); + cmd.StdErr.Should().Be( + string.Format( + CommonLocalizableStrings.UnsupportedProjectType, + Path.Combine(solutionDirectory, projectToAdd))); + cmd.StdOut.Should().BeEmpty(); + + File.ReadAllText(solutionPath) + .Should() + .BeVisuallyEquivalentTo(contentBefore); + } + [Fact] private void WhenSlnContainsSolutionFolderWithDifferentCasingItDoesNotCreateDuplicate() { From eec79d83fcbce19f179806bdd550a429aab51c61 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Fri, 23 Mar 2018 10:30:47 -0700 Subject: [PATCH 14/14] Try shorter test names --- test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs index a30853340..f85d7446e 100644 --- a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs +++ b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs @@ -365,7 +365,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests } [Fact] - public void ItPrefersTheValueOfApplicationUrlFromEnvironmentVariablesOverTheProperty() + public void ItPrefersTheValueOfAppUrlFromEnvVarOverTheProp() { var testAppName = "AppWithApplicationUrlInLaunchSettings"; var testInstance = TestAssets.Get(testAppName) @@ -395,7 +395,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests } [Fact] - public void ItUsesTheValueOfApplicationUrlIfTheEnvironmentVariableIsNotSet() + public void ItUsesTheValueOfAppUrlIfTheEnvVarIsNotSet() { var testAppName = "AppWithApplicationUrlInLaunchSettings"; var testInstance = TestAssets.Get(testAppName)