Merge pull request #32 from muehlhaus/developer

Update with changes from developer

Author: kMutagene

FSharp.Plotly.sln

@@ -22,6 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{83F16175-43B1-4C90-A1EE-8E351C33435D}"
 	ProjectSection(SolutionItems) = preProject
+		docsrc\tools\formatters.fsx = docsrc\tools\formatters.fsx
 		docsrc\tools\generate.fsx = docsrc\tools\generate.fsx
 		docsrc\tools\templates\template.cshtml = docsrc\tools\templates\template.cshtml
 	EndProjectSection
@@ -78,7 +79,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{7C6D08
 		appveyor.yml = appveyor.yml
 		build.cmd = build.cmd
 		build.fsx = build.fsx
-		build.proj = build.proj
 		build.sh = build.sh
 	EndProjectSection
 EndProject
@@ -87,19 +87,24 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Dotnet|Any CPU = Dotnet|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F635BEEF-9609-4485-8C72-D8090A5F40A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F635BEEF-9609-4485-8C72-D8090A5F40A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F635BEEF-9609-4485-8C72-D8090A5F40A2}.Dotnet|Any CPU.ActiveCfg = Dotnet|Any CPU
+		{F635BEEF-9609-4485-8C72-D8090A5F40A2}.Dotnet|Any CPU.Build.0 = Dotnet|Any CPU
 		{F635BEEF-9609-4485-8C72-D8090A5F40A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F635BEEF-9609-4485-8C72-D8090A5F40A2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{82EEB69B-361E-486E-9F54-D346A8C76CC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{82EEB69B-361E-486E-9F54-D346A8C76CC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82EEB69B-361E-486E-9F54-D346A8C76CC9}.Dotnet|Any CPU.ActiveCfg = Dotnet|Any CPU
 		{82EEB69B-361E-486E-9F54-D346A8C76CC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{82EEB69B-361E-486E-9F54-D346A8C76CC9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B88586CA-044D-4D65-AB51-A7339C83D42F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B88586CA-044D-4D65-AB51-A7339C83D42F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B88586CA-044D-4D65-AB51-A7339C83D42F}.Dotnet|Any CPU.ActiveCfg = Dotnet|Any CPU
 		{B88586CA-044D-4D65-AB51-A7339C83D42F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B88586CA-044D-4D65-AB51-A7339C83D42F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

RELEASE_NOTES.md

@@ -1,6 +1,9 @@
+### 1.2.1 - Apr 8 2020
+ * [Improve C# interop](https://github.com/muehlhaus/FSharp.Plotly/commit/4bc8a45d4cdea3961c15429680923927b47a2840) by using null as default parameter for optional parameters in chart extensions and requiring qualified access for style parameters
+
+
 ### 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)

appveyor.yml

@@ -1,10 +1,30 @@
-image: Visual Studio 2017
+image: 
+  - Ubuntu
+  - Visual Studio 2019
 
 init:
   - git config --global core.autocrlf input
-  - dotnet tool install fake-cli -g
-build_script:
-  - cmd: build.cmd All
+
+matrix:
+  fast_finish: true
+
+for:
+-
+  matrix:
+    only:
+      - image: Visual Studio 2019
+
+  build_script:
+  - cmd: build.cmd
+-
+  matrix:
+    only:
+      - image: Ubuntu
+
+  build_script:
+  - chmod +x ./build.sh
+  - sh: ./build.sh -t DotnetCoreBuild
+
 test: off
 version: 0.0.1.{build}
 
@@ -15,4 +35,4 @@ branches:
 
 artifacts:
   - path: bin
-    name: bin
+    name: bin

build.cmd

@@ -1,7 +1,6 @@
 @echo off
 cls
 
-dotnet restore build.proj
 dotnet tool restore
 dotnet paket restore
 dotnet fake build %*