Skip to content

Commit 57e846c

Browse files
CharliePooleCharliePoole
committed
Create new nunit.extensibility and nunit.extensibility.api assemblies
1 parent 2768679 commit 57e846c

File tree

71 files changed

+336
-334
lines changed

Some content is hidden

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

71 files changed

+336
-334
lines changed

‎NUnitConsole.sln

+30-7
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{0F76
123123
EndProject
124124
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-agent-net80", "src\NUnitEngine\agents\nunit-agent-net80\nunit-agent-net80.csproj", "{CD357A8B-BE40-4F63-92DA-A71B94EE47E4}"
125125
EndProject
126-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FakeExtensions", "src\TestData\FakeExtensions\FakeExtensions.csproj", "{1D84092C-32D7-4074-9FA6-5FA97335F173}"
127-
EndProject
128126
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppContextTest", "src\TestData\AppContextTest\AppContextTest.csproj", "{E79A3CCD-07E2-4C50-B8BF-1C5844720725}"
129127
EndProject
130128
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InvalidTestNames", "src\TestData\InvalidTestNames\InvalidTestNames.csproj", "{48DF1E40-93BA-436A-B460-5D1130316ADA}"
@@ -147,6 +145,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common", "src\NUnitEn
147145
EndProject
148146
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common.tests", "src\NUnitEngine\nunit.common.tests\nunit.common.tests.csproj", "{F546CFE1-74B0-45D3-A06A-8972D73F4419}"
149147
EndProject
148+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensibility", "Extensibility", "{3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}"
149+
EndProject
150+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.extensibility.api", "src\Extensibility\nunit.extensibility.api\nunit.extensibility.api.csproj", "{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}"
151+
EndProject
152+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.extensibility", "src\Extensibility\nunit.extensibility\nunit.extensibility.csproj", "{49E8B583-37C2-4166-8007-3DB780D01004}"
153+
EndProject
154+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.extensibility.tests", "src\Extensibility\nunit.extensibility.tests\nunit.extensibility.tests.csproj", "{B22FEE5B-83D4-4021-B066-1B958332D391}"
155+
EndProject
156+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FakeExtensions", "src\Extensibility\FakeExtensions\FakeExtensions.csproj", "{E2A4C099-E35D-4E27-B89D-957140ED970F}"
157+
EndProject
150158
Global
151159
GlobalSection(SolutionConfigurationPlatforms) = preSolution
152160
Debug|Any CPU = Debug|Any CPU
@@ -217,10 +225,6 @@ Global
217225
{CD357A8B-BE40-4F63-92DA-A71B94EE47E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
218226
{CD357A8B-BE40-4F63-92DA-A71B94EE47E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
219227
{CD357A8B-BE40-4F63-92DA-A71B94EE47E4}.Release|Any CPU.Build.0 = Release|Any CPU
220-
{1D84092C-32D7-4074-9FA6-5FA97335F173}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
221-
{1D84092C-32D7-4074-9FA6-5FA97335F173}.Debug|Any CPU.Build.0 = Debug|Any CPU
222-
{1D84092C-32D7-4074-9FA6-5FA97335F173}.Release|Any CPU.ActiveCfg = Release|Any CPU
223-
{1D84092C-32D7-4074-9FA6-5FA97335F173}.Release|Any CPU.Build.0 = Release|Any CPU
224228
{E79A3CCD-07E2-4C50-B8BF-1C5844720725}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
225229
{E79A3CCD-07E2-4C50-B8BF-1C5844720725}.Debug|Any CPU.Build.0 = Debug|Any CPU
226230
{E79A3CCD-07E2-4C50-B8BF-1C5844720725}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -261,6 +265,22 @@ Global
261265
{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Debug|Any CPU.Build.0 = Debug|Any CPU
262266
{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Release|Any CPU.ActiveCfg = Release|Any CPU
263267
{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Release|Any CPU.Build.0 = Release|Any CPU
268+
{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
269+
{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}.Debug|Any CPU.Build.0 = Debug|Any CPU
270+
{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}.Release|Any CPU.ActiveCfg = Release|Any CPU
271+
{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}.Release|Any CPU.Build.0 = Release|Any CPU
272+
{49E8B583-37C2-4166-8007-3DB780D01004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
273+
{49E8B583-37C2-4166-8007-3DB780D01004}.Debug|Any CPU.Build.0 = Debug|Any CPU
274+
{49E8B583-37C2-4166-8007-3DB780D01004}.Release|Any CPU.ActiveCfg = Release|Any CPU
275+
{49E8B583-37C2-4166-8007-3DB780D01004}.Release|Any CPU.Build.0 = Release|Any CPU
276+
{B22FEE5B-83D4-4021-B066-1B958332D391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
277+
{B22FEE5B-83D4-4021-B066-1B958332D391}.Debug|Any CPU.Build.0 = Debug|Any CPU
278+
{B22FEE5B-83D4-4021-B066-1B958332D391}.Release|Any CPU.ActiveCfg = Release|Any CPU
279+
{B22FEE5B-83D4-4021-B066-1B958332D391}.Release|Any CPU.Build.0 = Release|Any CPU
280+
{E2A4C099-E35D-4E27-B89D-957140ED970F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
281+
{E2A4C099-E35D-4E27-B89D-957140ED970F}.Debug|Any CPU.Build.0 = Debug|Any CPU
282+
{E2A4C099-E35D-4E27-B89D-957140ED970F}.Release|Any CPU.ActiveCfg = Release|Any CPU
283+
{E2A4C099-E35D-4E27-B89D-957140ED970F}.Release|Any CPU.Build.0 = Release|Any CPU
264284
EndGlobalSection
265285
GlobalSection(SolutionProperties) = preSolution
266286
HideSolutionNode = FALSE
@@ -292,7 +312,6 @@ Global
292312
{9375E2BF-5AF9-4773-A5D1-EA16D9006940} = {B25157A1-B3CD-40FB-89F2-A7206C0B553A}
293313
{0F76DA4A-58B9-4B45-BEC5-259105570D11} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
294314
{CD357A8B-BE40-4F63-92DA-A71B94EE47E4} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}
295-
{1D84092C-32D7-4074-9FA6-5FA97335F173} = {37D508B2-91E0-4B32-869B-DFF9E68EA213}
296315
{E79A3CCD-07E2-4C50-B8BF-1C5844720725} = {37D508B2-91E0-4B32-869B-DFF9E68EA213}
297316
{48DF1E40-93BA-436A-B460-5D1130316ADA} = {37D508B2-91E0-4B32-869B-DFF9E68EA213}
298317
{2F9D8932-2186-464F-BED6-7D7979C8FFA6} = {37D508B2-91E0-4B32-869B-DFF9E68EA213}
@@ -304,6 +323,10 @@ Global
304323
{0555B97D-E918-455B-951C-74EFCDA8790A} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
305324
{542685E5-8C2E-4425-ADD1-C45B55AFB964} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
306325
{F546CFE1-74B0-45D3-A06A-8972D73F4419} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
326+
{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
327+
{49E8B583-37C2-4166-8007-3DB780D01004} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
328+
{B22FEE5B-83D4-4021-B066-1B958332D391} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
329+
{E2A4C099-E35D-4E27-B89D-957140ED970F} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
307330
EndGlobalSection
308331
GlobalSection(ExtensibilityGlobals) = postSolution
309332
SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711}

‎build.cake

+37-19
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ PackageDefinition NUnitConsoleRunnerNet80Package;
2525
PackageDefinition NUnitEnginePackage;
2626
PackageDefinition NUnitEngineApiPackage;
2727
PackageDefinition NUnitConsoleRunnerChocolateyPackage;
28-
PackageDefinition NUnitConsoleZipPackage;
28+
//PackageDefinition NUnitConsoleZipPackage;
2929

3030
BuildSettings.Packages.AddRange(new PackageDefinition[] {
3131

@@ -36,21 +36,27 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
3636
HasFiles("LICENSE.txt", "NOTICES.txt"),
3737
HasDirectory("tools").WithFiles(
3838
"nunit-console.exe", "nunit-console.exe.config", "nunit.engine.dll", "nunit.engine.core.dll",
39-
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
39+
"nunit.extensibility.dll", "nunit.extensibility.api.dll", "nunit.common.dll",
40+
"nunit.engine.api.dll", "testcentric.metadata.dll"),
4041
HasDirectory("tools/agents/net462").WithFiles(
4142
"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.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
43+
"nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
44+
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
4345
HasDirectory("tools/agents/net8.0").WithFiles(
4446
"nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
45-
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
47+
"nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
48+
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
4649
},
4750
symbols: new PackageCheck[] {
4851
HasDirectory("tools").WithFiles(
49-
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb", "nunit-console.pdb"),
52+
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
53+
"nunit.common.pdb", "nunit.engine.api.pdb", "nunit-console.pdb"),
5054
HasDirectory("tools/agents/net462").WithFiles(
51-
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
55+
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb",
56+
"nunit.extensibility.pdb", "nunit.extensibility.api.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
5257
HasDirectory("tools/agents/net8.0").WithFiles(
53-
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb")
58+
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
59+
"nunit.common.pdb", "nunit.engine.api.pdb")
5460
},
5561
testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
5662
+ $"NUnit.ConsoleRunner.{BuildSettings.PackageVersion}/tools/nunit-console.exe"),
@@ -70,7 +76,8 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
7076
HasFiles("nunit.exe"),
7177
HasDirectory(".store/nunit.consolerunner.netcore/**/tools/net8.0/any").WithFiles(
7278
"nunit-netcore-console.dll", "nunit-netcore-console.dll.config",
73-
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll",
79+
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.extensibility.dll",
80+
"nunit.extensibility.api.dll", "nunit.engine.api.dll", "testcentric.metadata.dll",
7481
"Microsoft.Extensions.DependencyModel.dll")
7582
},
7683
testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
@@ -83,13 +90,16 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
8390
checks: new PackageCheck[] {
8491
HasDirectory("tools").WithFiles(
8592
"LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit-console.exe", "nunit-console.exe.config",
86-
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
93+
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
94+
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
8795
HasDirectory("tools/agents/net462").WithFiles(
8896
"nunit-agent-net462.exe", "nunit-agent-net462.exe.config", "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
89-
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
97+
"nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
98+
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
9099
HasDirectory("tools/agents/net8.0").WithFiles(
91100
"nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
92-
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
101+
"nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
102+
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
93103
},
94104
testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory
95105
+ $"nunit-console-runner-v4.{BuildSettings.PackageVersion}/tools/nunit-console.exe"),
@@ -101,25 +111,33 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
101111
checks: new PackageCheck[] {
102112
HasFiles("LICENSE.txt", "NOTICES.txt"),
103113
HasDirectory("lib/net462").WithFiles(
104-
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
114+
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
115+
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
105116
HasDirectory("lib/net8.0").WithFiles(
106-
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll"),
117+
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
118+
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll"),
107119
HasDirectory("agents/net462").WithFiles(
108120
"nunit-agent-net462.exe", "nunit-agent-net462.exe.config",
109121
"nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
110-
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
122+
"nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
123+
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
111124
HasDirectory("agents/net8.0").WithFiles(
112125
"nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
113-
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") },
126+
"nunit.engine.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
127+
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") },
114128
symbols: new PackageCheck[] {
115129
HasDirectory("lib/net462").WithFiles(
116-
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
130+
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb",
131+
"nunit.extensibility.api.pdb", "nunit.engine.api.pdb"),
117132
HasDirectory("lib/net8.0").WithFiles(
118-
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
133+
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
134+
"nunit.common.pdb", "nunit.engine.api.pdb"),
119135
HasDirectory("contentFiles/any/agents/net462").WithFiles(
120-
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
136+
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb",
137+
"nunit.extensibility.api.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
121138
HasDirectory("contentFiles/any/agents/net8.0").WithFiles(
122-
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb")
139+
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
140+
"nunit.common.pdb", "nunit.engine.api.pdb")
123141
}),
124142

125143
NUnitEngineApiPackage = new NuGetPackage(

‎choco/nunit-console-runner.nuspec

+6
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
<file src = "$BIN_DIR$net462/nunit.engine.api.dll" target="tools" />
3737
<file src = "$BIN_DIR$net462/nunit.engine.api.xml" target="tools" />
3838
<file src = "$BIN_DIR$net462/nunit.engine.core.dll" target="tools" />
39+
<file src = "$BIN_DIR$net462/nunit.extensibility.dll" target="tools" />
40+
<file src = "$BIN_DIR$net462/nunit.extensibility.api.dll" target="tools" />
3941
<file src = "$BIN_DIR$net462/nunit.common.dll" target="tools" />
4042
<file src = "$BIN_DIR$net462/nunit.engine.dll" target="tools" />
4143
<file src = "$BIN_DIR$net462/testcentric.metadata.dll" target="tools" />
@@ -47,6 +49,8 @@
4749
<file src = "$BIN_DIR$agents/net462/nunit.engine.api.dll" target="tools/agents/net462" />
4850
<file src = "$BIN_DIR$agents/net462/nunit.engine.api.xml" target="tools/agents/net462" />
4951
<file src = "$BIN_DIR$agents/net462/nunit.engine.core.dll" target="tools/agents/net462" />
52+
<file src = "$BIN_DIR$agents/net462/nunit.extensibility.dll" target="tools/agents/net462" />
53+
<file src = "$BIN_DIR$agents/net462/nunit.extensibility.api.dll" target="tools/agents/net462" />
5054
<file src = "$BIN_DIR$agents/net462/nunit.common.dll" target="tools/agents/net462" />
5155
<file src = "$BIN_DIR$agents/net462/testcentric.metadata.dll" target="tools/agents/net462" />
5256
<file src = "nunit-agent.exe.ignore" target="tools/agents/net462" />
@@ -59,6 +63,8 @@
5963
<file src = "$BIN_DIR$agents/net8.0/nunit.engine.api.dll" target="tools/agents/net8.0" />
6064
<file src = "$BIN_DIR$agents/net8.0/nunit.engine.api.xml" target="tools/agents/net8.0" />
6165
<file src = "$BIN_DIR$agents/net8.0/nunit.engine.core.dll" target="tools/agents/net8.0" />
66+
<file src = "$BIN_DIR$agents/net8.0/nunit.extensibility.dll" target="tools/agents/net8.0" />
67+
<file src = "$BIN_DIR$agents/net8.0/nunit.extensibility.api.dll" target="tools/agents/net8.0" />
6268
<file src = "$BIN_DIR$agents/net8.0/nunit.common.dll" target="tools/agents/net8.0" />
6369
<file src = "$BIN_DIR$agents/net8.0/testcentric.metadata.dll" target="tools/agents/net8.0" />
6470
<file src = "$BIN_DIR$agents/net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net8.0" />

0 commit comments

Comments
 (0)