Skip to content

[csharp] Add missing ConfigureAwait(false) for csharp generator #21244

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

Merged
wing328 merged 2 commits into from
May 9, 2025
Merged

[csharp] Add missing ConfigureAwait(false) for csharp generator #21244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59936f2
[csharp] ApiClient.mustache: Apply ConfigureAwait(false) consistently
billybooth May 7, 2025
aa055ae
[csharp] Update samples to include 59936f29f00
billybooth May 8, 2025
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
6 changes: 3 additions & 3 deletions modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ namespace {{packageName}}.Client
{
InterceptRequest(request);

RestResponse<T> response = await getResponse(client);
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);

// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
Expand Down Expand Up @@ -562,7 +562,7 @@ namespace {{packageName}}.Client
{
if (policyResult.Outcome == OutcomeType.Successful)
{
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down Expand Up @@ -621,7 +621,7 @@ namespace {{packageName}}.Client
{
var policy = RetryConfiguration.AsyncRetryPolicy;
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions ...es/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Client/ApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
{
InterceptRequest(request);

RestResponse<T> response = await getResponse(client);
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);

// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
Expand Down Expand Up @@ -545,7 +545,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
{
if (policyResult.Outcome == OutcomeType.Successful)
{
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down Expand Up @@ -602,7 +602,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
{
var policy = RetryConfiguration.AsyncRetryPolicy;
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
{
InterceptRequest(request);

RestResponse<T> response = await getResponse(client);
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);

// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
Expand Down Expand Up @@ -545,7 +545,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
{
if (policyResult.Outcome == OutcomeType.Successful)
{
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down Expand Up @@ -602,7 +602,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
{
var policy = RetryConfiguration.AsyncRetryPolicy;
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions ...store/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/ApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
{
InterceptRequest(request);

RestResponse<T> response = await getResponse(client);
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);

// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
Expand Down Expand Up @@ -561,7 +561,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
{
if (policyResult.Outcome == OutcomeType.Successful)
{
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down Expand Up @@ -618,7 +618,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
{
var policy = RetryConfiguration.AsyncRetryPolicy;
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions ...client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/ApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
{
InterceptRequest(request);

RestResponse<T> response = await getResponse(client);
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);

// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
Expand Down Expand Up @@ -561,7 +561,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
{
if (policyResult.Outcome == OutcomeType.Successful)
{
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down Expand Up @@ -618,7 +618,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
{
var policy = RetryConfiguration.AsyncRetryPolicy;
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions ...client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/ApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
{
InterceptRequest(request);

RestResponse<T> response = await getResponse(client);
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);

// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
Expand Down Expand Up @@ -561,7 +561,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
{
if (policyResult.Outcome == OutcomeType.Successful)
{
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down Expand Up @@ -618,7 +618,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
{
var policy = RetryConfiguration.AsyncRetryPolicy;
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions ...ient/petstore/csharp/restsharp/net8/EnumMappings/src/Org.OpenAPITools/Client/ApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
{
InterceptRequest(request);

RestResponse<T> response = await getResponse(client);
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);

// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
Expand Down Expand Up @@ -560,7 +560,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
{
if (policyResult.Outcome == OutcomeType.Successful)
{
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down Expand Up @@ -617,7 +617,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
{
var policy = RetryConfiguration.AsyncRetryPolicy;
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions ...petstore/csharp/restsharp/net8/ParameterMappings/src/Org.OpenAPITools/Client/ApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
{
InterceptRequest(request);

RestResponse<T> response = await getResponse(client);
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);

// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
Expand Down Expand Up @@ -544,7 +544,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
{
if (policyResult.Outcome == OutcomeType.Successful)
{
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down Expand Up @@ -601,7 +601,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
{
var policy = RetryConfiguration.AsyncRetryPolicy;
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions ...s/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Client/ApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
{
InterceptRequest(request);

RestResponse<T> response = await getResponse(client);
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);

// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
Expand Down Expand Up @@ -560,7 +560,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
{
if (policyResult.Outcome == OutcomeType.Successful)
{
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down Expand Up @@ -617,7 +617,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
{
var policy = RetryConfiguration.AsyncRetryPolicy;
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions ...etstore/csharp/restsharp/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/ApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
{
InterceptRequest(request);

RestResponse<T> response = await getResponse(client);
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);

// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
Expand Down Expand Up @@ -544,7 +544,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
{
if (policyResult.Outcome == OutcomeType.Successful)
{
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down Expand Up @@ -601,7 +601,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
{
var policy = RetryConfiguration.AsyncRetryPolicy;
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions ...etstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
{
InterceptRequest(request);

RestResponse<T> response = await getResponse(client);
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);

// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
Expand Down Expand Up @@ -560,7 +560,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
{
if (policyResult.Outcome == OutcomeType.Successful)
{
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down Expand Up @@ -617,7 +617,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
{
var policy = RetryConfiguration.AsyncRetryPolicy;
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions ...ient/petstore/csharp/restsharp/net9/EnumMappings/src/Org.OpenAPITools/Client/ApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
{
InterceptRequest(request);

RestResponse<T> response = await getResponse(client);
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);

// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
Expand Down Expand Up @@ -560,7 +560,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
{
if (policyResult.Outcome == OutcomeType.Successful)
{
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down Expand Up @@ -617,7 +617,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
{
var policy = RetryConfiguration.AsyncRetryPolicy;
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
}
else
{
Expand Down
Loading
Loading