diff --git a/build.cake b/build.cake
index 6be163e1..b0b81d43 100644
--- a/build.cake
+++ b/build.cake
@@ -12,7 +12,7 @@ var configuration = Argument("configuration", "Release");
// SET PACKAGE VERSION
//////////////////////////////////////////////////////////////////////
-var version = "4.3.0";
+var version = "4.3.0-alpha-net7";
var modifier = "";
var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";
diff --git a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
index d3974ea2..7c5ba2b9 100644
--- a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
+++ b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
@@ -12,6 +12,14 @@
true
+
+ https://www.myget.org/F/nunit/api/v3/index.json
+
+
+
+
+
+
NUnit3TestAdapter
Charlie Poole, Terje Sandstrom
@@ -24,7 +32,6 @@
-
diff --git a/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs b/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs
index a031b2f1..0797b719 100644
--- a/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs
+++ b/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs
@@ -412,9 +412,9 @@ 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;
- var dRunstate = ExtractRunState(node);
+ // 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);
int dTestcasecount = int.Parse(tcs ?? "1", CultureInfo.InvariantCulture);
diff --git a/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs b/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs
index 99d3f81d..631e3b55 100644
--- a/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs
+++ b/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs
@@ -1,6 +1,8 @@
using System.Linq;
using System.Xml;
+
using NSubstitute;
+
using NUnit.Framework;
using NUnit.VisualStudio.TestAdapter.NUnitEngine;
// ReSharper disable StringLiteralTypo
@@ -13,8 +15,8 @@ public class NUnitDiscoveryTests
private IAdapterSettings settings;
private const string FullDiscoveryXml =
- @"
-
+ @"
+
diff --git a/src/NUnitTestAdapterTests/TestAdapterUtils.cs b/src/NUnitTestAdapterTests/TestAdapterUtils.cs
index fa15605c..42bd10f8 100644
--- a/src/NUnitTestAdapterTests/TestAdapterUtils.cs
+++ b/src/NUnitTestAdapterTests/TestAdapterUtils.cs
@@ -51,13 +51,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 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());