From 304127ec0dadbe3def3aebfd68fcadc938efbd71 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 4 Mar 2016 12:16:23 -0800 Subject: [PATCH] Fix wrapped project export --- .../Compilation/LibraryExporter.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs b/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs index 2ab423241..2679750f4 100644 --- a/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs +++ b/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs @@ -215,7 +215,7 @@ namespace Microsoft.DotNet.ProjectModel.Compilation var compileAsset = new LibraryAsset( project.Project.Name, - null, + Path.GetFileName(assemblyPath), assemblyPath); builder.AddCompilationAssembly(compileAsset); @@ -334,7 +334,7 @@ namespace Microsoft.DotNet.ProjectModel.Compilation var assemblyPath = Path.Combine(package.Path, analyzer); - // $/analyzers/{Framework Name}{Version}/{Supported Architecture}/{Supported Programming Language}/{Analyzer}.dll + // $/analyzers/{Framework Name}{Version}/{Supported Architecture}/{Supported Programming Language}/{Analyzer}.dll switch (specifiers.Length) { // $/analyzers/{analyzer}.dll @@ -396,7 +396,7 @@ namespace Microsoft.DotNet.ProjectModel.Compilation private static bool LibraryIsOfType(LibraryType type, LibraryDescription library) { - return type.Equals(LibraryType.Unspecified) || // No type filter was requested + return type.Equals(LibraryType.Unspecified) || // No type filter was requested library.Identity.Type.Equals(type); // OR, library type matches requested type } }