diff --git a/build.cake b/build.cake index ab501e7..259560d 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 @@ -160,63 +160,6 @@ BuildSettings.Packages.Add(new ChocolateyPackage( testRunner: new AgentRunner(BuildSettings.ChocolateyTestDirectory + "nunit-extension-net90-pluggable-agent." + BuildSettings.PackageVersion + "/tools/agent/nunit-agent-net90.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-net90.csproj b/src/agent/nunit-agent-net90.csproj index dd6883c..5ccba64 100644 --- a/src/agent/nunit-agent-net90.csproj +++ b/src/agent/nunit-agent-net90.csproj @@ -25,8 +25,8 @@ - - + + \ No newline at end of file diff --git a/src/launcher/nunit-agent-launcher-net90.csproj b/src/launcher/nunit-agent-launcher-net90.csproj index efcca9c..e327ec3 100644 --- a/src/launcher/nunit-agent-launcher-net90.csproj +++ b/src/launcher/nunit-agent-launcher-net90.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/src/tests/nunit-agent-launcher-net90.tests.csproj b/src/tests/nunit-agent-launcher-net90.tests.csproj index 33d42b6..0d9abe3 100644 --- a/src/tests/nunit-agent-launcher-net90.tests.csproj +++ b/src/tests/nunit-agent-launcher-net90.tests.csproj @@ -23,7 +23,7 @@ - +