Merge pull request #3376 from eerhardt/MergePreview2

Merge rel/1.0.0-preview2 into rel/1.0.0
This commit is contained in:
Eric Erhardt 2016-06-06 19:03:01 -05:00
commit 0b30b148f3
189 changed files with 464 additions and 557 deletions

View file

@ -8,16 +8,22 @@ namespace Microsoft.DotNet.Tools.Help
{
public class HelpCommand
{
private const string UsageText = @"Usage: dotnet [common-options] [command] [arguments]
private const string UsageText = @"Usage: dotnet [host-options] [command] [arguments] [common-options]
Arguments:
[command] The command to execute
[arguments] Arguments to pass to the command
[command] The command to execute
[arguments] Arguments to pass to the command
[host-options] Options specific to dotnet (host)
[common-options] Options common to all commands
Common Options (passed before the command):
-v|--verbose Enable verbose output
--version Display .NET CLI Version Number
--info Display .NET CLI Info
Common options:
-v|--verbose Enable verbose output
-h|--help Show help
Host options (passed before the command):
-v|--verbose Enable verbose output
--version Display .NET CLI Version Number
--info Display .NET CLI Info
Common Commands:
new Initialize a basic .NET project

View file

@ -9,7 +9,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004363"
"version": "1.0.0-rc3-004391"
}
},
"imports": "dnxcore50"

View file

@ -27,7 +27,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004363"
"version": "1.0.0-rc3-004391"
}
},
"imports": [