Skip to content

Commit 22d93d6

Browse files
committed
Target netstandard only, update .NET Interactive dependencies
1 parent 7e6e50b commit 22d93d6

File tree

4 files changed

+57
-8
lines changed

4 files changed

+57
-8
lines changed

src/Plotly.NET.ImageExport/Plotly.NET.ImageExport.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0; netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<WarnOn>3390;$(WarnOn)</WarnOn>
77
</PropertyGroup>

src/Plotly.NET.Interactive/Plotly.NET.Interactive.fsproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>netstandard2.1</TargetFramework>
55
<OutputType>Library</OutputType>
66
<NoWarn>$(NoWarn);NU5100</NoWarn><!-- dll outside of lib/ folder -->
77
<!-- Optional: Declare that the Repository URL can be published to NuSpec -->
@@ -32,7 +32,7 @@
3232
<ItemGroup>
3333
<None Include="Repack.ps1" />
3434
<None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
35-
<None Include="..\..\bin\Plotly.NET.Interactive\net5.0\Plotly.NET.Interactive.dll" Pack="true" PackagePath="interactive-extensions/dotnet" />
35+
<None Include="..\..\bin\Plotly.NET.Interactive\netstandard2.1\Plotly.NET.Interactive.dll" Pack="true" PackagePath="interactive-extensions/dotnet" />
3636
<Compile Include="AssemblyInfo.fs" />
3737
<Compile Include="Extension.fs" />
3838
</ItemGroup>
@@ -48,8 +48,8 @@
4848
</ItemGroup>
4949

5050
<ItemGroup>
51-
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.21559.2" />
52-
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.21559.2" />
51+
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.21606.1" />
52+
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.21606.1" />
5353
</ItemGroup>
5454

5555
</Project>

src/Plotly.NET/Playground.fsx

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
#load "StyleParams.fs"
1212
#load "ColorKeyword.fs"
1313
#load "Colors.fs"
14+
#load "TickFormatStop.fs"
1415
#load "Frame.fs"
1516
#load "Font.fs"
1617
#load "Title.fs"
18+
#load "ColorBar.fs"
1719
#load "Line.fs"
1820

1921
#I "Layout/ObjectAbstractions/Common"
@@ -34,8 +36,6 @@
3436
#load "Annotation.fs"
3537
#load "LayoutGrid.fs"
3638
#load "Legend.fs"
37-
#load "TickFormatStop.fs"
38-
#load "ColorBar.fs"
3939
#load "Rangebreak.fs"
4040
#load "LinearAxis.fs"
4141
#load "ColorAxis.fs"
@@ -176,6 +176,55 @@ open Plotly.NET
176176
open System
177177
open Plotly.NET
178178

179+
180+
let y = [2.; 1.5; 5.; 1.5; 3.; 2.5; 2.5; 1.5; 3.5; 1.]
181+
let x = ["bin1";"bin2";"bin1";"bin2";"bin1";"bin2";"bin1";"bin1";"bin2";"bin1"]
182+
183+
let y2 = [2.; 1.5; 5.; 1.5; 3.; 2.5; 2.5; 1.5; 3.5; 1.]
184+
let x2 = ["bin3";"bin4";"bin3";"bin4";"bin3";"bin4";"bin3";"bin3";"bin4";"bin3"]
185+
186+
let violin1 =
187+
Chart.Violin (
188+
x,y,
189+
ShowBox = true,
190+
BoxFillColor = Color.fromKeyword ColorKeyword.Red)
191+
192+
let violin2 =
193+
Chart.Violin (
194+
x2,y2,
195+
ShowBox = true,
196+
BoxFillColor = Color.fromKeyword ColorKeyword.Green)
197+
198+
[
199+
violin1
200+
violin2
201+
]
202+
|> Chart.combine
203+
|> Chart.withTraceInfo(
204+
Name = "violins",
205+
LegendGroup = "violins",
206+
LegendGroupTitle = Title.init("Some violins m8")
207+
)
208+
|> Chart.show
209+
210+
let table1 =
211+
let header = ["<b>RowIndex</b>";"A";"simple";"table"]
212+
let rows =
213+
[
214+
["0";"I" ;"am" ;"a"]
215+
["1";"little";"example";"!"]
216+
]
217+
Chart.Table(header, rows)
218+
|> Chart.show
219+
220+
Trace2D.initHistogram(
221+
Trace2DStyle.Histogram(
222+
Y = [1;2;3;3;4;4;4;5;6;6;7]
223+
)
224+
)
225+
|> GenericChart.ofTraceObject true
226+
|> Chart.show
227+
179228
let contour =
180229
[
181230
Chart.Carpet(

src/Plotly.NET/Plotly.NET.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0; net5.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
44
</PropertyGroup>
55
<PropertyGroup>
66
<RootNamespace>Plotly.NET</RootNamespace>

0 commit comments

Comments
 (0)