mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #9323 from dotnet/merges/release/2.1.4xx-to-master

Browse source 
Merge release/2.1.4xx to master
This commit is contained in:
Livar 2018-05-22 13:28:50 -07:00 • committed by GitHub
commit 6f6f28dac6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
363 changed files with 6214 additions and 4797 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs
View file

@ -19,12 +19,11 @@ namespace Microsoft.DotNet.Cli.Add.Reference.Tests
Arguments:
<PROJECT> The project file to operate on. If a file is not specified, the command will search the current directory for one.
<PROJECT_PATH> Project to project references to add
<PROJECT_PATH> The paths to the projects to add as references.
Options:
-h, --help Show help information.
-f, --framework <FRAMEWORK> Add reference only when targeting a specific framework
";
-h, --help Show command line help.
-f, --framework <FRAMEWORK> Add the reference only when targeting a specific framework.";
private const string AddCommandHelpText = @"Usage: dotnet add [options] <PROJECT> [command]
@ -32,12 +31,11 @@ Arguments:
<PROJECT> The project file to operate on. If a file is not specified, the command will search the current directory for one.
Options:
-h, --help Show help information.
-h, --help Show command line help.
Commands:
package <PACKAGE_NAME> Add a NuGet package reference to the project.
reference <PROJECT_PATH> Add a project-to-project reference to the project.
";
reference <PROJECT_PATH> Add a project-to-project reference to the project.";
const string FrameworkNet451Arg = "-f net451";
const string ConditionFrameworkNet451 = "== 'net451'";

91
test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs
View file

@ -15,60 +15,61 @@ namespace Microsoft.DotNet.Help.Tests
public class GivenThatIWantToShowHelpForDotnetCommand : TestBase
{
private const string HelpText =
@"Usage: dotnet [runtime-options] [path-to-application]
Usage: dotnet [sdk-options] [command] [arguments] [command-options]
@"Usage: dotnet [runtime-options] [path-to-application] [arguments]
Execute a .NET Core application.
runtime-options:
--additionalprobingpath <path> Path containing probing policy and assemblies to probe for.
--additional-deps <path> Path to additional deps.json file.
--fx-version <version> Version of the installed Shared Framework to use to run the application.
--roll-forward-on-no-candidate-fx Roll forward on no candidate shared framework is enabled.
path-to-application:
The path to an application .dll file to execute.
SDK commands:
new Initialize .NET projects.
restore Restore dependencies specified in the .NET project.
run Compiles and immediately executes a .NET project.
build Builds a .NET project.
publish Publishes a .NET project for deployment (including the runtime).
test Runs unit tests using the test runner specified in the project.
pack Creates a NuGet package.
migrate Migrates a project.json based project to a msbuild based project.
clean Clean build output(s).
sln Modify solution (SLN) files.
add Add reference to the project.
remove Remove reference from the project.
list List references of a .NET project.
nuget Provides additional NuGet commands.
msbuild Runs Microsoft Build Engine (MSBuild).
vstest Runs Microsoft Test Execution Command Line Tool.
store Stores the specified assemblies in the runtime store.
tool Install or work with tools that extend the .NET experience.
build-server Interact with servers started by a build.
help Show help.
Usage: dotnet [sdk-options] [command] [command-options] [arguments]
Common options:
-v|--verbosity Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic].
-h|--help Show help.
Run 'dotnet COMMAND --help' for more information on a command.
Execute a .NET Core SDK command.
sdk-options:
--version Display .NET Core SDK version in use.
--info Display .NET Core information.
--list-sdks Display the installed SDKs.
--list-runtimes Display the installed runtimes.
-d|--diagnostics Enable diagnostic output.
-d|--diagnostics Enable diagnostic output.
-h|--help Show command line help.
--info Display .NET Core information.
--list-runtimes Display the installed runtimes.
--list-sdks Display the installed SDKs.
--version Display .NET Core SDK version in use.
runtime-options:
--additionalprobingpath <path> Path containing probing policy and assemblies to probe for.
--fx-version <version> Version of the installed Shared Framework to use to run the application.
--roll-forward-on-no-candidate-fx Roll forward on no candidate shared framework is enabled.
--additional-deps <path> Path to additional deps.json file.
SDK commands:
add Add a package or reference to a .NET project.
build Build a .NET project.
build-server Interact with servers started by a build.
clean Clean build outputs of a .NET project.
help Show command line help.
list List project references of a .NET project.
migrate Migrate a project.json project to an MSBuild project.
msbuild Run Microsoft Build Engine (MSBuild) commands.
new Create a new .NET project or file.
nuget Provides additional NuGet commands.
pack Create a NuGet package.
publish Publish a .NET project for deployment.
remove Remove a package or reference from a .NET project.
restore Restore dependencies specified in a .NET project.
run Build and run a .NET project output.
sln Modify Visual Studio solution files.
store Store the specified assemblies in the runtime package store.
test Run unit tests using the test runner specified in a .NET project.
tool Install or manage tools that extend the .NET experience.
vstest Run Microsoft Test Engine (VSTest) commands.
Additional tools ('dotnet [tool-name] --help' for more information):
dev-certs Create and manage development certificates.
ef Entity Framework Core command-line tools.
sql-cache SQL Server cache command-line tools.
user-secrets Manage development user secrets.
watch Start a file watcher that runs a command when files change.
";
Additional commands from bundled tools:
dev-certs Create and manage development certificates.
ef Entity Framework Core command-line tools.
sql-cache SQL Server cache command-line tools.
user-secrets Manage development user secrets.
watch Start a file watcher that runs a command when files change.
Run 'dotnet [command] --help' for more information on a command.";
[Theory]
[InlineData("--help")]

4
test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetHelpCommand.cs
View file

@ -14,10 +14,10 @@ namespace Microsoft.DotNet.Help.Tests
@"Usage: dotnet help [options] <COMMAND_NAME>
Arguments:
<COMMAND_NAME> CLI command for which to view more detailed help.
<COMMAND_NAME> The SDK command to launch online help for.
Options:
-h, --help Show help information";
-h, --help Show command line help.";
[Theory]
[InlineData("--help")]

8
test/dotnet-list-reference.Tests/GivenDotnetListReference.cs
View file

@ -20,8 +20,7 @@ Arguments:
<PROJECT> The project file to operate on. If a file is not specified, the command will search the current directory for one.
Options:
-h, --help Show help information.
";
-h, --help Show command line help.";
private const string ListCommandHelpText = @"Usage: dotnet list [options] <PROJECT> [command]
@ -29,11 +28,10 @@ Arguments:
<PROJECT> The project file to operate on. If a file is not specified, the command will search the current directory for one.
Options:
-h, --help Show help information.
-h, --help Show command line help.
Commands:
reference List all project-to-project references of the project.
";
reference List all project-to-project references of the project.";
const string FrameworkNet451Arg = "-f net451";
const string ConditionFrameworkNet451 = "== 'net451'";

10
test/dotnet-remove-package.Tests/GivenDotnetRemovePackage.cs
View file

@ -16,11 +16,10 @@ namespace Microsoft.DotNet.Cli.Remove.Package.Tests
Arguments:
<PROJECT> The project file to operate on. If a file is not specified, the command will search the current directory for one.
<PACKAGE_NAME> Package reference to remove.
<PACKAGE_NAME> The package reference to remove.
Options:
-h, --help Show help information.
";
-h, --help Show command line help.";
private const string RemoveCommandHelpText = @"Usage: dotnet remove [options] <PROJECT> [command]
@ -28,12 +27,11 @@ Arguments:
<PROJECT> The project file to operate on. If a file is not specified, the command will search the current directory for one.
Options:
-h, --help Show help information.
-h, --help Show command line help.
Commands:
package <PACKAGE_NAME> Remove a NuGet package reference from the project.
reference <PROJECT_PATH> Remove a project-to-project reference from the project.
";
reference <PROJECT_PATH> Remove a project-to-project reference from the project.";
[Theory]
[InlineData("--help")]

12
test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs
View file

@ -18,12 +18,11 @@ namespace Microsoft.DotNet.Cli.Remove.Reference.Tests
Arguments:
<PROJECT> The project file to operate on. If a file is not specified, the command will search the current directory for one.
<PROJECT_PATH> Project to project references to remove
<PROJECT_PATH> The paths to the referenced projects to remove.
Options:
-h, --help Show help information.
-f, --framework <FRAMEWORK> Remove reference only when targeting a specific framework
";
-h, --help Show command line help.
-f, --framework <FRAMEWORK> Remove the reference only when targeting a specific framework.";
private const string RemoveCommandHelpText = @"Usage: dotnet remove [options] <PROJECT> [command]
@ -31,12 +30,11 @@ Arguments:
<PROJECT> The project file to operate on. If a file is not specified, the command will search the current directory for one.
Options:
-h, --help Show help information.
-h, --help Show command line help.
Commands:
package <PACKAGE_NAME> Remove a NuGet package reference from the project.
reference <PROJECT_PATH> Remove a project-to-project reference from the project.
";
reference <PROJECT_PATH> Remove a project-to-project reference from the project.";
const string FrameworkNet451Arg = "-f net451";
const string ConditionFrameworkNet451 = "== 'net451'";

20
test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs
View file

@ -17,29 +17,27 @@ namespace Microsoft.DotNet.Cli.Sln.Add.Tests
{
public class GivenDotnetSlnAdd : TestBase
{
private string HelpText = @"Usage: dotnet sln <SLN_FILE> add [options] <args>
private string HelpText = @"Usage: dotnet sln <SLN_FILE> add [options] <PROJECT_PATH>
Arguments:
<SLN_FILE> Solution file to operate on. If not specified, the command will search the current directory for one.
<args> Add one or more specified projects to the solution.
<SLN_FILE> The solution file to operate on. If not specified, the command will search the current directory for one.
<PROJECT_PATH> The paths to the projects to add to the solution.
Options:
-h, --help Show help information.
";
-h, --help Show command line help.";
private const string SlnCommandHelpText = @"Usage: dotnet sln [options] <SLN_FILE> [command]
Arguments:
<SLN_FILE> Solution file to operate on. If not specified, the command will search the current directory for one.
<SLN_FILE> The solution file to operate on. If not specified, the command will search the current directory for one.
Options:
-h, --help Show help information.
-h, --help Show command line help.
Commands:
add <args> .NET Add project(s) to a solution file Command
list .NET List project(s) in a solution file Command
remove <args> .NET Remove project(s) from a solution file Command
";
add <PROJECT_PATH> Add one or more projects to a solution file.
list List all projects in a solution file.
remove <PROJECT_PATH> Remove one or more projects from a solution file.";
private ITestOutputHelper _output;

16
test/dotnet-sln-list.Tests/GivenDotnetSlnList.cs
View file

@ -18,25 +18,23 @@ namespace Microsoft.DotNet.Cli.Sln.List.Tests
private const string HelpText = @"Usage: dotnet sln <SLN_FILE> list [options]
Arguments:
<SLN_FILE> Solution file to operate on. If not specified, the command will search the current directory for one.
<SLN_FILE> The solution file to operate on. If not specified, the command will search the current directory for one.
Options:
-h, --help Show help information.
";
-h, --help Show command line help.";
private const string SlnCommandHelpText = @"Usage: dotnet sln [options] <SLN_FILE> [command]
Arguments:
<SLN_FILE> Solution file to operate on. If not specified, the command will search the current directory for one.
<SLN_FILE> The solution file to operate on. If not specified, the command will search the current directory for one.
Options:
-h, --help Show help information.
-h, --help Show command line help.
Commands:
add <args> .NET Add project(s) to a solution file Command
list .NET List project(s) in a solution file Command
remove <args> .NET Remove project(s) from a solution file Command
";
add <PROJECT_PATH> Add one or more projects to a solution file.
list List all projects in a solution file.
remove <PROJECT_PATH> Remove one or more projects from a solution file.";
[Theory]
[InlineData("--help")]

20
test/dotnet-sln-remove.Tests/GivenDotnetSlnRemove.cs
View file

@ -15,29 +15,27 @@ namespace Microsoft.DotNet.Cli.Sln.Remove.Tests
{
public class GivenDotnetSlnRemove : TestBase
{
private const string HelpText = @"Usage: dotnet sln <SLN_FILE> remove [options] <args>
private const string HelpText = @"Usage: dotnet sln <SLN_FILE> remove [options] <PROJECT_PATH>
Arguments:
<SLN_FILE> Solution file to operate on. If not specified, the command will search the current directory for one.
<args> Remove the specified project(s) from the solution. The project is not impacted.
<SLN_FILE> The solution file to operate on. If not specified, the command will search the current directory for one.
<PROJECT_PATH> The paths to the projects to from from the solution.
Options:
-h, --help Show help information.
";
-h, --help Show command line help.";
private const string SlnCommandHelpText = @"Usage: dotnet sln [options] <SLN_FILE> [command]
Arguments:
<SLN_FILE> Solution file to operate on. If not specified, the command will search the current directory for one.
<SLN_FILE> The solution file to operate on. If not specified, the command will search the current directory for one.
Options:
-h, --help Show help information.
-h, --help Show command line help.
Commands:
add <args> .NET Add project(s) to a solution file Command
list .NET List project(s) in a solution file Command
remove <args> .NET Remove project(s) from a solution file Command
";
add <PROJECT_PATH> Add one or more projects to a solution file.
list List all projects in a solution file.
remove <PROJECT_PATH> Remove one or more projects from a solution file.";
private const string ExpectedSlnContentsAfterRemove = @"
Microsoft Visual Studio Solution File, Format Version 12.00