From 4ac4b7b5012c64f3bf981a96da62ed6aa84df81b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0est=C3=A1k=20V=C3=ADt?= <Vit.Sestak@ysoft.com>
Date: Tue, 1 Aug 2017 16:14:55 +0200
Subject: [PATCH] Improved main library detection for .NET

---
 app/services/OdcService.scala | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/services/OdcService.scala b/app/services/OdcService.scala
index ea2411f..be4c8b8 100644
--- a/app/services/OdcService.scala
+++ b/app/services/OdcService.scala
@@ -85,7 +85,11 @@ class OdcService @Inject() (odcConfig: OdcConfig, odcDbConnectionConfig: OdcDbCo
 
   def scanDotNet(packageName: String, version: String): Future[SingleLibraryScanResult] = scanInternal(
     createOdcCommand = createStandardOdcCommand,
-    isMainLibraryOption = Some(_.fileName == s"$packageName.dll"),
+    isMainLibraryOption = Some(dep =>
+      (dep.fileName == s"$packageName.dll") ||
+        (dep.fileName == s"$packageName.$version.nupkg") ||
+        (dep.fileName == s"$packageName.$version.nupkg: $packageName.nuspec")
+    ),
     enableMultipleMainLibraries = true,
     limitations = Some("Scans for .NET libraries usually contain multiple DLL variants of the same library, because multiple targets (e.g., .NETFramework 4.0, .NETFramework 4.5, .NETStandard 1.0, Portable Class Library, …) are scanned.")
   ){dir =>