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( Reporter.Verbose.WriteLine(string.Format(
LocalizableStrings.ExpectDepsJsonAt, LocalizableStrings.ExpectDepsJsonAt,
ProjectToolsCommandResolverName,
depsJsonPath)); depsJsonPath));
EnsureToolJsonDepsFileExists(toolLockFile, depsJsonPath, toolLibrary); 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 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) 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,7 +25,7 @@ Options:
-h|--help Show help information -h|--help Show help information
-f|--framework <FRAMEWORK> Add reference only when targetting a specific framework -f|--framework <FRAMEWORK> Add reference only when targetting a specific framework
Args: Additional Arguments:
Project to project references to add Project to project references to add
"; ";

View file

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

View file

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

View file

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