From 3f04c27c2445cccce7a464661edfe87f30ed75dd Mon Sep 17 00:00:00 2001 From: Eugene Tolmachev Date: Sat, 17 Apr 2021 13:41:11 -0400 Subject: [PATCH] fix docs links --- .fsdocs/cache | 1 - .gitignore | 2 +- build.fsx | 13 ++++++++----- docs/_template.html | 2 ++ docs/{content => img}/logo.png | Bin docs/index.fsx | 13 ++++++------- docs/sample.fsx | 2 +- 7 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 .fsdocs/cache rename docs/{content => img}/logo.png (100%) diff --git a/.fsdocs/cache b/.fsdocs/cache deleted file mode 100644 index 4cb3cb8..0000000 --- a/.fsdocs/cache +++ /dev/null @@ -1 +0,0 @@ -@£TupleOfTupleOfstringstringFSharpListOfTupleOfstringFSharpOptionOfstringFSharpOptionOfstringFSharpOptionOfstringbooleanbooleanFSharpOptionOfstringTupleOfFSharpOptionOfstringFSharpListOfTupleOfParamKeystringIrqufEGn5F2dSckgXJyyqsycfIzLVhDQ5F2dSckgFSharpListOfstringFSharpListOfTupleOfParamKeystringIrqufEGn5F2dSckgnFmJ5oRfTupleOfFSharpOptionOfstringArrayOfstringFSharpListOfstringdateTimeArrayOfdateTime0CngyMQD_ShTDFhl_P.http://schemas.datacontract.org/2004/07/System i)http://www.w3.org/2001/XMLSchema-instance@m_Item1@m_Item1™ https://github.com/Azure/AAD.fs/@m_Item2™AAD.fs@m_Item3 aDhttp://schemas.datacontract.org/2004/07/Microsoft.FSharp.Collections^head@m_Item1™G/Users/eugene/sources/aad.fs/AAD.fs/bin/Debug/netstandard2.0/AAD.fs.dll@m_Item2 b=http://schemas.datacontract.org/2004/07/Microsoft.FSharp.Core_value™https://github.com/Azure/AAD.fs@m_Item3.nil† b=http://schemas.datacontract.org/2004/07/Microsoft.FSharp.Core@m_Item4.nil† b=http://schemas.datacontract.org/2004/07/Microsoft.FSharp.Core@m_Item5…@m_Item6‡@m_Item7.nil† b=http://schemas.datacontract.org/2004/07/Microsoft.FSharp.Core@m_Rest@m_Item1.nil† b=http://schemas.datacontract.org/2004/07/Microsoft.FSharp.Core@m_Item2^head@m_Item1 bDhttp://schemas.datacontract.org/2004/07/FSharp.Formatting.Templating_item™root@m_Item2™ https://github.com/Azure/AAD.fs/^tail^head@m_Item1 bDhttp://schemas.datacontract.org/2004/07/FSharp.Formatting.Templating_item™fsdocs-authors@m_Item2™AAD.fs^tail^head@m_Item1 bDhttp://schemas.datacontract.org/2004/07/FSharp.Formatting.Templating_item™fsdocs-collection-name@m_Item2™AAD.fs^tail^head@m_Item1 bDhttp://schemas.datacontract.org/2004/07/FSharp.Formatting.Templating_item™fsdocs-collection-name-link@m_Item2™ https://github.com/Azure/AAD.fs/^tail^head@m_Item1 bDhttp://schemas.datacontract.org/2004/07/FSharp.Formatting.Templating_item™fsdocs-copyright@m_Item2™/(c) Microsoft Corporation. All rights reserved.^tail^head@m_Item1 bDhttp://schemas.datacontract.org/2004/07/FSharp.Formatting.Templating_item™fsdocs-logo-src@m_Item2™,https://github.com/Azure/AAD.fs/img/logo.png^tail^head@m_Item1 bDhttp://schemas.datacontract.org/2004/07/FSharp.Formatting.Templating_item™fsdocs-navbar-position@m_Item2™ fixed-right^tail^head@m_Item1 bDhttp://schemas.datacontract.org/2004/07/FSharp.Formatting.Templating_item™ fsdocs-theme@m_Item2™default^tail^head@m_Item1 bDhttp://schemas.datacontract.org/2004/07/FSharp.Formatting.Templating_item™fsdocs-logo-link@m_Item2™Khttps://raw.githubusercontent.com/Azure/AAD.fs/master/docs/content/logo.png^tail^head@m_Item1 bDhttp://schemas.datacontract.org/2004/07/FSharp.Formatting.Templating_item™fsdocs-license-link@m_Item2™6git@github.com:Azure/AAD.fs.git/blob/master/LICENSE.md^tail^head@m_Item1 bDhttp://schemas.datacontract.org/2004/07/FSharp.Formatting.Templating_item™fsdocs-release-notes-link@m_Item2™ [ "" "" "" - sprintf "%s/%s" gitHome gitName + sprintf "%s" gitIO "MIT" sprintf "%s/%s" gitHome gitName sprintf "%s" (List.head release.Notes) - "https://raw.githubusercontent.com/Azure/AAD.fs/master/docs/files/img/logo.png" + "https://raw.githubusercontent.com/Azure/AAD.fs/master/docs/img/logo.png" "suave;giraffe;fsharp" sprintf "%s" (string ver) + "Eugene Tolmachev" "(c) Microsoft Corporation. All rights reserved." - sprintf "%s/master/docs/content/logo.png" gitContent + sprintf "%s/master/docs/img/logo.png" gitContent sprintf "%s/blob/master/LICENSE.md" gitRepo sprintf "%s/blob/master/RELEASE_NOTES.md" gitRepo "fixed-right" @@ -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) @@ -249,6 +251,7 @@ Target.create "ci" ignore ==> "restore" ==> "build" ==> "test" + ==> "meta" ==> "generateDocs" ==> "package" ==> "publish" @@ -260,7 +263,7 @@ Target.create "ci" ignore <== [ "test" ] "release" - <== [ "meta"; "publish" ] + <== [ "publish" ] "ci" <== [ "package" ] diff --git a/docs/_template.html b/docs/_template.html index 50e57b1..43686fa 100755 --- a/docs/_template.html +++ b/docs/_template.html @@ -61,6 +61,8 @@

{{fsdocs-collection- + +
{{fsdocs-copyright}}
\ No newline at end of file diff --git a/docs/content/logo.png b/docs/img/logo.png similarity index 100% rename from docs/content/logo.png rename to docs/img/logo.png diff --git a/docs/index.fsx b/docs/index.fsx index 610a9f6..b77ee09 100755 --- a/docs/index.fsx +++ b/docs/index.fsx @@ -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 *) + diff --git a/docs/sample.fsx b/docs/sample.fsx index c6328bf..b5d8191 100644 --- a/docs/sample.fsx +++ b/docs/sample.fsx @@ -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()