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

Merge pull request #1477 from dotnet/brthor/deps-space-fix

Browse source 
fix dotnet-compile.deps.json space in the path issue.
This commit is contained in:
Bryan Thornbury 2016-02-18 11:24:40 -08:00
commit 8d939fc7e1
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dotnet/commands/dotnet-compile/ManagedCompiler.cs
View file

@ -115,7 +115,7 @@ namespace Microsoft.DotNet.Tools.Compiler
writer.Write(dependencyContext, fileStream);
}
compilerArgs.Add($"--resource:{depsJsonFile},{context.ProjectFile.Name}.deps.json");
compilerArgs.Add($"--resource:\"{depsJsonFile}\",{context.ProjectFile.Name}.deps.json");
}
if (!AddNonCultureResources(context.ProjectFile, compilerArgs, intermediateOutputPath))

18
test/dotnet-compile.Tests/CompilerTests.cs
View file

@ -88,6 +88,24 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
Assert.Contains("CA1018", result.StdErr);
}
[Fact]
public void CompilingAppWithPreserveCompilationContextWithSpaceInThePathShouldSucceed()
{
var root = Temp.CreateDirectory();
var spaceBufferDirectory = root.CreateDirectory("space directory");
var testAppDir = spaceBufferDirectory.CreateDirectory("TestAppCompilationContext");
CopyProjectToTempDir(Path.Combine(_testProjectsRoot, "TestAppCompilationContext"), testAppDir);
var testProjectDir = Path.Combine(_testProjectsRoot, "TestAppCompilationContext", "TestApp");
var testProject = Path.Combine(testProjectDir, "project.json");
var buildCommand = new BuildCommand(testProject);
buildCommand.Execute().Should().Pass();
}
private void CopyProjectToTempDir(string projectDir, TempDirectory tempDir)
{
// copy all the files to temp dir

1
test/dotnet-compile.Tests/project.json
View file

@ -23,6 +23,7 @@
"../../TestAssets/TestProjects/TestLibraryWithAnalyzer/*",
"../../TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/*",
"../../TestAssets/TestProjects/TestProjectWithCultureSpecificResource/*",
"../../TestAssets/TestProjects/TestAppCompilationContext/**/*",
"../../TestAssets/TestProjects/global.json"
],