Skip to content

Commit

Permalink
Merge pull request #1497 from nunit/updt-recipe
Browse files Browse the repository at this point in the history
Update recipe to version 1.2.0
  • Loading branch information
CharliePoole authored Oct 8, 2024
2 parents 96c2dad + 7e668cb commit 9a98ee0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions build.cake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Load the recipe
#load nuget:?package=NUnit.Cake.Recipe&version=1.2.0-dev00009
#load nuget:?package=NUnit.Cake.Recipe&version=1.2.0
// Comment out above line and uncomment below for local tests of recipe changes
//#load ../NUnit.Cake.Recipe/recipe/*.cake

Expand Down Expand Up @@ -143,11 +143,11 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
+ $"NUnit.Console.{BuildSettings.PackageVersion}/bin/net462/nunit3-console.exe"),
tests: StandardRunnerTests,
bundledExtensions: new [] {
new PackageReference("NUnit.Extension.VSProjectLoader", "3.9.0"),
new PackageReference("NUnit.Extension.NUnitProjectLoader", "3.8.0"),
new PackageReference("NUnit.Extension.NUnitV2Driver", "3.9.0"),
new PackageReference("NUnit.Extension.NUnitV2ResultWriter", "3.8.0"),
new PackageReference("NUnit.Extension.TeamCityEventListener", "1.0.7")
KnownExtensions.VSProjectLoader.NuGetPackage,
KnownExtensions.NUnitProjectLoader.NuGetPackage,
KnownExtensions.NUnitV2Driver.NuGetPackage,
KnownExtensions.NUnitV2ResultWriter.NuGetPackage,
KnownExtensions.TeamCityEventListener.NuGetPackage
}),

// NOTE: Packages below this point have no direct tests
Expand Down
14 changes: 7 additions & 7 deletions package-tests.cake
Original file line number Diff line number Diff line change
Expand Up @@ -206,23 +206,23 @@ StandardRunnerTests.Add(new PackageTest(
"Run NUnit project with mock-assembly.dll built for .NET 4.6.2 and 6.0",
"../../NetFXTests.nunit --config=Release --trace=Debug",
new MockAssemblyExpectedResult("net-4.6.2", "netcore-6.0"),
KnownExtensions.NUnitProjectLoader.SetVersion("3.8.0")));
KnownExtensions.NUnitProjectLoader));

// V2 Result Writer Test
StandardRunnerTests.Add(new PackageTest(
1, "V2ResultWriterTest",
"Run mock-assembly under .NET 6.0 and produce V2 output",
"testdata/net6.0/mock-assembly.dll --result=TestResult.xml --result=NUnit2TestResult.xml;format=nunit2",
new MockAssemblyExpectedResult("netcore-6.0"),
KnownExtensions.NUnitV2ResultWriter.SetVersion("3.8.0")));
KnownExtensions.NUnitV2ResultWriter));

// VS Project Loader Tests
StandardRunnerTests.Add(new PackageTest(
1, "VSProjectLoaderTest_Project",
"Run mock-assembly using the .csproj file",
"../../src/TestData/mock-assembly/mock-assembly.csproj --config=Release",
new MockAssemblyExpectedResult("net462", "netcore-3.1", "netcore-6.0", "netcore-7.0", "netcore-8.0"),
KnownExtensions.VSProjectLoader.SetVersion("3.9.0")));
KnownExtensions.VSProjectLoader));

StandardRunnerTests.Add(new PackageTest(
1, "VSProjectLoaderTest_Solution",
Expand All @@ -249,15 +249,15 @@ StandardRunnerTests.Add(new PackageTest(
new ExpectedAssemblyResult("WpfApp.exe")
}
},
KnownExtensions.VSProjectLoader.SetVersion("3.9.0")));
KnownExtensions.VSProjectLoader));

// TeamCity Event Listener Test
StandardRunnerTests.Add(new PackageTest(
1, "TeamCityListenerTest",
"Run mock-assembly with --teamcity enabled",
"testdata/net462/mock-assembly.dll --teamcity",
new MockAssemblyExpectedResult("net-4.6.2"),
new ExtensionSpecifier("NUnit.Extension.TeamCityEventListener", "nunit-extension-teamcity-event-listener", "1.0.7")));
KnownExtensions.TeamCityEventListener));

// V2 Framework Driver Tests
StandardRunnerTests.Add(new PackageTest(
Expand All @@ -274,7 +274,7 @@ StandardRunnerTests.Add(new PackageTest(
Skipped = 4,
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly-v2.dll", "net-4.6.2") }
},
new ExtensionSpecifier("NUnit.Extension.NUnitV2Driver", "nunit-extension-nunit-v2-driver", "3.9.0")));
KnownExtensions.NUnitV2Driver));

StandardRunnerTests.Add(new PackageTest(
1, "V2FrameworkDriverTest",
Expand All @@ -290,7 +290,7 @@ StandardRunnerTests.Add(new PackageTest(
Skipped = 4,
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly-v2.dll", "net-4.6.2") }
},
new ExtensionSpecifier("NUnit.Extension.NUnitV2Driver", "nunit-extension-nunit-v2-driver", "3.9.0")));
KnownExtensions.NUnitV2Driver));

//////////////////////////////////////////////////////////////////////
// SPECIAL CASES
Expand Down

0 comments on commit 9a98ee0

Please sign in to comment.