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

Use the correct compilerOption in LibraryExporter

Browse source
This commit is contained in:
Ajay Bhargav Baaskaran 2016-05-06 14:53:42 -07:00 • committed by Piotr Puszkiewicz
parent 8c902a1954
commit 7821df9bd3
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs
View file

@ -299,7 +299,7 @@ namespace Microsoft.DotNet.ProjectModel.Compilation
builder.AddRuntimeAsset(new LibraryAsset(Path.GetFileName(pdbPath), Path.GetFileName(pdbPath), pdbPath)); builder.AddRuntimeAsset(new LibraryAsset(Path.GetFileName(pdbPath), Path.GetFileName(pdbPath), pdbPath));
} }
} }
else if (HasSourceFiles(project)) else if (HasSourceFiles(project, compilerOptions))
{ {
var outputPaths = project.GetOutputPaths(_buildBasePath, _solutionRootPath, _configuration, _runtime); var outputPaths = project.GetOutputPaths(_buildBasePath, _solutionRootPath, _configuration, _runtime);
@ -337,10 +337,8 @@ namespace Microsoft.DotNet.ProjectModel.Compilation
return builder.Build(); return builder.Build();
} }
private bool HasSourceFiles(ProjectDescription project) private bool HasSourceFiles(ProjectDescription project, CommonCompilerOptions compilerOptions)
{ {
var compilerOptions = project.TargetFrameworkInfo.CompilerOptions;
if (compilerOptions.CompileInclude == null) if (compilerOptions.CompileInclude == null)
{ {
return project.Project.Files.SourceFiles.Any(); return project.Project.Files.SourceFiles.Any();