Fixing tests and a couple of issues in the code due to Localization.
This commit is contained in:
parent
1be6365e56
commit
52b45d0c49
8 changed files with 17 additions and 11 deletions
|
@ -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);
|
||||||
|
|
|
@ -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} }}";
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,8 +25,8 @@ 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
|
||||||
";
|
";
|
||||||
|
|
||||||
const string FrameworkNet451Arg = "-f net451";
|
const string FrameworkNet451Arg = "-f net451";
|
||||||
|
|
|
@ -24,8 +24,8 @@ 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
|
||||||
";
|
";
|
||||||
|
|
||||||
[Theory]
|
[Theory]
|
||||||
|
|
|
@ -59,7 +59,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
|
||||||
[InlineData("run", true)]
|
[InlineData("run", true)]
|
||||||
public void When_help_is_invoked_Then_MSBuild_extra_options_text_is_included_in_output(string commandName, bool isMSBuildCommand)
|
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 projectDirectory = TestAssetsManager.CreateTestDirectory("ItContainsMSBuildHelpText");
|
||||||
var result = new TestCommand("dotnet")
|
var result = new TestCommand("dotnet")
|
||||||
|
|
|
@ -24,8 +24,8 @@ 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
|
||||||
";
|
";
|
||||||
|
|
||||||
const string FrameworkNet451Arg = "-f net451";
|
const string FrameworkNet451Arg = "-f net451";
|
||||||
|
|
|
@ -22,8 +22,8 @@ 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
|
||||||
";
|
";
|
||||||
|
|
||||||
[Theory]
|
[Theory]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue