Skip to content

Remove NUnit.Agent.Core from this repo and use a reference #1859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CharliePoole merged 3 commits into from
Aug 5, 2026
Merged

Remove NUnit.Agent.Core from this repo and use a reference #1859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96bf9df
Remove NUnit.Agent.Core from this repo and use a reference
CharliePoole Aug 4, 2026
a87909b
Merge branch 'main' into issue-1848
CharliePoole Aug 4, 2026
c663171
Remove nunit.agent.core from this project and reference it as a package
CharliePoole Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions NUnitConsole.sln
View file
Open in desktop

@manfred-brands manfred-brands Aug 5, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be much simpler if migrating to .slnx file.
There is a dotnet sln migrate command for it.

Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,6 @@ 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.agent.core", "src\NUnitCommon\nunit.agent.core\nunit.agent.core.csproj", "{4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA}"
EndProject
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
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DirectTestAgent", "src\NUnitCommon\DirectTestAgent\DirectTestAgent.csproj", "{0E415863-1621-41DB-9DB0-36B5664DFF35}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakeExtensions", "src\TestData\FakeExtensions\2.0\FakeExtensions.csproj", "{E3A8037B-83EF-CB79-3EED-492C89F47BF9}"
EndProject
Global
Expand Down Expand Up @@ -251,18 +245,6 @@ 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
{0E415863-1621-41DB-9DB0-36B5664DFF35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E415863-1621-41DB-9DB0-36B5664DFF35}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E415863-1621-41DB-9DB0-36B5664DFF35}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0E415863-1621-41DB-9DB0-36B5664DFF35}.Release|Any CPU.Build.0 = Release|Any CPU
{E3A8037B-83EF-CB79-3EED-492C89F47BF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E3A8037B-83EF-CB79-3EED-492C89F47BF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E3A8037B-83EF-CB79-3EED-492C89F47BF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -304,9 +286,6 @@ Global
{B22FEE5B-83D4-4021-B066-1B958332D391} = {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}
{0E415863-1621-41DB-9DB0-36B5664DFF35} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
{E3A8037B-83EF-CB79-3EED-492C89F47BF9} = {37D508B2-91E0-4B32-869B-DFF9E68EA213}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
23 changes: 1 addition & 22 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Load the recipe
#load nuget:?package=NUnit.Cake.Recipe&version=2.0.0-beta.4.2
#load nuget:?package=NUnit.Cake.Recipe&version=2.0.0-beta.4.3
// Comment out above line and uncomment below for local tests of recipe changes
//#load ../NUnit.Cake.Recipe/src/NUnit.Cake.Recipe/content/*.cake

Expand Down Expand Up @@ -73,26 +73,6 @@ PackageDefinition NUnitExtensibilityPackage = new NuGetPackage(
HasDirectory("lib/netstandard2.0").WithFile("nunit.extensibility.pdb")
});

PackageDefinition NUnitAgentCorePackage = new NuGetPackage(
id: "NUnit.Agent.Core",
source: BuildSettings.SourceDirectory + "NUnitCommon/nunit.agent.core/nunit.agent.core.csproj",
checks: new PackageCheck[]
{
HasFiles("LICENSE.txt"),
HasDirectory("lib/net462").WithFile("nunit.agent.core.dll" ),
HasDirectory("lib/net8.0").WithFiles("nunit.agent.core.dll"),
HasDependency("NUnit.Engine.Api"),
HasDependency("NUnit.Common", THIS_VERSION),
HasDependency("TestCentric.Metadata", "3.0.4")
},
symbols: new PackageCheck[]
{
HasDirectory("lib/net462").WithFile("nunit.agent.core.pdb"),
HasDirectory("lib/net8.0").WithFile("nunit.agent.core.pdb")
},
testRunner: new DirectTestAgentRunner(),
tests: AgentCoreTests);

PackageDefinition NUnitEnginePackage = new NuGetPackage(
id: "NUnit.Engine",
source: BuildSettings.SourceDirectory + "NUnitEngine/nunit.engine/nunit.engine.csproj",
Expand Down Expand Up @@ -167,7 +147,6 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
NUnitExtensibilityApiPackage,
NUnitCommonPackage,
NUnitExtensibilityPackage,
NUnitAgentCorePackage,
NUnitEnginePackage,
NUnitConsoleRunnerDotNetToolPackage,
NUnitConsoleRunnerNuGetPackage,
Expand Down
14 changes: 0 additions & 14 deletions package-tests.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,6 @@ AddToBothLists(new PackageTest(1, "Net60Test")
ExpectedResult = new MockAssemblyExpectedResult("netcore-6.0")
});

AddToBothLists(new PackageTest(1, "NetCore31Test")
{
Description = "Run mock-assembly.dll under .NET Core 3.1",
Arguments = "testdata/netcoreapp3.1/mock-assembly.dll",
ExpectedResult = new MockAssemblyExpectedResult("netcore-3.1")
});

//////////////////////////////////////////////////////////////////////
// RUN MOCK-ASSEMBLY-X86 UNDER EACH RUNTIME
//////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -132,13 +125,6 @@ if (dotnetX86Available)
Arguments = "testdata/net7.0/mock-assembly-x86.dll",
ExpectedResult = new MockAssemblyX86ExpectedResult("netcore-7.0")
});

StandardRunnerTests.Add(new PackageTest(1, "NetCore31X86Test")
{
Description = "Run mock-assembly-x86.dll under .NET Core 3.1",
Arguments = "testdata/netcoreapp3.1/mock-assembly-x86.dll",
ExpectedResult = new MockAssemblyX86ExpectedResult("netcore-3.1")
});
}
}

Expand Down
15 changes: 9 additions & 6 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
<!-- Debugging -->
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
<!-- Commonly Used Package Versions -->
<AnnotatedReferenceAssemblyVersion>8.0.0</AnnotatedReferenceAssemblyVersion>
<EngineApiVersion>4.0.0-beta.4</EngineApiVersion>
<!-- Informational Settings -->
<Company>NUnit Software</Company>
<Product>NUnit 4 Runner and Engine</Product>
Expand All @@ -40,11 +37,17 @@
<NSubstituteVersion>2.0.3</NSubstituteVersion>
</PropertyGroup>

<!-- Default versions for targets not listed above -->
<!-- Default versions for NUnit and NSubstitute and other commonly used packages -->
<PropertyGroup>
<NUnitVersion Condition="'$(NUnitVersion)'==''">4.6.1</NUnitVersion>
<NSubstituteVersion Condition="'$(NSubstituteVersion)'==''">5.3.0</NSubstituteVersion>
<AnnotatedReferenceAssemblyVersion>8.0.0</AnnotatedReferenceAssemblyVersion>
<NUnitAgentCoreVersion>4.0.0-beta.4</NUnitAgentCoreVersion>
<NUnitAnalyzersVersion>4.14.0</NUnitAnalyzersVersion>
<NUnitCommonVersion>4.0.0-beta.2.3</NUnitCommonVersion>
<NUnitEngineApiVersion>4.0.0-beta.4</NUnitEngineApiVersion>
<NUnitExtensibilityVersion>4.0.0-beta.2.3</NUnitExtensibilityVersion>
<NUnitFrameworkVersion Condition="'$(NUnitFrameworkVersion)'==''">4.6.1</NUnitFrameworkVersion>
<NSubstituteVersion Condition="'$(NSubstituteVersion)'==''">5.3.0</NSubstituteVersion>
<TestCentricMetadataVersion>3.0.4</TestCentricMetadataVersion>
</PropertyGroup>

<!-- Common package metadata, may be overridden in individual projects -->
Expand Down
14 changes: 0 additions & 14 deletions src/NUnitCommon/DirectTestAgent/DirectTestAgent.cs
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions src/NUnitCommon/DirectTestAgent/DirectTestAgent.csproj
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions src/NUnitCommon/nunit.agent.core.tests/AgentDirectRunnerTests.cs
View file
Open in desktop

This file was deleted.

78 changes: 0 additions & 78 deletions src/NUnitCommon/nunit.agent.core.tests/AgentOptionTests.cs
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/NUnitCommon/nunit.agent.core.tests/App.config
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions src/NUnitCommon/nunit.agent.core.tests/Drivers/DriverServiceTests.cs
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions src/NUnitCommon/nunit.agent.core.tests/Drivers/NUnit3DriverFactoryTests.cs
View file
Open in desktop

This file was deleted.

Loading