Skip to content

Commit a7fa141

Browse files
kMutagenekMutagene
committed
Greatly improve test pipeline and structure
1 parent 697f886 commit a7fa141

231 files changed

Lines changed: 278 additions & 169 deletions

File tree

Some content is hidden

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

‎Plotly.NET.sln‎

Lines changed: 72 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7C6D08E7
2828
EndProject
2929
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Plotly.NET", "src\Plotly.NET\Plotly.NET.fsproj", "{DFAC135B-36B8-4347-B1DD-B5E0144610C2}"
3030
EndProject
31-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Plotly.NET.Tests", "tests\Plotly.NET.Tests\Plotly.NET.Tests.fsproj", "{2C9916F4-817A-4B70-8D83-F48E9A30544F}"
32-
EndProject
3331
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".ci", ".ci", "{2461AFBF-6E10-4F7B-A0EA-3D62541C2EB1}"
3432
ProjectSection(SolutionItems) = preProject
3533
.github\workflows\build-and-deploy-docs.yml = .github\workflows\build-and-deploy-docs.yml
@@ -139,24 +137,34 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0E87E47E-9ED
139137
EndProject
140138
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EAE25A1F-86FC-426B-803F-1006D1AD06A8}"
141139
ProjectSection(SolutionItems) = preProject
142-
src\Plotly.NET\Playground.fsx = src\Plotly.NET\Playground.fsx
140+
tests\README.md = tests\README.md
143141
EndProjectSection
144142
EndProject
145-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Plotly.NET.Tests.FSharpConsole", "tests\Plotly.NET.Tests.FSharpConsole\Plotly.NET.Tests.FSharpConsole.fsproj", "{60114ACE-77E6-4A19-9A2F-CB64084174AF}"
143+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "build", "build\build.fsproj", "{403785C9-B5B1-4BA4-9944-A0F9D5D1B3CD}"
146144
EndProject
147-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plotly.NET.Tests.CSharpConsole", "tests\Plotly.NET.Tests.CSharpConsole\Plotly.NET.Tests.CSharpConsole.csproj", "{1BC73DA0-586F-45C2-BC5B-A70C452A00F0}"
145+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plotly.NET.CSharp", "src\Plotly.NET.CSharp\Plotly.NET.CSharp.csproj", "{F944FE69-F4A5-4B48-8E4D-BE4B61E92B26}"
148146
EndProject
149-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Plotly.NET.ImageExport.Tests", "tests\Plotly.NET.ImageExport.Tests\Plotly.NET.ImageExport.Tests.fsproj", "{55A461C3-8018-4020-B16E-D6005BDFCAED}"
147+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CoreTests", "CoreTests", "{023425D8-B375-45ED-A29A-A3ED00C0E2BC}"
150148
EndProject
151-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "build", "build\build.fsproj", "{403785C9-B5B1-4BA4-9944-A0F9D5D1B3CD}"
149+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JSTests", "JSTests", "{94E71E92-C244-4AF1-903A-DAC5448DADA5}"
152150
EndProject
153-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plotly.NET.CSharp", "src\Plotly.NET.CSharp\Plotly.NET.CSharp.csproj", "{F944FE69-F4A5-4B48-8E4D-BE4B61E92B26}"
151+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ExtensionLibTests", "ExtensionLibTests", "{02886FBB-DB32-4BBB-A93C-E13EBF453ACC}"
152+
EndProject
153+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConsoleApps", "ConsoleApps", "{E8897848-2EF4-4126-9315-ADE0BA92D951}"
154+
EndProject
155+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpConsole", "tests\ConsoleApps\CSharpConsole\CSharpConsole.csproj", "{029EBCB4-0E8B-40F8-B7AA-61B814FAE5A6}"
156+
EndProject
157+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpConsole", "tests\ConsoleApps\FSharpConsole\FSharpConsole.fsproj", "{598AB47B-EFE7-414A-B6EA-8C96B4AA7A4C}"
158+
EndProject
159+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "CoreTests", "tests\CoreTests\CoreTests\CoreTests.fsproj", "{DA7BC908-7DC9-4BA7-8100-17D3FD2901EA}"
160+
EndProject
161+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpInteroperabilityTests", "tests\CoreTests\CSharpInteroperabilityTests\CSharpInteroperabilityTests.csproj", "{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}"
154162
EndProject
155-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plotly.NET.CSharp.Tests", "tests\Plotly.NET.CSharp.Tests\Plotly.NET.CSharp.Tests.csproj", "{4C24BA53-F41C-4110-AD7A-28143DCF671E}"
163+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "StrongNameTests", "tests\CoreTests\StrongNameTests\StrongNameTests.fsproj", "{32E187BB-D1D4-4864-A021-55A7A08E17EC}"
156164
EndProject
157-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plotly.NET.Tests.CSharpInteroperability", "tests\Plotly.NET.Tests.CSharpInteroperability\Plotly.NET.Tests.CSharpInteroperability.csproj", "{64022D22-EB9A-4AE3-A0E6-BFA41E8B18CB}"
165+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ImageExportTests", "tests\ExtensionLibsTests\ImageExportTests\ImageExportTests.fsproj", "{A3693DD1-4D34-4B10-B310-07A4C7433F7D}"
158166
EndProject
159-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Plotly.NET.Tests.StrongName", "tests\Plotly.NET.Tests.StrongName\Plotly.NET.Tests.StrongName.fsproj", "{E923A457-A6D3-4614-A8A9-287E4A4797EF}"
167+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpTests", "tests\ExtensionLibsTests\CSharpTests\CSharpTests.csproj", "{1170E3A9-D83E-40B0-8D51-20485C76BE88}"
160168
EndProject
161169
Global
162170
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -171,12 +179,6 @@ Global
171179
{DFAC135B-36B8-4347-B1DD-B5E0144610C2}.Dotnet|Any CPU.Build.0 = Dotnet|Any CPU
172180
{DFAC135B-36B8-4347-B1DD-B5E0144610C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
173181
{DFAC135B-36B8-4347-B1DD-B5E0144610C2}.Release|Any CPU.Build.0 = Release|Any CPU
174-
{2C9916F4-817A-4B70-8D83-F48E9A30544F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
175-
{2C9916F4-817A-4B70-8D83-F48E9A30544F}.Debug|Any CPU.Build.0 = Debug|Any CPU
176-
{2C9916F4-817A-4B70-8D83-F48E9A30544F}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
177-
{2C9916F4-817A-4B70-8D83-F48E9A30544F}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
178-
{2C9916F4-817A-4B70-8D83-F48E9A30544F}.Release|Any CPU.ActiveCfg = Release|Any CPU
179-
{2C9916F4-817A-4B70-8D83-F48E9A30544F}.Release|Any CPU.Build.0 = Release|Any CPU
180182
{0F135E3B-B0E1-42A9-B180-18C0221DC7B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
181183
{0F135E3B-B0E1-42A9-B180-18C0221DC7B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
182184
{0F135E3B-B0E1-42A9-B180-18C0221DC7B8}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
@@ -189,24 +191,6 @@ Global
189191
{6CFC629E-1A0C-4EF3-8495-BA00A356A381}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
190192
{6CFC629E-1A0C-4EF3-8495-BA00A356A381}.Release|Any CPU.ActiveCfg = Release|Any CPU
191193
{6CFC629E-1A0C-4EF3-8495-BA00A356A381}.Release|Any CPU.Build.0 = Release|Any CPU
192-
{60114ACE-77E6-4A19-9A2F-CB64084174AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
193-
{60114ACE-77E6-4A19-9A2F-CB64084174AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
194-
{60114ACE-77E6-4A19-9A2F-CB64084174AF}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
195-
{60114ACE-77E6-4A19-9A2F-CB64084174AF}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
196-
{60114ACE-77E6-4A19-9A2F-CB64084174AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
197-
{60114ACE-77E6-4A19-9A2F-CB64084174AF}.Release|Any CPU.Build.0 = Release|Any CPU
198-
{1BC73DA0-586F-45C2-BC5B-A70C452A00F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
199-
{1BC73DA0-586F-45C2-BC5B-A70C452A00F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
200-
{1BC73DA0-586F-45C2-BC5B-A70C452A00F0}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
201-
{1BC73DA0-586F-45C2-BC5B-A70C452A00F0}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
202-
{1BC73DA0-586F-45C2-BC5B-A70C452A00F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
203-
{1BC73DA0-586F-45C2-BC5B-A70C452A00F0}.Release|Any CPU.Build.0 = Release|Any CPU
204-
{55A461C3-8018-4020-B16E-D6005BDFCAED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
205-
{55A461C3-8018-4020-B16E-D6005BDFCAED}.Debug|Any CPU.Build.0 = Debug|Any CPU
206-
{55A461C3-8018-4020-B16E-D6005BDFCAED}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
207-
{55A461C3-8018-4020-B16E-D6005BDFCAED}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
208-
{55A461C3-8018-4020-B16E-D6005BDFCAED}.Release|Any CPU.ActiveCfg = Release|Any CPU
209-
{55A461C3-8018-4020-B16E-D6005BDFCAED}.Release|Any CPU.Build.0 = Release|Any CPU
210194
{403785C9-B5B1-4BA4-9944-A0F9D5D1B3CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
211195
{403785C9-B5B1-4BA4-9944-A0F9D5D1B3CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
212196
{403785C9-B5B1-4BA4-9944-A0F9D5D1B3CD}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
@@ -219,44 +203,72 @@ Global
219203
{F944FE69-F4A5-4B48-8E4D-BE4B61E92B26}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
220204
{F944FE69-F4A5-4B48-8E4D-BE4B61E92B26}.Release|Any CPU.ActiveCfg = Release|Any CPU
221205
{F944FE69-F4A5-4B48-8E4D-BE4B61E92B26}.Release|Any CPU.Build.0 = Release|Any CPU
222-
{4C24BA53-F41C-4110-AD7A-28143DCF671E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
223-
{4C24BA53-F41C-4110-AD7A-28143DCF671E}.Debug|Any CPU.Build.0 = Debug|Any CPU
224-
{4C24BA53-F41C-4110-AD7A-28143DCF671E}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
225-
{4C24BA53-F41C-4110-AD7A-28143DCF671E}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
226-
{4C24BA53-F41C-4110-AD7A-28143DCF671E}.Release|Any CPU.ActiveCfg = Release|Any CPU
227-
{4C24BA53-F41C-4110-AD7A-28143DCF671E}.Release|Any CPU.Build.0 = Release|Any CPU
228-
{64022D22-EB9A-4AE3-A0E6-BFA41E8B18CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
229-
{64022D22-EB9A-4AE3-A0E6-BFA41E8B18CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
230-
{64022D22-EB9A-4AE3-A0E6-BFA41E8B18CB}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
231-
{64022D22-EB9A-4AE3-A0E6-BFA41E8B18CB}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
232-
{64022D22-EB9A-4AE3-A0E6-BFA41E8B18CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
233-
{64022D22-EB9A-4AE3-A0E6-BFA41E8B18CB}.Release|Any CPU.Build.0 = Release|Any CPU
234-
{E923A457-A6D3-4614-A8A9-287E4A4797EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
235-
{E923A457-A6D3-4614-A8A9-287E4A4797EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
236-
{E923A457-A6D3-4614-A8A9-287E4A4797EF}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
237-
{E923A457-A6D3-4614-A8A9-287E4A4797EF}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
238-
{E923A457-A6D3-4614-A8A9-287E4A4797EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
239-
{E923A457-A6D3-4614-A8A9-287E4A4797EF}.Release|Any CPU.Build.0 = Release|Any CPU
206+
{029EBCB4-0E8B-40F8-B7AA-61B814FAE5A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
207+
{029EBCB4-0E8B-40F8-B7AA-61B814FAE5A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
208+
{029EBCB4-0E8B-40F8-B7AA-61B814FAE5A6}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
209+
{029EBCB4-0E8B-40F8-B7AA-61B814FAE5A6}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
210+
{029EBCB4-0E8B-40F8-B7AA-61B814FAE5A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
211+
{029EBCB4-0E8B-40F8-B7AA-61B814FAE5A6}.Release|Any CPU.Build.0 = Release|Any CPU
212+
{598AB47B-EFE7-414A-B6EA-8C96B4AA7A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
213+
{598AB47B-EFE7-414A-B6EA-8C96B4AA7A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
214+
{598AB47B-EFE7-414A-B6EA-8C96B4AA7A4C}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
215+
{598AB47B-EFE7-414A-B6EA-8C96B4AA7A4C}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
216+
{598AB47B-EFE7-414A-B6EA-8C96B4AA7A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
217+
{598AB47B-EFE7-414A-B6EA-8C96B4AA7A4C}.Release|Any CPU.Build.0 = Release|Any CPU
218+
{DA7BC908-7DC9-4BA7-8100-17D3FD2901EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
219+
{DA7BC908-7DC9-4BA7-8100-17D3FD2901EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
220+
{DA7BC908-7DC9-4BA7-8100-17D3FD2901EA}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
221+
{DA7BC908-7DC9-4BA7-8100-17D3FD2901EA}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
222+
{DA7BC908-7DC9-4BA7-8100-17D3FD2901EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
223+
{DA7BC908-7DC9-4BA7-8100-17D3FD2901EA}.Release|Any CPU.Build.0 = Release|Any CPU
224+
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
225+
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
226+
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
227+
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
228+
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
229+
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1}.Release|Any CPU.Build.0 = Release|Any CPU
230+
{32E187BB-D1D4-4864-A021-55A7A08E17EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
231+
{32E187BB-D1D4-4864-A021-55A7A08E17EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
232+
{32E187BB-D1D4-4864-A021-55A7A08E17EC}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
233+
{32E187BB-D1D4-4864-A021-55A7A08E17EC}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
234+
{32E187BB-D1D4-4864-A021-55A7A08E17EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
235+
{32E187BB-D1D4-4864-A021-55A7A08E17EC}.Release|Any CPU.Build.0 = Release|Any CPU
236+
{A3693DD1-4D34-4B10-B310-07A4C7433F7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
237+
{A3693DD1-4D34-4B10-B310-07A4C7433F7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
238+
{A3693DD1-4D34-4B10-B310-07A4C7433F7D}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
239+
{A3693DD1-4D34-4B10-B310-07A4C7433F7D}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
240+
{A3693DD1-4D34-4B10-B310-07A4C7433F7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
241+
{A3693DD1-4D34-4B10-B310-07A4C7433F7D}.Release|Any CPU.Build.0 = Release|Any CPU
242+
{1170E3A9-D83E-40B0-8D51-20485C76BE88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
243+
{1170E3A9-D83E-40B0-8D51-20485C76BE88}.Debug|Any CPU.Build.0 = Debug|Any CPU
244+
{1170E3A9-D83E-40B0-8D51-20485C76BE88}.Dotnet|Any CPU.ActiveCfg = Debug|Any CPU
245+
{1170E3A9-D83E-40B0-8D51-20485C76BE88}.Dotnet|Any CPU.Build.0 = Debug|Any CPU
246+
{1170E3A9-D83E-40B0-8D51-20485C76BE88}.Release|Any CPU.ActiveCfg = Release|Any CPU
247+
{1170E3A9-D83E-40B0-8D51-20485C76BE88}.Release|Any CPU.Build.0 = Release|Any CPU
240248
EndGlobalSection
241249
GlobalSection(SolutionProperties) = preSolution
242250
HideSolutionNode = FALSE
243251
EndGlobalSection
244252
GlobalSection(NestedProjects) = preSolution
245253
{DFAC135B-36B8-4347-B1DD-B5E0144610C2} = {0E87E47E-9EDC-4525-AF72-F0E139D54236}
246-
{2C9916F4-817A-4B70-8D83-F48E9A30544F} = {EAE25A1F-86FC-426B-803F-1006D1AD06A8}
247254
{0F135E3B-B0E1-42A9-B180-18C0221DC7B8} = {0E87E47E-9EDC-4525-AF72-F0E139D54236}
248255
{5219BAC7-ACE6-435F-A983-BC63DD7B745E} = {7B09CC0A-F1E1-4094-9DE4-B047581E01F0}
249256
{60FB82C0-F472-494E-BCF7-7B3C54212406} = {7B09CC0A-F1E1-4094-9DE4-B047581E01F0}
250257
{CDB973F2-0F60-4ADB-84A8-924AFA8B6D49} = {7B09CC0A-F1E1-4094-9DE4-B047581E01F0}
251258
{6CFC629E-1A0C-4EF3-8495-BA00A356A381} = {0E87E47E-9EDC-4525-AF72-F0E139D54236}
252-
{60114ACE-77E6-4A19-9A2F-CB64084174AF} = {EAE25A1F-86FC-426B-803F-1006D1AD06A8}
253-
{1BC73DA0-586F-45C2-BC5B-A70C452A00F0} = {EAE25A1F-86FC-426B-803F-1006D1AD06A8}
254-
{55A461C3-8018-4020-B16E-D6005BDFCAED} = {EAE25A1F-86FC-426B-803F-1006D1AD06A8}
255259
{403785C9-B5B1-4BA4-9944-A0F9D5D1B3CD} = {7C6D08E7-3EAC-4335-8F4B-252C193C27C9}
256260
{F944FE69-F4A5-4B48-8E4D-BE4B61E92B26} = {0E87E47E-9EDC-4525-AF72-F0E139D54236}
257-
{4C24BA53-F41C-4110-AD7A-28143DCF671E} = {EAE25A1F-86FC-426B-803F-1006D1AD06A8}
258-
{64022D22-EB9A-4AE3-A0E6-BFA41E8B18CB} = {EAE25A1F-86FC-426B-803F-1006D1AD06A8}
259-
{E923A457-A6D3-4614-A8A9-287E4A4797EF} = {EAE25A1F-86FC-426B-803F-1006D1AD06A8}
261+
{023425D8-B375-45ED-A29A-A3ED00C0E2BC} = {EAE25A1F-86FC-426B-803F-1006D1AD06A8}
262+
{94E71E92-C244-4AF1-903A-DAC5448DADA5} = {EAE25A1F-86FC-426B-803F-1006D1AD06A8}
263+
{02886FBB-DB32-4BBB-A93C-E13EBF453ACC} = {EAE25A1F-86FC-426B-803F-1006D1AD06A8}
264+
{E8897848-2EF4-4126-9315-ADE0BA92D951} = {EAE25A1F-86FC-426B-803F-1006D1AD06A8}
265+
{029EBCB4-0E8B-40F8-B7AA-61B814FAE5A6} = {E8897848-2EF4-4126-9315-ADE0BA92D951}
266+
{598AB47B-EFE7-414A-B6EA-8C96B4AA7A4C} = {E8897848-2EF4-4126-9315-ADE0BA92D951}
267+
{DA7BC908-7DC9-4BA7-8100-17D3FD2901EA} = {023425D8-B375-45ED-A29A-A3ED00C0E2BC}
268+
{C10C0225-FBBA-4E3C-99FD-FA4A2BCBB3B1} = {023425D8-B375-45ED-A29A-A3ED00C0E2BC}
269+
{32E187BB-D1D4-4864-A021-55A7A08E17EC} = {023425D8-B375-45ED-A29A-A3ED00C0E2BC}
270+
{A3693DD1-4D34-4B10-B310-07A4C7433F7D} = {02886FBB-DB32-4BBB-A93C-E13EBF453ACC}
271+
{1170E3A9-D83E-40B0-8D51-20485C76BE88} = {02886FBB-DB32-4BBB-A93C-E13EBF453ACC}
260272
EndGlobalSection
261273
GlobalSection(ExtensibilityGlobals) = postSolution
262274
SolutionGuid = {7177F1E1-341C-48AB-9864-6B525FFF7633}

‎build/Build.fs‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,20 @@ initializeContext ()
1818

1919
open BasicTasks
2020

21+
//workaround for tasks created with functions not being runnable.
22+
23+
//let _ = TestTasks.buildTestsAll |> ignore
24+
//let _ = TestTasks.buildTestsCore |> ignore
25+
//let _ = TestTasks.buildTestsNetFX |> ignore
26+
//let _ = TestTasks.buildTestsExtensionsLibs |> ignore
27+
28+
//let _ = TestTasks.runTestsAll |> ignore
29+
//let _ = TestTasks.runTestsCore |> ignore
30+
//let _ = TestTasks.runTestsNetFX |> ignore
31+
//let _ = TestTasks.runTestsCoreWithNetFX |> ignore
32+
//let _ = TestTasks.runTestsExtensionLibs |> ignore
33+
34+
2135
let sourceFiles =
2236
!! "src/Plotly.NET/**/*.fs"
2337
++ "src/Plotly.NET.ImageExport/**/*.fs"
@@ -33,7 +47,7 @@ let _release =
3347
[
3448
clean
3549
build
36-
runTests
50+
runTestsAll
3751
pack
3852
buildDocs
3953
createTag
@@ -49,7 +63,7 @@ let _preRelease =
4963
setPrereleaseTag
5064
clean
5165
build
52-
runTests
66+
runTestsAll
5367
packPrerelease
5468
buildDocsPrerelease
5569
createPrereleaseTag
@@ -64,7 +78,7 @@ let _releaseNoDocs =
6478
[
6579
clean
6680
build
67-
runTests
81+
runTestsAll
6882
pack
6983
createTag
7084
publishNuget
@@ -78,7 +92,7 @@ let _preReleaseNoDocs =
7892
setPrereleaseTag
7993
clean
8094
build
81-
runTests
95+
runTestsAll
8296
packPrerelease
8397
createPrereleaseTag
8498
publishNugetPrerelease

‎build/PackageTasks.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ open Fake.Core
1111
open Fake.DotNet
1212
open Fake.IO.Globbing.Operators
1313

14-
let pack = BuildTask.create "Pack" [ clean; build; runTests ] {
14+
let pack = BuildTask.create "Pack" [ clean; build; runTestsAll ] {
1515
projects
1616
|> List.iter (fun pInfo ->
1717
if promptYesNo $"creating stable package for {pInfo.Name}{System.Environment.NewLine}\tpackage version: {pInfo.PackageVersionTag}{System.Environment.NewLine}\tassembly version: {pInfo.AssemblyVersion}{System.Environment.NewLine}\tassembly informational version: {pInfo.AssemblyInformationalVersion}{System.Environment.NewLine} OK?" then
@@ -62,7 +62,7 @@ let packPrerelease =
6262
[
6363
clean
6464
build
65-
runTests
65+
runTestsAll
6666
] {
6767
projects
6868
|> List.iter (fun pInfo ->

‎build/ProjectInfo.fs‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -63,26 +63,30 @@ let pkgDir = "pkg"
6363
let configuration = "Release"
6464

6565
// test projects (.NET)
66-
let CoreTestProject = ProjectInfo.create("Plotly.NET.Tests", "tests/Plotly.NET.Tests/Plotly.NET.Tests.fsproj")
67-
let ImageExportTestProject = ProjectInfo.create("Plotly.NET.ImageExport.Tests", "tests/Plotly.NET.ImageExport.Tests/Plotly.NET.ImageExport.Tests.fsproj")
68-
let CSharpInteroperabilityTestProject = ProjectInfo.create("Plotly.NET.Tests.CSharpInteroperability", "tests/Plotly.NET.Tests.CSharpInteroperability/Plotly.NET.Tests.CSharpInteroperability.csproj")
69-
let CSharpTestProject = ProjectInfo.create("Plotly.NET.CSharp.Tests", "tests/Plotly.NET.CSharp.Tests/Plotly.NET.CSharp.Tests.csproj")
70-
71-
/// contains project info about all test projects
72-
let testProjects =
73-
[
74-
CoreTestProject
75-
ImageExportTestProject
76-
CSharpTestProject
77-
]
78-
79-
// test projects (.NET framework)
80-
let StrongNameTestProject = ProjectInfo.create("Plotly.NET.Tests.StrongName", "tests/Plotly.NET.Tests.StrongName/Plotly.NET.Tests.StrongName.fsproj")
81-
82-
let testProjectsNetFX =
83-
[
84-
StrongNameTestProject
85-
]
66+
let CoreTestProject = ProjectInfo.create("CoreTests", "tests/CoreTests/CoreTests/CoreTests.fsproj")
67+
let CSharpInteroperabilityTestProject = ProjectInfo.create("CSharpInteroperabilityTests", "tests/CoreTests/CSharpInteroperabilityTests/CSharpInteroperabilityTests.csproj")
68+
69+
/// contains project info about the core test projects
70+
let testProjectsCore = [
71+
CoreTestProject
72+
CSharpInteroperabilityTestProject
73+
]
74+
75+
let ImageExportTestProject = ProjectInfo.create("ImageExportTests", "tests/ExtensionLibsTests/ImageExportTests/ImageExportTests.fsproj")
76+
let CSharpTestProject = ProjectInfo.create("CSharpTests", "tests/ExtensionLibsTests/CSharpTests/CSharpTests.csproj")
77+
78+
///
79+
let testProjectsExtensionsLibs = [
80+
ImageExportTestProject
81+
CSharpTestProject
82+
]
83+
84+
// test projects (.NET framework)
85+
let StrongNameTestProject = ProjectInfo.create("StrongNameTests", "tests/CoreTests/StrongNameTests/StrongNameTests.fsproj")
86+
87+
let testProjectsNetFX = [
88+
StrongNameTestProject
89+
]
8690

8791
let CoreProject = ProjectInfo.create("Plotly.NET", "src/Plotly.NET/Plotly.NET.fsproj", "src/Plotly.NET/RELEASE_NOTES.md")
8892
let InteractiveProject = ProjectInfo.create("Plotly.NET.Interactive", "src/Plotly.NET.Interactive/Plotly.NET.Interactive.fsproj", "src/Plotly.NET.Interactive/RELEASE_NOTES.md")

0 commit comments

Comments
 (0)