Skip to content

Commit cb0e620

Browse files
committed
Update recipe
1 parent 271731b commit cb0e620

File tree

2 files changed

+32
-17
lines changed

2 files changed

+32
-17
lines changed

build.cake

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Load the recipe
2-
#load nuget:?package=NUnit.Cake.Recipe&version=1.4.0-alpha.6
2+
#load nuget:?package=NUnit.Cake.Recipe&version=1.4.0-alpha.7
33
// Comment out above line and uncomment below for local tests of recipe changes
44
//#load ../NUnit.Cake.Recipe/recipe/*.cake
55

@@ -127,11 +127,11 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
127127
+ $"NUnit.Console.{BuildSettings.PackageVersion}/bin/net462/nunit3-console.exe"),
128128
tests: PackageTests.ZipRunnerTests,
129129
bundledExtensions: new [] {
130-
KnownExtensions.VSProjectLoader.NuGetPackage,
131-
KnownExtensions.NUnitProjectLoader.NuGetPackage,
132-
KnownExtensions.NUnitV2Driver.NuGetPackage,
133-
KnownExtensions.NUnitV2ResultWriter.NuGetPackage,
134-
KnownExtensions.TeamCityEventListener.NuGetPackage
130+
Extensions.VSProjectLoader.NuGetPackage,
131+
Extensions.NUnitProjectLoader.NuGetPackage,
132+
Extensions.NUnitV2Driver.NuGetPackage,
133+
Extensions.NUnitV2ResultWriter.NuGetPackage,
134+
Extensions.TeamCityEventListener.NuGetPackage
135135
}),
136136

137137
// NOTE: Packages below this point have no direct tests

package-tests.cake

+26-11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
public static class Extensions
2+
{
3+
// Extensions used in tests, with version specified.
4+
public static ExtensionSpecifier NUnitV2Driver = new ExtensionSpecifier(
5+
"NUnit.Extension.NUnitV2Driver", "nunit-extension-nunit-v2-driver", "3.9.0");
6+
public static ExtensionSpecifier NUnitProjectLoader = new ExtensionSpecifier(
7+
"NUnit.Extension.NUnitProjectLoader", "nunit-extension-nunit-project-loader", "3.8.0");
8+
public static ExtensionSpecifier VSProjectLoader = new ExtensionSpecifier(
9+
"NUnit.Extension.VSProjectLoader", "nunit-extension-vs-project-loader", "3.9.0");
10+
public static ExtensionSpecifier NUnitV2ResultWriter = new ExtensionSpecifier(
11+
"NUnit.Extension.NUnitV2ResultWriter", "nunit-extension-nunit-v2-result-writer", "3.8.0");
12+
public static ExtensionSpecifier TeamCityEventListener = new ExtensionSpecifier(
13+
"NUnit.Extension.TeamCityEventListener", "nunit-extension-teamcity-event-listener", "1.0.9");
14+
}
15+
116
public static class PackageTests
217
{
318
// Tests run for the Standard runner packages (both nuget and chocolatey)
@@ -261,15 +276,15 @@ public static class PackageTests
261276
Description = "Run NUnit project with mock-assembly.dll targeting .NET 4.6.2 and 6.0",
262277
Arguments = "../../MixedTests.nunit --config=Release",
263278
ExpectedResult = new MockAssemblyExpectedResult("net-4.6.2", "net-6.0"),
264-
ExtensionsNeeded = new [] { KnownExtensions.NUnitProjectLoader }
279+
ExtensionsNeeded = new [] { Extensions.NUnitProjectLoader }
265280
});
266281

267282
NetCoreRunnerTests.Add(new PackageTest(1, "NUnitProjectTest")
268283
{
269284
Description= "Run NUnit project with mock-assembly.dll targeting .NET 6.0 and 8.0",
270285
Arguments="../../NetCoreTests.nunit --config=Release",
271286
ExpectedResult = new MockAssemblyExpectedResult("netcore-6.0", "netcore-8.0"),
272-
ExtensionsNeeded = new [] { KnownExtensions.NUnitProjectLoader }
287+
ExtensionsNeeded = new [] { Extensions.NUnitProjectLoader }
273288
});
274289

275290
// V2 Result Writer Test
@@ -278,7 +293,7 @@ public static class PackageTests
278293
Description = "Run mock-assembly targeting .NET 6.0 and produce V2 output",
279294
Arguments = "testdata/net6.0/mock-assembly.dll --result=TestResult.xml --result=NUnit2TestResult.xml;format=nunit2",
280295
ExpectedResult = new MockAssemblyExpectedResult("netcore-6.0"),
281-
ExtensionsNeeded = new[] { KnownExtensions.NUnitV2ResultWriter }
296+
ExtensionsNeeded = new[] { Extensions.NUnitV2ResultWriter }
282297
});
283298

284299
// VS Project Loader Tests
@@ -287,7 +302,7 @@ public static class PackageTests
287302
Description = "Run mock-assembly using the .csproj file",
288303
Arguments = "../../src/TestData/mock-assembly/mock-assembly.csproj --config=Release",
289304
ExpectedResult = new MockAssemblyExpectedResult("net462", "netcore-3.1", "netcore-6.0", "netcore-7.0", "netcore-8.0"),
290-
ExtensionsNeeded = new[] { KnownExtensions.VSProjectLoader }
305+
ExtensionsNeeded = new[] { Extensions.VSProjectLoader }
291306
});
292307

293308
StandardAndZipLists.Add(new PackageTest(1, "VSProjectLoaderTest_Solution")
@@ -315,7 +330,7 @@ public static class PackageTests
315330
new ExpectedAssemblyResult("WpfApp.exe")
316331
}
317332
},
318-
ExtensionsNeeded = new[] { KnownExtensions.VSProjectLoader }
333+
ExtensionsNeeded = new[] { Extensions.VSProjectLoader }
319334
});
320335

321336
// TeamCity Event Listener Tests
@@ -324,7 +339,7 @@ public static class PackageTests
324339
Description = "Run mock-assembly targeting .NET 4.6.2 with --teamcity option",
325340
Arguments = "testdata/net462/mock-assembly.dll --teamcity --trace:Debug",
326341
ExpectedResult = new MockAssemblyExpectedResult("net-4.6.2"),
327-
ExtensionsNeeded = new[] { KnownExtensions.TeamCityEventListener },
342+
ExtensionsNeeded = new[] { Extensions.TeamCityEventListener },
328343
OutputCheck = new OutputContains("##teamcity")
329344
});
330345

@@ -334,7 +349,7 @@ public static class PackageTests
334349
Description = "Run mock-assembly targeting .NET 4.6.2 with --enable teamcity option",
335350
Arguments = "testdata/net462/mock-assembly.dll --enable:NUnit.Engine.Listeners.TeamCityEventListener --trace:Debug",
336351
ExpectedResult = new MockAssemblyExpectedResult("net-4.6.2"),
337-
ExtensionsNeeded = new[] { KnownExtensions.TeamCityEventListener },
352+
ExtensionsNeeded = new[] { Extensions.TeamCityEventListener },
338353
OutputCheck = new OutputContains("##teamcity")
339354
});
340355

@@ -343,7 +358,7 @@ public static class PackageTests
343358
Description = "Run mock-assembly targeting .NET 6.0 with --teamcity option",
344359
Arguments = "testdata/net6.0/mock-assembly.dll --teamcity --trace:Debug",
345360
ExpectedResult = new MockAssemblyExpectedResult("net-6.0"),
346-
ExtensionsNeeded = new[] { KnownExtensions.TeamCityEventListener },
361+
ExtensionsNeeded = new[] { Extensions.TeamCityEventListener },
347362
OutputCheck = new OutputContains("##teamcity")
348363
});
349364

@@ -353,7 +368,7 @@ public static class PackageTests
353368
Description = "Run mock-assembly targeting .NET 6.0 with --enable teamcity option",
354369
Arguments = "testdata/net6.0/mock-assembly.dll --enable:NUnit.Engine.Listeners.TeamCityEventListener --trace:Debug",
355370
ExpectedResult = new MockAssemblyExpectedResult("net-6.0"),
356-
ExtensionsNeeded = new[] { KnownExtensions.TeamCityEventListener },
371+
ExtensionsNeeded = new[] { Extensions.TeamCityEventListener },
357372
OutputCheck = new OutputContains("##teamcity")
358373
});
359374

@@ -372,7 +387,7 @@ public static class PackageTests
372387
Skipped = 4,
373388
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly-v2.dll", "net-4.6.2") }
374389
},
375-
ExtensionsNeeded = new[] { KnownExtensions.NUnitV2Driver }
390+
ExtensionsNeeded = new[] { Extensions.NUnitV2Driver }
376391
});
377392

378393
StandardAndZipLists.Add(new PackageTest(1, "V2FrameworkDriverTest")
@@ -389,7 +404,7 @@ public static class PackageTests
389404
Skipped = 4,
390405
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly-v2.dll", "net-4.6.2") }
391406
},
392-
ExtensionsNeeded = new[] { KnownExtensions.NUnitV2Driver }
407+
ExtensionsNeeded = new[] { Extensions.NUnitV2Driver }
393408
});
394409

395410
//////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)