Merge remote-tracking branch 'origin/main' into docfx_tfm

# Conflicts:
#	docs/BuildDoc.cmd
This commit is contained in:
Morten Nielsen 2021-03-15 23:07:37 -07:00
commit 3ab2c95a10

View file

@ -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