Skip to content

Commit 35f0897

Browse files
kMutagenekMutagene
committed
#457: Remove C# interop from core library
1 parent 56cc563 commit 35f0897

File tree

118 files changed

+8679
-9873
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+8679
-9873
lines changed

‎Plotly.NET.sln

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpConsole", "tests\Cons
8686
EndProject
8787
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "CoreTests", "tests\CoreTests\CoreTests\CoreTests.fsproj", "{DA7BC908-7DC9-4BA7-8100-17D3FD2901EA}"
8888
EndProject
89-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpInteroperabilityTests", "tests\CoreTests\CSharpInteroperabilityTests\CSharpInteroperabilityTests.csproj", "{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}"
90-
EndProject
9189
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "StrongNameTests", "tests\CoreTests\StrongNameTests\StrongNameTests.fsproj", "{32E187BB-D1D4-4864-A021-55A7A08E17EC}"
9290
EndProject
9391
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ImageExportTests", "tests\ExtensionLibsTests\ImageExportTests\ImageExportTests.fsproj", "{A3693DD1-4D34-4B10-B310-07A4C7433F7D}"
@@ -288,12 +286,6 @@ Global
288286
{DA7BC908-7DC9-4BA7-8100-17D3FD2901EA}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
289287
{DA7BC908-7DC9-4BA7-8100-17D3FD2901EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
290288
{DA7BC908-7DC9-4BA7-8100-17D3FD2901EA}.Release|Any CPU.Build.0 = Release|Any CPU
291-
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
292-
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
293-
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
294-
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
295-
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
296-
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}.Release|Any CPU.Build.0 = Release|Any CPU
297289
{32E187BB-D1D4-4864-A021-55A7A08E17EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
298290
{32E187BB-D1D4-4864-A021-55A7A08E17EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
299291
{32E187BB-D1D4-4864-A021-55A7A08E17EC}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
@@ -344,7 +336,6 @@ Global
344336
{029EBCB4-0E8B-40F8-B7AA-61B814FAE5A6} = {E8897848-2EF4-4126-9315-ADE0BA92D951}
345337
{598AB47B-EFE7-414A-B6EA-8C96B4AA7A4C} = {E8897848-2EF4-4126-9315-ADE0BA92D951}
346338
{DA7BC908-7DC9-4BA7-8100-17D3FD2901EA} = {023425D8-B375-45ED-A29A-A3ED00C0E2BC}
347-
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1} = {023425D8-B375-45ED-A29A-A3ED00C0E2BC}
348339
{32E187BB-D1D4-4864-A021-55A7A08E17EC} = {023425D8-B375-45ED-A29A-A3ED00C0E2BC}
349340
{A3693DD1-4D34-4B10-B310-07A4C7433F7D} = {02886FBB-DB32-4BBB-A93C-E13EBF453ACC}
350341
{1170E3A9-D83E-40B0-8D51-20485C76BE88} = {02886FBB-DB32-4BBB-A93C-E13EBF453ACC}

‎build/ProjectInfo.fs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,10 @@ let testBaseProjects = [
7373

7474
// test projects (.NET)
7575
let CoreTestProject = ProjectInfo.create("CoreTests", "tests/CoreTests/CoreTests/CoreTests.fsproj")
76-
let CSharpInteroperabilityTestProject = ProjectInfo.create("CSharpInteroperabilityTests", "tests/CoreTests/CSharpInteroperabilityTests/CSharpInteroperabilityTests.csproj")
7776

7877
/// contains project info about the core test projects
7978
let testProjectsCore = [
8079
CoreTestProject
81-
CSharpInteroperabilityTestProject
8280
]
8381

8482
let ImageExportTestProject = ProjectInfo.create("ImageExportTests", "tests/ExtensionLibsTests/ImageExportTests/ImageExportTests.fsproj")

‎src/Plotly.NET.CSharp/ChartAPI/Chart3D.cs

Lines changed: 67 additions & 5 deletions
Large diffs are not rendered by default.

‎src/Plotly.NET/CSharpLayer/GenericChartExtensions.fs

Lines changed: 0 additions & 1044 deletions
This file was deleted.

‎src/Plotly.NET/ChartAPI/Chart.fs

Lines changed: 570 additions & 570 deletions
Large diffs are not rendered by default.

‎src/Plotly.NET/ChartAPI/Chart2D.fs

Lines changed: 1432 additions & 1432 deletions
Large diffs are not rendered by default.

‎src/Plotly.NET/ChartAPI/Chart3D.fs

Lines changed: 344 additions & 344 deletions
Large diffs are not rendered by default.

‎src/Plotly.NET/ChartAPI/ChartCarpet.fs

Lines changed: 256 additions & 256 deletions
Large diffs are not rendered by default.

‎src/Plotly.NET/ChartAPI/ChartDomain.fs

Lines changed: 451 additions & 451 deletions
Large diffs are not rendered by default.

‎src/Plotly.NET/ChartAPI/ChartMap.fs

Lines changed: 467 additions & 467 deletions
Large diffs are not rendered by default.

‎src/Plotly.NET/ChartAPI/ChartPolar.fs

Lines changed: 230 additions & 230 deletions
Large diffs are not rendered by default.

‎src/Plotly.NET/ChartAPI/ChartSmith.fs

Lines changed: 160 additions & 160 deletions
Large diffs are not rendered by default.

‎src/Plotly.NET/ChartAPI/ChartTernary.fs

Lines changed: 170 additions & 170 deletions
Large diffs are not rendered by default.

‎src/Plotly.NET/CommonAbstractions/AutoRangeOptions.fs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ type AutoRangeOptions() =
1818
/// <param name="MinAllowed">Use this value exactly as autorange minimum.</param>
1919
static member init
2020
(
21-
[<Optional; DefaultParameterValue(null)>] ?ClipMax: #IConvertible,
22-
[<Optional; DefaultParameterValue(null)>] ?ClipMin: #IConvertible,
23-
[<Optional; DefaultParameterValue(null)>] ?Include: #IConvertible,
24-
[<Optional; DefaultParameterValue(null)>] ?MaxAllowed: #IConvertible,
25-
[<Optional; DefaultParameterValue(null)>] ?MinAllowed: #IConvertible
21+
?ClipMax: #IConvertible,
22+
?ClipMin: #IConvertible,
23+
?Include: #IConvertible,
24+
?MaxAllowed: #IConvertible,
25+
?MinAllowed: #IConvertible
2626
) =
2727
AutoRangeOptions()
2828
|> AutoRangeOptions.style (
@@ -43,11 +43,11 @@ type AutoRangeOptions() =
4343
/// <param name="MinAllowed">Use this value exactly as autorange minimum.</param>
4444
static member style
4545
(
46-
[<Optional; DefaultParameterValue(null)>] ?ClipMax: #IConvertible,
47-
[<Optional; DefaultParameterValue(null)>] ?ClipMin: #IConvertible,
48-
[<Optional; DefaultParameterValue(null)>] ?Include: #IConvertible,
49-
[<Optional; DefaultParameterValue(null)>] ?MaxAllowed: #IConvertible,
50-
[<Optional; DefaultParameterValue(null)>] ?MinAllowed: #IConvertible
46+
?ClipMax: #IConvertible,
47+
?ClipMin: #IConvertible,
48+
?Include: #IConvertible,
49+
?MaxAllowed: #IConvertible,
50+
?MinAllowed: #IConvertible
5151

5252
) =
5353
(fun (autoRangeOptions: AutoRangeOptions) ->

‎src/Plotly.NET/CommonAbstractions/ColorBar.fs

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -59,52 +59,52 @@ type ColorBar() =
5959
/// <param name="YRef">Sets the container `y` refers to. "container" spans the entire `height` of the plot. "paper" refers to the height of the plotting area only.</param>
6060
static member init
6161
(
62-
[<Optional; DefaultParameterValue(null)>] ?BGColor: Color,
63-
[<Optional; DefaultParameterValue(null)>] ?BorderColor: Color,
64-
[<Optional; DefaultParameterValue(null)>] ?BorderWidth: float,
65-
[<Optional; DefaultParameterValue(null)>] ?DTick: IConvertible,
66-
[<Optional; DefaultParameterValue(null)>] ?ExponentFormat: StyleParam.ExponentFormat,
67-
[<Optional; DefaultParameterValue(null)>] ?LabelAlias: DynamicObj,
68-
[<Optional; DefaultParameterValue(null)>] ?Len: float,
69-
[<Optional; DefaultParameterValue(null)>] ?LenMode: StyleParam.UnitMode,
70-
[<Optional; DefaultParameterValue(null)>] ?MinExponent: float,
71-
[<Optional; DefaultParameterValue(null)>] ?NTicks: int,
72-
[<Optional; DefaultParameterValue(null)>] ?Orientation: StyleParam.Orientation,
73-
[<Optional; DefaultParameterValue(null)>] ?OutlineColor: Color,
74-
[<Optional; DefaultParameterValue(null)>] ?OutlineWidth: float,
75-
[<Optional; DefaultParameterValue(null)>] ?SeparateThousands: bool,
76-
[<Optional; DefaultParameterValue(null)>] ?ShowExponent: StyleParam.ShowExponent,
77-
[<Optional; DefaultParameterValue(null)>] ?ShowTickLabels: bool,
78-
[<Optional; DefaultParameterValue(null)>] ?ShowTickPrefix: StyleParam.ShowTickOption,
79-
[<Optional; DefaultParameterValue(null)>] ?ShowTickSuffix: StyleParam.ShowTickOption,
80-
[<Optional; DefaultParameterValue(null)>] ?Thickness: float,
81-
[<Optional; DefaultParameterValue(null)>] ?ThicknessMode: StyleParam.UnitMode,
82-
[<Optional; DefaultParameterValue(null)>] ?Tick0: IConvertible,
83-
[<Optional; DefaultParameterValue(null)>] ?TickAngle: int,
84-
[<Optional; DefaultParameterValue(null)>] ?TickColor: Color,
85-
[<Optional; DefaultParameterValue(null)>] ?TickFont: Font,
86-
[<Optional; DefaultParameterValue(null)>] ?TickFormat: string,
87-
[<Optional; DefaultParameterValue(null)>] ?TickFormatStops: seq<TickFormatStop>,
88-
[<Optional; DefaultParameterValue(null)>] ?TickLabelOverflow: StyleParam.TickLabelOverflow,
89-
[<Optional; DefaultParameterValue(null)>] ?TickLabelPosition: StyleParam.TickLabelPosition,
90-
[<Optional; DefaultParameterValue(null)>] ?TickLabelStep: int,
91-
[<Optional; DefaultParameterValue(null)>] ?TickLen: float,
92-
[<Optional; DefaultParameterValue(null)>] ?TickMode: StyleParam.TickMode,
93-
[<Optional; DefaultParameterValue(null)>] ?TickPrefix: string,
94-
[<Optional; DefaultParameterValue(null)>] ?Ticks: StyleParam.TickOptions,
95-
[<Optional; DefaultParameterValue(null)>] ?TickSuffix: string,
96-
[<Optional; DefaultParameterValue(null)>] ?TickText: seq<#IConvertible>,
97-
[<Optional; DefaultParameterValue(null)>] ?TickVals: seq<#IConvertible>,
98-
[<Optional; DefaultParameterValue(null)>] ?TickWidth: float,
99-
[<Optional; DefaultParameterValue(null)>] ?Title: Title,
100-
[<Optional; DefaultParameterValue(null)>] ?X: float,
101-
[<Optional; DefaultParameterValue(null)>] ?XAnchor: StyleParam.HorizontalAlign,
102-
[<Optional; DefaultParameterValue(null)>] ?XPad: float,
103-
[<Optional; DefaultParameterValue(null)>] ?XRef: string,
104-
[<Optional; DefaultParameterValue(null)>] ?Y: float,
105-
[<Optional; DefaultParameterValue(null)>] ?YAnchor: StyleParam.VerticalAlign,
106-
[<Optional; DefaultParameterValue(null)>] ?YPad: float,
107-
[<Optional; DefaultParameterValue(null)>] ?YRef: string
62+
?BGColor: Color,
63+
?BorderColor: Color,
64+
?BorderWidth: float,
65+
?DTick: IConvertible,
66+
?ExponentFormat: StyleParam.ExponentFormat,
67+
?LabelAlias: DynamicObj,
68+
?Len: float,
69+
?LenMode: StyleParam.UnitMode,
70+
?MinExponent: float,
71+
?NTicks: int,
72+
?Orientation: StyleParam.Orientation,
73+
?OutlineColor: Color,
74+
?OutlineWidth: float,
75+
?SeparateThousands: bool,
76+
?ShowExponent: StyleParam.ShowExponent,
77+
?ShowTickLabels: bool,
78+
?ShowTickPrefix: StyleParam.ShowTickOption,
79+
?ShowTickSuffix: StyleParam.ShowTickOption,
80+
?Thickness: float,
81+
?ThicknessMode: StyleParam.UnitMode,
82+
?Tick0: IConvertible,
83+
?TickAngle: int,
84+
?TickColor: Color,
85+
?TickFont: Font,
86+
?TickFormat: string,
87+
?TickFormatStops: seq<TickFormatStop>,
88+
?TickLabelOverflow: StyleParam.TickLabelOverflow,
89+
?TickLabelPosition: StyleParam.TickLabelPosition,
90+
?TickLabelStep: int,
91+
?TickLen: float,
92+
?TickMode: StyleParam.TickMode,
93+
?TickPrefix: string,
94+
?Ticks: StyleParam.TickOptions,
95+
?TickSuffix: string,
96+
?TickText: seq<#IConvertible>,
97+
?TickVals: seq<#IConvertible>,
98+
?TickWidth: float,
99+
?Title: Title,
100+
?X: float,
101+
?XAnchor: StyleParam.HorizontalAlign,
102+
?XPad: float,
103+
?XRef: string,
104+
?Y: float,
105+
?YAnchor: StyleParam.VerticalAlign,
106+
?YPad: float,
107+
?YRef: string
108108
) =
109109
ColorBar()
110110
|> ColorBar.style (
@@ -205,52 +205,52 @@ type ColorBar() =
205205
/// <param name="YPad">Sets the amount of padding (in px) along the y direction.</param>
206206
static member style
207207
(
208-
[<Optional; DefaultParameterValue(null)>] ?BGColor: Color,
209-
[<Optional; DefaultParameterValue(null)>] ?BorderColor: Color,
210-
[<Optional; DefaultParameterValue(null)>] ?BorderWidth: float,
211-
[<Optional; DefaultParameterValue(null)>] ?DTick: IConvertible,
212-
[<Optional; DefaultParameterValue(null)>] ?ExponentFormat: StyleParam.ExponentFormat,
213-
[<Optional; DefaultParameterValue(null)>] ?LabelAlias: DynamicObj,
214-
[<Optional; DefaultParameterValue(null)>] ?Len: float,
215-
[<Optional; DefaultParameterValue(null)>] ?LenMode: StyleParam.UnitMode,
216-
[<Optional; DefaultParameterValue(null)>] ?MinExponent: float,
217-
[<Optional; DefaultParameterValue(null)>] ?NTicks: int,
218-
[<Optional; DefaultParameterValue(null)>] ?Orientation: StyleParam.Orientation,
219-
[<Optional; DefaultParameterValue(null)>] ?OutlineColor: Color,
220-
[<Optional; DefaultParameterValue(null)>] ?OutlineWidth: float,
221-
[<Optional; DefaultParameterValue(null)>] ?SeparateThousands: bool,
222-
[<Optional; DefaultParameterValue(null)>] ?ShowExponent: StyleParam.ShowExponent,
223-
[<Optional; DefaultParameterValue(null)>] ?ShowTickLabels: bool,
224-
[<Optional; DefaultParameterValue(null)>] ?ShowTickPrefix: StyleParam.ShowTickOption,
225-
[<Optional; DefaultParameterValue(null)>] ?ShowTickSuffix: StyleParam.ShowTickOption,
226-
[<Optional; DefaultParameterValue(null)>] ?Thickness: float,
227-
[<Optional; DefaultParameterValue(null)>] ?ThicknessMode: StyleParam.UnitMode,
228-
[<Optional; DefaultParameterValue(null)>] ?Tick0: IConvertible,
229-
[<Optional; DefaultParameterValue(null)>] ?TickAngle: int,
230-
[<Optional; DefaultParameterValue(null)>] ?TickColor: Color,
231-
[<Optional; DefaultParameterValue(null)>] ?TickFont: Font,
232-
[<Optional; DefaultParameterValue(null)>] ?TickFormat: string,
233-
[<Optional; DefaultParameterValue(null)>] ?TickFormatStops: seq<TickFormatStop>,
234-
[<Optional; DefaultParameterValue(null)>] ?TickLabelOverflow: StyleParam.TickLabelOverflow,
235-
[<Optional; DefaultParameterValue(null)>] ?TickLabelPosition: StyleParam.TickLabelPosition,
236-
[<Optional; DefaultParameterValue(null)>] ?TickLabelStep: int,
237-
[<Optional; DefaultParameterValue(null)>] ?TickLen: float,
238-
[<Optional; DefaultParameterValue(null)>] ?TickMode: StyleParam.TickMode,
239-
[<Optional; DefaultParameterValue(null)>] ?TickPrefix: string,
240-
[<Optional; DefaultParameterValue(null)>] ?Ticks: StyleParam.TickOptions,
241-
[<Optional; DefaultParameterValue(null)>] ?TickSuffix: string,
242-
[<Optional; DefaultParameterValue(null)>] ?TickText: seq<#IConvertible>,
243-
[<Optional; DefaultParameterValue(null)>] ?TickVals: seq<#IConvertible>,
244-
[<Optional; DefaultParameterValue(null)>] ?TickWidth: float,
245-
[<Optional; DefaultParameterValue(null)>] ?Title: Title,
246-
[<Optional; DefaultParameterValue(null)>] ?X: float,
247-
[<Optional; DefaultParameterValue(null)>] ?XAnchor: StyleParam.HorizontalAlign,
248-
[<Optional; DefaultParameterValue(null)>] ?XPad: float,
249-
[<Optional; DefaultParameterValue(null)>] ?XRef: string,
250-
[<Optional; DefaultParameterValue(null)>] ?Y: float,
251-
[<Optional; DefaultParameterValue(null)>] ?YAnchor: StyleParam.VerticalAlign,
252-
[<Optional; DefaultParameterValue(null)>] ?YPad: float,
253-
[<Optional; DefaultParameterValue(null)>] ?YRef: string
208+
?BGColor: Color,
209+
?BorderColor: Color,
210+
?BorderWidth: float,
211+
?DTick: IConvertible,
212+
?ExponentFormat: StyleParam.ExponentFormat,
213+
?LabelAlias: DynamicObj,
214+
?Len: float,
215+
?LenMode: StyleParam.UnitMode,
216+
?MinExponent: float,
217+
?NTicks: int,
218+
?Orientation: StyleParam.Orientation,
219+
?OutlineColor: Color,
220+
?OutlineWidth: float,
221+
?SeparateThousands: bool,
222+
?ShowExponent: StyleParam.ShowExponent,
223+
?ShowTickLabels: bool,
224+
?ShowTickPrefix: StyleParam.ShowTickOption,
225+
?ShowTickSuffix: StyleParam.ShowTickOption,
226+
?Thickness: float,
227+
?ThicknessMode: StyleParam.UnitMode,
228+
?Tick0: IConvertible,
229+
?TickAngle: int,
230+
?TickColor: Color,
231+
?TickFont: Font,
232+
?TickFormat: string,
233+
?TickFormatStops: seq<TickFormatStop>,
234+
?TickLabelOverflow: StyleParam.TickLabelOverflow,
235+
?TickLabelPosition: StyleParam.TickLabelPosition,
236+
?TickLabelStep: int,
237+
?TickLen: float,
238+
?TickMode: StyleParam.TickMode,
239+
?TickPrefix: string,
240+
?Ticks: StyleParam.TickOptions,
241+
?TickSuffix: string,
242+
?TickText: seq<#IConvertible>,
243+
?TickVals: seq<#IConvertible>,
244+
?TickWidth: float,
245+
?Title: Title,
246+
?X: float,
247+
?XAnchor: StyleParam.HorizontalAlign,
248+
?XPad: float,
249+
?XRef: string,
250+
?Y: float,
251+
?YAnchor: StyleParam.VerticalAlign,
252+
?YPad: float,
253+
?YRef: string
254254
) =
255255

256256
(fun (colorBar: ColorBar) ->

‎src/Plotly.NET/CommonAbstractions/Font.fs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ type Font() =
1111
/// Init Font()
1212
static member init
1313
(
14-
[<Optional; DefaultParameterValue(null)>] ?Family: StyleParam.FontFamily,
15-
[<Optional; DefaultParameterValue(null)>] ?Size: float,
16-
[<Optional; DefaultParameterValue(null)>] ?Color: Color
14+
?Family: StyleParam.FontFamily,
15+
?Size: float,
16+
?Color: Color
1717
) =
1818
Font() |> Font.style (?Family = Family, ?Size = Size, ?Color = Color)
1919

2020

2121
// Applies the styles to Font()
2222
static member style
2323
(
24-
[<Optional; DefaultParameterValue(null)>] ?Family: StyleParam.FontFamily,
25-
[<Optional; DefaultParameterValue(null)>] ?Size: float,
26-
[<Optional; DefaultParameterValue(null)>] ?Color: Color
24+
?Family: StyleParam.FontFamily,
25+
?Size: float,
26+
?Color: Color
2727
) =
2828
(fun (font: Font) ->
2929
font

0 commit comments

Comments
 (0)