Further work on 1613

Author: CharliePoole

src/NUnitConsole/nunit3-console/ConsoleRunner.cs

@@ -52,7 +52,7 @@ public class ConsoleRunner
 
         public ConsoleRunner(ITestEngine engine, ConsoleOptions options, ExtendedTextWriter writer)
         {
-             Guard.ArgumentNotNull(_engine = engine, nameof(engine));
+            Guard.ArgumentNotNull(_engine = engine, nameof(engine));
             Guard.ArgumentNotNull(_options = options, nameof(options));
             Guard.ArgumentNotNull(_outWriter = writer, nameof(writer));
 
@@ -71,7 +71,7 @@ public ConsoleRunner(ITestEngine engine, ConsoleOptions options, ExtendedTextWri
                 foreach (string extensionDirectory in extensionPath.Split(new[] { Path.PathSeparator }, StringSplitOptions.RemoveEmptyEntries))
                     _extensionService.FindExtensionAssemblies(extensionDirectory);
 
-             foreach (string extensionDirectory in _options.ExtensionDirectories)
+            foreach (string extensionDirectory in _options.ExtensionDirectories)
                _extensionService.FindExtensionAssemblies(extensionDirectory);
 
             _workDirectory = options.WorkDirectory;

src/NUnitEngine/nunit.engine.core/Services/DriverService.cs

@@ -21,7 +21,7 @@ public class DriverService : Service, IDriverService
         static ILogger log = InternalTrace.GetLogger("DriverService");
 
         private ExtensionService _extensionService;
-        private IList<IDriverFactory> _factories;
+        private List<IDriverFactory> _factories;
 
         /// <summary>
         /// Get a driver suitable for use with a particular test assembly.
@@ -125,8 +125,7 @@ private void InitializeDriverFactories()
 
             if (_extensionService != null)
             {
-                foreach (IDriverFactory factory in _extensionService.GetExtensions<IDriverFactory>())
-                    _factories.Add(factory);
+                _factories.AddRange(_extensionService.GetExtensions<IDriverFactory>());
 
 #if NETFRAMEWORK
                 var node = _extensionService.GetExtensionNode("/NUnit/Engine/NUnitV2Driver");

src/NUnitEngine/nunit.engine.core/Services/ExtensionManager.cs

@@ -10,7 +10,6 @@
 using NUnit.Engine.Internal.FileSystemAccess;
 using NUnit.Engine.Internal.FileSystemAccess.Default;
 using System.Linq;
-using System.Diagnostics;
 
 namespace NUnit.Engine.Services
 {
@@ -21,7 +20,6 @@ public class ExtensionManager
         static readonly Logger log = InternalTrace.GetLogger(typeof(ExtensionManager));
 
         private readonly IFileSystem _fileSystem;
-        //private readonly IAddinsFileReader _addinsReader;
         private readonly IDirectoryFinder _directoryFinder;
 
         // List of all ExtensionPoints discovered
@@ -154,10 +152,7 @@ public void FindExtensionAssemblies(string startDir)
 
                 log.Info($"FindExtensionAssemblies examining extension directory {startDir}");
 
-                // Create the list of possible extension assemblies,
-                // eliminating duplicates, start in the provided directory.
-                // In this top level directory, we only look at .addins files.
-                ProcessAddinsFiles(_fileSystem.GetDirectory(startDir), false);
+                ProcessDirectory(_fileSystem.GetDirectory(startDir), false);
             }
         }
 
@@ -631,27 +626,6 @@ internal bool CanLoadTargetFramework(Assembly runnerAsm, ExtensionAssembly exten
                     }
             }
 
-            //string extensionFrameworkName = AssemblyDefinition.ReadAssembly(extensionAsm.FilePath).GetFrameworkName();
-            //string runnerFrameworkName = AssemblyDefinition.ReadAssembly(runnerAsm.Location).GetFrameworkName();
-            //if (runnerFrameworkName?.StartsWith(".NETStandard") == true)
-            //{
-            //    throw new NUnitEngineException($"{runnerAsm.FullName} test runner must target .NET Core or .NET Framework, not .NET Standard");
-            //}
-            //else if (runnerFrameworkName?.StartsWith(".NETCoreApp") == true)
-            //{
-            //    if (extensionFrameworkName?.StartsWith(".NETStandard") != true && extensionFrameworkName?.StartsWith(".NETCoreApp") != true)
-            //    {
-            //        log.Info($".NET Core runners require .NET Core or .NET Standard extension for {extensionAsm.FilePath}");
-            //        return false;
-            //    }
-            //}
-            //else if (extensionFrameworkName?.StartsWith(".NETCoreApp") == true)
-            //{
-            //    log.Info($".NET Framework runners cannot load .NET Core extension {extensionAsm.FilePath}");
-            //    return false;
-            //}
-
-            //return true;
         }
 
         private System.Runtime.Versioning.FrameworkName GetTargetRuntime(string filePath)