Merge branch 'master' of https://github.com/muehlhaus/FSharp.Plotly.git

Author: muehl

paket.lock

@@ -1,4 +1,5 @@
-namespace System
+// Auto-Generated by FAKE; do not edit
+namespace System
 open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("FSharp.Plotly.WPF")>]
@@ -9,5 +10,8 @@ open System.Reflection
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "1.0.2"
-    let [<Literal>] InformationalVersion = "1.0.2"
+    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.0.2"
+    let [<Literal>] AssemblyFileVersion = "1.0.2"

src/FSharp.Plotly.WPF/AssemblyInfo.fs

@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>FSharp.Plotly.WPF</RootNamespace>
     <AssemblyName>FSharp.Plotly.WPF</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>FSharp.Plotly.WPF</Name>

src/FSharp.Plotly.WPF/FSharp.Plotly.WPF.fsproj

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+  </startup>
 <runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.0.0" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
   </dependentAssembly>
-</assemblyBinding></runtime></configuration>
+</assemblyBinding></runtime></configuration>

src/FSharp.Plotly/App.config

@@ -1,4 +1,5 @@
-namespace System
+// Auto-Generated by FAKE; do not edit
+namespace System
 open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("FSharp.Plotly")>]
@@ -9,5 +10,8 @@ open System.Reflection
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "1.0.2"
-    let [<Literal>] InformationalVersion = "1.0.2"
+    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.0.2"
+    let [<Literal>] AssemblyFileVersion = "1.0.2"

src/FSharp.Plotly/AssemblyInfo.fs

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" requireReinstallation="true" />
 </packages>

src/FSharp.Plotly/FSharp.Plotly.fsproj

@@ -5,6 +5,6 @@
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.0.0" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
   </dependentAssembly>
 </assemblyBinding></runtime></configuration>