Skip to content

Commit 267332c

Browse files
gep13gep13
committed
Merge branch 'release/0.13.0'
* release/0.13.0: (#61) Add override for OpenCover (#62) ToLower() to argument (maint) Formatting (#62) Don't run any unit tests when argument set (maint) Correct spelling of NuGet (maint) Renamed CanUseGitReleaseManager property (#61) Renamed ShouldPublishGitHub (#61) Add new criteria to tasks (#61) Alphabetical all the things! (maint) Renamed all DotNetCore tasks (maint) Remove Upload-Artifacts-Task
2 parents ff59a53 + 1ac87f7 commit 267332c

10 files changed

+299
-219
lines changed

‎Chocolatey.Cake.Recipe/Content/build.cake

+18-34
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Setup<BuildData>(context =>
1919
context.Log.Verbosity = Verbosity.Diagnostic;
2020
}
2121

22-
RequireTool(BuildParameters.IsDotNetCoreBuild || BuildParameters.PreferDotNetGlobalToolUsage ? ToolSettings.GitVersionGlobalTool : ToolSettings.GitVersionTool, () => {
22+
RequireTool(BuildParameters.IsDotNetBuild || BuildParameters.PreferDotNetGlobalToolUsage ? ToolSettings.GitVersionGlobalTool : ToolSettings.GitVersionTool, () => {
2323
BuildParameters.SetBuildVersion(
2424
BuildVersion.CalculatingSemanticVersion(
2525
context: Context,
@@ -74,7 +74,7 @@ BuildParameters.Tasks.RestoreTask = Task("Restore")
7474
});
7575
});
7676

77-
BuildParameters.Tasks.DotNetCoreRestoreTask = Task("DotNetCoreRestore")
77+
BuildParameters.Tasks.DotNetRestoreTask = Task("DotNetRestore")
7878
.IsDependentOn("Clean")
7979
.Does(() =>
8080
{
@@ -156,9 +156,9 @@ BuildParameters.Tasks.BuildTask = Task("Build")
156156
CopyBuildOutput();
157157
}));
158158

159-
BuildParameters.Tasks.DotNetCoreBuildTask = Task("DotNetCoreBuild")
159+
BuildParameters.Tasks.DotNetBuildTask = Task("DotNetBuild")
160160
.IsDependentOn("Clean")
161-
.IsDependentOn("DotNetCoreRestore")
161+
.IsDependentOn("DotNetRestore")
162162
.Does(() => {
163163
Information("Building {0}", BuildParameters.SolutionFilePath);
164164

@@ -226,7 +226,7 @@ public void CopyBuildOutput()
226226
Information("AssemblyName: {0}", parsedProject.AssemblyName);
227227
Information("IsLibrary: {0}", parsedProject.IsLibrary());
228228

229-
if (BuildParameters.IsDotNetCoreBuild)
229+
if (BuildParameters.IsDotNetBuild)
230230
{
231231
Information("IsGlobalTool: {0}", parsedProject.IsGlobalTool());
232232
}
@@ -304,7 +304,7 @@ public void CopyBuildOutput()
304304

305305
foreach (var targetFramework in parsedProject.NetCore.TargetFrameworks)
306306
{
307-
Information("Running DotNetCorePublish for {0}...", project.Path.FullPath);
307+
Information("Running dotnet publish for {0}...", project.Path.FullPath);
308308

309309
DotNetCorePublish(project.Path.FullPath, new DotNetCorePublishSettings {
310310
OutputDirectory = outputFolder.Combine(targetFramework),
@@ -366,7 +366,7 @@ public void CopyBuildOutput()
366366

367367
foreach (var targetFramework in parsedProject.NetCore.TargetFrameworks)
368368
{
369-
Information("Running DotNetCorePublish for {0}...", project.Path.FullPath);
369+
Information("Running dotnet publish for {0}...", project.Path.FullPath);
370370

371371
DotNetCorePublish(project.Path.FullPath, new DotNetCorePublishSettings {
372372
OutputDirectory = outputFolder.Combine(targetFramework),
@@ -421,23 +421,7 @@ BuildParameters.Tasks.DefaultTask = Task("Default")
421421
.IsDependentOn("Package");
422422

423423

424-
BuildParameters.Tasks.UploadArtifactsTask = Task("Upload-Artifacts")
425-
.IsDependentOn("Package")
426-
.WithCriteria(() => !BuildParameters.IsLocalBuild || BuildParameters.ForceContinuousIntegration, "Skipping because this is a local build, and force isn't being applied")
427-
.WithCriteria(() => DirectoryExists(BuildParameters.Paths.Directories.NuGetPackages) || DirectoryExists(BuildParameters.Paths.Directories.ChocolateyPackages), "Skipping because no packages to upload")
428-
.Does(() =>
429-
{
430-
// Concatenating FilePathCollections should make sure we get unique FilePaths
431-
foreach (var package in GetFiles(BuildParameters.Paths.Directories.Packages + "/*") +
432-
GetFiles(BuildParameters.Paths.Directories.NuGetPackages + "/*") +
433-
GetFiles(BuildParameters.Paths.Directories.ChocolateyPackages + "/*"))
434-
{
435-
BuildParameters.BuildProvider.UploadArtifact(package);
436-
}
437-
});
438-
439424
BuildParameters.Tasks.ContinuousIntegrationTask = Task("CI")
440-
.IsDependentOn("Upload-Artifacts")
441425
.IsDependentOn("Publish-PreRelease-Packages")
442426
.IsDependentOn("Publish-Release-Packages")
443427
.IsDependentOn("Publish-GitHub-Release")
@@ -478,25 +462,25 @@ public class Builder
478462

479463
public void Run()
480464
{
481-
BuildParameters.IsDotNetCoreBuild = false;
465+
BuildParameters.IsDotNetBuild = false;
482466

483-
SetupTasks(BuildParameters.IsDotNetCoreBuild);
467+
SetupTasks(BuildParameters.IsDotNetBuild);
484468

485469
_action(BuildParameters.Target);
486470
}
487471

488-
public void RunDotNetCore()
472+
public void RunDotNet()
489473
{
490-
BuildParameters.IsDotNetCoreBuild = true;
474+
BuildParameters.IsDotNetBuild = true;
491475

492-
SetupTasks(BuildParameters.IsDotNetCoreBuild);
476+
SetupTasks(BuildParameters.IsDotNetBuild);
493477

494478
_action(BuildParameters.Target);
495479
}
496480

497-
private static void SetupTasks(bool isDotNetCoreBuild)
481+
private static void SetupTasks(bool isDotNetBuild)
498482
{
499-
var prefix = isDotNetCoreBuild ? "DotNetCore" : "";
483+
var prefix = isDotNetBuild ? "DotNet" : "";
500484

501485
BuildParameters.Tasks.PackageTask.IsDependentOn("Test");
502486
BuildParameters.Tasks.PackageTask.IsDependentOn("Analyze");
@@ -521,9 +505,9 @@ public class Builder
521505
BuildParameters.Tasks.ConfigurationBuilderTask.IsDependentOn(prefix + "Build");
522506
BuildParameters.Tasks.TestTask.IsDependentOn(prefix + "Build");
523507

524-
if (!isDotNetCoreBuild)
508+
if (!isDotNetBuild)
525509
{
526-
if (BuildParameters.TransifexEnabled)
510+
if (BuildParameters.ShouldRunTransifex)
527511
{
528512
BuildParameters.Tasks.BuildTask.IsDependentOn("Transifex-Pull-Translations");
529513
}
@@ -541,9 +525,9 @@ public class Builder
541525
}
542526
else
543527
{
544-
if (BuildParameters.TransifexEnabled)
528+
if (BuildParameters.ShouldRunTransifex)
545529
{
546-
BuildParameters.Tasks.DotNetCoreBuildTask.IsDependentOn("Transifex-Pull-Translations");
530+
BuildParameters.Tasks.DotNetBuildTask.IsDependentOn("Transifex-Pull-Translations");
547531
}
548532

549533
BuildParameters.Tasks.PackageTask.IsDependentOn(prefix + "Pack");

‎Chocolatey.Cake.Recipe/Content/gitreleasemanager.cake

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
///////////////////////////////////////////////////////////////////////////////
44

55
BuildParameters.Tasks.CreateReleaseNotesTask = Task("Create-Release-Notes")
6-
.Does(() => RequireTool(BuildParameters.IsDotNetCoreBuild || BuildParameters.PreferDotNetGlobalToolUsage ? ToolSettings.GitReleaseManagerGlobalTool : ToolSettings.GitReleaseManagerTool, () => {
7-
if (BuildParameters.CanUseGitReleaseManager)
6+
.Does(() => RequireTool(BuildParameters.IsDotNetBuild || BuildParameters.PreferDotNetGlobalToolUsage ? ToolSettings.GitReleaseManagerGlobalTool : ToolSettings.GitReleaseManagerTool, () => {
7+
if (BuildParameters.CanRunGitReleaseManager)
88
{
99
var settings = new GitReleaseManagerCreateSettings
1010
{
@@ -33,8 +33,8 @@ BuildParameters.Tasks.ExportReleaseNotesTask = Task("Export-Release-Notes")
3333
.WithCriteria(() => !BuildParameters.IsPullRequest || BuildParameters.PrepareLocalRelease, "Skipping because this is pull request, and is not preparing local release")
3434
.WithCriteria(() => BuildParameters.BranchType == BranchType.Master || BuildParameters.BranchType == BranchType.Release || BuildParameters.BranchType == BranchType.HotFix || BuildParameters.PrepareLocalRelease, "Skipping because this is not a releasable branch, and is not preparing local release")
3535
.WithCriteria(() => BuildParameters.IsTagged || BuildParameters.PrepareLocalRelease, "Skipping because this is not a tagged build, and is not preparing local release")
36-
.Does(() => RequireTool(BuildParameters.IsDotNetCoreBuild || BuildParameters.PreferDotNetGlobalToolUsage ? ToolSettings.GitReleaseManagerGlobalTool : ToolSettings.GitReleaseManagerTool, () => {
37-
if (BuildParameters.CanUseGitReleaseManager)
36+
.Does(() => RequireTool(BuildParameters.IsDotNetBuild || BuildParameters.PreferDotNetGlobalToolUsage ? ToolSettings.GitReleaseManagerGlobalTool : ToolSettings.GitReleaseManagerTool, () => {
37+
if (BuildParameters.CanRunGitReleaseManager)
3838
{
3939
if (BuildParameters.ShouldDownloadMilestoneReleaseNotes)
4040
{
@@ -64,9 +64,9 @@ BuildParameters.Tasks.PublishGitHubReleaseTask = Task("Publish-GitHub-Release")
6464
.WithCriteria(() => !BuildParameters.IsPullRequest, "Skipping because this is pull request")
6565
.WithCriteria(() => BuildParameters.BranchType == BranchType.Master || BuildParameters.BranchType == BranchType.Release || BuildParameters.BranchType == BranchType.HotFix, "Skipping because this is not a releasable branch")
6666
.WithCriteria(() => BuildParameters.IsTagged, "Skipping because this is not a tagged build")
67-
.WithCriteria(() => BuildParameters.ShouldPublishGitHub, "Skipping because this publishing GitHub Release is disabled via parameters (perhaps the default value?")
68-
.Does(() => RequireTool(BuildParameters.IsDotNetCoreBuild || BuildParameters.PreferDotNetGlobalToolUsage ? ToolSettings.GitReleaseManagerGlobalTool : ToolSettings.GitReleaseManagerTool, () => {
69-
if (BuildParameters.CanUseGitReleaseManager)
67+
.WithCriteria(() => BuildParameters.ShouldRunGitReleaseManager, "Skipping because this publishing running GitReleaseManager is disabled via parameters (perhaps the default value?")
68+
.Does(() => RequireTool(BuildParameters.IsDotNetBuild || BuildParameters.PreferDotNetGlobalToolUsage ? ToolSettings.GitReleaseManagerGlobalTool : ToolSettings.GitReleaseManagerTool, () => {
69+
if (BuildParameters.CanRunGitReleaseManager)
7070
{
7171
// Concatenating FilePathCollections should make sure we get unique FilePaths
7272
foreach (var package in GetFiles(BuildParameters.Paths.Directories.Packages + "/*") +
@@ -92,8 +92,8 @@ BuildParameters.Tasks.PublishGitHubReleaseTask = Task("Publish-GitHub-Release")
9292
});
9393

9494
BuildParameters.Tasks.CreateDefaultLabelsTask = Task("Create-Default-Labels")
95-
.Does(() => RequireTool(BuildParameters.IsDotNetCoreBuild || BuildParameters.PreferDotNetGlobalToolUsage ? ToolSettings.GitReleaseManagerGlobalTool : ToolSettings.GitReleaseManagerTool, () => {
96-
if (BuildParameters.CanUseGitReleaseManager)
95+
.Does(() => RequireTool(BuildParameters.IsDotNetBuild || BuildParameters.PreferDotNetGlobalToolUsage ? ToolSettings.GitReleaseManagerGlobalTool : ToolSettings.GitReleaseManagerTool, () => {
96+
if (BuildParameters.CanRunGitReleaseManager)
9797
{
9898
GitReleaseManagerLabel(BuildParameters.GitHub.Token, BuildParameters.RepositoryOwner, BuildParameters.RepositoryName);
9999
}

‎Chocolatey.Cake.Recipe/Content/gitversion.cake

+17
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,23 @@ public class BuildVersion
2020

2121
string cakeVersion = typeof(ICakeContext).Assembly.GetName().Version.ToString();
2222

23+
if (!BuildParameters.ShouldRunGitVersion)
24+
{
25+
context.Information("Running GitVersion is not enabled, so returning default values...");
26+
27+
return new BuildVersion
28+
{
29+
MajorMinorPatch = "0.1.0",
30+
SemVersion = "0.1.0-alpha.0",
31+
Milestone = "0.1.0",
32+
CakeVersion = cakeVersion,
33+
FileVersion = "0.1.0.0",
34+
PackageVersion = "0.1.0-alpha-20220317-13",
35+
InformationalVersion = "0.1.0-alpha.0+Branch.develop.Sha.528f9bf572a52f0660cbe3f4d109599eab1e9866",
36+
FullSemVersion = "0.1.0-alpha.0",
37+
};
38+
}
39+
2340
try
2441
{
2542
context.Information("Testing to see if valid git repository...");

‎Chocolatey.Cake.Recipe/Content/ilmerge.cake

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
BuildParameters.Tasks.ILMergeTask = Task("Run-ILMerge")
22
.IsDependeeOf("Copy-Nuspec-Folders")
3+
.WithCriteria(() => BuildParameters.ShouldRunILMerge, "Skipping because ILMerge is not enabled")
34
.WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping because not running on Windows")
45
.Does(() => RequireTool(ToolSettings.ILMergeTool, () =>
56
{
@@ -16,7 +17,7 @@ BuildParameters.Tasks.ILMergeTask = Task("Run-ILMerge")
1617

1718
Information("Running ILMerge...");
1819
ILMerge(ilMergeConfig.Output, ilMergeConfig.PrimaryAssemblyName, ilMergeConfig.AssemblyPaths, settings);
19-
20+
2021
if (FileExists(ilMergeConfig.LogFile))
2122
{
2223
BuildParameters.BuildProvider.UploadArtifact(ilMergeConfig.LogFile);

‎Chocolatey.Cake.Recipe/Content/packages.cake

+8-6
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ BuildParameters.Tasks.CreateNuGetPackagesTask = Task("Create-NuGet-Packages")
9595
}
9696
});
9797

98-
BuildParameters.Tasks.DotNetCorePackTask = Task("DotNetCorePack")
99-
.IsDependentOn("DotNetCoreBuild")
100-
.WithCriteria(() => BuildParameters.ShouldRunDotNetCorePack, "Skipping because packaging through .NET Core is disabled")
98+
BuildParameters.Tasks.DotNetPackTask = Task("DotNetPack")
99+
.IsDependentOn("DotNetBuild")
100+
.WithCriteria(() => BuildParameters.ShouldRunDotNetPack, "Skipping because packaging through .NET Core is disabled")
101101
.Does(() =>
102102
{
103103
var projects = GetFiles(BuildParameters.SourceDirectoryPath + "/**/*.csproj")
@@ -119,7 +119,7 @@ BuildParameters.Tasks.DotNetCorePackTask = Task("DotNetCorePack")
119119
.WithProperty("FileVersion", BuildParameters.Version.FileVersion)
120120
.WithProperty("AssemblyInformationalVersion", BuildParameters.Version.InformationalVersion);
121121

122-
if (BuildParameters.ShouldBuildNugetSourcePackage)
122+
if (BuildParameters.ShouldBuildNuGetSourcePackage)
123123
{
124124
msBuildSettings.WithProperty("SymbolPackageFormat", "snupkg");
125125
}
@@ -130,8 +130,8 @@ BuildParameters.Tasks.DotNetCorePackTask = Task("DotNetCorePack")
130130
Configuration = BuildParameters.Configuration,
131131
OutputDirectory = BuildParameters.Paths.Directories.NuGetPackages,
132132
MSBuildSettings = msBuildSettings,
133-
IncludeSource = BuildParameters.ShouldBuildNugetSourcePackage,
134-
IncludeSymbols = BuildParameters.ShouldBuildNugetSourcePackage,
133+
IncludeSource = BuildParameters.ShouldBuildNuGetSourcePackage,
134+
IncludeSymbols = BuildParameters.ShouldBuildNuGetSourcePackage,
135135
};
136136

137137
foreach (var project in projects)
@@ -141,6 +141,7 @@ BuildParameters.Tasks.DotNetCorePackTask = Task("DotNetCorePack")
141141
});
142142

143143
BuildParameters.Tasks.PublishPreReleasePackagesTask = Task("Publish-PreRelease-Packages")
144+
.WithCriteria(() => BuildParameters.ShouldPublishPreReleasePackages, "Skipping because publishing of pre-release packages is not enabled")
144145
.WithCriteria(() => !BuildParameters.IsLocalBuild || BuildParameters.ForceContinuousIntegration, "Skipping because this is a local build, and force isn't being applied")
145146
.WithCriteria(() => !BuildParameters.IsPullRequest, "Skipping because current build is from a Pull Request")
146147
.WithCriteria(() => !BuildParameters.IsTagged, "Skipping because current commit is tagged")
@@ -162,6 +163,7 @@ BuildParameters.Tasks.PublishPreReleasePackagesTask = Task("Publish-PreRelease-P
162163
});
163164

164165
BuildParameters.Tasks.PublishReleasePackagesTask = Task("Publish-Release-Packages")
166+
.WithCriteria(() => BuildParameters.ShouldPublishReleasePackages, "Skipping because publishing of release packages is not enabled")
165167
.WithCriteria(() => !BuildParameters.IsLocalBuild || BuildParameters.ForceContinuousIntegration, "Skipping because this is a local build, and force isn't being applied")
166168
.WithCriteria(() => !BuildParameters.IsPullRequest, "Skipping because current build is from a Pull Request")
167169
.WithCriteria(() => BuildParameters.IsTagged, "Skipping because current commit is not tagged")

0 commit comments

Comments
 (0)