@@ -31,7 +31,8 @@ public void InitializePackageDefinitions(ICakeContext context)
31
31
Net70Test ,
32
32
Net80Test ,
33
33
Net50PlusNet60Test ,
34
- Net40PlusNet60Test
34
+ Net40PlusNet60Test ,
35
+ NUnitProjectTest
35
36
} ;
36
37
37
38
// Tests run for the NETCORE runner package
@@ -79,13 +80,13 @@ public void InitializePackageDefinitions(ICakeContext context)
79
80
checks : new PackageCheck [ ] {
80
81
HasFiles ( "LICENSE.txt" , "NOTICES.txt" ) ,
81
82
HasDirectory ( "tools" ) . WithFiles ( CONSOLE_FILES ) . AndFiles ( ENGINE_FILES ) . AndFile ( "nunit.console.nuget.addins" ) ,
82
- HasDirectory ( "tools/agents/net20" ) . WithFiles ( AGENT_FILES ) . AndFile ( "nunit.agent.addins" ) ,
83
- HasDirectory ( "tools/agents/net40" ) . WithFiles ( AGENT_FILES ) . AndFile ( "nunit.agent.addins" ) ,
84
- HasDirectory ( "tools/agents/netcoreapp3.1" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.agent.addins" ) ,
85
- HasDirectory ( "tools/agents/net5.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.agent.addins" ) ,
86
- HasDirectory ( "tools/agents/net6.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.agent.addins" ) ,
87
- HasDirectory ( "tools/agents/net7.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.agent.addins" ) ,
88
- HasDirectory ( "tools/agents/net8.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.agent.addins" )
83
+ HasDirectory ( "tools/agents/net20" ) . WithFiles ( AGENT_FILES ) . AndFile ( "nunit.console.nuget. agent.addins" ) ,
84
+ HasDirectory ( "tools/agents/net40" ) . WithFiles ( AGENT_FILES ) . AndFile ( "nunit.console.nuget. agent.addins" ) ,
85
+ HasDirectory ( "tools/agents/netcoreapp3.1" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.console.nuget. agent.addins" ) ,
86
+ HasDirectory ( "tools/agents/net5.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.console.nuget. agent.addins" ) ,
87
+ HasDirectory ( "tools/agents/net6.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.console.nuget. agent.addins" ) ,
88
+ HasDirectory ( "tools/agents/net7.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.console.nuget. agent.addins" ) ,
89
+ HasDirectory ( "tools/agents/net8.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.console.nuget. agent.addins" )
89
90
} ,
90
91
symbols : new PackageCheck [ ] {
91
92
HasDirectory ( "tools" ) . WithFiles ( ENGINE_PDB_FILES ) . AndFile ( "nunit3-console.pdb" ) ,
@@ -136,14 +137,14 @@ public void InitializePackageDefinitions(ICakeContext context)
136
137
version : ProductVersion ,
137
138
source : CHOCO_DIR + "nunit-console-runner.nuspec" ,
138
139
checks : new PackageCheck [ ] {
139
- HasDirectory ( "tools" ) . WithFiles ( "LICENSE.txt" , "NOTICES.txt" , "VERIFICATION.txt" ) . AndFiles ( CONSOLE_FILES ) . AndFiles ( ENGINE_FILES ) . AndFile ( "nunit.choco.addins" ) ,
140
- HasDirectory ( "tools/agents/net20" ) . WithFiles ( AGENT_FILES ) . AndFile ( "nunit.agent.addins" ) ,
141
- HasDirectory ( "tools/agents/net40" ) . WithFiles ( AGENT_FILES ) . AndFile ( "nunit.agent.addins" ) ,
142
- HasDirectory ( "tools/agents/netcoreapp3.1" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.agent.addins" ) ,
143
- HasDirectory ( "tools/agents/net5.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.agent.addins" ) ,
144
- HasDirectory ( "tools/agents/net6.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.agent.addins" ) ,
145
- HasDirectory ( "tools/agents/net7.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.agent.addins" ) ,
146
- HasDirectory ( "tools/agents/net8.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.agent.addins" )
140
+ HasDirectory ( "tools" ) . WithFiles ( "LICENSE.txt" , "NOTICES.txt" , "VERIFICATION.txt" ) . AndFiles ( CONSOLE_FILES ) . AndFiles ( ENGINE_FILES ) . AndFile ( "nunit.console. choco.addins" ) ,
141
+ HasDirectory ( "tools/agents/net20" ) . WithFiles ( AGENT_FILES ) . AndFile ( "nunit.console.choco. agent.addins" ) ,
142
+ HasDirectory ( "tools/agents/net40" ) . WithFiles ( AGENT_FILES ) . AndFile ( "nunit.console.choco. agent.addins" ) ,
143
+ HasDirectory ( "tools/agents/netcoreapp3.1" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.console.choco. agent.addins" ) ,
144
+ HasDirectory ( "tools/agents/net5.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.console.choco. agent.addins" ) ,
145
+ HasDirectory ( "tools/agents/net6.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.console.choco. agent.addins" ) ,
146
+ HasDirectory ( "tools/agents/net7.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.console.choco. agent.addins" ) ,
147
+ HasDirectory ( "tools/agents/net8.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFile ( "nunit.console.choco. agent.addins" )
147
148
} ,
148
149
executable : "tools/nunit3-console.exe" ,
149
150
tests : StandardRunnerTests ) ,
@@ -159,7 +160,7 @@ public void InitializePackageDefinitions(ICakeContext context)
159
160
HasDirectory ( "Nunit.org/nunit-console/addins" ) . WithFiles ( "nunit.core.dll" , "nunit.core.interfaces.dll" , "nunit.v2.driver.dll" , "nunit-project-loader.dll" , "vs-project-loader.dll" , "nunit-v2-result-writer.dll" , "teamcity-event-listener.dll" )
160
161
} ,
161
162
executable : "NUnit.org/nunit-console/nunit3-console.exe" ,
162
- tests : StandardRunnerTests . Concat ( new [ ] { NUnitProjectTest } ) ) ,
163
+ tests : StandardRunnerTests ) ,
163
164
164
165
NUnitConsoleZipPackage = new ZipPackage (
165
166
context : context ,
@@ -181,7 +182,7 @@ public void InitializePackageDefinitions(ICakeContext context)
181
182
HasDirectory ( "bin/agents/net8.0" ) . WithFiles ( AGENT_FILES_NETCORE ) . AndFiles ( AGENT_PDB_FILES_NETCORE )
182
183
} ,
183
184
executable : "bin/net20/nunit3-console.exe" ,
184
- tests : StandardRunnerTests . Concat ( new [ ] { NUnitProjectTest } ) ) ,
185
+ tests : StandardRunnerTests ) ,
185
186
186
187
// NOTE: Packages below this point have no direct tests
187
188
0 commit comments