From 7bc48e9c6531403b7ec685134bef7c95235d6279 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Fri, 14 Jul 2023 17:06:44 +0200 Subject: [PATCH 1/5] Update OpenAPI Generator download link to use v7.0.0-beta --- src/Core/ApiClientCodeGen.Core/Resource.Designer.cs | 4 ++-- src/Core/ApiClientCodeGen.Core/Resource.resx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Core/ApiClientCodeGen.Core/Resource.Designer.cs b/src/Core/ApiClientCodeGen.Core/Resource.Designer.cs index 5ca9dc9de1..14ec7ff2e4 100644 --- a/src/Core/ApiClientCodeGen.Core/Resource.Designer.cs +++ b/src/Core/ApiClientCodeGen.Core/Resource.Designer.cs @@ -60,7 +60,7 @@ internal Resource() { } /// - /// Looks up a localized string similar to https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.0.1/openapi-generator-cli-6.0.1.jar. + /// Looks up a localized string similar to https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.0-beta/openapi-generator-cli-7.0.0-beta.jar. /// public static string LegacyOpenApiGenerator_DownloadUrl { get { @@ -69,7 +69,7 @@ public static string LegacyOpenApiGenerator_DownloadUrl { } /// - /// Looks up a localized string similar to ACE9D0D6F89AFED9EED414DCB3736DFABC911B77. + /// Looks up a localized string similar to 42FBFF2C650504C5DCCA8246C0463C609AEF7AE1. /// public static string LegacyOpenApiGenerator_SHA1 { get { diff --git a/src/Core/ApiClientCodeGen.Core/Resource.resx b/src/Core/ApiClientCodeGen.Core/Resource.resx index f9f1998218..b95298019c 100644 --- a/src/Core/ApiClientCodeGen.Core/Resource.resx +++ b/src/Core/ApiClientCodeGen.Core/Resource.resx @@ -136,9 +136,9 @@ 54EB5F2561C77D23AF3FA2E4CEA8A100BA8F71C8 - https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.0.1/openapi-generator-cli-6.0.1.jar + https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.0-beta/openapi-generator-cli-7.0.0-beta.jar - ACE9D0D6F89AFED9EED414DCB3736DFABC911B77 + 42FBFF2C650504C5DCCA8246C0463C609AEF7AE1 \ No newline at end of file From e05cb3eebae39d302e5a20a40379b4acc58ded37 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Fri, 14 Jul 2023 17:08:41 +0200 Subject: [PATCH 2/5] Update OpenAPI Generator to v7.0.0-beta in Rapicgen CLI tool --- .../Commands/CSharp/OpenApiCSharpGeneratorCommand.cs | 2 +- .../ApiClientCodeGen.CLI/Commands/OpenApiGeneratorCommand.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/OpenApiCSharpGeneratorCommand.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/OpenApiCSharpGeneratorCommand.cs index a00eb17cd7..230f6177db 100644 --- a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/OpenApiCSharpGeneratorCommand.cs +++ b/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/OpenApiCSharpGeneratorCommand.cs @@ -9,7 +9,7 @@ namespace Rapicgen.CLI.Commands.CSharp { - [Command("openapi", Description = "OpenAPI Generator (v6.6.0)")] + [Command("openapi", Description = "OpenAPI Generator (v7.0.0-beta)")] public class OpenApiCSharpGeneratorCommand : CodeGeneratorCommand, IOpenApiGeneratorOptions { private readonly IGeneralOptions options; diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/OpenApiGeneratorCommand.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/OpenApiGeneratorCommand.cs index 66e49ab058..ff924a698d 100644 --- a/src/CLI/ApiClientCodeGen.CLI/Commands/OpenApiGeneratorCommand.cs +++ b/src/CLI/ApiClientCodeGen.CLI/Commands/OpenApiGeneratorCommand.cs @@ -15,7 +15,7 @@ namespace Rapicgen.CLI.Commands [Command( "openapi-generator", Description = - @"Generate code using OpenAPI Generator (v6.6.0). + @"Generate code using OpenAPI Generator (v7.0.0-beta). See supported generators at https://openapi-generator.tech/docs/generators/")] public class OpenApiGeneratorCommand { From ae8ae46f9ee68e105df07d523cfb3e4903606cbb Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Fri, 14 Jul 2023 17:09:00 +0200 Subject: [PATCH 3/5] Update OpenAPI Generator to v7.0.0-beta in header --- .../Generators/OpenApi/OpenApiCSharpCodeGenerator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/ApiClientCodeGen.Core/Generators/OpenApi/OpenApiCSharpCodeGenerator.cs b/src/Core/ApiClientCodeGen.Core/Generators/OpenApi/OpenApiCSharpCodeGenerator.cs index c89ea9d4be..0a4c5eb5f4 100644 --- a/src/Core/ApiClientCodeGen.Core/Generators/OpenApi/OpenApiCSharpCodeGenerator.cs +++ b/src/Core/ApiClientCodeGen.Core/Generators/OpenApi/OpenApiCSharpCodeGenerator.cs @@ -113,7 +113,7 @@ public string GenerateCode(IProgressReporter? pGenerateProgress) return GeneratedCode.PrefixAutogeneratedCodeHeader( CSharpFileMerger.MergeFilesAndDeleteSource(output), "OpenAPI Generator", - "v6.6.0"); + "v7.0.0-beta"); } finally { From 5300c8ac93bb3a66fedffacde00321f877312f90 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Fri, 14 Jul 2023 17:09:12 +0200 Subject: [PATCH 4/5] Update OpenAPI Generator to v7.0.0-beta in Visual Studio context menus --- src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct | 4 ++-- src/VSIX/ApiClientCodeGen.VSIX/VSCommandTable.vsct | 4 ++-- .../ApiClientCodeGen.VSMac/Properties/Manifest.addin.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct b/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct index 1d3e5c4a28..7203f30b4d 100644 --- a/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct +++ b/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct @@ -39,7 +39,7 @@