Fix generation when [DefaultValue]'s type differs #2895
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,12 +41,19 @@ public DataContract GetDataContractForType(Type type) | |
| var enumValues = type.GetEnumValues(); | ||
|
|
||
| // Test to determine if the serializer will treat as string | ||
| var serializeAsString = | ||
| enumValues.Length > 0 && | ||
| #if NET5_0_OR_GREATER | ||
| JsonConverterFunc(enumValues.GetValue(0), type).StartsWith('\"'); | ||
| #else | ||
| JsonConverterFunc(enumValues.GetValue(0), type).StartsWith("\""); | ||
| #endif | ||
|
|
||
| var exampleType = serializeAsString ? | ||
| typeof(string) : | ||
| type.GetEnumUnderlyingType(); | ||
|
|
||
| primitiveTypeAndFormat = PrimitiveTypesAndFormats[exampleType]; | ||
|
|
||
| return DataContract.ForPrimitive( | ||
| underlyingType: type, | ||
|
|
@@ -144,7 +151,7 @@ public bool IsSupportedCollection(Type type, out Type itemType) | |
| return false; | ||
| } | ||
|
|
||
domaindrivendev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| private List<DataProperty> GetDataPropertiesFor(Type objectType, out Type extensionDataType) | ||
| { | ||
| extensionDataType = null; | ||
|
|
||
|
|
@@ -177,7 +184,7 @@ private IEnumerable<DataProperty> GetDataPropertiesFor(Type objectType, out Type | |
|
|
||
| return | ||
| (property.IsPubliclyReadable() || property.IsPubliclyWritable()) && | ||
| !(property.GetIndexParameters().Length > 0) && | ||
|
There was a problem hiding this comment. @martincostello is this another performance-related suggestion? Personally, I prefer the readability of There was a problem hiding this comment. Most likely yes. See CA1860 (Note: I also don't like that rule. I've disabled it in my projects since I don't write high performance code.) There was a problem hiding this comment. Yeah this is a new analyser rule related to performance as well. |
||
| !(property.HasAttribute<JsonIgnoreAttribute>() && isIgnoredViaNet5Attribute) && | ||
| !(property.HasAttribute<SwaggerIgnoreAttribute>()) && | ||
| !(_serializerOptions.IgnoreReadOnlyProperties && !property.IsPubliclyWritable()); | ||
|
|
||
domaindrivendev marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <NoWarn>$(NoWarn);CA1050</NoWarn> | ||
| <Nullable>enable</Nullable> | ||
| <RootNamespace>WebApi</RootNamespace> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\..\src\Swashbuckle.AspNetCore.SwaggerGen\Swashbuckle.AspNetCore.SwaggerGen.csproj" /> | ||
| <ProjectReference Include="..\..\..\src\Swashbuckle.AspNetCore.SwaggerUI\Swashbuckle.AspNetCore.SwaggerUI.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.AspNetCore.OpenApi" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| using Microsoft.AspNetCore.Mvc; | ||
|
|
||
| var builder = WebApplication.CreateBuilder(args); | ||
|
|
||
| builder.Services.AddControllers(); | ||
|
|
||
| builder.Services.AddEndpointsApiExplorer(); | ||
| builder.Services.AddSwaggerGen(options => | ||
| { | ||
| options.UseAllOfToExtendReferenceSchemas(); | ||
| }); | ||
|
|
||
| var app = builder.Build(); | ||
| app.UseHttpsRedirection(); | ||
|
|
||
| if (app.Environment.IsDevelopment()) | ||
| { | ||
| _ = app.UseSwagger(); | ||
| _ = app.UseSwaggerUI(); | ||
| } | ||
|
|
||
| app.MapControllers(); | ||
|
|
||
| app.Run(); | ||
|
|
||
| [ApiController] | ||
| [Route("api/[controller]")] | ||
| public class EnumController : ControllerBase | ||
| { | ||
| [HttpGet] | ||
| public IActionResult Get(LogLevel? logLevel = LogLevel.Error) => Ok(new { logLevel }); | ||
| } | ||
|
|
||
| namespace MvcWithNullable | ||
| { | ||
| public partial class Program | ||
| { | ||
| // Expose the Program class for use with WebApplicationFactory<T> | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.