Skip to content

Commit

Permalink
Merge branch 'main' into chore-add-detailed-errormsg
Browse files Browse the repository at this point in the history
  • Loading branch information
filzrev authored Mar 14, 2024
2 parents 5e09db7 + 88d97e2 commit d76b5ca
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 9 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: nightly
on:
schedule:
- cron: '0 0 * * *'

jobs:
publish-github-packages:
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
permissions:
packages: write
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- id: version
uses: paulhatch/semantic-version@v5.4.0
with:
version_format: ${major}.${minor}.${patch}-preview.${increment}

- uses: ./.github/actions/build

- name: dotnet pack
run: dotnet pack -c Release /p:Version=${{ steps.version.outputs.version }} -o drop/nuget

- name: dotnet nuget push
run: |
dotnet nuget push drop/nuget/*.nupkg --api-key "${{ secrets.GITHUB_TOKEN }}" --skip-duplicate --source https://nuget.pkg.github.com/dotnet/index.json
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ Docfx is planned to continue as a community-driven project. We hope to produce f
For more information, refer to [Getting Started](http://dotnet.github.io/docfx/tutorial/docfx_getting_started.html).
> [!TIP]
> Docfx publishes nightly builds to [GitHub Packages](https://github.com/orgs/dotnet/packages), this allows you to stay up-to-date with the latest developments in Docfx.
## Contributing
Use [Discussions](https://github.com/dotnet/docfx/discussions) for questions and general discussions.
Expand Down
5 changes: 4 additions & 1 deletion src/Docfx.Dotnet/Filters/ConfigFilterRuleItemUnion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ public ConfigFilterRuleItem Rule
}

// If kind is not specified for exclude. Set `ExtendedSymbolKind.Type` as default kind.
Exclude.Kind ??= ExtendedSymbolKind.Type | ExtendedSymbolKind.Member;
if (Exclude != null)
{
Exclude.Kind ??= ExtendedSymbolKind.Type | ExtendedSymbolKind.Member;
}

return Exclude;
}
Expand Down
14 changes: 7 additions & 7 deletions templates/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion templates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@typescript-eslint/parser": "^7.2.0",
"browser-sync": "^3.0.2",
"esbuild": "~0.20.1",
"esbuild-sass-plugin": "~3.1.0",
"esbuild-sass-plugin": "~3.2.0",
"eslint": "^8.57.0",
"eslint-config-standard": "^17.1.0",
"jest": "^29.7.0",
Expand Down
8 changes: 8 additions & 0 deletions test/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>

<PropertyGroup>
<!--
.NET 9 preview 2 or later run tests in parallel by default.
It is necessary to disable this feature because there are tests that need to be executed sequentially that are marked with `[Collection("docfx STA")]`.
-->
<TestTfmsInParallel>false</TestTfmsInParallel>
</PropertyGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<ItemGroup>
Expand Down

0 comments on commit d76b5ca

Please sign in to comment.