Skip to content

Commit a704d68

Browse files
committed
ILMerge Fake.Core.ReleaseNotes - fixes #4126
1 parent 050a37c commit a704d68

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

RELEASE_NOTES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#### 7.0.1 - 2022-03-01
1+
#### 7.0.2 - 2022-03-01
22
* Support for .NET 7.0
33
* Support as .NET 6.0 tool
44
* Auto-Restore after paket install an paket update

build.fsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ Target "MergePaketTool" (fun _ ->
293293
[
294294
"Argu.dll"
295295
"Chessie.dll"
296+
"Fake.Core.ReleaseNotes.dll"
296297
"FSharp.Core.dll"
297298
"Mono.Cecil.dll"
298299
"Newtonsoft.Json.dll"

src/Paket/Program.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ let add (results : ParseResults<_>) =
250250
match project with
251251
| Some projectName ->
252252
dependencies.AddToProject(group, packageName, version, force, redirects, cleanBindingRedirects, createNewBindingFiles, projectName, noInstall |> not, semVerUpdateMode, touchAffectedRefs, noResolve |> not, packageKind)
253-
| None ->
253+
| None ->
254254
let interactive = results.Contains AddArgs.Interactive
255255
dependencies.Add(group, packageName, version, force, redirects, cleanBindingRedirects, createNewBindingFiles, interactive, noInstall |> not, semVerUpdateMode, touchAffectedRefs, noResolve |> not, packageKind)
256256

@@ -577,7 +577,7 @@ let pack (results : ParseResults<_>) =
577577
|> legacyBool results (ReplaceArgument("--symbols", "symbols"))
578578
let includeReferencedProjects =
579579
(results.Contains PackArgs.Include_Referenced_Projects,
580-
results.Contains PackArgs.Include_Referenced_Projects_Legacy)
580+
results.Contains PackArgs.Include_Referenced_Projects_Legacy)
581581
|> legacyBool results (ReplaceArgument("--include-referenced-projects", "Include_Referenced_Projects"))
582582
let projectUrl =
583583
(results.TryGetResult PackArgs.Project_Url,
@@ -590,14 +590,14 @@ let pack (results : ParseResults<_>) =
590590
let releaseNotes =
591591
match cliReleaseNotes with
592592
| Some notes -> Some notes
593-
| None ->
593+
| None ->
594594
match fileReleaseNotes with
595595
| Some notes -> notes.Notes |> String.concat "\n" |> Some
596596
| None -> None
597597
let version =
598598
match cliVersion with
599599
| Some v -> Some v
600-
| None ->
600+
| None ->
601601
match fileReleaseNotes with
602602
| Some notes -> Some notes.NugetVersion
603603
| None -> None

0 commit comments

Comments
 (0)