From c2049205e32f630fb74b576ea6db198a2852b966 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Fri, 19 Jul 2024 23:19:19 +0200 Subject: [PATCH 1/4] Add support for .NET 7.0 and .NET 8.0 to the OpenAPI Generator target framework options --- .../OpenApiGenerator/OpenApiSupportedTargetFramework.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Core/ApiClientCodeGen.Core/Options/OpenApiGenerator/OpenApiSupportedTargetFramework.cs b/src/Core/ApiClientCodeGen.Core/Options/OpenApiGenerator/OpenApiSupportedTargetFramework.cs index 133d3105d5..df170500cd 100644 --- a/src/Core/ApiClientCodeGen.Core/Options/OpenApiGenerator/OpenApiSupportedTargetFramework.cs +++ b/src/Core/ApiClientCodeGen.Core/Options/OpenApiGenerator/OpenApiSupportedTargetFramework.cs @@ -24,5 +24,9 @@ public enum OpenApiSupportedTargetFramework Net50, [Description("net6.0")] Net60, + [Description("net7.0")] + Net70, + [Description("net8.0")] + Net80, } } \ No newline at end of file From b1aea02e1504f70ddd8d4ff449e81ad81a7dbfe9 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Fri, 19 Jul 2024 23:21:19 +0200 Subject: [PATCH 2/4] Update OpenApiSupportedTargetFramework.cs to remove netcoreapp3.1 target framework --- .../OpenApiGenerator/OpenApiSupportedTargetFramework.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Core/ApiClientCodeGen.Core/Options/OpenApiGenerator/OpenApiSupportedTargetFramework.cs b/src/Core/ApiClientCodeGen.Core/Options/OpenApiGenerator/OpenApiSupportedTargetFramework.cs index df170500cd..19747d63b7 100644 --- a/src/Core/ApiClientCodeGen.Core/Options/OpenApiGenerator/OpenApiSupportedTargetFramework.cs +++ b/src/Core/ApiClientCodeGen.Core/Options/OpenApiGenerator/OpenApiSupportedTargetFramework.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using System.ComponentModel; namespace Rapicgen.Core.Options.OpenApiGenerator { @@ -16,8 +16,6 @@ public enum OpenApiSupportedTargetFramework NetStandard14, [Description("netstandard1.3")] NetStandard13, - [Description("netcoreapp3.1")] - NetCoreApp31, [Description("net47")] Net47, [Description("net5.0")] From 63f738a2cc269bb02cf76cebca437621718c6af6 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Fri, 19 Jul 2024 23:22:22 +0200 Subject: [PATCH 3/4] Update OpenApiSupportedTargetFramework to replace Net50 with Net48 --- .../OpenApiGenerator/OpenApiSupportedTargetFramework.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Core/ApiClientCodeGen.Core/Options/OpenApiGenerator/OpenApiSupportedTargetFramework.cs b/src/Core/ApiClientCodeGen.Core/Options/OpenApiGenerator/OpenApiSupportedTargetFramework.cs index 19747d63b7..5e476c7ac9 100644 --- a/src/Core/ApiClientCodeGen.Core/Options/OpenApiGenerator/OpenApiSupportedTargetFramework.cs +++ b/src/Core/ApiClientCodeGen.Core/Options/OpenApiGenerator/OpenApiSupportedTargetFramework.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using System.ComponentModel; namespace Rapicgen.Core.Options.OpenApiGenerator { @@ -18,8 +18,8 @@ public enum OpenApiSupportedTargetFramework NetStandard13, [Description("net47")] Net47, - [Description("net5.0")] - Net50, + [Description("net48")] + Net48, [Description("net6.0")] Net60, [Description("net7.0")] From f382093bba27ce4213d6fcf7b352f0a0ceb60860 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Sat, 20 Jul 2024 10:54:48 +0200 Subject: [PATCH 4/4] Fix EnumGetDescriptionTests --- .../Extensions/EnumGetDescriptionTests.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Core/ApiClientCodeGen.Core.Tests/Extensions/EnumGetDescriptionTests.cs b/src/Core/ApiClientCodeGen.Core.Tests/Extensions/EnumGetDescriptionTests.cs index 0b05ae52db..c9adf811ce 100644 --- a/src/Core/ApiClientCodeGen.Core.Tests/Extensions/EnumGetDescriptionTests.cs +++ b/src/Core/ApiClientCodeGen.Core.Tests/Extensions/EnumGetDescriptionTests.cs @@ -16,10 +16,11 @@ public class EnumGetDescriptionTests [InlineData(OpenApiSupportedTargetFramework.NetStandard16, "netstandard1.6")] [InlineData(OpenApiSupportedTargetFramework.NetStandard20, "netstandard2.0")] [InlineData(OpenApiSupportedTargetFramework.NetStandard21, "netstandard2.1")] - [InlineData(OpenApiSupportedTargetFramework.NetCoreApp31, "netcoreapp3.1")] [InlineData(OpenApiSupportedTargetFramework.Net47, "net47")] - [InlineData(OpenApiSupportedTargetFramework.Net50, "net5.0")] + [InlineData(OpenApiSupportedTargetFramework.Net48, "net48")] [InlineData(OpenApiSupportedTargetFramework.Net60, "net6.0")] + [InlineData(OpenApiSupportedTargetFramework.Net70, "net7.0")] + [InlineData(OpenApiSupportedTargetFramework.Net80, "net8.0")] public void GetDescription_Returns_Description( OpenApiSupportedTargetFramework framework, string expected)