Skip to content

Commit 74441fd

Browse files
devhl-labsdevhl-labs
authored
[csharp-netcore] Removed net5, added net7 (#14003)
* removed net5, added net7 * bumped github action dotnet version
1 parent 40e04df commit 74441fd

18 files changed

Lines changed: 130 additions & 129 deletions

File tree

‎.github/workflows/samples-dotnet.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/checkout@v3
3030
- uses: actions/setup-dotnet@v3.0.3
3131
with:
32-
dotnet-version: '6.0.x'
32+
dotnet-version: '7.0.x'
3333
- name: Build
3434
working-directory: ${{ matrix.sample }}
3535
run: dotnet build Org.OpenAPITools.sln

‎bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0-nrt.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ additionalProperties:
88
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
99
useCompareNetObjects: true
1010
disallowAdditionalPropertiesIfNotPresent: false
11-
targetFramework: net6.0
11+
targetFramework: net7.0
1212
nullableReferenceTypes: true

‎bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ additionalProperties:
88
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
99
useCompareNetObjects: true
1010
disallowAdditionalPropertiesIfNotPresent: false
11-
targetFramework: net6.0
11+
targetFramework: net7.0
1212
nullableReferenceTypes: false

‎bin/configs/csharp-netcore-OpenAPIClient-net50.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ additionalProperties:
88
useCompareNetObjects: true
99
disallowAdditionalPropertiesIfNotPresent: false
1010
useOneOfDiscriminatorLookup: true
11-
targetFramework: net5.0
11+
targetFramework: net7.0

‎docs/generators/csharp-netcore.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
4242
|releaseNote|Release note, default to 'Minor update'.| |Minor update|
4343
|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
4444
|sourceFolder|source folder for generated code| |src|
45-
|targetFramework|The target .NET framework version. To target multiple frameworks, use `;` as the separator, e.g. `netstandard2.1;netcoreapp3.1`|<dl><dt>**netstandard1.3**</dt><dd>.NET Standard 1.3 compatible</dd><dt>**netstandard1.4**</dt><dd>.NET Standard 1.4 compatible</dd><dt>**netstandard1.5**</dt><dd>.NET Standard 1.5 compatible</dd><dt>**netstandard1.6**</dt><dd>.NET Standard 1.6 compatible</dd><dt>**netstandard2.0**</dt><dd>.NET Standard 2.0 compatible</dd><dt>**netstandard2.1**</dt><dd>.NET Standard 2.1 compatible</dd><dt>**netcoreapp3.1**</dt><dd>.NET Core 3.1 compatible</dd><dt>**net47**</dt><dd>.NET Framework 4.7 compatible</dd><dt>**net48**</dt><dd>.NET Framework 4.8 compatible</dd><dt>**net5.0**</dt><dd>.NET 5.0 compatible</dd><dt>**net6.0**</dt><dd>.NET 6.0 compatible</dd></dl>|netstandard2.0|
45+
|targetFramework|The target .NET framework version. To target multiple frameworks, use `;` as the separator, e.g. `netstandard2.1;netcoreapp3.1`|<dl><dt>**netstandard1.3**</dt><dd>.NET Standard 1.3 compatible</dd><dt>**netstandard1.4**</dt><dd>.NET Standard 1.4 compatible</dd><dt>**netstandard1.5**</dt><dd>.NET Standard 1.5 compatible</dd><dt>**netstandard1.6**</dt><dd>.NET Standard 1.6 compatible</dd><dt>**netstandard2.0**</dt><dd>.NET Standard 2.0 compatible</dd><dt>**netstandard2.1**</dt><dd>.NET Standard 2.1 compatible</dd><dt>**netcoreapp3.1**</dt><dd>.NET Core 3.1 compatible (End of Support 13 Dec 2022)</dd><dt>**net47**</dt><dd>.NET Framework 4.7 compatible</dd><dt>**net48**</dt><dd>.NET Framework 4.8 compatible</dd><dt>**net6.0**</dt><dd>.NET 6.0 compatible</dd><dt>**net7.0**</dt><dd>.NET 7.0 compatible</dd></dl>|netstandard2.0|
4646
|useCollection|Deserialize array types to Collection&lt;T&gt; instead of List&lt;T&gt;.| |false|
4747
|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
4848
|useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped.| |false|

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
7979
FrameworkStrategy.NETCOREAPP_3_1,
8080
FrameworkStrategy.NETFRAMEWORK_4_7,
8181
FrameworkStrategy.NETFRAMEWORK_4_8,
82-
FrameworkStrategy.NET_5_0,
83-
FrameworkStrategy.NET_6_0
82+
FrameworkStrategy.NET_6_0,
83+
FrameworkStrategy.NET_7_0
8484
);
8585
private static FrameworkStrategy defaultFramework = FrameworkStrategy.NETSTANDARD_2_0;
8686
protected final Map<String, String> frameworks;
@@ -731,7 +731,6 @@ public void processOpts() {
731731

732732
if (!additionalProperties.containsKey(CodegenConstants.NULLABLE_REFERENCE_TYPES) && !strategies.stream().anyMatch(s ->
733733
s.equals(FrameworkStrategy.NETCOREAPP_3_1) ||
734-
s.equals(FrameworkStrategy.NET_5_0) ||
735734
s.equals(FrameworkStrategy.NETFRAMEWORK_4_8) ||
736735
s.equals(FrameworkStrategy.NETFRAMEWORK_4_7))) {
737736
// starting in .net 6.0, NRT is enabled by default. If not specified, lets enable NRT to match the framework's default
@@ -1243,16 +1242,16 @@ private static abstract class FrameworkStrategy {
12431242
};
12441243
static FrameworkStrategy NETSTANDARD_2_1 = new FrameworkStrategy("netstandard2.1", ".NET Standard 2.1 compatible", "netcoreapp3.1") {
12451244
};
1246-
static FrameworkStrategy NETCOREAPP_3_1 = new FrameworkStrategy("netcoreapp3.1", ".NET Core 3.1 compatible", "netcoreapp3.1", Boolean.FALSE) {
1245+
static FrameworkStrategy NETCOREAPP_3_1 = new FrameworkStrategy("netcoreapp3.1", ".NET Core 3.1 compatible (End of Support 13 Dec 2022)", "netcoreapp3.1", Boolean.FALSE) {
12471246
};
12481247
static FrameworkStrategy NETFRAMEWORK_4_7 = new FrameworkStrategy("net47", ".NET Framework 4.7 compatible", "net47", Boolean.FALSE) {
12491248
};
12501249
static FrameworkStrategy NETFRAMEWORK_4_8 = new FrameworkStrategy("net48", ".NET Framework 4.8 compatible", "net48", Boolean.FALSE) {
12511250
};
1252-
static FrameworkStrategy NET_5_0 = new FrameworkStrategy("net5.0", ".NET 5.0 compatible", "net5.0", Boolean.FALSE) {
1253-
};
12541251
static FrameworkStrategy NET_6_0 = new FrameworkStrategy("net6.0", ".NET 6.0 compatible", "net6.0", Boolean.FALSE) {
12551252
};
1253+
static FrameworkStrategy NET_7_0 = new FrameworkStrategy("net7.0", ".NET 7.0 compatible", "net7.0", Boolean.FALSE) {
1254+
};
12561255
protected String name;
12571256
protected String description;
12581257
protected String testTargetFramework;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
```ps1
77
$properties = @(
88
'apiName=Api',
9-
'targetFramework=net6.0',
9+
'targetFramework=net7.0',
1010
'validatable=true',
1111
'nullableReferenceTypes=true',
1212
'hideGenerationTimestamp=true',
@@ -250,7 +250,7 @@ Authentication schemes defined for the API:
250250
- returnICollection: false
251251
- sortParamsByRequiredFlag:
252252
- sourceFolder: src
253-
- targetFramework: net6.0
253+
- targetFramework: net7.0
254254
- useCollection: false
255255
- useDateTimeOffset: false
256256
- useOneOfDiscriminatorLookup: false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<AssemblyName>Org.OpenAPITools.Test</AssemblyName>
55
<RootNamespace>Org.OpenAPITools.Test</RootNamespace>
6-
<TargetFramework>net6.0</TargetFramework>
6+
<TargetFramework>net7.0</TargetFramework>
77
<IsPackable>false</IsPackable>
88
<Nullable>enable</Nullable>
99
</PropertyGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<GenerateAssemblyInfo>true</GenerateAssemblyInfo> <!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
<AssemblyName>Org.OpenAPITools</AssemblyName>
77
<PackageId>Org.OpenAPITools</PackageId>
88
<OutputType>Library</OutputType>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
```ps1
77
$properties = @(
88
'apiName=Api',
9-
'targetFramework=net6.0',
9+
'targetFramework=net7.0',
1010
'validatable=true',
1111
'nullableReferenceTypes=false',
1212
'hideGenerationTimestamp=true',
@@ -250,7 +250,7 @@ Authentication schemes defined for the API:
250250
- returnICollection: false
251251
- sortParamsByRequiredFlag:
252252
- sourceFolder: src
253-
- targetFramework: net6.0
253+
- targetFramework: net7.0
254254
- useCollection: false
255255
- useDateTimeOffset: false
256256
- useOneOfDiscriminatorLookup: false

0 commit comments

Comments
 (0)