Reinstate belt and braces approach to loading extensions from mixed r…

…untimes
nunit · Jan 10, 2021 · bd0d308 · bd0d308
1 parent 7682d4a
commit bd0d308
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/NUnitEngine/nunit.engine.core/Services/ExtensionService.cs b/src/NUnitEngine/nunit.engine.core/Services/ExtensionService.cs
@@ -410,7 +410,13 @@ private void Visit(string filePath)
         /// </summary>
         internal void FindExtensionsInAssembly(ExtensionAssembly assembly)
         {
-            log.Info("Scanning {0} assembly for Extensions", assembly.FilePath);
+            log.Info($"Scanning {assembly.FilePath} for Extensions");
+
+            if (!CanLoadTargetFramework(Assembly.GetEntryAssembly(), assembly))
+            {
+                log.Info($"{assembly.FilePath} cannot be loaded on this runtime");
+                return;
+            }
 
             IRuntimeFramework assemblyTargetFramework = null;
 #if NETFRAMEWORK
@@ -539,4 +545,4 @@ internal static bool CanLoadTargetFramework(Assembly runnerAsm, ExtensionAssembl
         }
     }
 }
-#endif
+#endif