Merge pull request #8 from HLWeil/master

include Newtonsoft.Json.dll in nuget package

Author: muehlhaus

build.fsx

@@ -147,6 +147,10 @@ Target "Build" (fun _ ->
       Excludes = [] }
     |> MSBuild "" "Build" ["Configuration", configuration;]
     |> Log "AppBuild-Output: "
+    Fake.FileHelper.CopyFile
+        (__SOURCE_DIRECTORY__+ @"\packages\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll")
+        (__SOURCE_DIRECTORY__ + @"\src\FSharp.Plotly\bin\" + configuration + @"\netstandard2.0\Newtonsoft.Json.dll")
+       
 )
 
 // --------------------------------------------------------------------------------------

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("0.6")>]
-[<assembly: AssemblyFileVersionAttribute("0.6")>]
+[<assembly: AssemblyVersionAttribute("1.1.1")>]
+[<assembly: AssemblyFileVersionAttribute("1.1.1")>]
 [<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 = "0.6"
-    let [<Literal>] AssemblyFileVersion = "0.6"
+    let [<Literal>] AssemblyVersion = "1.1.1"
+    let [<Literal>] AssemblyFileVersion = "1.1.1"
     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("0.6")>]
-[<assembly: AssemblyFileVersionAttribute("0.6")>]
+[<assembly: AssemblyVersionAttribute("1.1.1")>]
+[<assembly: AssemblyFileVersionAttribute("1.1.1")>]
 [<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 = "0.6"
-    let [<Literal>] AssemblyFileVersion = "0.6"
+    let [<Literal>] AssemblyVersion = "1.1.1"
+    let [<Literal>] AssemblyFileVersion = "1.1.1"
     let [<Literal>] AssemblyConfiguration = "Release"

src/FSharp.Plotly/FSharp.Plotly.fsproj

@@ -36,12 +36,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" >
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.1">
       <Private>True</Private>
       <Paket>True</Paket>
     </PackageReference>
+    
   </ItemGroup>
-
+  
   <ItemGroup>
     <Content Include="App.config" />
   </ItemGroup>

src/FSharp.Plotly/paket.template

@@ -21,3 +21,5 @@ summary
     Functional graph library for F#
 description
     Functional graph library for F#
+files
+	bin\Release\netstandard2.0\Newtonsoft.Json.dll ==> lib\netstandard2.0\