Skip to content

Commit b6e0172

Browse files
MpdreamzMpdreamz
committed
Merge remote-tracking branch 'origin/main' into feature/api-docs-multiple
2 parents 8f7c6d9 + 34e2e16 commit b6e0172

File tree

51 files changed

+497
-481
lines changed

Some content is hidden

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

51 files changed

+497
-481
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,9 @@ csharp_style_namespace_declarations = file_scoped
213213
dotnet_analyzer_diagnostic.severity = warning
214214
dotnet_analyzer_diagnostic.category-Style.severity = warning
215215

216+
# can be made static
217+
dotnet_diagnostic.CA1822.severity = suggestion
218+
216219
# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1848
217220
dotnet_diagnostic.CA1848.severity = suggestion
218221
# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca2201

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<PackageVersion Include="Samboy063.Tomlet" Version="6.0.0" />
4747
<PackageVersion Include="Slugify.Core" Version="4.0.1" />
4848
<PackageVersion Include="SoftCircuits.IniFileParser" Version="2.7.0" />
49-
<PackageVersion Include="System.IO.Abstractions" Version="22.0.14" />
49+
<PackageVersion Include="System.IO.Abstractions" Version="22.0.15" />
5050
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
5151
<PackageVersion Include="Utf8StreamReader" Version="1.3.2" />
5252
<PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3" PrivateAssets="All" />
@@ -62,7 +62,7 @@
6262
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
6363
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
6464
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
65-
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.14" />
65+
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.15" />
6666
<PackageVersion Include="Unquote" Version="7.0.1" />
6767
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0">
6868
<PrivateAssets>all</PrivateAssets>

‎src/Elastic.ApiExplorer/OpenApiGenerator.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public record ApiEndpoint(List<ApiOperation> Operations, string? Name) : IApiGro
3838
public Task RenderAsync(FileSystemStream stream, ApiRenderContext context, CancellationToken ctx = default) => Task.CompletedTask;
3939
}
4040

41-
public class OpenApiGenerator(BuildContext context, IMarkdownStringRenderer markdownStringRenderer, ILoggerFactory logger)
41+
public class OpenApiGenerator(ILoggerFactory logFactory, BuildContext context, IMarkdownStringRenderer markdownStringRenderer)
4242
{
43-
private readonly ILogger _logger = logger.CreateLogger<OpenApiGenerator>();
43+
private readonly ILogger _logger = logFactory.CreateLogger<OpenApiGenerator>();
4444
private readonly IFileSystem _writeFileSystem = context.WriteFileSystem;
4545
private readonly StaticFileContentHashProvider _contentHashProvider = new(new EmbeddedOrPhysicalFileProvider(context));
4646

@@ -294,7 +294,7 @@ private async Task<IFileInfo> Render<T>(string prefix, INavigationItem current,
294294
if (!outputFile.Directory!.Exists)
295295
outputFile.Directory.Create();
296296

297-
var navigationRenderResult = await navigationRenderer.RenderNavigation(current.NavigationRoot, new Uri("http://ignored.example"), INavigationHtmlWriter.AllLevels, ctx);
297+
var navigationRenderResult = await navigationRenderer.RenderNavigation(current.NavigationRoot, INavigationHtmlWriter.AllLevels, ctx);
298298
renderContext = renderContext with
299299
{
300300
CurrentNavigation = current,

‎src/Elastic.Documentation.Site/Navigation/INavigationHtmlWriter.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ public interface INavigationHtmlWriter
1010
{
1111
const int AllLevels = -1;
1212

13-
Task<NavigationRenderResult> RenderNavigation(IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, Uri navigationSource,
14-
int maxLevel, Cancel ctx = default);
13+
Task<NavigationRenderResult> RenderNavigation(IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, int maxLevel, Cancel ctx = default);
1514

1615
async Task<string> Render(NavigationViewModel model, Cancel ctx)
1716
{

‎src/Elastic.Documentation.Site/Navigation/IsolatedBuildNavigationHtmlWriter.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ public class IsolatedBuildNavigationHtmlWriter(BuildContext context, IRootNaviga
1313
{
1414
private readonly ConcurrentDictionary<(string, int), string> _renderedNavigationCache = [];
1515

16-
public async Task<NavigationRenderResult> RenderNavigation(IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation,
17-
Uri navigationSource, int maxLevel, Cancel ctx = default)
16+
public async Task<NavigationRenderResult> RenderNavigation(
17+
IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, int maxLevel, Cancel ctx = default
18+
)
1819
{
1920
var navigation = context.Configuration.Features.PrimaryNavEnabled || currentRootNavigation.IsUsingNavigationDropdown
2021
? currentRootNavigation

0 commit comments

Comments
 (0)