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

Addressing code review comments.

Browse source
This commit is contained in:
Livar Cunha 2016-11-23 10:19:00 -08:00
parent dc87680337
commit d5f7efbe86
3 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Microsoft.DotNet.Cli.Utils/Muxer.cs
View file

@ -15,7 +15,8 @@ namespace Microsoft.DotNet.Cli.Utils
{ {
get get
{ {
return new DirectoryInfo(Path.GetDirectoryName(GetDataFromAppDomain("FX_DEPS_FILE"))).Name; var depsFile = new FileInfo(Path.GetDirectoryName(GetDataFromAppDomain("FX_DEPS_FILE")));
return depsFile.Directory.Name;
} }
} }

8
test/EndToEnd/GivenDotNetUsesMSBuild.cs
View file

@ -70,7 +70,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
} }
[Fact] [Fact]
public void ItCanRunToolsThatPrefersTheCliRuntime() public void ItCanRunToolsThatPrefersTheCliRuntimeEvenWhenTheToolItselfDeclaresADifferentRuntime()
{ {
var testInstance = TestAssets.Get("MSBuildTestApp") var testInstance = TestAssets.Get("MSBuildTestApp")
.CreateInstance() .CreateInstance()
@ -82,10 +82,8 @@ namespace Microsoft.DotNet.Tests.EndToEnd
new DotnetCommand() new DotnetCommand()
.WithWorkingDirectory(testInstance.Root) .WithWorkingDirectory(testInstance.Root)
.ExecuteWithCapturedOutput("prefercliruntime") .ExecuteWithCapturedOutput("prefercliruntime")
.Should() .Should().Pass()
.Pass() .And.HaveStdOutContaining("Hello I prefer the cli runtime World!");;
.And
.HaveStdOutContaining("Hello I prefer the cli runtime World!");;
} }
[Fact] [Fact]

42
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
View file

@ -80,16 +80,16 @@ namespace Microsoft.DotNet.Tests
{ {
var projectToolsCommandResolver = SetupProjectToolsCommandResolver(); var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
var testInstance = TestAssetsManager var testInstance = TestAssets.Get(TestProjectName)
.CreateTestInstance(TestProjectName) .CreateInstance()
.WithNuGetMSBuildFiles() .WithSourceFiles()
.WithLockFiles(); .WithRestoreFiles();
var commandResolverArguments = new CommandResolverArguments() var commandResolverArguments = new CommandResolverArguments()
{ {
CommandName = "nonexistent-command", CommandName = "nonexistent-command",
CommandArguments = null, CommandArguments = null,
ProjectDirectory = testInstance.Path ProjectDirectory = testInstance.Root.FullName
}; };
var result = projectToolsCommandResolver.Resolve(commandResolverArguments); var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
@ -102,16 +102,16 @@ namespace Microsoft.DotNet.Tests
{ {
var projectToolsCommandResolver = SetupProjectToolsCommandResolver(); var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
var testInstance = TestAssetsManager var testInstance = TestAssets.Get(TestProjectName)
.CreateTestInstance(TestProjectName) .CreateInstance()
.WithNuGetMSBuildFiles() .WithSourceFiles()
.WithLockFiles(); .WithRestoreFiles();
var commandResolverArguments = new CommandResolverArguments() var commandResolverArguments = new CommandResolverArguments()
{ {
CommandName = "dotnet-portable", CommandName = "dotnet-portable",
CommandArguments = null, CommandArguments = null,
ProjectDirectory = testInstance.Path ProjectDirectory = testInstance.Root.FullName
}; };
var result = projectToolsCommandResolver.Resolve(commandResolverArguments); var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
@ -266,23 +266,23 @@ namespace Microsoft.DotNet.Tests
{ {
var projectToolsCommandResolver = SetupProjectToolsCommandResolver(); var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
var testInstance = TestAssetsManager var testInstance = TestAssets.Get("MSBuildTestApp")
.CreateTestInstance("MSBuildTestApp") .CreateInstance()
.WithNuGetMSBuildFiles() .WithSourceFiles()
.WithLockFiles(); .WithRestoreFiles();
var commandResolverArguments = new CommandResolverArguments() var commandResolverArguments = new CommandResolverArguments()
{ {
CommandName = "dotnet-prefercliruntime", CommandName = "dotnet-prefercliruntime",
CommandArguments = null, CommandArguments = null,
ProjectDirectory = testInstance.Path ProjectDirectory = testInstance.Root.FullName
}; };
var result = projectToolsCommandResolver.Resolve(commandResolverArguments); var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
result.Should().NotBeNull(); result.Should().NotBeNull();
result.Args.Should().Contain("-fx-version 1.0.1"); result.Args.Should().Contain("--fx-version 1.0.1");
} }
[Fact] [Fact]
@ -290,16 +290,16 @@ namespace Microsoft.DotNet.Tests
{ {
var projectToolsCommandResolver = SetupProjectToolsCommandResolver(); var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
var testInstance = TestAssetsManager var testInstance = TestAssets.Get(TestProjectName)
.CreateTestInstance(TestProjectName) .CreateInstance()
.WithNuGetMSBuildFiles() .WithSourceFiles()
.WithLockFiles(); .WithRestoreFiles();
var commandResolverArguments = new CommandResolverArguments() var commandResolverArguments = new CommandResolverArguments()
{ {
CommandName = "dotnet-portable", CommandName = "dotnet-portable",
CommandArguments = null, CommandArguments = null,
ProjectDirectory = testInstance.Path ProjectDirectory = testInstance.Root.FullName
}; };
var result = projectToolsCommandResolver.Resolve(commandResolverArguments); var result = projectToolsCommandResolver.Resolve(commandResolverArguments);