From 5c9b0f4a3b7b23271fb1b169d9d5890f3b7a69f7 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Fri, 11 Oct 2024 22:25:39 +0200 Subject: [PATCH 1/6] Update Kiota to version to v1.19.1 in dependency installer --- .../Installer/DependencyInstallerTests.cs | 4 ++-- .../ApiClientCodeGen.Core/Installer/DependencyInstaller.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Core/ApiClientCodeGen.Core.Tests/Installer/DependencyInstallerTests.cs b/src/Core/ApiClientCodeGen.Core.Tests/Installer/DependencyInstallerTests.cs index 9fea08c003..0e8442dba1 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.19.0", + "tool install --global Microsoft.OpenApi.Kiota --version 1.19.1", 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.19.0", + "tool install --global Microsoft.OpenApi.Kiota --version 1.19.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 a0d6074f9d..7caafc228f 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.19.0")) + if (!kiotaVersion.StartsWith("1.19.1")) { //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.19.0"; + arguments = "tool install --global Microsoft.OpenApi.Kiota --version 1.19.1"; using var context = new DependencyContext(command, $"{command} {arguments}"); processLauncher.Start(command, arguments); context.Succeeded(); From da24113daa6fdafd5b0c489385e9c973627289a4 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Fri, 11 Oct 2024 22:25:48 +0200 Subject: [PATCH 2/6] Update Kiota version to v1.19.1 in CLI tool --- 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 bbfd2f6d51..515ccfa687 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.19.0)")] +[Command("kiota", Description = "Microsoft Kiota (v1.19.1)")] public class KiotaCommand : CodeGeneratorCommand, IKiotaOptions { private readonly IProcessLauncher processLauncher; From 922053e1fe5f5d9288ca79b7d2f2a839ab865e11 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Fri, 11 Oct 2024 22:25:57 +0200 Subject: [PATCH 3/6] Update Kiota version to v1.19.1 in headers --- .../Generators/Kiota/KiotaCodeGenerator.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Core/ApiClientCodeGen.Core/Generators/Kiota/KiotaCodeGenerator.cs b/src/Core/ApiClientCodeGen.Core/Generators/Kiota/KiotaCodeGenerator.cs index a98fd4b9ce..b97c93accc 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.19.0"); + "v1.19.1"); } pGenerateProgress?.Progress(30); @@ -87,7 +87,7 @@ public string GenerateCode(IProgressReporter? pGenerateProgress) return GeneratedCode.PrefixAutogeneratedCodeHeader( output, "Kiota", - "v1.19.0"); + "v1.19.1"); } private void RunKiotaGenerate(string outputFolder) From 549b974e07ffeb1eb5ca5c836b1223c02d16b831 Mon Sep 17 00:00:00 2001 From: Christian Helle Date: Fri, 11 Oct 2024 22:26:12 +0200 Subject: [PATCH 4/6] Update Kiota version to v1.19.1 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 9165684630..bb39d30829 100644 --- a/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct +++ b/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct @@ -44,7 +44,7 @@