Skip to content

Commit 7fe34c6

Browse files
BryanAldrichBryanAldrich
committed
fixed misplaced semicolon on the conditional directive.
updated netcore projects to be truly multi target capable. updated project nuget references to be latest(ish) versions that still supported the relevant targets. Added a couple references to remove security related warnings. updated the multiple frameworks sample in .net47 to include net8.0 uppdated test project for httpclient/standard2.0/Petstore. It was woefully out of date. Project does contain handwritten tests.
1 parent ad53f63 commit 7fe34c6

File tree

130 files changed

+1675
-1620
lines changed

Some content is hidden

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

130 files changed

+1675
-1620
lines changed

‎bin/configs/csharp-restsharp-net4.7-multipleFrameworks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
44
templateDir: modules/openapi-generator/src/main/resources/csharp
55
additionalProperties:
66
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
7-
targetFramework: netstandard2.1;net47
7+
targetFramework: netstandard2.1;net47;net8.0
88
useCompareNetObjects: "true"
99
equatable: true

‎modules/openapi-generator/src/main/resources/csharp-functions/Project.csproj.mustache.bak

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

‎modules/openapi-generator/src/main/resources/csharp-functions/function.mustache.bak

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ return Is{{vendorExtensions.x-http-status}}
33
? System.Text.Json.JsonSerializer.Deserialize<{{#isModel}}{{^containerType}}{{packageName}}.{{modelPackage}}.{{/containerType}}{{/isModel}}{{{dataType}}}>(RawContent, _jsonSerializerOptions)
44
:
55
#if NET6_0_OR_GREATER
6-
null
6+
null;
77
#else
8-
default
9-
#endif;
8+
default;
9+
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ namespace {{packageName}}.{{apiPackage}}
629629
630630
ILogger<{{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse> apiResponseLoggerLocalVar = LoggerFactory.CreateLogger<{{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse>();
631631

632-
{{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse apiResponseLocalVar = new {{operationId}}ApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions);
632+
{{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse apiResponseLocalVar = new {{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions);
633633

634634
After{{operationId}}DefaultImplementation({{#lambda.joinWithComma}}apiResponseLocalVar {{#allParams}}{{paramName}} {{/allParams}}{{/lambda.joinWithComma}});
635635

‎modules/openapi-generator/src/main/resources/csharp/netcore_project.mustache

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@
2424
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
2525
</PropertyGroup>
2626

27+
<Choose>
28+
<When Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp'">
29+
<PropertyGroup><IsUnifiedNETVersion>true</IsUnifiedNETVersion></PropertyGroup>
30+
</When>
31+
<When Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">
32+
<PropertyGroup><IsNetFramework>true</IsNetFramework></PropertyGroup>
33+
</When>
34+
<When Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETStandard'"></When>
35+
</Choose>
36+
2737
<ItemGroup>
2838
{{#useCompareNetObjects}}
2939
<PackageReference Include="CompareNETObjects" Version="4.83.0" />
@@ -33,7 +43,8 @@
3343
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3444
{{/useGenericHost}}
3545
{{#useRestSharp}}
36-
<PackageReference Include="RestSharp" Version="112.0.0" />
46+
<PackageReference Include="RestSharp" Version="112.1.0" />
47+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
3748
{{/useRestSharp}}
3849
{{#useGenericHost}}
3950
<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}}{{#net9.0}}9.0.0 {{/net9.0}}{{/lambda.first}}" />
@@ -46,39 +57,27 @@
4657
{{/net80OrLater}}
4758
{{^net60OrLater}}
4859
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
49-
{{#net47OrLater}}
50-
<Reference Include="System.Web" />
51-
{{/net47OrLater}}
5260
{{/net60OrLater}}
5361
{{/useGenericHost}}
5462
{{^useGenericHost}}
5563
{{#supportsRetry}}
5664
<PackageReference Include="Polly" Version="{{^netStandard}}8.1.0{{/netStandard}}{{#netStandard}}8.1.0{{/netStandard}}" />
5765
{{/supportsRetry}}
5866
{{/useGenericHost}}
59-
{{#validatable}}
60-
{{^net60OrLater}}
67+
</ItemGroup>
68+
{{#validatable}}
69+
<ItemGroup>
6170
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
62-
{{/net60OrLater}}
63-
{{/validatable}}
6471
</ItemGroup>
72+
{{/validatable}}
6573

66-
{{^useGenericHost}}
67-
<ItemGroup>
68-
{{^net60OrLater}}
74+
<ItemGroup Condition="$(IsNetFramework) == 'true'">
6975
<None Remove="System.Web" />
70-
{{/net60OrLater}}
71-
{{#net48}}
72-
<None Remove="System.Net.Http" />
73-
{{/net48}}
76+
<Reference Include="System.Web" />
7477
</ItemGroup>
78+
7579
<ItemGroup>
76-
{{^net60OrLater}}
77-
<Reference Include="System.Web" />
78-
{{/net60OrLater}}
79-
{{#net48}}
80-
<Reference Include="System.Net.Http" />
81-
{{/net48}}
80+
<None Remove="System.Net.Http" />
81+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
8282
</ItemGroup>
83-
{{/useGenericHost}}
8483
{{>netcore_project.additions}}</Project>

‎samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<GenerateAssemblyInfo>false</GenerateAssemblyInfo><!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->
54
<TargetFramework>net8.0</TargetFramework>
@@ -21,15 +20,34 @@
2120
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
2221
</PropertyGroup>
2322

23+
<Choose>
24+
<When Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp'">
25+
<PropertyGroup><IsUnifiedNETVersion>true</IsUnifiedNETVersion></PropertyGroup>
26+
</When>
27+
<When Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">
28+
<PropertyGroup><IsNetFramework>true</IsNetFramework></PropertyGroup>
29+
</When>
30+
<When Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETStandard'"></When>
31+
</Choose>
32+
2433
<ItemGroup>
2534
<PackageReference Include="JsonSubTypes" Version="2.0.1" />
2635
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
27-
<PackageReference Include="RestSharp" Version="112.0.0" />
28-
<PackageReference Include="Polly" Version="8.1.0" />
36+
<PackageReference Include="RestSharp" Version="112.1.0" />
37+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
38+
<PackageReference Include="Polly" Version="8.5.0" />
2939
</ItemGroup>
30-
3140
<ItemGroup>
41+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
3242
</ItemGroup>
43+
44+
<ItemGroup Condition="$(IsNetFramework) == 'true'">
45+
<None Remove="System.Web" />
46+
<Reference Include="System.Web" />
47+
</ItemGroup>
48+
3349
<ItemGroup>
50+
<None Remove="System.Net.Http" />
51+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
3452
</ItemGroup>
3553
</Project>

‎samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
12-
<PackageReference Include="xunit" Version="2.4.2" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
12+
<PackageReference Include="xunit" Version="2.9.2" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<GenerateAssemblyInfo>false</GenerateAssemblyInfo><!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->
54
<TargetFramework>netstandard2.0</TargetFramework>
@@ -20,19 +19,35 @@
2019
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
2120
</PropertyGroup>
2221

22+
<Choose>
23+
<When Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp'">
24+
<PropertyGroup><IsUnifiedNETVersion>true</IsUnifiedNETVersion></PropertyGroup>
25+
</When>
26+
<When Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">
27+
<PropertyGroup><IsNetFramework>true</IsNetFramework></PropertyGroup>
28+
</When>
29+
<When Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETStandard'"></When>
30+
</Choose>
31+
2332
<ItemGroup>
2433
<PackageReference Include="CompareNETObjects" Version="4.83.0" />
2534
<PackageReference Include="JsonSubTypes" Version="2.0.1" />
2635
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
27-
<PackageReference Include="RestSharp" Version="112.0.0" />
28-
<PackageReference Include="Polly" Version="8.1.0" />
36+
<PackageReference Include="RestSharp" Version="112.1.0" />
37+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
38+
<PackageReference Include="Polly" Version="8.5.0" />
39+
</ItemGroup>
40+
<ItemGroup>
2941
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
3042
</ItemGroup>
3143

32-
<ItemGroup>
44+
<ItemGroup Condition="$(IsNetFramework) == 'true'">
3345
<None Remove="System.Web" />
46+
<Reference Include="System.Web" />
3447
</ItemGroup>
48+
3549
<ItemGroup>
36-
<Reference Include="System.Web" />
50+
<None Remove="System.Net.Http" />
51+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
3752
</ItemGroup>
3853
</Project>

‎samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
240240

241241
ILogger<APIKEYSApi.GetApiKeysIdApiResponse> apiResponseLoggerLocalVar = LoggerFactory.CreateLogger<APIKEYSApi.GetApiKeysIdApiResponse>();
242242

243-
APIKEYSApi.GetApiKeysIdApiResponse apiResponseLocalVar = new GetApiKeysIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/api_keys/{id}", requestedAtLocalVar, _jsonSerializerOptions);
243+
APIKEYSApi.GetApiKeysIdApiResponse apiResponseLocalVar = new APIKEYSApi.GetApiKeysIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/api_keys/{id}", requestedAtLocalVar, _jsonSerializerOptions);
244244

245245
AfterGetApiKeysIdDefaultImplementation(apiResponseLocalVar, id);
246246

0 commit comments

Comments
 (0)