diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/LocalizableStrings.cs b/src/dotnet/commands/dotnet-list/dotnet-list-reference/LocalizableStrings.cs similarity index 95% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/LocalizableStrings.cs rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/LocalizableStrings.cs index 6c32c56c4..4bf2d2a83 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-list/dotnet-list-reference/LocalizableStrings.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Tools.List.ProjectToProjectReferences { public const string AppFullName = ".NET Core Project-to-Project dependency viewer"; - public const string AppDescription = "Command to list project to project (p2p) references"; + public const string AppDescription = "Command to list project to project references"; public const string NoReferencesFound = "There are no {0} references in project {1}.\n{0} is the type of the item being requested (project, package, p2p) and {1} is the object operated on (a project file or a solution file). "; } diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/Program.cs b/src/dotnet/commands/dotnet-list/dotnet-list-reference/Program.cs similarity index 97% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/Program.cs rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/Program.cs index f3ce2f62c..28a3f29ff 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/Program.cs +++ b/src/dotnet/commands/dotnet-list/dotnet-list-reference/Program.cs @@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Tools.List.ProjectToProjectReferences { var command = new ListProjectToProjectReferencesCommand() { - Name = "p2ps", + Name = "reference", FullName = LocalizableStrings.AppFullName, Description = LocalizableStrings.AppDescription, }; diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.cs.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.cs.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.cs.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.de.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.de.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.de.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.es.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.es.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.es.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.fr.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.fr.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.fr.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.it.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.it.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.it.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.ja.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.ja.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.ja.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.ko.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.ko.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.ko.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.pl.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.pl.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.pl.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.pt-BR.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.pt-BR.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.pt-BR.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.ru.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.ru.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.ru.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.tr.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.tr.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.tr.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.zh-Hans.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.zh-Hans.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.zh-Hans.xlf diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.zh-Hant.xlf similarity index 100% rename from src/dotnet/commands/dotnet-list/dotnet-list-p2ps/xlf/LocalizableStrings.zh-Hant.xlf rename to src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.zh-Hant.xlf diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/ListP2PsCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/ListReferenceCommand.cs similarity index 72% rename from test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/ListP2PsCommand.cs rename to test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/ListReferenceCommand.cs index df538f8c4..0dc5b5df3 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/ListP2PsCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/ListReferenceCommand.cs @@ -5,22 +5,22 @@ using Microsoft.DotNet.Cli.Utils; namespace Microsoft.DotNet.Tools.Test.Utilities { - public sealed class ListP2PsCommand : TestCommand + public sealed class ListReferenceCommand : TestCommand { private string _projectName = null; - public ListP2PsCommand() + public ListReferenceCommand() : base("dotnet") { } public override CommandResult Execute(string args = "") { - args = $"list {_projectName} p2ps {args}"; + args = $"list {_projectName} reference {args}"; return base.ExecuteWithCapturedOutput(args); } - public ListP2PsCommand WithProject(string projectName) + public ListReferenceCommand WithProject(string projectName) { _projectName = projectName; return this; diff --git a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj index b983bef79..09141e8e2 100644 --- a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj +++ b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj @@ -4,7 +4,7 @@ netcoreapp1.0 true - dotnet-add-p2p.Tests + dotnet-add-reference.Tests $(PackageTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-list-p2ps.Tests/GivenDotnetListP2Ps.cs b/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs similarity index 93% rename from test/dotnet-list-p2ps.Tests/GivenDotnetListP2Ps.cs rename to test/dotnet-list-reference.Tests/GivenDotnetListReference.cs index d74fdb348..6d82863b2 100644 --- a/test/dotnet-list-p2ps.Tests/GivenDotnetListP2Ps.cs +++ b/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs @@ -9,13 +9,13 @@ using System; using System.IO; using Xunit; -namespace Microsoft.DotNet.Cli.List.P2P.Tests +namespace Microsoft.DotNet.Cli.List.Reference.Tests { - public class GivenDotnetListP2Ps : TestBase + public class GivenDotnetListReference : TestBase { private const string HelpText = @".NET Core Project-to-Project dependency viewer -Usage: dotnet list p2ps [options] +Usage: dotnet list reference [options] Arguments: The project file to operate on. If a file is not specified, the command will search the current directory for one. @@ -33,7 +33,7 @@ Options: [InlineData("-h")] public void WhenHelpOptionIsPassedItPrintsUsage(string helpArg) { - var cmd = new ListP2PsCommand().Execute(helpArg); + var cmd = new ListReferenceCommand().Execute(helpArg); cmd.Should().Pass(); cmd.StdOut.Should().BeVisuallyEquivalentTo(HelpText); } @@ -66,7 +66,7 @@ Options: { var setup = Setup(); - var cmd = new ListP2PsCommand() + var cmd = new ListReferenceCommand() .WithWorkingDirectory(setup.TestRoot) .WithProject(projName) .Execute($"\"{setup.ValidRefCsprojPath}\""); @@ -81,7 +81,7 @@ Options: string projName = "Broken/Broken.csproj"; var setup = Setup(); - var cmd = new ListP2PsCommand() + var cmd = new ListReferenceCommand() .WithWorkingDirectory(setup.TestRoot) .WithProject(projName) .Execute($"\"{setup.ValidRefCsprojPath}\""); @@ -96,7 +96,7 @@ Options: var setup = Setup(); var workingDir = Path.Combine(setup.TestRoot, "MoreThanOne"); - var cmd = new ListP2PsCommand() + var cmd = new ListReferenceCommand() .WithWorkingDirectory(workingDir) .Execute($"\"{setup.ValidRefCsprojRelToOtherProjPath}\""); cmd.ExitCode.Should().NotBe(0); @@ -109,7 +109,7 @@ Options: { var setup = Setup(); - var cmd = new ListP2PsCommand() + var cmd = new ListReferenceCommand() .WithWorkingDirectory(setup.TestRoot) .Execute($"\"{setup.ValidRefCsprojPath}\""); cmd.ExitCode.Should().NotBe(0); @@ -122,7 +122,7 @@ Options: { var lib = NewLib(); - var cmd = new ListP2PsCommand() + var cmd = new ListReferenceCommand() .WithProject(lib.CsProjPath) .Execute(); cmd.Should().Pass(); @@ -140,7 +140,7 @@ Options: string ref1 = NewLib("ItPrintsSingleReference", "ref").CsProjPath; AddValidRef(ref1, lib); - var cmd = new ListP2PsCommand() + var cmd = new ListReferenceCommand() .WithProject(lib.CsProjPath) .Execute(); cmd.Should().Pass(); @@ -165,7 +165,7 @@ Options: AddValidRef(ref2, lib); AddValidRef(ref3, lib); - var cmd = new ListP2PsCommand() + var cmd = new ListReferenceCommand() .WithProject(lib.CsProjPath) .Execute(); cmd.Should().Pass(); diff --git a/test/dotnet-list-p2ps.Tests/MSBuild.exe b/test/dotnet-list-reference.Tests/MSBuild.exe similarity index 100% rename from test/dotnet-list-p2ps.Tests/MSBuild.exe rename to test/dotnet-list-reference.Tests/MSBuild.exe diff --git a/test/dotnet-list-p2ps.Tests/MSBuild.exe.config b/test/dotnet-list-reference.Tests/MSBuild.exe.config similarity index 100% rename from test/dotnet-list-p2ps.Tests/MSBuild.exe.config rename to test/dotnet-list-reference.Tests/MSBuild.exe.config diff --git a/test/dotnet-list-p2ps.Tests/dotnet-list-p2ps.Tests.csproj b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj similarity index 97% rename from test/dotnet-list-p2ps.Tests/dotnet-list-p2ps.Tests.csproj rename to test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj index 11e1e7819..e3c8454f4 100644 --- a/test/dotnet-list-p2ps.Tests/dotnet-list-p2ps.Tests.csproj +++ b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj @@ -4,7 +4,7 @@ netcoreapp1.0 true - dotnet-list-p2ps.Tests + dotnet-list-reference.Tests $(PackageTargetFallback);dotnet5.4;portable-net451+win8