diff --git a/NUnitConsole.sln b/NUnitConsole.sln index a06ff2cbd..ba6dec794 100644 --- a/NUnitConsole.sln +++ b/NUnitConsole.sln @@ -88,8 +88,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated", nuget\deprecated\nunit.runners.nuspec = nuget\deprecated\nunit.runners.nuspec EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.core", "src\NUnitEngine\nunit.engine.core\nunit.engine.core.csproj", "{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mock-assembly-x86", "src\TestData\mock-assembly-x86\mock-assembly-x86.csproj", "{9D3015EE-5B84-41B3-A1D3-1A439370C392}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated", "{068F6CA9-6108-4F45-8540-351AA5227259}" @@ -97,8 +95,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated", choco\deprecated\nunit-console-with-extensions.nuspec = choco\deprecated\nunit-console-with-extensions.nuspec EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.core.tests", "src\NUnitEngine\nunit.engine.core.tests\nunit.engine.core.tests.csproj", "{CACC0520-B452-4310-A33C-DC944129ACDD}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestData", "TestData", "{37D508B2-91E0-4B32-869B-DFF9E68EA213}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "agents", "agents", "{1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}" @@ -161,9 +157,9 @@ 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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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 @@ -191,18 +187,10 @@ Global {B1D90742-39BD-429C-8E87-C5CD2991DF27}.Debug|Any CPU.Build.0 = Debug|Any CPU {B1D90742-39BD-429C-8E87-C5CD2991DF27}.Release|Any CPU.ActiveCfg = Release|Any CPU {B1D90742-39BD-429C-8E87-C5CD2991DF27}.Release|Any CPU.Build.0 = Release|Any CPU - {A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Release|Any CPU.Build.0 = Release|Any CPU {9D3015EE-5B84-41B3-A1D3-1A439370C392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9D3015EE-5B84-41B3-A1D3-1A439370C392}.Debug|Any CPU.Build.0 = Debug|Any CPU {9D3015EE-5B84-41B3-A1D3-1A439370C392}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D3015EE-5B84-41B3-A1D3-1A439370C392}.Release|Any CPU.Build.0 = Release|Any CPU - {CACC0520-B452-4310-A33C-DC944129ACDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CACC0520-B452-4310-A33C-DC944129ACDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CACC0520-B452-4310-A33C-DC944129ACDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CACC0520-B452-4310-A33C-DC944129ACDD}.Release|Any CPU.Build.0 = Release|Any CPU {E4041712-A1F1-479D-A7F7-89F491066163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E4041712-A1F1-479D-A7F7-89F491066163}.Debug|Any CPU.Build.0 = Debug|Any CPU {E4041712-A1F1-479D-A7F7-89F491066163}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -314,10 +302,8 @@ Global {B1D90742-39BD-429C-8E87-C5CD2991DF27} = {37D508B2-91E0-4B32-869B-DFF9E68EA213} {4FDF7BFA-A337-41D3-898D-C6A98278E6AD} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF} {9A7C8370-ED1F-486F-A8F5-C5BF4221464E} = {A972031D-2F61-4183-AF75-99EE1A9F6B32} - {A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39} {9D3015EE-5B84-41B3-A1D3-1A439370C392} = {37D508B2-91E0-4B32-869B-DFF9E68EA213} {068F6CA9-6108-4F45-8540-351AA5227259} = {4FDF7BFA-A337-41D3-898D-C6A98278E6AD} - {CACC0520-B452-4310-A33C-DC944129ACDD} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39} {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39} {E4041712-A1F1-479D-A7F7-89F491066163} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54} {D4AE483A-D4E1-4892-AF87-3607FBA8755F} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54} diff --git a/build.cake b/build.cake index 6b112ee95..3c214f488 100644 --- a/build.cake +++ b/build.cake @@ -34,7 +34,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { checks: new PackageCheck[] { HasFiles("LICENSE.txt", "NOTICES.txt"), HasDirectory("tools").WithFiles( - "nunit-console.exe", "nunit-console.exe.config", "nunit.engine.dll", "nunit.engine.core.dll", + "nunit-console.exe", "nunit-console.exe.config", "nunit.engine.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"), HasDirectory("tools/agents/net462").WithFiles( @@ -48,7 +48,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { }, symbols: new PackageCheck[] { HasDirectory("tools").WithFiles( - "nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb", + "nunit.engine.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb", "nunit.common.pdb", "nunit.engine.api.pdb", "nunit-console.pdb"), HasDirectory("tools/agents/net462").WithFiles( "nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.agent.core.pdb", @@ -75,7 +75,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { HasFiles("nunit.exe"), HasDirectory(".store/nunit.consolerunner.netcore/**/tools/net8.0/any").WithFiles( "nunit-netcore-console.dll", "nunit-netcore-console.dll.config", - "nunit.engine.dll", "nunit.engine.core.dll", "nunit.agent.core.dll", "nunit.extensibility.dll", + "nunit.engine.dll", "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll") }, @@ -89,7 +89,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { checks: new PackageCheck[] { HasDirectory("tools").WithFiles( "LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit-console.exe", "nunit-console.exe.config", - "nunit.engine.dll", "nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", + "nunit.engine.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"), HasDirectory("tools/agents/net462").WithFiles( "nunit-agent-net462.exe", "nunit-agent-net462.exe.config", "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config", @@ -110,10 +110,10 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { checks: new PackageCheck[] { HasFiles("LICENSE.txt", "NOTICES.txt"), HasDirectory("lib/net462").WithFiles( - "nunit.engine.dll", "nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", + "nunit.engine.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"), HasDirectory("lib/net8.0").WithFiles( - "nunit.engine.dll", "nunit.engine.core.dll", "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", + "nunit.engine.dll", "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll"), HasDirectory("agents/net462").WithFiles( "nunit-agent-net462.exe", "nunit-agent-net462.exe.config", @@ -126,10 +126,10 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") }, symbols: new PackageCheck[] { HasDirectory("lib/net462").WithFiles( - "nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", + "nunit.engine.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb", "nunit.engine.api.pdb"), HasDirectory("lib/net8.0").WithFiles( - "nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb", + "nunit.engine.pdb","nunit.extensibility.pdb", "nunit.extensibility.api.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"), HasDirectory("contentFiles/any/agents/net462").WithFiles( "nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", diff --git a/choco/nunit-console-runner.nuspec b/choco/nunit-console-runner.nuspec index 9fa3c879a..cfaaf2186 100644 --- a/choco/nunit-console-runner.nuspec +++ b/choco/nunit-console-runner.nuspec @@ -35,7 +35,6 @@ - diff --git a/nuget/engine/nunit.engine.nuspec b/nuget/engine/nunit.engine.nuspec index 79555d26d..16fe2b0c0 100644 --- a/nuget/engine/nunit.engine.nuspec +++ b/nuget/engine/nunit.engine.nuspec @@ -37,8 +37,6 @@ - - @@ -52,8 +50,6 @@ - - diff --git a/nuget/runners/nunit.console-runner.netcore.nuspec b/nuget/runners/nunit.console-runner.netcore.nuspec index 206bff61f..d5218e031 100644 --- a/nuget/runners/nunit.console-runner.netcore.nuspec +++ b/nuget/runners/nunit.console-runner.netcore.nuspec @@ -35,8 +35,6 @@ - - diff --git a/nuget/runners/nunit.console-runner.nuspec b/nuget/runners/nunit.console-runner.nuspec index 1b4404848..73f12e50e 100644 --- a/nuget/runners/nunit.console-runner.nuspec +++ b/nuget/runners/nunit.console-runner.nuspec @@ -71,8 +71,6 @@ - - diff --git a/src/NUnitEngine/nunit.engine.core.tests/Internal/AssemblyHelperTests.cs b/src/NUnitCommon/nunit.common.tests/AssemblyHelperTests.cs similarity index 93% rename from src/NUnitEngine/nunit.engine.core.tests/Internal/AssemblyHelperTests.cs rename to src/NUnitCommon/nunit.common.tests/AssemblyHelperTests.cs index 8afbf20bb..f8fde00f0 100644 --- a/src/NUnitEngine/nunit.engine.core.tests/Internal/AssemblyHelperTests.cs +++ b/src/NUnitCommon/nunit.common.tests/AssemblyHelperTests.cs @@ -9,16 +9,16 @@ namespace NUnit.Engine.Internal public class AssemblyHelperTests { #if NETFRAMEWORK - private static readonly string THIS_ASSEMBLY_PATH = "nunit.engine.core.tests.exe"; + private static readonly string THIS_ASSEMBLY_FILENAME = "nunit.common.tests.exe"; #else - private static readonly string THIS_ASSEMBLY_PATH = "nunit.engine.core.tests.dll"; + private static readonly string THIS_ASSEMBLY_FILENAME = "nunit.common.tests.dll"; #endif [Test] public void GetPathForAssembly() { string path = AssemblyHelper.GetAssemblyPath(this.GetType().Assembly); - Assert.That(Path.GetFileName(path), Is.EqualTo(THIS_ASSEMBLY_PATH).IgnoreCase); + Assert.That(Path.GetFileName(path), Is.EqualTo(THIS_ASSEMBLY_FILENAME).IgnoreCase); Assert.That(File.Exists(path)); } diff --git a/src/NUnitEngine/nunit.engine.core.tests/Internal/DirectoryFinderTests.cs b/src/NUnitCommon/nunit.common.tests/FileSystemAccess/DirectoryFinderTests.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core.tests/Internal/DirectoryFinderTests.cs rename to src/NUnitCommon/nunit.common.tests/FileSystemAccess/DirectoryFinderTests.cs diff --git a/src/NUnitCommon/nunit.common.tests/FileSystemAccess/Default/DirectoryTests.cs b/src/NUnitCommon/nunit.common.tests/FileSystemAccess/DirectoryTests.cs similarity index 100% rename from src/NUnitCommon/nunit.common.tests/FileSystemAccess/Default/DirectoryTests.cs rename to src/NUnitCommon/nunit.common.tests/FileSystemAccess/DirectoryTests.cs diff --git a/src/NUnitCommon/nunit.common.tests/FileSystemAccess/Default/DirectoryTests2.cs b/src/NUnitCommon/nunit.common.tests/FileSystemAccess/DirectoryTests2.cs similarity index 100% rename from src/NUnitCommon/nunit.common.tests/FileSystemAccess/Default/DirectoryTests2.cs rename to src/NUnitCommon/nunit.common.tests/FileSystemAccess/DirectoryTests2.cs diff --git a/src/NUnitCommon/nunit.common.tests/FileSystemAccess/Default/FileSystemTests.cs b/src/NUnitCommon/nunit.common.tests/FileSystemAccess/FileSystemTests.cs similarity index 100% rename from src/NUnitCommon/nunit.common.tests/FileSystemAccess/Default/FileSystemTests.cs rename to src/NUnitCommon/nunit.common.tests/FileSystemAccess/FileSystemTests.cs diff --git a/src/NUnitCommon/nunit.common.tests/FileSystemAccess/Default/FileTests.cs b/src/NUnitCommon/nunit.common.tests/FileSystemAccess/FileTests.cs similarity index 100% rename from src/NUnitCommon/nunit.common.tests/FileSystemAccess/Default/FileTests.cs rename to src/NUnitCommon/nunit.common.tests/FileSystemAccess/FileTests.cs diff --git a/src/NUnitEngine/nunit.engine.core.tests/Helpers/On.cs b/src/NUnitCommon/nunit.common.tests/On.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core.tests/Helpers/On.cs rename to src/NUnitCommon/nunit.common.tests/On.cs diff --git a/src/NUnitEngine/nunit.engine.core.tests/Internal/PathUtilTests.cs b/src/NUnitCommon/nunit.common.tests/PathUtilTests.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core.tests/Internal/PathUtilTests.cs rename to src/NUnitCommon/nunit.common.tests/PathUtilTests.cs diff --git a/src/NUnitEngine/nunit.engine.core.tests/Internal/ProcessUtilsTests.cs b/src/NUnitCommon/nunit.common.tests/ProcessUtilsTests.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core.tests/Internal/ProcessUtilsTests.cs rename to src/NUnitCommon/nunit.common.tests/ProcessUtilsTests.cs diff --git a/src/NUnitEngine/nunit.engine.core.tests/ResultHelperTests.cs b/src/NUnitCommon/nunit.common.tests/ResultHelperTests.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core.tests/ResultHelperTests.cs rename to src/NUnitCommon/nunit.common.tests/ResultHelperTests.cs diff --git a/src/NUnitEngine/nunit.engine.core.tests/Internal/TcpChannelUtilsTests.cs b/src/NUnitCommon/nunit.common.tests/TcpChannelUtilsTests.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core.tests/Internal/TcpChannelUtilsTests.cs rename to src/NUnitCommon/nunit.common.tests/TcpChannelUtilsTests.cs diff --git a/src/NUnitCommon/nunit.common.tests/nunit.common.tests.csproj b/src/NUnitCommon/nunit.common.tests/nunit.common.tests.csproj index 3f8a2b540..6baa2f9b6 100644 --- a/src/NUnitCommon/nunit.common.tests/nunit.common.tests.csproj +++ b/src/NUnitCommon/nunit.common.tests/nunit.common.tests.csproj @@ -12,9 +12,14 @@ + + + + + diff --git a/src/NUnitCommon/nunit.extensibility.tests/ExtensionManagerTests.cs b/src/NUnitCommon/nunit.extensibility.tests/ExtensionManagerTests.cs index e8a7e5d31..bf82fc694 100644 --- a/src/NUnitCommon/nunit.extensibility.tests/ExtensionManagerTests.cs +++ b/src/NUnitCommon/nunit.extensibility.tests/ExtensionManagerTests.cs @@ -153,11 +153,11 @@ public void SkipsGracefullyLoadingOtherFrameworkExtensionAssembly() Assume.That(Assembly.GetEntryAssembly(), Is.Not.Null, "Entry assembly is null, framework loading validation will be skipped."); #if NETCOREAPP - // Attempt to load the .NET 3.5 version of the extensions from the .NET Core 2.0 tests - var assemblyName = Path.Combine(GetSiblingDirectory("net462"), "nunit.engine.core.tests.exe"); + // Attempt to load the .NET 4.6.2 version of the extensions from the .NET 8.0 tests + var assemblyName = Path.Combine(GetSiblingDirectory("net462"), "nunit.extensibility.tests.exe"); #else - // Attempt to load the .NET Core 3.1 version of the extensions from the .NET 3.5 tests - var assemblyName = Path.Combine(GetSiblingDirectory("netcoreapp3.1"), "nunit.engine.core.tests.dll"); + // Attempt to load the .NET 8.0 version of the extensions from the .NET 4.6.2 tests + var assemblyName = Path.Combine(GetSiblingDirectory("net8.0"), "nunit.extensibility.tests.dll"); #endif Assert.That(assemblyName, Does.Exist); Console.WriteLine($"{assemblyName} does exist"); diff --git a/src/NUnitEngine/nunit.engine.core.tests/App.config b/src/NUnitEngine/nunit.engine.core.tests/App.config deleted file mode 100644 index 1f86e4c2b..000000000 --- a/src/NUnitEngine/nunit.engine.core.tests/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/NUnitEngine/nunit.engine.core.tests/Program.cs b/src/NUnitEngine/nunit.engine.core.tests/Program.cs deleted file mode 100644 index 5bd3e43a5..000000000 --- a/src/NUnitEngine/nunit.engine.core.tests/Program.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt - -using System.Reflection; -using NUnitLite; - -namespace NUnit.Engine.Tests -{ - class Program - { - static int Main(string[] args) - { - return new TextRunner(typeof(Program).Assembly).Execute(args); - } - } -} diff --git a/src/NUnitEngine/nunit.engine.core.tests/alt.config b/src/NUnitEngine/nunit.engine.core.tests/alt.config deleted file mode 100644 index 682d5c095..000000000 --- a/src/NUnitEngine/nunit.engine.core.tests/alt.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - 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 deleted file mode 100644 index 1b95fbf44..000000000 --- a/src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj +++ /dev/null @@ -1,63 +0,0 @@ - - - - NUnit.Engine - net462;netcoreapp3.1;net6.0;net8.0 - Exe - - - - NUnit Engine Core Tests ($(TargetFramework)) - Tests of nunit.engine.core assembly - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - - - - - - - - - \ No newline at end of file diff --git a/src/NUnitEngine/nunit.engine.core/InternalEnginePackageSettings.cs b/src/NUnitEngine/nunit.engine.core/InternalEnginePackageSettings.cs deleted file mode 100644 index 3ace49896..000000000 --- a/src/NUnitEngine/nunit.engine.core/InternalEnginePackageSettings.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt - -namespace NUnit.Engine -{ - /// - /// InternalEngineSettings contains constant values that - /// are used as keys in setting up a TestPackage. - /// Values here are set/used internally within the engine. - /// Setting values may be a string, int or bool. - /// - public static class InternalEnginePackageSettings - { - /// - /// 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/nunit.engine.core.csproj b/src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj deleted file mode 100644 index 6728f7d77..000000000 --- a/src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj +++ /dev/null @@ -1,49 +0,0 @@ - - - - NUnit.Engine - net462;netcoreapp3.1;net6.0;net8.0 - - $(NoWarn);SYSLIB0011 - - - - - - - - - NUnit Engine Core - Common code used by both the engine and agents - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NUnitEngine/nunit.engine.core.tests/AppContextTest.cs b/src/NUnitEngine/nunit.engine.tests/AppContextTest.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core.tests/AppContextTest.cs rename to src/NUnitEngine/nunit.engine.tests/AppContextTest.cs diff --git a/src/NUnitEngine/nunit.engine.core.tests/AsyncTestEngineResultTests.cs b/src/NUnitEngine/nunit.engine.tests/AsyncTestEngineResultTests.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core.tests/AsyncTestEngineResultTests.cs rename to src/NUnitEngine/nunit.engine.tests/AsyncTestEngineResultTests.cs diff --git a/src/NUnitEngine/nunit.engine.core.tests/TestEngineResultTests.cs b/src/NUnitEngine/nunit.engine.tests/TestEngineResultTests.cs similarity index 100% rename from src/NUnitEngine/nunit.engine.core.tests/TestEngineResultTests.cs rename to src/NUnitEngine/nunit.engine.tests/TestEngineResultTests.cs