Skip to content

Commit b4eb9a4

Browse files
devhl-labsdevhl-labs
authored
fixed .net6 packages (#15902)
1 parent ae8da31 commit b4eb9a4

16 files changed

Lines changed: 58 additions & 18 deletions

File tree

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,8 @@ protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
420420
.put("optional", new OptionalParameterLambda().generator(this))
421421
.put("joinWithComma", new JoinWithCommaLambda())
422422
.put("trimLineBreaks", new TrimLineBreaksLambda())
423-
.put("trimTrailingWhiteSpace", new TrimTrailingWhiteSpaceLambda());
423+
.put("trimTrailingWhiteSpace", new TrimTrailingWhiteSpaceLambda())
424+
.put("first", new FirstLambda());
424425
}
425426

426427
@Override

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/FirstLambda.java‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.openapitools.codegen.templating.mustache;
18+
19+
import com.samskivert.mustache.Mustache;
20+
import com.samskivert.mustache.Template;
21+
22+
import java.io.IOException;
23+
import java.io.Writer;
24+
import java.util.Arrays;
25+
26+
/**
27+
* Split text by 2 spaces and then return the first entry
28+
*
29+
* Register:
30+
* <pre>
31+
* additionalProperties.put("first", new FirstLambda());
32+
* </pre>
33+
*
34+
* Use:
35+
* <pre>
36+
* {{#first}}{{name}}{{/first}}
37+
* </pre>
38+
*/
39+
public class FirstLambda implements Mustache.Lambda {
40+
public FirstLambda() {
41+
42+
}
43+
44+
@Override
45+
public void execute(Template.Fragment fragment, Writer writer) throws IOException {
46+
String[] parts = fragment.execute().trim().split(" ");
47+
48+
writer.write(Arrays.stream(parts).findFirst().orElse(""));
49+
}
50+
}

‎modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/README.client.mustache‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ namespace YourProject
123123

124124
- [Microsoft.Extensions.Hosting](https://www.nuget.org/packages/Microsoft.Extensions.Hosting/) - 5.0.0 or later
125125
- [Microsoft.Extensions.Http](https://www.nuget.org/packages/Microsoft.Extensions.Http/) - 5.0.0 or later{{#supportsRetry}}
126-
- [Microsoft.Extensions.Http.Polly](https://www.nuget.org/packages/Microsoft.Extensions.Http.Polly/) - 5.0.1 or later
127-
- [Polly](https://www.nuget.org/packages/Polly/) - 7.2.3 or later{{/supportsRetry}}{{#useCompareNetObjects}}
126+
- [Microsoft.Extensions.Http.Polly](https://www.nuget.org/packages/Microsoft.Extensions.Http.Polly/) - 5.0.1 or later{{/supportsRetry}}{{#useCompareNetObjects}}
128127
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later{{/useCompareNetObjects}}{{#validatable}}
129128
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.7.0 or later{{/validatable}}{{#apiDocs}}
130129

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,17 @@
3535
<PackageReference Include="RestSharp" Version="108.0.3" />
3636
{{/useRestSharp}}
3737
{{#useGenericHost}}
38-
<PackageReference Include="Microsoft.Extensions.Http" Version="{{^netStandard}}7.0.0{{/netStandard}}{{#netStandard}}5.0.0{{/netStandard}}" />
39-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="{{^netStandard}}7.0.1{{/netStandard}}{{#netStandard}}5.0.0{{/netStandard}}" />
38+
<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}}{{#net70OrLater}}7.0.0{{/net70OrLater}}{{/lambda.first}}" />
39+
<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}}{{#net70OrLater}}7.0.1 {{/net70OrLater}}{{/lambda.first}}" />
4040
{{#supportsRetry}}
41-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="{{^netStandard}}7.0.5{{/netStandard}}{{#netStandard}}5.0.1{{/netStandard}}" />
41+
<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}}{{#net70OrLater}}7.0.5 {{/net70OrLater}}{{/lambda.first}}" />
4242
{{/supportsRetry}}
4343
{{/useGenericHost}}
44+
{{^useGenericHost}}
4445
{{#supportsRetry}}
4546
<PackageReference Include="Polly" Version="{{^netStandard}}7.2.3{{/netStandard}}{{#netStandard}}7.2.3{{/netStandard}}" />
4647
{{/supportsRetry}}
48+
{{/useGenericHost}}
4749
{{#validatable}}
4850
{{^net60OrLater}}
4951
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

‎samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Org.OpenAPITools.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
2626
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
2727
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.5" />
28-
<PackageReference Include="Polly" Version="7.2.3" />
2928
</ItemGroup>
3029

3130
</Project>

‎samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ namespace YourProject
147147
- [Microsoft.Extensions.Hosting](https://www.nuget.org/packages/Microsoft.Extensions.Hosting/) - 5.0.0 or later
148148
- [Microsoft.Extensions.Http](https://www.nuget.org/packages/Microsoft.Extensions.Http/) - 5.0.0 or later
149149
- [Microsoft.Extensions.Http.Polly](https://www.nuget.org/packages/Microsoft.Extensions.Http.Polly/) - 5.0.1 or later
150-
- [Polly](https://www.nuget.org/packages/Polly/) - 7.2.3 or later
151150
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
152151
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.7.0 or later
153152

‎samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
2525
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
2626
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.5" />
27-
<PackageReference Include="Polly" Version="7.2.3" />
2827
</ItemGroup>
2928

3029
</Project>

‎samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ namespace YourProject
147147
- [Microsoft.Extensions.Hosting](https://www.nuget.org/packages/Microsoft.Extensions.Hosting/) - 5.0.0 or later
148148
- [Microsoft.Extensions.Http](https://www.nuget.org/packages/Microsoft.Extensions.Http/) - 5.0.0 or later
149149
- [Microsoft.Extensions.Http.Polly](https://www.nuget.org/packages/Microsoft.Extensions.Http.Polly/) - 5.0.1 or later
150-
- [Polly](https://www.nuget.org/packages/Polly/) - 7.2.3 or later
151150
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
152151
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.7.0 or later
153152

‎samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
2626
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
2727
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.5" />
28-
<PackageReference Include="Polly" Version="7.2.3" />
2928
</ItemGroup>
3029

3130
</Project>

‎samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ namespace YourProject
105105
- [Microsoft.Extensions.Hosting](https://www.nuget.org/packages/Microsoft.Extensions.Hosting/) - 5.0.0 or later
106106
- [Microsoft.Extensions.Http](https://www.nuget.org/packages/Microsoft.Extensions.Http/) - 5.0.0 or later
107107
- [Microsoft.Extensions.Http.Polly](https://www.nuget.org/packages/Microsoft.Extensions.Http.Polly/) - 5.0.1 or later
108-
- [Polly](https://www.nuget.org/packages/Polly/) - 7.2.3 or later
109108
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
110109
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.7.0 or later
111110

0 commit comments

Comments
 (0)