huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle compilerOptions in project.json

This commit is contained in:
Prafull Bhosale 2016-10-12 09:49:12 -07:00
parent 329b65fc69
commit 1ae83eff70
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Microsoft.Extensions.ProjectModel.DotNet.Sources/DotNetProjectContext.cs
View File

@ -52,7 +52,7 @@ namespace Microsoft.Extensions.ProjectModel
_compilerOptions = _projectContext.ProjectFile.GetCompilerOptions(TargetFramework, Configuration); _compilerOptions = _projectContext.ProjectFile.GetCompilerOptions(TargetFramework, Configuration);
// Workaround https://github.com/dotnet/cli/issues/3164 // Workaround https://github.com/dotnet/cli/issues/3164
IsClassLibrary = !(_compilerOptions.EmitEntryPoint IsClassLibrary = !(_compilerOptions?.EmitEntryPoint
?? projectContext.ProjectFile.GetCompilerOptions(null, configuration).EmitEntryPoint.GetValueOrDefault()); ?? projectContext.ProjectFile.GetCompilerOptions(null, configuration).EmitEntryPoint.GetValueOrDefault());
_dependencyProvider = new Lazy<DotNetDependencyProvider>(() => new DotNetDependencyProvider(_projectContext)); _dependencyProvider = new Lazy<DotNetDependencyProvider>(() => new DotNetDependencyProvider(_projectContext));
@ -80,13 +80,17 @@ namespace Microsoft.Extensions.ProjectModel
// TODO read from xproj if available // TODO read from xproj if available
public string RootNamespace => _projectContext.ProjectFile.Name; public string RootNamespace => _projectContext.ProjectFile.Name;
public string TargetDirectory => _paths.RuntimeOutputPath; public string TargetDirectory => _paths.RuntimeOutputPath;
public string Platform => _compilerOptions.Platform; public string Platform => _compilerOptions?.Platform;
public IEnumerable<string> CompilationItems public IEnumerable<string> CompilationItems
=> _compilerOptions.CompileInclude.ResolveFiles(); => (_compilerOptions?.CompileInclude == null)
? _projectContext.ProjectFile.Files.SourceFiles
: _compilerOptions.CompileInclude.ResolveFiles();
public IEnumerable<string> EmbededItems public IEnumerable<string> EmbededItems
=> _compilerOptions.EmbedInclude.ResolveFiles(); => (_compilerOptions?.EmbedInclude == null)
? _projectContext.ProjectFile.Files.ResourceFiles.Keys
: _compilerOptions.EmbedInclude.ResolveFiles();
public IEnumerable<DependencyDescription> PackageDependencies public IEnumerable<DependencyDescription> PackageDependencies
{ {