Skip to content

Commit 8ec6163

Browse files
committed
Fix collection expression use in old versions of C#
1 parent e5bccf9 commit 8ec6163

16 files changed

Lines changed: 20 additions & 15 deletions

File tree

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,12 @@ using System.Net.Http.Headers;
327327
return null;
328328
329329
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
330+
{{#net80OrLater}}
330331
return [MediaTypeWithQualityHeaderValue.Parse("application/json")];
332+
{{/net80OrLater}}
333+
{{^net80OrLater}}
334+
return new [] { MediaTypeWithQualityHeaderValue.Parse("application/json") };
335+
{{/net80OrLater}}
331336

332337
return accepts.Select(MediaTypeWithQualityHeaderValue.Parse);
333338
}

samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/ClientUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public static IEnumerable<MediaTypeWithQualityHeaderValue> SelectHeaderAcceptArr
247247
return null;
248248

249249
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
250-
return [MediaTypeWithQualityHeaderValue.Parse("application/json")];
250+
return new [] { MediaTypeWithQualityHeaderValue.Parse("application/json") };
251251

252252
return accepts.Select(MediaTypeWithQualityHeaderValue.Parse);
253253
}

samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/ClientUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public static IEnumerable<MediaTypeWithQualityHeaderValue> SelectHeaderAcceptArr
247247
return null;
248248

249249
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
250-
return [MediaTypeWithQualityHeaderValue.Parse("application/json")];
250+
return new [] { MediaTypeWithQualityHeaderValue.Parse("application/json") };
251251

252252
return accepts.Select(MediaTypeWithQualityHeaderValue.Parse);
253253
}

samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/ClientUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public static IEnumerable<MediaTypeWithQualityHeaderValue> SelectHeaderAcceptArr
232232
return null;
233233

234234
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
235-
return [MediaTypeWithQualityHeaderValue.Parse("application/json")];
235+
return new [] { MediaTypeWithQualityHeaderValue.Parse("application/json") };
236236

237237
return accepts.Select(MediaTypeWithQualityHeaderValue.Parse);
238238
}

samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ public static IEnumerable<MediaTypeWithQualityHeaderValue> SelectHeaderAcceptArr
347347
return null;
348348

349349
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
350-
return [MediaTypeWithQualityHeaderValue.Parse("application/json")];
350+
return new [] { MediaTypeWithQualityHeaderValue.Parse("application/json") };
351351

352352
return accepts.Select(MediaTypeWithQualityHeaderValue.Parse);
353353
}

samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/ClientUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public static IEnumerable<MediaTypeWithQualityHeaderValue> SelectHeaderAcceptArr
247247
return null;
248248

249249
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
250-
return [MediaTypeWithQualityHeaderValue.Parse("application/json")];
250+
return new [] { MediaTypeWithQualityHeaderValue.Parse("application/json") };
251251

252252
return accepts.Select(MediaTypeWithQualityHeaderValue.Parse);
253253
}

samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ public static IEnumerable<MediaTypeWithQualityHeaderValue> SelectHeaderAcceptArr
351351
return null;
352352

353353
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
354-
return [MediaTypeWithQualityHeaderValue.Parse("application/json")];
354+
return new [] { MediaTypeWithQualityHeaderValue.Parse("application/json") };
355355

356356
return accepts.Select(MediaTypeWithQualityHeaderValue.Parse);
357357
}

samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public static IEnumerable<MediaTypeWithQualityHeaderValue> SelectHeaderAcceptArr
232232
return null;
233233

234234
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
235-
return [MediaTypeWithQualityHeaderValue.Parse("application/json")];
235+
return new [] { MediaTypeWithQualityHeaderValue.Parse("application/json") };
236236

237237
return accepts.Select(MediaTypeWithQualityHeaderValue.Parse);
238238
}

samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/ClientUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public static IEnumerable<MediaTypeWithQualityHeaderValue> SelectHeaderAcceptArr
247247
return null;
248248

249249
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
250-
return [MediaTypeWithQualityHeaderValue.Parse("application/json")];
250+
return new [] { MediaTypeWithQualityHeaderValue.Parse("application/json") };
251251

252252
return accepts.Select(MediaTypeWithQualityHeaderValue.Parse);
253253
}

samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/ClientUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public static IEnumerable<MediaTypeWithQualityHeaderValue> SelectHeaderAcceptArr
247247
return null;
248248

249249
if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
250-
return [MediaTypeWithQualityHeaderValue.Parse("application/json")];
250+
return new [] { MediaTypeWithQualityHeaderValue.Parse("application/json") };
251251

252252
return accepts.Select(MediaTypeWithQualityHeaderValue.Parse);
253253
}

0 commit comments

Comments
 (0)