Fix reading issue 🐛

nfdi4plants · May 16, 2023 · 4fe5a51 · 4fe5a51
1 parent 8b7e242
commit 4fe5a51
Show file tree

Hide file tree

Showing 13 changed files with 340 additions and 203 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,5 @@
+### 1.0.1+8b7e242 (Released 2023-5-16)
+
 ### 1.0.0+3a35af7 (Released 2023-5-16)
 * Additions:
     * [[#3a35af7](https://github.com/Freymaurer/Nfdi4Plants.Fornax/commit/3a35af7aeddf772a1913c8f9439b68755993d278)] Add searchbar and new sidebar support #7 #8

diff --git a/build/BasicTasks.fs b/build/BasicTasks.fs
@@ -12,7 +12,7 @@ let setPrereleaseTag = BuildTask.create "SetPrereleaseTag" [] {
     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
 }
 

diff --git a/build/PackageTasks.fs b/build/PackageTasks.fs
@@ -56,7 +56,7 @@ let pack = BuildTask.create "Pack" [clean; build; runTests] {
 }
 
 let packPrerelease = BuildTask.create "PackPrerelease" [setPrereleaseTag; clean; build; runTests] {
-    if promptYesNo (sprintf "package tag will be %s OK?" prereleaseTag )
+    if promptYesNo (sprintf "Creating stable package with version %s OK?" prereleaseTag )
         then 
             !! "src/**/*.*proj"
             -- "src/bin/*"

diff --git a/build/ReleaseTasks.fs b/build/ReleaseTasks.fs
@@ -18,16 +18,12 @@ let createTag = BuildTask.create "CreateTag" [clean; build; runTests; pack] {
     if promptYesNo (sprintf "tagging branch with %s OK?" stableVersionTag ) then
         Git.Branches.tag "" stableVersionTag
         Git.Branches.pushTag "" projectRepo stableVersionTag
-    else
-        failwith "aborted"
 }
 
 let createPrereleaseTag = BuildTask.create "CreatePrereleaseTag" [setPrereleaseTag; clean; build; runTests; packPrerelease] {
     if promptYesNo (sprintf "tagging branch with %s OK?" prereleaseTag ) then 
         Git.Branches.tag "" prereleaseTag
         Git.Branches.pushTag "" projectRepo prereleaseTag
-    else
-        failwith "aborted"
 }
 
 

diff --git a/client/docs/_sidebars/mainSidebar.md b/client/docs/_sidebars/mainSidebar.md
@@ -1,5 +1,5 @@
 ---
-published: 2022-05-09
+published: 2023-05-16
 Article Status: Publishable
 To-Dos: 
     - Update links to other KB articles
@@ -15,11 +15,4 @@ To-Dos:
 ### [Sharing and curation](/docs/metadata.html#sharing-and-curation)
 ## [How does DataPLANT support me in metadata annotation](/docs/metadata.html#how-does-dataplant-support-me-in-metadata-annotation)
 ## [DataPLANT Support](/docs/metadata.html#dataplant-support)
-# [Test 1](/path/any)
-# [Test 1](/path/any)
-## [Test 2](/path/any)
-## [Test 2](/path/any)
-## [Test 2](/path/any)
-### [Test 3](/path/any)
-#### [Test 4](/path/any)
-##### [Test 5](/path/any)
+# [Code Examples](/docs/CodeExamples.html)
diff --git a/client/generators/docs.fsx b/client/generators/docs.fsx
@@ -10,7 +10,7 @@ let generate' (ctx : SiteContents) (page: string) =
         ctx.TryGetValues<Nfdi4Plants.Docs> ()
         |> Option.defaultValue Seq.empty
         |> Seq.findBack (fun n -> n.file = page)
-
+        
     Layout.layout ctx doc.title [
         Layout.docsLayout doc
     ]