added framework support (OpenAPITools#18776)

welshm · May 29, 2024 · b19fc67 · b19fc67
1 parent 2471ba2
commit b19fc67
Show file tree

Hide file tree

Showing 991 changed files with 139,920 additions and 28 deletions.
diff --git a/.github/workflows/openapi-generator.yaml b/.github/workflows/openapi-generator.yaml
@@ -151,7 +151,16 @@ jobs:
           rm -rf samples/client/petstore/csharp/generichost/net8/Petstore
           rm -rf samples/client/petstore/csharp/generichost/net8/SourceGeneration
           rm -rf samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
+
           rm -rf samples/client/petstore/csharp/generichost/standard2.0/Petstore
+
+          rm -rf samples/client/petstore/csharp/generichost/net8/AllOf
+          rm -rf samples/client/petstore/csharp/generichost/net8/AnyOf
+          rm -rf samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare
+          rm -rf samples/client/petstore/csharp/generichost/net8/FormModels
+          rm -rf samples/client/petstore/csharp/generichost/net8/OneOf
+          rm -rf samples/client/petstore/csharp/generichost/net8/Petstore
+          rm -rf samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
       - name: Generate samples
         run: |
           bash bin/generate-samples.sh

diff --git a/.github/workflows/samples-dotnet-net47.yaml b/.github/workflows/samples-dotnet-net47.yaml
@@ -0,0 +1,32 @@
+name: Samples C# .Net 4.7 Clients
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/csharp/generichost/net4.7/**
+  pull_request:
+    paths:
+      - samples/client/petstore/csharp/generichost/net4.7/**
+jobs:
+  build:
+    name: Build .Net projects
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/client/petstore/csharp/generichost/net4.7/AllOf
+          - samples/client/petstore/csharp/generichost/net4.7/AnyOf
+          - samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare
+          - samples/client/petstore/csharp/generichost/net4.7/FormModels
+          - samples/client/petstore/csharp/generichost/net4.7/OneOf
+          - samples/client/petstore/csharp/generichost/net4.7/Petstore
+          - samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: dotnet build Org.OpenAPITools.sln
+      - name: Test
+        working-directory: ${{ matrix.sample }}
+        run: dotnet test Org.OpenAPITools.sln
diff --git a/appveyor.yml b/appveyor.yml
@@ -54,8 +54,17 @@ test_script:
   - dotnet test samples\client\petstore\csharp\generichost\net8\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   - dotnet test samples\client\petstore\csharp\generichost\net8\SourceGeneration\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   - dotnet test samples\client\petstore\csharp\generichost\net8\UseDateTimeForDate\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+
   - dotnet test samples\client\petstore\csharp\generichost\standard2.0\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
 
+  - dotnet test samples\client\petstore\csharp\generichost\net8\AllOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\generichost\net8\AnyOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\generichost\net8\AnyOfNoCompare\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\generichost\net8\FormModels\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\generichost\net8\OneOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\generichost\net8\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\generichost\net8\UseDateTimeForDate\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+
   - dotnet test samples\client\petstore\csharp\httpclient\standard2.0\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
 
   - dotnet test samples\client\petstore\csharp\restsharp\net4.7\MultipleFrameworks\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj

diff --git a/bin/configs/csharp-generichost-net4.7-allOf.yaml b/bin/configs/csharp-generichost-net4.7-allOf.yaml
@@ -0,0 +1,13 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/generichost/net4.7/AllOf
+inputSpec: modules/openapi-generator/src/test/resources/3_0/allOf.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: false
+  equatable: true
+  targetFramework: net47
diff --git a/bin/configs/csharp-generichost-net4.7-anyOf.yaml b/bin/configs/csharp-generichost-net4.7-anyOf.yaml
@@ -0,0 +1,13 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/generichost/net4.7/AnyOf
+inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: false
+  equatable: true
+  targetFramework: net47
diff --git a/bin/configs/csharp-generichost-net4.7-anyOfNoCompare.yaml b/bin/configs/csharp-generichost-net4.7-anyOfNoCompare.yaml
@@ -0,0 +1,13 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare
+inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: false
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: false
+  equatable: true
+  targetFramework: net47
diff --git a/bin/configs/csharp-generichost-net4.7-formModels.yaml b/bin/configs/csharp-generichost-net4.7-formModels.yaml
@@ -0,0 +1,16 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/generichost/net4.7/FormModels
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: false
+  equatable: true
+  targetFramework: net47
+  skipFormModel: false
+inlineSchemaOptions:
+  RESOLVE_INLINE_ENUMS: true
diff --git a/bin/configs/csharp-generichost-net4.7-oneOf.yaml b/bin/configs/csharp-generichost-net4.7-oneOf.yaml
@@ -0,0 +1,13 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/generichost/net4.7/OneOf
+inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: false
+  equatable: true
+  targetFramework: net47
diff --git a/bin/configs/csharp-generichost-net4.7-useDateTimeForDate.yaml b/bin/configs/csharp-generichost-net4.7-useDateTimeForDate.yaml
@@ -0,0 +1,10 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/dates-api.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{2E60EF87-DB0B-4D01-A36E-F5E90F7EC757}'
+  useDateTimeForDate: true
+  targetFramework: net47
diff --git a/bin/configs/csharp-generichost-net4.7.yaml b/bin/configs/csharp-generichost-net4.7.yaml
@@ -0,0 +1,13 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/generichost/net4.7/Petstore
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: false
+  equatable: true
+  targetFramework: net47
diff --git a/.../openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponse`1.mustache b/.../openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponse`1.mustache
@@ -164,7 +164,7 @@ namespace {{packageName}}.{{clientPackage}}
         /// </summary>
         /// <param name="result"></param>
         /// <returns></returns>
-        bool Try{{.}}({{^netStandard}}[NotNullWhen(true)]{{/netStandard}}out TType{{nrt?}} result);
+        bool Try{{.}}({{#net60OrLater}}[NotNullWhen(true)]{{/net60OrLater}}out TType{{nrt?}} result);
     }
     {{/x-http-statuses-with-return}}
 }
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AsModel.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AsModel.mustache
@@ -1,4 +1,4 @@
 // This logic may be modified with the AsModel.mustache template
 return Is{{vendorExtensions.x-http-status}}
     ? System.Text.Json.JsonSerializer.Deserialize<{{#isModel}}{{^containerType}}{{packageName}}.{{modelPackage}}.{{/containerType}}{{/isModel}}{{{dataType}}}>(RawContent, _jsonSerializerOptions)
-    : {{^netStandard}}null{{/netStandard}}{{#netStandard}}default{{/netStandard}};
+    : {{#net60OrLater}}null{{/net60OrLater}}{{^net60OrLater}}default{{/net60OrLater}};
diff --git a/...es/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache b/...es/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache
@@ -103,7 +103,7 @@ using System.Runtime.CompilerServices;
         /// <param name="options"></param>
         /// <param name="result"></param>
         /// <returns></returns>
-        public static bool TryDeserialize<T>(string json, JsonSerializerOptions options, {{^netStandard}}[System.Diagnostics.CodeAnalysis.NotNullWhen(true)] {{/netStandard}}out T{{#nrt}}{{^netStandard}}?{{/netStandard}}{{/nrt}} result)
+        public static bool TryDeserialize<T>(string json, JsonSerializerOptions options, {{#net60OrLater}}[System.Diagnostics.CodeAnalysis.NotNullWhen(true)] {{/net60OrLater}}out T{{#nrt}}{{#net60OrLater}}?{{/net60OrLater}}{{/nrt}} result)
         {
             try
             {
@@ -125,7 +125,7 @@ using System.Runtime.CompilerServices;
         /// <param name="options"></param>
         /// <param name="result"></param>
         /// <returns></returns>
-        public static bool TryDeserialize<T>(ref Utf8JsonReader reader, JsonSerializerOptions options, {{^netStandard}}[System.Diagnostics.CodeAnalysis.NotNullWhen(true)] {{/netStandard}}out T{{#nrt}}{{^netStandard}}?{{/netStandard}}{{/nrt}} result)
+        public static bool TryDeserialize<T>(ref Utf8JsonReader reader, JsonSerializerOptions options, {{#net60OrLater}}[System.Diagnostics.CodeAnalysis.NotNullWhen(true)] {{/net60OrLater}}out T{{#nrt}}{{#net60OrLater}}?{{/net60OrLater}}{{/nrt}} result)
         {
             try
             {

diff --git a/...pi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache b/...pi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache
@@ -7,12 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-{{^netStandard}}
 using System.Threading.Channels;
-{{/netStandard}}
-{{#netStandard}}
-using System.Threading.Channels;
-{{/netStandard}}
 
 namespace {{packageName}}.{{clientPackage}}
 {

diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache
@@ -606,13 +606,13 @@ namespace {{packageName}}.{{apiPackage}}
                         httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar));
                     {{/-first}}
                     {{/produces}}
-                    {{^netStandard}}
+                    {{#net60OrLater}}
 
                     httpRequestMessageLocalVar.Method = HttpMethod.{{#lambda.titlecase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.titlecase}};
-                    {{/netStandard}}
-                    {{#netStandard}}
+                    {{/net60OrLater}}
+                    {{^net60OrLater}}
                     httpRequestMessageLocalVar.Method = new HttpMethod("{{#lambda.uppercase}}{{httpMethod}}{{/lambda.uppercase}}");
-                    {{/netStandard}}
+                    {{/net60OrLater}}
 
                     DateTime requestedAtLocalVar = DateTime.UtcNow;
 
@@ -747,7 +747,7 @@ namespace {{packageName}}.{{apiPackage}}
             /// </summary>
             /// <param name="result"></param>
             /// <returns></returns>
-            public bool Try{{vendorExtensions.x-http-status}}({{^netStandard}}[NotNullWhen(true)]{{/netStandard}}out {{#isModel}}{{^containerType}}{{packageName}}.{{modelPackage}}.{{/containerType}}{{/isModel}}{{{dataType}}}{{#nrt}}?{{/nrt}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}} result)
+            public bool Try{{vendorExtensions.x-http-status}}({{#net60OrLater}}[NotNullWhen(true)]{{/net60OrLater}}out {{#isModel}}{{^containerType}}{{packageName}}.{{modelPackage}}.{{/containerType}}{{/isModel}}{{{dataType}}}{{#nrt}}?{{/nrt}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}} result)
             {
                 result = null;
 

diff --git a/modules/openapi-generator/src/main/resources/csharp/netcore_project.mustache b/modules/openapi-generator/src/main/resources/csharp/netcore_project.mustache
@@ -32,27 +32,30 @@
     <PackageReference Include="JsonSubTypes" Version="2.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     {{/useGenericHost}}
-      {{#useRestSharp}}
+    {{#useRestSharp}}
     <PackageReference Include="RestSharp" Version="110.2.0" />
-      {{/useRestSharp}}
-      {{#useGenericHost}}
+    {{/useRestSharp}}
+    {{#useGenericHost}}
     <PackageReference Include="Microsoft.Extensions.Http" Version="{{#lambda.first}}{{#netStandard}}5.0.0  {{/netStandard}}{{#net47}}7.0.0  {{/net47}}{{#net48}}7.0.0  {{/net48}}{{#net6.0}}6.0.0  {{/net6.0}}{{#net7.0}}7.0.0  {{/net7.0}}{{#net8.0}}8.0.0  {{/net8.0}}{{/lambda.first}}" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="{{#lambda.first}}{{#netStandard}}5.0.0  {{/netStandard}}{{#net47}}7.0.0  {{/net47}}{{#net48}}7.0.0  {{/net48}}{{#net6.0}}6.0.1  {{/net6.0}}{{#net7.0}}7.0.1  {{/net7.0}}{{#net8.0}}8.0.0  {{/net8.0}}{{/lambda.first}}" />
-      {{#supportsRetry}}
+    {{#supportsRetry}}
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="{{#lambda.first}}{{#netStandard}}5.0.1  {{/netStandard}}{{#net47}}7.0.0  {{/net47}}{{#net48}}7.0.0  {{/net48}}{{#net6.0}}6.0.19  {{/net6.0}}{{#net7.0}}7.0.11  {{/net7.0}}{{#net8.0}}8.0.3  {{/net8.0}}{{/lambda.first}}" />
-      {{/supportsRetry}}
-      {{#net80OrLater}}
+    {{/supportsRetry}}
+    {{#net80OrLater}}
     <PackageReference Include="Microsoft.Net.Http.Headers" Version="8.0.3" />
-      {{/net80OrLater}}
-      {{#netStandard}}
+    {{/net80OrLater}}
+    {{^net60OrLater}}
     <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
-      {{/netStandard}}
-      {{/useGenericHost}}
-      {{^useGenericHost}}
-      {{#supportsRetry}}
+    {{#net47OrLater}}
+    <Reference Include="System.Web" />
+    {{/net47OrLater}}
+    {{/net60OrLater}}
+    {{/useGenericHost}}
+    {{^useGenericHost}}
+    {{#supportsRetry}}
     <PackageReference Include="Polly" Version="{{^netStandard}}8.1.0{{/netStandard}}{{#netStandard}}8.1.0{{/netStandard}}" />
-      {{/supportsRetry}}
-      {{/useGenericHost}}
+    {{/supportsRetry}}
+    {{/useGenericHost}}
     {{#validatable}}
     {{^net60OrLater}}
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />