Skip to content

Commit

Permalink
fix docs links
Browse files Browse the repository at this point in the history
  • Loading branch information
et1975 committed Apr 17, 2021
1 parent 750923e commit 3f04c27
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 15 deletions.
1 change: 0 additions & 1 deletion .fsdocs/cache

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.vs/
.idea/
.ionide/

.fsdocs/
.dotnet/
.local/
.nuget/
Expand Down
13 changes: 8 additions & 5 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ open System.Text.RegularExpressions
let gitName = "AAD.fs"
let gitOwner = "Azure"
let gitHome = sprintf "https://github.com/%s" gitOwner
let gitIO = sprintf "https://%s.github.io/%s" gitOwner gitName
let gitRepo = sprintf "git@github.com:%s/%s.git" gitOwner gitName
let gitContent = sprintf "https://raw.github.com/%s/%s" gitOwner gitName

Expand Down Expand Up @@ -202,15 +203,16 @@ Target.create "meta" (fun _ ->
[ "<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">"
"<Import Project=\"common.props\" />"
"<PropertyGroup>"
sprintf "<PackageProjectUrl>%s/%s</PackageProjectUrl>" gitHome gitName
sprintf "<PackageProjectUrl>%s</PackageProjectUrl>" gitIO
"<PackageLicense>MIT</PackageLicense>"
sprintf "<RepositoryUrl>%s/%s</RepositoryUrl>" gitHome gitName
sprintf "<PackageReleaseNotes>%s</PackageReleaseNotes>" (List.head release.Notes)
"<PackageIconUrl>https://raw.github.com/Azure/AAD.fs/master/docs/files/img/logo.png</PackageIconUrl>"
"<PackageIconUrl>https://raw.github.com/Azure/AAD.fs/master/docs/img/logo.png</PackageIconUrl>"
"<PackageTags>suave;giraffe;fsharp</PackageTags>"
sprintf "<Version>%s</Version>" (string ver)
"<Authors>Eugene Tolmachev</Authors>"
"<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>"
sprintf "<FsDocsLogoLink>%s/master/docs/content/logo.png</FsDocsLogoLink>" gitContent
sprintf "<FsDocsLogoSource>%s/master/docs/img/logo.png</FsDocsLogoSource>" gitContent
sprintf "<FsDocsLicenseLink>%s/blob/master/LICENSE.md</FsDocsLicenseLink>" gitRepo
sprintf "<FsDocsReleaseNotesLink>%s/blob/master/RELEASE_NOTES.md</FsDocsReleaseNotesLink>" gitRepo
"<FsDocsNavbarPosition>fixed-right</FsDocsNavbarPosition>"
Expand All @@ -235,7 +237,7 @@ Target.create "releaseDocs" (fun _ ->
let tempDocsDir = "tmp/gh-pages"
Shell.cleanDir tempDocsDir
Git.Repository.cloneSingleBranch "" gitRepo "gh-pages" tempDocsDir

Git.Repository.fullclean tempDocsDir
Shell.copyRecursive "output" tempDocsDir true |> Trace.tracefn "%A"
Git.Staging.stageAll tempDocsDir
Git.Commit.exec tempDocsDir (sprintf "Update generated documentation for version %s" release.NugetVersion)
Expand All @@ -249,6 +251,7 @@ Target.create "ci" ignore
==> "restore"
==> "build"
==> "test"
==> "meta"
==> "generateDocs"
==> "package"
==> "publish"
Expand All @@ -260,7 +263,7 @@ Target.create "ci" ignore
<== [ "test" ]

"release"
<== [ "meta"; "publish" ]
<== [ "publish" ]

"ci"
<== [ "package" ]
Expand Down
2 changes: 2 additions & 0 deletions docs/_template.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ <h3 class="muted"><a href="{{fsdocs-collection-name-link}}">{{fsdocs-collection-
<script type="text/javascript" src="{{root}}content/fsdocs-search.js"></script>
<!-- END SEARCH BOX: this adds support for the search box -->
</div>

<div style="text-align: center">{{fsdocs-copyright}}</div>
</body>

</html>
File renamed without changes
13 changes: 6 additions & 7 deletions docs/index.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,12 @@ The library is available under MIT license, which allows modification and
redistribution for both commercial and non-commercial purposes. For more information see the
[License file][license] in the GitHub repository.
[content]: https://github.com/Azure/DatatypeChannels.ASB/tree/master/docs/content
[gh]: https://github.com/Azure/DatatypeChannels.ASB
[issues]: https://github.com/Azure/DatatypeChannels.ASB/issues
[readme]: https://github.com/Azure/DatatypeChannels.ASB/blob/master/README.md
[license]: https://github.com/Azure/DatatypeChannels.ASB/blob/master/LICENSE.md
[content]: https://github.com/Azure/AAD.fs/tree/master/docs/content
[gh]: https://github.com/Azure/AAD.fs
[issues]: https://github.com/Azure/AAD.fs/issues
[readme]: https://github.com/Azure/AAD.fs/blob/master/README.md
[license]: https://github.com/Azure/AAD.fs/blob/master/LICENSE.md
Copyright 2021 Microsoft
*)


2 changes: 1 addition & 1 deletion docs/sample.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#r "AAD.fs.tasks.dll"
#r "Giraffe.dll"
open System
open FSharp.Control.Tasks
open FSharp.Control.Tasks.V2.ContextInsensitive
open Giraffe
open AAD
let httpClient = new Net.Http.HttpClient()
Expand Down

0 comments on commit 3f04c27

Please sign in to comment.