From 71ba9eb046b4f40bfd770bdd57c9b1f678758ea8 Mon Sep 17 00:00:00 2001 From: Terje Sandstrom Date: Mon, 8 Apr 2024 10:35:26 +0200 Subject: [PATCH] Removing builds, updating cake script. Fixes #1159 --- NUnit3TestAdapter.sln | 2 -- build.cake | 48 ++----------------------------------------- 2 files changed, 2 insertions(+), 48 deletions(-) diff --git a/NUnit3TestAdapter.sln b/NUnit3TestAdapter.sln index 880d2f99..0ad680df 100644 --- a/NUnit3TestAdapter.sln +++ b/NUnit3TestAdapter.sln @@ -7,8 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig .gitignore = .gitignore .runsettings = .runsettings - appveyor.yml = appveyor.yml - azure-pipelines.yml = azure-pipelines.yml build.cake = build.cake build.cmd = build.cmd build.ps1 = build.ps1 diff --git a/build.cake b/build.cake index ca720c11..8cba4f35 100644 --- a/build.cake +++ b/build.cake @@ -1,5 +1,5 @@ -#tool vswhere&version=3.1.1 -#tool Microsoft.TestPlatform&version=17.7.2 +#tool vswhere&version=3.1.7 +#tool Microsoft.TestPlatform&version=17.9.0 ////////////////////////////////////////////////////////////////////// // ARGUMENTS @@ -20,43 +20,6 @@ var modifier = "-beta.1"; var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : ""; var packageVersion = version + modifier + dbgSuffix; Information("Packageversion: "+packageVersion); -if (BuildSystem.IsRunningOnAppVeyor) -{ - var tag = AppVeyor.Environment.Repository.Tag; - - if (tag.IsTag) - { - packageVersion = tag.Name; - } - else - { - var buildNumber = AppVeyor.Environment.Build.Number.ToString("00000"); - var branch = AppVeyor.Environment.Repository.Branch.Replace(".", "").Replace("/", ""); - var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest; - - if (branch == "master" && !isPullRequest) - { - packageVersion = version + "-dev-" + buildNumber + dbgSuffix; - } - else - { - var suffix = "-ci-" + buildNumber + dbgSuffix; - - if (isPullRequest) - suffix += "-pr-" + AppVeyor.Environment.PullRequest.Number; - else - suffix += "-" + System.Text.RegularExpressions.Regex.Replace(branch, "[^0-9A-Za-z-]+", "-"); - - // Nuget limits "special version part" to 20 chars. Add one for the hyphen. - if (suffix.Length > 21) - suffix = suffix.Substring(0, 21); - - packageVersion = version + suffix; - } - } - - AppVeyor.UpdateBuildVersion(packageVersion); -} var packageName = "NUnit3TestAdapter-" + packageVersion; @@ -349,13 +312,6 @@ Task("CI") .IsDependentOn("Package") .IsDependentOn("Acceptance"); -Task("Appveyor") - .IsDependentOn("Build") - .IsDependentOn("Test") - .IsDependentOn("Package") - .IsDependentOn("Acceptance"); - - Task("Default") .IsDependentOn("Build");