Skip to content

Commit 5a0ea2c

Browse files
EraYaNEraYaN
committed
Support multi targetting
1 parent 31e462d commit 5a0ea2c

File tree

39 files changed

+192
-141
lines changed

39 files changed

+192
-141
lines changed

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

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,64 @@
3636
<PackageReference Include="RestSharp" Version="112.0.0" />
3737
{{/useRestSharp}}
3838
{{#useGenericHost}}
39-
<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.5 {{/net9.0}}{{/lambda.first}}" />
40-
<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}}{{#net9.0}}9.0.5 {{/net9.0}}{{/lambda.first}}" />
39+
{{#netStandard}}
40+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard1.4' or '$(TargetFramework)' == 'netstandard1.5' or '$(TargetFramework)' == 'netstandard1.6' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'" Version="6.0.1" />
41+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard1.4' or '$(TargetFramework)' == 'netstandard1.5' or '$(TargetFramework)' == 'netstandard1.6' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'" Version="6.0.1" />
42+
{{/netStandard}}
43+
{{#net47}}
44+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.1" />
45+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.1" />
46+
{{/net47}}
47+
{{#net48}}
48+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net481'" Version="6.0.1" />
49+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net481'" Version="6.0.1" />
50+
{{/net48}}
51+
{{#net6.0}}
52+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net6.0'" Version="6.0.1" />
53+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net6.0'" Version="6.0.1" />
54+
{{/net6.0}}
55+
{{#net7.0}}
56+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net7.0'" Version=7.0.1" />
57+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net7.0'" Version="7.0.1" />
58+
{{/net7.0}}
59+
{{#net8.0}}
60+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.1" />
61+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.1" />
62+
{{/net8.0}}
63+
{{#net9.0}}
64+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
65+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
66+
{{/net9.0}}
4167
{{#supportsRetry}}
42-
<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.8 {{/net8.0}}{{#net9.0}}9.0.5 {{/net9.0}}{{/lambda.first}}" />
68+
{{#netStandard}}
69+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard1.4' or '$(TargetFramework)' == 'netstandard1.5' or '$(TargetFramework)' == 'netstandard1.6' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'" Version="6.0.36" />
70+
{{/netStandard}}
71+
{{#net47}}
72+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.36" />
73+
{{/net47}}
74+
{{#net48}}
75+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net481'" Version="6.0.36" />
76+
{{/net48}}
77+
{{#net6.0}}
78+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net6.0'" Version="6.0.36" />
79+
{{/net6.0}}
80+
{{#net7.0}}
81+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net7.0'" Version="7.0.20" />
82+
{{/net7.0}}
83+
{{#net8.0}}
84+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.20" />
85+
{{/net8.0}}
86+
{{#net9.0}}
87+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
88+
{{/net9.0}}
4389
{{/supportsRetry}}
4490
{{#net80OrLater}}
45-
<PackageReference Include="Microsoft.Net.Http.Headers" Version="{{#lambda.first}}{{#net8.0}}8.0.8 {{/net8.0}}{{#net9.0}}9.0.5 {{/net9.0}}{{/lambda.first}}" />
91+
{{#net8.0}}
92+
<PackageReference Include="Microsoft.Net.Http.Headers" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.17" />
93+
{{/net8.0}}
94+
{{#net9.0}}
95+
<PackageReference Include="Microsoft.Net.Http.Headers" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
96+
{{/net9.0}}
4697
{{/net80OrLater}}
4798
{{^net60OrLater}}
4899
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />

‎samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Org.OpenAPITools.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.5" />
26-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
27-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.5" />
28-
<PackageReference Include="Microsoft.Net.Http.Headers" Version="9.0.5" />
25+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
26+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
27+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
28+
<PackageReference Include="Microsoft.Net.Http.Headers" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
2929
</ItemGroup>
3030

3131
</Project>

‎samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Org.OpenAPITools.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.5" />
26-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
27-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.5" />
28-
<PackageReference Include="Microsoft.Net.Http.Headers" Version="9.0.5" />
25+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
26+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
27+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
28+
<PackageReference Include="Microsoft.Net.Http.Headers" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
2929
</ItemGroup>
3030

3131
</Project>

‎samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.5" />
26-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
27-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.5" />
28-
<PackageReference Include="Microsoft.Net.Http.Headers" Version="9.0.5" />
25+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
26+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
27+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
28+
<PackageReference Include="Microsoft.Net.Http.Headers" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
2929
</ItemGroup>
3030

3131
</Project>

‎samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Org.OpenAPITools.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.5" />
26-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
27-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.5" />
28-
<PackageReference Include="Microsoft.Net.Http.Headers" Version="9.0.5" />
25+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
26+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
27+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
28+
<PackageReference Include="Microsoft.Net.Http.Headers" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
2929
</ItemGroup>
3030

3131
</Project>

‎samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Org.OpenAPITools.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.5" />
26-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
27-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.5" />
28-
<PackageReference Include="Microsoft.Net.Http.Headers" Version="9.0.5" />
25+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
26+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
27+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
28+
<PackageReference Include="Microsoft.Net.Http.Headers" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.6" />
2929
</ItemGroup>
3030

3131
</Project>

‎samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="CompareNETObjects" Version="4.83.0" />
25-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
26-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.1" />
26+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.1" />
27+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.36" />
2828
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
2929
<Reference Include="System.Web" />
3030
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

‎samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="CompareNETObjects" Version="4.83.0" />
25-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
26-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.1" />
26+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.1" />
27+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.36" />
2828
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
2929
<Reference Include="System.Web" />
3030
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

‎samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Org.OpenAPITools.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
25-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
26-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.1" />
25+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.1" />
26+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.36" />
2727
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
2828
<Reference Include="System.Web" />
2929
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

‎samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="CompareNETObjects" Version="4.83.0" />
25-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
26-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.Http" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.1" />
26+
<PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.1" />
27+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Condition="'$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'net471' or '$(TargetFramework)' == 'net472'" Version="6.0.36" />
2828
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
2929
<Reference Include="System.Web" />
3030
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

0 commit comments

Comments
 (0)