@@ -122,6 +122,7 @@ let failOnBadExitAndPrint (p : ProcessResult) =
122
122
123
123
failwithf " failed with exitcode %d " p.ExitCode
124
124
125
+ let isPublishToGitHub ctx = ctx.Context.FinalTarget = " PublishToGitHub"
125
126
126
127
let isCI = lazy environVarAsBoolOrDefault " CI" false
127
128
@@ -229,9 +230,8 @@ let failOnCIBuild () =
229
230
if isCI.Value then
230
231
failwith " On CI. If you want to run this target, please use a local build."
231
232
232
- let allPublishChecks () =
233
- failOnLocalBuild ()
234
- Changelog.failOnEmptyChangelog latestEntry
233
+ let allPublishChecks () = failOnLocalBuild ()
234
+ //Changelog.failOnEmptyChangelog latestEntry
235
235
236
236
//-----------------------------------------------------------------------------
237
237
// Target Implementations
@@ -266,7 +266,23 @@ let dotnetRestore _ =
266
266
|> Seq.iter ( retryIfInCI 10 )
267
267
268
268
let updateChangelog ctx =
269
- latestEntry <- Changelog.updateChangelog changelogPath changelog gitHubRepoUrl ctx
269
+ latestEntry <-
270
+ if not <| isPublishToGitHub ctx then
271
+ Changelog.updateChangelog changelogPath changelog gitHubRepoUrl ctx
272
+ else
273
+ let latest = changelog.LatestEntry
274
+ let semVer = {
275
+ latest.SemVer with
276
+ Original = None
277
+ Patch = latest.SemVer.Patch + 1 u
278
+ PreRelease = PreRelease.TryParse " ci"
279
+ }
280
+ {
281
+ latest with
282
+ SemVer = semVer
283
+ NuGetVersion = semVer.AsString
284
+ AssemblyVersion = semVer.AsString
285
+ }
270
286
271
287
let revertChangelog _ =
272
288
if String.isNotNullOrEmpty Changelog.changelogBackupFilename then
@@ -280,13 +296,13 @@ let deleteChangelogBackupFile _ =
280
296
let getPackageVersionProperty publishToGitHub =
281
297
if publishToGitHub then
282
298
let runId = Environment.environVar " GITHUB_RUN_ID"
283
- $" /p:PackageVersion=%s {latestEntry.NuGetVersion}-ci- %s {runId}"
299
+ $" /p:PackageVersion=%s {latestEntry.NuGetVersion}-%s {runId}"
284
300
else
285
301
$" /p:PackageVersion=%s {latestEntry.NuGetVersion}"
286
302
287
303
let dotnetBuild ctx =
288
304
289
- let publishToGitHub = ctx.Context.FinalTarget = " PublishToGitHub "
305
+ let publishToGitHub = isPublishToGitHub ctx
290
306
291
307
let args = [ getPackageVersionProperty publishToGitHub; " --no-restore" ]
292
308
@@ -447,10 +463,7 @@ let dotnetPack ctx =
447
463
// Get release notes with properly-linked version number
448
464
let releaseNotes = Changelog.mkReleaseNotes changelog latestEntry gitHubRepoUrl
449
465
450
- let args = [
451
- getPackageVersionProperty ( ctx.Context.FinalTarget = " PublishToGitHub" )
452
- $" /p:PackageReleaseNotes=\" {releaseNotes}\" "
453
- ]
466
+ let args = [ getPackageVersionProperty ( isPublishToGitHub ctx); $" /p:PackageReleaseNotes=\" {releaseNotes}\" " ]
454
467
455
468
DotNet.pack
456
469
( fun c -> {
@@ -531,7 +544,6 @@ let githubRelease _ =
531
544
532
545
let files = !! distGlob
533
546
// Get release notes with properly-linked version number
534
-
535
547
let releaseNotes = Changelog.mkReleaseNotes changelog latestEntry gitHubRepoUrl
536
548
537
549
GitHub.createClientWithToken token
@@ -659,7 +671,7 @@ let initTargets (ctx : Context.FakeExecutionContext) =
659
671
==>! " ShowCoverageReport"
660
672
661
673
" UpdateChangelog"
662
- =?> ( " GenerateAssemblyInfo" , not isPublishToGitHub )
674
+ ==> " GenerateAssemblyInfo"
663
675
==> " GitRelease"
664
676
==>! " Release"
665
677
0 commit comments