Skip to content

Merge master into openapi #1546

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.

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

Merged
merged 15 commits into from
May 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"jetbrains.resharper.globaltools": {
"version": "2024.1.0",
"version": "2024.1.2",
"commands": [
"jb"
]
Expand All @@ -15,7 +15,7 @@
]
},
"dotnet-reportgenerator-globaltool": {
"version": "5.2.4",
"version": "5.3.0",
"commands": [
"reportgenerator"
]
Expand All @@ -27,7 +27,7 @@
]
},
"microsoft.openapi.kiota": {
"version": "1.11.1",
"version": "1.14.0",
"commands": [
"kiota"
]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Tune GitHub-hosted runner network
uses: smorimoto/tune-github-hosted-runner-network@v1
- name: Setup PostgreSQL
uses: ikalnytskyi/action-setup-postgres@v5
uses: ikalnytskyi/action-setup-postgres@v6
with:
username: postgres
password: postgres
Expand Down Expand Up @@ -302,7 +302,7 @@ jobs:
dotnet nuget push "$env:GITHUB_WORKSPACE/packages/*.nupkg" --api-key "$env:GITHUB_TOKEN" --source 'github'
- name: Publish documentation
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: gh-pages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qodana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
fetch-depth: 0 # a full history is required for pull request analysis
- name: 'Qodana Scan'
uses: JetBrains/qodana-action@v2023.3
uses: JetBrains/qodana-action@v2024.1
env:
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
- name: Upload results to artifacts on failure
Expand Down
11 changes: 5 additions & 6 deletions package-versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ApiDescriptionServerVersion>8.0.*</ApiDescriptionServerVersion>
<BenchmarkDotNetVersion>0.13.*</BenchmarkDotNetVersion>
<BlushingPenguinVersion>1.0.*</BlushingPenguinVersion>
<BogusVersion>35.2.*</BogusVersion>
<BogusVersion>35.5.*</BogusVersion>
<CodeAnalysisVersion>4.9.*</CodeAnalysisVersion>
<CoverletVersion>6.0.*</CoverletVersion>
<DapperVersion>2.1.*</DapperVersion>
Expand All @@ -23,10 +23,9 @@
<NSwagApiClientVersion>13.20.*</NSwagApiClientVersion>
<NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
<SourceLinkVersion>8.0.*</SourceLinkVersion>
<SwashbuckleVersion>6.5.*</SwashbuckleVersion>
<TestSdkVersion>17.8.*</TestSdkVersion>
<XunitVersion>2.6.*</XunitVersion>
<XunitVisualStudioVersion>2.5.*</XunitVisualStudioVersion>
<SwashbuckleVersion>6.6.*</SwashbuckleVersion>
<TestSdkVersion>17.9.*</TestSdkVersion>
<XunitVersion>2.8.*</XunitVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
Expand All @@ -35,7 +34,7 @@

<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
<AspNetCoreVersion>8.0.*</AspNetCoreVersion>
<EntityFrameworkCoreVersion>8.0.*-*</EntityFrameworkCoreVersion>
<EntityFrameworkCoreVersion>8.0.*</EntityFrameworkCoreVersion>
<SystemTextJsonVersion>$(AspNetCoreVersion)</SystemTextJsonVersion>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Examples/DapperExample/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
// docker run --rm --detach --name dapper-example-postgresql-db -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -p 5432:5432 postgres:latest
// docker run --rm --detach --name dapper-example-postgresql-management --link dapper-example-postgresql-db:db -e [email protected] -e PGADMIN_DEFAULT_PASSWORD=postgres -p 5050:80 dpage/pgadmin4:latest
"DapperExamplePostgreSql": "Host=localhost;Database=DapperExample;User ID=postgres;Password=postgres;Include Error Detail=true",
// docker run --rm --detach --name dapper-example-mysql-db -e MYSQL_ROOT_PASSWORD=mysql -e MYSQL_DATABASE=DapperExample -e MYSQL_USER=mysql -e MYSQL_PASSWORD=mysql -p 3306:3306 mysql:latest --default-authentication-plugin=mysql_native_password
// docker run --rm --detach --name dapper-example-mysql-db -e MYSQL_ROOT_PASSWORD=mysql -e MYSQL_DATABASE=DapperExample -e MYSQL_USER=mysql -e MYSQL_PASSWORD=mysql -p 3306:3306 mysql:latest
// docker run --rm --detach --name dapper-example-mysql-management --link dapper-example-mysql-db:db -p 8081:80 phpmyadmin/phpmyadmin
"DapperExampleMySql": "Host=localhost;Database=DapperExample;User ID=mysql;Password=mysql",
"DapperExampleMySql": "Host=localhost;Database=DapperExample;User ID=mysql;Password=mysql;SSL Mode=None;AllowPublicKeyRetrieval=True",
// docker run --rm --detach --name dapper-example-sqlserver -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=Passw0rd!" -p 1433:1433 mcr.microsoft.com/mssql/server:2022-latest
"DapperExampleSqlServer": "Server=localhost;Database=DapperExample;User ID=sa;Password=Passw0rd!;TrustServerCertificate=true"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,38 @@ namespace OpenApiKiotaClientExample.GeneratedCode.Api {
/// <summary>
/// Builds and executes requests for operations under \api
/// </summary>
public class ApiRequestBuilder : BaseRequestBuilder {
public class ApiRequestBuilder : BaseRequestBuilder
{
/// <summary>The people property</summary>
public PeopleRequestBuilder People { get =>
new PeopleRequestBuilder(PathParameters, RequestAdapter);
public PeopleRequestBuilder People
{
get => new PeopleRequestBuilder(PathParameters, RequestAdapter);
}
/// <summary>The tags property</summary>
public TagsRequestBuilder Tags { get =>
new TagsRequestBuilder(PathParameters, RequestAdapter);
public TagsRequestBuilder Tags
{
get => new TagsRequestBuilder(PathParameters, RequestAdapter);
}
/// <summary>The todoItems property</summary>
public TodoItemsRequestBuilder TodoItems { get =>
new TodoItemsRequestBuilder(PathParameters, RequestAdapter);
public TodoItemsRequestBuilder TodoItems
{
get => new TodoItemsRequestBuilder(PathParameters, RequestAdapter);
}
/// <summary>
/// Instantiates a new ApiRequestBuilder and sets the default values.
/// Instantiates a new <see cref="ApiRequestBuilder"/> and sets the default values.
/// </summary>
/// <param name="pathParameters">Path parameters for the request</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public ApiRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/api", pathParameters) {
public ApiRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/api", pathParameters)
{
}
/// <summary>
/// Instantiates a new ApiRequestBuilder and sets the default values.
/// Instantiates a new <see cref="ApiRequestBuilder"/> and sets the default values.
/// </summary>
/// <param name="rawUrl">The raw URL to use for the request builder.</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public ApiRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/api", rawUrl) {
public ApiRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/api", rawUrl)
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,44 @@ namespace OpenApiKiotaClientExample.GeneratedCode.Api.People.Item.AssignedTodoIt
/// <summary>
/// Builds and executes requests for operations under \api\people\{id}\assignedTodoItems
/// </summary>
public class AssignedTodoItemsRequestBuilder : BaseRequestBuilder {
public class AssignedTodoItemsRequestBuilder : BaseRequestBuilder
{
/// <summary>
/// Instantiates a new AssignedTodoItemsRequestBuilder and sets the default values.
/// Instantiates a new <see cref="AssignedTodoItemsRequestBuilder"/> and sets the default values.
/// </summary>
/// <param name="pathParameters">Path parameters for the request</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public AssignedTodoItemsRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/api/people/{id}/assignedTodoItems{?query*}", pathParameters) {
public AssignedTodoItemsRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/api/people/{id}/assignedTodoItems{?query*}", pathParameters)
{
}
/// <summary>
/// Instantiates a new AssignedTodoItemsRequestBuilder and sets the default values.
/// Instantiates a new <see cref="AssignedTodoItemsRequestBuilder"/> and sets the default values.
/// </summary>
/// <param name="rawUrl">The raw URL to use for the request builder.</param>
/// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
public AssignedTodoItemsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/api/people/{id}/assignedTodoItems{?query*}", rawUrl) {
public AssignedTodoItemsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/api/people/{id}/assignedTodoItems{?query*}", rawUrl)
{
}
/// <summary>
/// Retrieves the related todoItems of an individual person&apos;s assignedTodoItems relationship.
/// </summary>
/// <returns>A <see cref="TodoItemCollectionResponseDocument"/></returns>
/// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
/// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
/// <exception cref="ErrorResponseDocument">When receiving a 400 status code</exception>
/// <exception cref="ErrorResponseDocument">When receiving a 404 status code</exception>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public async Task<TodoItemCollectionResponseDocument?> GetAsync(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderGetQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default) {
public async Task<TodoItemCollectionResponseDocument?> GetAsync(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderGetQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
{
#nullable restore
#else
public async Task<TodoItemCollectionResponseDocument> GetAsync(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderGetQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default) {
public async Task<TodoItemCollectionResponseDocument> GetAsync(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderGetQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
{
#endif
var requestInfo = ToGetRequestInformation(requestConfiguration);
var errorMapping = new Dictionary<string, ParsableFactory<IParsable>> {
var errorMapping = new Dictionary<string, ParsableFactory<IParsable>>
{
{"400", ErrorResponseDocument.CreateFromDiscriminatorValue},
{"404", ErrorResponseDocument.CreateFromDiscriminatorValue},
};
Expand All @@ -53,24 +62,29 @@ public async Task<TodoItemCollectionResponseDocument> GetAsync(Action<RequestCon
/// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public async Task<Stream?> HeadAsync(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderHeadQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default) {
public async Task HeadAsync(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderHeadQueryParameters>>? requestConfiguration = default, CancellationToken cancellationToken = default)
{
#nullable restore
#else
public async Task<Stream> HeadAsync(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderHeadQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default) {
public async Task HeadAsync(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderHeadQueryParameters>> requestConfiguration = default, CancellationToken cancellationToken = default)
{
#endif
var requestInfo = ToHeadRequestInformation(requestConfiguration);
return await RequestAdapter.SendPrimitiveAsync<Stream>(requestInfo, default, cancellationToken).ConfigureAwait(false);
await RequestAdapter.SendNoContentAsync(requestInfo, default, cancellationToken).ConfigureAwait(false);
}
/// <summary>
/// Retrieves the related todoItems of an individual person&apos;s assignedTodoItems relationship.
/// </summary>
/// <returns>A <see cref="RequestInformation"/></returns>
/// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderGetQueryParameters>>? requestConfiguration = default) {
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderGetQueryParameters>>? requestConfiguration = default)
{
#nullable restore
#else
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderGetQueryParameters>> requestConfiguration = default) {
public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderGetQueryParameters>> requestConfiguration = default)
{
#endif
var requestInfo = new RequestInformation(Method.GET, UrlTemplate, PathParameters);
requestInfo.Configure(requestConfiguration);
Expand All @@ -80,13 +94,16 @@ public RequestInformation ToGetRequestInformation(Action<RequestConfiguration<As
/// <summary>
/// Compare the returned ETag HTTP header with an earlier one to determine if the response has changed since it was fetched.
/// </summary>
/// <returns>A <see cref="RequestInformation"/></returns>
/// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
public RequestInformation ToHeadRequestInformation(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderHeadQueryParameters>>? requestConfiguration = default) {
public RequestInformation ToHeadRequestInformation(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderHeadQueryParameters>>? requestConfiguration = default)
{
#nullable restore
#else
public RequestInformation ToHeadRequestInformation(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderHeadQueryParameters>> requestConfiguration = default) {
public RequestInformation ToHeadRequestInformation(Action<RequestConfiguration<AssignedTodoItemsRequestBuilderHeadQueryParameters>> requestConfiguration = default)
{
#endif
var requestInfo = new RequestInformation(Method.HEAD, UrlTemplate, PathParameters);
requestInfo.Configure(requestConfiguration);
Expand All @@ -95,14 +112,17 @@ public RequestInformation ToHeadRequestInformation(Action<RequestConfiguration<A
/// <summary>
/// Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
/// </summary>
/// <returns>A <see cref="AssignedTodoItemsRequestBuilder"/></returns>
/// <param name="rawUrl">The raw URL to use for the request builder.</param>
public AssignedTodoItemsRequestBuilder WithUrl(string rawUrl) {
public AssignedTodoItemsRequestBuilder WithUrl(string rawUrl)
{
return new AssignedTodoItemsRequestBuilder(rawUrl, RequestAdapter);
}
/// <summary>
/// Retrieves the related todoItems of an individual person&apos;s assignedTodoItems relationship.
/// </summary>
public class AssignedTodoItemsRequestBuilderGetQueryParameters {
public class AssignedTodoItemsRequestBuilderGetQueryParameters
{
/// <summary>For syntax, see the documentation for the [`include`](https://www.jsonapi.net/usage/reading/including-relationships.html)/[`filter`](https://www.jsonapi.net/usage/reading/filtering.html)/[`sort`](https://www.jsonapi.net/usage/reading/sorting.html)/[`page`](https://www.jsonapi.net/usage/reading/pagination.html)/[`fields`](https://www.jsonapi.net/usage/reading/sparse-fieldset-selection.html) query string parameters.</summary>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
Expand All @@ -117,7 +137,8 @@ public class AssignedTodoItemsRequestBuilderGetQueryParameters {
/// <summary>
/// Compare the returned ETag HTTP header with an earlier one to determine if the response has changed since it was fetched.
/// </summary>
public class AssignedTodoItemsRequestBuilderHeadQueryParameters {
public class AssignedTodoItemsRequestBuilderHeadQueryParameters
{
/// <summary>For syntax, see the documentation for the [`include`](https://www.jsonapi.net/usage/reading/including-relationships.html)/[`filter`](https://www.jsonapi.net/usage/reading/filtering.html)/[`sort`](https://www.jsonapi.net/usage/reading/sorting.html)/[`page`](https://www.jsonapi.net/usage/reading/pagination.html)/[`fields`](https://www.jsonapi.net/usage/reading/sparse-fieldset-selection.html) query string parameters.</summary>
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
#nullable enable
Expand Down
Loading
Loading