Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Microsoft Kiota to v1.6.1 #626

Merged
merged 5 commits into from
Sep 11, 2023
Merged

Update Microsoft Kiota to v1.6.1 #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35fc305
Update Kiota version to 1.6.1 in DependencyInstaller
christianhelle Sep 11, 2023
9dde155
Update Kiota version in auto-generated code header
christianhelle Sep 11, 2023
97fed8f
Update Kiota version in command description
christianhelle Sep 11, 2023
b05df51
Update Kiota version in VSIX and VSMac context menus
christianhelle Sep 11, 2023
d819ce6
Update Kiota version to v1.6.1 in docs
christianhelle Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,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.5.1](https://learn.microsoft.com/en-us/openapi/kiota/)** generator.
- ***KiotaCodeGenerator*** - Generates a single file C# REST API Client using the Microsoft project **[Kiota v1.6.1](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]`

Expand Down Expand Up @@ -294,7 +294,7 @@ Options:

Commands:
autorest AutoRest (v3.0.0-beta.20210504.2)
kiota Microsoft Kiota (v1.5.1)
kiota Microsoft Kiota (v1.6.1)
nswag NSwag (v13.20.0)
openapi OpenAPI Generator (v7.0.0)
refitter Refitter (v0.7.5)
Expand Down
2 changes: 1 addition & 1 deletion docs/CLI.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Options:

Commands:
autorest AutoRest (v3.0.0-beta.20210504.2)
kiota Microsoft Kiota (v1.5.1)
kiota Microsoft Kiota (v1.6.1)
nswag NSwag (v13.20.0)
openapi OpenAPI Generator (v7.0.0)
refitter Refitter (v0.7.5)
Expand Down
2 changes: 1 addition & 1 deletion docs/Marketplace.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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.5.1](https://learn.microsoft.com/en-us/openapi/kiota/)** generator.
- ***KiotaCodeGenerator*** - Generates a single file C# REST API Client using the Microsoft project **[Kiota v1.6.1](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]`

Expand Down
2 changes: 1 addition & 1 deletion docs/Marketplace2022.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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.5.1](https://learn.microsoft.com/en-us/openapi/kiota/)** generator.
- ***KiotaCodeGenerator*** - Generates a single file C# REST API Client using the Microsoft project **[Kiota v1.6.1](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]`

Expand Down
2 changes: 1 addition & 1 deletion docs/VisualStudioForMac.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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.5.1](https://learn.microsoft.com/en-us/openapi/kiota/)** generator.
- ***KiotaCodeGenerator*** - Generates a single file C# REST API Client using the Microsoft project **[Kiota v1.6.1](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]`

Expand Down
2 changes: 1 addition & 1 deletion src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/KiotaCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/Core/ApiClientCodeGen.Core.Tests/Installer/DependencyInstallerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void InstallKiota_Invokes_ProcessLauncher(
.Verify(
c => c.Start(
It.IsAny<string>(),
"tool install --global Microsoft.OpenApi.Kiota --version 1.5.1",
"tool install --global Microsoft.OpenApi.Kiota --version 1.6.1",
null));
}

Expand All @@ -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."));
Expand Down
2 changes: 1 addition & 1 deletion src/Core/ApiClientCodeGen.Core/Generators/Kiota/KiotaCodeGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
2 changes: 1 addition & 1 deletion src/Core/ApiClientCodeGen.Core/Installer/DependencyInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</Button>
<Button guid="guidPackageCmdSet" id="KiotaCodeGeneratorCustomToolSetter" priority="0x0102" type="Button">
<Strings>
<ButtonText>Generate with Microsoft Kiota (v1.5.1)</ButtonText>
<ButtonText>Generate with Microsoft Kiota (v1.6.1)</ButtonText>
</Strings>
</Button>
<Button guid="guidPackageCmdSet" id="SwaggerCodeGeneratorCustomToolSetter" priority="0x0103" type="Button">
Expand Down Expand Up @@ -88,7 +88,7 @@
</Button>
<Button guid="guidNewRestApiClientCmdSet" id="GenerateWithKiota" priority="0x0103" type="Button">
<Strings>
<ButtonText>Generate with Microsoft Kiota (v1.5.1)</ButtonText>
<ButtonText>Generate with Microsoft Kiota (v1.6.1)</ButtonText>
</Strings>
</Button>
<Button guid="guidNewRestApiClientCmdSet" id="GenerateWithSwagger" priority="0x0104" type="Button">
Expand Down
4 changes: 2 additions & 2 deletions src/VSIX/ApiClientCodeGen.VSIX/VSCommandTable.vsct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</Button>
<Button guid="guidPackageCmdSet" id="KiotaCodeGeneratorCustomToolSetter" priority="0x0102" type="Button">
<Strings>
<ButtonText>Generate with Microsoft Kiota (v1.5.1)</ButtonText>
<ButtonText>Generate with Microsoft Kiota (v1.6.1)</ButtonText>
</Strings>
</Button>
<Button guid="guidPackageCmdSet" id="SwaggerCodeGeneratorCustomToolSetter" priority="0x0103" type="Button">
Expand Down Expand Up @@ -88,7 +88,7 @@
</Button>
<Button guid="guidNewRestApiClientCmdSet" id="GenerateWithKiota" priority="0x0103" type="Button">
<Strings>
<ButtonText>Generate with Microsoft Kiota (v1.5.1)</ButtonText>
<ButtonText>Generate with Microsoft Kiota (v1.6.1)</ButtonText>
</Strings>
</Button>
<Button guid="guidNewRestApiClientCmdSet" id="GenerateWithSwagger" priority="0x0104" type="Button">
Expand Down
4 changes: 2 additions & 2 deletions src/VSMac/ApiClientCodeGen.VSMac/Properties/Manifest.addin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
defaultHandler="ApiClientCodeGen.VSMac.Commands.Handlers.AddNewOpenApiCommandHandler" />

<Command id = "ApiClientCodeGen.VSMac.Commands.AddToProject.Kiota"
_label = "Generate with Kiota (v1.5.1)"
_label = "Generate with Kiota (v1.6.1)"
defaultHandler="ApiClientCodeGen.VSMac.Commands.Handlers.AddNewKiotaCommandHandler" />

<Command id = "ApiClientCodeGen.VSMac.Commands.AddToProject.Refitter"
Expand Down Expand Up @@ -68,7 +68,7 @@
defaultHandler="ApiClientCodeGen.VSMac.Commands.Handlers.GenerateOpenApiCommandHandler" />

<Command id = "ApiClientCodeGen.VSMac.Commands.GenerateCode.Kiota"
_label = "Generate with Kiota (v1.5.1)"
_label = "Generate with Kiota (v1.6.1)"
defaultHandler="ApiClientCodeGen.VSMac.Commands.Handlers.GenerateKiotaCommandHandler" />

<Command id = "ApiClientCodeGen.VSMac.Commands.GenerateCode.Refitter"
Expand Down