Skip to content

Commit abe7ab6

Browse files
committed
Release v24.0 | Upgrade to net9.0 TFM | .NET 9 release | +semver: major
1 parent 34b55b5 commit abe7ab6

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

build.cake

+16-13
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ Task("Version")
127127
.Does(() =>
128128
{
129129
versioning = GetNuGetVersionForCommit();
130+
versioning.NuGetVersion ??= (target == Release) ? versioning.MajorMinorPatch : versioning.SemVer;
130131
Information("#########################");
131132
Information("# SemVer Information");
132133
Information("#========================");
@@ -137,15 +138,15 @@ Task("Version")
137138
Information($"# {nameof(versioning.InformationalVersion)}: {versioning.InformationalVersion}");
138139
Information("#########################");
139140

140-
// if (IsRunningInCICD())
141-
// {
142-
Information("Persisting version number...");
143-
PersistVersion(committedVersion, versioning.SemVer);
144-
// }
145-
// else
146-
// {
147-
// Information("We are not running on build server, so we won't persist the version number.");
148-
// }
141+
if (IsRunningInCICD())
142+
{
143+
Information($"Persisting version number... {nameof(versioning.NuGetVersion)} -> {versioning.NuGetVersion}");
144+
PersistVersion(committedVersion, versioning.NuGetVersion);
145+
}
146+
else
147+
{
148+
Information("We are not running on build server, so we will not persist the version number.");
149+
}
149150
});
150151

151152
Task("GitLogUniqContributors")
@@ -177,7 +178,7 @@ Task("CreateReleaseNotes")
177178
Information($"Generating release notes at {releaseNotesFile}");
178179
var lastReleaseTags = GitHelper("describe --tags --abbrev=0 --exclude net*");
179180
var lastRelease = lastReleaseTags.First(t => !t.StartsWith("net")); // skip 'net*-vX.Y.Z' tag and take 'major.minor.build'
180-
var releaseVersion = versioning.SemVer;
181+
var releaseVersion = versioning.NuGetVersion;
181182

182183
// Read main header from Git file, substitute version in header, and add content further...
183184
Information("{0} New release tag is " + releaseVersion);
@@ -690,7 +691,7 @@ Task("DownloadGitHubReleaseArtifacts")
690691
System.Threading.Thread.Sleep(5000);
691692
EnsureDirectoryExists(packagesDir);
692693

693-
var releaseUrl = "https://api.github.com/repos/ThreeMammals/ocelot/releases/tags/" + versioning.SemVer;
694+
var releaseUrl = "https://api.github.com/repos/ThreeMammals/ocelot/releases/tags/" + versioning.NuGetVersion;
694695
var releaseInfo = await GetResourceAsync(releaseUrl);
695696
var assets_url = Newtonsoft.Json.Linq.JObject.Parse(releaseInfo)
696697
.Value<string>("assets_url");
@@ -869,7 +870,8 @@ private void SetupGitHubClient(System.Net.Http.HttpClient client)
869870

870871
private dynamic CreateGitHubRelease()
871872
{
872-
var json = $"{{ \"tag_name\": \"{versioning.SemVer}\", \"target_commitish\": \"{versioning.BranchName}\", \"name\": \"{versioning.SemVer}\", \"body\": \"{ReleaseNotesAsJson()}\", \"draft\": true, \"prerelease\": true, \"generate_release_notes\": false }}";
873+
var body = ReleaseNotesAsJson();
874+
var json = $"{{ \"tag_name\": \"{versioning.NuGetVersion}\", \"target_commitish\": \"{versioning.BranchName}\", \"name\": \"{versioning.NuGetVersion}\", \"body\": \"{body}\", \"draft\": true, \"prerelease\": true, \"generate_release_notes\": false }}";
873875
var content = new System.Net.Http.StringContent(json, System.Text.Encoding.UTF8, "application/json");
874876

875877
using (var client = new System.Net.Http.HttpClient())
@@ -924,7 +926,8 @@ private void CompleteGitHubRelease(dynamic release)
924926
{
925927
int releaseId = release.id;
926928
string url = release.url.ToString();
927-
var json = $"{{ \"tag_name\": \"{versioning.SemVer}\", \"target_commitish\": \"{versioning.BranchName}\", \"name\": \"{versioning.SemVer}\", \"body\": \"{ReleaseNotesAsJson()}\", \"draft\": false, \"prerelease\": false }}";
929+
string body = ReleaseNotesAsJson();
930+
var json = $"{{ \"tag_name\": \"{versioning.NuGetVersion}\", \"target_commitish\": \"{versioning.BranchName}\", \"name\": \"{versioning.NuGetVersion}\", \"body\": \"{body}\", \"draft\": false, \"prerelease\": false }}";
928931
var request = new System.Net.Http.HttpRequestMessage(new System.Net.Http.HttpMethod("Patch"), url); // $"https://api.github.com/repos/ThreeMammals/Ocelot/releases/{releaseId}");
929932
request.Content = new System.Net.Http.StringContent(json, System.Text.Encoding.UTF8, "application/json");
930933

0 commit comments

Comments
 (0)