Skip to content

Commit 3bb17ef

Browse files
authored
fixed issue (#18309)
1 parent ac14e66 commit 3bb17ef

File tree

76 files changed

+3944
-56
lines changed

Some content is hidden

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

76 files changed

+3944
-56
lines changed

.github/workflows/samples-dotnet.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
sample:
2424
- samples/client/petstore/csharp/generichost/net8/AllOf
2525
- samples/client/petstore/csharp/generichost/net8/AnyOf
26+
- samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare
2627
- samples/client/petstore/csharp/generichost/net8/FormModels
2728
- samples/client/petstore/csharp/generichost/net8/ManualPetstoreTests
2829
- samples/client/petstore/csharp/generichost/net8/ManualSourceGenerationTests

appveyor.yml

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ build_script:
4545
test_script:
4646
- dotnet test samples\client\petstore\csharp\generichost\net8\AllOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
4747
- dotnet test samples\client\petstore\csharp\generichost\net8\AnyOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
48+
- dotnet test samples\client\petstore\csharp\generichost\net8\AnyOfNoCompare\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
4849
- dotnet test samples\client\petstore\csharp\generichost\net8\FormModels\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
4950
- dotnet test samples\client\petstore\csharp\generichost\net8\ManualSourceGenerationTests\ManualTests.Latest.UseSourceGeneration\ManualTests.Latest.UseSourceGeneration.csproj
5051
- dotnet test samples\client\petstore\csharp\generichost\net8\ManualPetstoreTests\OpenAPIClient-generichost-manual-tests\OpenAPIClient-generichost-manual-tests.csproj
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# for csharp generichost
2+
generatorName: csharp
3+
outputDir: samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml
5+
library: generichost
6+
templateDir: modules/openapi-generator/src/main/resources/csharp
7+
additionalProperties:
8+
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
9+
useCompareNetObjects: false
10+
disallowAdditionalPropertiesIfNotPresent: false
11+
nullableReferenceTypes: true
12+
equatable: true
13+
targetFramework: net8.0

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
{
106106
{{#oneOf}}
107107
Utf8JsonReader utf8JsonReader{{name}} = utf8JsonReader;
108-
OpenAPIClientUtils.TryDeserialize<{{{datatypeWithEnum}}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}>(ref utf8JsonReader{{name}}, jsonSerializerOptions, out {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}});
108+
ClientUtils.TryDeserialize<{{{datatypeWithEnum}}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}>(ref utf8JsonReader{{name}}, jsonSerializerOptions, out {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}});
109109
{{^-last}}
110110

111111
{{/-last}}
@@ -134,7 +134,7 @@
134134
{
135135
{{#anyOf}}
136136
Utf8JsonReader utf8JsonReader{{name}} = utf8JsonReader;
137-
OpenAPIClientUtils.TryDeserialize<{{{datatypeWithEnum}}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}>(ref utf8JsonReader{{name}}, jsonSerializerOptions, out {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}});
137+
ClientUtils.TryDeserialize<{{{datatypeWithEnum}}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}>(ref utf8JsonReader{{name}}, jsonSerializerOptions, out {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}});
138138
{{^-last}}
139139

140140
{{/-last}}

samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Model/Fruit.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@ public override Fruit Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
154154
if (utf8JsonReaderAnyOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderAnyOf.CurrentDepth - 1)
155155
{
156156
Utf8JsonReader utf8JsonReaderApple = utf8JsonReader;
157-
OpenAPIClientUtils.TryDeserialize<Apple?>(ref utf8JsonReaderApple, jsonSerializerOptions, out apple);
157+
ClientUtils.TryDeserialize<Apple?>(ref utf8JsonReaderApple, jsonSerializerOptions, out apple);
158158

159159
Utf8JsonReader utf8JsonReaderBanana = utf8JsonReader;
160-
OpenAPIClientUtils.TryDeserialize<Banana?>(ref utf8JsonReaderBanana, jsonSerializerOptions, out banana);
160+
ClientUtils.TryDeserialize<Banana?>(ref utf8JsonReaderBanana, jsonSerializerOptions, out banana);
161161
}
162162
}
163163

0 commit comments

Comments
 (0)