diff --git a/NuGet.Config b/NuGet.Config
index f35c58dc2..e7b530794 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -5,7 +5,7 @@
-
+
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index ff484babe..e3aa4364b 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -11,11 +11,11 @@
$(CLI_SharedFrameworkVersion)
$(CLI_SharedFrameworkVersion)
$(CLI_SharedFrameworkVersion)
- 1.0.0-beta2-20170421-198
- 1.0.0-beta2-20170421-198
- 1.0.0-beta2-20170421-198
- 2.0.0-preview2-002081
- 2.0.0-preview2-002081
+ 1.0.0-beta2-20170425-201
+ 1.0.0-beta2-20170425-203
+ 1.0.0-beta2-20170425-203
+ 2.0.0-preview1-002088
+ 2.0.0-preview1-002088
0.1.0-alpha-142
diff --git a/src/dotnet/CommonLocalizableStrings.cs b/src/dotnet/CommonLocalizableStrings.cs
index d19b462d5..1c582f46a 100644
--- a/src/dotnet/CommonLocalizableStrings.cs
+++ b/src/dotnet/CommonLocalizableStrings.cs
@@ -185,5 +185,12 @@ namespace Microsoft.DotNet.Tools
public const string ProjectNotCompatibleWithFrameworks = "Project `{0}` cannot be added due to incompatible targeted frameworks between the two projects. Please review the project you are trying to add and verify that is compatible with the following targets:";
public const string ProjectDoesNotTargetFramework = "Project `{0}` does not target framework `{1}`.";
public const string ProjectCouldNotBeEvaluated = "Project `{0}` could not be evaluated. Evaluation failed with following error:\n{1}";
+
+ /// common options
+ public const string VerbosityOptionDescription = "Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]";
+ public const string FrameworkOptionDescription = "Target framework to publish for. The target framework has to be specified in the project file.";
+ public const string RuntimeOptionDescription = "Publish the project for a given runtime. This is used when creating self-contained deployment. Default is to publish a framework-dependent app.";
+ public const string ConfigurationOptionDescription = "Configuration to use for building the project. Default for most projects is \"Debug\".";
+ public const string CmdVersionSuffixDescription = "Defines the value for the $(VersionSuffix) property in the project.";
}
}
diff --git a/src/dotnet/CommonOptions.cs b/src/dotnet/CommonOptions.cs
index 4dc1dfacf..e2ea884ef 100644
--- a/src/dotnet/CommonOptions.cs
+++ b/src/dotnet/CommonOptions.cs
@@ -3,6 +3,7 @@ using System.IO;
using System.Linq;
using Microsoft.DotNet.Cli.CommandLine;
using Microsoft.DotNet.Tools.Common;
+using Microsoft.DotNet.Tools;
namespace Microsoft.DotNet.Cli
{
@@ -18,7 +19,7 @@ namespace Microsoft.DotNet.Cli
public static Option VerbosityOption() =>
Create.Option(
"-v|--verbosity",
- "Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]",
+ CommonLocalizableStrings.VerbosityOptionDescription,
Accept.AnyOneOf(
"q", "quiet",
"m", "minimal",
@@ -30,7 +31,7 @@ namespace Microsoft.DotNet.Cli
public static Option FrameworkOption() =>
Create.Option(
"-f|--framework",
- "Target framework to publish for. The target framework has to be specified in the project file.",
+ CommonLocalizableStrings.FrameworkOptionDescription,
Accept.ExactlyOneArgument()
.WithSuggestionsFrom(_ => Suggest.TargetFrameworksFromProjectFile())
.With(name: "FRAMEWORK")
@@ -39,7 +40,7 @@ namespace Microsoft.DotNet.Cli
public static Option RuntimeOption() =>
Create.Option(
"-r|--runtime",
- "Publish the project for a given runtime. This is used when creating self-contained deployment. Default is to publish a framework-dependent app.",
+ CommonLocalizableStrings.RuntimeOptionDescription,
Accept.ExactlyOneArgument()
.WithSuggestionsFrom(_ => Suggest.RunTimesFromProjectFile())
.With(name: "RUNTIME_IDENTIFIER")
@@ -47,8 +48,8 @@ namespace Microsoft.DotNet.Cli
public static Option ConfigurationOption() =>
Create.Option(
- "-c|--configuration",
- "Configuration to use for building the project. Default for most projects is \"Debug\".",
+ "-c|--configuration",
+ CommonLocalizableStrings.ConfigurationOptionDescription,
Accept.ExactlyOneArgument()
.With(name: "CONFIGURATION")
.WithSuggestionsFrom("DEBUG", "RELEASE")
@@ -57,7 +58,7 @@ namespace Microsoft.DotNet.Cli
public static Option VersionSuffixOption() =>
Create.Option(
"--version-suffix",
- "Defines the value for the $(VersionSuffix) property in the project.",
+ CommonLocalizableStrings.CmdVersionSuffixDescription,
Accept.ExactlyOneArgument()
.With(name: "VERSION_SUFFIX")
.ForwardAsSingle(o => $"/p:VersionSuffix={o.Arguments.Single()}"));
diff --git a/src/dotnet/commands/dotnet-restore/Program.cs b/src/dotnet/commands/dotnet-restore/Program.cs
index 1e1ff728d..e06ddc42d 100644
--- a/src/dotnet/commands/dotnet-restore/Program.cs
+++ b/src/dotnet/commands/dotnet-restore/Program.cs
@@ -23,8 +23,6 @@ namespace Microsoft.DotNet.Tools.Restore
{
DebugHelper.HandleDebugSwitch(ref args);
- Reporter.Output.WriteLine(string.Join(" ", args));
-
var parser = Parser.Instance;
var result = parser.ParseFrom("dotnet restore", args);