Skip to content

Commit f6cdb9c

Browse files
Minor code clean up
1 parent da42c25 commit f6cdb9c

5 files changed

Lines changed: 11 additions & 59 deletions

File tree

src/Abstractions/src/Asp.Versioning.Abstractions/NamespaceParser.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ namespace Asp.Versioning;
1818
/// Represents API version parser from a type namespace.
1919
/// </summary>
2020
/// <remarks>
21-
/// The namespace identifier can use 'v', 'V', or '_' as a prefix. The '_' prefix is useful when
22-
/// a folder starts with a number because Visual Studio automatically prefixes it with an underscore.
23-
/// For example, <c>Contoso.Api._2018_04_01.Controllers</c> is equivalent to <c>Contoso.Api.v2018_04_01.Controllers</c>.
21+
/// The namespace identifier can use <c>'v'</c>, <c>'V'</c>, or <c>'_'</c> as a prefix. The <c>'_'</c> prefix is useful
22+
/// when the source folder starts with a number and the editor automatically prefixes it with an underscore. As an
23+
/// example, <c>Api._2018_04_01.Controllers</c> is equivalent to <c>Api.v2018_04_01.Controllers</c>.
2424
/// </remarks>
2525
public class NamespaceParser
2626
{

src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/DependencyInjection/IApiVersioningBuilderExtensions.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,8 @@ private static void AddApiExplorerServices( IApiVersioningBuilder builder )
5858

5959
var services = builder.Services;
6060

61-
// registers DefaultApiDescriptionProvider, which discovers controller-based endpoints
62-
services.AddMvcCore().AddApiExplorer();
63-
64-
// registers EndpointMetadataApiDescriptionProvider, which discovers minimal API endpoints.
65-
// both providers are required so that OpenApiDocumentService sees all endpoints.
6661
services.AddEndpointsApiExplorer();
62+
services.AddMvcCore().AddApiExplorer();
6763
services.TryAddSingleton<IOptionsFactory<ApiExplorerOptions>, ApiExplorerOptionsFactory<ApiExplorerOptions>>();
6864
services.TryAddTransient<IApiVersionDescriptionProviderFactory, ApiVersionDescriptionProviderFactory>();
6965
services.TryAddSingleton( static sp => sp.GetRequiredService<IApiVersionDescriptionProviderFactory>().Create() );

src/AspNetCore/WebApi/test/Asp.Versioning.OpenApi.Tests/Asp.Versioning.OpenApi.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<Compile Include="$(SourceFile)" Condition="Exists('$(SourceFile)')" Link="%(Filename)%(Extension)" Visible="false" />
16+
<Compile Include="$(RootDir)\src\Abstractions\test\Asp.Versioning.Abstractions.Tests\AssumeCultureAttribute.cs" Link="AssumeCultureAttribute.cs" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
@@ -35,7 +35,7 @@
3535
<WriteLinesToFile File="$(SourceFile)" Lines="@(Code)" Overwrite="true" />
3636

3737
<ItemGroup>
38-
<Compile Include="$(SourceFile)" Visible="false" />
38+
<Compile Include="$(SourceFile)" />
3939
</ItemGroup>
4040

4141
</Target>

src/AspNetCore/WebApi/test/Asp.Versioning.OpenApi.Tests/AssumeCultureAttribute.cs

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

src/AspNetCore/WebApi/test/Asp.Versioning.OpenApi.Tests/Transformers/AcceptanceTest.cs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@ namespace Asp.Versioning.OpenApi.Transformers;
1313

1414
public class AcceptanceTest
1515
{
16-
/// <summary>
17-
/// Verifies that minimal API endpoints produce a non-empty OpenAPI document.
18-
/// <c>AddApiExplorer</c> internally calls <c>AddMvcCore().AddApiExplorer()</c>,
19-
/// which auto-discovers controllers from the test assembly. Application parts
20-
/// are cleared to isolate the test to minimal API endpoints only.
21-
/// </summary>
22-
/// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
2316
[Fact]
2417
[AssumeCulture( "en-US" )]
2518
public async Task minimal_api_should_generate_expected_open_api_document()
@@ -31,9 +24,8 @@ public async Task minimal_api_should_generate_expected_open_api_document()
3124
builder.Services.AddApiVersioning( options => AddPolicies( options ) )
3225
.AddApiExplorer( options => options.GroupNameFormat = "'v'VVV" )
3326
.AddOpenApi();
34-
builder.Services.AddMvcCore()
35-
.ConfigureApplicationPartManager(
36-
m => m.ApplicationParts.Clear() );
27+
28+
IsolateMinimalApis( builder.Services );
3729

3830
var app = builder.Build();
3931
var api = app.NewVersionedApi( "Test" )
@@ -133,6 +125,9 @@ public async Task mixed_api_should_generate_expected_open_api_document()
133125
JsonNode.DeepEquals( actual, expected ).Should().BeTrue();
134126
}
135127

128+
private static void IsolateMinimalApis( IServiceCollection services ) =>
129+
services.AddMvcCore().ConfigureApplicationPartManager( m => m.ApplicationParts.Clear() );
130+
136131
private static ApiVersioningOptions AddPolicies( ApiVersioningOptions options )
137132
{
138133
options.Policies.Deprecate( 1.0 )

0 commit comments

Comments
 (0)