From 35fc3059d9a7f3ed43b6f42259f842c3c30927ce Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Mon, 11 Sep 2023 15:41:39 +0200 Subject: [PATCH 1/5] Update Kiota version to 1.6.1 in DependencyInstaller DependencyInstallerTests and DependencyInstaller have been updated to install version 1.6.1 of Microsoft.OpenApi.Kiota tool instead of 1.5.1. This ensures the project is using the most recent stable version of Kiota, providing the latest features and improvements. --- .../Installer/DependencyInstallerTests.cs | 4 ++-- .../ApiClientCodeGen.Core/Installer/DependencyInstaller.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Core/ApiClientCodeGen.Core.Tests/Installer/DependencyInstallerTests.cs b/src/Core/ApiClientCodeGen.Core.Tests/Installer/DependencyInstallerTests.cs index 85e41b58e0..b549f7b42a 100644 --- a/src/Core/ApiClientCodeGen.Core.Tests/Installer/DependencyInstallerTests.cs +++ b/src/Core/ApiClientCodeGen.Core.Tests/Installer/DependencyInstallerTests.cs @@ -90,7 +90,7 @@ public void InstallKiota_Invokes_ProcessLauncher( .Verify( c => c.Start( It.IsAny(), - "tool install --global Microsoft.OpenApi.Kiota --version 1.5.1", + "tool install --global Microsoft.OpenApi.Kiota --version 1.6.1", null)); } @@ -104,7 +104,7 @@ public void InstallKiota_Ignores_ProcessLauncherException_For_Already_Installed( .Throws( new ProcessLaunchException( "dotnet", - "tool install --global Microsoft.OpenApi.Kiota --version 1.5.1", + "tool install --global Microsoft.OpenApi.Kiota --version 1.6.1", null, string.Empty, "Tool 'microsoft.openapi.kiota' is already installed.")); diff --git a/src/Core/ApiClientCodeGen.Core/Installer/DependencyInstaller.cs b/src/Core/ApiClientCodeGen.Core/Installer/DependencyInstaller.cs index 4d9fdfd10d..dda45cc125 100644 --- a/src/Core/ApiClientCodeGen.Core/Installer/DependencyInstaller.cs +++ b/src/Core/ApiClientCodeGen.Core/Installer/DependencyInstaller.cs @@ -52,7 +52,7 @@ public void InstallKiota() try { var command = PathProvider.GetDotNetPath(); - const string arguments = "tool install --global Microsoft.OpenApi.Kiota --version 1.5.1"; + const string arguments = "tool install --global Microsoft.OpenApi.Kiota --version 1.6.1"; using var context = new DependencyContext(command, $"{command} {arguments}"); processLauncher.Start(command, arguments); context.Succeeded(); From 9dde15592c81352923ed904ce857144893d5a2f3 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Mon, 11 Sep 2023 15:46:12 +0200 Subject: [PATCH 2/5] Update Kiota version in auto-generated code header The code generator was updated to reflect the new Kiota version (v1.6.1) in its auto-generated code header. This change ensures the generated codes keep up to date with Kiota's latest version and features. --- .../Generators/Kiota/KiotaCodeGenerator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/ApiClientCodeGen.Core/Generators/Kiota/KiotaCodeGenerator.cs b/src/Core/ApiClientCodeGen.Core/Generators/Kiota/KiotaCodeGenerator.cs index 4953c102ba..0d2409c311 100644 --- a/src/Core/ApiClientCodeGen.Core/Generators/Kiota/KiotaCodeGenerator.cs +++ b/src/Core/ApiClientCodeGen.Core/Generators/Kiota/KiotaCodeGenerator.cs @@ -44,6 +44,6 @@ public string GenerateCode(IProgressReporter? pGenerateProgress) var output = CSharpFileMerger.MergeFiles(outputFolder); pGenerateProgress?.Progress(100); - return GeneratedCode.PrefixAutogeneratedCodeHeader(output, "Kiota", "v1.5.1"); + return GeneratedCode.PrefixAutogeneratedCodeHeader(output, "Kiota", "v1.6.1"); } } \ No newline at end of file From 97fed8fa2227ac4e8d4d44ff8ad5b932720318e2 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Mon, 11 Sep 2023 15:46:28 +0200 Subject: [PATCH 3/5] Update Kiota version in command description The Kiota version in the command description was updated from 1.5.1 to 1.6.1. This change reflects the latest supported version of Kiota in the command line interface for the Rapicgen API client code generator. --- src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/KiotaCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/KiotaCommand.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/KiotaCommand.cs index f0e86afd51..13bf8d5450 100644 --- a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/KiotaCommand.cs +++ b/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/KiotaCommand.cs @@ -7,7 +7,7 @@ namespace Rapicgen.CLI.Commands.CSharp; -[Command("kiota", Description = "Microsoft Kiota (v1.5.1)")] +[Command("kiota", Description = "Microsoft Kiota (v1.6.1)")] public class KiotaCommand : CodeGeneratorCommand { private readonly IProcessLauncher processLauncher; From b05df5178ec89fe3dca5a3939064f7932ae814fe Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Mon, 11 Sep 2023 15:56:47 +0200 Subject: [PATCH 4/5] Update Kiota version in VSIX and VSMac context menus The button text indicating the version of Microsoft Kiota has been updated from v1.5.1 to v1.6.1. This change was made in the .vsct files of the VSIX project and the Manifest.addin.xml of the VSMac project. The update reflects the new version of Kiota being utilized and provides accurate information to the users using these tools. --- 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 caf95d6faa..44ca3137ce 100644 --- a/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct +++ b/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct @@ -44,7 +44,7 @@