Bump version to 1.2.0

Replace deprecated functions in build.fsx

Author: kMutagene

.gitignore

@@ -186,3 +186,4 @@ docsrc/tools/FSharp.Formatting.svclog
 docs
 temp/gh-pages
 /src/FSharp.Plotly/TestScript.fsx
+/pkg

RELEASE_NOTES.md

@@ -1,3 +1,20 @@
+### 1.2.0 - Feb 17 2020
+Additional functionality:
+ * *
+ * [Various marker style options](https://github.com/muehlhaus/FSharp.Plotly/commit/11a80f94d9fb9f94a4504073955e009746e9fd0d)
+ * [Config support](https://github.com/muehlhaus/FSharp.Plotly/commit/70998edd586553b40a8b95de56d86639902a5420)
+ * [Chart.Stack works now with both 2D and 3D Charts](https://github.com/muehlhaus/FSharp.Plotly/commit/db7ce675a73f37598590f24ac99c246fce78759e)
+
+Additional plots:
+ * [Parallel Categories](https://github.com/muehlhaus/FSharp.Plotly/commit/adaf9e361d9fe8ac3b51a8832ffbb024cd3d78dc)
+ * [Stacked Area](https://github.com/muehlhaus/FSharp.Plotly/commit/612666883ac07f21350d3da3d6749387a9cb1f4d)
+ * [Tables](https://github.com/muehlhaus/FSharp.Plotly/commit/6bfc9e34072c486546ad3fbf118f027e57c6114c)
+
+Additional functionality and plots thanks to external open source contributors:
+ * You can now [add descriptional text to the chart html](https://github.com/muehlhaus/FSharp.Plotly/commit/bd99364d1fcfe894c772ad2fe9c59b31a37dc547) (thanks @kkkmail)
+ * [Sankey and Candlestick Charts are now available](https://github.com/muehlhaus/FSharp.Plotly/commit/f1e873d7e2c2cc5a60c2365058880419668d1804) (thanks @fwaris)
+
+
 ### 1.1.2 - Aug 16 2018
 * Support .net framework 4.7
 * Minor improvments 

build.fsx

@@ -46,16 +46,25 @@ module TemporaryDocumentationHelpers =
           FsiEval : bool }
 
 
-    let private run toolPath command = 
-        if 0 <> Process.execSimple ((fun info ->
-                { info with
-                    FileName = toolPath
-                    Arguments = command }) >> Process.withFramework) System.TimeSpan.MaxValue
+    let private run toolPath arguments = 
+        Command.RawCommand
+            (
+                toolPath,
+                arguments
+            )
+        |> CreateProcess.fromCommand
+        |> CreateProcess.withFramework
+        |> CreateProcess.ensureExitCode
+        |> Proc.run
+        |> ignore
 
-        then failwithf "FSharp.Formatting %s failed." command
 
     let createDocs p =
-        let toolPath = Tools.findToolInSubPath "fsformatting.exe" (Directory.GetCurrentDirectory() @@ "lib/Formatting")
+        let toolPath = 
+            match ProcessUtils.tryFindLocalTool "" "fsformatting.exe"  [(Directory.GetCurrentDirectory() @@ "/lib")] with
+            |Some tool -> tool
+            | _ -> failwith "FSFormatting executable not found"
+        //let toolPath = Tools.findToolInSubPath "fsformatting.exe" (Directory.GetCurrentDirectory() @@ "lib/Formatting")
 
         let defaultLiterateArguments =
             { ToolPath = toolPath
@@ -82,10 +91,7 @@ module TemporaryDocumentationHelpers =
             |> Seq.append 
                    (["literate"; "--processdirectory" ] @ layoutroots @ [ "--inputdirectory"; source; "--templatefile"; template; 
                       "--outputDirectory"; outputDir] @ fsiEval @ [ "--replacements" ])
-            |> Seq.map (fun s -> 
-                   if s.StartsWith "\"" then s
-                   else sprintf "\"%s\"" s)
-            |> String.separated " "
+            |> Arguments.OfArgs
         run arguments.ToolPath command
         printfn "Successfully generated docs for %s" source
 
@@ -139,6 +145,8 @@ let gitRaw = Environment.environVarOrDefault "gitRaw" "https://raw.githubusercon
 
 let website = "/FSharp.Plotly"
 
+let pkgDir = "pkg"
+
 // --------------------------------------------------------------------------------------
 // END TODO: The rest of the file includes standard build steps
 // --------------------------------------------------------------------------------------
@@ -243,23 +251,18 @@ Target.create "Build" (fun _ ->
 Target.create "RunTests" (fun _ ->
     let assemblies = !! testAssemblies
 
-    let setParams f =
-        match Environment.isWindows with
-        | true ->
-            fun p ->
-                { p with
-                    FileName = f}
-        | false ->
-            fun p ->
-                { p with
-                    FileName = "mono"
-                    Arguments = f }
     assemblies
-    |> Seq.map (fun f ->
-        Process.execSimple (setParams f) System.TimeSpan.MaxValue
+    |> Seq.iter (fun f ->
+        Command.RawCommand (
+            f,
+            Arguments.OfArgs []
+        )
+        |> CreateProcess.fromCommand
+        |> CreateProcess.withFramework
+        |> CreateProcess.ensureExitCode
+        |> Proc.run
+        |> ignore
     )
-    |>Seq.reduce (+)
-    |> (fun i -> if i > 0 then failwith "")
 )
 
 // --------------------------------------------------------------------------------------
@@ -268,10 +271,11 @@ Target.create "RunTests" (fun _ ->
 Target.create "NuGet" (fun _ ->
     Paket.pack(fun p ->
         { p with
-            OutputPath = "bin"
+            ToolType = ToolType.CreateLocalTool()
+            OutputPath = pkgDir
             Version = release.NugetVersion
-            ReleaseNotes = String.toLines release.Notes})
-)
+            ReleaseNotes = release.Notes |> String.toLines })
+        )
 
 Target.create "PublishNuget" (fun _ ->
     Paket.push(fun p ->
@@ -366,8 +370,8 @@ Target.create "Docs" (fun _ ->
     Shell.rename "docsrc/content/release-notes.md" "docsrc/content/RELEASE_NOTES.md"
 
     File.delete "docsrc/content/license.md"
-    Shell.copyFile "docsrc/content/" "LICENSE.txt"
-    Shell.rename "docsrc/content/license.md" "docsrc/content/LICENSE.txt"
+    Shell.copyFile "docsrc/content/" "LICENSE"
+    Shell.rename "docsrc/content/license.md" "docsrc/content/LICENSE"
 
 
     DirectoryInfo.getSubDirectories (DirectoryInfo.ofPath templates)

src/FSharp.Plotly.WPF/AssemblyInfo.fs

@@ -5,15 +5,15 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Plotly.WPF")>]
 [<assembly: AssemblyProductAttribute("FSharp.Plotly")>]
 [<assembly: AssemblyDescriptionAttribute("A F# interactive charting library using plotly.js")>]
-[<assembly: AssemblyVersionAttribute("1.1.2")>]
-[<assembly: AssemblyFileVersionAttribute("1.1.2")>]
+[<assembly: AssemblyVersionAttribute("1.2.0")>]
+[<assembly: AssemblyFileVersionAttribute("1.2.0")>]
 [<assembly: AssemblyConfigurationAttribute("Release")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Plotly.WPF"
     let [<Literal>] AssemblyProduct = "FSharp.Plotly"
     let [<Literal>] AssemblyDescription = "A F# interactive charting library using plotly.js"
-    let [<Literal>] AssemblyVersion = "1.1.2"
-    let [<Literal>] AssemblyFileVersion = "1.1.2"
+    let [<Literal>] AssemblyVersion = "1.2.0"
+    let [<Literal>] AssemblyFileVersion = "1.2.0"
     let [<Literal>] AssemblyConfiguration = "Release"

src/FSharp.Plotly/AssemblyInfo.fs

@@ -5,15 +5,15 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Plotly")>]
 [<assembly: AssemblyProductAttribute("FSharp.Plotly")>]
 [<assembly: AssemblyDescriptionAttribute("A F# interactive charting library using plotly.js")>]
-[<assembly: AssemblyVersionAttribute("1.1.2")>]
-[<assembly: AssemblyFileVersionAttribute("1.1.2")>]
+[<assembly: AssemblyVersionAttribute("1.2.0")>]
+[<assembly: AssemblyFileVersionAttribute("1.2.0")>]
 [<assembly: AssemblyConfigurationAttribute("Release")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Plotly"
     let [<Literal>] AssemblyProduct = "FSharp.Plotly"
     let [<Literal>] AssemblyDescription = "A F# interactive charting library using plotly.js"
-    let [<Literal>] AssemblyVersion = "1.1.2"
-    let [<Literal>] AssemblyFileVersion = "1.1.2"
+    let [<Literal>] AssemblyVersion = "1.2.0"
+    let [<Literal>] AssemblyFileVersion = "1.2.0"
     let [<Literal>] AssemblyConfiguration = "Release"