Skip to content

Commit

Permalink
Merge pull request #1023 from christianhelle/kiota-v1.19.1
Browse files Browse the repository at this point in the history
Microsoft Kiota v1.19.1
  • Loading branch information
christianhelle authored Oct 11, 2024
2 parents 1afb98a + 60c14ff commit 8552203
Show file tree
Hide file tree
Showing 15 changed files with 44 additions and 44 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.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.19.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]`. 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:
Expand Down Expand Up @@ -306,7 +306,7 @@ Options:
Commands:
autorest AutoRest (v3.0.0-beta.20210504.2)
kiota Microsoft Kiota (v1.19.0)
kiota Microsoft Kiota (v1.19.1)
nswag NSwag (v14.1.0)
openapi OpenAPI Generator (v7.9.0)
refitter Refitter (v1.3.2)
Expand Down
2 changes: 1 addition & 1 deletion docs/CLI.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Options:

Commands:
autorest AutoRest (v3.0.0-beta.20210504.2)
kiota Microsoft Kiota (v1.19.0)
kiota Microsoft Kiota (v1.19.1)
nswag NSwag (v14.1.0)
openapi OpenAPI Generator (v7.9.0)
refitter Refitter (v1.3.2)
Expand Down
2 changes: 1 addition & 1 deletion docs/Marketplace.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.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.19.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]`. 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:
Expand Down
2 changes: 1 addition & 1 deletion docs/Marketplace2022.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.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.19.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]`. 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:
Expand Down
2 changes: 1 addition & 1 deletion docs/VisualStudioForMac.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.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.19.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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void InstallKiota_Invokes_ProcessLauncher(
mock.Verify(
c => c.Start(
It.IsAny<string>(),
"tool install --global Microsoft.OpenApi.Kiota --version 1.19.0",
"tool install --global Microsoft.OpenApi.Kiota --version 1.19.1",
null));
}

Expand All @@ -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."));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public string GenerateCode(IProgressReporter? pGenerateProgress)
return GeneratedCode.PrefixAutogeneratedCodeHeader(
string.Empty,
"Kiota",
"v1.19.0");
"v1.19.1");
}

pGenerateProgress?.Progress(30);
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
}
Expand All @@ -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();
Expand Down
14 changes: 7 additions & 7 deletions src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencies.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,37 +76,37 @@ public static class PackageDependencies
public static readonly PackageDependency MicrosoftKiotaAbstractions =
new PackageDependency(
"Microsoft.Kiota.Abstractions",
"1.13.0");
"1.13.1");

public static readonly PackageDependency MicrosoftKiotaAuthenticationAzure =
new PackageDependency(
"Microsoft.Kiota.Authentication.Azure",
"1.13.0");
"1.13.1");

public static readonly PackageDependency MicrosoftKiotaHttpClientLibrary =
new PackageDependency(
"Microsoft.Kiota.Http.HttpClientLibrary",
"1.13.0");
"1.13.1");

public static readonly PackageDependency MicrosoftKiotaSerializationForm =
new PackageDependency(
"Microsoft.Kiota.Serialization.Form",
"1.13.0");
"1.13.1");

public static readonly PackageDependency MicrosoftKiotaSerializationJson =
new PackageDependency(
"Microsoft.Kiota.Serialization.Json",
"1.13.0");
"1.13.1");

public static readonly PackageDependency MicrosoftKiotaSerializationText =
new PackageDependency(
"Microsoft.Kiota.Serialization.Text",
"1.13.0");
"1.13.1");

public static readonly PackageDependency MicrosoftKiotaSerializationMultipart =
new PackageDependency(
"Microsoft.Kiota.Serialization.Multipart",
"1.13.0");
"1.13.1");

public static readonly PackageDependency Refit =
new PackageDependency(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ public static class KiotaProjectFileContents
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.13.1" />
</ItemGroup>
</Project>
""";
Expand All @@ -26,12 +26,12 @@ public static class KiotaProjectFileContents
<TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.13.1" />
</ItemGroup>
</Project>
""";
Expand Down
4 changes: 2 additions & 2 deletions src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct
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.19.0)</ButtonText>
<ButtonText>Generate with Microsoft Kiota (v1.19.1)</ButtonText>
</Strings>
</Button>
<Button guid="guidPackageCmdSet" id="SwaggerCodeGeneratorCustomToolSetter" priority="0x0103" type="Button">
Expand Down Expand Up @@ -104,7 +104,7 @@
</Button>
<Button guid="guidNewRestApiClientCmdSet" id="GenerateWithKiota" priority="0x0103" type="Button">
<Strings>
<ButtonText>Generate with Microsoft Kiota (v1.19.0)</ButtonText>
<ButtonText>Generate with Microsoft Kiota (v1.19.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
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.19.0)</ButtonText>
<ButtonText>Generate with Microsoft Kiota (v1.19.1)</ButtonText>
</Strings>
</Button>
<Button guid="guidPackageCmdSet" id="SwaggerCodeGeneratorCustomToolSetter" priority="0x0103" type="Button">
Expand Down Expand Up @@ -104,7 +104,7 @@
</Button>
<Button guid="guidNewRestApiClientCmdSet" id="GenerateWithKiota" priority="0x0103" type="Button">
<Strings>
<ButtonText>Generate with Microsoft Kiota (v1.19.0)</ButtonText>
<ButtonText>Generate with Microsoft Kiota (v1.19.1)</ButtonText>
</Strings>
</Button>
<Button guid="guidNewRestApiClientCmdSet" id="GenerateWithSwagger" priority="0x0104" type="Button">
Expand Down
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.19.0)"
_label = "Generate with Kiota (v1.19.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.19.0)"
_label = "Generate with Kiota (v1.19.1)"
defaultHandler="ApiClientCodeGen.VSMac.Commands.Handlers.GenerateKiotaCommandHandler" />

<Command id = "ApiClientCodeGen.VSMac.Commands.GenerateCode.Refitter"
Expand Down
12 changes: 6 additions & 6 deletions test/GeneratedCode/Kiota/Directory.build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<Compile Include="../*.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.13.0" />
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.13.1" />
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.13.1" />
</ItemGroup>
</Project>

0 comments on commit 8552203

Please sign in to comment.