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

Rebase with the latest sources and fix the tests.

Browse source
This commit is contained in:
Sridhar Periyasamy 2016-02-16 11:26:40 -08:00
parent ab455e6bb9
commit 9ec8556d24
7 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/dotnet-compile.UnitTests/GivenACompilationDriver.cs
View file

@ -24,7 +24,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
public GivenACompilationDriverController()
{
_projectJson =
Path.Combine(AppContext.BaseDirectory, "TestAssets", "TestProjects", "TestApp", "project.json");
Path.Combine(AppContext.BaseDirectory, "TestAssets", "TestProjects", "TestAppWithLibrary", "TestApp", "project.json");
_managedCompilerMock = new Mock<ICompiler>();
_managedCompilerMock.Setup(c => c
.Compile(It.IsAny<ProjectContext>(), It.IsAny<CompilerCommandApp>()))

1
test/dotnet-compile.UnitTests/GivenThatICareAboutScriptVariablesFromAManagedCompiler.cs
View file

@ -156,6 +156,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
AppContext.BaseDirectory,
"TestAssets",
"TestProjects",
"TestAppWithLibrary",
"TestApp");
public static string OutputPath = Path.Combine(

4
test/dotnet-compile.UnitTests/project.json
View file

@ -24,9 +24,7 @@
},
"content": [
"../../TestAssets/TestProjects/TestLibrary/*",
"../../TestAssets/TestProjects/TestApp/*",
"../../TestAssets/TestProjects/global.json"
"../../TestAssets/TestProjects/TestAppWithLibrary/**/*"
],
"testRunner": "xunit"