@@ -127,6 +127,7 @@ Task("Version")
127
127
. Does ( ( ) =>
128
128
{
129
129
versioning = GetNuGetVersionForCommit ( ) ;
130
+ versioning . NuGetVersion ??= ( target == Release ) ? versioning . MajorMinorPatch : versioning . SemVer ;
130
131
Information ( "#########################" ) ;
131
132
Information ( "# SemVer Information" ) ;
132
133
Information ( "#========================" ) ;
@@ -137,15 +138,15 @@ Task("Version")
137
138
Information ( $ "# { nameof ( versioning . InformationalVersion ) } : { versioning . InformationalVersion } ") ;
138
139
Information ( "#########################" ) ;
139
140
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
+ }
149
150
} ) ;
150
151
151
152
Task( "GitLogUniqContributors" )
@@ -177,7 +178,7 @@ Task("CreateReleaseNotes")
177
178
Information ( $ "Generating release notes at { releaseNotesFile } ") ;
178
179
var lastReleaseTags = GitHelper ( "describe --tags --abbrev=0 --exclude net*" ) ;
179
180
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 ;
181
182
182
183
// Read main header from Git file, substitute version in header, and add content further...
183
184
Information ( "{0} New release tag is " + releaseVersion ) ;
@@ -690,7 +691,7 @@ Task("DownloadGitHubReleaseArtifacts")
690
691
System . Threading . Thread . Sleep ( 5000 ) ;
691
692
EnsureDirectoryExists ( packagesDir ) ;
692
693
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 ;
694
695
var releaseInfo = await GetResourceAsync ( releaseUrl ) ;
695
696
var assets_url = Newtonsoft . Json . Linq . JObject . Parse ( releaseInfo )
696
697
. Value < string > ( "assets_url" ) ;
@@ -869,7 +870,8 @@ private void SetupGitHubClient(System.Net.Http.HttpClient client)
869
870
870
871
private dynamic CreateGitHubRelease ( )
871
872
{
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 }}";
873
875
var content = new System . Net . Http . StringContent ( json , System . Text . Encoding . UTF8 , "application/json" ) ;
874
876
875
877
using ( var client = new System . Net . Http . HttpClient ( ) )
@@ -924,7 +926,8 @@ private void CompleteGitHubRelease(dynamic release)
924
926
{
925
927
int releaseId = release . id ;
926
928
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 }}";
928
931
var request = new System . Net . Http . HttpRequestMessage ( new System . Net . Http . HttpMethod ( "Patch" ) , url ) ; // $"https://api.github.com/repos/ThreeMammals/Ocelot/releases/{releaseId}");
929
932
request . Content = new System . Net . Http . StringContent ( json , System . Text . Encoding . UTF8 , "application/json" ) ;
930
933
0 commit comments