Fixing tests and a couple of issues in the code due to Localization.

This commit is contained in:
Livar Cunha 2016-12-16 23:59:58 -08:00
parent 1be6365e56
commit 52b45d0c49
8 changed files with 17 additions and 11 deletions

View file

@ -239,6 +239,7 @@ namespace Microsoft.DotNet.Cli.Utils
Reporter.Verbose.WriteLine(string.Format(
LocalizableStrings.ExpectDepsJsonAt,
ProjectToolsCommandResolverName,
depsJsonPath));
EnsureToolJsonDepsFileExists(toolLockFile, depsJsonPath, toolLibrary);

View file

@ -121,6 +121,6 @@ namespace Microsoft.DotNet.ProjectJsonMigration
public const string IgnoringMergedProperty = "Ignoring fully merged property";
public const string PropertyInfo = "{0}: {message}, {{ Name={1}, Value={2} }}";
public const string PropertyInfo = "{0}: {1}, {{ Name={2}, Value={3} }}";
}
}

View file

@ -125,7 +125,12 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Transforms
private void TracePropertyInfo(string message, ProjectPropertyElement mergedProperty)
{
MigrationTrace.Instance.WriteLine(String.Format(LocalizableStrings.PropertyInfo, nameof(PropertyTransformApplicator), mergedProperty.Name, mergedProperty.Value));
MigrationTrace.Instance.WriteLine(String.Format(
LocalizableStrings.PropertyInfo,
nameof(PropertyTransformApplicator),
message,
mergedProperty.Name,
mergedProperty.Value));
}
}
}

View file

@ -25,8 +25,8 @@ Options:
-h|--help Show help information
-f|--framework <FRAMEWORK> Add reference only when targetting a specific framework
Args:
Project to project references to add
Additional Arguments:
Project to project references to add
";
const string FrameworkNet451Arg = "-f net451";

View file

@ -24,8 +24,8 @@ Arguments:
Options:
-h|--help Show help information
Args:
Projects to add to solution
Additional Arguments:
Projects to add to solution
";
[Theory]

View file

@ -59,7 +59,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
[InlineData("run", true)]
public void When_help_is_invoked_Then_MSBuild_extra_options_text_is_included_in_output(string commandName, bool isMSBuildCommand)
{
const string MSBuildHelpText = " Any extra options that should be passed to MSBuild. See 'dotnet msbuild -h' for available options.";
const string MSBuildHelpText = " Any extra options that should be passed to MSBuild. See 'dotnet msbuild -h' for available options.";
var projectDirectory = TestAssetsManager.CreateTestDirectory("ItContainsMSBuildHelpText");
var result = new TestCommand("dotnet")

View file

@ -24,8 +24,8 @@ Options:
-h|--help Show help information
-f|--framework <FRAMEWORK> Remove reference only when targetting a specific framework
Args:
Project to project references to remove
Additional Arguments:
Project to project references to remove
";
const string FrameworkNet451Arg = "-f net451";

View file

@ -22,8 +22,8 @@ Arguments:
Options:
-h|--help Show help information
Args:
Projects to remove from a solution
Additional Arguments:
Projects to remove from a solution
";
[Theory]