Eliminate .NET Framework 2.0 build

build.cake

@@ -19,8 +19,6 @@ 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/net462")
 			.WithFiles("testcentric.extensibility.dll", "TestCentric.Extensibility.api.dll", "nunit.engine.api.dll"),
 		HasDirectory("lib/netstandard2.0")
@@ -49,7 +47,6 @@ BuildSettings.Packages.Add(new NuGetPackage(
 	checks: new PackageCheck[] {
 		HasFiles(
 			"LICENSE.txt", "README.md", "testcentric.png",
-			"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,6 @@
 		<file src="../../README.md" />
 		<file src="../../LICENSE.txt" />
 		<file src="../../testcentric.png" />
-		<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,6 @@
 		<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.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="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/testcentric.extensibility.api/testcentric.extensibility.api.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net20;net462;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
 		<RootNamespace>TestCentric.Extensibility</RootNamespace>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>

src/testcentric.extensibility.fakes/FakeExtensions.cs

@@ -123,4 +123,13 @@ public void OnTestEvent(string text)
             throw new System.NotImplementedException();
         }
     }
+
+    [NUnit.Extensibility.Extension]
+    public class FakeNUnit4Listener : NUnit.Engine.ITestEventListener
+    {
+        public void OnTestEvent(string text)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
 }

src/testcentric.extensibility.fakes/TestCentric.Extensibility.FakeExtensions.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net20;net462;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
 		<RootNamespace>TestCentric.Extensibility</RootNamespace>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>testcentric.snk</AssemblyOriginatorKeyFile>

src/testcentric.extensibility.tests/ExtensionAssemblyTests.cs

@@ -55,11 +55,7 @@ public void TargetFramework()
         {
             var framework = _ea.FrameworkName;
             Assert.That(_ea.FrameworkName.Identifier, Is.EqualTo(".NETFramework"));
-#if NET20 || NET35
-            Assert.That(_ea.FrameworkName.Version, Is.EqualTo(new Version(2, 0)));
-#else
             Assert.That(_ea.FrameworkName.Version, Is.EqualTo(new Version(4, 6, 2)));
-#endif
         }
 #endif
     }

src/testcentric.extensibility.tests/ExtensionManagerTests.cs

@@ -122,39 +122,54 @@ internal class ThisIsNotAnExtensionPoint
             "TestCentric.Engine.Extensibility.FakeTestEventListener",
             "TestCentric.Engine.Extensibility.FakeProjectLoader",
             "TestCentric.Engine.Extensibility.FakeResultWriter",
-            "TestCentric.Engine.Extensibility.FakeNUnitExtension_ThrowsInConstructor"
+            "TestCentric.Engine.Extensibility.FakeNUnitExtension_ThrowsInConstructor",
+            "TestCentric.Engine.Extensibility.FakeNUnit4Listener"
         ];
 
-        [Test]
+        private static string[] KnownExtensionPaths =
+        [
+            "/TestCentric/Engine/AgentLaunchers",
+            "/TestCentric/Engine/AgentLaunchers",
+            "/TestCentric/Engine/TestEventListeners",
+            "/TestCentric/Engine/ProjectLoaders",
+            "/TestCentric/Engine/ResultWriters",
+            "/TestCentric/Engine/TestEventListeners",
+            "/TestCentric/Engine/TestEventListeners"
+        ];
+
+        private const string INITIALLY_DISABLED_EXTENSION = "TestCentric.Engine.Extensibility.FakeTestEventListener";
+        [Test, Order(1)]
         public void AllExtensionsAreKnown()
         {
             Assert.That(ExtensionManager.Extensions.Select(ep => ep.TypeName), Is.EquivalentTo(KnownExtensionTypeNames));
         }
 
-        // Run this first as subsequent test will enable the extension
-        [Test, Order(1)]
-        public void ExtensionMayBeDisabledByDefault()
+        [TestCaseSource(nameof(KnownExtensionTypeNames)), Order(2)]
+        public void ExtensionStatusIsCorrect(string typeName)
         {
-            Assert.That(ExtensionManager.Extensions,
-                Has.One.Property(nameof(ExtensionNode.TypeName)).EqualTo("TestCentric.Engine.Extensibility.FakeTestEventListener")
-                   .And.Property(nameof(ExtensionNode.Enabled)).False);
+            Assert.That(GetExtensionNode(typeName).Status, Is.EqualTo(ExtensionStatus.Unloaded));
         }
 
-        [Test]
-        public void DisabledExtensionMayBeEnabled()
+        [Test, Sequential, Order(3)]
+        public void ExtensionsAreEnabledAsExpected(
+            [ValueSource(nameof(KnownExtensionTypeNames))] string typeName,
+            [Values(true, false, false, true, true, false, true)] bool enabled)
         {
-            ExtensionManager.EnableExtension("TestCentric.Engine.Extensibility.FakeTestEventListener", true);
+            Assert.That(GetExtensionNode(typeName).Enabled, Is.EqualTo(enabled));
+        }
 
-            Assert.That(ExtensionManager.Extensions,
-                Has.One.Property(nameof(ExtensionNode.TypeName)).EqualTo("TestCentric.Engine.Extensibility.FakeTestEventListener")
-                   .And.Property(nameof(ExtensionNode.Enabled)).True);
+        [Test, Order(4)]
+        public void ExtensionMayBeDisabledByDefault()
+        {
+            Assert.That(GetExtensionNode(INITIALLY_DISABLED_EXTENSION).Enabled, Is.False);
+            ExtensionManager.EnableExtension(INITIALLY_DISABLED_EXTENSION, true);
+            Assert.That(GetExtensionNode(INITIALLY_DISABLED_EXTENSION).Enabled, Is.True);
         }
 
         [Test]
         public void NUnitExtensionThrowsInConstructor()
         {
-            string typeName = "TestCentric.Engine.Extensibility.FakeNUnitExtension_ThrowsInConstructor";
-            var exNode = ExtensionManager.Extensions.Where(n => n.TypeName == typeName).Single();
+            var exNode = GetExtensionNode("TestCentric.Engine.Extensibility.FakeNUnitExtension_ThrowsInConstructor");
 
             // Although the constructor throws, we don't get an exception.
             // However, the node contains the error information.
@@ -178,25 +193,19 @@ public void TestCentricExtensionThrowsInConstructor()
             Assert.That(exNode.Exception.InnerException, Is.InstanceOf<NotImplementedException>());
         }
 
-#if NETCOREAPP
-        [TestCase("netstandard2.0", ExpectedResult = true)]
-        [TestCase("net462", ExpectedResult = false)]
-        [TestCase("net20", ExpectedResult = false)]
-#elif NET40_OR_GREATER
+#if NETFRAMEWORK
         [TestCase("netstandard2.0", ExpectedResult = false)]
         [TestCase("net462", ExpectedResult = true)]
-        [TestCase("net20", ExpectedResult = true)]
 #else
-        [TestCase("netstandard2.0", ExpectedResult = false)]
+        [TestCase("netstandard2.0", ExpectedResult = true)]
         [TestCase("net462", ExpectedResult = false)]
-        [TestCase("net20", ExpectedResult = true)]
 #endif
         public bool LoadTargetFramework(string tfm)
         {
             return ExtensionManager.CanLoadTargetFramework(THIS_ASSEMBLY, FakeExtensions(tfm));
         }
 
-        #endregion
+#endregion
 
         private const string FAKE_EXTENSIONS_FILENAME = "TestCentric.Extensibility.FakeExtensions.dll";
         private static readonly string FAKE_EXTENSIONS_PARENT_DIRECTORY =
@@ -213,5 +222,8 @@ private static ExtensionAssembly FakeExtensions(string tfm)
             return new ExtensionAssembly(
                 Path.Combine(FAKE_EXTENSIONS_PARENT_DIRECTORY, Path.Combine(tfm, FAKE_EXTENSIONS_FILENAME)), false);
         }
+
+        private ExtensionNode GetExtensionNode(string typeName) =>
+            ExtensionManager.Extensions.Where(n => n.TypeName == typeName).Single();
     }
 }

src/testcentric.extensibility.tests/testcentric.extensibility.tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net35;net462;net6.0</TargetFrameworks>
+		<TargetFrameworks>net462;net6.0</TargetFrameworks>
 		<RootNamespace>TestCentric.Extensibility</RootNamespace>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>testcentric.snk</AssemblyOriginatorKeyFile>
@@ -16,10 +16,6 @@
 		<ProjectReference Include="..\TestCentric.Extensibility.Api\TestCentric.Extensibility.Api.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='net35'">
-		<PackageReference Include="NSubstitute" Version="2.0.3" />
-	</ItemGroup>
-
 	<ItemGroup Condition="'$(TargetFramework)'=='net462'">
 		<PackageReference Include="NSubstitute" Version="5.1.0" />
 	</ItemGroup>