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

Adding some more tracing to tools command resolvers.

Browse source
This commit is contained in:
Livar Cunha 2016-10-14 00:23:49 -07:00
parent d8a10024e5
commit 99d6b1fd6d
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectDependenciesCommandResolver.cs
View file

@ -78,6 +78,7 @@ namespace Microsoft.DotNet.Cli.Utils
if (project == null)
{
Reporter.Verbose.WriteLine($"projectdependenciescommandresolver: Didn't find a matching project {projectDirectory}.");
return null;
}
@ -131,6 +132,8 @@ namespace Microsoft.DotNet.Cli.Utils
throw new InvalidOperationException($"Ambiguous command name: {commandName}");
}
Reporter.Verbose.WriteLine($"projectdependenciescommandresolver: tool library found {toolLibraries?.Count() > 0}");
return toolLibraries?.FirstOrDefault();
}

3
src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectFactory.cs
View file

@ -38,7 +38,10 @@ namespace Microsoft.DotNet.Cli.Utils
Path.Combine(AppContext.BaseDirectory, "msbuild.exe") :
msBuildExePath;
Reporter.Verbose.WriteLine($"projetfactory: MSBUILD_EXE_PATH = {msBuildExePath}");
string msBuildProjectPath = GetMSBuildProjPath(projectDirectory);
Reporter.Verbose.WriteLine($"projetfactory: MSBuild project path = {msBuildProjectPath}");
if(msBuildProjectPath == null)
{
return null;

2
test/EndToEnd/GivenDotNetUsesMSBuild.cs
View file

@ -108,7 +108,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
new DotnetCommand()
.WithWorkingDirectory(testProjectDirectory)
.ExecuteWithCapturedOutput("dependency-tool-invoker -f netcoreapp1.0 portable")
.ExecuteWithCapturedOutput("-v dependency-tool-invoker -f netcoreapp1.0 portable")
.Should()
.Pass()
.And

1
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolverBeingUsedWithMSBuild.cs
View file

@ -41,6 +41,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
Environment.SetEnvironmentVariable(
Constants.MSBUILD_EXE_PATH,
Path.Combine(_repoDirectoriesProvider.Stage2Sdk, "msbuild.exe"));
Environment.SetEnvironmentVariable("DOTNET_CLI_CONTEXT_VERBOSE", "true");
}
[Fact]