Restore and reorganize tests

NuGet.config

@@ -4,6 +4,7 @@
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
 	<add key="TestCentric MyGet V2 Feed" value="https://www.myget.org/F/testcentric/api/v2/" />
-	<add key="TestCentric MyGet V3 Feed" value="https://www.myget.org/F/testcentric/api/v3/index.json" />
+	  <add key="TestCentric MyGet V3 Feed" value="https://www.myget.org/F/testcentric/api/v3/index.json" />
+	  <add key="NUnit MyGet V3 Feed" value="https://www.myget.org/F/nunit/api/v3/index.json" />
   </packageSources>
 </configuration>

build.cake

@@ -1,5 +1,5 @@
 // Load the recipe
-#load nuget:?package=TestCentric.Cake.Recipe&version=1.4.1-dev00004
+#load nuget:?package=TestCentric.Cake.Recipe&version=1.5.0-dev00006
 // Comment out above line and uncomment below for local tests of recipe changes
 //#load ../TestCentric.Cake.Recipe/recipe/*.cake
 
@@ -19,8 +19,8 @@ BuildSettings.Packages.Add(new NuGetPackage(
 	source: "nuget/TestCentric.Extensibility.nuspec",
 	checks: new PackageCheck[] {
 		HasFiles("LICENSE.txt", "README.md", "testcentric.png"),
-		HasDirectory("lib/net20")
-			.WithFiles("TestCentric.Extensibility.dll", "TestCentric.Extensibility.api.dll", "nunit.engine.api.dll"),
+		//HasDirectory("lib/net20")
+		//	.WithFiles("TestCentric.Extensibility.dll", "TestCentric.Extensibility.api.dll", "nunit.engine.api.dll"),
 		HasDirectory("lib/net462")
 			.WithFiles("testcentric.extensibility.dll", "TestCentric.Extensibility.api.dll", "nunit.engine.api.dll"),
 		HasDirectory("lib/netstandard2.0")
@@ -49,7 +49,7 @@ BuildSettings.Packages.Add(new NuGetPackage(
 	checks: new PackageCheck[] {
 		HasFiles(
 			"LICENSE.txt", "README.md", "testcentric.png",
-			"lib/net20/testcentric.extensibility.api.dll",
+			//"lib/net20/testcentric.extensibility.api.dll",
 			"lib/net462/testcentric.extensibility.api.dll",
 			"lib/netstandard2.0/testcentric.extensibility.api.dll") }));
 

nuget/TestCentric.Extensibility.Api.nuspec

@@ -18,7 +18,7 @@
 		<file src="../../README.md" />
 		<file src="../../LICENSE.txt" />
 		<file src="../../testcentric.png" />
-		<file src="net20/TestCentric.Extensibility.Api.dll" target="lib/net20" />
+		<!--<file src="net20/TestCentric.Extensibility.Api.dll" target="lib/net20" />-->
 		<file src="net462/TestCentric.Extensibility.Api.dll" target="lib/net462" />
 		<file src="netstandard2.0/TestCentric.Extensibility.Api.dll" target="lib/netstandard2.0" />
 	</files>

nuget/TestCentric.Extensibility.nuspec

@@ -22,11 +22,11 @@
 		<file src="../../README.md" />
 		<file src="../../LICENSE.txt" />
 		<file src="../../testcentric.png" />
-		<file src="net20/TestCentric.Extensibility.dll" target="lib/net20" />
+		<!--<file src="net20/TestCentric.Extensibility.dll" target="lib/net20" />
 		<file src="net20/TestCentric.Extensibility.pdb" target="lib/net20" />
 		<file src="net20/TestCentric.Extensibility.Api.dll" target="lib/net20" />
 		<file src="net20/TestCentric.Extensibility.Api.pdb" target="lib/net20" />
-		<file src="net20/nunit.engine.api.dll" target="lib/net20" />
+		<file src="net20/nunit.engine.api.dll" target="lib/net20" />-->
 		<file src="net462/TestCentric.Extensibility.dll" target="lib/net462" />
 		<file src="net462/TestCentric.Extensibility.pdb" target="lib/net462" />
 		<file src="net462/TestCentric.Extensibility.Api.dll" target="lib/net462" />

src/Directory.Build.props

@@ -23,10 +23,9 @@
         <DebugSymbols>true</DebugSymbols>
         <!-- Commonly Used Package Versions -->
         <AnnotatedReferenceAssemblyVersion>8.0.0</AnnotatedReferenceAssemblyVersion>
-		<EngineVersion>2.0.0-dev01905</EngineVersion>
+		<EngineVersion>2.0.0-dev01907</EngineVersion>
 		<MetadataVersion>3.0.4</MetadataVersion>
 		<InternalTraceVersion>1.2.1</InternalTraceVersion>
-		<NUnitApiVersion>3.16.2</NUnitApiVersion>
 		<!-- Informational Settings -->
         <Company>TestCentric</Company>
         <Product>TestCentric Gui Runner and Engine</Product>
@@ -36,6 +35,11 @@
         <NSubstitutePublicKey>0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7</NSubstitutePublicKey>
     </PropertyGroup>
 
+	<!-- Version of NUnit.Engine.Api depends on target framework -->
+	<PropertyGroup Condition="'$(TargetFramework)'=='net35' OR '$(TargetFramework)'=='net20'">
+		<NUnitApiVersion>3.16.2</NUnitApiVersion>
+	</PropertyGroup>
+
 	<!-- Version of NUnit used depends on the target framework -->
 	<PropertyGroup Condition="'$(TargetFramework)'=='net35'
 			OR '$(TargetFramework)'=='netcoreapp2.1' OR '$(TargetFramework)'=='netcoreapp3.1'
@@ -44,10 +48,11 @@
 		<NSubstituteVersion>2.0.3</NSubstituteVersion>
 	</PropertyGroup>
 
-	<!-- Default NUnit version for targets not listed above -->
+	<!-- Default versions for targets not handled by conditions listed above -->
 	<PropertyGroup>
 		<NUnitVersion Condition="'$(NUnitVersion)'==''">4.1.0</NUnitVersion>
 		<NSubstituteVersion Condition="'$(NSubstituteVersion)'==''">5.3.0</NSubstituteVersion>
+		<NUnitApiVersion Condition="'$(NUnitApiVersion)'==''">4.0.0-beta.1.1</NUnitApiVersion>
 	</PropertyGroup>
 
 	<!-- Common package metadata, may be overridden in individual projects -->

src/testcentric.extensibility.fakes/FakeExtensions.cs

@@ -3,50 +3,40 @@
 // Licensed under the MIT License. See LICENSE file in root directory.
 // ***********************************************************************
 
-using TestCentric.Extensibility;
-using TestCentric.Engine.Services;
-
 using System.Diagnostics;
 using System;
 using System.Reflection;
 using System.Xml;
 using System.IO;
 
-#if false
 namespace TestCentric.Engine.Extensibility
 {
-    // Extensions
-
-    [Extension(Enabled = false, Path = "/TestCentric/Engine/TypeExtensions/ITestEventListener")]
-    public class FakeTestEventListener : ITestEventListener
-    {
-        public void OnTestEvent(string text)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
+    using TestCentric.Extensibility;
 
-    //[Extension]
-    public class FakeService : IService
+    [Extension]
+    public class FakeAgentLauncher : IAgentLauncher
     {
-        public IServiceLocator ServiceContext { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
-
-        public ServiceStatus Status => throw new System.NotImplementedException();
+        public TestAgentInfo AgentInfo => throw new NotImplementedException();
 
-        public void StartService()
+        public bool CanCreateProcess(TestPackage package)
         {
-            throw new System.NotImplementedException();
+            throw new NotImplementedException();
         }
 
-        public void StopService()
+        public Process CreateProcess(Guid agentId, string agencyUrl, TestPackage package)
         {
-            throw new System.NotImplementedException();
+            throw new NotImplementedException();
         }
     }
 
-    [Extension]
-    public class FakeAgentLauncher : TestCentric.Engine.Extensibility.IAgentLauncher
+    [Extension(Enabled = false)]
+    public class FakeAgentLauncher_ThrowsInConstructor : IAgentLauncher
     {
+        public FakeAgentLauncher_ThrowsInConstructor()
+        {
+            throw new NotImplementedException();
+        }
+
         public TestAgentInfo AgentInfo => throw new NotImplementedException();
 
         public bool CanCreateProcess(TestPackage package)
@@ -59,26 +49,58 @@ public Process CreateProcess(Guid agentId, string agencyUrl, TestPackage package
             throw new NotImplementedException();
         }
     }
+}
 
-    //[Extension]
-    public class FakeDriverFactory : IDriverFactory
-    {
-#if NETFRAMEWORK
-        public IFrameworkDriver GetDriver(AppDomain domain, AssemblyName reference)
+namespace NUnit.Engine.Extensibility
+{
+#if NET20
+    using NUnit.Engine.Extensibility;
 #else
-        public IFrameworkDriver GetDriver(AssemblyName reference)
+    using NUnit.Extensibility;
 #endif
+
+    [Extension(Enabled = false, Path = "/NUnit/Engine/TypeExtensions/ITestEventListener")]
+    public class FakeTestEventListener : ITestEventListener
+    {
+        public void OnTestEvent(string text)
         {
-            throw new NotImplementedException();
+            throw new System.NotImplementedException();
         }
+    }
 
-        public bool IsSupportedTestFramework(AssemblyName reference)
+    [Extension(Path = "/NUnit/Engine/TypeExtensions/IProjectLoader")]
+    public class FakeProjectLoader : IProjectLoader
+    {
+        public bool CanLoadFrom(string path)
         {
-            throw new NotImplementedException();
+            throw new System.NotImplementedException();
+        }
+
+        public NUnit.Engine.Extensibility.IProject LoadFrom(string path)
+        {
+            throw new System.NotImplementedException();
         }
     }
 
-    //[Extension]
+//    [Extension]
+//    public class FakeDriverFactory : IDriverFactory
+//    {
+//#if NETFRAMEWORK
+//        public IFrameworkDriver GetDriver(AppDomain domain, AssemblyName reference)
+//#else
+//        public IFrameworkDriver GetDriver(AssemblyName reference)
+//#endif
+//        {
+//            throw new NotImplementedException();
+//        }
+
+//        public bool IsSupportedTestFramework(AssemblyName reference)
+//        {
+//            throw new NotImplementedException();
+//        }
+//    }
+
+    [Extension]
     public class FakeResultWriter : IResultWriter
     {
         public void CheckWritability(string outputPath)
@@ -97,10 +119,10 @@ public void WriteResultFile(XmlNode resultNode, TextWriter writer)
         }
     }
 
-    [Extension(Enabled = false)]
-    public class FakeExtension_ThrowsInConstructor : ITestEventListener
+    [Extension(Enabled = false, Path = "/NUnit/Engine/TypeExtensions/ITestEventListener")]
+    public class FakeNUnitExtension_ThrowsInConstructor : ITestEventListener
     {
-        public FakeExtension_ThrowsInConstructor()
+        public FakeNUnitExtension_ThrowsInConstructor()
         {
             throw new NotImplementedException();
         }
@@ -111,22 +133,3 @@ public void OnTestEvent(string text)
         }
     }
 }
-#endif
-
-namespace NUnit.Engine.Extensibility
-{
-    //[Extension(Path = "/NUnit/Engine/TypeExtensions/IProjectLoader/")]
-    [Extension]
-    public class FakeProjectLoader : IProjectLoader
-    {
-        public bool CanLoadFrom(string path)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public NUnit.Engine.Extensibility.IProject LoadFrom(string path)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}