From 46dfb35acb5984915232b2f6547b54c9fb9d55a1 Mon Sep 17 00:00:00 2001 From: Charlie Poole Date: Fri, 5 Jun 2026 14:35:42 -0700 Subject: [PATCH] Update to recipe version 2.0.0-beta.3 --- build.cake | 103 +----------------- src/Directory.Build.props | 5 +- src/agent/nunit-agent-net80.csproj | 4 +- .../nunit-agent-launcher-net80.csproj | 4 +- .../nunit-agent-launcher-net80.tests.csproj | 2 +- 5 files changed, 10 insertions(+), 108 deletions(-) diff --git a/build.cake b/build.cake index 5f0f88a..71a893d 100644 --- a/build.cake +++ b/build.cake @@ -1,5 +1,5 @@ // Load the recipe -#load nuget:?package=NUnit.Cake.Recipe&version=1.6.0 +#load nuget:?package=NUnit.Cake.Recipe&version=2.0.0-beta.3 // Comment out above line and uncomment below for local tests of recipe changes //#load ../NUnit.Cake.Recipe/recipe/*.cake @@ -15,26 +15,6 @@ BuildSettings.Initialize ); var PackageTests = new PackageTest[] { - //new PackageTest(1, "NetCore11PackageTest") - //{ - // Description = "Run mock-assembly.dll targeting .NET Core 1.1", - // Arguments = "tests/netcoreapp1.1/mock-assembly.dll", - // ExpectedResult = new ExpectedResult("Failed") - // { - // Total = 35, Passed = 21, Failed = 5, Warnings = 1, Inconclusive = 1, Skipped = 7, - // Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly.dll") } - // } - //}, - //new PackageTest(1, "NetCore21PackageTest") - //{ - // Description = "Run mock-assembly.dll targeting .NET Core 2.1", - // Arguments = "tests/netcoreapp2.1/mock-assembly.dll", - // ExpectedResult = new ExpectedResult("Failed") - // { - // Total = 35, Passed = 21, Failed = 5, Warnings = 1, Inconclusive = 1, Skipped = 7, - // Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly.dll") } - // } - //}, new PackageTest(1, "NetCore31PackageTest") { Description = "Run mock-assembly.dll targeting .NET Core 3.1", @@ -45,16 +25,6 @@ var PackageTests = new PackageTest[] { Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly.dll") } } }, - //new PackageTest(1, "Net50PackageTest") - //{ - // Description = "Run mock-assembly.dll targeting .NET 5.0", - // Arguments = "testdata/net5.0/mock-assembly.dll", - // ExpectedResult = new ExpectedResult("Failed") - // { - // Total = 35, Passed = 21, Failed = 5, Warnings = 1, Inconclusive = 1, Skipped = 7, - // Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly.dll") } - // } - //}, new PackageTest(1, "Net60PackageTest") { Description = "Run mock-assembly.dll targeting .NET 6.0", @@ -138,80 +108,9 @@ BuildSettings.Packages.Add(new ChocolateyPackage( "nunit.extensibility.api.dll", "nunit.extensibility.dll", "nunit.agent.core.dll", "TestCentric.Metadata.dll", "Microsoft.Extensions.DependencyModel.dll") }, -// packageContent: new PackageContent() -// .WithRootFiles("../../nunit.png") -// .WithDirectories( -// new DirectoryContent("tools").WithFiles( -// "../../LICENSE.txt", "../../README.md", "../../VERIFICATION.txt", -// "net80-agent-launcher.dll", "net80-agent-launcher.pdb", -// "NUnit.Extensibility.Api.dll", "NUnit.Engine.Api.dll"), -// new DirectoryContent("tools/agent").WithFiles( -// "agent/net80-agent.dll", "agent/net80-agent.pdb", "agent/net80-agent.dll.config", "agent/NUnit.Agent.Core.dll", -// "agent/net80-agent.deps.json", $"agent/net80-agent.runtimeconfig.json", -// "agent/NUnit.InternalTrace.dll", "agent/NUnit.Metadata.dll", -// "agent/NUnit.Extensibility.dll", "agent/NUnit.Extensibility.Api.dll", -// "agent/NUnit.Engine.Api.dll", "agent/Microsoft.Extensions.DependencyModel.dll")), testRunner: new AgentRunner(BuildSettings.ChocolateyTestDirectory + "nunit-extension-net80-pluggable-agent." + BuildSettings.PackageVersion + "/tools/agent/nunit-agent-net80.dll"), tests: PackageTests)); -Task("PublishToNuGet") - .Description(""" - Publishes packages to NuGet for an alpha, beta, rc or final release. If not, - or if the --nopush option was used, a message is displayed. - """) - .Does(() => - { - if (!BuildSettings.ShouldPublishToNuGet) - Information("Nothing to publish to NuGet from this run."); - else if (CommandLineOptions.NoPush) - Information("NoPush option suppressing publication to NuGet"); - else - foreach (var package in BuildSettings.Packages) - { - var packageName = $"{package.PackageId}.{BuildSettings.PackageVersion}.nupkg"; - var packagePath = BuildSettings.PackageDirectory + packageName; - try - { - if (package.PackageType == PackageType.NuGet) - NuGetPush(packagePath, new NuGetPushSettings() { ApiKey = BuildSettings.NuGetApiKey, Source = BuildSettings.NuGetPushUrl }); - } - catch (Exception ex) - { - Error(ex.Message); - throw; - } - } - }); - -Task("PublishToChocolatey") - .Description(""" - Publishes packages to Chocolatey for an alpha, beta, rc or final release. - If not, or if the --nopush option was used, a message is displayed. - """) - .Does(() => - { - if (!BuildSettings.ShouldPublishToChocolatey) - Information("Nothing to publish to Chocolatey from this run."); - else if (CommandLineOptions.NoPush) - Information("NoPush option suppressing publication to Chocolatey"); - else - foreach (var package in BuildSettings.Packages) - { - var packageName = $"{package.PackageId}.{BuildSettings.PackageVersion}.nupkg"; - var packagePath = BuildSettings.PackageDirectory + packageName; - try - { - if (package.PackageType == PackageType.Chocolatey) - ChocolateyPush(packagePath, new ChocolateyPushSettings() { ApiKey = BuildSettings.ChocolateyApiKey, Source = BuildSettings.ChocolateyPushUrl }); - } - catch (Exception ex) - { - Error(ex.Message); - throw; - } - } - }); - ////////////////////////////////////////////////////////////////////// // EXECUTION ////////////////////////////////////////////////////////////////////// diff --git a/src/Directory.Build.props b/src/Directory.Build.props index cfb3068..f50b886 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -8,6 +8,9 @@ true true Minimum - + + 4.0.0-beta.2 + 4.0.0-beta.2 + diff --git a/src/agent/nunit-agent-net80.csproj b/src/agent/nunit-agent-net80.csproj index 4df3e67..d99e126 100644 --- a/src/agent/nunit-agent-net80.csproj +++ b/src/agent/nunit-agent-net80.csproj @@ -24,8 +24,8 @@ - - + + \ No newline at end of file diff --git a/src/launcher/nunit-agent-launcher-net80.csproj b/src/launcher/nunit-agent-launcher-net80.csproj index efcca9c..e327ec3 100644 --- a/src/launcher/nunit-agent-launcher-net80.csproj +++ b/src/launcher/nunit-agent-launcher-net80.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/src/tests/nunit-agent-launcher-net80.tests.csproj b/src/tests/nunit-agent-launcher-net80.tests.csproj index 78caa7d..e77a316 100644 --- a/src/tests/nunit-agent-launcher-net80.tests.csproj +++ b/src/tests/nunit-agent-launcher-net80.tests.csproj @@ -23,7 +23,7 @@ - +