Skip to content

Commit 1a9082c

Browse files
filzrevfilzrev
authored
Merge branch 'main' into feat-add-net10-support
2 parents 16b06df + c82e491 commit 1a9082c

File tree

67 files changed

+774
-1431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+774
-1431
lines changed

‎.github/workflows/release.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ jobs:
4141
sign:
4242
runs-on: windows-latest
4343
needs: build
44+
environment: nuget.org
45+
permissions:
46+
id-token: write
4447
steps:
4548
- uses: actions/setup-dotnet@v5
4649
with:
@@ -52,19 +55,23 @@ jobs:
5255
path: drop/nuget
5356

5457
# Install `Sign CLI` to use Azure Key Vault (See: https://github.com/dotnet/sign/blob/main/docs/comparisons.md)
55-
- run: dotnet tool install --tool-path . sign --version 0.9.1-beta.25379.1
58+
- run: dotnet tool install --tool-path . --prerelease sign
59+
60+
- uses: azure/login@v1
61+
with:
62+
allow-no-subscriptions: true
63+
client-id: ${{ secrets.SIGN_KEY_VAULT_CLIENT_ID }}
64+
tenant-id: ${{ secrets.SIGN_KEY_VAULT_TENANT_ID }}
5665

5766
- run: >
5867
./sign code azure-key-vault
5968
drop/nuget/**/*.*
6069
--description "Docfx code sign"
6170
--description-url "https://dotnet.github.io/docfx"
6271
--timestamp-url http://timestamp.digicert.com
72+
--azure-credential-type "azure-cli"
6373
--azure-key-vault-url "${{ secrets.SIGN_KEY_VAULT_URL }}"
6474
--azure-key-vault-certificate "${{ secrets.SIGN_KEY_VAULT_CERTIFICATE }}"
65-
--azure-key-vault-tenant-id "${{ secrets.SIGN_KEY_VAULT_TENANT_ID }}"
66-
--azure-key-vault-client-id "${{ secrets.SIGN_KEY_VAULT_CLIENT_ID }}"
67-
--azure-key-vault-client-secret "${{ secrets.SIGN_KEY_VAULT_CLIENT_SECRET }}"
6875
6976
- uses: actions/upload-artifact@v4
7077
with:
@@ -74,6 +81,7 @@ jobs:
7481
publish:
7582
runs-on: ubuntu-latest
7683
needs: sign
84+
environment: nuget.org
7785
permissions:
7886
contents: write
7987
id-token: write
@@ -109,3 +117,5 @@ jobs:
109117
gh release upload --repo dotnet/docfx ${GITHUB_REF_NAME} drop/bin/docfx-osx-x64-${GITHUB_REF_NAME}.zip
110118
env:
111119
GH_TOKEN: ${{ github.token }}
120+
121+

‎Directory.Packages.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<ItemGroup>
77
<PackageVersion Include="HtmlAgilityPack" Version="1.12.4" />
88
<PackageVersion Include="ICSharpCode.Decompiler" Version="9.1.0.7988" />
9-
<PackageVersion Include="Jint" Version="4.4.1" />
9+
<PackageVersion Include="Jint" Version="4.4.2" />
1010
<PackageVersion Include="JsonSchema.Net" Version="7.4.0" />
11-
<PackageVersion Include="Markdig" Version="0.42.0" />
12-
<PackageVersion Include="Microsoft.Playwright" Version="1.55.0" />
11+
<PackageVersion Include="Markdig" Version="0.43.0" />
12+
<PackageVersion Include="Microsoft.Playwright" Version="1.56.0" />
1313
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
1414
<PackageVersion Include="OneOf" Version="3.0.271" />
1515
<PackageVersion Include="OneOf.SourceGenerator" Version="3.0.271" />

‎docfx.sln‎

Lines changed: 0 additions & 613 deletions
This file was deleted.

‎docfx.slnx‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<Solution>
2+
<Folder Name="/Solution Items/">
3+
<File Path=".editorconfig" />
4+
<File Path="Directory.Build.props" />
5+
<File Path="Directory.Packages.props" />
6+
</Folder>
7+
<Folder Name="/src/">
8+
<File Path="src/Directory.Build.props" />
9+
<Project Path="src/docfx/docfx.csproj" DefaultStartup="true" />
10+
<Project Path="src/Docfx.App/Docfx.App.csproj" />
11+
<Project Path="src/Docfx.Build/Docfx.Build.csproj" />
12+
<Project Path="src/Docfx.Dotnet/Docfx.Dotnet.csproj" />
13+
</Folder>
14+
<Folder Name="/src/Common/">
15+
<Project Path="src/Docfx.Build.Common/Docfx.Build.Common.csproj" />
16+
<Project Path="src/Docfx.Common/Docfx.Common.csproj" />
17+
<Project Path="src/Docfx.Glob/Docfx.Glob.csproj" />
18+
<Project Path="src/Docfx.Plugins/Docfx.Plugins.csproj" />
19+
<Project Path="src/Docfx.YamlSerialization/Docfx.YamlSerialization.csproj" />
20+
</Folder>
21+
<Folder Name="/src/DataContracts/">
22+
<Project Path="src/Docfx.DataContracts.Common/Docfx.DataContracts.Common.csproj" />
23+
<Project Path="src/Docfx.DataContracts.RestApi/Docfx.DataContracts.RestApi.csproj" />
24+
<Project Path="src/Docfx.DataContracts.UniversalReference/Docfx.DataContracts.UniversalReference.csproj" />
25+
</Folder>
26+
<Folder Name="/src/Extensions/">
27+
<Project Path="src/Docfx.Build.ManagedReference/Docfx.Build.ManagedReference.csproj" />
28+
<Project Path="src/Docfx.Build.OperationLevelRestApi/Docfx.Build.OperationLevelRestApi.csproj" />
29+
<Project Path="src/Docfx.Build.OverwriteDocuments/Docfx.Build.OverwriteDocuments.csproj" />
30+
<Project Path="src/Docfx.Build.RestApi/Docfx.Build.RestApi.csproj" />
31+
<Project Path="src/Docfx.Build.SchemaDriven/Docfx.Build.SchemaDriven.csproj" />
32+
<Project Path="src/Docfx.Build.TagLevelRestApi/Docfx.Build.TagLevelRestApi.csproj" />
33+
<Project Path="src/Docfx.Build.UniversalReference/Docfx.Build.UniversalReference.csproj" />
34+
</Folder>
35+
<Folder Name="/src/Markdown/">
36+
<Project Path="src/Docfx.MarkdigEngine.Extensions/Docfx.MarkdigEngine.Extensions.csproj" />
37+
<Project Path="src/Docfx.MarkdigEngine/Docfx.MarkdigEngine.csproj" />
38+
</Folder>
39+
<Folder Name="/test/">
40+
<File Path="test/Directory.Build.props" />
41+
<File Path="test/Directory.Packages.props" />
42+
<Project Path="test/Docfx.Build.Common.Tests/Docfx.Build.Common.Tests.csproj" />
43+
<Project Path="test/Docfx.Build.Tests/Docfx.Build.Tests.csproj" />
44+
<Project Path="test/Docfx.Common.Tests/Docfx.Common.Tests.csproj" />
45+
<Project Path="test/Docfx.Dotnet.Tests/Docfx.Dotnet.Tests.csproj" />
46+
<Project Path="test/Docfx.Glob.Tests/Docfx.Glob.Tests.csproj" />
47+
<Project Path="test/Docfx.MarkdigEngine.Extensions.Tests/Docfx.MarkdigEngine.Extensions.Tests.csproj" />
48+
<Project Path="test/Docfx.MarkdigEngine.Tests/Docfx.MarkdigEngine.Tests.csproj" />
49+
<Project Path="test/docfx.Snapshot.Tests/docfx.Snapshot.Tests.csproj" />
50+
<Project Path="test/Docfx.Tests.Common/Docfx.Tests.Common.csproj" />
51+
<Project Path="test/docfx.Tests/docfx.Tests.csproj" />
52+
</Folder>
53+
<Folder Name="/test/Extensions/">
54+
<Project Path="test/Docfx.Build.ManagedReference.Tests/Docfx.Build.ManagedReference.Tests.csproj" />
55+
<Project Path="test/Docfx.Build.OverwriteDocuments.Tests/Docfx.Build.OverwriteDocuments.Tests.csproj" />
56+
<Project Path="test/Docfx.Build.RestApi.Tests/Docfx.Build.RestApi.Tests.csproj" />
57+
<Project Path="test/Docfx.Build.RestApi.WithPlugins.Tests/Docfx.Build.RestApi.WithPlugins.Tests.csproj" />
58+
<Project Path="test/Docfx.Build.SchemaDriven.Tests/Docfx.Build.SchemaDriven.Tests.csproj" />
59+
<Project Path="test/Docfx.Build.UniversalReference.Tests/Docfx.Build.UniversalReference.Tests.csproj" />
60+
</Folder>
61+
</Solution>

‎src/Docfx.Common/Git/GitUtility.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ record Repo(string path, string url, string branch);
3434
if (EnvironmentContext.GitFeaturesDisabled)
3535
return null;
3636

37+
// Return null when file path `/obj/` to avoid generating invalid link.
38+
if (filePath.Contains("/obj/") || filePath.Contains("\\obj\\"))
39+
return null;
40+
3741
var repo = GetRepoInfo(Path.GetDirectoryName(filePath));
3842
if (repo is null)
3943
return null;

0 commit comments

Comments
 (0)