Skip to content

Commit

Permalink
Remove WPF project to transition to .NET Core only. Fix doc links
Browse files Browse the repository at this point in the history
  • Loading branch information
kMutagene committed Sep 14, 2020
1 parent 3203bf1 commit 40878d3
Show file tree
Hide file tree
Showing 17 changed files with 8 additions and 358 deletions.
9 changes: 0 additions & 9 deletions Plotly.NET.sln
Expand Up @@ -51,7 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D
docsrc\content\parallel-categories.fsx = docsrc\content\parallel-categories.fsx
docsrc\content\parallel-coords.fsx = docsrc\content\parallel-coords.fsx
docsrc\content\pie-daughnut-charts.fsx = docsrc\content\pie-daughnut-charts.fsx
docsrc\content\plotly-wpf.fsx = docsrc\content\plotly-wpf.fsx
docsrc\content\polar-charts.fsx = docsrc\content\polar-charts.fsx
docsrc\content\range-plots.fsx = docsrc\content\range-plots.fsx
docsrc\content\sankey.fsx = docsrc\content\sankey.fsx
Expand Down Expand Up @@ -79,8 +78,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{7C6D08
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Plotly.NET", "src\Plotly.NET\Plotly.NET.fsproj", "{DFAC135B-36B8-4347-B1DD-B5E0144610C2}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Plotly.NET.WPF", "src\Plotly.NET.WPF\Plotly.NET.WPF.fsproj", "{C73BB0AE-B1AD-446A-9833-7A9543853EFA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8C673526-8416-4DB2-AA73-908B5871A733}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Plotly.NET.Tests", "tests\Plotly.NET.Tests\Plotly.NET.Tests.fsproj", "{DA6EFE18-664F-4915-A4A9-46B679D1E598}"
Expand All @@ -98,12 +95,6 @@ Global
{DFAC135B-36B8-4347-B1DD-B5E0144610C2}.Dotnet|Any CPU.Build.0 = Dotnet|Any CPU
{DFAC135B-36B8-4347-B1DD-B5E0144610C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DFAC135B-36B8-4347-B1DD-B5E0144610C2}.Release|Any CPU.Build.0 = Release|Any CPU
{C73BB0AE-B1AD-446A-9833-7A9543853EFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C73BB0AE-B1AD-446A-9833-7A9543853EFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C73BB0AE-B1AD-446A-9833-7A9543853EFA}.Dotnet|Any CPU.ActiveCfg = Dotnet|Any CPU
{C73BB0AE-B1AD-446A-9833-7A9543853EFA}.Dotnet|Any CPU.Build.0 = Dotnet|Any CPU
{C73BB0AE-B1AD-446A-9833-7A9543853EFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C73BB0AE-B1AD-446A-9833-7A9543853EFA}.Release|Any CPU.Build.0 = Release|Any CPU
{DA6EFE18-664F-4915-A4A9-46B679D1E598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DA6EFE18-664F-4915-A4A9-46B679D1E598}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA6EFE18-664F-4915-A4A9-46B679D1E598}.Dotnet|Any CPU.ActiveCfg = Dotnet|Any CPU
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -6,7 +6,7 @@ The library Plotly.NET implements charting suitable for use from F# scripting. O
Documentation
=============

The documentation can be found [here.](http://muehlhaus.github.io/Plotly.NET/)
The documentation can be found [here.](http://plotly.github.io/Plotly.NET/)
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!


Expand Down
37 changes: 2 additions & 35 deletions build.fsx
Expand Up @@ -116,14 +116,6 @@ Target.create "CopyBinaries" (fun _ ->
|> Seq.iter (fun (fromDir, toDir) -> Shell.copyDir toDir fromDir (fun _ -> true))
)

Target.create "CopyBinariesDotnet" (fun _ ->
!! "src/**/*.fsproj"
-- "src/Plotly.NET.WPF/Plotly.NET.WPF.fsproj"
|> Seq.map (fun f -> ((Path.getDirectory f) </> "bin" </> "Dotnet", "bin" </> (Path.GetFileNameWithoutExtension f)))
|> Seq.iter (fun (fromDir, toDir) -> Shell.copyDir toDir fromDir (fun _ -> true))
)


// --------------------------------------------------------------------------------------
// Clean build results

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

Target.create "BuildDotnet" (fun _ ->
solutionFile
|> DotNet.build (fun p ->
{ p with
Configuration = dotnetCoreConfiguration }
)
)

// --------------------------------------------------------------------------------------
// Run the unit tests using test runner
Expand Down Expand Up @@ -277,8 +262,8 @@ Target.create "ReleaseDocsLocal" (fun _ ->
printfn "%A" filesToReplaceIn
Shell.replaceInFiles
[
"""href="https://muehlhaus.github.io/FSharp.Plotly/""","""href=./"""
"""src="https://muehlhaus.github.io/FSharp.Plotly/""", """src=./"""
"""href="https://plotly.github.io/Plotly.NET/""","""href=./"""
"""src="https://plotly.github.io/Plotly.NET/""", """src=./"""
".html\"", ".html"
".css\"", ".css"
".jpg\"", ".jpg"
Expand All @@ -298,17 +283,6 @@ Target.create "Release" (fun _ ->
Git.Branches.pushTag "" "upstream" release.NugetVersion
)

Target.create "GitReleaseNuget" (fun _ ->
let tempNugetDir = "temp/nuget"
Shell.cleanDir tempNugetDir |> ignore
Git.Repository.cloneSingleBranch "" (gitHome + "/" + gitName + ".git") "nuget" tempNugetDir
let files = Directory.EnumerateFiles(__SOURCE_DIRECTORY__ @@ "bin")
Shell.copy tempNugetDir files
Git.Staging.stageAll tempNugetDir
Git.Commit.exec tempNugetDir (sprintf "Update git nuget packages for version %s" release.NugetVersion)
Git.Branches.push tempNugetDir
)

// --------------------------------------------------------------------------------------
// Run all targets by default. Invoke 'build <Target>' to override

Expand Down Expand Up @@ -347,13 +321,6 @@ Target.create "DotnetCoreBuild" ignore
==> "BuildCIPackages"
==> "CIBuild"

"Clean"
==> "CleanDocs"
==> "AssemblyInfo"
==> "BuildDotnet"
==> "CopyBinariesDotnet"
==> "DotnetCoreBuild"

"Clean"
==> "CleanDocs"
==> "AssemblyInfo"
Expand Down
44 changes: 0 additions & 44 deletions docsrc/content/plotly-wpf.fsx

This file was deleted.

4 changes: 1 addition & 3 deletions docsrc/tools/generate.fsx
Expand Up @@ -35,7 +35,7 @@ let rec copyRecursive dir1 dir2 =
File.Copy(file, file.Replace(dir1, dir2), true)

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

let info =
[ "project-name", "Plotly.NET"
Expand All @@ -53,13 +53,11 @@ let info =
let referenceBinaries =
[
__SOURCE_DIRECTORY__ + "/../../src/Plotly.NET/bin/Release/netstandard2.0/Plotly.NET.dll"
__SOURCE_DIRECTORY__ + "/../../src/Plotly.NET.WPF//bin/Release/net47/Plotly.NET.WPF.dll"
]

let libDirs =
[
__SOURCE_DIRECTORY__ + "/../../src/Plotly.NET/bin/Release/netstandard2.0/"
__SOURCE_DIRECTORY__ + "/../../src/Plotly.NET.WPF/bin/Release/net47/"
]

// When called from 'build.fsx', use the public project URL as <root>
Expand Down
3 changes: 0 additions & 3 deletions docsrc/tools/templates/template.cshtml
Expand Up @@ -88,9 +88,6 @@
<li><a href="@Root/multiple-charts.html">Multiple Charts</a></li>
<li><a href="@Root/errorbars.html">Error bars</a></li>
<li><a href="@Root/shapes.html">Shapes</a></li>
<li class="nav-header">Plotly WPF</li>
<li><a href="@Root/plotly-wpf.html">Using Plotly PopUp window</a></li>

<li class="nav-header">Documentation</li>
<li><a href="@Root/reference/index.html">API Reference</a></li>
</ul>
Expand Down
17 changes: 0 additions & 17 deletions src/Plotly.NET.WPF/AssemblyInfo.fs

This file was deleted.

23 changes: 0 additions & 23 deletions src/Plotly.NET.WPF/ChartWPF.fs

This file was deleted.

4 changes: 0 additions & 4 deletions src/Plotly.NET.WPF/FSharp.Plotly.WPF.fsproj

This file was deleted.

37 changes: 0 additions & 37 deletions src/Plotly.NET.WPF/Plotly.NET.WPF.fsproj

This file was deleted.

111 changes: 0 additions & 111 deletions src/Plotly.NET.WPF/ViewContainer.fs

This file was deleted.

0 comments on commit 40878d3

Please sign in to comment.