Skip to content

Commit 43fd02c

Browse files
authored
Merge pull request #1840 from nunit/issue-1839
Remove chocolatey package from CI build
2 parents 91c0cbc + f7dc841 commit 43fd02c

1 file changed

Lines changed: 2 additions & 23 deletions

File tree

build.cake

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ PackageDefinition NUnitConsoleRunnerDotNetToolPackage = new DotNetToolPackage(
144144
testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory + "nunit.exe"),
145145
tests: NetCoreRunnerTests);
146146

147-
// NOTE: The final three packages continue to use a nuspec file for various reasons
147+
// NOTE: The final two packages continue to use a nuspec file for various reasons
148148

149149
// 1. NUnit.ConsoleRunner needs to use it to specify the bundled pluggable agents
150150
PackageDefinition NUnitConsoleRunnerNuGetPackage = new NuGetPackage(
@@ -168,27 +168,7 @@ PackageDefinition NUnitConsoleRunnerNuGetPackage = new NuGetPackage(
168168
+ $"NUnit.ConsoleRunner.{BuildSettings.PackageVersion}/tools/nunit-console.exe"),
169169
tests: StandardRunnerTests);
170170

171-
// 3. The chocolatey console runner has to follow special chocolatey conventions
172-
PackageDefinition NUnitConsoleRunnerChocolateyPackage = new ChocolateyPackage(
173-
id: "nunit-console-runner",
174-
description: RUNNER_DESCRIPTION,
175-
packageContent: new PackageContent()
176-
.WithDirectories(
177-
new DirectoryContent("tools").WithFiles(
178-
"../../LICENSE.txt", "../../NOTICES.txt", "../../choco/VERIFICATION.txt",
179-
"net462/nunit-console.exe", "net462/nunit-console.exe.config",
180-
"net462/nunit.engine.dll", "net462/nunit.extensibility.dll", "net462/nunit.extensibility.api.dll",
181-
"net462/nunit.common.dll", "net462/nunit.engine.api.dll", "net462/testcentric.metadata.dll") )
182-
.WithDependencies(KnownExtensions.BundledChocolateyAgents),
183-
// Keeping separate check for dependencies until PackageContent automatic verification handles them
184-
checks: new PackageCheck[] {
185-
HasDependencies(KnownExtensions.BundledChocolateyAgents)
186-
},
187-
testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory
188-
+ $"nunit-console-runner.{BuildSettings.PackageVersion}/tools/nunit-console.exe"),
189-
tests: StandardRunnerTests);
190-
191-
// NUnit.Console is a meta-package and is built using a nuspec file
171+
// 2. NUnit.Console is a meta-package and is built using a nuspec file
192172
PackageDefinition NUnitConsoleNuGetPackage = new NuGetPackage(
193173
id: "NUnit.Console",
194174
source: BuildSettings.NuGetDirectory + "runners/nunit.console-runner-with-extensions.nuspec",
@@ -206,7 +186,6 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
206186
NUnitEnginePackage,
207187
NUnitConsoleRunnerDotNetToolPackage,
208188
NUnitConsoleRunnerNuGetPackage,
209-
NUnitConsoleRunnerChocolateyPackage,
210189
NUnitConsoleNuGetPackage
211190
});
212191

0 commit comments

Comments
 (0)