diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 40574db7..1df6e95b 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,8 @@ -### 1.4.1 - July 30, 2016 +### 1.4.2-rc001 - September 25, 2016 +* Rationalise the GoogleChart and PlotlyChart types +* Rationalise the pipeline style helpers + +### 1.4.1 - July 30, 2016 * Documentation updates * Plotly API mappings fixes diff --git a/build.fsx b/build.fsx index e0ebb2e8..b3a9f4ee 100644 --- a/build.fsx +++ b/build.fsx @@ -151,11 +151,20 @@ Target "SourceLink" (fun _ -> Target "NuGet" (fun _ -> Paket.Pack(fun p -> +// NuGet (fun p -> { p with + // Authors = authors OutputPath = "bin" Version = release.NugetVersion ReleaseNotes = toLines release.Notes +// Dependencies = +// [ +// "Google.DataTable.Net.Wrapper", GetPackageVersion "packages" "Google.DataTable.Net.Wrapper" +// "Newtonsoft.Json", GetPackageVersion "packages" "Newtonsoft.Json" +// ] + }) +// ("xplot.nuspec") ) Target "PublishNuget" (fun _ -> diff --git a/docs/tools/formatters.fsx b/docs/tools/formatters.fsx index 463dd5cc..6213000a 100644 --- a/docs/tools/formatters.fsx +++ b/docs/tools/formatters.fsx @@ -141,7 +141,7 @@ let createFsiEvaluator root output (floatFormat:string) = | :? GoogleCharts.GoogleChart as ch -> // Just return the inline HTML of a Google chart let ch = ch |> XPlot.GoogleCharts.Chart.WithSize(700, 400) - Some [ InlineBlock ch.InlineHtml ] + Some [ InlineBlock <| ch.GetInlineHtml() ] | :? Plotly.PlotlyChart as chart -> // Just return the inline HTML for a Plotly chart diff --git a/src/XPlot.GoogleCharts.Deedle/AssemblyInfo.fs b/src/XPlot.GoogleCharts.Deedle/AssemblyInfo.fs index 78cc6475..adde9cb0 100644 --- a/src/XPlot.GoogleCharts.Deedle/AssemblyInfo.fs +++ b/src/XPlot.GoogleCharts.Deedle/AssemblyInfo.fs @@ -4,10 +4,10 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "1.4.1" - let [] InformationalVersion = "1.4.1" + let [] Version = "1.4.2" + let [] InformationalVersion = "1.4.2" diff --git a/src/XPlot.GoogleCharts/AssemblyInfo.fs b/src/XPlot.GoogleCharts/AssemblyInfo.fs index aac15c6d..50fcea76 100644 --- a/src/XPlot.GoogleCharts/AssemblyInfo.fs +++ b/src/XPlot.GoogleCharts/AssemblyInfo.fs @@ -4,10 +4,10 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "1.4.1" - let [] InformationalVersion = "1.4.1" + let [] Version = "1.4.2" + let [] InformationalVersion = "1.4.2" diff --git a/src/XPlot.GoogleCharts/paket.template b/src/XPlot.GoogleCharts/paket.template index 7c9bdb73..1daedeef 100644 --- a/src/XPlot.GoogleCharts/paket.template +++ b/src/XPlot.GoogleCharts/paket.template @@ -1,8 +1,8 @@ type project owners - Taha Hachana + Taha Hachana; Tomas Petricek authors - Taha Hachana + Taha Hachana; Tomas Petricek projectUrl http://github.com/TahaHachana/XPlot iconUrl @@ -19,3 +19,6 @@ summary Data visualization library for F# description XPlot is a cross-platform data visualization library that supports creating charts using Google Charts and Plotly. The library provides a composable domain specific language for building charts and specifying their properties. +dependencies + Google.DataTable.Net.Wrapper ~> CURRENTVERSION + Newtonsoft.Json ~> CURRENTVERSION \ No newline at end of file diff --git a/src/XPlot.Plotly/AssemblyInfo.fs b/src/XPlot.Plotly/AssemblyInfo.fs index b362472d..d3e59197 100644 --- a/src/XPlot.Plotly/AssemblyInfo.fs +++ b/src/XPlot.Plotly/AssemblyInfo.fs @@ -4,10 +4,10 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "1.4.1" - let [] InformationalVersion = "1.4.1" + let [] Version = "1.4.2" + let [] InformationalVersion = "1.4.2"