Skip to content

Commit bb94586

Browse files
authored
Merge pull request #883 from Romfos/doc1
Migrate documentation validation from build.fsproj to Roslyn code generator
2 parents 17a55ca + 6246cd2 commit bb94586

File tree

14 files changed

+161
-208
lines changed

14 files changed

+161
-208
lines changed

.github/workflows/test.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,6 @@ jobs:
3333
- name: Test
3434
run: dotnet test -f ${{ matrix.framework }} --no-build --no-restore
3535

36-
test-documentation:
37-
runs-on: windows-latest
38-
steps:
39-
- name: Checkout
40-
uses: actions/checkout@v4
41-
42-
- name: Setup .NET
43-
uses: actions/setup-dotnet@v4
44-
with:
45-
dotnet-version: |
46-
9.0.x
47-
8.0.x
48-
49-
- name: Build documentation
50-
run: dotnet run --project 'build/build.fsproj'
51-
5236
format-verify:
5337
runs-on: ubuntu-latest
5438
steps:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* [UPDATE] Migrate documentation to docfx platform. https://github.com/dotnet/docfx
1010
* [UPDATE][BREAKING] Nullability is enabled for public api for .NET Core TFMs
1111
* [UPDATE] Migrate to slnx format for solution file
12+
* [UPDATE] Migrate documentation validation from build.fsproj to Roslyn code generator
1213

1314
### 5.3.0 (October 2024)
1415

Directory.Build.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,4 @@
99
<ImplicitUsings>enable</ImplicitUsings>
1010
</PropertyGroup>
1111

12-
<PropertyGroup>
13-
<OutputPath>$(MSBuildThisFileDirectory)\bin\$(Configuration)\$(MSBuildProjectName)\</OutputPath>
14-
</PropertyGroup>
15-
1612
</Project>

NSubstitute.slnx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
<Solution>
2-
<Folder Name="/build/">
3-
<File Path="build/build.fs" />
4-
<File Path="build/ExtractDocs.fs" />
5-
</Folder>
62
<Folder Name="/Solution Items/">
73
<File Path=".editorconfig" />
84
<File Path="BreakingChanges.md" />
@@ -16,5 +12,7 @@
1612
<Folder Name="/tests/">
1713
<Project Path="tests/NSubstitute.Acceptance.Specs/NSubstitute.Acceptance.Specs.csproj" />
1814
<Project Path="tests/NSubstitute.Benchmarks/NSubstitute.Benchmarks.csproj" />
15+
<Project Path="tests/NSubstitute.Documentation.Tests.Generator/NSubstitute.Documentation.Tests.Generator.csproj" Id="d031abb6-0702-4eee-89f6-dd3e9af0573b" />
16+
<Project Path="tests/NSubstitute.Documentation.Tests/NSubstitute.Documentation.Tests.csproj" Id="ed043d85-3df4-4878-ab35-ce5e533f1a30" />
1917
</Folder>
2018
</Solution>

build/ExtractDocs.fs

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

build/build.fs

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

build/build.fsproj

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

build/build.sln

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

src/NSubstitute/NSubstitute.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
88
<AssemblyOriginatorKeyFile>nsubstitute.snk</AssemblyOriginatorKeyFile>
99
<DelaySign>false</DelaySign>
10-
<DocumentationFile>..\..\bin\$(Configuration)\NSubstitute\$(TargetFramework)\NSubstitute.xml</DocumentationFile>
10+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1111
<NoWarn>$(NoWarn);1591</NoWarn>
1212
</PropertyGroup>
1313

tests/NSubstitute.Acceptance.Specs/NSubstitute.Acceptance.Specs.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
<ItemGroup>
88
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
10-
<PackageReference Include="NUnit" Version="4.2.2" />
11-
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
10+
<PackageReference Include="NUnit" Version="4.3.2" />
11+
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">

0 commit comments

Comments
 (0)