ILMerge Fake.Core.ReleaseNotes - fixes #4126

fsprojects · Mar 1, 2022 · a704d68 · a704d68
1 parent 050a37c
commit a704d68
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-#### 7.0.1 - 2022-03-01
+#### 7.0.2 - 2022-03-01
 * Support for .NET 7.0
 * Support as .NET 6.0 tool
 * Auto-Restore after paket install an paket update

diff --git a/build.fsx b/build.fsx
@@ -293,6 +293,7 @@ Target "MergePaketTool" (fun _ ->
         [
             "Argu.dll"
             "Chessie.dll"
+            "Fake.Core.ReleaseNotes.dll"
             "FSharp.Core.dll"
             "Mono.Cecil.dll"
             "Newtonsoft.Json.dll"

diff --git a/src/Paket/Program.fs b/src/Paket/Program.fs
@@ -250,7 +250,7 @@ let add (results : ParseResults<_>) =
     match project with
     | Some projectName ->
         dependencies.AddToProject(group, packageName, version, force, redirects, cleanBindingRedirects, createNewBindingFiles, projectName, noInstall |> not, semVerUpdateMode, touchAffectedRefs, noResolve |> not, packageKind)
-    | None ->        
+    | None ->
         let interactive = results.Contains AddArgs.Interactive
         dependencies.Add(group, packageName, version, force, redirects, cleanBindingRedirects, createNewBindingFiles, interactive, noInstall |> not, semVerUpdateMode, touchAffectedRefs, noResolve |> not, packageKind)
 
@@ -577,7 +577,7 @@ let pack (results : ParseResults<_>) =
         |> legacyBool results (ReplaceArgument("--symbols", "symbols"))
     let includeReferencedProjects =
         (results.Contains PackArgs.Include_Referenced_Projects,
-         results.Contains PackArgs.Include_Referenced_Projects_Legacy)
+         results.Contains PackArgs.Include_Referenced_Projects_Legacy) 
         |> legacyBool results (ReplaceArgument("--include-referenced-projects", "Include_Referenced_Projects"))
     let projectUrl =
         (results.TryGetResult PackArgs.Project_Url,
@@ -590,14 +590,14 @@ let pack (results : ParseResults<_>) =
     let releaseNotes =
         match cliReleaseNotes with
         | Some notes -> Some notes
-        | None -> 
+        | None ->
             match fileReleaseNotes with
             | Some notes -> notes.Notes |> String.concat "\n" |> Some
             | None -> None
     let version =
         match cliVersion with
         | Some v -> Some v
-        | None ->   
+        | None ->
             match fileReleaseNotes with
             | Some notes -> Some notes.NugetVersion
             | None -> None