From a4cdd29fd65a9d9626f3591d83002fd528a69b0a Mon Sep 17 00:00:00 2001 From: Morten Nielsen Date: Mon, 15 Mar 2021 22:20:13 -0700 Subject: [PATCH 1/2] Split doc build steps in two --- docs/BuildDoc.cmd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/BuildDoc.cmd b/docs/BuildDoc.cmd index 658c39f..26d8b1c 100644 --- a/docs/BuildDoc.cmd +++ b/docs/BuildDoc.cmd @@ -22,12 +22,14 @@ mkdir %~dp0../artifacts/docs/api %~dp0..\.tools\nuget install memberpage -Version 2.56.7 -OutputDirectory %~dp0 REM Build the output site (HTML) from the generated metadata and input files (uses configuration in docfx.json in this folder) -%DocFxFolder%\v%DocFXVersion%\docfx.exe %~dp0\docfx.json +%DocFxFolder%\v%DocFXVersion%\docfx.exe metadata %~dp0\docfx.json REM Build applies-to version/framework info dotnet build AppliesToGenerator\DocFXAppliesToGenerator.csproj AppliesToGenerator\bin\Debug\netcoreapp3.1\DocFXAppliesToGenerator.exe appliesToList.json +%DocFxFolder%\v%DocFXVersion%\docfx.exe build %~dp0\docfx.json + ECHO Fixing API Reference Links powershell -ExecutionPolicy ByPass -command "%~dp0FixApiRefLinks.ps1" -Path %~dp0..\artifacts\docs_site\api\ start http://localhost:8080 From be3b7aeafaaa08110fc7d4f6cd42fd31ea89cdf4 Mon Sep 17 00:00:00 2001 From: Morten Nielsen <1378165+dotMorten@users.noreply.github.com> Date: Mon, 15 Mar 2021 22:56:30 -0700 Subject: [PATCH 2/2] Update build script --- .github/workflows/ghpages.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ghpages.yml b/.github/workflows/ghpages.yml index 4eceacd..a23c9be 100644 --- a/.github/workflows/ghpages.yml +++ b/.github/workflows/ghpages.yml @@ -21,7 +21,7 @@ jobs: Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v${env:DOCFXVERSION}/docfx.zip" -OutFile ".tools/docfx/docfx.zip" [System.IO.Compression.ZipFile]::ExtractToDirectory(".tools/docfx/docfx.zip", ".tools/docfx" ) env: - DOCFXVERSION: 2.48.1 + DOCFXVERSION: 2.56.7 - name: Install .NET OMD Generator run: dotnet tool install --tool-path .tools/omd dotMorten.OmdGenerator --version 1.2.0 @@ -38,8 +38,11 @@ jobs: env: DOCFX_SOURCE_BRANCH_NAME: main run: | - nuget install memberpage -Version 2.48.1 -OutputDirectory docs - .tools/docfx/docfx.exe docs/docfx.json + nuget install memberpage -Version 2.56.7 -OutputDirectory docs + .tools/docfx/docfx.exe metadata docs/docfx.json + dotnet build docs/AppliesToGenerator\DocFXAppliesToGenerator.csproj + docs/AppliesToGenerator\bin\Debug\netcoreapp3.1\DocFXAppliesToGenerator.exe docs/appliesToList.json + .tools/docfx/docfx.exe build docs/docfx.json powershell -ExecutionPolicy ByPass -command "docs\FixApiRefLinks" -Path artifacts\docs_site\api\ - name: Publish Documentation