Skip to content

Commit 160e6f6

Browse files
author
Morten Nielsen
committed
Fix DocFX
Upgrade docfx to 2.78.3
1 parent 63e31de commit 160e6f6

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

.github/workflows/ghpages.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
- name: Download DocFX
2222
run: |
2323
mkdir .tools/docfx
24-
Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v${env:DOCFXVERSION}/docfx.zip" -OutFile ".tools/docfx/docfx.zip"
24+
Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v${env:DOCFXVERSION}/docfx-win-x64-v${env:DOCFXVERSION}.zip" -OutFile ".tools/docfx/docfx.zip"
2525
[System.IO.Compression.ZipFile]::ExtractToDirectory(".tools/docfx/docfx.zip", ".tools/docfx" )
2626
env:
27-
DOCFXVERSION: 2.59.4
27+
DOCFXVERSION: 2.78.3
2828

2929
- name: Install .NET OMD Generator
3030
run: dotnet tool install --tool-path .tools/omd dotMorten.OmdGenerator --version 1.4.0
@@ -41,7 +41,6 @@ jobs:
4141
env:
4242
DOCFX_SOURCE_BRANCH_NAME: main
4343
run: |
44-
nuget install memberpage -Version 2.59.4 -OutputDirectory docs
4544
.tools/docfx/docfx.exe metadata docs/docfx.json
4645
.tools/docfx/docfx.exe build docs/docfx.json
4746

docs/BuildDoc.cmd

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
@ECHO OFF
22

3-
SET DocFXVersion=2.58
3+
SET DocFXVersion=2.78.3
44
SET DocFxFolder=%~dp0..\.tools\docfx
55

66
REM Download DocFx
77

88
IF NOT EXIST "%DocFxFolder%\v%DocFXVersion%\docfx.exe" (
99
MKDIR "%DocFXFolder%\v%DocFXVersion%"
10-
powershell -ExecutionPolicy ByPass -command "Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v%DocFXVersion%/docfx.zip" -OutFile '%DocFxFolder%\docfx_v%DocFXVersion%.zip'"
10+
powershell -ExecutionPolicy ByPass -command "Invoke-WebRequest -Uri 'https://github.com/dotnet/docfx/releases/download/v%DocFXVersion%/docfx-win-x64-v%DocFXVersion%.zip' -OutFile '%DocFxFolder%\docfx_v%DocFXVersion%.zip'"
1111
powershell -ExecutionPolicy ByPass -command "Expand-Archive -LiteralPath '%DocFxFolder%\docfx_v%DocFXVersion%.zip' -DestinationPath '%DocFxFolder%\v%DocFXVersion%'"
1212
DEL "%DocFxFolder%\docfx_v%DocFXVersion%.zip" /Q
1313
)
14-
IF NOT EXIST "..\.tools\nuget.exe" (
15-
powershell -ExecutionPolicy ByPass -command "Invoke-WebRequest -Uri "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -OutFile '%~dp0..\.tools\nuget.exe'"
16-
)
1714

1815
REM Generate OMD
1916
dotnet tool install --tool-path %~dp0../.tools/omd dotMorten.OmdGenerator --version 1.4.0
2017
mkdir %~dp0../artifacts/docs/api
2118
%~dp0..\.tools\omd\generateomd /source=%~dp0../src/WinUIEx/. /output=%~dp0../artifacts/docs/api/omd.html
2219

23-
%~dp0..\.tools\nuget install memberpage -Version 2.58.0 -OutputDirectory %~dp0
2420
REM Build the output site (HTML) from the generated metadata and input files (uses configuration in docfx.json in this folder)
2521
%DocFxFolder%\v%DocFXVersion%\docfx.exe metadata %~dp0\docfx.json
2622

docs/docfx.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
],
1212
"dest": "obj/api",
1313
"disableGitFeatures": false,
14-
"disableDefaultFilter": false
14+
"disableDefaultFilter": false,
15+
"memberLayout": "separatePages"
1516
},
1617
],
1718
"build": {
@@ -69,14 +70,14 @@
6970
"_gitContribute": {
7071
"branch": "main",
7172
"apiSpecFolder": "docs/api_overwrites"
72-
}
73+
},
74+
"memberLayout": "separatePages"
7375
},
7476
"dest": "../artifacts/docs_site",
7577
"globalMetadataFiles": [],
7678
"fileMetadataFiles": [],
7779
"template": [
7880
"default",
79-
"memberpage.2.58.0/content",
8081
"template_overrides"
8182
],
8283
"postProcessors": [],

0 commit comments

Comments
 (0)