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

Merge branch 'master' into MergeRel10

Browse source
This commit is contained in:
Eric Erhardt 2017-02-01 18:45:05 -06:00 • committed by GitHub
commit 0281fde7d1
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/dotnet/commands/dotnet-migrate/LocalizableStrings.cs
View file

@ -17,11 +17,11 @@ Defaults to current directory if nothing is specified.";
public const string CmdTemplateDescription = "Base MSBuild template to use for migrated app. The default is the project included in dotnet new.";
public const string CmdVersionDescription = "The version of the sdk package that will be referenced in the migrated app. The default is the version of the sdk in dotnet new.";
public const string CmdVersionDescription = "The version of the SDK package that will be referenced in the migrated app. The default is the version of the SDK in dotnet new.";
public const string CmdXprojFileDescription = "The path to the xproj file to use. Required when there is more than one xproj in a project directory.";
public const string CmdSkipProjectReferencesDescription = "Skip migrating project references. By default project references are migrated recursively.";
public const string CmdSkipProjectReferencesDescription = "Skip migrating project references. By default, project references are migrated recursively.";
public const string CmdReportFileDescription = "Output migration report to the given file in addition to the console.";

2
src/dotnet/commands/dotnet-publish/LocalizableStrings.cs
View file

@ -16,7 +16,7 @@
public const string RuntimeOption = "RUNTIME_IDENTIFIER";
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-dependented app.";
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 OutputOption = "OUTPUT_DIR";

2
src/dotnet/commands/dotnet-test/LocalizableStrings.cs
View file

@ -53,7 +53,7 @@
public const string CmdNoBuildDescription = @"Do not build project before testing.";
public const string RunSettingsArgsHelpText = @"Any extra commandline runsettings arguments that should be passed to vstest. See 'dotnet vstest --help' for available options.
public const string RunSettingsArgsHelpText = @"Any extra command-line runsettings arguments that should be passed to vstest. See 'dotnet vstest --help' for available options.
Example: -- RunConfiguration.ResultsDirectory=""C:\users\user\desktop\Results Directory"" MSTest.DeploymentEnabled=false";
public const string CmdResultsDirectoryDescription = @"The test results directory will be created in the specified path if it does not exist.