Skip to content

Commit 40878d3

Browse files
kMutagenekMutagene
committed
Remove WPF project to transition to .NET Core only. Fix doc links
1 parent 3203bf1 commit 40878d3

17 files changed

+8
-358
lines changed

Diff for: ‎Plotly.NET.sln

-9
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D
5151
docsrc\content\parallel-categories.fsx = docsrc\content\parallel-categories.fsx
5252
docsrc\content\parallel-coords.fsx = docsrc\content\parallel-coords.fsx
5353
docsrc\content\pie-daughnut-charts.fsx = docsrc\content\pie-daughnut-charts.fsx
54-
docsrc\content\plotly-wpf.fsx = docsrc\content\plotly-wpf.fsx
5554
docsrc\content\polar-charts.fsx = docsrc\content\polar-charts.fsx
5655
docsrc\content\range-plots.fsx = docsrc\content\range-plots.fsx
5756
docsrc\content\sankey.fsx = docsrc\content\sankey.fsx
@@ -79,8 +78,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{7C6D08
7978
EndProject
8079
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Plotly.NET", "src\Plotly.NET\Plotly.NET.fsproj", "{DFAC135B-36B8-4347-B1DD-B5E0144610C2}"
8180
EndProject
82-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Plotly.NET.WPF", "src\Plotly.NET.WPF\Plotly.NET.WPF.fsproj", "{C73BB0AE-B1AD-446A-9833-7A9543853EFA}"
83-
EndProject
8481
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8C673526-8416-4DB2-AA73-908B5871A733}"
8582
EndProject
8683
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Plotly.NET.Tests", "tests\Plotly.NET.Tests\Plotly.NET.Tests.fsproj", "{DA6EFE18-664F-4915-A4A9-46B679D1E598}"
@@ -98,12 +95,6 @@ Global
9895
{DFAC135B-36B8-4347-B1DD-B5E0144610C2}.Dotnet|Any CPU.Build.0 = Dotnet|Any CPU
9996
{DFAC135B-36B8-4347-B1DD-B5E0144610C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
10097
{DFAC135B-36B8-4347-B1DD-B5E0144610C2}.Release|Any CPU.Build.0 = Release|Any CPU
101-
{C73BB0AE-B1AD-446A-9833-7A9543853EFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
102-
{C73BB0AE-B1AD-446A-9833-7A9543853EFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
103-
{C73BB0AE-B1AD-446A-9833-7A9543853EFA}.Dotnet|Any CPU.ActiveCfg = Dotnet|Any CPU
104-
{C73BB0AE-B1AD-446A-9833-7A9543853EFA}.Dotnet|Any CPU.Build.0 = Dotnet|Any CPU
105-
{C73BB0AE-B1AD-446A-9833-7A9543853EFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
106-
{C73BB0AE-B1AD-446A-9833-7A9543853EFA}.Release|Any CPU.Build.0 = Release|Any CPU
10798
{DA6EFE18-664F-4915-A4A9-46B679D1E598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10899
{DA6EFE18-664F-4915-A4A9-46B679D1E598}.Debug|Any CPU.Build.0 = Debug|Any CPU
109100
{DA6EFE18-664F-4915-A4A9-46B679D1E598}.Dotnet|Any CPU.ActiveCfg = Dotnet|Any CPU

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The library Plotly.NET implements charting suitable for use from F# scripting. O
66
Documentation
77
=============
88

9-
The documentation can be found [here.](http://muehlhaus.github.io/Plotly.NET/)
9+
The documentation can be found [here.](http://plotly.github.io/Plotly.NET/)
1010
The documentation for this library is automatically generated (using the F# Formatting) from *.fsx and *.md files in the docs folder. If you find a typo, please submit a pull request!
1111

1212

Diff for: ‎build.fsx

+2-35
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,6 @@ Target.create "CopyBinaries" (fun _ ->
116116
|> Seq.iter (fun (fromDir, toDir) -> Shell.copyDir toDir fromDir (fun _ -> true))
117117
)
118118

119-
Target.create "CopyBinariesDotnet" (fun _ ->
120-
!! "src/**/*.fsproj"
121-
-- "src/Plotly.NET.WPF/Plotly.NET.WPF.fsproj"
122-
|> Seq.map (fun f -> ((Path.getDirectory f) </> "bin" </> "Dotnet", "bin" </> (Path.GetFileNameWithoutExtension f)))
123-
|> Seq.iter (fun (fromDir, toDir) -> Shell.copyDir toDir fromDir (fun _ -> true))
124-
)
125-
126-
127119
// --------------------------------------------------------------------------------------
128120
// Clean build results
129121

@@ -149,13 +141,6 @@ Target.create "Build" (fun _ ->
149141
Configuration = buildConfiguration })
150142
)
151143

152-
Target.create "BuildDotnet" (fun _ ->
153-
solutionFile
154-
|> DotNet.build (fun p ->
155-
{ p with
156-
Configuration = dotnetCoreConfiguration }
157-
)
158-
)
159144

160145
// --------------------------------------------------------------------------------------
161146
// Run the unit tests using test runner
@@ -277,8 +262,8 @@ Target.create "ReleaseDocsLocal" (fun _ ->
277262
printfn "%A" filesToReplaceIn
278263
Shell.replaceInFiles
279264
[
280-
"""href="https://muehlhaus.github.io/FSharp.Plotly/""","""href=./"""
281-
"""src="https://muehlhaus.github.io/FSharp.Plotly/""", """src=./"""
265+
"""href="https://plotly.github.io/Plotly.NET/""","""href=./"""
266+
"""src="https://plotly.github.io/Plotly.NET/""", """src=./"""
282267
".html\"", ".html"
283268
".css\"", ".css"
284269
".jpg\"", ".jpg"
@@ -298,17 +283,6 @@ Target.create "Release" (fun _ ->
298283
Git.Branches.pushTag "" "upstream" release.NugetVersion
299284
)
300285

301-
Target.create "GitReleaseNuget" (fun _ ->
302-
let tempNugetDir = "temp/nuget"
303-
Shell.cleanDir tempNugetDir |> ignore
304-
Git.Repository.cloneSingleBranch "" (gitHome + "/" + gitName + ".git") "nuget" tempNugetDir
305-
let files = Directory.EnumerateFiles(__SOURCE_DIRECTORY__ @@ "bin")
306-
Shell.copy tempNugetDir files
307-
Git.Staging.stageAll tempNugetDir
308-
Git.Commit.exec tempNugetDir (sprintf "Update git nuget packages for version %s" release.NugetVersion)
309-
Git.Branches.push tempNugetDir
310-
)
311-
312286
// --------------------------------------------------------------------------------------
313287
// Run all targets by default. Invoke 'build <Target>' to override
314288

@@ -347,13 +321,6 @@ Target.create "DotnetCoreBuild" ignore
347321
==> "BuildCIPackages"
348322
==> "CIBuild"
349323

350-
"Clean"
351-
==> "CleanDocs"
352-
==> "AssemblyInfo"
353-
==> "BuildDotnet"
354-
==> "CopyBinariesDotnet"
355-
==> "DotnetCoreBuild"
356-
357324
"Clean"
358325
==> "CleanDocs"
359326
==> "AssemblyInfo"

Diff for: ‎docsrc/content/plotly-wpf.fsx

-44
This file was deleted.

Diff for: ‎docsrc/tools/generate.fsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ let rec copyRecursive dir1 dir2 =
3535
File.Copy(file, file.Replace(dir1, dir2), true)
3636

3737
// Web site location for the generated documentation
38-
let website = "https://muehlhaus.github.io/Plotly.NET/"
38+
let website = "https://plotly.github.io/Plotly.NET"
3939

4040
let info =
4141
[ "project-name", "Plotly.NET"
@@ -53,13 +53,11 @@ let info =
5353
let referenceBinaries =
5454
[
5555
__SOURCE_DIRECTORY__ + "/../../src/Plotly.NET/bin/Release/netstandard2.0/Plotly.NET.dll"
56-
__SOURCE_DIRECTORY__ + "/../../src/Plotly.NET.WPF//bin/Release/net47/Plotly.NET.WPF.dll"
5756
]
5857

5958
let libDirs =
6059
[
6160
__SOURCE_DIRECTORY__ + "/../../src/Plotly.NET/bin/Release/netstandard2.0/"
62-
__SOURCE_DIRECTORY__ + "/../../src/Plotly.NET.WPF/bin/Release/net47/"
6361
]
6462

6563
// When called from 'build.fsx', use the public project URL as <root>

Diff for: ‎docsrc/tools/templates/template.cshtml

-3
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@
8888
<li><a href="@Root/multiple-charts.html">Multiple Charts</a></li>
8989
<li><a href="@Root/errorbars.html">Error bars</a></li>
9090
<li><a href="@Root/shapes.html">Shapes</a></li>
91-
<li class="nav-header">Plotly WPF</li>
92-
<li><a href="@Root/plotly-wpf.html">Using Plotly PopUp window</a></li>
93-
9491
<li class="nav-header">Documentation</li>
9592
<li><a href="@Root/reference/index.html">API Reference</a></li>
9693
</ul>

Diff for: ‎src/Plotly.NET.WPF/AssemblyInfo.fs

-17
This file was deleted.

Diff for: ‎src/Plotly.NET.WPF/ChartWPF.fs

-23
This file was deleted.

Diff for: ‎src/Plotly.NET.WPF/FSharp.Plotly.WPF.fsproj

-4
This file was deleted.

Diff for: ‎src/Plotly.NET.WPF/Plotly.NET.WPF.fsproj

-37
This file was deleted.

Diff for: ‎src/Plotly.NET.WPF/ViewContainer.fs

-111
This file was deleted.

0 commit comments

Comments
 (0)