Skip to content

Commit 7f19ef7

Browse files
CharliePooleCharliePoole
committed
Implement an algorithm to find extensions
1 parent 0ec572c commit 7f19ef7

17 files changed

+66
-130
lines changed

‎GitVersion.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
next-version: 3.18.0
1+
next-version: 3.19.0
22
mode: ContinuousDelivery
33
legacy-semver-padding: 5
44
build-metadata-padding: 5

‎NUnitConsole.sln

+1-9
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "choco", "choco", "{4FDF7BFA
7777
choco\nunit-agent-x86.exe.ignore = choco\nunit-agent-x86.exe.ignore
7878
choco\nunit-agent.exe.ignore = choco\nunit-agent.exe.ignore
7979
choco\nunit-console-runner.nuspec = choco\nunit-console-runner.nuspec
80-
choco\nunit.console.choco.addins = choco\nunit.console.choco.addins
81-
choco\nunit.console.choco.agent.addins = choco\nunit.console.choco.agent.addins
8280
choco\VERIFICATION.txt = choco\VERIFICATION.txt
8381
EndProjectSection
8482
EndProject
@@ -147,14 +145,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InvalidTestNames", "src\Tes
147145
EndProject
148146
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppContextTest", "src\TestData\AppContextTest\AppContextTest.csproj", "{E43A3E4B-B050-471B-B43C-0DF60FD44376}"
149147
EndProject
150-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net8.0", "net8.0", "{303CF83E-2A87-4882-8CAC-3EB59AAD81FC}"
151-
ProjectSection(SolutionItems) = preProject
152-
nuget\runners\net8.0\DotnetToolSettings.xml = nuget\runners\net8.0\DotnetToolSettings.xml
153-
EndProjectSection
154-
EndProject
155148
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mock-assembly-v2", "src\TestData\mock-assembly-v2\mock-assembly-v2.csproj", "{AD40CA55-35CC-41CA-85F5-8FDA4ECAFF78}"
156149
EndProject
157-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakeExtensions", "src\TestData\FakeExtensions\FakeExtensions.csproj", "{D6C217E0-BFB7-4C80-8D50-C969F46EBC59}"
150+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FakeExtensions", "src\TestData\FakeExtensions\FakeExtensions.csproj", "{D6C217E0-BFB7-4C80-8D50-C969F46EBC59}"
158151
EndProject
159152
Global
160153
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -276,7 +269,6 @@ Global
276269
{6B550F25-1CA5-4F3E-B631-1ECCD4CB94E4} = {2ECE1CFB-9436-4149-B7E4-1FB1786FDE9F}
277270
{58E18ACC-1F7E-4395-817E-E7EF943E0C77} = {2ECE1CFB-9436-4149-B7E4-1FB1786FDE9F}
278271
{E43A3E4B-B050-471B-B43C-0DF60FD44376} = {2ECE1CFB-9436-4149-B7E4-1FB1786FDE9F}
279-
{303CF83E-2A87-4882-8CAC-3EB59AAD81FC} = {F3E87D0F-6F06-4C0B-AE06-42C0834C3C6E}
280272
{AD40CA55-35CC-41CA-85F5-8FDA4ECAFF78} = {2ECE1CFB-9436-4149-B7E4-1FB1786FDE9F}
281273
{D6C217E0-BFB7-4C80-8D50-C969F46EBC59} = {2ECE1CFB-9436-4149-B7E4-1FB1786FDE9F}
282274
EndGlobalSection

‎build.cake

+20-16
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ BuildSettings.Initialize(
1919

2020
FilePath[] ConsoleFiles = {
2121
"nunit3-console.dll", "nunit3-console.dll.config", "nunit3-console.exe", "nunit3-console.pdb",
22-
"nunit3-console.deps.json", "nunit3-console.runtimeconfig.json", "nunit.console.nuget.addins" };
22+
"nunit3-console.deps.json", "nunit3-console.runtimeconfig.json" };
2323
FilePath[] ENGINE_FILES = {
2424
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.engine.metadata.dll" };
2525
FilePath[] ENGINE_PDB_FILES = {
@@ -61,12 +61,12 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
6161
source: BuildSettings.NuGetDirectory + "runners/nunit.console-runner.nuspec",
6262
checks: new PackageCheck[] {
6363
HasFiles("LICENSE.txt", "NOTICES.txt"),
64-
HasDirectory("tools").WithFiles("nunit3-console.exe", "nunit3-console.exe.config", "nunit.console.nuget.addins").AndFiles(ENGINE_FILES),
65-
HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES).AndFile("nunit.console.nuget.agent.addins"),
66-
HasDirectory("tools/agents/netcoreapp3.1").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.nuget.agent.addins"),
67-
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.nuget.agent.addins"),
68-
HasDirectory("tools/agents/net7.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.nuget.agent.addins"),
69-
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.nuget.agent.addins")
64+
HasDirectory("tools").WithFiles("nunit3-console.exe", "nunit3-console.exe.config").AndFiles(ENGINE_FILES),
65+
HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES),
66+
HasDirectory("tools/agents/netcoreapp3.1").WithFiles(AGENT_FILES_NETCORE),
67+
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE),
68+
HasDirectory("tools/agents/net7.0").WithFiles(AGENT_FILES_NETCORE),
69+
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE)
7070
},
7171
symbols: new PackageCheck[] {
7272
HasDirectory("tools").WithFiles(ENGINE_PDB_FILES).AndFile("nunit3-console.pdb"),
@@ -103,12 +103,12 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
103103
id: "nunit-console-runner",
104104
source: BuildSettings.ChocolateyDirectory + "nunit-console-runner.nuspec",
105105
checks: new PackageCheck[] {
106-
HasDirectory("tools").WithFiles("LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit3-console.exe", "nunit3-console.exe.config", "nunit.console.choco.addins").AndFiles(ENGINE_FILES),
107-
HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES).AndFile("nunit.console.choco.agent.addins"),
108-
HasDirectory("tools/agents/netcoreapp3.1").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.choco.agent.addins"),
109-
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.choco.agent.addins"),
110-
HasDirectory("tools/agents/net7.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.choco.agent.addins"),
111-
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.choco.agent.addins")
106+
HasDirectory("tools").WithFiles("LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit3-console.exe", "nunit3-console.exe.config").AndFiles(ENGINE_FILES),
107+
HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES),
108+
HasDirectory("tools/agents/netcoreapp3.1").WithFiles(AGENT_FILES_NETCORE),
109+
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE),
110+
HasDirectory("tools/agents/net7.0").WithFiles(AGENT_FILES_NETCORE),
111+
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE)
112112
},
113113
testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory
114114
+ $"nunit-console-runner.{BuildSettings.PackageVersion}/tools/nunit3-console.exe"),
@@ -151,9 +151,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
151151
HasFiles("LICENSE.txt", "NOTICES.txt"),
152152
HasDirectory("lib/net462").WithFiles(ENGINE_FILES),
153153
HasDirectory("lib/net8.0").WithFiles(ENGINE_FILES).AndFile("Microsoft.Extensions.DependencyModel.dll"),
154-
HasDirectory("contentFiles/any/lib/net462").WithFile("nunit.engine.nuget.addins"),
155-
HasDirectory("contentFiles/any/lib/net8.0").WithFile("nunit.engine.nuget.addins"),
156-
HasDirectory("contentFiles/any/agents/net462").WithFiles(AGENT_FILES).AndFile("nunit.agent.addins")
154+
HasDirectory("contentFiles/any/agents/net462").WithFiles(AGENT_FILES)
157155
},
158156
symbols: new PackageCheck[] {
159157
HasDirectory("lib/net462").WithFiles(ENGINE_PDB_FILES),
@@ -201,6 +199,12 @@ Task("TestZipPackage")
201199
NUnitConsoleZipPackage.RunPackageTests();
202200
});
203201

202+
Task("TestNetCorePackage")
203+
.Does(() =>
204+
{
205+
NUnitConsoleRunnerNetCorePackage.RunPackageTests();
206+
});
207+
204208
// Adhoc code to check content of a dotnet standalone executable
205209
// TODO: Incorporate this in the recipe itself
206210

‎nuget/engine/nunit.agent.addins

-1
This file was deleted.

‎nuget/engine/nunit.engine.nuget.addins

-4
This file was deleted.

‎nuget/engine/nunit.engine.nuspec

-6
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@
6666
<file src="agents/netcoreapp3.1/nunit.engine.api.pdb" target="contentFiles/any/agents/netcoreapp3.1" />
6767
<file src="agents/netcoreapp3.1/testcentric.engine.metadata.dll" target="contentFiles/any/agents/netcoreapp3.1" />
6868

69-
<file src="../../nuget/engine/nunit.engine.nuget.addins" target="contentFiles/any/lib/net462"/>
70-
<file src="../../nuget/engine/nunit.agent.addins" target="contentFiles/any/agents/net462"/>
71-
<file src="../../nuget/engine/nunit.agent.addins" target="contentFiles/any/agents/net40"/>
72-
<file src="../../nuget/engine/nunit.agent.addins" target="contentFiles/any/agents/netcoreapp3.1"/>
73-
7469
<file src="net8.0/nunit.engine.dll" target="lib/net8.0" />
7570
<file src="net8.0/nunit.engine.pdb" target="lib/net8.0" />
7671
<file src="net8.0/nunit.engine.core.dll" target="lib/net8.0" />
@@ -79,7 +74,6 @@
7974
<file src="net8.0/nunit.engine.api.pdb" target="lib/net8.0" />
8075
<file src="net8.0/testcentric.engine.metadata.dll" target="lib/net8.0" />
8176
<file src="net8.0/Microsoft.Extensions.DependencyModel.dll" target="lib/net8.0" />
82-
<file src="../../nuget/engine/nunit.engine.nuget.addins" target="contentFiles/any/lib/net8.0"/>
8377

8478
<file src="../../nuget/engine/build/**/*" target="build" />
8579
<file src="../../nunit_256.png" target="images" />

‎nuget/runners/net8.0/DotnetToolSettings.xml

-6
This file was deleted.

‎nuget/runners/nunit.console-runner.net80.nuspec

-53
This file was deleted.

‎nuget/runners/nunit.console-runner.netcore.nuspec

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<file src="net8.0/nunit.engine.api.xml" target="tools/net8.0/any" />
4646
<file src="net8.0/testcentric.engine.metadata.dll" target="tools/net8.0/any" />
4747
<file src="net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/net8.0/any" />
48-
<file src="../../nuget/runners/nunit.console.nuget.addins" target="tools/net8.0/any"/>
4948
<file src="../../nuget/runners/DotnetToolSettings.xml" target="tools/net8.0/any"/>
5049

5150
<file src="../../nunit_256.png" target="images"/>

‎nuget/runners/nunit.console-runner.nuspec

-6
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<file src="agents/net462/nunit.engine.core.dll" target="tools/agents/net462" />
4040
<file src="agents/net462/nunit.engine.core.pdb" target="tools/agents/net462" />
4141
<file src="agents/net462/testcentric.engine.metadata.dll" target="tools/agents/net462" />
42-
<file src="../../nuget/runners/nunit.console.nuget.agent.addins" target="tools/agents/net462"/>
4342

4443
<file src="agents/netcoreapp3.1/nunit-agent.dll" target="tools/agents/netcoreapp3.1" />
4544
<file src="agents/netcoreapp3.1/nunit-agent.pdb" target="tools/agents/netcoreapp3.1" />
@@ -53,7 +52,6 @@
5352
<file src="agents/netcoreapp3.1/nunit.engine.core.pdb" target="tools/agents/netcoreapp3.1" />
5453
<file src="agents/netcoreapp3.1/testcentric.engine.metadata.dll" target="tools/agents/netcoreapp3.1" />
5554
<file src="agents/netcoreapp3.1/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/netcoreapp3.1" />
56-
<file src="../../nuget/runners/nunit.console.nuget.agent.addins" target="tools/agents/netcoreapp3.1"/>
5755

5856
<file src="agents/net6.0/nunit-agent.dll" target="tools/agents/net6.0" />
5957
<file src="agents/net6.0/nunit-agent.pdb" target="tools/agents/net6.0" />
@@ -67,7 +65,6 @@
6765
<file src="agents/net6.0/nunit.engine.core.pdb" target="tools/agents/net6.0" />
6866
<file src="agents/net6.0/testcentric.engine.metadata.dll" target="tools/agents/net6.0" />
6967
<file src="agents/net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net6.0" />
70-
<file src="../../nuget/runners/nunit.console.nuget.agent.addins" target="tools/agents/net6.0"/>
7168

7269
<file src="agents/net7.0/nunit-agent.dll" target="tools/agents/net7.0" />
7370
<file src="agents/net7.0/nunit-agent.pdb" target="tools/agents/net7.0" />
@@ -81,7 +78,6 @@
8178
<file src="agents/net7.0/nunit.engine.core.pdb" target="tools/agents/net7.0" />
8279
<file src="agents/net7.0/testcentric.engine.metadata.dll" target="tools/agents/net7.0" />
8380
<file src="agents/net7.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net7.0" />
84-
<file src="../../nuget/runners/nunit.console.nuget.agent.addins" target="tools/agents/net7.0"/>
8581

8682
<file src="agents/net8.0/nunit-agent.dll" target="tools/agents/net8.0" />
8783
<file src="agents/net8.0/nunit-agent.pdb" target="tools/agents/net8.0" />
@@ -95,7 +91,6 @@
9591
<file src="agents/net8.0/nunit.engine.core.pdb" target="tools/agents/net8.0" />
9692
<file src="agents/net8.0/testcentric.engine.metadata.dll" target="tools/agents/net8.0" />
9793
<file src="agents/net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net8.0" />
98-
<file src="../../nuget/runners/nunit.console.nuget.agent.addins" target="tools/agents/net8.0"/>
9994

10095
<file src="net462/nunit3-console.exe" target="tools" />
10196
<file src="net462/nunit3-console.pdb" target="tools" />
@@ -108,7 +103,6 @@
108103
<file src="net462/nunit.engine.dll" target="tools" />
109104
<file src="net462/nunit.engine.pdb" target="tools" />
110105
<file src="net462/testcentric.engine.metadata.dll" target="tools" />
111-
<file src="../../nuget/runners/nunit.console.nuget.addins" target="tools"/>
112106
<file src="../../nunit_256.png" target="images"/>
113107
</files>
114108
</package>

‎nuget/runners/nunit.console.nuget.addins

-11
This file was deleted.

‎nuget/runners/nunit.console.nuget.agent.addins

-11
This file was deleted.

‎package-tests.cake

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ StandardRunnerTests.Add(new PackageTest(
210210
KnownExtensions.NUnitProjectLoader));
211211

212212
// V2 Result Writer Test
213-
StandardRunnerTests.Add(new PackageTest(
213+
AddToBothLists(new PackageTest(
214214
1, "V2ResultWriterTest",
215215
"Run mock-assembly under .NET 6.0 and produce V2 output",
216216
"testdata/net6.0/mock-assembly.dll --result=TestResult.xml --result=NUnit2TestResult.xml;format=nunit2",

‎src/NUnitEngine/nunit.engine.core.tests/Services/ExtensionManagerTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using NUnit.Engine.Internal.FileSystemAccess;
1313
using System.Diagnostics;
1414

15-
namespace NUnit.Engine.Services.Tests
15+
namespace NUnit.Engine.Services
1616
{
1717
public class ExtensionManagerTests
1818
{
@@ -58,7 +58,7 @@ public void CreateExtensionManager()
5858
// Find actual extension points.
5959
_extensionManager.FindExtensionPoints(typeof(CoreEngine).Assembly);
6060
_extensionManager.FindExtensionPoints(typeof(ITestEngine).Assembly);
61-
// Find extensions.
61+
// Find extensions directly in the their assemblies
6262
#if NETCOREAPP
6363
_extensionManager.FindExtensionsInAssembly(FakeExtensions("netstandard2.0"));
6464
#else

0 commit comments

Comments
 (0)