From abc42b0222c6307e5ed7f53a12aca03f9e16ffea Mon Sep 17 00:00:00 2001 From: Charlie Poole Date: Mon, 3 Feb 2025 08:28:55 -0800 Subject: [PATCH] Initial implementation of nunit.agent.core (packaging NYI) --- NUnitConsole.sln | 14 +++++++ .../Drivers}/DriverServiceTests.cs | 2 - .../Drivers/NUnit3DriverFactoryTests.cs | 2 +- .../Drivers/NUnitFrameworkDriverTests.cs | 1 - .../NotRunnableFrameworkDriverTests.cs | 0 .../Runners/DomainManagerStaticTests.cs | 0 .../Runners/DomainManagerTests.cs | 0 .../Runners/FakeTestAgentRunner.cs | 6 ++- .../Runners/TestAgentRunnerExceptionTests.cs | 5 +-- .../Runners/TestAgentRunnerTests.cs | 0 .../nunit.agent.core.tests.csproj | 35 ++++++++++++++++++ .../Agents/RemoteTestAgent.cs | 0 .../nunit.agent.core}/Agents/TestAgent.cs | 0 .../nunit.agent.core}/CallbackHandler.cs | 0 .../Transports/ITestAgentTransport.cs | 0 .../Remoting/TestAgentRemotingTransport.cs | 1 - .../Transports/Tcp/TestAgentTcpTransport.cs | 1 - .../Drivers/DriverService.cs | 1 - .../Drivers/IDriverService.cs | 0 .../Drivers/NUnit2DriverFactory.cs | 1 - .../Drivers/NUnit3DriverFactory.cs | 3 +- .../Drivers/NUnitFrameworkApi.cs | 0 .../Drivers/NUnitFrameworkApi2009.cs | 13 +++---- .../Drivers/NUnitFrameworkApi2018.cs | 24 ++++++------ .../Drivers/NUnitFrameworkDriver.cs | 4 +- .../Drivers/NotRunnableFrameworkDriver.cs | 0 .../Drivers}/ProvidedPathsAssemblyResolver.cs | 2 +- .../RunTestsCallbackHandler.cs | 0 .../Runners}/DomainDetailsBuilder.cs | 2 +- .../Runners/DomainManager.cs | 3 +- .../Runners/LocalTestRunner.cs | 0 .../Runners/NotRunnableTestRunner.cs | 0 .../Runners/TestAgentRunner.cs | 7 ++-- .../Runners/TestDomainRunner.cs | 0 .../nunit.agent.core}/RuntimeInformation.cs | 0 .../TestAssemblyLoadContext.cs | 0 .../nunit.agent.core}/TestAssemblyResolver.cs | 0 .../TestPackageExtensions.cs | 2 +- .../nunit.agent.core/nunit.agent.core.csproj | 37 +++++++++++++++++++ .../Messages/CommandMessage.cs | 0 .../Messages/CommandReturnMessage.cs | 0 .../Messages/ProgressMessage.cs | 0 .../Messages/TestEngineMessage.cs | 0 .../Protocols/BinarySerializationProtocol.cs | 0 .../Protocols/ISerializationProtocol.cs | 0 .../Transports/Tcp/SocketReader.cs | 0 .../nunit.common}/CurrentMessageCounter.cs | 2 +- .../nunit.common}/DotNet.cs | 0 .../nunit.common}/ProcessUtils.cs | 2 +- .../nunit.common}/ResultHelper.cs | 2 +- ...ils.ObservableServerChannelSinkProvider.cs | 2 +- .../nunit.common}/TcpChannelUtils.cs | 2 +- .../nunit.common/nunit.common.csproj | 12 ++++++ .../nunit-agent-net462-x86.csproj | 2 +- .../nunit-agent-net462.csproj | 2 +- .../nunit-agent-net80.csproj | 6 +-- .../AsyncTestEngineResult.cs | 18 +++++++-- .../EnginePackageSettings.cs | 24 ++++++++++++ .../ITestAgency.cs | 0 .../ITestAgent.cs | 0 .../ITestEngineRunner.cs | 0 .../TestEngineResult.cs | 18 ++++++--- .../nunit.engine.core.tests.csproj | 9 +++-- .../Internal/IEnumerableExtensions.cs | 27 -------------- .../nunit.engine.core.csproj | 4 ++ .../Services/RuntimeFrameworkServiceTests.cs | 8 ++-- .../Remoting/TestAgencyRemotingTransport.cs | 1 - .../Communication/Transports/Tcp/TcpServer.cs | 1 - .../Runners/AggregatingTestRunner.cs | 1 - .../nunit.engine/Runners/MasterTestRunner.cs | 1 - .../Runners/MultipleTestProcessRunner.cs | 1 - .../nunit.engine/Runners/ProcessRunner.cs | 1 - .../nunit.engine/Services/AgentProcess.cs | 1 - .../ResultWriters/NUnit3XmlResultWriter.cs | 2 - .../Services/RuntimeFrameworkService.cs | 21 +++++------ .../nunit.engine/Services/ServiceManager.cs | 1 - .../nunit.engine/Services/TestAgency.cs | 1 - .../Services/TestRunnerFactory.cs | 3 +- src/NUnitEngine/nunit.engine/TestEngine.cs | 1 - .../nunit.engine/nunit.engine.csproj | 3 +- 80 files changed, 220 insertions(+), 125 deletions(-) rename src/{NUnitEngine/nunit.engine.core.tests/Services => NUnitCommon/nunit.agent.core.tests/Drivers}/DriverServiceTests.cs (97%) rename src/{NUnitEngine/nunit.engine.core.tests => NUnitCommon/nunit.agent.core.tests}/Drivers/NUnit3DriverFactoryTests.cs (92%) rename src/{NUnitEngine/nunit.engine.core.tests => NUnitCommon/nunit.agent.core.tests}/Drivers/NUnitFrameworkDriverTests.cs (99%) rename src/{NUnitEngine/nunit.engine.core.tests => NUnitCommon/nunit.agent.core.tests}/Drivers/NotRunnableFrameworkDriverTests.cs (100%) rename src/{NUnitEngine/nunit.engine.core.tests => NUnitCommon/nunit.agent.core.tests}/Runners/DomainManagerStaticTests.cs (100%) rename src/{NUnitEngine/nunit.engine.core.tests => NUnitCommon/nunit.agent.core.tests}/Runners/DomainManagerTests.cs (100%) rename src/{NUnitEngine/nunit.engine.core.tests => NUnitCommon/nunit.agent.core.tests}/Runners/FakeTestAgentRunner.cs (56%) rename src/{NUnitEngine/nunit.engine.core.tests => NUnitCommon/nunit.agent.core.tests}/Runners/TestAgentRunnerExceptionTests.cs (98%) rename src/{NUnitEngine/nunit.engine.core.tests => NUnitCommon/nunit.agent.core.tests}/Runners/TestAgentRunnerTests.cs (100%) create mode 100644 src/NUnitCommon/nunit.agent.core.tests/nunit.agent.core.tests.csproj rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Agents/RemoteTestAgent.cs (100%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Agents/TestAgent.cs (100%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/CallbackHandler.cs (100%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Communication/Transports/ITestAgentTransport.cs (100%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Communication/Transports/Remoting/TestAgentRemotingTransport.cs (99%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Communication/Transports/Tcp/TestAgentTcpTransport.cs (99%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Drivers/DriverService.cs (99%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Drivers/IDriverService.cs (100%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Drivers/NUnit2DriverFactory.cs (98%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Drivers/NUnit3DriverFactory.cs (97%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Drivers/NUnitFrameworkApi.cs (100%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Drivers/NUnitFrameworkApi2009.cs (95%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Drivers/NUnitFrameworkApi2018.cs (93%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Drivers/NUnitFrameworkDriver.cs (98%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Drivers/NotRunnableFrameworkDriver.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Internal => NUnitCommon/nunit.agent.core/Drivers}/ProvidedPathsAssemblyResolver.cs (98%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/RunTestsCallbackHandler.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Internal => NUnitCommon/nunit.agent.core/Runners}/DomainDetailsBuilder.cs (98%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Runners/DomainManager.cs (98%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Runners/LocalTestRunner.cs (100%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Runners/NotRunnableTestRunner.cs (100%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Runners/TestAgentRunner.cs (96%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.agent.core}/Runners/TestDomainRunner.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Internal/Backports => NUnitCommon/nunit.agent.core}/RuntimeInformation.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Internal => NUnitCommon/nunit.agent.core}/TestAssemblyLoadContext.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Internal => NUnitCommon/nunit.agent.core}/TestAssemblyResolver.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Internal => NUnitCommon/nunit.agent.core}/TestPackageExtensions.cs (97%) create mode 100644 src/NUnitCommon/nunit.agent.core/nunit.agent.core.csproj rename src/{NUnitEngine/nunit.engine.core/Communication => NUnitCommon/nunit.common/Communitcation}/Messages/CommandMessage.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Communication => NUnitCommon/nunit.common/Communitcation}/Messages/CommandReturnMessage.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Communication => NUnitCommon/nunit.common/Communitcation}/Messages/ProgressMessage.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Communication => NUnitCommon/nunit.common/Communitcation}/Messages/TestEngineMessage.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Communication => NUnitCommon/nunit.common/Communitcation}/Protocols/BinarySerializationProtocol.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Communication => NUnitCommon/nunit.common/Communitcation}/Protocols/ISerializationProtocol.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Communication => NUnitCommon/nunit.common/Communitcation}/Transports/Tcp/SocketReader.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Internal => NUnitCommon/nunit.common}/CurrentMessageCounter.cs (95%) rename src/{NUnitEngine/nunit.engine.core => NUnitCommon/nunit.common}/DotNet.cs (100%) rename src/{NUnitEngine/nunit.engine.core/Internal => NUnitCommon/nunit.common}/ProcessUtils.cs (99%) rename src/{NUnitEngine/nunit.engine.core/Internal => NUnitCommon/nunit.common}/ResultHelper.cs (99%) rename src/{NUnitEngine/nunit.engine.core/Internal => NUnitCommon/nunit.common}/TcpChannelUtils.ObservableServerChannelSinkProvider.cs (99%) rename src/{NUnitEngine/nunit.engine.core/Internal => NUnitCommon/nunit.common}/TcpChannelUtils.cs (99%) rename src/NUnitEngine/{nunit.engine.core => nunit.engine.api}/AsyncTestEngineResult.cs (76%) rename src/{NUnitCommon/nunit.common => NUnitEngine/nunit.engine.api}/EnginePackageSettings.cs (83%) rename src/NUnitEngine/{nunit.engine.core => nunit.engine.api}/ITestAgency.cs (100%) rename src/NUnitEngine/{nunit.engine.core => nunit.engine.api}/ITestAgent.cs (100%) rename src/NUnitEngine/{nunit.engine.core => nunit.engine.api}/ITestEngineRunner.cs (100%) rename src/NUnitEngine/{nunit.engine.core => nunit.engine.api}/TestEngineResult.cs (88%) delete mode 100644 src/NUnitEngine/nunit.engine.core/Internal/IEnumerableExtensions.cs diff --git a/NUnitConsole.sln b/NUnitConsole.sln index 538d8737c..a06ff2cbd 100644 --- a/NUnitConsole.sln +++ b/NUnitConsole.sln @@ -161,6 +161,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common", "src\NUnitCo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common.tests", "src\NUnitCommon\nunit.common.tests\nunit.common.tests.csproj", "{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.agent.core", "src\NUnitCommon\nunit.agent.core\nunit.agent.core.csproj", "{4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.agent.core.tests", "src\NUnitCommon\nunit.agent.core.tests\nunit.agent.core.tests.csproj", "{89258A3E-5B62-487A-9AE7-D7672CBF61F1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -287,6 +291,14 @@ Global {6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}.Debug|Any CPU.Build.0 = Debug|Any CPU {6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}.Release|Any CPU.ActiveCfg = Release|Any CPU {6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}.Release|Any CPU.Build.0 = Release|Any CPU + {4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA}.Release|Any CPU.Build.0 = Release|Any CPU + {89258A3E-5B62-487A-9AE7-D7672CBF61F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89258A3E-5B62-487A-9AE7-D7672CBF61F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89258A3E-5B62-487A-9AE7-D7672CBF61F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89258A3E-5B62-487A-9AE7-D7672CBF61F1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -333,6 +345,8 @@ Global {E2A4C099-E35D-4E27-B89D-957140ED970F} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC} {9D9CAD66-8EDF-4ED0-A222-503BE9B21EC7} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC} {6605DA54-EBF4-4ED1-B5BC-B607AD0CE308} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC} + {4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC} + {89258A3E-5B62-487A-9AE7-D7672CBF61F1} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711} diff --git a/src/NUnitEngine/nunit.engine.core.tests/Services/DriverServiceTests.cs b/src/NUnitCommon/nunit.agent.core.tests/Drivers/DriverServiceTests.cs similarity index 97% rename from src/NUnitEngine/nunit.engine.core.tests/Services/DriverServiceTests.cs rename to src/NUnitCommon/nunit.agent.core.tests/Drivers/DriverServiceTests.cs index 538263071..f2e325514 100644 --- a/src/NUnitEngine/nunit.engine.core.tests/Services/DriverServiceTests.cs +++ b/src/NUnitCommon/nunit.agent.core.tests/Drivers/DriverServiceTests.cs @@ -1,11 +1,9 @@ // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt using System; -using System.Collections.Generic; using System.IO; using NUnit.Framework; using NUnit.Engine.Drivers; -using NUnit.Engine.Extensibility; namespace NUnit.Engine.Services { diff --git a/src/NUnitEngine/nunit.engine.core.tests/Drivers/NUnit3DriverFactoryTests.cs b/src/NUnitCommon/nunit.agent.core.tests/Drivers/NUnit3DriverFactoryTests.cs similarity index 92% rename from src/NUnitEngine/nunit.engine.core.tests/Drivers/NUnit3DriverFactoryTests.cs rename to src/NUnitCommon/nunit.agent.core.tests/Drivers/NUnit3DriverFactoryTests.cs index 64211c281..527028702 100644 --- a/src/NUnitEngine/nunit.engine.core.tests/Drivers/NUnit3DriverFactoryTests.cs +++ b/src/NUnitCommon/nunit.agent.core.tests/Drivers/NUnit3DriverFactoryTests.cs @@ -22,7 +22,7 @@ public void SetUp() [TestCase(4, ExpectedResult = true)] public bool SupportsNetFramework(int majorVersion) { - AssemblyName name = new AssemblyName(NUnit3DriverFactory.NUNIT_FRAMEWORK) + AssemblyName name = new AssemblyName("nunit.framework") { Version = new Version(majorVersion, 0) }; diff --git a/src/NUnitEngine/nunit.engine.core.tests/Drivers/NUnitFrameworkDriverTests.cs b/src/NUnitCommon/nunit.agent.core.tests/Drivers/NUnitFrameworkDriverTests.cs similarity index 99% rename from src/NUnitEngine/nunit.engine.core.tests/Drivers/NUnitFrameworkDriverTests.cs rename to src/NUnitCommon/nunit.agent.core.tests/Drivers/NUnitFrameworkDriverTests.cs index 011c6b9c7..a47091bf9 100644 --- a/src/NUnitEngine/nunit.engine.core.tests/Drivers/NUnitFrameworkDriverTests.cs +++ b/src/NUnitCommon/nunit.agent.core.tests/Drivers/NUnitFrameworkDriverTests.cs @@ -7,7 +7,6 @@ using NUnit.TestData.Assemblies; using NUnit.Framework; using NUnit.Framework.Internal; -using NUnit.Engine.Internal; namespace NUnit.Engine.Drivers { diff --git a/src/NUnitEngine/nunit.engine.core.tests/Drivers/NotRunnableFrameworkDriverTests.cs b/src/NUnitCommon/nunit.agent.core.tests/Drivers/NotRunnableFrameworkDriverTests.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core.tests/Drivers/NotRunnableFrameworkDriverTests.cs rename to src/NUnitCommon/nunit.agent.core.tests/Drivers/NotRunnableFrameworkDriverTests.cs diff --git a/src/NUnitEngine/nunit.engine.core.tests/Runners/DomainManagerStaticTests.cs b/src/NUnitCommon/nunit.agent.core.tests/Runners/DomainManagerStaticTests.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core.tests/Runners/DomainManagerStaticTests.cs rename to src/NUnitCommon/nunit.agent.core.tests/Runners/DomainManagerStaticTests.cs diff --git a/src/NUnitEngine/nunit.engine.core.tests/Runners/DomainManagerTests.cs b/src/NUnitCommon/nunit.agent.core.tests/Runners/DomainManagerTests.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core.tests/Runners/DomainManagerTests.cs rename to src/NUnitCommon/nunit.agent.core.tests/Runners/DomainManagerTests.cs diff --git a/src/NUnitEngine/nunit.engine.core.tests/Runners/FakeTestAgentRunner.cs b/src/NUnitCommon/nunit.agent.core.tests/Runners/FakeTestAgentRunner.cs similarity index 56% rename from src/NUnitEngine/nunit.engine.core.tests/Runners/FakeTestAgentRunner.cs rename to src/NUnitCommon/nunit.agent.core.tests/Runners/FakeTestAgentRunner.cs index d3135d396..c7fe16621 100644 --- a/src/NUnitEngine/nunit.engine.core.tests/Runners/FakeTestAgentRunner.cs +++ b/src/NUnitCommon/nunit.agent.core.tests/Runners/FakeTestAgentRunner.cs @@ -1,14 +1,16 @@ // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt +using NUnit.Engine.Drivers; using System; namespace NUnit.Engine.Runners { - internal class FakeTestAgentRunner : Engine.Runners.TestAgentRunner + internal class FakeTestAgentRunner : TestAgentRunner { - public FakeTestAgentRunner(TestPackage package) : base(package) + public FakeTestAgentRunner(TestPackage package, IDriverService? driverService = null) : base(package) { TestDomain = AppDomain.CurrentDomain; + DriverService = driverService; } public new void Load() diff --git a/src/NUnitEngine/nunit.engine.core.tests/Runners/TestAgentRunnerExceptionTests.cs b/src/NUnitCommon/nunit.agent.core.tests/Runners/TestAgentRunnerExceptionTests.cs similarity index 98% rename from src/NUnitEngine/nunit.engine.core.tests/Runners/TestAgentRunnerExceptionTests.cs rename to src/NUnitCommon/nunit.agent.core.tests/Runners/TestAgentRunnerExceptionTests.cs index 7df91d65d..ad49277d7 100644 --- a/src/NUnitEngine/nunit.engine.core.tests/Runners/TestAgentRunnerExceptionTests.cs +++ b/src/NUnitCommon/nunit.agent.core.tests/Runners/TestAgentRunnerExceptionTests.cs @@ -27,10 +27,7 @@ public void Initialize() string.Empty, false).ReturnsForAnyArgs(_driver); - _runner = new FakeTestAgentRunner(new TestPackage("mock-assembly.dll").SubPackages[0]) - { - DriverService = driverService - }; + _runner = new FakeTestAgentRunner(new TestPackage("mock-assembly.dll").SubPackages[0], driverService); } [TearDown] diff --git a/src/NUnitEngine/nunit.engine.core.tests/Runners/TestAgentRunnerTests.cs b/src/NUnitCommon/nunit.agent.core.tests/Runners/TestAgentRunnerTests.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core.tests/Runners/TestAgentRunnerTests.cs rename to src/NUnitCommon/nunit.agent.core.tests/Runners/TestAgentRunnerTests.cs diff --git a/src/NUnitCommon/nunit.agent.core.tests/nunit.agent.core.tests.csproj b/src/NUnitCommon/nunit.agent.core.tests/nunit.agent.core.tests.csproj new file mode 100644 index 000000000..599ba9940 --- /dev/null +++ b/src/NUnitCommon/nunit.agent.core.tests/nunit.agent.core.tests.csproj @@ -0,0 +1,35 @@ + + + + net462;net8.0 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/NUnitEngine/nunit.engine.core/Agents/RemoteTestAgent.cs b/src/NUnitCommon/nunit.agent.core/Agents/RemoteTestAgent.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Agents/RemoteTestAgent.cs rename to src/NUnitCommon/nunit.agent.core/Agents/RemoteTestAgent.cs diff --git a/src/NUnitEngine/nunit.engine.core/Agents/TestAgent.cs b/src/NUnitCommon/nunit.agent.core/Agents/TestAgent.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Agents/TestAgent.cs rename to src/NUnitCommon/nunit.agent.core/Agents/TestAgent.cs diff --git a/src/NUnitEngine/nunit.engine.core/CallbackHandler.cs b/src/NUnitCommon/nunit.agent.core/CallbackHandler.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/CallbackHandler.cs rename to src/NUnitCommon/nunit.agent.core/CallbackHandler.cs diff --git a/src/NUnitEngine/nunit.engine.core/Communication/Transports/ITestAgentTransport.cs b/src/NUnitCommon/nunit.agent.core/Communication/Transports/ITestAgentTransport.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Communication/Transports/ITestAgentTransport.cs rename to src/NUnitCommon/nunit.agent.core/Communication/Transports/ITestAgentTransport.cs diff --git a/src/NUnitEngine/nunit.engine.core/Communication/Transports/Remoting/TestAgentRemotingTransport.cs b/src/NUnitCommon/nunit.agent.core/Communication/Transports/Remoting/TestAgentRemotingTransport.cs similarity index 99% rename from src/NUnitEngine/nunit.engine.core/Communication/Transports/Remoting/TestAgentRemotingTransport.cs rename to src/NUnitCommon/nunit.agent.core/Communication/Transports/Remoting/TestAgentRemotingTransport.cs index 4efcfe296..a15ca6c57 100644 --- a/src/NUnitEngine/nunit.engine.core/Communication/Transports/Remoting/TestAgentRemotingTransport.cs +++ b/src/NUnitCommon/nunit.agent.core/Communication/Transports/Remoting/TestAgentRemotingTransport.cs @@ -6,7 +6,6 @@ using System.Runtime.Remoting.Channels.Tcp; using System.Threading; using NUnit.Engine.Agents; -using NUnit.Engine.Internal; namespace NUnit.Engine.Communication.Transports.Remoting { diff --git a/src/NUnitEngine/nunit.engine.core/Communication/Transports/Tcp/TestAgentTcpTransport.cs b/src/NUnitCommon/nunit.agent.core/Communication/Transports/Tcp/TestAgentTcpTransport.cs similarity index 99% rename from src/NUnitEngine/nunit.engine.core/Communication/Transports/Tcp/TestAgentTcpTransport.cs rename to src/NUnitCommon/nunit.agent.core/Communication/Transports/Tcp/TestAgentTcpTransport.cs index 3d006e3f4..e76f406bd 100644 --- a/src/NUnitEngine/nunit.engine.core/Communication/Transports/Tcp/TestAgentTcpTransport.cs +++ b/src/NUnitCommon/nunit.agent.core/Communication/Transports/Tcp/TestAgentTcpTransport.cs @@ -4,7 +4,6 @@ using System.Net.Sockets; using System.Threading; using NUnit.Engine.Agents; -using NUnit.Engine.Internal; using NUnit.Engine.Communication.Messages; using NUnit.Engine.Communication.Protocols; diff --git a/src/NUnitEngine/nunit.engine.core/Drivers/DriverService.cs b/src/NUnitCommon/nunit.agent.core/Drivers/DriverService.cs similarity index 99% rename from src/NUnitEngine/nunit.engine.core/Drivers/DriverService.cs rename to src/NUnitCommon/nunit.agent.core/Drivers/DriverService.cs index 9e6283f44..30be94517 100644 --- a/src/NUnitEngine/nunit.engine.core/Drivers/DriverService.cs +++ b/src/NUnitCommon/nunit.agent.core/Drivers/DriverService.cs @@ -5,7 +5,6 @@ using System.IO; using System.Reflection; using NUnit.Engine.Extensibility; -using NUnit.Engine.Internal; using TestCentric.Metadata; namespace NUnit.Engine.Drivers diff --git a/src/NUnitEngine/nunit.engine.core/Drivers/IDriverService.cs b/src/NUnitCommon/nunit.agent.core/Drivers/IDriverService.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Drivers/IDriverService.cs rename to src/NUnitCommon/nunit.agent.core/Drivers/IDriverService.cs diff --git a/src/NUnitEngine/nunit.engine.core/Drivers/NUnit2DriverFactory.cs b/src/NUnitCommon/nunit.agent.core/Drivers/NUnit2DriverFactory.cs similarity index 98% rename from src/NUnitEngine/nunit.engine.core/Drivers/NUnit2DriverFactory.cs rename to src/NUnitCommon/nunit.agent.core/Drivers/NUnit2DriverFactory.cs index 642eeeea6..f60750f83 100644 --- a/src/NUnitEngine/nunit.engine.core/Drivers/NUnit2DriverFactory.cs +++ b/src/NUnitCommon/nunit.agent.core/Drivers/NUnit2DriverFactory.cs @@ -4,7 +4,6 @@ using System; using System.Reflection; using NUnit.Engine.Extensibility; -using NUnit.Engine.Internal; using NUnit.Extensibility; namespace NUnit.Engine.Drivers diff --git a/src/NUnitEngine/nunit.engine.core/Drivers/NUnit3DriverFactory.cs b/src/NUnitCommon/nunit.agent.core/Drivers/NUnit3DriverFactory.cs similarity index 97% rename from src/NUnitEngine/nunit.engine.core/Drivers/NUnit3DriverFactory.cs rename to src/NUnitCommon/nunit.agent.core/Drivers/NUnit3DriverFactory.cs index 15c4cf7bd..ca7b678cd 100644 --- a/src/NUnitEngine/nunit.engine.core/Drivers/NUnit3DriverFactory.cs +++ b/src/NUnitCommon/nunit.agent.core/Drivers/NUnit3DriverFactory.cs @@ -3,7 +3,6 @@ using System; using System.Reflection; using NUnit.Engine.Extensibility; -using NUnit.Engine.Internal; namespace NUnit.Engine.Drivers { @@ -46,7 +45,7 @@ public IFrameworkDriver GetDriver(AppDomain domain, string id, AssemblyName refe public IFrameworkDriver GetDriver(string id, AssemblyName reference) { Guard.ArgumentNotNullOrEmpty(id, nameof(id)); - Guard.ArgumentValid(IsSupportedTestFramework(reference), "Invalid framework", "reference"); + Guard.ArgumentValid(IsSupportedTestFramework(reference), "Invalid framework", nameof(reference)); log.Info("Using NUnitFrameworkDriver"); return new NUnitFrameworkDriver(id, reference); } diff --git a/src/NUnitEngine/nunit.engine.core/Drivers/NUnitFrameworkApi.cs b/src/NUnitCommon/nunit.agent.core/Drivers/NUnitFrameworkApi.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Drivers/NUnitFrameworkApi.cs rename to src/NUnitCommon/nunit.agent.core/Drivers/NUnitFrameworkApi.cs diff --git a/src/NUnitEngine/nunit.engine.core/Drivers/NUnitFrameworkApi2009.cs b/src/NUnitCommon/nunit.agent.core/Drivers/NUnitFrameworkApi2009.cs similarity index 95% rename from src/NUnitEngine/nunit.engine.core/Drivers/NUnitFrameworkApi2009.cs rename to src/NUnitCommon/nunit.agent.core/Drivers/NUnitFrameworkApi2009.cs index c8c10c398..0e4408bb9 100644 --- a/src/NUnitEngine/nunit.engine.core/Drivers/NUnitFrameworkApi2009.cs +++ b/src/NUnitCommon/nunit.agent.core/Drivers/NUnitFrameworkApi2009.cs @@ -6,16 +6,15 @@ using System.IO; using System.Reflection; using System.Runtime.Serialization; -using NUnit.Engine.Internal; namespace NUnit.Engine.Drivers { - /// - /// This is the original NUnit 3 API, which only works for .NET Framework. - /// As far as I can discover, it first appeared in pre-release 2.9.1, - /// on launchpad in 2009, hence the name. - /// - class NUnitFrameworkApi2009 : NUnitFrameworkApi + /// + /// This is the original NUnit 3 API, which only works for .NET Framework. + /// As far as I can discover, it first appeared in pre-release 2.9.1, + /// on launchpad in 2009, hence the name. + /// + class NUnitFrameworkApi2009 : NUnitFrameworkApi { static readonly Logger log = InternalTrace.GetLogger(nameof(NUnitFrameworkApi2009)); diff --git a/src/NUnitEngine/nunit.engine.core/Drivers/NUnitFrameworkApi2018.cs b/src/NUnitCommon/nunit.agent.core/Drivers/NUnitFrameworkApi2018.cs similarity index 93% rename from src/NUnitEngine/nunit.engine.core/Drivers/NUnitFrameworkApi2018.cs rename to src/NUnitCommon/nunit.agent.core/Drivers/NUnitFrameworkApi2018.cs index 13fc41ee5..711b6804b 100644 --- a/src/NUnitEngine/nunit.engine.core/Drivers/NUnitFrameworkApi2018.cs +++ b/src/NUnitCommon/nunit.agent.core/Drivers/NUnitFrameworkApi2018.cs @@ -4,7 +4,10 @@ using System.Collections.Generic; using System.IO; using System.Reflection; + +#if NETCOREAPP using NUnit.Engine.Internal; +#endif namespace NUnit.Engine.Drivers { @@ -56,7 +59,7 @@ public string Load(string testAssemblyPath, IDictionary settings { Guard.ArgumentNotNull(testAssemblyPath, nameof(testAssemblyPath)); Guard.ArgumentNotNull(settings, nameof(settings)); - Guard.ArgumentValid(File.Exists(testAssemblyPath), "Framework driver called with a file name that doesn't exist.", "testAssemblyPath"); + Guard.ArgumentValid(File.Exists(testAssemblyPath), "Framework driver called with a file name that doesn't exist.", nameof(testAssemblyPath)); log.Info($"Loading {testAssemblyPath} - see separate log file"); _testAssemblyPath = Path.GetFullPath(testAssemblyPath); @@ -67,15 +70,15 @@ public string Load(string testAssemblyPath, IDictionary settings { _frameworkController = AppDomain.CurrentDomain.CreateInstanceAndUnwrap( _nunitRef.FullName, - CONTROLLER_TYPE, - false, - 0, - null, - new object[] { _testAssemblyPath, idPrefix, settings }, - null, + CONTROLLER_TYPE, + false, + 0, + null, + new object[] { _testAssemblyPath, idPrefix, settings }, + null, null).ShouldNotBeNull(); } - catch (Exception ex) + catch (Exception ex) { string msg = $"Failed to load {_nunitRef.FullName}\r\n Codebase: {_nunitRef.CodeBase}"; throw new Exception(msg, ex); @@ -119,14 +122,14 @@ public string Run(ITestEventListener? listener, string filter) CheckLoadWasCalled(); log.Info("Running {0} - see separate log file", Path.GetFileName(_testAssemblyPath.ShouldNotBeNull())); Action? callback = null; - return (string)ExecuteMethod(RUN_METHOD, new[] { typeof(Action), typeof(string) }, callback, filter); + return (string)ExecuteMethod(RUN_METHOD, [typeof(Action), typeof(string)], callback, filter); } public void RunAsync(Action callback, string filter) { CheckLoadWasCalled(); log.Info("Running {0} - see separate log file", Path.GetFileName(_testAssemblyPath.ShouldNotBeNull())); - ExecuteMethod(RUN_ASYNC_METHOD, new[] { typeof(Action), typeof(string) }, callback, filter); + ExecuteMethod(RUN_ASYNC_METHOD, [typeof(Action), typeof(string)], callback, filter); } public void StopRun(bool force) @@ -187,7 +190,6 @@ private Assembly LoadAssembly(AssemblyName assemblyName) } catch (Exception e) { - var msg = string.Format(FAILED_TO_LOAD_ASSEMBLY + assemblyName.FullName); log.Error($"{FAILED_TO_LOAD_ASSEMBLY}\r\n{e}"); throw new NUnitEngineException(FAILED_TO_LOAD_NUNIT, e); } diff --git a/src/NUnitEngine/nunit.engine.core/Drivers/NUnitFrameworkDriver.cs b/src/NUnitCommon/nunit.agent.core/Drivers/NUnitFrameworkDriver.cs similarity index 98% rename from src/NUnitEngine/nunit.engine.core/Drivers/NUnitFrameworkDriver.cs rename to src/NUnitCommon/nunit.agent.core/Drivers/NUnitFrameworkDriver.cs index 3a30b2f51..ef2f36f0c 100644 --- a/src/NUnitEngine/nunit.engine.core/Drivers/NUnitFrameworkDriver.cs +++ b/src/NUnitCommon/nunit.agent.core/Drivers/NUnitFrameworkDriver.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Reflection; -using NUnit.Engine.Internal; +using NUnit.Engine; using NUnit.Engine.Extensibility; namespace NUnit.Engine.Drivers @@ -14,7 +14,7 @@ namespace NUnit.Engine.Drivers /// public class NUnitFrameworkDriver : IFrameworkDriver { - static readonly Version MINIMUM_NUNIT_VERSION = new Version(3, 2, 0); + static readonly Version MINIMUM_NUNIT_VERSION = new(3, 2, 0); static readonly Logger log = InternalTrace.GetLogger(nameof(NUnitFrameworkDriver)); readonly NUnitFrameworkApi _api; diff --git a/src/NUnitEngine/nunit.engine.core/Drivers/NotRunnableFrameworkDriver.cs b/src/NUnitCommon/nunit.agent.core/Drivers/NotRunnableFrameworkDriver.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Drivers/NotRunnableFrameworkDriver.cs rename to src/NUnitCommon/nunit.agent.core/Drivers/NotRunnableFrameworkDriver.cs diff --git a/src/NUnitEngine/nunit.engine.core/Internal/ProvidedPathsAssemblyResolver.cs b/src/NUnitCommon/nunit.agent.core/Drivers/ProvidedPathsAssemblyResolver.cs similarity index 98% rename from src/NUnitEngine/nunit.engine.core/Internal/ProvidedPathsAssemblyResolver.cs rename to src/NUnitCommon/nunit.agent.core/Drivers/ProvidedPathsAssemblyResolver.cs index 91ad7fe90..b9c89ee04 100644 --- a/src/NUnitEngine/nunit.engine.core/Internal/ProvidedPathsAssemblyResolver.cs +++ b/src/NUnitCommon/nunit.agent.core/Drivers/ProvidedPathsAssemblyResolver.cs @@ -6,7 +6,7 @@ using System.IO; using System.Diagnostics; -namespace NUnit.Engine.Internal +namespace NUnit.Engine.Drivers { public class ProvidedPathsAssemblyResolver { diff --git a/src/NUnitEngine/nunit.engine.core/RunTestsCallbackHandler.cs b/src/NUnitCommon/nunit.agent.core/RunTestsCallbackHandler.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/RunTestsCallbackHandler.cs rename to src/NUnitCommon/nunit.agent.core/RunTestsCallbackHandler.cs diff --git a/src/NUnitEngine/nunit.engine.core/Internal/DomainDetailsBuilder.cs b/src/NUnitCommon/nunit.agent.core/Runners/DomainDetailsBuilder.cs similarity index 98% rename from src/NUnitEngine/nunit.engine.core/Internal/DomainDetailsBuilder.cs rename to src/NUnitCommon/nunit.agent.core/Runners/DomainDetailsBuilder.cs index 1737f37ca..fd84bcbca 100644 --- a/src/NUnitEngine/nunit.engine.core/Internal/DomainDetailsBuilder.cs +++ b/src/NUnitCommon/nunit.agent.core/Runners/DomainDetailsBuilder.cs @@ -5,7 +5,7 @@ using System.Reflection; using System.Text; -namespace NUnit.Engine.Internal +namespace NUnit.Engine { /// /// DomainDetailsBuilder provides human readable information on diff --git a/src/NUnitEngine/nunit.engine.core/Runners/DomainManager.cs b/src/NUnitCommon/nunit.agent.core/Runners/DomainManager.cs similarity index 98% rename from src/NUnitEngine/nunit.engine.core/Runners/DomainManager.cs rename to src/NUnitCommon/nunit.agent.core/Runners/DomainManager.cs index a9a8ac4a0..d087609fc 100644 --- a/src/NUnitEngine/nunit.engine.core/Runners/DomainManager.cs +++ b/src/NUnitCommon/nunit.agent.core/Runners/DomainManager.cs @@ -10,7 +10,6 @@ using System.Security; using System.Security.Policy; using System.Security.Principal; -using NUnit.Engine.Internal; using System.Linq; namespace NUnit.Engine.Runners @@ -83,7 +82,7 @@ AppDomainSetup CreateAppDomainSetup(TestPackage package) // If property is null, .NET 4.5+ is not installed, so there is no need if (TargetFrameworkNameProperty != null) { - var frameworkName = package.GetSetting(InternalEnginePackageSettings.ImageTargetFrameworkName, ""); + var frameworkName = package.GetSetting(EnginePackageSettings.ImageTargetFrameworkName, ""); if (frameworkName != "") TargetFrameworkNameProperty.SetValue(setup, frameworkName, null); } diff --git a/src/NUnitEngine/nunit.engine.core/Runners/LocalTestRunner.cs b/src/NUnitCommon/nunit.agent.core/Runners/LocalTestRunner.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Runners/LocalTestRunner.cs rename to src/NUnitCommon/nunit.agent.core/Runners/LocalTestRunner.cs diff --git a/src/NUnitEngine/nunit.engine.core/Runners/NotRunnableTestRunner.cs b/src/NUnitCommon/nunit.agent.core/Runners/NotRunnableTestRunner.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Runners/NotRunnableTestRunner.cs rename to src/NUnitCommon/nunit.agent.core/Runners/NotRunnableTestRunner.cs diff --git a/src/NUnitEngine/nunit.engine.core/Runners/TestAgentRunner.cs b/src/NUnitCommon/nunit.agent.core/Runners/TestAgentRunner.cs similarity index 96% rename from src/NUnitEngine/nunit.engine.core/Runners/TestAgentRunner.cs rename to src/NUnitCommon/nunit.agent.core/Runners/TestAgentRunner.cs index 87cae5bf7..846bdd2aa 100644 --- a/src/NUnitEngine/nunit.engine.core/Runners/TestAgentRunner.cs +++ b/src/NUnitCommon/nunit.agent.core/Runners/TestAgentRunner.cs @@ -6,7 +6,6 @@ using System.Linq; using NUnit.Engine.Drivers; using NUnit.Engine.Extensibility; -using NUnit.Engine.Internal; namespace NUnit.Engine.Runners { @@ -24,7 +23,7 @@ public abstract class TestAgentRunner : ITestEngineRunner protected AppDomain? TestDomain { get; set; } // Used to inject DriverService for testing - internal IDriverService? DriverService { get; set; } + protected IDriverService? DriverService { get; set; } /// /// The TestPackage for which this is the runner @@ -101,11 +100,11 @@ public virtual TestEngineResult Load() var testFile = assemblyPackage.FullName!; // We know it's an assembly - string? targetFramework = assemblyPackage.GetSetting(InternalEnginePackageSettings.ImageTargetFrameworkName, (string?)null); + string? targetFramework = assemblyPackage.GetSetting(EnginePackageSettings.ImageTargetFrameworkName, (string?)null); bool skipNonTestAssemblies = assemblyPackage.GetSetting(EnginePackageSettings.SkipNonTestAssemblies, false); if (_assemblyResolver != null && !TestDomain.IsDefaultAppDomain() - && assemblyPackage.GetSetting(InternalEnginePackageSettings.ImageRequiresDefaultAppDomainAssemblyResolver, false)) + && assemblyPackage.GetSetting(EnginePackageSettings.ImageRequiresDefaultAppDomainAssemblyResolver, false)) { // It's OK to do this in the loop because the Add method // checks to see if the path is already present. diff --git a/src/NUnitEngine/nunit.engine.core/Runners/TestDomainRunner.cs b/src/NUnitCommon/nunit.agent.core/Runners/TestDomainRunner.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Runners/TestDomainRunner.cs rename to src/NUnitCommon/nunit.agent.core/Runners/TestDomainRunner.cs diff --git a/src/NUnitEngine/nunit.engine.core/Internal/Backports/RuntimeInformation.cs b/src/NUnitCommon/nunit.agent.core/RuntimeInformation.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Internal/Backports/RuntimeInformation.cs rename to src/NUnitCommon/nunit.agent.core/RuntimeInformation.cs diff --git a/src/NUnitEngine/nunit.engine.core/Internal/TestAssemblyLoadContext.cs b/src/NUnitCommon/nunit.agent.core/TestAssemblyLoadContext.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Internal/TestAssemblyLoadContext.cs rename to src/NUnitCommon/nunit.agent.core/TestAssemblyLoadContext.cs diff --git a/src/NUnitEngine/nunit.engine.core/Internal/TestAssemblyResolver.cs b/src/NUnitCommon/nunit.agent.core/TestAssemblyResolver.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Internal/TestAssemblyResolver.cs rename to src/NUnitCommon/nunit.agent.core/TestAssemblyResolver.cs diff --git a/src/NUnitEngine/nunit.engine.core/Internal/TestPackageExtensions.cs b/src/NUnitCommon/nunit.agent.core/TestPackageExtensions.cs similarity index 97% rename from src/NUnitEngine/nunit.engine.core/Internal/TestPackageExtensions.cs rename to src/NUnitCommon/nunit.agent.core/TestPackageExtensions.cs index 535561eba..190a37989 100644 --- a/src/NUnitEngine/nunit.engine.core/Internal/TestPackageExtensions.cs +++ b/src/NUnitCommon/nunit.agent.core/TestPackageExtensions.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -namespace NUnit.Engine.Internal +namespace NUnit.Engine { public delegate bool TestPackageSelectorDelegate(TestPackage p); diff --git a/src/NUnitCommon/nunit.agent.core/nunit.agent.core.csproj b/src/NUnitCommon/nunit.agent.core/nunit.agent.core.csproj new file mode 100644 index 000000000..0cb240de9 --- /dev/null +++ b/src/NUnitCommon/nunit.agent.core/nunit.agent.core.csproj @@ -0,0 +1,37 @@ + + + + NUnit.Engine + net462;netcoreapp3.1;net6.0;net8.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/NUnitEngine/nunit.engine.core/Communication/Messages/CommandMessage.cs b/src/NUnitCommon/nunit.common/Communitcation/Messages/CommandMessage.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Communication/Messages/CommandMessage.cs rename to src/NUnitCommon/nunit.common/Communitcation/Messages/CommandMessage.cs diff --git a/src/NUnitEngine/nunit.engine.core/Communication/Messages/CommandReturnMessage.cs b/src/NUnitCommon/nunit.common/Communitcation/Messages/CommandReturnMessage.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Communication/Messages/CommandReturnMessage.cs rename to src/NUnitCommon/nunit.common/Communitcation/Messages/CommandReturnMessage.cs diff --git a/src/NUnitEngine/nunit.engine.core/Communication/Messages/ProgressMessage.cs b/src/NUnitCommon/nunit.common/Communitcation/Messages/ProgressMessage.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Communication/Messages/ProgressMessage.cs rename to src/NUnitCommon/nunit.common/Communitcation/Messages/ProgressMessage.cs diff --git a/src/NUnitEngine/nunit.engine.core/Communication/Messages/TestEngineMessage.cs b/src/NUnitCommon/nunit.common/Communitcation/Messages/TestEngineMessage.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Communication/Messages/TestEngineMessage.cs rename to src/NUnitCommon/nunit.common/Communitcation/Messages/TestEngineMessage.cs diff --git a/src/NUnitEngine/nunit.engine.core/Communication/Protocols/BinarySerializationProtocol.cs b/src/NUnitCommon/nunit.common/Communitcation/Protocols/BinarySerializationProtocol.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Communication/Protocols/BinarySerializationProtocol.cs rename to src/NUnitCommon/nunit.common/Communitcation/Protocols/BinarySerializationProtocol.cs diff --git a/src/NUnitEngine/nunit.engine.core/Communication/Protocols/ISerializationProtocol.cs b/src/NUnitCommon/nunit.common/Communitcation/Protocols/ISerializationProtocol.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Communication/Protocols/ISerializationProtocol.cs rename to src/NUnitCommon/nunit.common/Communitcation/Protocols/ISerializationProtocol.cs diff --git a/src/NUnitEngine/nunit.engine.core/Communication/Transports/Tcp/SocketReader.cs b/src/NUnitCommon/nunit.common/Communitcation/Transports/Tcp/SocketReader.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/Communication/Transports/Tcp/SocketReader.cs rename to src/NUnitCommon/nunit.common/Communitcation/Transports/Tcp/SocketReader.cs diff --git a/src/NUnitEngine/nunit.engine.core/Internal/CurrentMessageCounter.cs b/src/NUnitCommon/nunit.common/CurrentMessageCounter.cs similarity index 95% rename from src/NUnitEngine/nunit.engine.core/Internal/CurrentMessageCounter.cs rename to src/NUnitCommon/nunit.common/CurrentMessageCounter.cs index 88d8af0a5..ae35b2efc 100644 --- a/src/NUnitEngine/nunit.engine.core/Internal/CurrentMessageCounter.cs +++ b/src/NUnitCommon/nunit.common/CurrentMessageCounter.cs @@ -2,7 +2,7 @@ using System.Threading; -namespace NUnit.Engine.Internal +namespace NUnit.Engine { public sealed class CurrentMessageCounter { diff --git a/src/NUnitEngine/nunit.engine.core/DotNet.cs b/src/NUnitCommon/nunit.common/DotNet.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/DotNet.cs rename to src/NUnitCommon/nunit.common/DotNet.cs diff --git a/src/NUnitEngine/nunit.engine.core/Internal/ProcessUtils.cs b/src/NUnitCommon/nunit.common/ProcessUtils.cs similarity index 99% rename from src/NUnitEngine/nunit.engine.core/Internal/ProcessUtils.cs rename to src/NUnitCommon/nunit.common/ProcessUtils.cs index 055d2c99e..f2eec7354 100644 --- a/src/NUnitEngine/nunit.engine.core/Internal/ProcessUtils.cs +++ b/src/NUnitCommon/nunit.common/ProcessUtils.cs @@ -23,7 +23,7 @@ using System.Text; -namespace NUnit.Engine.Internal +namespace NUnit.Engine { public static class ProcessUtils { diff --git a/src/NUnitEngine/nunit.engine.core/Internal/ResultHelper.cs b/src/NUnitCommon/nunit.common/ResultHelper.cs similarity index 99% rename from src/NUnitEngine/nunit.engine.core/Internal/ResultHelper.cs rename to src/NUnitCommon/nunit.common/ResultHelper.cs index 574ceefb2..c36dc655b 100644 --- a/src/NUnitEngine/nunit.engine.core/Internal/ResultHelper.cs +++ b/src/NUnitCommon/nunit.common/ResultHelper.cs @@ -6,7 +6,7 @@ using System.Reflection; using System.Xml; -namespace NUnit.Engine.Internal +namespace NUnit.Engine { /// /// ResultHelper provides static methods for working with diff --git a/src/NUnitEngine/nunit.engine.core/Internal/TcpChannelUtils.ObservableServerChannelSinkProvider.cs b/src/NUnitCommon/nunit.common/TcpChannelUtils.ObservableServerChannelSinkProvider.cs similarity index 99% rename from src/NUnitEngine/nunit.engine.core/Internal/TcpChannelUtils.ObservableServerChannelSinkProvider.cs rename to src/NUnitCommon/nunit.common/TcpChannelUtils.ObservableServerChannelSinkProvider.cs index 750b9f084..52e94510a 100644 --- a/src/NUnitEngine/nunit.engine.core/Internal/TcpChannelUtils.ObservableServerChannelSinkProvider.cs +++ b/src/NUnitCommon/nunit.common/TcpChannelUtils.ObservableServerChannelSinkProvider.cs @@ -7,7 +7,7 @@ using System.Runtime.Remoting.Channels; using System.Runtime.Remoting.Messaging; -namespace NUnit.Engine.Internal +namespace NUnit.Engine { partial class TcpChannelUtils { diff --git a/src/NUnitEngine/nunit.engine.core/Internal/TcpChannelUtils.cs b/src/NUnitCommon/nunit.common/TcpChannelUtils.cs similarity index 99% rename from src/NUnitEngine/nunit.engine.core/Internal/TcpChannelUtils.cs rename to src/NUnitCommon/nunit.common/TcpChannelUtils.cs index 5e25403d8..1aec666fe 100644 --- a/src/NUnitEngine/nunit.engine.core/Internal/TcpChannelUtils.cs +++ b/src/NUnitCommon/nunit.common/TcpChannelUtils.cs @@ -9,7 +9,7 @@ using System.Runtime.Serialization.Formatters; using System.Threading; -namespace NUnit.Engine.Internal +namespace NUnit.Engine { /// /// A collection of utility methods used to create, retrieve diff --git a/src/NUnitCommon/nunit.common/nunit.common.csproj b/src/NUnitCommon/nunit.common/nunit.common.csproj index 07de0ff21..c928b3f04 100644 --- a/src/NUnitCommon/nunit.common/nunit.common.csproj +++ b/src/NUnitCommon/nunit.common/nunit.common.csproj @@ -5,8 +5,20 @@ net462;netstandard2.0 + + + + + + + + + + + + diff --git a/src/NUnitEngine/agents/nunit-agent-net462-x86/nunit-agent-net462-x86.csproj b/src/NUnitEngine/agents/nunit-agent-net462-x86/nunit-agent-net462-x86.csproj index 29f314bda..3a464ee91 100644 --- a/src/NUnitEngine/agents/nunit-agent-net462-x86/nunit-agent-net462-x86.csproj +++ b/src/NUnitEngine/agents/nunit-agent-net462-x86/nunit-agent-net462-x86.csproj @@ -31,9 +31,9 @@ + - diff --git a/src/NUnitEngine/agents/nunit-agent-net462/nunit-agent-net462.csproj b/src/NUnitEngine/agents/nunit-agent-net462/nunit-agent-net462.csproj index 8bb192e6e..39d03ecb7 100644 --- a/src/NUnitEngine/agents/nunit-agent-net462/nunit-agent-net462.csproj +++ b/src/NUnitEngine/agents/nunit-agent-net462/nunit-agent-net462.csproj @@ -30,9 +30,9 @@ + - diff --git a/src/NUnitEngine/agents/nunit-agent-net80/nunit-agent-net80.csproj b/src/NUnitEngine/agents/nunit-agent-net80/nunit-agent-net80.csproj index 6894e23d2..f1b7796f4 100644 --- a/src/NUnitEngine/agents/nunit-agent-net80/nunit-agent-net80.csproj +++ b/src/NUnitEngine/agents/nunit-agent-net80/nunit-agent-net80.csproj @@ -31,9 +31,9 @@ + - @@ -47,9 +47,9 @@ - + - + \ No newline at end of file diff --git a/src/NUnitEngine/nunit.engine.core/AsyncTestEngineResult.cs b/src/NUnitEngine/nunit.engine.api/AsyncTestEngineResult.cs similarity index 76% rename from src/NUnitEngine/nunit.engine.core/AsyncTestEngineResult.cs rename to src/NUnitEngine/nunit.engine.api/AsyncTestEngineResult.cs index 9a777d507..0e39f9957 100644 --- a/src/NUnitEngine/nunit.engine.core/AsyncTestEngineResult.cs +++ b/src/NUnitEngine/nunit.engine.api/AsyncTestEngineResult.cs @@ -23,22 +23,32 @@ public TestEngineResult EngineResult { get { - Guard.OperationValid(_result != null, "Cannot retrieve Result from an incomplete or cancelled TestRun."); + if (_result == null) + throw new InvalidOperationException("Cannot retrieve Result from an incomplete or cancelled TestRun."); return _result; } } + /// + /// TODO: Can we remove this? + /// public EventWaitHandle WaitHandle { get { return _waitHandle; } } + /// + /// Used by tests + /// + /// public void SetResult(TestEngineResult result) { - Guard.ArgumentNotNull(result, "result"); - Guard.OperationValid(_result == null, "Cannot set the Result of an TestRun more than once"); - + if (result == null) + throw new ArgumentNullException(nameof(result)); + if (_result != null) + throw new InvalidOperationException("Cannot set the Result of an TestRun more than once"); + _result = result; _waitHandle.Set(); } diff --git a/src/NUnitCommon/nunit.common/EnginePackageSettings.cs b/src/NUnitEngine/nunit.engine.api/EnginePackageSettings.cs similarity index 83% rename from src/NUnitCommon/nunit.common/EnginePackageSettings.cs rename to src/NUnitEngine/nunit.engine.api/EnginePackageSettings.cs index 71fe320d3..1c38bc86b 100644 --- a/src/NUnitCommon/nunit.common/EnginePackageSettings.cs +++ b/src/NUnitEngine/nunit.engine.api/EnginePackageSettings.cs @@ -140,5 +140,29 @@ public static class EnginePackageSettings /// This path is provided to tests by the framework TestContext. /// public const string WorkDirectory = "WorkDirectory"; + + /// + /// If the package represents an assembly, then this is the CLR version + /// stored in the assembly image. If it represents a project or other + /// group of assemblies, it is the maximum version for all the assemblies. + /// + public const string ImageRuntimeVersion = "ImageRuntimeVersion"; + + /// + /// True if any assembly in the package requires running as a 32-bit + /// process when on a 64-bit system. + /// + public const string ImageRequiresX86 = "ImageRequiresX86"; + + /// + /// True if any assembly in the package requires a special assembly resolution hook + /// in the default application domain in order to find dependent assemblies. + /// + public const string ImageRequiresDefaultAppDomainAssemblyResolver = "ImageRequiresDefaultAppDomainAssemblyResolver"; + + /// + /// The FrameworkName specified on a TargetFrameworkAttribute for the assembly + /// + public const string ImageTargetFrameworkName = "ImageTargetFrameworkName"; } } diff --git a/src/NUnitEngine/nunit.engine.core/ITestAgency.cs b/src/NUnitEngine/nunit.engine.api/ITestAgency.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/ITestAgency.cs rename to src/NUnitEngine/nunit.engine.api/ITestAgency.cs diff --git a/src/NUnitEngine/nunit.engine.core/ITestAgent.cs b/src/NUnitEngine/nunit.engine.api/ITestAgent.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/ITestAgent.cs rename to src/NUnitEngine/nunit.engine.api/ITestAgent.cs diff --git a/src/NUnitEngine/nunit.engine.core/ITestEngineRunner.cs b/src/NUnitEngine/nunit.engine.api/ITestEngineRunner.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core/ITestEngineRunner.cs rename to src/NUnitEngine/nunit.engine.api/ITestEngineRunner.cs diff --git a/src/NUnitEngine/nunit.engine.core/TestEngineResult.cs b/src/NUnitEngine/nunit.engine.api/TestEngineResult.cs similarity index 88% rename from src/NUnitEngine/nunit.engine.core/TestEngineResult.cs rename to src/NUnitEngine/nunit.engine.api/TestEngineResult.cs index 0de0de182..ac79967eb 100644 --- a/src/NUnitEngine/nunit.engine.core/TestEngineResult.cs +++ b/src/NUnitEngine/nunit.engine.api/TestEngineResult.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Reflection; using System.Xml; -using NUnit.Engine.Internal; namespace NUnit.Engine { @@ -84,7 +83,9 @@ public IList XmlNodes { XmlDocument doc = new XmlDocument(); doc.LoadXml(_xmlText[i]); - _xmlNodes.Add(doc.FirstChild.ShouldNotBeNull()); + // TODO: Should we throw if first child is null? + if (doc.FirstChild != null) + _xmlNodes.Add(doc.FirstChild); } return _xmlNodes; @@ -109,11 +110,16 @@ public XmlNode Xml } } - public void Add(string xml) - { - this._xmlText.Add(xml); - } + // TODO: Make sure this is not needed then delete + //public void Add(string xml) + //{ + // this._xmlText.Add(xml); + //} + /// + /// Add an XmlNode to the TestEngineResult + /// + /// public void Add(XmlNode xml) { this._xmlText.Add(xml.OuterXml); diff --git a/src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj b/src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj index 68444cab2..1b95fbf44 100644 --- a/src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj +++ b/src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj @@ -27,9 +27,6 @@ - - - @@ -57,4 +54,10 @@ + + + + + + \ No newline at end of file diff --git a/src/NUnitEngine/nunit.engine.core/Internal/IEnumerableExtensions.cs b/src/NUnitEngine/nunit.engine.core/Internal/IEnumerableExtensions.cs deleted file mode 100644 index 554d3f9eb..000000000 --- a/src/NUnitEngine/nunit.engine.core/Internal/IEnumerableExtensions.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt - -using System.Collections.Generic; -namespace NUnit.Engine.Internal -{ - /// - /// Extension methods to get some Linq-feeling in .NET 2.0 projects. - /// - internal static class IEnumerableExtensions - { - /// - /// Gets a value indicating whether the enumeration contains at least one item or not. - /// - /// The type of objects contained in the enumeration. - /// The enumeration. - /// if contains at least one item; otherwhise, . - public static bool Any(this IEnumerable enumeration) - { - foreach (var _ in enumeration) - { - return true; - } - - return false; - } - } -} diff --git a/src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj b/src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj index f34d24215..6728f7d77 100644 --- a/src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj +++ b/src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj @@ -42,4 +42,8 @@ + + + + \ No newline at end of file diff --git a/src/NUnitEngine/nunit.engine.tests/Services/RuntimeFrameworkServiceTests.cs b/src/NUnitEngine/nunit.engine.tests/Services/RuntimeFrameworkServiceTests.cs index 6d3c72ea5..d131804d3 100644 --- a/src/NUnitEngine/nunit.engine.tests/Services/RuntimeFrameworkServiceTests.cs +++ b/src/NUnitEngine/nunit.engine.tests/Services/RuntimeFrameworkServiceTests.cs @@ -126,8 +126,8 @@ public void AvailableFrameworksList_ContainsNoDuplicates() public void EngineOptionPreferredOverImageTarget(string framework, int majorVersion, int minorVersion, string requested) { var package = new TestPackage("test"); - package.AddSetting(InternalEnginePackageSettings.ImageTargetFrameworkName, framework); - package.AddSetting(InternalEnginePackageSettings.ImageRuntimeVersion, new Version(majorVersion, minorVersion)); + package.AddSetting(EnginePackageSettings.ImageTargetFrameworkName, framework); + package.AddSetting(EnginePackageSettings.ImageRuntimeVersion, new Version(majorVersion, minorVersion)); package.AddSetting(EnginePackageSettings.RequestedRuntimeFramework, requested); _runtimeService.SelectRuntimeFramework(package); @@ -146,9 +146,9 @@ public void RuntimeFrameworkIsSetForSubpackages() var topLevelPackage = new TestPackage(new [] {"a.dll", "b.dll"}); var net20Package = topLevelPackage.SubPackages[0]; - net20Package.Settings.Add(InternalEnginePackageSettings.ImageRuntimeVersion, new Version("2.0")); + net20Package.Settings.Add(EnginePackageSettings.ImageRuntimeVersion, new Version("2.0")); var net40Package = topLevelPackage.SubPackages[1]; - net40Package.Settings.Add(InternalEnginePackageSettings.ImageRuntimeVersion, new Version("4.0")); + net40Package.Settings.Add(EnginePackageSettings.ImageRuntimeVersion, new Version("4.0")); _runtimeService.SelectRuntimeFramework(topLevelPackage); diff --git a/src/NUnitEngine/nunit.engine/Communication/Transports/Remoting/TestAgencyRemotingTransport.cs b/src/NUnitEngine/nunit.engine/Communication/Transports/Remoting/TestAgencyRemotingTransport.cs index b13439044..6672a0593 100644 --- a/src/NUnitEngine/nunit.engine/Communication/Transports/Remoting/TestAgencyRemotingTransport.cs +++ b/src/NUnitEngine/nunit.engine/Communication/Transports/Remoting/TestAgencyRemotingTransport.cs @@ -9,7 +9,6 @@ using System.Runtime.Remoting; using System.Runtime.Remoting.Channels; using System.Runtime.Remoting.Channels.Tcp; -using NUnit.Engine.Internal; using NUnit.Engine.Services; namespace NUnit.Engine.Communication.Transports.Remoting diff --git a/src/NUnitEngine/nunit.engine/Communication/Transports/Tcp/TcpServer.cs b/src/NUnitEngine/nunit.engine/Communication/Transports/Tcp/TcpServer.cs index 03cb770d9..bc42ec5e8 100644 --- a/src/NUnitEngine/nunit.engine/Communication/Transports/Tcp/TcpServer.cs +++ b/src/NUnitEngine/nunit.engine/Communication/Transports/Tcp/TcpServer.cs @@ -4,7 +4,6 @@ using System.Net; using System.Net.Sockets; using System.Threading; -using NUnit.Engine.Internal; namespace NUnit.Engine.Communication.Transports.Tcp { diff --git a/src/NUnitEngine/nunit.engine/Runners/AggregatingTestRunner.cs b/src/NUnitEngine/nunit.engine/Runners/AggregatingTestRunner.cs index 1924d9b9b..b9c0e06e8 100644 --- a/src/NUnitEngine/nunit.engine/Runners/AggregatingTestRunner.cs +++ b/src/NUnitEngine/nunit.engine/Runners/AggregatingTestRunner.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; -using NUnit.Engine.Internal; namespace NUnit.Engine.Runners { diff --git a/src/NUnitEngine/nunit.engine/Runners/MasterTestRunner.cs b/src/NUnitEngine/nunit.engine/Runners/MasterTestRunner.cs index 48743493f..39b9d01bd 100644 --- a/src/NUnitEngine/nunit.engine/Runners/MasterTestRunner.cs +++ b/src/NUnitEngine/nunit.engine/Runners/MasterTestRunner.cs @@ -6,7 +6,6 @@ using System.IO; using System.Reflection; using System.Xml; -using NUnit.Engine.Internal; using NUnit.Engine.Services; using System.ComponentModel; diff --git a/src/NUnitEngine/nunit.engine/Runners/MultipleTestProcessRunner.cs b/src/NUnitEngine/nunit.engine/Runners/MultipleTestProcessRunner.cs index 40e17bf37..53337aa3f 100644 --- a/src/NUnitEngine/nunit.engine/Runners/MultipleTestProcessRunner.cs +++ b/src/NUnitEngine/nunit.engine/Runners/MultipleTestProcessRunner.cs @@ -2,7 +2,6 @@ #if NETFRAMEWORK using System; -using NUnit.Engine.Internal; namespace NUnit.Engine.Runners { diff --git a/src/NUnitEngine/nunit.engine/Runners/ProcessRunner.cs b/src/NUnitEngine/nunit.engine/Runners/ProcessRunner.cs index 3a6f47cf5..1261a0b88 100644 --- a/src/NUnitEngine/nunit.engine/Runners/ProcessRunner.cs +++ b/src/NUnitEngine/nunit.engine/Runners/ProcessRunner.cs @@ -4,7 +4,6 @@ using System; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using NUnit.Engine.Internal; using NUnit.Engine.Services; namespace NUnit.Engine.Runners diff --git a/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs b/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs index f15504eaf..b7d6dce45 100644 --- a/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs +++ b/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs @@ -5,7 +5,6 @@ using System.Diagnostics; using System.IO; using System.Text; -using NUnit.Engine.Internal; namespace NUnit.Engine.Services { diff --git a/src/NUnitEngine/nunit.engine/Services/ResultWriters/NUnit3XmlResultWriter.cs b/src/NUnitEngine/nunit.engine/Services/ResultWriters/NUnit3XmlResultWriter.cs index 72d8c3345..693f87655 100644 --- a/src/NUnitEngine/nunit.engine/Services/ResultWriters/NUnit3XmlResultWriter.cs +++ b/src/NUnitEngine/nunit.engine/Services/ResultWriters/NUnit3XmlResultWriter.cs @@ -8,8 +8,6 @@ namespace NUnit.Engine.Services { - using Internal; - /// /// NUnit3XmlResultWriter is responsible for writing the results /// of a test to a file in NUnit 3 format. diff --git a/src/NUnitEngine/nunit.engine/Services/RuntimeFrameworkService.cs b/src/NUnitEngine/nunit.engine/Services/RuntimeFrameworkService.cs index aabbc284e..d87e12b13 100644 --- a/src/NUnitEngine/nunit.engine/Services/RuntimeFrameworkService.cs +++ b/src/NUnitEngine/nunit.engine/Services/RuntimeFrameworkService.cs @@ -8,7 +8,6 @@ using System.Reflection; using System.Runtime.Versioning; using Microsoft.Win32; -using NUnit.Engine.Internal; using NUnit.Engine.Services.RuntimeLocators; using TestCentric.Metadata; @@ -151,7 +150,7 @@ private RuntimeFramework SelectRuntimeFrameworkInner(TestPackage package) log.Debug($"No specific framework requested for {package.Name}"); - string imageTargetFrameworkNameSetting = package.GetSetting(InternalEnginePackageSettings.ImageTargetFrameworkName, ""); + string imageTargetFrameworkNameSetting = package.GetSetting(EnginePackageSettings.ImageTargetFrameworkName, ""); Runtime targetRuntime; Version targetVersion; @@ -159,7 +158,7 @@ private RuntimeFramework SelectRuntimeFrameworkInner(TestPackage package) { // Assume .NET Framework targetRuntime = Runtime.Net; - var trialVersion = package.GetSetting(InternalEnginePackageSettings.ImageRuntimeVersion, new Version(2, 0)); + var trialVersion = package.GetSetting(EnginePackageSettings.ImageRuntimeVersion, new Version(2, 0)); targetVersion = new Version(trialVersion.Major, trialVersion.Minor); } else @@ -358,12 +357,12 @@ private static void ApplyImageData(TestPackage package) ApplyImageData(subPackage); // Collect the highest version required - Version v = subPackage.GetSetting(InternalEnginePackageSettings.ImageRuntimeVersion, new Version(0, 0)); + Version v = subPackage.GetSetting(EnginePackageSettings.ImageRuntimeVersion, new Version(0, 0)); if (v > targetVersion) targetVersion = v; // Collect highest framework name // TODO: This assumes lexical ordering is valid - check it - string fn = subPackage.GetSetting(InternalEnginePackageSettings.ImageTargetFrameworkName, ""); + string fn = subPackage.GetSetting(EnginePackageSettings.ImageTargetFrameworkName, ""); if (fn != "") { if (frameworkName == null || fn.CompareTo(frameworkName) < 0) @@ -371,10 +370,10 @@ private static void ApplyImageData(TestPackage package) } // If any assembly requires X86, then the aggregate package requires it - if (subPackage.GetSetting(InternalEnginePackageSettings.ImageRequiresX86, false)) + if (subPackage.GetSetting(EnginePackageSettings.ImageRequiresX86, false)) requiresX86 = true; - if (subPackage.GetSetting(InternalEnginePackageSettings.ImageRequiresDefaultAppDomainAssemblyResolver, false)) + if (subPackage.GetSetting(EnginePackageSettings.ImageRequiresDefaultAppDomainAssemblyResolver, false)) requiresAssemblyResolver = true; } } @@ -415,16 +414,16 @@ private static void ApplyImageData(TestPackage package) } if (targetVersion.Major > 0) - package.Settings[InternalEnginePackageSettings.ImageRuntimeVersion] = targetVersion; + package.Settings[EnginePackageSettings.ImageRuntimeVersion] = targetVersion; if (!string.IsNullOrEmpty(frameworkName)) - package.Settings[InternalEnginePackageSettings.ImageTargetFrameworkName] = frameworkName; + package.Settings[EnginePackageSettings.ImageTargetFrameworkName] = frameworkName; - package.Settings[InternalEnginePackageSettings.ImageRequiresX86] = requiresX86; + package.Settings[EnginePackageSettings.ImageRequiresX86] = requiresX86; if (requiresX86) package.Settings[EnginePackageSettings.RunAsX86] = true; - package.Settings[InternalEnginePackageSettings.ImageRequiresDefaultAppDomainAssemblyResolver] = requiresAssemblyResolver; + package.Settings[EnginePackageSettings.ImageRequiresDefaultAppDomainAssemblyResolver] = requiresAssemblyResolver; } } } diff --git a/src/NUnitEngine/nunit.engine/Services/ServiceManager.cs b/src/NUnitEngine/nunit.engine/Services/ServiceManager.cs index 547d458da..98f08fa93 100644 --- a/src/NUnitEngine/nunit.engine/Services/ServiceManager.cs +++ b/src/NUnitEngine/nunit.engine/Services/ServiceManager.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using System.Reflection; -using NUnit.Engine.Internal; namespace NUnit.Engine.Services { diff --git a/src/NUnitEngine/nunit.engine/Services/TestAgency.cs b/src/NUnitEngine/nunit.engine/Services/TestAgency.cs index ac167fd96..4797e2625 100644 --- a/src/NUnitEngine/nunit.engine/Services/TestAgency.cs +++ b/src/NUnitEngine/nunit.engine/Services/TestAgency.cs @@ -4,7 +4,6 @@ using System; using System.Threading; using System.Diagnostics; -using NUnit.Engine.Internal; using NUnit.Engine.Communication.Transports.Remoting; using NUnit.Engine.Communication.Transports.Tcp; using System.Diagnostics.CodeAnalysis; diff --git a/src/NUnitEngine/nunit.engine/Services/TestRunnerFactory.cs b/src/NUnitEngine/nunit.engine/Services/TestRunnerFactory.cs index 6a0790453..cab119e1a 100644 --- a/src/NUnitEngine/nunit.engine/Services/TestRunnerFactory.cs +++ b/src/NUnitEngine/nunit.engine/Services/TestRunnerFactory.cs @@ -2,7 +2,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using NUnit.Engine.Internal; using NUnit.Engine.Runners; namespace NUnit.Engine.Services @@ -68,7 +67,7 @@ public ITestEngineRunner MakeTestRunner(TestPackage package) } } #else - if (package.GetSetting(InternalEnginePackageSettings.ImageTargetFrameworkName, "").StartsWith("Unmanaged,")) + if (package.GetSetting(EnginePackageSettings.ImageTargetFrameworkName, "").StartsWith("Unmanaged,")) return new UnmanagedExecutableTestRunner(package.FullName ?? "Package Suite"); bool isNested = false; diff --git a/src/NUnitEngine/nunit.engine/TestEngine.cs b/src/NUnitEngine/nunit.engine/TestEngine.cs index 883379b95..bb1b34103 100644 --- a/src/NUnitEngine/nunit.engine/TestEngine.cs +++ b/src/NUnitEngine/nunit.engine/TestEngine.cs @@ -5,7 +5,6 @@ using System.IO; using System.Reflection; using System.Runtime.InteropServices; -using NUnit.Engine.Internal; using NUnit.Engine.Services; namespace NUnit.Engine diff --git a/src/NUnitEngine/nunit.engine/nunit.engine.csproj b/src/NUnitEngine/nunit.engine/nunit.engine.csproj index 17eef11eb..7ceaca731 100644 --- a/src/NUnitEngine/nunit.engine/nunit.engine.csproj +++ b/src/NUnitEngine/nunit.engine/nunit.engine.csproj @@ -21,9 +21,10 @@ + + - \ No newline at end of file