|
1 | 1 | // Load the recipe |
2 | | -#load nuget:?package=NUnit.Cake.Recipe&version=1.5.0-alpha.4 |
| 2 | +#load nuget:?package=NUnit.Cake.Recipe&version=1.5.0 |
3 | 3 | // Comment out above line and uncomment below for local tests of recipe changes |
4 | 4 | //#load ../NUnit.Cake.Recipe/recipe/*.cake |
5 | 5 |
|
@@ -39,25 +39,13 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { |
39 | 39 | "nunit-console.exe", "nunit-console.exe.config", "nunit.engine.dll", |
40 | 40 | "nunit.extensibility.dll", "nunit.extensibility.api.dll", "nunit.common.dll", |
41 | 41 | "nunit.engine.api.dll", "testcentric.metadata.dll"), |
42 | | - HasDirectory("tools/agents/net462").WithFiles( |
43 | | - "nunit-agent-net462.exe", "nunit-agent-net462.exe.config", "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config", |
44 | | - "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", |
45 | | - "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"), |
46 | | - HasDirectory("tools/agents/net8.0").WithFiles( |
47 | | - "nunit-agent-net80.dll", "nunit-agent-net80.dll.config", |
48 | | - "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", |
49 | | - "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") |
| 42 | + HasDependency("NUnit.Extension.Net462PluggableAgent", "4.0.0-alpha.6"), |
| 43 | + HasDependency("NUnit.Extension.Net80PluggableAgent", "4.0.0-alpha.4") |
50 | 44 | }, |
51 | 45 | symbols: new PackageCheck[] { |
52 | 46 | HasDirectory("tools").WithFiles( |
53 | 47 | "nunit.engine.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb", |
54 | 48 | "nunit.common.pdb", "nunit.engine.api.pdb", "nunit-console.pdb"), |
55 | | - HasDirectory("tools/agents/net462").WithFiles( |
56 | | - "nunit-agent-net462.pdb", "nunit-agent-net462-x86.pdb", "nunit.agent.core.pdb", |
57 | | - "nunit.extensibility.pdb", "nunit.extensibility.api.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"), |
58 | | - HasDirectory("tools/agents/net8.0").WithFiles( |
59 | | - "nunit-agent-net80.pdb", "nunit.agent.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb", |
60 | | - "nunit.common.pdb", "nunit.engine.api.pdb") |
61 | 49 | }, |
62 | 50 | testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory |
63 | 51 | + $"NUnit.ConsoleRunner.{BuildSettings.PackageVersion}/tools/nunit-console.exe"), |
@@ -92,14 +80,8 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { |
92 | 80 | "LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit-console.exe", "nunit-console.exe.config", |
93 | 81 | "nunit.engine.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", |
94 | 82 | "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"), |
95 | | - HasDirectory("tools/agents/net462").WithFiles( |
96 | | - "nunit-agent-net462.exe", "nunit-agent-net462.exe.config", "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config", |
97 | | - "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", |
98 | | - "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"), |
99 | | - HasDirectory("tools/agents/net8.0").WithFiles( |
100 | | - "nunit-agent-net80.dll", "nunit-agent-net80.dll.config", |
101 | | - "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", |
102 | | - "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") |
| 83 | + HasDependency("nunit-extension-net462-pluggable-agent", "4.0.0-alpha.6"), |
| 84 | + HasDependency("nunit-extension-net80-pluggable-agent", "4.0.0-alpha.4") |
103 | 85 | }, |
104 | 86 | testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory |
105 | 87 | + $"nunit-console-runner-v4.{BuildSettings.PackageVersion}/tools/nunit-console.exe"), |
@@ -141,33 +123,18 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { |
141 | 123 | "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"), |
142 | 124 | HasDirectory("lib/net8.0").WithFiles( |
143 | 125 | "nunit.engine.dll", "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", |
144 | | - "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll"), |
145 | | - HasDirectory("agents/net462").WithFiles( |
146 | | - "nunit-agent-net462.exe", "nunit-agent-net462.exe.config", |
147 | | - "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config", |
148 | | - "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", |
149 | | - "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"), |
150 | | - HasDirectory("agents/net8.0").WithFiles( |
151 | | - "nunit-agent-net80.dll", "nunit-agent-net80.dll.config", |
152 | | - "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll", |
153 | | - "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") }, |
| 126 | + "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll") }, |
154 | 127 | symbols: new PackageCheck[] { |
155 | 128 | HasDirectory("lib/net462").WithFiles( |
156 | 129 | "nunit.engine.pdb", "nunit.extensibility.pdb", |
157 | 130 | "nunit.extensibility.api.pdb", "nunit.engine.api.pdb"), |
158 | 131 | HasDirectory("lib/net8.0").WithFiles( |
159 | 132 | "nunit.engine.pdb","nunit.extensibility.pdb", "nunit.extensibility.api.pdb", |
160 | | - "nunit.common.pdb", "nunit.engine.api.pdb"), |
161 | | - HasDirectory("agents/net462").WithFiles( |
162 | | - "nunit-agent-net462.pdb", "nunit-agent-net462-x86.pdb", "nunit.agent.core.pdb", "nunit.extensibility.pdb", |
163 | | - "nunit.extensibility.api.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"), |
164 | | - HasDirectory("agents/net8.0").WithFiles( |
165 | | - "nunit-agent-net80.pdb", "nunit.agent.core.pdb", "nunit.extensibility.pdb", "nunit.extensibility.api.pdb", |
166 | | - "nunit.common.pdb", "nunit.engine.api.pdb") |
167 | | - }, |
168 | | - testRunner: new AgentSelector( |
169 | | - BuildSettings.NuGetTestDirectory + $"NUnit.Engine.{BuildSettings.PackageVersion}/agents"), |
170 | | - tests: EngineTests), |
| 133 | + "nunit.common.pdb", "nunit.engine.api.pdb") } ), |
| 134 | + // TODO: Revise AgentSelector and reinstate tests |
| 135 | + //testRunner: new AgentSelector( |
| 136 | + // BuildSettings.NuGetTestDirectory + $"NUnit.Engine.{BuildSettings.PackageVersion}/agents"), |
| 137 | + //tests: EngineTests), |
171 | 138 |
|
172 | 139 | NUnitEngineApiPackage = new NuGetPackage( |
173 | 140 | id: "NUnit.Engine.Api", |
|
0 commit comments