From 2263c7d6b074f36033784930463e953f2964a7a9 Mon Sep 17 00:00:00 2001 From: Jack Gerrits Date: Thu, 30 Jan 2025 19:57:53 -0500 Subject: [PATCH 1/4] Fix apidoc generation --- .github/workflows/docs.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 81f70c42424a..1945a599c7c8 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -194,15 +194,13 @@ jobs: - name: Setup .NET 8.0 uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' global-json-file: dotnet/global.json - run: dotnet tool update -g docfx - run: | - mkdir -p ./build/dotnet/dev/ - docfx docfx.json --output ./build/dotnet/dev/ - working-directory: ./docs/dotnet + docfx docs/dotnet/docfx.json + mv docs/dotnet/_site build/dotnet/dev/ - name: insert clarity snippet to *.html - working-directory: ./docs/dotnet/build/dotnet/dev/ + working-directory: build/dotnet/dev/ shell: python run: | import os @@ -234,7 +232,7 @@ jobs: print(f'Clarity script inserted into {html_path}') - uses: actions/upload-artifact@v4 with: - path: "./docs/dotnet/build" + path: "build/" name: "dotnet-dev-docs" deploy: From d9afbb447478c4207eb3cf30f3ef47c7c33f67a7 Mon Sep 17 00:00:00 2001 From: Jack Gerrits Date: Thu, 30 Jan 2025 20:03:36 -0500 Subject: [PATCH 2/4] verbose --- .github/workflows/docs.yml | 2 +- docs/dotnet/docfx.json | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 1945a599c7c8..a055a501b92e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -197,7 +197,7 @@ jobs: global-json-file: dotnet/global.json - run: dotnet tool update -g docfx - run: | - docfx docs/dotnet/docfx.json + docfx docs/dotnet/docfx.json --verbose mv docs/dotnet/_site build/dotnet/dev/ - name: insert clarity snippet to *.html working-directory: build/dotnet/dev/ diff --git a/docs/dotnet/docfx.json b/docs/dotnet/docfx.json index f04b979c30e8..660aa502fd38 100644 --- a/docs/dotnet/docfx.json +++ b/docs/dotnet/docfx.json @@ -32,12 +32,6 @@ "files": [ "core/**.md", "core/**/toc.yml", - "articles/**.md", - "articles/**/toc.yml", - "tutorial/**.md", - "tutorial/**/toc.yml", - "release_note/**.md", - "release_note/**/toc.yml", "toc.yml", "*.md" ] From 9118fd78c6c0743f98decafc07733320a22edad7 Mon Sep 17 00:00:00 2001 From: Jack Gerrits Date: Thu, 30 Jan 2025 20:09:18 -0500 Subject: [PATCH 3/4] update mkdir --- .github/workflows/docs.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a055a501b92e..5ba428636b61 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -197,8 +197,9 @@ jobs: global-json-file: dotnet/global.json - run: dotnet tool update -g docfx - run: | - docfx docs/dotnet/docfx.json --verbose - mv docs/dotnet/_site build/dotnet/dev/ + docfx docs/dotnet/docfx.json + mkdir -p build/dotnet/ + mv docs/dotnet/_site build/dotnet/dev - name: insert clarity snippet to *.html working-directory: build/dotnet/dev/ shell: python From d3454566054178e598aec449c441542386abea15 Mon Sep 17 00:00:00 2001 From: Jack Gerrits Date: Thu, 30 Jan 2025 20:29:53 -0500 Subject: [PATCH 4/4] tweak api input --- docs/dotnet/docfx.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/dotnet/docfx.json b/docs/dotnet/docfx.json index 660aa502fd38..7eefe1a32b1a 100644 --- a/docs/dotnet/docfx.json +++ b/docs/dotnet/docfx.json @@ -4,10 +4,10 @@ "src": [ { "files": [ - "Contracts/Microsoft.AutoGen.Contracts.csproj", - "Core/Microsoft.AutoGen.Core.csproj" + "src/Microsoft.AutoGen/Core/**/*.csproj", + "src/Microsoft.AutoGen/Contracts/**/*.csproj" ], - "src": "../../dotnet/src/Microsoft.Autogen/" + "src": "../../dotnet/" } ], "dest": "api",