diff --git a/README.md b/README.md index e41319c6c1..377c919701 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Custom tools let you associate a tool with an item in a project and run that too The output file is the result of merging all the files generated using the OpenAPI Generator tool with: `generate -g csharp --input-spec [swagger file] --output [output file] -DapiTests=false -DmodelTests=false -DpackageName=[default namespace] --skip-overwrite`. It is possible to configure the OpenAPI Generator to generate multiple files which will be placed at the same path as the OpenAPI specifications document that was used to generate code, this is done under Tools -> REST API Client Code Generator -> OpenAPI Generator and setting **Generate Multiple Files** to **true** -- ***KiotaCodeGenerator*** - Generates a single file C# REST API Client using the Microsoft project **[Kiota v1.21.0](https://learn.microsoft.com/en-us/openapi/kiota/)** generator. The output file is the result of merging all the files generated using the Kiota dotnet tool with: `generate -l CSharp -d [swagger file] -o [output file] -n [default namespace]`. It is possible to configure the OpenAPI Generator to generate multiple files which will be placed at the same path as the OpenAPI specifications document that was used to generate code, this is done under Tools -> REST API Client Code Generator -> Kiota and setting **Generate Multiple Files** to **true** +- ***KiotaCodeGenerator*** - Generates a single file C# REST API Client using the Microsoft project **[Kiota v1.22.0](https://learn.microsoft.com/en-us/openapi/kiota/)** generator. The output file is the result of merging all the files generated using the Kiota dotnet tool with: `generate -l CSharp -d [swagger file] -o [output file] -n [default namespace]`. It is possible to configure the OpenAPI Generator to generate multiple files which will be placed at the same path as the OpenAPI specifications document that was used to generate code, this is done under Tools -> REST API Client Code Generator -> Kiota and setting **Generate Multiple Files** to **true** - ***SwaggerCodeGenerator*** - Generates a single file C# REST API Client using **Swagger Codegen CLI v3.0.34**. The output file is the result of merging all the files generated using the Swagger Codegen CLI tool with: @@ -306,7 +306,7 @@ Options: Commands: autorest AutoRest (v3.0.0-beta.20210504.2) - kiota Microsoft Kiota (v1.21.0) + kiota Microsoft Kiota (v1.22.0) nswag NSwag (v14.2.0) openapi OpenAPI Generator (v7.10.0) refitter Refitter (v1.4.1) diff --git a/docs/CLI.md b/docs/CLI.md index 09a6cf5290..8d5d1bf136 100644 --- a/docs/CLI.md +++ b/docs/CLI.md @@ -70,7 +70,7 @@ Options: Commands: autorest AutoRest (v3.0.0-beta.20210504.2) - kiota Microsoft Kiota (v1.21.0) + kiota Microsoft Kiota (v1.22.0) nswag NSwag (v14.2.0) openapi OpenAPI Generator (v7.10.0) refitter Refitter (v1.4.1) diff --git a/docs/Marketplace.md b/docs/Marketplace.md index 56d7843621..8795d9c969 100644 --- a/docs/Marketplace.md +++ b/docs/Marketplace.md @@ -32,7 +32,7 @@ A collection of Visual Studio C# custom tool code generators for Swagger / OpenA The output file is the result of merging all the files generated using the OpenAPI Generator tool with: `generate -g csharp --input-spec [swagger file] --output [output file] -DapiTests=false -DmodelTests=false -DpackageName=[default namespace] --skip-overwrite`. It is possible to configure the OpenAPI Generator to generate multiple files which will be placed at the same path as the OpenAPI specifications document that was used to generate code, this is done under Tools -> REST API Client Code Generator -> OpenAPI Generator and setting **Generate Multiple Files** to **true** -- ***KiotaCodeGenerator*** - Generates a single file C# REST API Client using the Microsoft project **[Kiota v1.21.0](https://learn.microsoft.com/en-us/openapi/kiota/)** generator. The output file is the result of merging all the files generated using the Kiota dotnet tool with: `generate -l CSharp -d [swagger file] -o [output file] -n [default namespace]`. It is possible to configure the OpenAPI Generator to generate multiple files which will be placed at the same path as the OpenAPI specifications document that was used to generate code, this is done under Tools -> REST API Client Code Generator -> Kiota and setting **Generate Multiple Files** to **true** +- ***KiotaCodeGenerator*** - Generates a single file C# REST API Client using the Microsoft project **[Kiota v1.22.0](https://learn.microsoft.com/en-us/openapi/kiota/)** generator. The output file is the result of merging all the files generated using the Kiota dotnet tool with: `generate -l CSharp -d [swagger file] -o [output file] -n [default namespace]`. It is possible to configure the OpenAPI Generator to generate multiple files which will be placed at the same path as the OpenAPI specifications document that was used to generate code, this is done under Tools -> REST API Client Code Generator -> Kiota and setting **Generate Multiple Files** to **true** - ***SwaggerCodeGenerator*** - Generates a single file C# REST API Client using **Swagger Codegen CLI v3.0.34**. The output file is the result of merging all the files generated using the Swagger Codegen CLI tool with: diff --git a/docs/Marketplace2022.md b/docs/Marketplace2022.md index 5f3daeb7c6..fc9ee926a0 100644 --- a/docs/Marketplace2022.md +++ b/docs/Marketplace2022.md @@ -32,7 +32,7 @@ A collection of Visual Studio C# custom tool code generators for Swagger / OpenA The output file is the result of merging all the files generated using the OpenAPI Generator tool with: `generate -g csharp --input-spec [swagger file] --output [output file] -DapiTests=false -DmodelTests=false -DpackageName=[default namespace] --skip-overwrite`. It is possible to configure the OpenAPI Generator to generate multiple files which will be placed at the same path as the OpenAPI specifications document that was used to generate code, this is done under Tools -> REST API Client Code Generator -> OpenAPI Generator and setting **Generate Multiple Files** to **true** -- ***KiotaCodeGenerator*** - Generates a single file C# REST API Client using the Microsoft project **[Kiota v1.21.0](https://learn.microsoft.com/en-us/openapi/kiota/)** generator. The output file is the result of merging all the files generated using the Kiota dotnet tool with: `generate -l CSharp -d [swagger file] -o [output file] -n [default namespace]`. It is possible to configure the OpenAPI Generator to generate multiple files which will be placed at the same path as the OpenAPI specifications document that was used to generate code, this is done under Tools -> REST API Client Code Generator -> Kiota and setting **Generate Multiple Files** to **true** +- ***KiotaCodeGenerator*** - Generates a single file C# REST API Client using the Microsoft project **[Kiota v1.22.0](https://learn.microsoft.com/en-us/openapi/kiota/)** generator. The output file is the result of merging all the files generated using the Kiota dotnet tool with: `generate -l CSharp -d [swagger file] -o [output file] -n [default namespace]`. It is possible to configure the OpenAPI Generator to generate multiple files which will be placed at the same path as the OpenAPI specifications document that was used to generate code, this is done under Tools -> REST API Client Code Generator -> Kiota and setting **Generate Multiple Files** to **true** - ***SwaggerCodeGenerator*** - Generates a single file C# REST API Client using **Swagger Codegen CLI v3.0.34**. The output file is the result of merging all the files generated using the Swagger Codegen CLI tool with: diff --git a/docs/VisualStudioForMac.md b/docs/VisualStudioForMac.md index 1fc0455863..941939d93a 100644 --- a/docs/VisualStudioForMac.md +++ b/docs/VisualStudioForMac.md @@ -17,7 +17,7 @@ A collection of Visual Studio C# custom tool code generators for Swagger / OpenA The output file is the result of merging all the files generated using the OpenAPI Generator tool with: `generate -g csharp --input-spec [swagger file] --output [output file] -DapiTests=false -DmodelTests=false -DpackageName=[default namespace] --skip-overwrite` -- ***KiotaCodeGenerator*** - Generates a single file C# REST API Client using the Microsoft project **[Kiota v1.21.0](https://learn.microsoft.com/en-us/openapi/kiota/)** generator. +- ***KiotaCodeGenerator*** - Generates a single file C# REST API Client using the Microsoft project **[Kiota v1.22.0](https://learn.microsoft.com/en-us/openapi/kiota/)** generator. The output file is the result of merging all the files generated using the Kiota dotnet tool with: `generate -l CSharp -d [swagger file] -o [output file] -n [default namespace]` diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/KiotaCommand.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/KiotaCommand.cs index 2534551e3f..21bba5c41d 100644 --- a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/KiotaCommand.cs +++ b/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/KiotaCommand.cs @@ -8,7 +8,7 @@ namespace Rapicgen.CLI.Commands.CSharp; -[Command("kiota", Description = "Microsoft Kiota (v1.21.0)")] +[Command("kiota", Description = "Microsoft Kiota (v1.22.0)")] public class KiotaCommand : CodeGeneratorCommand, IKiotaOptions { private readonly IProcessLauncher processLauncher; diff --git a/src/Core/ApiClientCodeGen.Core.Tests/Installer/DependencyInstallerTests.cs b/src/Core/ApiClientCodeGen.Core.Tests/Installer/DependencyInstallerTests.cs index dba4542b44..2ab30436cd 100644 --- a/src/Core/ApiClientCodeGen.Core.Tests/Installer/DependencyInstallerTests.cs +++ b/src/Core/ApiClientCodeGen.Core.Tests/Installer/DependencyInstallerTests.cs @@ -99,7 +99,7 @@ public void InstallKiota_Invokes_ProcessLauncher( mock.Verify( c => c.Start( It.IsAny(), - "tool install --global Microsoft.OpenApi.Kiota --version 1.21.0", + "tool install --global Microsoft.OpenApi.Kiota --version 1.22.0", null)); } @@ -113,7 +113,7 @@ public void InstallKiota_Ignores_ProcessLauncherException_For_Already_Installed( .Throws( new ProcessLaunchException( "dotnet", - "tool install --global Microsoft.OpenApi.Kiota --version 1.21.0", + "tool install --global Microsoft.OpenApi.Kiota --version 1.22.0", null, string.Empty, "Tool 'microsoft.openapi.kiota' is already installed.")); diff --git a/src/Core/ApiClientCodeGen.Core/Generators/Kiota/KiotaCodeGenerator.cs b/src/Core/ApiClientCodeGen.Core/Generators/Kiota/KiotaCodeGenerator.cs index eaf9078fe6..4934d54adb 100644 --- a/src/Core/ApiClientCodeGen.Core/Generators/Kiota/KiotaCodeGenerator.cs +++ b/src/Core/ApiClientCodeGen.Core/Generators/Kiota/KiotaCodeGenerator.cs @@ -31,7 +31,7 @@ public string GenerateCode(IProgressReporter? pGenerateProgress) return GeneratedCode.PrefixAutogeneratedCodeHeader( string.Empty, "Kiota", - "v1.21.0"); + "v1.22.0"); } pGenerateProgress?.Progress(30); @@ -87,7 +87,7 @@ public string GenerateCode(IProgressReporter? pGenerateProgress) return GeneratedCode.PrefixAutogeneratedCodeHeader( output, "Kiota", - "v1.21.0"); + "v1.22.0"); } private void RunKiotaGenerate(string outputFolder) diff --git a/src/Core/ApiClientCodeGen.Core/Installer/DependencyInstaller.cs b/src/Core/ApiClientCodeGen.Core/Installer/DependencyInstaller.cs index 4cbcfd7732..9e68268964 100644 --- a/src/Core/ApiClientCodeGen.Core/Installer/DependencyInstaller.cs +++ b/src/Core/ApiClientCodeGen.Core/Installer/DependencyInstaller.cs @@ -71,7 +71,7 @@ public void InstallKiota() Logger.Instance.WriteLine(error); } }); - if (!kiotaVersion.StartsWith("1.21.0")) + if (!kiotaVersion.StartsWith("1.22.0")) { //older or newer? i guess this should be handled. } @@ -80,7 +80,7 @@ public void InstallKiota() { //if command doesn't exist Win32Exception is thrown. command = PathProvider.GetDotNetPath(); - arguments = "tool install --global Microsoft.OpenApi.Kiota --version 1.21.0"; + arguments = "tool install --global Microsoft.OpenApi.Kiota --version 1.22.0"; using var context = new DependencyContext(command, $"{command} {arguments}"); processLauncher.Start(command, arguments); context.Succeeded(); diff --git a/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencies.cs b/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencies.cs index c2479082fe..74f0d122ae 100644 --- a/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencies.cs +++ b/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencies.cs @@ -76,37 +76,37 @@ public static class PackageDependencies public static readonly PackageDependency MicrosoftKiotaAbstractions = new PackageDependency( "Microsoft.Kiota.Abstractions", - "1.16.1"); + "1.16.3"); public static readonly PackageDependency MicrosoftKiotaAuthenticationAzure = new PackageDependency( "Microsoft.Kiota.Authentication.Azure", - "1.16.1"); + "1.16.3"); public static readonly PackageDependency MicrosoftKiotaHttpClientLibrary = new PackageDependency( "Microsoft.Kiota.Http.HttpClientLibrary", - "1.16.1"); + "1.16.3"); public static readonly PackageDependency MicrosoftKiotaSerializationForm = new PackageDependency( "Microsoft.Kiota.Serialization.Form", - "1.16.1"); + "1.16.3"); public static readonly PackageDependency MicrosoftKiotaSerializationJson = new PackageDependency( "Microsoft.Kiota.Serialization.Json", - "1.16.1"); + "1.16.3"); public static readonly PackageDependency MicrosoftKiotaSerializationText = new PackageDependency( "Microsoft.Kiota.Serialization.Text", - "1.16.1"); + "1.16.3"); public static readonly PackageDependency MicrosoftKiotaSerializationMultipart = new PackageDependency( "Microsoft.Kiota.Serialization.Multipart", - "1.16.1"); + "1.16.3"); public static readonly PackageDependency Refit = new PackageDependency( diff --git a/src/Core/ApiClientCodeGen.Tests.Common/Build/Projects/KiotaProjectFileContents.cs b/src/Core/ApiClientCodeGen.Tests.Common/Build/Projects/KiotaProjectFileContents.cs index fd988027a1..396d7c3eef 100644 --- a/src/Core/ApiClientCodeGen.Tests.Common/Build/Projects/KiotaProjectFileContents.cs +++ b/src/Core/ApiClientCodeGen.Tests.Common/Build/Projects/KiotaProjectFileContents.cs @@ -9,12 +9,12 @@ public static class KiotaProjectFileContents net8.0 - - - - - - + + + + + + """; @@ -26,12 +26,12 @@ public static class KiotaProjectFileContents netstandard2.1 - - - - - - + + + + + + """; diff --git a/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct b/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct index 6508cadaa7..0315406fbf 100644 --- a/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct +++ b/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct @@ -44,7 +44,7 @@