Merge pull request #940 from microsoft/dev

Merge regression issue fixes
microsoft · Oct 27, 2020 · efd82cc · efd82cc
2 parents 15738f0 + 6d5b655
commit efd82cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/ApiPort/ApiPort.VisualStudio.Common/Analyze/ProjectAnalyzer.cs b/src/ApiPort/ApiPort.VisualStudio.Common/Analyze/ProjectAnalyzer.cs
@@ -83,7 +83,7 @@ public ProjectAnalyzer(
 
                 foreach (var file in output)
                 {
-                    targetAssemblies.Add(Path.GetFileName(file));
+                    targetAssemblies.Add(file);
                 }
 
                 referencedNuGetPackages.UnionWith(GetPackageReferences(project));

diff --git a/src/lib/Microsoft.Fx.Portability.Reports.Excel/ExcelOpenXmlOutputWriter.cs b/src/lib/Microsoft.Fx.Portability.Reports.Excel/ExcelOpenXmlOutputWriter.cs
@@ -225,10 +225,13 @@ private static void GenerateUnreferencedAssembliesPage(Worksheet missingAssembli
                 }
             }
 
-            foreach (var unresolvedAssemblyPair in response.Request.NonUserAssemblies.OrderBy(asm => asm.AssemblyIdentity))
+            if (response.Request.NonUserAssemblies != null)
             {
-                missingAssembliesPage.AddRow(unresolvedAssemblyPair.AssemblyIdentity, string.Empty, LocalizedStrings.SkippedAssembly);
-                detailsRows++;
+                foreach (var unresolvedAssemblyPair in response.Request.NonUserAssemblies.OrderBy(asm => asm.AssemblyIdentity))
+                {
+                    missingAssembliesPage.AddRow(unresolvedAssemblyPair.AssemblyIdentity, string.Empty, LocalizedStrings.SkippedAssembly);
+                    detailsRows++;
+                }
             }
 
             // Generate the pretty table