Merge pull request #970 from TestCentric/update-engine

Update to latest engine build; eliminate built-in agents for netcore 3.1 and net 5.0
TestCentric · Apr 22, 2023 · 012bca1 · 012bca1
2 parents df51730 + 896d824
commit 012bca1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 60 deletions.
diff --git a/build.cake b/build.cake
@@ -13,7 +13,7 @@ static string[] VALID_CONFIGS = new [] { "Release", "Debug" };
 // NOTE: This must match what is actually referenced by
 // the GUI test model project. Hopefully, this is a temporary
 // fix, which we can get rid of in the future.
-const string REF_ENGINE_VERSION = "2.0.0-dev00053";
+const string REF_ENGINE_VERSION = "2.0.0-dev00062";
 
 const string PACKAGE_NAME = "testcentric-gui";
 const string NUGET_PACKAGE_NAME = "TestCentric.GuiRunner";
@@ -76,8 +76,6 @@ var nugetPackage = new NuGetPackage(
 		HasFiles("CHANGES.txt", "LICENSE.txt", "NOTICES.txt", "testcentric.png"),
 		HasDirectory("tools").WithFiles(GUI_FILES).AndFiles(ENGINE_FILES).AndFile("testcentric.nuget.addins"),
 		HasDirectory("tools/agents/net462").WithFiles(NET_FRAMEWORK_AGENT_FILES).AndFiles(ENGINE_CORE_FILES).AndFile("testcentric-agent.nuget.addins"),
-		HasDirectory("tools/agents/netcoreapp3.1").WithFiles(NET_CORE_AGENT_FILES).AndFiles(ENGINE_CORE_FILES).AndFile("testcentric-agent.nuget.addins"),
-		HasDirectory("tools/agents/net5.0").WithFiles(NET_CORE_AGENT_FILES).AndFiles(ENGINE_CORE_FILES).AndFile("testcentric-agent.nuget.addins"),
 		HasDirectory("tools/agents/net6.0").WithFiles(NET_CORE_AGENT_FILES).AndFiles(ENGINE_CORE_FILES).AndFile("testcentric-agent.nuget.addins"),
 		HasDirectory("tools/agents/net7.0").WithFiles(NET_CORE_AGENT_FILES).AndFiles(ENGINE_CORE_FILES).AndFile("testcentric-agent.nuget.addins"),
 		HasDirectory("tools/Images").WithFiles("DebugTests.png", "RunTests.png", "StopRun.png", "GroupBy_16x.png", "SummaryReport.png"),
@@ -96,8 +94,6 @@ var chocolateyPackage = new ChocolateyPackage(
 	checks: new PackageCheck[] {
 		HasDirectory("tools").WithFiles("CHANGES.txt", "LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "testcentric.choco.addins").AndFiles(GUI_FILES).AndFiles(ENGINE_FILES).AndFile("testcentric.choco.addins"),
 		HasDirectory("tools/agents/net462").WithFiles(NET_FRAMEWORK_AGENT_FILES).AndFile("testcentric-agent.choco.addins"),
-		HasDirectory("tools/agents/netcoreapp3.1").WithFiles(NET_CORE_AGENT_FILES).AndFile("testcentric-agent.choco.addins"),
-		HasDirectory("tools/agents/net5.0").WithFiles(NET_CORE_AGENT_FILES).AndFile("testcentric-agent.choco.addins"),
 		HasDirectory("tools/agents/net6.0").WithFiles(NET_CORE_AGENT_FILES).AndFile("testcentric-agent.choco.addins"),
 		HasDirectory("tools/agents/net7.0").WithFiles(NET_CORE_AGENT_FILES).AndFile("testcentric-agent.choco.addins"),
 		HasDirectory("tools/Images").WithFiles("DebugTests.png", "RunTests.png", "StopRun.png", "GroupBy_16x.png", "SummaryReport.png"),
@@ -117,8 +113,6 @@ var zipPackage = new ZipPackage(
 		HasFiles("CHANGES.txt", "LICENSE.txt", "NOTICES.txt"),
 		HasDirectory("bin").WithFiles(GUI_FILES).AndFiles(ENGINE_FILES).AndFile("testcentric.zip.addins"),
 		HasDirectory("bin/agents/net462").WithFiles(NET_FRAMEWORK_AGENT_FILES),
-		HasDirectory("bin/agents/netcoreapp3.1").WithFiles(NET_CORE_AGENT_FILES),
-		HasDirectory("bin/agents/net5.0").WithFiles(NET_CORE_AGENT_FILES),
 		HasDirectory("bin/agents/net6.0").WithFiles(NET_CORE_AGENT_FILES),
 		HasDirectory("bin/agents/net7.0").WithFiles(NET_CORE_AGENT_FILES),
 		HasDirectory("bin/Images").WithFiles("DebugTests.png", "RunTests.png", "StopRun.png", "GroupBy_16x.png", "SummaryReport.png"),

diff --git a/choco/testcentric-gui.nuspec b/choco/testcentric-gui.nuspec
@@ -102,28 +102,6 @@ Projects with tests to be run under **TestCentric** must already have some versi
     <file src="$BIN$agents/net462/testcentric-agent-x86.exe.config" target="tools/agents/net462" />
     <file src="testcentric-agent.choco.addins" target="tools/agents/net462" />
 
-    <file src="$BIN$agents/netcoreapp3.1/nunit.engine.api.dll" target="tools/agents/netcoreapp3.1" />
-    <file src="$BIN$agents/netcoreapp3.1/testcentric.engine.metadata.dll" target="tools/agents/netcoreapp3.1" />
-	<file src="$BIN$agents/netcoreapp3.1/testcentric.extensibility.dll" target="tools/agents/netcoreapp3.1" />
-	<file src="$BIN$agents/netcoreapp3.1/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/netcoreapp3.1" />
-	<file src="$BIN$agents/netcoreapp3.1/testcentric.engine.core.dll" target="tools/agents/netcoreapp3.1" />
-    <file src="$BIN$agents/netcoreapp3.1/testcentric-agent.dll" target="tools/agents/netcoreapp3.1" />
-    <file src="$BIN$agents/netcoreapp3.1/testcentric-agent.dll.config" target="tools/agents/netcoreapp3.1" />
-    <file src="$BIN$agents/netcoreapp3.1/testcentric-agent.deps.json" target="tools/agents/netcoreapp3.1" />
-    <file src="$BIN$agents/netcoreapp3.1/testcentric-agent.runtimeconfig.json" target="tools/agents/netcoreapp3.1" />
-    <file src="testcentric-agent.choco.addins" target="tools/agents/netcoreapp3.1" />
-
-	  <file src="$BIN$agents/net5.0/nunit.engine.api.dll" target="tools/agents/net5.0" />
-	  <file src="$BIN$agents/net5.0/testcentric.engine.metadata.dll" target="tools/agents/net5.0" />
-	  <file src="$BIN$agents/net5.0/testcentric.extensibility.dll" target="tools/agents/net5.0" />
-	  <file src="$BIN$agents/net5.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net5.0" />
-	  <file src="$BIN$agents/net5.0/testcentric.engine.core.dll" target="tools/agents/net5.0" />
-	  <file src="$BIN$agents/net5.0/testcentric-agent.dll" target="tools/agents/net5.0" />
-	  <file src="$BIN$agents/net5.0/testcentric-agent.dll.config" target="tools/agents/net5.0" />
-	  <file src="$BIN$agents/net5.0/testcentric-agent.deps.json" target="tools/agents/net5.0" />
-	  <file src="$BIN$agents/net5.0/testcentric-agent.runtimeconfig.json" target="tools/agents/net5.0" />
-	  <file src="testcentric-agent.choco.addins" target="tools/agents/net5.0" />
-
 	  <file src="$BIN$agents/net6.0/nunit.engine.api.dll" target="tools/agents/net6.0" />
 	  <file src="$BIN$agents/net6.0/testcentric.engine.metadata.dll" target="tools/agents/net6.0" />
 	  <file src="$BIN$agents/net6.0/testcentric.extensibility.dll" target="tools/agents/net6.0" />

diff --git a/nuget/TestCentric.GuiRunner.nuspec b/nuget/TestCentric.GuiRunner.nuspec
@@ -76,28 +76,6 @@
     <file src="agents/net462/testcentric-agent-x86.exe.config" target="tools/agents/net462" />
     <file src="../../nuget/testcentric-agent.nuget.addins" target="tools/agents/net462" />
 
-    <file src="agents/netcoreapp3.1/nunit.engine.api.dll" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/testcentric.engine.metadata.dll" target="tools/agents/netcoreapp3.1" />
-	<file src="agents/netcoreapp3.1/testcentric.extensibility.dll" target="tools/agents/netcoreapp3.1" />
-	<file src="agents/netcoreapp3.1/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/netcoreapp3.1" />
-	<file src="agents/netcoreapp3.1/testcentric.engine.core.dll" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/testcentric-agent.dll" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/testcentric-agent.dll.config" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/testcentric-agent.deps.json" target="tools/agents/netcoreapp3.1" />
-    <file src="agents/netcoreapp3.1/testcentric-agent.runtimeconfig.json" target="tools/agents/netcoreapp3.1" />
-    <file src="../../nuget/testcentric-agent.nuget.addins" target="tools/agents/netcoreapp3.1" />
-
-	  <file src="agents/net5.0/nunit.engine.api.dll" target="tools/agents/net5.0" />
-	  <file src="agents/net5.0/testcentric.engine.metadata.dll" target="tools/agents/net5.0" />
-	  <file src="agents/net5.0/testcentric.extensibility.dll" target="tools/agents/net5.0" />
-	  <file src="agents/net5.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net5.0" />
-	  <file src="agents/net5.0/testcentric.engine.core.dll" target="tools/agents/net5.0" />
-	  <file src="agents/net5.0/testcentric-agent.dll" target="tools/agents/net5.0" />
-	  <file src="agents/net5.0/testcentric-agent.dll.config" target="tools/agents/net5.0" />
-	  <file src="agents/net5.0/testcentric-agent.deps.json" target="tools/agents/net5.0" />
-	  <file src="agents/net5.0/testcentric-agent.runtimeconfig.json" target="tools/agents/net5.0" />
-	  <file src="../../nuget/testcentric-agent.nuget.addins" target="tools/agents/net5.0" />
-
 	  <file src="agents/net6.0/nunit.engine.api.dll" target="tools/agents/net6.0" />
 	  <file src="agents/net6.0/testcentric.engine.metadata.dll" target="tools/agents/net6.0" />
 	  <file src="agents/net6.0/testcentric.extensibility.dll" target="tools/agents/net6.0" />

diff --git a/package-tests.cake b/package-tests.cake
@@ -22,11 +22,11 @@ public static void DefinePackageTests()
 
 	PackageTests.Add(new PackageTest(1, "NetCore21Test", "Run .NET Core 2.1 mock-assembly.dll under .NET Core 3.1",
         "netcoreapp2.1/mock-assembly.dll",
-        MockAssemblyExpectedResult("NetCore31AgentLauncher")));
+        MockAssemblyExpectedResult("Net60AgentLauncher")));
 
     PackageTests.Add(new PackageTest(1, "NetCore31Test", "Run mock-assembly.dll under .NET Core 3.1",
         "netcoreapp3.1/mock-assembly.dll",
-        MockAssemblyExpectedResult("NetCore31AgentLauncher")));
+        MockAssemblyExpectedResult("Net60AgentLauncher")));
 
     //    PackageTests.Add(new PackageTest(1, "NetCore11Test", "Run mock-assembly.dll targeting .NET Core 1.1",
     //        "netcoreapp1.1/mock-assembly.dll",
@@ -43,7 +43,7 @@ public static void DefinePackageTests()
 
     PackageTests.Add(new PackageTest(1, "Net50Test", "Run mock-assembly.dll under .NET 5.0",
         "net5.0/mock-assembly.dll",
-        MockAssemblyExpectedResult("Net50AgentLauncher")));
+        MockAssemblyExpectedResult("Net60AgentLauncher")));
 
     PackageTests.Add(new PackageTest(1, "Net60Test", "Run mock-assembly.dll under .NET 6.0",
         "net6.0/mock-assembly.dll",
@@ -59,14 +59,14 @@ public static void DefinePackageTests()
         "netcoreapp3.1/aspnetcore-test.dll",
         new ExpectedResult("Passed")
         {
-            Assemblies = new [] { new ExpectedAssemblyResult("aspnetcore-test.dll", "NetCore31AgentLauncher") }
+            Assemblies = new [] { new ExpectedAssemblyResult("aspnetcore-test.dll", "Net60AgentLauncher") }
         }));
 
     PackageTests.Add(new PackageTest(1, "AspNetCore50Test", "Run test using AspNetCore under .NET 5.0",
         "net5.0/aspnetcore-test.dll",
         new ExpectedResult("Passed")
         {
-            Assemblies = new [] { new ExpectedAssemblyResult("aspnetcore-test.dll", "Net50AgentLauncher") }
+            Assemblies = new [] { new ExpectedAssemblyResult("aspnetcore-test.dll", "Net60AgentLauncher") }
         }));
 
     PackageTests.Add(new PackageTest(1, "AspNetCore60Test", "Run test using AspNetCore under .NET 6.0",
@@ -93,7 +93,7 @@ public static void DefinePackageTests()
             "net5.0-windows/windows-forms-test.dll",
             new ExpectedResult("Passed")
             {
-                Assemblies = new [] { new ExpectedAssemblyResult("windows-forms-test.dll", "Net50AgentLauncher") }
+                Assemblies = new [] { new ExpectedAssemblyResult("windows-forms-test.dll", "Net60AgentLauncher") }
             }));
 
     PackageTests.Add(new PackageTest(1, "Net60WindowsFormsTest", "Run test using windows forms under .NET 6.0",
@@ -158,7 +158,7 @@ public static void DefinePackageTests()
         PackageTests.Add(new PackageTest(2, "NUnitProjectTest", "Run an NUnit project",
             "../../TestProject.nunit",
             MockAssemblyExpectedResult(
-                "Net20AgentLauncher", "Net462AgentLauncher", "NetCore31AgentLauncher", "Net50AgentLauncher"),
+                "Net20AgentLauncher", "Net462AgentLauncher", "Net60AgentLauncher", "Net60AgentLauncher"),
             EngineExtensions.NUnitProjectLoader));
     }
 

diff --git a/src/TestModel/model/TestCentric.Gui.Model.csproj b/src/TestModel/model/TestCentric.Gui.Model.csproj
@@ -16,8 +16,8 @@
 	<ItemGroup>
 		<PackageReference Include="Mono.Options" Version="6.12.0.148" />
 		<PackageReference Include="NUnit.Engine.Api" Version="3.16.2" />
-		<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-dev00053" />
-		<PackageReference Include="TestCentric.Engine" Version="2.0.0-dev00053" />
+		<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-dev00062" />
+		<PackageReference Include="TestCentric.Engine" Version="2.0.0-dev00062" />
 	</ItemGroup>
 
 </Project>