From 2da8c3a2e73aa110b1696d41932c32dc80c91967 Mon Sep 17 00:00:00 2001
From: Heinrich Weil <hl.weil@t-online.de>
Date: Fri, 10 Sep 2021 11:07:54 +0200
Subject: [PATCH] fix prerelease targets

---
 RELEASE_NOTES.md | 16 +++++++++++++++-
 build.fsx        | 22 +++++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index afa346d5..49801b00 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,4 +1,18 @@
-### 0.3.0-preview.1+993781f (Released 2021-9-6)
+### 0.3.2+4233b78 (Released 2021-9-9)
+* Additions:
+    * latest commit #4233b78
+    * [[#4233b78](https://github.com/nfdi4plants/ISADotNet/commit/4233b780896380764cb10a90af4b1902c8006ac9)] move SwateCustomXml datamodel to ISADotNet
+    * [[#f7511ad](https://github.com/nfdi4plants/ISADotNet/commit/f7511ad7855ba10b652c38feb2c09b993d6df779)] increase function parameter consistency
+    * [[#249f1af](https://github.com/nfdi4plants/ISADotNet/commit/249f1af066d0dfd9682016f6c207cf5c159bc1da)] add ISA Assay Common API parser
+    * [[#9890b6a](https://github.com/nfdi4plants/ISADotNet/commit/9890b6a7932813281546d3eb2621a5ace62265ab)] Unify naming as requested (PR #31).
+    * [[#a48d571](https://github.com/nfdi4plants/ISADotNet/commit/a48d5712a742631d0205dfdc35665acb7592e2df)] Add FromStringWithNumber for ProtocolParameter (Issue #24).
+    * [[#b511949](https://github.com/nfdi4plants/ISADotNet/commit/b511949f3463bb1c3f6053a836c83ddd686103f7)] add isa xlsx stream reader/writer functions
+    * [[#91e9ea5](https://github.com/nfdi4plants/ISADotNet/commit/91e9ea5bbfaa74e5ac5db1152be54a4b149e1f69)] Add GetName, GetNameWithNumber for xxValue DataModel (Issue #24).
+    * [[#035ed55](https://github.com/nfdi4plants/ISADotNet/commit/035ed55b0fa3a417aa32627f20ca037bac129b3c)] Add FromString, FromStringWithNumber for OntologyAnnotation, Factor, MaterialAttribute (Issue #24)
+    * [[#6f883e6](https://github.com/nfdi4plants/ISADotNet/commit/6f883e614e456817fcf6af8e15ce241b7d8c01b1)] Add GetValue logic for FactorValue, MaterialAttributeValue, ProcessParameterValue (Issue #24)
+    * [[#01db12b](https://github.com/nfdi4plants/ISADotNet/commit/01db12ba03014ef062d6f81b662be2042ee8ebbf)] add json readers/writers
+
+### 0.3.0+993781f (Released 2021-9-6)
 * Additions:
     * latest commit #993781f
     * [[#993781f](https://github.com/nfdi4plants/ISADotNet/commit/993781fe3b9ea7d2516ee1a823894b0705db87f9)] small adjustment to assay.xlsx reader
diff --git a/build.fsx b/build.fsx
index fddcea95..c80c0207 100644
--- a/build.fsx
+++ b/build.fsx
@@ -102,7 +102,7 @@ module BasicTasks =
         printfn "Please enter pre-release package suffix"
         let suffix = System.Console.ReadLine()
         prereleaseSuffix <- suffix
-        prereleaseTag <- (sprintf "%s-%s" release.NugetVersion suffix)
+        prereleaseTag <- (sprintf "%i.%i.%i-%s" release.SemVer.Major release.SemVer.Minor release.SemVer.Patch suffix)
         isPrerelease <- true
     }
 
@@ -231,6 +231,26 @@ module PackageTasks =
                                     MSBuildParams = msBuildParams
                             }
                 ))
+                "src/ISADotNet/ISADotNet.fsproj"
+                |> Fake.DotNet.DotNet.pack (fun p ->
+                    let msBuildParams =
+                        {p.MSBuildParams with 
+                            Properties = ([
+                                "PackageId", "ISADotNet.Fable"
+                                "Version",prereleaseTag
+                                "Description","Fable compliant release for the ISA compliant experimental metadata toolkit in F#. Additionally to the compiled library, it is shipped with the uncompiled code."
+                                "PackageTags","F# FSharp dotnet .Net bioinformatics biology datascience metadata investigation study assay ISA Json Fable"
+                                "PackageReleaseNotes",  (release.Notes |> List.map replaceCommitLink |> String.concat "\r\n")
+                            ] @ p.MSBuildParams.Properties)
+                        }
+                    let test = p
+                    {
+                        p with 
+                            VersionSuffix = Some prereleaseSuffix
+                            MSBuildParams = msBuildParams
+                            OutputPath = Some pkgDir
+                    }
+                )
         else
             failwith "aborted"
     }