Skip to content

Commit fe55a6f

Browse files
CharliePooleCharliePoole
authored
Merge pull request #1619 from nunit/issue-1578
Isolate the agents from the engine
2 parents 97b3a6a + a036e1c commit fe55a6f

File tree

165 files changed

+279
-382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+279
-382
lines changed

‎NUnitConsole.sln

+31-34
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated",
8888
nuget\deprecated\nunit.runners.nuspec = nuget\deprecated\nunit.runners.nuspec
8989
EndProjectSection
9090
EndProject
91-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.core", "src\NUnitEngine\nunit.engine.core\nunit.engine.core.csproj", "{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}"
92-
EndProject
9391
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mock-assembly-x86", "src\TestData\mock-assembly-x86\mock-assembly-x86.csproj", "{9D3015EE-5B84-41B3-A1D3-1A439370C392}"
9492
EndProject
9593
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated", "{068F6CA9-6108-4F45-8540-351AA5227259}"
9694
ProjectSection(SolutionItems) = preProject
9795
choco\deprecated\nunit-console-with-extensions.nuspec = choco\deprecated\nunit-console-with-extensions.nuspec
9896
EndProjectSection
9997
EndProject
100-
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}"
101-
EndProject
10298
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestData", "TestData", "{37D508B2-91E0-4B32-869B-DFF9E68EA213}"
10399
EndProject
104100
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "agents", "agents", "{1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}"
@@ -147,22 +143,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.2", "src\TestData\NU
147143
EndProject
148144
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.10", "src\TestData\NUnit3.10\NUnit3.10.csproj", "{0555B97D-E918-455B-951C-74EFCDA8790A}"
149145
EndProject
150-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common", "src\NUnitEngine\nunit.common\nunit.common.csproj", "{542685E5-8C2E-4425-ADD1-C45B55AFB964}"
146+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitCommon", "NUnitCommon", "{3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}"
151147
EndProject
152-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common.tests", "src\NUnitEngine\nunit.common.tests\nunit.common.tests.csproj", "{F546CFE1-74B0-45D3-A06A-8972D73F4419}"
148+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.extensibility.api", "src\NUnitCommon\nunit.extensibility.api\nunit.extensibility.api.csproj", "{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}"
153149
EndProject
154-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensibility", "Extensibility", "{3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}"
155-
ProjectSection(SolutionItems) = preProject
156-
src\Extensibility\Directory.Build.props = src\Extensibility\Directory.Build.props
157-
EndProjectSection
150+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.extensibility", "src\NUnitCommon\nunit.extensibility\nunit.extensibility.csproj", "{49E8B583-37C2-4166-8007-3DB780D01004}"
151+
EndProject
152+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.extensibility.tests", "src\NUnitCommon\nunit.extensibility.tests\nunit.extensibility.tests.csproj", "{B22FEE5B-83D4-4021-B066-1B958332D391}"
153+
EndProject
154+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FakeExtensions", "src\NUnitCommon\FakeExtensions\FakeExtensions.csproj", "{E2A4C099-E35D-4E27-B89D-957140ED970F}"
158155
EndProject
159-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.extensibility.api", "src\Extensibility\nunit.extensibility.api\nunit.extensibility.api.csproj", "{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}"
156+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common", "src\NUnitCommon\nunit.common\nunit.common.csproj", "{9D9CAD66-8EDF-4ED0-A222-503BE9B21EC7}"
160157
EndProject
161-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.extensibility", "src\Extensibility\nunit.extensibility\nunit.extensibility.csproj", "{49E8B583-37C2-4166-8007-3DB780D01004}"
158+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common.tests", "src\NUnitCommon\nunit.common.tests\nunit.common.tests.csproj", "{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}"
162159
EndProject
163-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.extensibility.tests", "src\Extensibility\nunit.extensibility.tests\nunit.extensibility.tests.csproj", "{B22FEE5B-83D4-4021-B066-1B958332D391}"
160+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.agent.core", "src\NUnitCommon\nunit.agent.core\nunit.agent.core.csproj", "{4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA}"
164161
EndProject
165-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FakeExtensions", "src\Extensibility\FakeExtensions\FakeExtensions.csproj", "{E2A4C099-E35D-4E27-B89D-957140ED970F}"
162+
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}"
166163
EndProject
167164
Global
168165
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -190,18 +187,10 @@ Global
190187
{B1D90742-39BD-429C-8E87-C5CD2991DF27}.Debug|Any CPU.Build.0 = Debug|Any CPU
191188
{B1D90742-39BD-429C-8E87-C5CD2991DF27}.Release|Any CPU.ActiveCfg = Release|Any CPU
192189
{B1D90742-39BD-429C-8E87-C5CD2991DF27}.Release|Any CPU.Build.0 = Release|Any CPU
193-
{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
194-
{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
195-
{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
196-
{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Release|Any CPU.Build.0 = Release|Any CPU
197190
{9D3015EE-5B84-41B3-A1D3-1A439370C392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
198191
{9D3015EE-5B84-41B3-A1D3-1A439370C392}.Debug|Any CPU.Build.0 = Debug|Any CPU
199192
{9D3015EE-5B84-41B3-A1D3-1A439370C392}.Release|Any CPU.ActiveCfg = Release|Any CPU
200193
{9D3015EE-5B84-41B3-A1D3-1A439370C392}.Release|Any CPU.Build.0 = Release|Any CPU
201-
{CACC0520-B452-4310-A33C-DC944129ACDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
202-
{CACC0520-B452-4310-A33C-DC944129ACDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
203-
{CACC0520-B452-4310-A33C-DC944129ACDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
204-
{CACC0520-B452-4310-A33C-DC944129ACDD}.Release|Any CPU.Build.0 = Release|Any CPU
205194
{E4041712-A1F1-479D-A7F7-89F491066163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
206195
{E4041712-A1F1-479D-A7F7-89F491066163}.Debug|Any CPU.Build.0 = Debug|Any CPU
207196
{E4041712-A1F1-479D-A7F7-89F491066163}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -266,14 +255,6 @@ Global
266255
{0555B97D-E918-455B-951C-74EFCDA8790A}.Debug|Any CPU.Build.0 = Debug|Any CPU
267256
{0555B97D-E918-455B-951C-74EFCDA8790A}.Release|Any CPU.ActiveCfg = Release|Any CPU
268257
{0555B97D-E918-455B-951C-74EFCDA8790A}.Release|Any CPU.Build.0 = Release|Any CPU
269-
{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
270-
{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Debug|Any CPU.Build.0 = Debug|Any CPU
271-
{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Release|Any CPU.ActiveCfg = Release|Any CPU
272-
{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Release|Any CPU.Build.0 = Release|Any CPU
273-
{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
274-
{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Debug|Any CPU.Build.0 = Debug|Any CPU
275-
{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Release|Any CPU.ActiveCfg = Release|Any CPU
276-
{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Release|Any CPU.Build.0 = Release|Any CPU
277258
{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
278259
{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}.Debug|Any CPU.Build.0 = Debug|Any CPU
279260
{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -290,6 +271,22 @@ Global
290271
{E2A4C099-E35D-4E27-B89D-957140ED970F}.Debug|Any CPU.Build.0 = Debug|Any CPU
291272
{E2A4C099-E35D-4E27-B89D-957140ED970F}.Release|Any CPU.ActiveCfg = Release|Any CPU
292273
{E2A4C099-E35D-4E27-B89D-957140ED970F}.Release|Any CPU.Build.0 = Release|Any CPU
274+
{9D9CAD66-8EDF-4ED0-A222-503BE9B21EC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
275+
{9D9CAD66-8EDF-4ED0-A222-503BE9B21EC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
276+
{9D9CAD66-8EDF-4ED0-A222-503BE9B21EC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
277+
{9D9CAD66-8EDF-4ED0-A222-503BE9B21EC7}.Release|Any CPU.Build.0 = Release|Any CPU
278+
{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
279+
{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}.Debug|Any CPU.Build.0 = Debug|Any CPU
280+
{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}.Release|Any CPU.ActiveCfg = Release|Any CPU
281+
{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}.Release|Any CPU.Build.0 = Release|Any CPU
282+
{4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
283+
{4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
284+
{4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
285+
{4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA}.Release|Any CPU.Build.0 = Release|Any CPU
286+
{89258A3E-5B62-487A-9AE7-D7672CBF61F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
287+
{89258A3E-5B62-487A-9AE7-D7672CBF61F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
288+
{89258A3E-5B62-487A-9AE7-D7672CBF61F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
289+
{89258A3E-5B62-487A-9AE7-D7672CBF61F1}.Release|Any CPU.Build.0 = Release|Any CPU
293290
EndGlobalSection
294291
GlobalSection(SolutionProperties) = preSolution
295292
HideSolutionNode = FALSE
@@ -305,10 +302,8 @@ Global
305302
{B1D90742-39BD-429C-8E87-C5CD2991DF27} = {37D508B2-91E0-4B32-869B-DFF9E68EA213}
306303
{4FDF7BFA-A337-41D3-898D-C6A98278E6AD} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
307304
{9A7C8370-ED1F-486F-A8F5-C5BF4221464E} = {A972031D-2F61-4183-AF75-99EE1A9F6B32}
308-
{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
309305
{9D3015EE-5B84-41B3-A1D3-1A439370C392} = {37D508B2-91E0-4B32-869B-DFF9E68EA213}
310306
{068F6CA9-6108-4F45-8540-351AA5227259} = {4FDF7BFA-A337-41D3-898D-C6A98278E6AD}
311-
{CACC0520-B452-4310-A33C-DC944129ACDD} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
312307
{1704B7B2-5AD3-44EA-AB26-445C4E4E2C54} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
313308
{E4041712-A1F1-479D-A7F7-89F491066163} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}
314309
{D4AE483A-D4E1-4892-AF87-3607FBA8755F} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}
@@ -330,12 +325,14 @@ Global
330325
{56416AD9-8E7B-4F72-B0E1-E75A024431F8} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
331326
{8AFBB856-700A-4CCC-AE0E-9B622178E1E0} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
332327
{0555B97D-E918-455B-951C-74EFCDA8790A} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
333-
{542685E5-8C2E-4425-ADD1-C45B55AFB964} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
334-
{F546CFE1-74B0-45D3-A06A-8972D73F4419} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
335328
{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
336329
{49E8B583-37C2-4166-8007-3DB780D01004} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
337330
{B22FEE5B-83D4-4021-B066-1B958332D391} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
338331
{E2A4C099-E35D-4E27-B89D-957140ED970F} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
332+
{9D9CAD66-8EDF-4ED0-A222-503BE9B21EC7} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
333+
{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
334+
{4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
335+
{89258A3E-5B62-487A-9AE7-D7672CBF61F1} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
339336
EndGlobalSection
340337
GlobalSection(ExtensibilityGlobals) = postSolution
341338
SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711}

‎build-results/NUnitConsole.binlog

2.52 MB
Binary file not shown.

‎build.cake

+16-16
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,27 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
3434
checks: new PackageCheck[] {
3535
HasFiles("LICENSE.txt", "NOTICES.txt"),
3636
HasDirectory("tools").WithFiles(
37-
"nunit-console.exe", "nunit-console.exe.config", "nunit.engine.dll", "nunit.engine.core.dll",
37+
"nunit-console.exe", "nunit-console.exe.config", "nunit.engine.dll",
3838
"nunit.extensibility.dll", "nunit.extensibility.api.dll", "nunit.common.dll",
3939
"nunit.engine.api.dll", "testcentric.metadata.dll"),
4040
HasDirectory("tools/agents/net462").WithFiles(
4141
"nunit-agent-net462.exe", "nunit-agent-net462.exe.config", "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
42-
"nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
42+
"nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
4343
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
4444
HasDirectory("tools/agents/net8.0").WithFiles(
4545
"nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
46-
"nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
46+
"nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
4747
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
4848
},
4949
symbols: new PackageCheck[] {
5050
HasDirectory("tools").WithFiles(
51-
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
51+
"nunit.engine.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
5252
"nunit.common.pdb", "nunit.engine.api.pdb", "nunit-console.pdb"),
5353
HasDirectory("tools/agents/net462").WithFiles(
54-
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb",
54+
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.agent.core.pdb",
5555
"nunit.extensibility.pdb", "nunit.extensibility.api.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
5656
HasDirectory("tools/agents/net8.0").WithFiles(
57-
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
57+
"nunit-agent.pdb", "nunit.agent.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
5858
"nunit.common.pdb", "nunit.engine.api.pdb")
5959
},
6060
testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
@@ -75,7 +75,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
7575
HasFiles("nunit.exe"),
7676
HasDirectory(".store/nunit.consolerunner.netcore/**/tools/net8.0/any").WithFiles(
7777
"nunit-netcore-console.dll", "nunit-netcore-console.dll.config",
78-
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.extensibility.dll",
78+
"nunit.engine.dll", "nunit.agent.core.dll", "nunit.extensibility.dll",
7979
"nunit.extensibility.api.dll", "nunit.engine.api.dll", "testcentric.metadata.dll",
8080
"Microsoft.Extensions.DependencyModel.dll")
8181
},
@@ -89,15 +89,15 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
8989
checks: new PackageCheck[] {
9090
HasDirectory("tools").WithFiles(
9191
"LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit-console.exe", "nunit-console.exe.config",
92-
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
92+
"nunit.engine.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
9393
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
9494
HasDirectory("tools/agents/net462").WithFiles(
9595
"nunit-agent-net462.exe", "nunit-agent-net462.exe.config", "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
96-
"nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
96+
"nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
9797
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
9898
HasDirectory("tools/agents/net8.0").WithFiles(
9999
"nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
100-
"nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
100+
"nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
101101
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
102102
},
103103
testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory
@@ -110,26 +110,26 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
110110
checks: new PackageCheck[] {
111111
HasFiles("LICENSE.txt", "NOTICES.txt"),
112112
HasDirectory("lib/net462").WithFiles(
113-
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
113+
"nunit.engine.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
114114
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
115115
HasDirectory("lib/net8.0").WithFiles(
116-
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
116+
"nunit.engine.dll", "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
117117
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll"),
118118
HasDirectory("agents/net462").WithFiles(
119119
"nunit-agent-net462.exe", "nunit-agent-net462.exe.config",
120120
"nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
121-
"nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
121+
"nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
122122
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
123123
HasDirectory("agents/net8.0").WithFiles(
124124
"nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
125-
"nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
125+
"nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
126126
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") },
127127
symbols: new PackageCheck[] {
128128
HasDirectory("lib/net462").WithFiles(
129-
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb",
129+
"nunit.engine.pdb", "nunit.extensibility.pdb",
130130
"nunit.extensibility.api.pdb", "nunit.engine.api.pdb"),
131131
HasDirectory("lib/net8.0").WithFiles(
132-
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
132+
"nunit.engine.pdb","nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
133133
"nunit.common.pdb", "nunit.engine.api.pdb"),
134134
HasDirectory("contentFiles/any/agents/net462").WithFiles(
135135
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb",

0 commit comments

Comments
 (0)