Fix build Newtonsoft.Json

Author: muehlhaus

.gitignore

@@ -183,3 +183,6 @@ docsrc/content/license.md
 docsrc/content/release-notes.md
 .fake
 docsrc/tools/FSharp.Formatting.svclog
+
+/docs
+AssemblyInfo.fs

RELEASE_NOTES.md

@@ -1,3 +1,7 @@
+### 1.1.2 - Aug 16 2018
+* Support .net framework 4.7
+* Minor improvments 
+
 ### 1.1.1 - Jun 22 2018
 * Support netStandard 2.0
 * Add new chart (SLOMP)

build.fsx

@@ -161,6 +161,9 @@ Target.create "Build" (fun _ ->
                 ]
          }
     MSBuild.build setParams solutionFile
+    Shell.copyFile
+        (__SOURCE_DIRECTORY__ + @"\src\FSharp.Plotly\bin\" + configuration + @"\netstandard2.0\Newtonsoft.Json.dll")
+        (__SOURCE_DIRECTORY__+ @"\packages\Newtonsoft.Json\lib\netstandard2.0\Newtonsoft.Json.dll")
 )
 
 // --------------------------------------------------------------------------------------
@@ -416,7 +419,12 @@ Target.create "All" ignore
   ==> "Release"
 
 
-"BuildPackage"
+"Clean"
+  ==> "AssemblyInfo"
+  ==> "Build"
+  ==> "CopyBinaries"
+  ==> "RunTests"
+  ==> "NuGet"
   ==> "GitReleaseNuget"
 
 Target.runOrDefault "All"

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

src/FSharp.Plotly/FSharp.Plotly.fsproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net45;net47;netstandard2.0</TargetFrameworks>
     <RootNamespace>FSharp.Plotly</RootNamespace>
@@ -39,5 +39,10 @@
     <None Include="paket.references" />
     <None Include="paket.template" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
+  </ItemGroup>  
+  
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>