Skip to content

Commit 9cebb20

Browse files
committed
Upgrade docfx to 2.78.5, target net10.0 for docs, and skip restore
1 parent ede6202 commit 9cebb20

34 files changed

Lines changed: 84 additions & 62 deletions

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"docfx": {
6-
"version": "2.77.0",
6+
"version": "2.78.5",
77
"commands": [
88
"docfx"
99
],

src/docs/LuceneDocsPlugins/AggregatePostProcessor.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
using Docfx.Plugins;
1919
using System.Collections.Immutable;
2020
using System.Composition;
21+
using System.Threading;
2122

2223
namespace LuceneDocsPlugins;
2324

@@ -40,11 +41,11 @@ public ImmutableDictionary<string, object> PrepareMetadata(ImmutableDictionary<s
4041
return metadata;
4142
}
4243

43-
public Manifest Process(Manifest manifest, string outputFolder)
44+
public Manifest Process(Manifest manifest, string outputFolder, CancellationToken cancellationToken)
4445
{
4546
foreach (var postProcessor in _postProcessors)
4647
{
47-
manifest = postProcessor.Process(manifest, outputFolder);
48+
manifest = postProcessor.Process(manifest, outputFolder, cancellationToken);
4849
}
4950

5051
return manifest;

src/docs/LuceneDocsPlugins/EnvironmentVariableProcessor.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
using System.Collections.Immutable;
2121
using System.IO;
2222
using System.Linq;
23+
using System.Threading;
2324

2425
namespace LuceneDocsPlugins;
2526

@@ -30,12 +31,14 @@ public ImmutableDictionary<string, object> PrepareMetadata(ImmutableDictionary<s
3031
return metadata;
3132
}
3233

33-
public Manifest Process(Manifest manifest, string outputFolder)
34+
public Manifest Process(Manifest manifest, string outputFolder, CancellationToken cancellationToken)
3435
{
3536
foreach (var manifestItem in manifest.Files.Where(x => x.Type == "Conceptual"))
3637
{
3738
foreach (var manifestItemOutputFile in manifestItem.Output)
3839
{
40+
cancellationToken.ThrowIfCancellationRequested();
41+
3942
var outputPath = Path.Combine(outputFolder, manifestItemOutputFile.Value.RelativePath);
4043

4144
var content = File.ReadAllText(outputPath);

src/docs/LuceneDocsPlugins/LuceneDocsPlugins.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ under the License.
4747
</PropertyGroup>
4848

4949
<ItemGroup>
50-
<PackageReference Include="Docfx.Plugins" Version="2.77.0" />
51-
<PackageReference Include="Docfx.Common" Version="2.77.0" />
50+
<PackageReference Include="Docfx.Plugins" Version="2.78.5" />
51+
<PackageReference Include="Docfx.Common" Version="2.78.5" />
5252
<PackageReference Include="System.Composition" Version="8.0.0" />
5353
</ItemGroup>
5454

src/docs/LuceneDocsPlugins/LuceneNoteProcessor.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
using System.Linq;
2424
using System.Text;
2525
using System.Text.RegularExpressions;
26+
using System.Threading;
2627

2728
namespace LuceneDocsPlugins;
2829

@@ -42,12 +43,14 @@ public ImmutableDictionary<string, object> PrepareMetadata(ImmutableDictionary<s
4243
return metadata;
4344
}
4445

45-
public Manifest Process(Manifest manifest, string outputFolder)
46+
public Manifest Process(Manifest manifest, string outputFolder, CancellationToken cancellationToken)
4647
{
4748
foreach (var manifestItem in manifest.Files)
4849
{
4950
foreach (var manifestItemOutputFile in manifestItem.Output)
5051
{
52+
cancellationToken.ThrowIfCancellationRequested();
53+
5154
var outputPath = Path.Combine(outputFolder, manifestItemOutputFile.Value.RelativePath);
5255

5356
var content = File.ReadAllText(outputPath);

websites/apidocs/docfx.analysis-common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"dest": "obj/docfx/api/analysis-common",
1717
"properties": {
18-
"TargetFramework": "net8.0"
18+
"TargetFramework": "net10.0"
1919
}
2020
}
2121
],

websites/apidocs/docfx.analysis-kuromoji.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"dest": "obj/docfx/api/analysis-kuromoji",
1717
"properties": {
18-
"TargetFramework": "net8.0"
18+
"TargetFramework": "net10.0"
1919
}
2020
}
2121
],

websites/apidocs/docfx.analysis-morfologik.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"dest": "obj/docfx/api/analysis-morfologik",
1717
"properties": {
18-
"TargetFramework": "net8.0"
18+
"TargetFramework": "net10.0"
1919
}
2020
}
2121
],

websites/apidocs/docfx.analysis-opennlp.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"dest": "obj/docfx/api/analysis-opennlp",
1717
"properties": {
18-
"TargetFramework": "net8.0"
18+
"TargetFramework": "net10.0"
1919
}
2020
}
2121
],

websites/apidocs/docfx.analysis-phonetic.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"dest": "obj/docfx/api/analysis-phonetic",
1717
"properties": {
18-
"TargetFramework": "net8.0"
18+
"TargetFramework": "net10.0"
1919
}
2020
}
2121
],

0 commit comments

Comments
 (0)