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

Merge branch 'troy/1391' into rel/1.0.0

Browse source
This commit is contained in:
Troy Dai 2016-02-15 23:46:07 -08:00
commit 852f982bc1
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -128,6 +128,18 @@ namespace Microsoft.DotNet.ProjectModel.Compilation
/// </summary>
private LibraryExport GetExport(LibraryDescription library)
{
if (!library.Resolved)
{
// For a unresolved project reference returns a export with empty asset.
return new LibraryExport(library: library,
compileAssemblies: Enumerable.Empty<LibraryAsset>(),
sourceReferences: Enumerable.Empty<string>(),
nativeLibraries: Enumerable.Empty<LibraryAsset>(),
runtimeAssets: Enumerable.Empty<LibraryAsset>(),
runtimeAssemblies: EmptyArray<LibraryAsset>.Value,
analyzers: EmptyArray<AnalyzerReference>.Value);
}
if (Equals(LibraryType.Package, library.Identity.Type))
{
return ExportPackage((PackageDescription)library);
@ -167,18 +179,6 @@ namespace Microsoft.DotNet.ProjectModel.Compilation
private LibraryExport ExportProject(ProjectDescription project)
{
if (!project.Resolved)
{
// For a unresolved project reference returns a export with empty asset.
return new LibraryExport(library: project,
compileAssemblies: Enumerable.Empty<LibraryAsset>(),
sourceReferences: Enumerable.Empty<string>(),
nativeLibraries: Enumerable.Empty<LibraryAsset>(),
runtimeAssets: Enumerable.Empty<LibraryAsset>(),
runtimeAssemblies: EmptyArray<LibraryAsset>.Value,
analyzers: EmptyArray<AnalyzerReference>.Value);
}
var compileAssemblies = new List<LibraryAsset>();
var runtimeAssets = new List<LibraryAsset>();
var sourceReferences = new List<string>();