From e93cad772a978378135e3de19afe50f496ee0c24 Mon Sep 17 00:00:00 2001
From: Manfred Brands <manfred-brands@users.noreply.github.com>
Date: Thu, 24 Mar 2022 16:53:03 +0800
Subject: [PATCH 1/2] Issue 965: Special build using pre-release of
 nunit.engine 4.0.0

---
 build.cake                                    |  4 ++--
 src/NUnitTestAdapter/NUnit.TestAdapter.csproj | 10 +++++++++-
 src/NUnitTestAdapterTests/TestAdapterUtils.cs |  7 +------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/build.cake b/build.cake
index e8a5dfbe..07047482 100644
--- a/build.cake
+++ b/build.cake
@@ -12,7 +12,7 @@ var configuration = Argument("configuration", "Release");
 // SET PACKAGE VERSION
 //////////////////////////////////////////////////////////////////////
 
-var version = "4.2.1";
+var version = "5.0.0";
 var modifier = "";
 
 var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";
@@ -101,7 +101,7 @@ Task("Clean")
 Task("CleanPackages")
     .Does(()=>
     {
-    CleanDirectory(PACKAGE_DIR);
+        CleanDirectory(PACKAGE_DIR);
     });
 
 //////////////////////////////////////////////////////////////////////
diff --git a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
index abc3253e..b2b7bd57 100644
--- a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
+++ b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
@@ -22,9 +22,17 @@
     <DisableHandlePackageFileConflicts>false</DisableHandlePackageFileConflicts>
   </PropertyGroup>
 
+  <!-- We reference a specific pre-release version of the nunit.engine -->
+  <PropertyGroup>
+    <RestoreAdditionalProjectSources>https://www.myget.org/F/nunit/api/v3/index.json</RestoreAdditionalProjectSources>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nunit.engine" Version="4.0.0-dev00100" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
-    <PackageReference Include="nunit.engine" Version="3.13.2" />
     <PackageReference Include="TestCentric.Metadata" Version="1.7.1" Aliases="TestCentric" />
   </ItemGroup>
 
diff --git a/src/NUnitTestAdapterTests/TestAdapterUtils.cs b/src/NUnitTestAdapterTests/TestAdapterUtils.cs
index f3325f01..c0d122f6 100644
--- a/src/NUnitTestAdapterTests/TestAdapterUtils.cs
+++ b/src/NUnitTestAdapterTests/TestAdapterUtils.cs
@@ -22,8 +22,8 @@
 // ***********************************************************************
 
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
 using NUnit.Engine.Services;
-using NUnit.Framework;
 
 namespace NUnit.VisualStudio.TestAdapter.Tests
 {
@@ -49,14 +49,9 @@ private static void InitializeForTesting(NUnitTestAdapter adapter)
             adapter.NUnitEngineAdapter.InternalEngineCreated += engine =>
             {
                 var concreteEngineType = (NUnit.Engine.TestEngine)engine;
-                concreteEngineType.Services.Add(new SettingsService(true));
-                concreteEngineType.Services.Add(new DomainManager());
                 concreteEngineType.Services.Add(new ExtensionService());
-                concreteEngineType.Services.Add(new DriverService());
-                concreteEngineType.Services.Add(new RecentFilesService());
                 concreteEngineType.Services.Add(new ProjectService());
                 concreteEngineType.Services.Add(new RuntimeFrameworkService());
-                concreteEngineType.Services.Add(new DefaultTestRunnerFactory());
                 concreteEngineType.Services.Add(new TestAgency()); // "TestAgency for " + TestContext.CurrentContext.Test.Name, 0));
                 concreteEngineType.Services.Add(new ResultService());
                 concreteEngineType.Services.Add(new TestFilterService());

From a23e83aa0e57163534e066b361aaf55709c9bae1 Mon Sep 17 00:00:00 2001
From: Manfred Brands <manfred-brands@users.noreply.github.com>
Date: Thu, 24 Mar 2022 17:56:48 +0800
Subject: [PATCH 2/2] NUnit.Engine 4 doesn't name test-run nodes.

---
 src/NUnitTestAdapter/NUnit.TestAdapter.csproj               | 2 +-
 src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs      | 6 ++++--
 .../NUnitEngineTests/NUnitDiscoveryTests.cs                 | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
index b2b7bd57..ec35def7 100644
--- a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
+++ b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
@@ -24,7 +24,7 @@
 
   <!-- We reference a specific pre-release version of the nunit.engine -->
   <PropertyGroup>
-    <RestoreAdditionalProjectSources>https://www.myget.org/F/nunit/api/v3/index.json</RestoreAdditionalProjectSources>
+    <RestoreAdditionalProjectSource>https://www.myget.org/F/nunit/api/v3/index.json</RestoreAdditionalProjectSource>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs b/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs
index a031b2f1..36608e79 100644
--- a/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs
+++ b/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs
@@ -412,8 +412,10 @@ private NUnitDiscoveryTestAssembly ExtractTestAssembly(XElement node, NUnitDisco
         private static BaseProperties ExtractSuiteBasePropertiesClass(XElement node)
         {
             string dId = node.Attribute(NUnitXmlAttributeNames.Id).Value;
-            string dName = node.Attribute(NUnitXmlAttributeNames.Name).Value;
-            string dFullname = node.Attribute(NUnitXmlAttributeNames.Fullname).Value;
+
+            // test-run no longer has a name/fullname property
+            string dName = node.Attribute(NUnitXmlAttributeNames.Name)?.Value ?? "Unnamed";
+            string dFullname = node.Attribute(NUnitXmlAttributeNames.Fullname)?.Value ?? "Unnamed";
             var dRunstate = ExtractRunState(node);
             const char apo = '\'';
             var tcs = node.Attribute(NUnitXmlAttributeNames.Testcasecount)?.Value.Trim(apo);
diff --git a/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs b/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs
index 99d3f81d..0d0e822c 100644
--- a/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs
+++ b/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs
@@ -13,7 +13,7 @@ public class NUnitDiscoveryTests
         private IAdapterSettings settings;
 
         private const string FullDiscoveryXml =
-            @"<test-run id='2' name='CSharpTestDemo.dll' fullname='D:\repos\NUnit\nunit3-vs-adapter-demo\solutions\vs2017\CSharpTestDemo\bin\Debug\CSharpTestDemo.dll' testcasecount='108'>
+            @"<test-run id='2' testcasecount='108'>
    <test-suite type='Assembly' id='0-1157' name='CSharpTestDemo.dll' fullname='D:\repos\NUnit\nunit3-vs-adapter-demo\solutions\vs2017\CSharpTestDemo\bin\Debug\CSharpTestDemo.dll' runstate='Runnable' testcasecount='108'>
       <properties>
          <property name='_PID' value='9856' />